Skip to content

Commit

Permalink
group unit yamls and sort out veterancy duplicates
Browse files Browse the repository at this point in the history
  • Loading branch information
SoScared committed Nov 20, 2018
1 parent b65f2bb commit d43dd54
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 106 deletions.
9 changes: 5 additions & 4 deletions mods/ura/mod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,20 @@ Rules:
ura|rules/ai/ai-easy.yaml
ura|rules/ai/ai-unknown.yaml
ura|rules/ai/player-bonuses-ai.yaml
ura|rules/aircraft.yaml
ura|rules/units/aircraft.yaml
ura|rules/units/infantry.yaml
ura|rules/units/ships.yaml
ura|rules/units/vehicles.yaml
ura|rules/units/veterancy.yaml
ura|rules/civilian.yaml
ura|rules/decoration.yaml
ura|rules/defaults.yaml
ura|rules/fakes.yaml
ura|rules/husks.yaml
ura|rules/infantry.yaml
ura|rules/palettes.yaml
ura|rules/player.yaml
ura|rules/ships.yaml
ura|rules/structures.yaml
ura|rules/upgrades.yaml
ura|rules/vehicles.yaml
ura|rules/world.yaml

Sequences:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,6 @@ E1:
ProducibleWithLevel:
Prerequisites: barracks.upgraded

E1.Rank1:
Inherits: E1
-Buildable:
ProducibleWithLevel:
Prerequisites: techlevel.infonly
RenderSprites:
Image: E1

E2:
Inherits: ^Soldier
Inherits@AUTOTARGET: ^AutoTargetGround
Expand Down Expand Up @@ -207,14 +199,6 @@ E3:
ProducibleWithLevel:
Prerequisites: barracks.upgraded

E3.Rank1:
Inherits: E3
-Buildable:
ProducibleWithLevel:
Prerequisites: techlevel.infonly
RenderSprites:
Image: E3

E4:
Inherits: ^Soldier
Inherits@AUTOTARGET: ^AutoTargetGround
Expand Down Expand Up @@ -391,16 +375,6 @@ SPY.England:
ProducibleWithLevel:
Prerequisites: techlevel.infonly

SPY.England.rank2:
Inherits: SPY.England
Buildable:
Prerequisites: ~infantry.england, dome, ~tent, ~mediumdome.upgraded
RenderSprites:
Image: spy.england.rank2
ProducibleWithLevel:
Prerequisites: ~techlevel.medium
InitialLevels: 2

MEDI:
Inherits: ^Soldier
Tooltip:
Expand Down Expand Up @@ -815,14 +789,6 @@ SNIPER:
ProducibleWithLevel:
Prerequisites: techlevel.infonly, ~radardome.upgraded

SNIPER.Rank1:
Inherits: SNIPER
-Buildable:
ProducibleWithLevel:
Prerequisites: techlevel.infonly
RenderSprites:
Image: SNIPER

EINSTEIN:
Inherits: ^CivInfantry
Tooltip:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -194,30 +194,6 @@ TRUK:
ProducibleWithLevel:
Prerequisites: warfactory.upgraded

1TNK.rank2:
Inherits: 1TNK
Buildable:
Prerequisites: ~vehicles.allies, ~techlevel.low, ~mediumfix.upgraded, ~!highfix.upgraded
RenderSprites:
Image: 1tnk.rank2
SpawnActorOnDeath:
Actor: 1TNK.rank2.Husk
ProducibleWithLevel:
Prerequisites: ~techlevel.low
InitialLevels: 2

1TNK.rank3:
Inherits: 1TNK
Buildable:
Prerequisites: ~vehicles.allies, ~techlevel.low, ~highfix.upgraded
RenderSprites:
Image: 1tnk.rank3
SpawnActorOnDeath:
Actor: 1TNK.rank3.Husk
ProducibleWithLevel:
Prerequisites: ~techlevel.low
InitialLevels: 3

2TNK:
Inherits: ^TrackedVehicle
Inherits@GAINSEXPERIENCE: ^GainsDoubleExperience
Expand Down Expand Up @@ -283,18 +259,6 @@ TRUK:
ProducibleWithLevel:
Prerequisites: warfactory.upgraded, servicedepot.upgraded

2TNK.rank2:
Inherits: 2TNK
Buildable:
Prerequisites: fix, ~vehicles.allies, ~!vehicles.germany, ~techlevel.medium, ~highfix.upgraded
RenderSprites:
Image: 2tnk.rank2
SpawnActorOnDeath:
Actor: 2TNK.rank2.Husk
ProducibleWithLevel:
Prerequisites: ~techlevel.medium
InitialLevels: 2

2TNK.Ger:
Inherits: 2TNK
Buildable:
Expand All @@ -317,18 +281,6 @@ TRUK:
SpawnActorOnDeath:
Actor: 2TNK.Ger.Husk

