From 1e3804b729d0ae3a0e2e39300c17507afb0e3a61 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 21 Aug 2014 13:05:14 +0200 Subject: [PATCH 1/6] unit -> units to avoid crashes --- mods/ra/maps/fort-lonestar/map.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index bbe725fa56..67b0571cb5 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -510,7 +510,7 @@ Rules: UseCashTick: yes SelectionShares: 30 GiveUnitCrateAction@e7: - Unit: e7 + Units: e7 SelectionShares: 10 Player: PlayerResources: From adcfdbd3919395b91db92d485ab8251b5587e042 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 21 Aug 2014 13:15:22 +0200 Subject: [PATCH 2/6] added ftur and removed hbox --- mods/ra/maps/fort-lonestar/map.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index 67b0571cb5..729ce1d55c 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -553,6 +553,8 @@ Rules: Power: Amount: 0 FTUR: + Buildable: + Prerequisites: barr,oilb Valued: Cost: 400 Power: @@ -569,8 +571,8 @@ Rules: Power: Amount: 0 HBOX: - Power: - Amount: 0 + Buildable: + Prerequisites: ~disabled GUN: Buildable: Prerequisites: ~disabled From 2e431bb95b0570eb3a9e9b21b2d91897024d4349 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 21 Aug 2014 13:37:47 +0200 Subject: [PATCH 3/6] removed unused buildable: owner: ... --- mods/ra/maps/fort-lonestar/map.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index 729ce1d55c..8a66062b56 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -541,8 +541,6 @@ Rules: Period: 250 Amount: 50 BARR: - Buildable: - Owner: allies,soviet Health: HP: 1000 Production: @@ -605,19 +603,16 @@ Rules: Prerequisites: ~disabled DOG: Buildable: - Owner: soviet,allies Prerequisites: barr,oilb Valued: Cost: 20 E1: Buildable: - Owner: soviet,allies Prerequisites: barr,oilb Valued: Cost: 20 E2: Buildable: - Owner: soviet,allies Prerequisites: barr,oilb Valued: Cost: 40 @@ -626,25 +621,21 @@ Rules: Chance: 20 E3: Buildable: - Owner: soviet,allies Prerequisites: barr,oilb Valued: Cost: 60 E4: Buildable: - Owner: soviet,allies Prerequisites: barr,oilb Valued: Cost: 100 E6: Buildable: - Owner: soviet,allies Prerequisites: barr Valued: Cost: 100 E7: Buildable: - Owner: soviet,allies Prerequisites: barr,oilb Valued: Cost: 750 @@ -663,13 +654,11 @@ Rules: Prerequisites: ~disabled MEDI: Buildable: - Owner: soviet,allies Prerequisites: barr,oilb Valued: Cost: 100 SHOK: Buildable: - Owner: soviet,allies Prerequisites: barr,oilb Valued: Cost: 150 @@ -677,7 +666,6 @@ Rules: Valued: Cost: 200 Buildable: - Owner: soviet, allies Prerequisites: barr,oilb Health: HP: 200 @@ -690,7 +678,6 @@ Rules: Queue: Infantry BuildPaletteOrder: 60 Prerequisites: barr,oilb - Owner: allies, soviet Valued: Cost: 300 ARTY: From 9a87a7cd1062c60ddff62b56c952a870cb428d0f Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 21 Aug 2014 13:59:52 +0200 Subject: [PATCH 4/6] moved mediamessage to avoid spam --- mods/ra/maps/fort-lonestar/fort-lonestar.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ra/maps/fort-lonestar/fort-lonestar.lua b/mods/ra/maps/fort-lonestar/fort-lonestar.lua index 20ba6e915b..d75e196207 100644 --- a/mods/ra/maps/fort-lonestar/fort-lonestar.lua +++ b/mods/ra/maps/fort-lonestar/fort-lonestar.lua @@ -130,8 +130,6 @@ SendWave = function() local units = wave[3] local target = Utils.Random(wave[4]).Location - Media.DisplayMessage("Defend Fort Lonestar at all costs!") - print(string.format("Sending wave %i in %i.", Wave, delay)) Trigger.AfterDelay(delay, function() SendUnits(entry, units, 40, target) end) end @@ -153,5 +151,7 @@ WorldLoaded = function() end end) + Media.DisplayMessage("Defend Fort Lonestar at all costs!") + SendWave() end From 911f79e86f679a3ff421a1029c3cc065bab2d606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 30 Aug 2014 17:52:35 +0200 Subject: [PATCH 5/6] fix production queues and prerequisites --- mods/ra/maps/fort-lonestar/map.yaml | 36 +++++++++++------------------ 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index 8a66062b56..1e4a40cce2 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -515,14 +515,6 @@ Rules: Player: PlayerResources: InitialCash: 50 - ClassicProductionQueue@Infantry: - Type: Infantry - BuildSpeed: 1 - LowPowerSlowdown: 3 - ClassicProductionQueue@Defense: - Type: Defense - BuildSpeed: .4 - LowPowerSlowdown: 3 ^Infantry: MustBeDestroyed: ^Vehicle: @@ -544,7 +536,7 @@ Rules: Health: HP: 1000 Production: - Produces: Defense,Infantry + Produces: Defense, Infantry, Soldier -Sellable: BaseProvider: Range: 12 @@ -552,14 +544,14 @@ Rules: Amount: 0 FTUR: Buildable: - Prerequisites: barr,oilb + Prerequisites: barracks Valued: Cost: 400 Power: Amount: 0 PBOX: Buildable: - Prerequisites: barr,oilb + Prerequisites: barracks Valued: Cost: 400 Health: @@ -603,17 +595,17 @@ Rules: Prerequisites: ~disabled DOG: Buildable: - Prerequisites: barr,oilb + Prerequisites: barracks Valued: Cost: 20 E1: Buildable: - Prerequisites: barr,oilb + Prerequisites: barracks Valued: Cost: 20 E2: Buildable: - Prerequisites: barr,oilb + Prerequisites: barracks Valued: Cost: 40 Explodes: @@ -621,22 +613,22 @@ Rules: Chance: 20 E3: Buildable: - Prerequisites: barr,oilb + Prerequisites: barracks Valued: Cost: 60 E4: Buildable: - Prerequisites: barr,oilb + Prerequisites: barracks Valued: Cost: 100 E6: Buildable: - Prerequisites: barr + Prerequisites: barracks Valued: Cost: 100 E7: Buildable: - Prerequisites: barr,oilb + Prerequisites: barracks Valued: Cost: 750 3TNK: @@ -654,19 +646,19 @@ Rules: Prerequisites: ~disabled MEDI: Buildable: - Prerequisites: barr,oilb + Prerequisites: barracks Valued: Cost: 100 SHOK: Buildable: - Prerequisites: barr,oilb + Prerequisites: barracks Valued: Cost: 150 SNIPER: Valued: Cost: 200 Buildable: - Prerequisites: barr,oilb + Prerequisites: barracks Health: HP: 200 AutoTarget: @@ -677,7 +669,7 @@ Rules: Buildable: Queue: Infantry BuildPaletteOrder: 60 - Prerequisites: barr,oilb + Prerequisites: barracks Valued: Cost: 300 ARTY: From 5b97076769487e79fa949fb31baf5e2e642ba6e6 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 30 Aug 2014 18:24:17 +0200 Subject: [PATCH 6/6] Readd correct buildingspeed modifier --- mods/ra/maps/fort-lonestar/map.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index 1e4a40cce2..d8b9274d39 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -515,6 +515,8 @@ Rules: Player: PlayerResources: InitialCash: 50 + ClassicProductionQueue@Infantry: + BuildSpeed: 1 ^Infantry: MustBeDestroyed: ^Vehicle: