Rebased. (+1 squashed commits)

Squashed commits: [43010a0] Fixes. (+1 squashed commits) Squashed commits: [94ee90e] Fixes. (+1 squashed commits) Squashed commits: [ef827c7] Style cop updates. Updates to LevelUp, Cloak, and UnitUpgrade to allow multiple units within range, plus maximum extra unit limit. (+1 squashed commits) Squashed commits: [2103b01] Dupe crate action updates and fixes. (+2 squashed commit) Squashed commit: [0f4df4a] Added DuplicateUnitCrateAction. [2787fa1] Clarity update. (+1 squashed commits) Squashed commits: [93ddc3b] Crate updates. +Multiple units per crate allowed. +Allow time delay on crate actions.
2014-07-10 20:55:02 +02:00
parent 582c1016e9
commit 94b1f53ebf
16 changed files with 374 additions and 63 deletions
--- a/mods/d2k/rules/misc.yaml
+++ b/mods/d2k/rules/misc.yaml
@@ -20,61 +20,75 @@ CRATE:
 		SelectionShares: 40
 	GiveUnitCrateAction@Trike:
 		SelectionShares: 20
-		Unit: trike
+		Units: trike
 	GiveUnitCrateAction@Raider:
 		SelectionShares: 15
-		Unit: raider
+		Units: raider
+		ValidRaces: ordos
 	GiveUnitCrateAction@Quad:
 		SelectionShares: 40
-		Unit: quad
+		Units: quad
 	GiveUnitCrateAction@CombatA:
 		SelectionShares: 10
-		Unit: combata
+		Units: combata
+		ValidRaces: atreides
 	GiveUnitCrateAction@CombatH:
 		SelectionShares: 10
-		Unit: combath
+		Units: combath
+		ValidRaces: harkonnen
 	GiveUnitCrateAction@CombatO:
 		SelectionShares: 10
-		Unit: combato
+		Units: combato
+		ValidRaces: ordos
 	GiveUnitCrateAction@SiegeTank:
 		SelectionShares: 10
-		Unit: siegetank
+		Units: siegetank
 	GiveUnitCrateAction@MissileTank:
 		SelectionShares: 10
-		Unit: missiletank
+		Units: missiletank
 	GiveUnitCrateAction@StealthRaider:
 		SelectionShares: 7
-		Unit: stealthraider
+		Units: stealthraider
+		ValidRaces: ordos
 	GiveUnitCrateAction@Fremen:
 		SelectionShares: 5
-		Unit: fremen
+		Units: fremen,fremen
+		ValidRaces: atreides
 	GiveUnitCrateAction@Sardaukar:
 		SelectionShares: 8
-		Unit: sardaukar
+		Units: sardaukar,sardaukar
+		ValidRaces: harkonnen
 	GiveUnitCrateAction@Saboteur:
 		SelectionShares: 3
-		Unit: saboteur
+		Units: saboteur,saboteur
+		ValidRaces: ordos
 	GiveUnitCrateAction@SonicTank:
 		SelectionShares: 5
-		Unit: sonictank
+		Units: sonictank
+		ValidRaces: atreides
 	GiveUnitCrateAction@Devast:
 		SelectionShares: 2
-		Unit: devast
+		Units: devast
+		ValidRaces: harkonnen
 	GiveUnitCrateAction@DeviatorTank:
 		SelectionShares: 5
-		Unit: deviatortank
+		Units: deviatortank
+		ValidRaces: ordos
 	GiveMcvCrateAction@Atreides:
 		SelectionShares: 0
 		NoBaseSelectionShares: 9001
-		Unit: mcva
+		Units: mcva
+		ValidRaces: atreides
 	GiveMcvCrateAction@Harkonnen:
 		SelectionShares: 0
 		NoBaseSelectionShares: 9001
-		Unit: mcvh
+		Units: mcvh
+		ValidRaces: harkonnen
 	GiveMcvCrateAction@Ordos:
 		SelectionShares: 0
 		NoBaseSelectionShares: 9001
-		Unit: mcvo
+		Units: mcvo
+		ValidRaces: ordos
 	RenderSprites:
 		Palette: effect
 	WithCrateBody:
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -89,31 +89,64 @@ CRATE:
 		SelectionShares: 5
 		Proxy: powerproxy.parabombs
 		Effect: parabombs
+	DuplicateUnitCrateAction:
+		SelectionShares: 10
+		MaxAmount: 5
+		MinAmount: 1
+		MaxDuplicatesWorth: 1500
 	GiveMcvCrateAction:
 		SelectionShares: 2
 		NoBaseSelectionShares: 100
-		Unit: mcv
+		Units: mcv
 	GiveUnitCrateAction@jeep:
 		SelectionShares: 7
-		Unit: jeep
+		Units: jeep
+		ValidRaces: allies
+		TimeDelay: 3000
 	GiveUnitCrateAction@arty:
 		SelectionShares: 6
-		Unit: arty
+		Units: arty
+		ValidRaces: allies
+		TimeDelay: 4500
 	GiveUnitCrateAction@v2rl:
 		SelectionShares: 6
-		Unit: v2rl
+		Units: v2rl
+		ValidRaces: soviet
+		TimeDelay: 4500
 	GiveUnitCrateAction@1tnk:
 		SelectionShares: 5
-		Unit: 1tnk
+		Units: 1tnk
+		ValidRaces: allies
+		TimeDelay: 3000
 	GiveUnitCrateAction@2tnk:
 		SelectionShares: 4
-		Unit: 2tnk
+		Units: 2tnk
+		ValidRaces: allies
+		TimeDelay: 4500
 	GiveUnitCrateAction@3tnk:
 		SelectionShares: 4
-		Unit: 3tnk
+		Units: 3tnk
+		ValidRaces: soviet
+		TimeDelay: 4500
 	GiveUnitCrateAction@4tnk:
 		SelectionShares: 3
-		Unit: 4tnk
+		Units: 4tnk
+		ValidRaces: soviet
+		TimeDelay: 9000
+	GiveUnitCrateAction@squadlight:
+		SelectionShares: 7
+		Units: e1,e1,e1,e3,e3
+		ValidRaces: allies, soviet
+	GiveUnitCrateAction@squadheavyallies:
+		SelectionShares: 7
+		Units: e1,e1,e1,e1,e3,e3,e3,e6,medi
+		ValidRaces: allies
+		TimeDelay: 4500
+	GiveUnitCrateAction@squadheavysoviet:
+		SelectionShares: 7
+		Units: e1,e1,e4,e4,e3,e3,e3
+		ValidRaces: soviet
+		TimeDelay: 4500
 	RenderSprites:
 		Palette: effect
 	WithCrateBody: