Skip to content

Commit

Permalink
Merge branch 'master' of github.com:patrickwieth/YMCA
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickwieth committed Apr 7, 2024
2 parents 1513f10 + ac8f0fc commit 1b3749f
Show file tree
Hide file tree
Showing 46 changed files with 1,006 additions and 992 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Contributors & special thanks to:
* Augusto (Red Guard, Minigunner, Tank Hunter)
* DarkStar (snct.shp/SonicTurret)
* Conman (Bi Xi Dragon)
* Medalmonkey/DerekPlus (Obelisktrooper)
* Medalmonkey/DerekPlus (Obelisktrooper, Mirage Trooper/Saboteur, Mercenary, Stormtrooper)

Of course YMCA wouldn't exist today without OpenRA & the
hard work of the many OpenRA contributors.
Expand Down
2 changes: 1 addition & 1 deletion OpenRA.Mods.CA/Traits/EjectOnTransform.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class EjectOnTransformInfo : ConditionalTraitInfo
{
[ActorReference]
[Desc("Name of the unit to eject. This actor type needs to have the Parachutable trait defined.")]
public readonly string PilotActor = "N1";
public readonly string PilotActor = "mercenary";

public override object Create(ActorInitializer init) { return new EjectOnTransform(init.Self, this); }
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ public ProductionTooltipLogicCA(Widget widget, TooltipContainerWidget tooltipCon
var dmgWarhead = warheads.OfType<DamageWarhead>().FirstOrDefault();
if (dmgWarhead != null)
{
versusLabel.Text += "\\nEffective versus:";
var fireRate = (weapon.Burst > 0 ? weapon.Burst : 1)*25.0 / weapon.ReloadDelay;
var damage = dmgWarhead.Damage / 100;
versusLabel.Text += "\\nDamage per Second: "+(int)(damage*fireRate)+"\\n\\nEffective versus:";
if (dmgWarhead.Versus.ContainsKey("None")) {
versusNoneLabel.Text += "Infantry: ";
versusNoneLabel.TextColor = Color.LightSalmon;
Expand Down Expand Up @@ -385,10 +387,10 @@ LabelWidget GetArmorTypeLabel(LabelWidget armorTypeLabel, ActorInfo actor)
var armor = actor.TraitInfos<ArmorInfo>().FirstOrDefault();
armorTypeLabel.Text = armor != null ? armor.Type : "";

// We also display Health in addition
var health = actor.TraitInfos<HealthInfo>().FirstOrDefault();
var healthText = health != null ? "("+health.HP/100+")" : "";
var healthText = health != null ? " - HP: "+health.HP/100 : "";

// hard coded, specific to CA - find a better way to set user-friendly names and colors for armor types
switch (armorTypeLabel.Text)
{
case "None":
Expand Down
10 changes: 6 additions & 4 deletions OpenRA.Mods.CA/Widgets/Logic/Ingame/SelectionTooltipLogic.cs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@ void UpdateTooltip()
var dmgWarhead = weapon.Warheads.OfType<DamageWarhead>().FirstOrDefault();
if (dmgWarhead != null)
{
versusLabel.Text += "\\nEffective versus:";
var fireRate = (weapon.Burst > 0 ? weapon.Burst : 1)*25.0 / weapon.ReloadDelay;
var damage = dmgWarhead.Damage / 100;
versusLabel.Text += "\\nDamage per Second: "+(int)(damage*fireRate)+"\\n\\nEffective versus:";
if (dmgWarhead.Versus.ContainsKey("None")) {
versusNoneLabel.Text += "Infantry: ";
versusNoneLabel.TextColor = Color.LightSalmon;
Expand Down Expand Up @@ -302,7 +304,7 @@ Color GetEffectiveLabelColor(int effectValue, int neutralValue) {

String GetEffectiveLabelText(int effectValue, int neutralValue) {
return $"{effectValue}%";
/*
/* // In the past there was text instead of just raw %
if (effectValue >= neutralValue * 2)
return "It's super effective!";
else if (effectValue >= neutralValue * 1.33)
Expand All @@ -321,10 +323,10 @@ LabelWidget GetArmorTypeLabel(LabelWidget armorTypeLabel, ActorInfo actor)
var armor = actor.TraitInfos<ArmorInfo>().FirstOrDefault();
armorTypeLabel.Text = armor != null ? armor.Type : "";

// We also display Health in addition
var health = actor.TraitInfos<HealthInfo>().FirstOrDefault();
var healthText = health != null ? "("+health.HP/100+")" : "";
var healthText = health != null ? " - HP: "+health.HP/100 : "";

// hard coded, specific to CA - find a better way to set user-friendly names and colors for armor types
switch (armorTypeLabel.Text)
{
case "None":
Expand Down
Binary file added mods/ca/bits/gdi/mercenary.shp
Binary file not shown.
Binary file added mods/ca/bits/gdi/mercenaryicon.shp
Binary file not shown.
Binary file added mods/ca/bits/gdi/rocketmercenary.shp
Binary file not shown.
Binary file added mods/ca/bits/gdi/rocketmercenaryicon.shp
Binary file not shown.
Binary file added mods/ca/bits/nod/adept.shp
Binary file not shown.
Binary file added mods/ca/bits/nod/adepticon.shp
Binary file not shown.
Binary file removed mods/ca/bits/nod/redeemer.shp
Binary file not shown.
Binary file added mods/ca/bits/nod/rocketcyborg.shp
Binary file not shown.
Binary file added mods/ca/bits/nod/rocketcyborgicon.shp
Binary file not shown.
Binary file added mods/ca/bits/nod/rockettrooper.shp
Binary file not shown.
Binary file added mods/ca/bits/nod/rockettroopericon.shp
Binary file not shown.
Binary file added mods/ca/bits/nod/saboteur.shp
Binary file not shown.
Binary file added mods/ca/bits/nod/saboteuricon.shp
Binary file not shown.
Binary file added mods/ca/bits/nod/stormtrooper.shp
Binary file not shown.
Binary file added mods/ca/bits/nod/stormtroopericon.shp
Binary file not shown.
Binary file removed mods/ca/bits/sab.shp
Binary file not shown.
Binary file removed mods/ca/bits/sabicon.shp
Binary file not shown.
18 changes: 9 additions & 9 deletions mods/ca/maps/delirium-shell/map.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1134,49 +1134,49 @@ Actors:
SubCell: 3
Location: 55,87
Owner: Multi3
Actor397: n3c
Actor397: rocket_cyborg
Facing: 384
SubCell: 3
Location: 54,82
Owner: Multi3
Actor400: n3c
Actor400: rocket_cyborg
Facing: 384
SubCell: 3
Location: 64,72
Owner: Multi3
Actor402: n1c
Actor402: stormtrooper
Facing: 384
SubCell: 3
Location: 56,86
Owner: Multi3
Actor403: n1c
Actor403: stormtrooper
Facing: 384
SubCell: 3
Location: 57,78
Owner: Multi3
Actor406: n1c
Actor406: stormtrooper
Facing: 384
Location: 65,73
SubCell: 3
Owner: Multi3
Actor408: n1c
Actor408: stormtrooper
Facing: 384
SubCell: 3
Location: 67,72
Owner: Multi3
Actor409: n1
Actor409: adept
Facing: 384
TurretFacing: 384
SubCell: 3
Location: 54,83
Owner: Multi3
Actor410: n1
Actor410: adept
Facing: 384
TurretFacing: 384
SubCell: 3
Location: 56,79
Owner: Multi3
Actor411: n1
Actor411: adept
Facing: 384
TurretFacing: 384
SubCell: 3
Expand Down
4 changes: 2 additions & 2 deletions mods/ca/maps/delirium-shell/shellmap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
information, see COPYING.
]]

NodLightUnitTypes = { "bike", "bike", "bggy", "rmbc", "rmbc", "n1c", "n1c", "n1c", "n1c", "n3c", "n3c" }
NodLightUnitTypes = { "bike", "bike", "bggy", "rmbc", "rmbc", "stormtrooper", "stormtrooper", "stormtrooper", "stormtrooper", "rocket_cyborg", "rocket_cyborg" }
NodHeavyUnitTypes = { "mtnk", "mtnk", "ftnk", "ftnk", "wtnk", "wtnk", "cdrn" }
NodAirUnitTypes = {"scrn", "scrn", "scrn"}
AlliedUnitTypes = { "jeep", "1tnk", "ifv.ai", "1tnk", "rtnk", "ifv.ai", "ptnk", "e1", "e1", "e1", "e1", "e3", "e3", "e3", "e3" }
Expand All @@ -17,7 +17,7 @@ ProducedUnitTypes =
{
{ factory = AlliedBarracks1, types = { "e1", "e3" } },
{ factory = ScrinBarracks1, types = { "s1", "s3" } },
{ factory = NodBarracks1, types = { "n1", "n3", "n4" } },
{ factory = NodBarracks1, types = { "adept", "rocket_trooper", "n4" } },
{ factory = AlliedWarFactory1, types = { "1tnk", "2tnk", "ptnk", "jeep", "ifv.ai", "cryo", "rtnk" } },
{ factory = ScrinWarFactory1, types = { "seek", "tpod", "gunw", "devo", "corr" } },
{ factory = NodWarFactory1, types = { "ltnk", "ftnk", "stnk", "arty.nod", "mlrs" } }
Expand Down
10 changes: 5 additions & 5 deletions mods/ca/maps/island-wars-ii-shell/map.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ Actors:
Facing: 73
TurretFacing: 110
Owner: Multi1
Actor258: n1
Actor258: mercenary
Owner: Multi0
Location: 52,66
SubCell: 3
Expand All @@ -716,13 +716,13 @@ Actors:
SubCell: 3
TurretFacing: 177
Facing: 177
Actor260: n1
Actor260: mercenary
Owner: Multi0
Location: 53,65
SubCell: 3
TurretFacing: 16
Facing: 16
Actor261: n1
Actor261: mercenary
Owner: Multi0
Location: 53,60
SubCell: 3
Expand Down Expand Up @@ -813,13 +813,13 @@ Actors:
SubCell: 3
Facing: 92
TurretFacing: 92
Actor278: n1
Actor278: adept
Owner: Multi0
Location: 59,62
SubCell: 3
TurretFacing: 191
Facing: 191
Actor279: n1
Actor279: adept
Owner: Multi0
Location: 59,63
SubCell: 3
Expand Down
4 changes: 2 additions & 2 deletions mods/ca/maps/island-wars-ii-shell/shellmap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ UnitTypes = { "3tnk", "ttnk" }
GDIUnitTypes = { "mtnk", "mtnk" }
GDIMLRSTypes = { "msam", "msam" }
BeachUnitTypes = { "e1", "e2", "e3", "e4", "e1", "e2", "e3", "e4", "e1", "e2", "e3", "e4", "e1", "e2", "e3", "shok" }
GDIBeachUnitTypes = { "n1", "n2", "n3", "n2", "n1", "n2", "n3", "n1", "n1", "n2", "n3", "n1", "n1", "n1", "n1", "n1" }
GDIBeachUnitTypes = { "mercenary", "n2", "rocket_mercenary", "n2", "mercenary", "n2", "rocket_mercenary", "mercenary", "mercenary", "n2", "rocket_mercenary", "mercenary", "mercenary", "mercenary", "mercenary", "mercenary" }
ProducedUnitTypes =
{
{ factory = AlliedBarracks1, types = { "n1", "n3" } },
{ factory = AlliedBarracks1, types = { "e1", "e3" } },
{ factory = SovietBarracks1, types = { "e1", "e2", "e3" } },
{ factory = SKennel1, types = { "dog" } },
{ factory = ANavalYard1, types = { "pt2" } },
Expand Down
7 changes: 4 additions & 3 deletions mods/ca/rules/ai/brutal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,15 @@ Player:
e3: 40
e4: 15
e6: 5
n1: 65
adept: 65
mercenary: 65
n2: 25
n3: 40
n4: 15
n5: 15
n6: 5
n1c: 65
n3c: 40
stormtrooper: 65
rocket_cyborg: 40
s1: 65
s2: 40
s3: 40
Expand Down
7 changes: 4 additions & 3 deletions mods/ca/rules/ai/easy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,15 @@ Player:
e3: 40
e4: 15
e6: 5
n1: 65
adept: 65
mercenary: 65
n2: 25
n3: 40
n4: 15
n5: 15
n6: 5
n1c: 65
n3c: 40
stormtrooper: 65
rocket_cyborg: 40
s1: 65
s2: 40
s3: 40
Expand Down
7 changes: 4 additions & 3 deletions mods/ca/rules/ai/hard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -211,14 +211,15 @@ Player:
e3: 40
e4: 15
e6: 5
n1: 65
adept: 65
mercenary: 65
n2: 25
n3: 40
n4: 15
n5: 15
n6: 5
n1c: 65
n3c: 40
stormtrooper: 65
rocket_cyborg: 40
s1: 65
s2: 40
s3: 40
Expand Down
7 changes: 4 additions & 3 deletions mods/ca/rules/ai/naval.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,14 @@ Player:
e2: 25
e3: 40
e4: 15
n1: 65
adept: 65
mercenary: 65
n2: 25
n3: 40
n4: 15
n5: 15
n1c: 65
n3c: 40
stormtrooper: 65
rocket_cyborg: 40
s1: 65
s2: 40
s3: 40
Expand Down
7 changes: 4 additions & 3 deletions mods/ca/rules/ai/normal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,15 @@ Player:
e3: 40
e4: 15
e6: 5
n1: 65
adept: 65
mercenary: 65
n2: 25
n3: 40
n4: 15
n5: 15
n6: 5
n1c: 65
n3c: 40
stormtrooper: 65
rocket_cyborg: 40
s1: 65
s2: 40
s3: 40
Expand Down
6 changes: 3 additions & 3 deletions mods/ca/rules/aircraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2353,17 +2353,17 @@ POD:
Velocity: 113
Explosion: DropPodVisual
SpawnActorOnDeath:
Actor: n1r1
Actor: mercenary

POD2:
Inherits: POD
SpawnActorOnDeath:
Actor: n2r1
Actor: n2

POD3:
Inherits: POD
SpawnActorOnDeath:
Actor: n3r1
Actor: rocket_mercenary

VENM:
Inherits: ^Helicopter
Expand Down
Loading

0 comments on commit 1b3749f

Please sign in to comment.