2TNK.Ger.rank2:
Inherits: 2TNK.Ger
Buildable:
Prerequisites: fix, ~vehicles.germany, ~techlevel.medium, ~highfix.upgraded
RenderSprites:
Image: 2tnk.ger.rank2
SpawnActorOnDeath:
Actor: 2TNK.Ger.rank2.Husk
ProducibleWithLevel:
Prerequisites: ~techlevel.medium
InitialLevels: 2

3TNK:
Inherits: ^TrackedVehicle
Inherits@GAINSEXPERIENCE: ^GainsDoubleExperience
Expand Down Expand Up @@ -788,26 +740,6 @@ JEEP:
InvalidTargets: NoAutoTarget
RequiresCondition: ifv-sniper || ifv-tanya

JEEP.2rank:
Inherits: JEEP
Buildable:
Prerequisites: ~vehicles.allies, ~techlevel.low, ~mediumfix.upgraded, ~!highfix.upgraded
RenderSprites:
Image: jeep.2rank
ProducibleWithLevel:
Prerequisites: ~techlevel.low
InitialLevels: 2

JEEP.3rank:
Inherits: JEEP
Buildable:
Prerequisites: ~vehicles.allies, ~techlevel.low, ~highfix.upgraded
RenderSprites:
Image: jeep.3rank
ProducibleWithLevel:
Prerequisites: ~techlevel.low
InitialLevels: 3

FTRK:
Inherits: ^Vehicle
Inherits@GAINSEXPERIENCE: ^GainsExperience
Expand Down
105 changes: 105 additions & 0 deletions mods/ura/rules/units/veterancy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
# Infantry

E1.Rank1:
Inherits: E1
-Buildable:
ProducibleWithLevel:
Prerequisites: techlevel.infonly
RenderSprites:
Image: E1

E3.Rank1:
Inherits: E3
-Buildable:
ProducibleWithLevel:
Prerequisites: techlevel.infonly
RenderSprites:
Image: E3

SPY.England.rank2:
Inherits: SPY.England
Buildable:
Prerequisites: ~infantry.england, dome, ~tent, ~mediumdome.upgraded
RenderSprites:
Image: spy.england.rank2
ProducibleWithLevel:
Prerequisites: ~techlevel.medium
InitialLevels: 2

SNIPER.Rank1:
Inherits: SNIPER
-Buildable:
ProducibleWithLevel:
Prerequisites: techlevel.infonly
RenderSprites:
Image: SNIPER

# Vehicles

1TNK.rank2:
Inherits: 1TNK
Buildable:
Prerequisites: ~vehicles.allies, ~techlevel.low, ~mediumfix.upgraded, ~!highfix.upgraded
RenderSprites:
Image: 1tnk.rank2
SpawnActorOnDeath:
Actor: 1TNK.rank2.Husk
ProducibleWithLevel:
Prerequisites: ~techlevel.low
InitialLevels: 2

1TNK.rank3:
Inherits: 1TNK
Buildable:
Prerequisites: ~vehicles.allies, ~techlevel.low, ~highfix.upgraded
RenderSprites:
Image: 1tnk.rank3
SpawnActorOnDeath:
Actor: 1TNK.rank3.Husk
ProducibleWithLevel:
Prerequisites: ~techlevel.low
InitialLevels: 3

2TNK.rank2:
Inherits: 2TNK
Buildable:
Prerequisites: fix, ~vehicles.allies, ~!vehicles.germany, ~techlevel.medium, ~highfix.upgraded
RenderSprites:
Image: 2tnk.rank2
SpawnActorOnDeath:
Actor: 2TNK.rank2.Husk
ProducibleWithLevel:
Prerequisites: ~techlevel.medium
InitialLevels: 2

2TNK.Ger.rank2:
Inherits: 2TNK.Ger
Buildable:
Prerequisites: fix, ~vehicles.germany, ~techlevel.medium, ~highfix.upgraded
RenderSprites:
Image: 2tnk.ger.rank2
SpawnActorOnDeath:
Actor: 2TNK.Ger.rank2.Husk
ProducibleWithLevel:
Prerequisites: ~techlevel.medium
InitialLevels: 2

JEEP.2rank:
Inherits: JEEP
Buildable:
Prerequisites: ~vehicles.allies, ~techlevel.low, ~mediumfix.upgraded, ~!highfix.upgraded
RenderSprites:
Image: jeep.2rank
ProducibleWithLevel:
Prerequisites: ~techlevel.low
InitialLevels: 2

JEEP.3rank:
Inherits: JEEP
Buildable:
Prerequisites: ~vehicles.allies, ~techlevel.low, ~highfix.upgraded
RenderSprites:
Image: jeep.3rank
ProducibleWithLevel:
Prerequisites: ~techlevel.low
InitialLevels: 3

0 comments on commit d43dd54

Please sign in to comment.