From 2c2424d10e4e973695e7543906e3f2641a110cad Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Tue, 26 Aug 2014 11:44:31 +0200 Subject: [PATCH 1/4] unit -> units to avoid crashes --- mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml | 10 +++++----- mods/ra/maps/drop-zone-w/map.yaml | 10 +++++----- mods/ra/maps/drop-zone/map.yaml | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml index 493f64159c..26c9812718 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml @@ -308,19 +308,19 @@ Rules: -GiveCashCrateAction: GiveUnitCrateAction@ttnk: SelectionShares: 4 - Unit: ttnk + Units: ttnk GiveUnitCrateAction@ftrk: SelectionShares: 6 - Unit: ftrk + Units: ftrk GiveUnitCrateAction@harv: SelectionShares: 1 - Unit: harv + Units: harv GiveUnitCrateAction@shok: SelectionShares: 1 - Unit: shok + Units: shok GiveUnitCrateAction@dog: SelectionShares: 1 - Unit: dog + Units: dog ^Infantry: GivesBounty: Percentage: 0 diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index c99546fa8a..0f17f51243 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -229,19 +229,19 @@ Rules: -GiveCashCrateAction: GiveUnitCrateAction@pt: SelectionShares: 7 - Unit: pt + Units: pt GiveUnitCrateAction@dd: SelectionShares: 6 - Unit: dd + Units: dd GiveUnitCrateAction@ca: SelectionShares: 4 - Unit: ca + Units: ca GiveUnitCrateAction@ss: SelectionShares: 6 - Unit: ss + Units: ss GiveUnitCrateAction@msub: SelectionShares: 4 - Unit: msub + Units: msub LST: Buildable: Queue: Ship diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml index a4c1196a5d..4ec9b9cb3e 100644 --- a/mods/ra/maps/drop-zone/map.yaml +++ b/mods/ra/maps/drop-zone/map.yaml @@ -203,19 +203,19 @@ Rules: -GiveCashCrateAction: GiveUnitCrateAction@ttnk: SelectionShares: 4 - Unit: ttnk + Units: ttnk GiveUnitCrateAction@ftrk: SelectionShares: 6 - Unit: ftrk + Units: ftrk GiveUnitCrateAction@harv: SelectionShares: 1 - Unit: harv + Units: harv GiveUnitCrateAction@shok: SelectionShares: 1 - Unit: shok + Units: shok GiveUnitCrateAction@dog: SelectionShares: 1 - Unit: dog + Units: dog ^Infantry: GivesBounty: Percentage: 0 From ed5648f87387dd8e868437584f42ffa3e8119b09 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Tue, 26 Aug 2014 12:28:14 +0200 Subject: [PATCH 2/4] Disabled wrong crateactions --- mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml | 3 +++ mods/ra/maps/drop-zone-w/map.yaml | 8 +++----- mods/ra/maps/drop-zone/map.yaml | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml index 26c9812718..6ed31d075f 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml @@ -306,6 +306,9 @@ Rules: -ExplodeCrateAction@fire: -SupportPowerCrateAction@parabombs: -GiveCashCrateAction: + -DuplicateUnitCrateAction: + -GiveUnitCrateAction@squadlight: + -GiveUnitCrateAction@squadheavysoviet: GiveUnitCrateAction@ttnk: SelectionShares: 4 Units: ttnk diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index 0f17f51243..87401f2144 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -214,12 +214,7 @@ Rules: -LevelUpCrateAction: -GiveMcvCrateAction: -GiveUnitCrateAction@jeep: - -GiveUnitCrateAction@arty: - -GiveUnitCrateAction@v2rl: -GiveUnitCrateAction@1tnk: - -GiveUnitCrateAction@2tnk: - -GiveUnitCrateAction@3tnk: - -GiveUnitCrateAction@4tnk: -RevealMapCrateAction: -HideMapCrateAction: -ExplodeCrateAction@nuke: @@ -227,6 +222,9 @@ Rules: -ExplodeCrateAction@fire: -SupportPowerCrateAction@parabombs: -GiveCashCrateAction: + -DuplicateUnitCrateAction: + -GiveUnitCrateAction@squadlight: + -GiveUnitCrateAction@squadheavyallies: GiveUnitCrateAction@pt: SelectionShares: 7 Units: pt diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml index 4ec9b9cb3e..f3cd1b0803 100644 --- a/mods/ra/maps/drop-zone/map.yaml +++ b/mods/ra/maps/drop-zone/map.yaml @@ -201,6 +201,9 @@ Rules: -ExplodeCrateAction@fire: -SupportPowerCrateAction@parabombs: -GiveCashCrateAction: + -DuplicateUnitCrateAction: + -GiveUnitCrateAction@squadlight: + -GiveUnitCrateAction@squadheavysoviet: GiveUnitCrateAction@ttnk: SelectionShares: 4 Units: ttnk From b5bdb734471037eed33468cc80d608bc02ce30ba Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Tue, 26 Aug 2014 12:33:15 +0200 Subject: [PATCH 3/4] Fixed crates spawning on inaccessable terrain --- mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml | 2 ++ mods/ra/maps/drop-zone-w/map.yaml | 2 ++ mods/ra/maps/drop-zone/map.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml index 6ed31d075f..532af90fb5 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml @@ -324,6 +324,8 @@ Rules: GiveUnitCrateAction@dog: SelectionShares: 1 Units: dog + Crate: + TerrainTypes: Clear, Road, Ore, Beach ^Infantry: GivesBounty: Percentage: 0 diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index 87401f2144..8ecacc6bda 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -240,6 +240,8 @@ Rules: GiveUnitCrateAction@msub: SelectionShares: 4 Units: msub + Crate: + TerrainTypes: Water LST: Buildable: Queue: Ship diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml index f3cd1b0803..a9750cfaf3 100644 --- a/mods/ra/maps/drop-zone/map.yaml +++ b/mods/ra/maps/drop-zone/map.yaml @@ -219,6 +219,8 @@ Rules: GiveUnitCrateAction@dog: SelectionShares: 1 Units: dog + Crate: + TerrainTypes: Clear, Road, Ore, Beach ^Infantry: GivesBounty: Percentage: 0 From 185079451831b795d35b2368a5103afd5270462d Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Tue, 26 Aug 2014 12:57:42 +0200 Subject: [PATCH 4/4] 'Cleaned away' some unused traits --- mods/ra/maps/drop-zone-w/map.yaml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index 8ecacc6bda..cd0a558e53 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -243,13 +243,8 @@ Rules: Crate: TerrainTypes: Water LST: - Buildable: - Queue: Ship - BuildPaletteOrder: 30 - Owner: allies Tooltip: Name: Naval Mobile HQ - Description: Naval mobile HQ.\n Protect it at all costs. Health: HP: 1000 Mobile: @@ -268,24 +263,14 @@ Rules: MustBeDestroyed: -GivesBounty: PT: - Buildable: - Owner: allies -GivesBounty: DD: - Buildable: - Owner: allies -GivesBounty: CA: - Buildable: - Owner: allies -GivesBounty: SS: - Buildable: - Owner: allies -GivesBounty: MSUB: - Buildable: - Owner: allies -GivesBounty: Sequences: