diff --git a/changelog.txt b/changelog.txt index 72ed501..951d4e3 100644 --- a/changelog.txt +++ b/changelog.txt @@ -17,6 +17,8 @@ https://github.com/OpenRA/OpenRA/commit/91097078da479c83a004e9604cdf4b5b3f71c1ba 4* Add FlyCircleOnIdle trait: https://github.com/OpenRA/OpenRA/commit/ca5c83a4f73cafb6f760da5c4eddf9c0f3093c83 https://github.com/RAunplugged/OpenRA/commit/bb25ddbae1669152a8651888d3a08c4216a89585 +* Add map selector refresh button: +https://github.com/OpenRA/OpenRA/pull/13009/commits/b91b023291ebff8af2b64cfbc60e3b8d22e0c52c 5* Alter lobby dropdown heights: https://github.com/RAunplugged/OpenRA/commit/7a58ed9a610a495055ecf77fcf057e3721f918c4 https://github.com/RAunplugged/OpenRA/commit/9e8da77364956f6da3914aadf568017633010a4a diff --git a/mods/ura/bits/e1.rank2.shp b/mods/ura/bits/e1.rank2.shp new file mode 100644 index 0000000..706c7fa Binary files /dev/null and b/mods/ura/bits/e1.rank2.shp differ diff --git a/mods/ura/bits/e1.rank2icon.shp b/mods/ura/bits/e1.rank2icon.shp new file mode 100644 index 0000000..ed9d1a3 Binary files /dev/null and b/mods/ura/bits/e1.rank2icon.shp differ diff --git a/mods/ura/bits/e3.rank2.shp b/mods/ura/bits/e3.rank2.shp new file mode 100644 index 0000000..0056cc1 Binary files /dev/null and b/mods/ura/bits/e3.rank2.shp differ diff --git a/mods/ura/bits/e3.rank2icon.shp b/mods/ura/bits/e3.rank2icon.shp new file mode 100644 index 0000000..ac93b23 Binary files /dev/null and b/mods/ura/bits/e3.rank2icon.shp differ diff --git a/mods/ura/bits/infspeed1.shp b/mods/ura/bits/infspeed1.shp new file mode 100644 index 0000000..2a59257 Binary files /dev/null and b/mods/ura/bits/infspeed1.shp differ diff --git a/mods/ura/bits/infspeed2.shp b/mods/ura/bits/infspeed2.shp new file mode 100644 index 0000000..6a09ba2 Binary files /dev/null and b/mods/ura/bits/infspeed2.shp differ diff --git a/mods/ura/mod.yaml b/mods/ura/mod.yaml index d25ef17..725e20a 100644 --- a/mods/ura/mod.yaml +++ b/mods/ura/mod.yaml @@ -76,6 +76,7 @@ Sequences: ura|sequences/aircraft.yaml ura|sequences/misc.yaml ura|sequences/decorations.yaml + ura|sequences/upgrades.yaml TileSets: ura|tilesets/snow.yaml diff --git a/mods/ura/rules/structures.yaml b/mods/ura/rules/structures.yaml index e655a2b..b015d1f 100644 --- a/mods/ura/rules/structures.yaml +++ b/mods/ura/rules/structures.yaml @@ -27,7 +27,7 @@ FACT: Range: 16c0 PauseOnCondition: being-captured Production: - Produces: Building, Defense + Produces: Building, Defense, Upgrade ProductionBar@Building: ProductionType: Building ProductionBar@Defense: @@ -44,6 +44,7 @@ FACT: Facing: 96 RequiresCondition: factundeploy && !build-incomplete PauseOnCondition: being-captured || being-demolished + Exit: RevealsShroud: Range: 6c256 RevealGeneratedShroud: False diff --git a/mods/ura/rules/units/infantry.yaml b/mods/ura/rules/units/infantry.yaml index 1defda0..cc83bfe 100644 --- a/mods/ura/rules/units/infantry.yaml +++ b/mods/ura/rules/units/infantry.yaml @@ -66,7 +66,7 @@ E1: Queue: Infantry BuildAtProductionType: Soldier BuildPaletteOrder: 10 - Prerequisites: ~barracks, ~techlevel.infonly + Prerequisites: ~barracks, ~techlevel.infonly, ~!barracks.upgraded2 Description: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles, Aircraft Armament@PRIMARY: Weapon: M1Carbine @@ -162,7 +162,7 @@ E3: Queue: Infantry BuildAtProductionType: Soldier BuildPaletteOrder: 30 - Prerequisites: ~barracks, ~techlevel.infonly + Prerequisites: ~barracks, ~techlevel.infonly, ~!barracks.upgraded2 Description: Anti-tank/Anti-aircraft infantry.\n Strong vs Vehicles, Aircraft\n Weak vs Infantry Armament@PRIMARY: Weapon: RedEye @@ -244,7 +244,7 @@ E4: StandSequences: parachute RequiresCondition: parachute ProducibleWithLevel: - Prerequisites: barracks.upgraded, radardome.upgraded + Prerequisites: barracks.upgraded E6: Inherits: ^Soldier @@ -351,7 +351,7 @@ SPY: ZOffset: 256 RequiresCondition: disguise ProducibleWithLevel: - Prerequisites: barracks.upgraded, radardome.upgraded + Prerequisites: radardome.upgraded SPY.England: Inherits: SPY @@ -360,7 +360,7 @@ SPY.England: Health: HP: 50 Buildable: - Prerequisites: ~infantry.england, dome, ~tent, ~!mediumdome.upgraded + Prerequisites: ~infantry.england, dome, ~tent, ~!radardome.upgraded RevealsShroud: Range: 8c0 RevealGeneratedShroud: False @@ -414,8 +414,6 @@ MEDI: DefaultAttackSequence: heal Voiced: VoiceSet: MedicVoice - ProducibleWithLevel: - Prerequisites: barracks.upgraded MECH: Inherits: ^Soldier @@ -459,8 +457,6 @@ MECH: StandSequences: stand Voiced: VoiceSet: MechanicVoice - ProducibleWithLevel: - Prerequisites: barracks.upgraded HIJACKER: Inherits: ^Soldier @@ -568,7 +564,7 @@ SHOK: StandSequences: parachute RequiresCondition: parachute ProducibleWithLevel: - Prerequisites: barracks.upgraded, radardome.upgraded + Prerequisites: barracks.upgraded #Tanya Swim properties and sequences by SirCake E7: @@ -641,7 +637,7 @@ E7: Voice: Build AnnounceOnKill: ProducibleWithLevel: - Prerequisites: barracks.upgraded, radardome.upgraded + Prerequisites: techcenter.upgraded # Modified version of the Grenade Launcher by Kiraye E9: @@ -687,7 +683,7 @@ E9: StandSequences: parachute RequiresCondition: parachute ProducibleWithLevel: - Prerequisites: techlevel.infonly, ~radardome.upgraded + Prerequisites: techlevel.infonly # Modified version of the Machine Gunner by Kiraye E10: @@ -726,7 +722,7 @@ E10: StandSequences: parachute RequiresCondition: parachute ProducibleWithLevel: - Prerequisites: techlevel.infonly, ~radardome.upgraded + Prerequisites: techlevel.infonly SNIPER: Inherits: ^Soldier @@ -787,7 +783,7 @@ SNIPER: StandSequences: parachute RequiresCondition: parachute ProducibleWithLevel: - Prerequisites: techlevel.infonly, ~radardome.upgraded + Prerequisites: techlevel.infonly EINSTEIN: Inherits: ^CivInfantry @@ -894,6 +890,7 @@ Zombie: VoiceSet: AntVoice ProducibleWithLevel: Prerequisites: barracks.upgraded, biolab.upgraded + InitialLevels: 4 Ant: Inherits: ^Infantry @@ -938,3 +935,4 @@ Ant: VoiceSet: AntVoice ProducibleWithLevel: Prerequisites: barracks.upgraded, biolab.upgraded + InitialLevels: 4 diff --git a/mods/ura/rules/units/veterancy.yaml b/mods/ura/rules/units/veterancy.yaml index aa292ea..873c239 100644 --- a/mods/ura/rules/units/veterancy.yaml +++ b/mods/ura/rules/units/veterancy.yaml @@ -8,6 +8,16 @@ E1.Rank1: RenderSprites: Image: E1 +E1.Rank2: + Inherits: E1 + Buildable: + Prerequisites: ~barracks, ~techlevel.infonly, ~barracks.upgraded2 + ProducibleWithLevel: + Prerequisites: techlevel.infonly + InitialLevels: 2 + RenderSprites: + Image: E1.Rank2 + E3.Rank1: Inherits: E3 -Buildable: @@ -16,10 +26,20 @@ E3.Rank1: RenderSprites: Image: E3 +E3.Rank2: + Inherits: E3 + Buildable: + Prerequisites: ~barracks, ~techlevel.infonly, ~barracks.upgraded2 + ProducibleWithLevel: + Prerequisites: techlevel.infonly + InitialLevels: 2 + RenderSprites: + Image: E3.Rank2 + SPY.England.rank2: Inherits: SPY.England Buildable: - Prerequisites: ~infantry.england, dome, ~tent, ~mediumdome.upgraded + Prerequisites: ~infantry.england, dome, ~tent, ~radardome.upgraded RenderSprites: Image: spy.england.rank2 ProducibleWithLevel: diff --git a/mods/ura/rules/upgrades.yaml b/mods/ura/rules/upgrades.yaml index 57b5440..be19060 100644 --- a/mods/ura/rules/upgrades.yaml +++ b/mods/ura/rules/upgrades.yaml @@ -1,8 +1,51 @@ +^UpgradeActor: + AlwaysVisible: + Interactable: + ScriptTriggers: + ProvidesPrerequisite@upgradename: + +# Upgrades + +upgrade.infrank1: + Inherits: ^UpgradeActor + Tooltip: + Name: Infantry Veterancy I + Buildable: + BuildPaletteOrder: 10 + Prerequisites: ~barracks, ~techlevel.infonly, ~!upgrade.infrank1, ~!barracks.upgraded + Queue: Upgrade + Description: Enables Veterancy I\ninfantry production. + Valued: + Cost: 1000 + RenderSprites: + Image: infspeed1 + ProvidesPrerequisite@default: + Prerequisite: barracks.upgraded + +upgrade.infrank2: + Inherits: ^UpgradeActor + Tooltip: + Name: Infantry Veterancy II + Buildable: + BuildPaletteOrder: 20 + Prerequisites: ~barracks, dome, ~techlevel.medium, upgrade.infrank1, ~!upgrade.infrank2, ~!barracks.upgraded2 + Queue: Upgrade + Description: Enables Veterancy II\ninfantry production. + Valued: + Cost: 1500 + RenderSprites: + Image: infspeed2 + ProvidesPrerequisite@default: + Prerequisite: barracks.upgraded2 + # Infiltration Tech Tree barracks.upgraded: AlwaysVisible: ProvidesPrerequisite: + ProvidesPrerequisite@secondupgrade: + RequiresPrerequisites: barracks.upgraded, techcenter.upgraded + Prerequisite: barracks.upgraded2 ProvidesPrerequisite@MEDIUMDOME: RequiresPrerequisites: radardome.upgraded Prerequisite: mediumdome.upgraded diff --git a/mods/ura/sequences/infantry.yaml b/mods/ura/sequences/infantry.yaml index f64f37d..9d81203 100644 --- a/mods/ura/sequences/infantry.yaml +++ b/mods/ura/sequences/infantry.yaml @@ -82,6 +82,90 @@ e1: Facings: 8 icon: e1icon +e1.rank2: + stand: + Facings: 8 + stand2: + Start: 8 + Facings: 8 + run: + Start: 16 + Length: 6 + Facings: 8 + Tick: 100 + shoot: + Start: 64 + Length: 8 + Facings: 8 + prone-stand: + Start: 144 + Stride: 4 + Facings: 8 + prone-stand2: + Start: 144 + Stride: 4 + Facings: 8 + prone-run: + Start: 144 + Length: 4 + Facings: 8 + Tick: 100 + liedown: + Start: 128 + Length: 2 + Facings: 8 + standup: + Start: 176 + Length: 2 + Facings: 8 + prone-shoot: + Start: 192 + Length: 8 + Facings: 8 + parachute: + Start: 377 + idle1: + Start: 256 + Length: 16 + Tick: 120 + idle2: + Start: 272 + Length: 16 + Tick: 120 + die1: + Start: 288 + Length: 8 + die2: + Start: 296 + Length: 8 + die3: + Start: 304 + Length: 8 + die4: + Start: 312 + Length: 12 + die5: + Start: 324 + Length: 18 + die6: electro + Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + die-crushed: corpse1 + Length: * + Tick: 1600 + ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + garrison-muzzle: minigun + Length: 6 + Facings: 8 + icon: e1.rank2icon + sniper: stand: Facings: 8 @@ -240,6 +324,79 @@ e3: Facings: 8 icon: e3icon +e3.rank2: + stand: + Facings: 8 + stand2: + Start: 8 + Facings: 8 + run: + Start: 16 + Length: 6 + Facings: 8 + Tick: 120 + shoot: + Start: 64 + Length: 8 + Facings: 8 + parachute: + Start: 393 + idle1: + Start: 272 + Length: 14 + Tick: 120 + idle2: + Start: 287 + Length: 16 + Tick: 120 + die1: + Start: 304 + Length: 8 + die2: + Start: 312 + Length: 8 + die3: + Start: 320 + Length: 8 + die4: + Start: 328 + Length: 12 + die5: + Start: 340 + Length: 18 + die6: electro + Length: * + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + die-crushed: corpse1 + Length: 6 + Tick: 1600 + ZOffset: -511 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + prone-stand: + Start: 144 + Stride: 4 + Facings: 8 + prone-stand2: + Start: 144 + Stride: 4 + Facings: 8 + prone-run: + Start: 144 + Length: 4 + Facings: 8 + Tick: 120 + prone-shoot: + Start: 192 + Length: 10 + Facings: 8 + icon: e3.rank2icon + e6: stand: Facings: 8 diff --git a/mods/ura/sequences/upgrades.yaml b/mods/ura/sequences/upgrades.yaml new file mode 100644 index 0000000..c0558f7 --- /dev/null +++ b/mods/ura/sequences/upgrades.yaml @@ -0,0 +1,4 @@ +infspeed1: + icon: infspeed1 +infspeed2: + icon: infspeed2 diff --git a/mods/ura/sequences/veterancy.yaml b/mods/ura/sequences/veterancy.yaml new file mode 100644 index 0000000..e69de29 diff --git a/mods/ura/uibits/chrome.png b/mods/ura/uibits/chrome.png index ee948a3..bd278ff 100644 Binary files a/mods/ura/uibits/chrome.png and b/mods/ura/uibits/chrome.png differ