From 0442c790dac637ffd910edb5c3359a6ef296960e Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Mon, 6 Apr 2015 19:17:38 +1200 Subject: [PATCH 01/13] Rework Russia's abilities to be Tesla-themed --- mods/ra/maps/survival01/map.yaml | 1 - mods/ra/rules/infantry.yaml | 2 +- mods/ra/rules/structures.yaml | 15 --------------- mods/ra/rules/vehicles.yaml | 4 ++-- mods/ra/rules/world.yaml | 2 +- 5 files changed, 4 insertions(+), 20 deletions(-) diff --git a/mods/ra/maps/survival01/map.yaml b/mods/ra/maps/survival01/map.yaml index 19aea2974c..9498ddbe5a 100644 --- a/mods/ra/maps/survival01/map.yaml +++ b/mods/ra/maps/survival01/map.yaml @@ -1267,7 +1267,6 @@ Rules: Inherits: AFLD -AirstrikePower@spyplane: -ParatroopersPower@paratroopers: - -ParatroopersPower@armordrop: -AirstrikePower@parabombs: -SupportPowerChargeBar: RenderBuilding: diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 6fa3e1b41e..07c257071c 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -462,7 +462,7 @@ SHOK: Queue: Infantry BuildAtProductionType: Soldier BuildPaletteOrder: 130 - Prerequisites: ~barr, stek, tsla, ~techlevel.unrestricted + Prerequisites: ~barr, stek, tsla, ~infantry.russia, ~techlevel.unrestricted Valued: Cost: 400 Tooltip: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index e960f383d7..900bf96cdd 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -1141,21 +1141,6 @@ AFLD: CameraActor: camera.paradrop DisplayBeacon: true BeaconPoster: pinficon - ParatroopersPower@armordrop: - OrderName: RussiaArmorDrop - Prerequisites: aircraft.russia - Icon: armordrop - ChargeTime: 450 - Description: Armor Airdrop - LongDesc: Badgers drop a pair of\nHeavy Tanks anywhere on the map. - DropItems: 3TNK,3TNK - SquadSize: 2 - SelectTargetSound: slcttgt1.aud - AllowImpassableCells: false - QuantizedFacings: 8 - CameraActor: camera.paradrop - DisplayBeacon: true - BeaconPoster: armordropicon AirstrikePower@parabombs: OrderName: UkraineParabombs Prerequisites: aircraft.ukraine diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index d43db333be..07d661a39b 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -564,7 +564,7 @@ TTNK: Buildable: Queue: Vehicle BuildPaletteOrder: 180 - Prerequisites: tsla, stek, ~vehicles.soviet, ~techlevel.unrestricted + Prerequisites: tsla, stek, ~vehicles.russia, ~techlevel.unrestricted Valued: Cost: 1350 Tooltip: @@ -706,7 +706,7 @@ QTNK: Buildable: Queue: Vehicle BuildPaletteOrder: 200 - Prerequisites: fix, stek, ~vehicles.russia, ~techlevel.unrestricted + Prerequisites: fix, stek, ~vehicles.soviet, ~techlevel.unrestricted Valued: Cost: 2000 Tooltip: diff --git a/mods/ra/rules/world.yaml b/mods/ra/rules/world.yaml index 409f8062f5..276fecc346 100644 --- a/mods/ra/rules/world.yaml +++ b/mods/ra/rules/world.yaml @@ -120,7 +120,7 @@ World: Name: Russia Race: russia Side: Soviet - Description: Russia: Tanks\nSpecial Ability: Armor Airdrop\nSpecial Unit: MAD Tank + Description: Russia: Tesla Weapons\nSpecial Unit: Tesla Tank\nSpecial Unit: Shock Trooper Country@6: Name: Ukraine Race: ukraine From 461cf89676e53aef8830d98c26308286106aa53c Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Mon, 6 Apr 2015 21:57:47 +1200 Subject: [PATCH 02/13] Make paratroopers available to all Soviet factions --- mods/ra/rules/structures.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 900bf96cdd..b60a42fe9a 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -1129,7 +1129,7 @@ AFLD: BeaconPoster: camicon ParatroopersPower@paratroopers: OrderName: SovietParatroopers - Prerequisites: aircraft.sovietvanilla + Prerequisites: aircraft.soviet Icon: paratroopers ChargeTime: 360 Description: Paratroopers From 8e1960452b500407a28b1842117bd6911fb4bbcc Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Mon, 6 Apr 2015 22:01:14 +1200 Subject: [PATCH 03/13] Remove advanced gap generator --- mods/ra/rules/structures.yaml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index b60a42fe9a..5d16f69b27 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -56,7 +56,7 @@ GAP: Buildable: Queue: Defense BuildPaletteOrder: 110 - Prerequisites: atek, ~!structures.france, ~structures.allies, ~techlevel.unrestricted + Prerequisites: atek, ~structures.allies, ~techlevel.unrestricted Building: Footprint: _ x Dimensions: 1,2 @@ -81,19 +81,6 @@ GAP: MustBeDestroyed: RequiredForShortGame: false -GAP.France: - Inherits: GAP - RenderBuilding: - Image: gap - Tooltip: - Name: Advanced Gap Generator - Buildable: - Prerequisites: atek, ~structures.france, ~techlevel.unrestricted - RevealsShroud: - Range: 10c0 - CreatesShroud: - Range: 10c0 - SPEN: Inherits: ^Building InfiltrateForSupportPower: From 5653b3cbf38cebad9a5b87085092289b27664af9 Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Mon, 6 Apr 2015 22:03:39 +1200 Subject: [PATCH 04/13] Move fake structures to France --- mods/ra/rules/fakes.yaml | 14 +++++++------- mods/ra/rules/world.yaml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mods/ra/rules/fakes.yaml b/mods/ra/rules/fakes.yaml index d89b656c6b..7c422810bb 100644 --- a/mods/ra/rules/fakes.yaml +++ b/mods/ra/rules/fakes.yaml @@ -3,7 +3,7 @@ FACF: Buildable: BuildPaletteOrder: 940 Queue: Defense - Prerequisites: ~structures.alliesvanilla, ~techlevel.medium + Prerequisites: ~structures.france, ~techlevel.medium Tooltip: Icon: fake-icon Name: Fake Construction Yard @@ -24,7 +24,7 @@ WEAF: Inherits: ^FakeBuilding Buildable: BuildPaletteOrder: 920 - Prerequisites: ~structures.alliesvanilla, ~techlevel.medium + Prerequisites: ~structures.france, ~techlevel.medium Queue: Defense Tooltip: Icon: fake-icon @@ -48,7 +48,7 @@ SYRF: Buildable: BuildPaletteOrder: 900 Queue: Defense - Prerequisites: ~structures.alliesvanilla, ~techlevel.medium + Prerequisites: ~structures.france, ~techlevel.medium Tooltip: Icon: fake-icon Name: Fake Shipyard @@ -105,7 +105,7 @@ DOMF: Buildable: BuildPaletteOrder: 930 Queue: Defense - Prerequisites: ~structures.alliesvanilla, ~techlevel.medium + Prerequisites: ~structures.france, ~techlevel.medium Building: Footprint: xx xx Dimensions: 2,2 @@ -127,7 +127,7 @@ ATEF: Buildable: BuildPaletteOrder: 940 Queue: Defense - Prerequisites: ~structures.alliesvanilla, ~techlevel.unrestricted + Prerequisites: ~structures.france, ~techlevel.unrestricted Building: Footprint: xx xx Dimensions: 2,2 @@ -149,7 +149,7 @@ PDOF: Buildable: BuildPaletteOrder: 950 Queue: Defense - Prerequisites: ~structures.alliesvanilla, ~techlevel.unrestricted + Prerequisites: ~structures.france, ~techlevel.unrestricted Building: Footprint: xx xx Dimensions: 2,2 @@ -172,7 +172,7 @@ MSLF: Buildable: BuildPaletteOrder: 960 Queue: Defense - Prerequisites: ~structures.alliesvanilla, ~techlevel.unrestricted + Prerequisites: ~structures.france, ~techlevel.unrestricted Building: Footprint: xx Dimensions: 2,1 diff --git a/mods/ra/rules/world.yaml b/mods/ra/rules/world.yaml index 276fecc346..9b4f452d2d 100644 --- a/mods/ra/rules/world.yaml +++ b/mods/ra/rules/world.yaml @@ -95,7 +95,7 @@ World: Name: Allies Race: allies Side: Allies - Description: Allies: Deception\nSpecial Ability: Can build fake structures + Description: Allies: Deception Country@1: Name: England Race: england @@ -105,7 +105,7 @@ World: Name: France Race: france Side: Allies - Description: France: Concealment\nSpecial Structure: Advanced Gap Generator\nSpecial Unit: Mobile Gap Generator + Description: France: Deception\nSpecial Ability: Can build fake structures\nSpecial Unit: Mobile Gap Generator Country@3: Name: Germany Race: germany From f142fb4e099a757b4acf99bb7e65e8ad74a49484 Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Mon, 6 Apr 2015 22:09:05 +1200 Subject: [PATCH 05/13] Remove vanilla Allies and vanilla Soviet countries from multiplayer --- mods/ra/rules/world.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/ra/rules/world.yaml b/mods/ra/rules/world.yaml index 9b4f452d2d..3cee8d7cf9 100644 --- a/mods/ra/rules/world.yaml +++ b/mods/ra/rules/world.yaml @@ -95,7 +95,7 @@ World: Name: Allies Race: allies Side: Allies - Description: Allies: Deception + Selectable: False Country@1: Name: England Race: england @@ -115,7 +115,7 @@ World: Name: Soviet Race: soviet Side: Soviet - Description: Soviet: Infantry\nSpecial Ability: Paradrop + Selectable: False Country@5: Name: Russia Race: russia @@ -135,13 +135,13 @@ World: Country@randomallies: Name: Allied Race: RandomAllies - RandomRaceMembers: allies, england, france, germany + RandomRaceMembers: england, france, germany Side: Random Description: A random Allied country. Country@randomsoviet: Name: Soviet Race: RandomSoviet - RandomRaceMembers: soviet, russia, ukraine + RandomRaceMembers: russia, ukraine Side: Random Description: A random Soviet country. DomainIndex: From 540148038dc965baaecd8a433486a9ea9203d6a8 Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Mon, 6 Apr 2015 22:13:20 +1200 Subject: [PATCH 06/13] Increase Ukraine parabombs badger squad size to 3 --- mods/ra/rules/structures.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 5d16f69b27..27b3e32809 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -1134,7 +1134,7 @@ AFLD: Icon: parabombs ChargeTime: 270 Description: Parabombs - LongDesc: A Badger drops a load of parachuted\nbombs on your target. + LongDesc: A squad of Badgers drops parachuted\nbombs on your target. SelectTargetSound: slcttgt1.aud CameraActor: camera CameraRemoveDelay: 150 @@ -1142,6 +1142,7 @@ AFLD: QuantizedFacings: 8 DisplayBeacon: true BeaconPoster: pbmbicon + SquadSize: 3 ProductionBar: SupportPowerChargeBar: PrimaryBuilding: From 7aca8d426ba7f246d9b22dce6f2c2ca848592415 Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Mon, 6 Apr 2015 22:19:19 +1200 Subject: [PATCH 07/13] Increase parabombs support power charge time to 360 --- mods/ra/rules/structures.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 27b3e32809..df48eed600 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -1132,7 +1132,7 @@ AFLD: OrderName: UkraineParabombs Prerequisites: aircraft.ukraine Icon: parabombs - ChargeTime: 270 + ChargeTime: 360 Description: Parabombs LongDesc: A squad of Badgers drops parachuted\nbombs on your target. SelectTargetSound: slcttgt1.aud From 65aa4b369e8777b0719b80d7fdf805d0de759d6c Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Mon, 6 Apr 2015 23:11:08 +1200 Subject: [PATCH 08/13] Spread out parabombs badgers --- mods/ra/rules/structures.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index df48eed600..43125339a0 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -1143,6 +1143,7 @@ AFLD: DisplayBeacon: true BeaconPoster: pbmbicon SquadSize: 3 + SquadOffset: 1792,1792,0 ProductionBar: SupportPowerChargeBar: PrimaryBuilding: From 011433041d533be55c7c723af51a7f91ef17341b Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Mon, 6 Apr 2015 23:20:22 +1200 Subject: [PATCH 09/13] Rename 'Allied' to 'Allies' in faction selector --- mods/ra/rules/world.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra/rules/world.yaml b/mods/ra/rules/world.yaml index 3cee8d7cf9..b0743276f5 100644 --- a/mods/ra/rules/world.yaml +++ b/mods/ra/rules/world.yaml @@ -133,7 +133,7 @@ World: Side: Random Description: A random country. Country@randomallies: - Name: Allied + Name: Allies Race: RandomAllies RandomRaceMembers: england, france, germany Side: Random From 15c548c60adc4bbf9ecd861c67c2c38d43a30f8b Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Mon, 6 Apr 2015 23:34:25 +1200 Subject: [PATCH 10/13] Have build limit of 1 for pdof and mslf --- mods/ra/rules/fakes.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/ra/rules/fakes.yaml b/mods/ra/rules/fakes.yaml index 7c422810bb..9d39c1e6f3 100644 --- a/mods/ra/rules/fakes.yaml +++ b/mods/ra/rules/fakes.yaml @@ -150,6 +150,7 @@ PDOF: BuildPaletteOrder: 950 Queue: Defense Prerequisites: ~structures.france, ~techlevel.unrestricted + BuildLimit: 1 Building: Footprint: xx xx Dimensions: 2,2 @@ -173,6 +174,7 @@ MSLF: BuildPaletteOrder: 960 Queue: Defense Prerequisites: ~structures.france, ~techlevel.unrestricted + BuildLimit: 1 Building: Footprint: xx Dimensions: 2,1 From 99945e11544d46fa86285ed6219172bdbd52f40a Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Mon, 6 Apr 2015 23:35:15 +1200 Subject: [PATCH 11/13] Increase power requirement of mslo from 100 to 150 --- mods/ra/rules/structures.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 43125339a0..e09e8ddd90 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -42,7 +42,7 @@ MSLO: DisabledOverlay: SupportPowerChargeBar: Power: - Amount: -100 + Amount: -150 MustBeDestroyed: RequiredForShortGame: false From c2c661de8271c440e3da27526e2545323282f570 Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Tue, 7 Apr 2015 00:12:32 +1200 Subject: [PATCH 12/13] Decrease power requirement of tsla from 150 to 100 --- mods/ra/rules/structures.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index e09e8ddd90..143b4be212 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -397,7 +397,7 @@ TSLA: -AcceptsSupplies: DrawLineToTarget: Power: - Amount: -150 + Amount: -100 DetectCloaked: Range: 8 From ce88dc3112e74212554b28abf01dd722602d7052 Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Tue, 7 Apr 2015 00:17:10 +1200 Subject: [PATCH 13/13] Remove orphaned armor airdrop icon and sequences --- mods/ra/bits/armordropicon.shp | Bin 3160 -> 0 bytes mods/ra/sequences/misc.yaml | 4 ---- 2 files changed, 4 deletions(-) delete mode 100644 mods/ra/bits/armordropicon.shp diff --git a/mods/ra/bits/armordropicon.shp b/mods/ra/bits/armordropicon.shp deleted file mode 100644 index c8002e8f7e78d3494d3ccbde6c0320f9827f1512..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3160 zcmbtW&2png5O(gvj%4A$VO1{qkSoy(C^--<3W{rOLE+LXz>I7wx3IqNN2W-1h*?hx;J)uE2K6qa4F)0rq|AEep|JbBkFqGs zNIx+QAv`_3zJg%$qz0LzmL9-d5&>9%j_~PwmFGR_e@77hDZE#W_@|WjAw2*MB#a0$ zKmk?+XFR!w4GO~j3~^6M%6cf!&#%9UaQaKQh7ek1s6b{|ge$)D0a!QmSO z5%~w2@fxYugf9jTQlOA6A!_n9hyYIYfc1Tr<-p4fD@jf(Ikmxn?hx8t>UDv z%ChR>^?J89*T4=DfnfW`*PEN2G48x=8p|YB;_LTI2y^1h++}KZ{;rE*>vdUh_(h3Y z5YiaatW0ez<2rV03_@92u|Gt^$=78&Uo6c!>7c~FtFMRjfdtWwIY1Fr=X>YeZcMXm zyvj2vG#8iv3SJjg+PH1!*cWbWN~lK)(4r;}AZXmUK;>qc5f@I|x~ryXU1K$utNY6o zBt_{ZYb37o{X5?@d8SaGlv|XYq7cNYPMf#@L-{gu&fC_pkg{a8Y)oAz@y_>wt`L8< zuIi7`P#-z1Y0NP;l&t_}X?ectv%Y?rzbp`ksW2Zqvr5y{BykeQRky3wNHt~#YXc2y z;4Mv+&V06TQ!A#d_{K|Mo(GQdu1XP4W2(yQ5-;}S7*Nb{1Ol#1PGaKU?!3fGTRZkE zzq~C6#k)B6D*vwX5kc*CP3n~uW~eH7(~8Ez3PU05+9Y-C)ip9fiqo`NE|;$5d0s*v z!2C_KHKm34}F4 z?uZ2;Q0!qC=|Fc`P7L(8p@fAYkz8Q|!F13QClO17FNIh!8LBAg^=%&I`2PfAT!0b* zaWKhi2rwO=7@`dYXHdqQFH~zKw*W<0avjbD1c2?0jxHFtL^4=Fco4wV7CR?i=6JQt zwg`#;e-K|DZ52WYhu4V%Fcw5KVJ76KPn;*6X&oU9jWZS@>5f(lhB8g>kzCD6$SZxB z121A0pmV!bTf`z2P2mA@WEbHiLHu}c5RZQvWI3QjsiLjM|A7nyvIu03P-PYtU%%e` zx`Tc0KEr<595=_~!^3g&@UYobkB?7J*dh-qg9Bs^^MpAQ@_5`q2)uzCLlP13P0dWFjorr zM@s|G?(iEwU~C#b_1qK$@XQWb$kns#;N_WI;fDLzaU1x5 iCg-g6%c%I22n-{bFL(iD&oJ>}*mh2Baq9iYPV_ej6v3VV diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml index 9a28b9fa15..81d364686e 100644 --- a/mods/ra/sequences/misc.yaml +++ b/mods/ra/sequences/misc.yaml @@ -114,9 +114,6 @@ beacon: pinficon: lores-pinficon Length: * Offset: 0,-42 - armordropicon: lores-pinficon - Length: * - Offset: 0,-42 clock: beaconclock Length: * Offset: 0,-42 @@ -426,7 +423,6 @@ icon: chrono: warpicon spyplane: smigicon paratroopers: pinficon - armordrop: armordropicon gps: gpssicon parabombs: pbmbicon sonar: sonricon