update mod to latest engine tag

RAunplugged · Nov 14, 2018 · c6dd7ed · c6dd7ed
1 parent 9feb2bc
commit c6dd7ed
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -27,7 +27,7 @@ https://github.com/RAunplugged/OpenRA/commit/9407722bf22db52f3544b548f42a4e62861
 Latest updates:
 
 OpenRAModSDK commit tag: 8a1f1a9 - 8a1f1a9706057cb8872a784cbe8fc0b915778554
-OpenRA Engine commit tag: d653614 - d653614e7550564ca41ff94bbddf2bb29d85265d
+OpenRA Engine commit tag: cd82382 - cd82382f6803c13a92a498b0cd53e999d2356ad1 - Nov 11
 
 
 

diff --git a/mod.config b/mod.config
@@ -9,7 +9,7 @@
 MOD_ID="ura"
 
 # The OpenRA engine version to use for this project.
-ENGINE_VERSION="unplugged-d653614"
+ENGINE_VERSION="unplugged-cd82382"
 
 ##############################################################################
 # Continuous Integration

diff --git a/mods/ura/maps/minigames/fort-lonestar/rules.yaml b/mods/ura/maps/minigames/fort-lonestar/rules.yaml
@@ -105,8 +105,6 @@ Player:
 		DefaultCashDropdownLocked: True
 		DefaultCashDropdownVisible: False
 		DefaultCash: 50
-	-ConditionManager:
-	-HarvesterBotModule:
 	-HackyAI@BrutalAI:
 	-HackyAI@HardAI:
 	-HackyAI@NormalAI:

diff --git a/mods/ura/rules/ai/ai.yaml b/mods/ura/rules/ai/ai.yaml
@@ -9,14 +9,31 @@ Player:
 	# Easy AI | Vanilla Mode | -20% Cost/Production penalty
 
 	HarvesterBotModule:
-		RequiresCondition: enable-easy-ai || enable-normal-ai || enable-hard-ai || enable-brutal-ai || enable-naval-ai || enable-naval-hard-ai
+		RequiresCondition: enable-easy-ai || enable-normal-ai || enable-hard-ai || enable-brutal-ai || enable-naval-ai || enable-navalhard-ai
+
+	GrantConditionOnBotOwner@easy:
+		Condition: enable-easy-ai
+		Bots: easy
+	GrantConditionOnBotOwner@normal:
+		Condition: enable-normal-ai
+		Bots: normal
+	GrantConditionOnBotOwner@hard:
+		Condition: enable-hard-ai
+		Bots: hard
+	GrantConditionOnBotOwner@brutal:
+		Condition: enable-brutal-ai
+		Bots: brutal
+	GrantConditionOnBotOwner@naval:
+		Condition: enable-naval-ai
+		Bots: naval
+	GrantConditionOnBotOwner@navalhard:
+		Condition: enable-navalhard-ai
+		Bots: navalHard
 
 	HackyAI@EasyAI:
 		Name: Easy AI
 		Type: easy
 
-		Condition: enable-easy-ai
-
 		SquadSize: 30
 		SquadSizeRandomBonus: 40
 		MinimumExcessPower: 80
@@ -218,8 +235,6 @@ Player:
 		Name: Normal AI
 		Type: normal
 
-		Condition: enable-normal-ai
-
 		SquadSize: 30
 		SquadSizeRandomBonus: 40
 		MinimumExcessPower: 80
@@ -421,8 +436,6 @@ Player:
 		Name: Hard AI
 		Type: hard
 
-		Condition: enable-hard-ai
-
 		SquadSize: 15
 		SquadSizeRandomBonus: 40
 		MinimumExcessPower: 80
@@ -446,7 +459,6 @@ Player:
 		ProtectionScanRadius: 10
 
 		RestrictMCVDeploymentFallbackToBase: False
-		HarvesterEnemyAvoidanceRadius: 10c0
 		MaxResourceCellsToCheck: 8
 
 		BuildingCommonNames:
@@ -631,8 +643,6 @@ Player:
 		Name: Brutal AI
 		Type: brutal
 
-		Condition: enable-brutal-ai
-
 		SquadSize: 15
 		SquadSizeRandomBonus: 40
 		MinimumExcessPower: 80
@@ -656,7 +666,6 @@ Player:
 		ProtectionScanRadius: 10
 
 		RestrictMCVDeploymentFallbackToBase: False
-		HarvesterEnemyAvoidanceRadius: 10c0
 		MaxResourceCellsToCheck: 8
 
 		BuildingCommonNames:
@@ -841,8 +850,6 @@ Player:
 		Name: Naval AI
 		Type: naval
 
-		Condition: enable-naval-ai
-
 		SquadSize: 1
 		SquadSizeRandomBonus: 3
 		MinimumExcessPower: 120
@@ -999,8 +1006,6 @@ Player:
 		Name: Naval AI (Hard)
 		Type: navalHard
 
-		Condition: enable-naval-hard-ai
-
 		SquadSize: 1
 		SquadSizeRandomBonus: 3
 		MinimumExcessPower: 120