Merge pull request #7220 from obrakmann/d2k-worm-option-and-maps

Add worms to d2k maps and add lobby option to disable them
2014-12-31 13:03:37 +01:00
parent 16a7038d90 caa38f034e
commit 714233d72e
35 changed files with 708 additions and 19 deletions
--- a/mods/cnc/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -27,6 +27,7 @@ Videos:

 Options:
 	Crates: False
+	Creeps: False
 	Fog: True
 	Shroud: True
 	AllyBuildRadius: False
@@ -461,8 +462,6 @@ Rules:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
 	^Infantry:
-		SpawnViceroid:
-			Probability: 0
 		Tooltip:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
--- a/mods/cnc/maps/gdi02/map.yaml
+++ b/mods/cnc/maps/gdi02/map.yaml
@@ -25,6 +25,7 @@ Videos:

 Options:
 	Crates: False
+	Creeps: False
 	Fog: True
 	Shroud: True
 	AllyBuildRadius: False
@@ -764,8 +765,6 @@ Rules:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
 	^Infantry:
-		SpawnViceroid:
-			Probability: 0
 		Tooltip:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
--- a/mods/cnc/maps/gdi03/map.yaml
+++ b/mods/cnc/maps/gdi03/map.yaml
@@ -26,6 +26,7 @@ Videos:

 Options:
 	Crates: False
+	Creeps: False
 	Fog: True
 	Shroud: True
 	AllyBuildRadius: False
@@ -756,8 +757,6 @@ Rules:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
 	^Infantry:
-		SpawnViceroid:
-			Probability: 0
 		Tooltip:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
--- a/mods/cnc/maps/gdi04a/map.yaml
+++ b/mods/cnc/maps/gdi04a/map.yaml
@@ -26,8 +26,8 @@ Videos:
 	GameLost: gameover.vqa

 Options:
-	Cheats: False
 	Crates: False
+	Creeps: False
 	Fog: True
 	Shroud: True
 	AllyBuildRadius: False
@@ -581,8 +581,6 @@ Rules:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
 	^Infantry:
-		SpawnViceroid:
-			Probability: 0
 		Tooltip:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
--- a/mods/cnc/maps/gdi04b/map.yaml
+++ b/mods/cnc/maps/gdi04b/map.yaml
@@ -27,6 +27,7 @@ Videos:

 Options:
 	Crates: False
+	Creeps: False
 	Fog: True
 	Shroud: True
 	AllyBuildRadius: False
@@ -636,8 +637,6 @@ Rules:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
 	^Infantry:
-		SpawnViceroid:
-			Probability: 0
 		Tooltip:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
--- a/mods/cnc/maps/gdi04c/map.yaml
+++ b/mods/cnc/maps/gdi04c/map.yaml
@@ -27,6 +27,7 @@ Videos:

 Options:
 	Crates: False
+	Creeps: False
 	Fog: True
 	Shroud: True
 	AllyBuildRadius: False
@@ -900,8 +901,6 @@ Rules:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
 	^Infantry:
-		SpawnViceroid:
-			Probability: 0
 		Tooltip:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
--- a/mods/cnc/maps/nod01/map.yaml
+++ b/mods/cnc/maps/nod01/map.yaml
@@ -25,6 +25,7 @@ Videos:

 Options:
 	Crates: False
+	Creeps: False
 	Fog: True
 	Shroud: True
 	AllyBuildRadius: False
--- a/mods/cnc/maps/nod03a/map.yaml
+++ b/mods/cnc/maps/nod03a/map.yaml
@@ -26,6 +26,7 @@ Videos:

 Options:
 	Crates: False
+	Creeps: False
 	Fog: True
 	Shroud: True
 	AllyBuildRadius: False
@@ -555,8 +556,6 @@ Rules:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
 	^Infantry:
-		SpawnViceroid:
-			Probability: 0
 		Tooltip:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
--- a/mods/cnc/maps/nod03b/map.yaml
+++ b/mods/cnc/maps/nod03b/map.yaml
@@ -26,6 +26,7 @@ Videos:

 Options:
 	Crates: False
+	Creeps: False
 	Fog: True
 	Shroud: True
 	AllyBuildRadius: False
@@ -596,8 +597,6 @@ Rules:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
 	^Helicopter:
-		SpawnViceroid:
-			Probability: 0
 		Tooltip:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
--- a/mods/d2k/chrome/lobby-dialogs.yaml
+++ b/mods/d2k/chrome/lobby-dialogs.yaml
@@ -0,0 +1,271 @@
+Background@KICK_CLIENT_DIALOG:
+	X: 20
+	Y: 67
+	Width: 535
+	Height: 235
+	Logic: KickClientLogic
+	Background: dialog3
+	Children:
+		Label@TITLE:
+			X: 0
+			Y: 40
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Bold
+			Align: Center
+		Label@TEXTA:
+			X: 0
+			Y: 67
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+			Text: You may also apply a temporary ban, preventing
+		Label@TEXTB:
+			X: 0
+			Y: 85
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+			Text: them from joining for the remainder of this game.
+		Checkbox@PREVENT_REJOINING_CHECKBOX:
+			X: (PARENT_RIGHT - WIDTH)/2
+			Y: 120
+			Width: 150
+			Height: 20
+			Text: Temporarily Ban
+		Button@OK_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 + 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Kick
+			Font: Bold
+		Button@CANCEL_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 - 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Cancel
+			Font: Bold
+
+Background@KICK_SPECTATORS_DIALOG:
+	X: 20
+	Y: 67
+	Width: 535
+	Height: 235
+	Logic: KickSpectatorsLogic
+	Background: dialog3
+	Children:
+		Label@TITLE:
+			X: 0
+			Y: 40
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Bold
+			Align: Center
+			Text: Kick Spectators
+		Label@TEXT:
+			X: 0
+			Y: 85
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+		Button@OK_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 + 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Ok
+			Font: Bold
+		Button@CANCEL_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 - 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Cancel
+			Font: Bold
+
+Background@LOBBY_OPTIONS_BIN:
+	X: 20
+	Y: 67
+	Width: 593
+	Height: 235
+	Background: dialog3
+	Children:
+		Label@TITLE:
+			X: 0
+			Y: 5
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Bold
+			Align: Center
+			Text: Map Options
+		Container:
+			X: 30
+			Y: 50
+			Width: PARENT_RIGHT-60
+			Height: PARENT_BOTTOM-75
+			Children:
+				Checkbox@SHROUD_CHECKBOX:
+					Width: 140
+					Height: 20
+					Text: Shroud
+				Checkbox@FOG_CHECKBOX:
+					Y: 35
+					Width: 140
+					Height: 20
+					Text: Fog of War
+				Checkbox@SHORTGAME_CHECKBOX:
+					X: 150
+					Width: 140
+					Height: 20
+					Text: Short Game
+				Checkbox@CRATES_CHECKBOX:
+					X: 150
+					Y: 35
+					Width: 140
+					Height: 20
+					Text: Crates
+				Checkbox@ALLYBUILDRADIUS_CHECKBOX:
+					X: 290
+					Width: 140
+					Height: 20
+					Text: Build off Allies' ConYards
+				Checkbox@FRAGILEALLIANCES_CHECKBOX:
+					X: 290
+					Y: 35
+					Width: 140
+					Height: 20
+					Text: Diplomacy Changes
+				Checkbox@CREEPS_CHECKBOX:
+					Y: 70
+					Width: 140
+					Height: 20
+					Text: Worms
+				Checkbox@ALLOWCHEATS_CHECKBOX:
+					X: 150
+					Y: 70
+					Width: 140
+					Height: 20
+					Text: Debug Menu
+				Label@STARTINGCASH_DESC:
+					Y: 110
+					Width: 80
+					Height: 25
+					Text: Starting Cash:
+					Align: Right
+				DropDownButton@STARTINGCASH_DROPDOWNBUTTON:
+					X: 85
+					Y: 110
+					Width: 130
+					Height: 25
+					Font: Regular
+					Text: $5000
+				Label@STARTINGUNITS_DESC:
+					X: PARENT_RIGHT - WIDTH - 145
+					Y: 110
+					Width: 120
+					Height: 25
+					Text: Starting Units:
+					Align: Right
+				DropDownButton@STARTINGUNITS_DROPDOWNBUTTON:
+					X: PARENT_RIGHT - WIDTH
+					Y: 110
+					Width: 140
+					Height: 25
+					Font: Regular
+				Label@DIFFICULTY_DESC:
+					X: PARENT_RIGHT - WIDTH - 145
+					Y: 150
+					Width: 120
+					Height: 25
+					Text: Mission Difficulty:
+					Align: Right
+				DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
+					X: PARENT_RIGHT - WIDTH
+					Y: 150
+					Width: 140
+					Height: 25
+					Font: Regular
+				DropDownButton@TECHLEVEL_DROPDOWNBUTTON:
+					X: 85
+					Y: 150
+					Width: 130
+					Height: 25
+					Font: Regular
+					Text: 10
+				Label@TECHLEVEL_DESC:
+					Y: 150
+					Width: 80
+					Height: 25
+					Text: Tech Level:
+					Align: Right
+
+Background@FORCE_START_DIALOG:
+	X: 20
+	Y: 67
+	Width: 593
+	Height: 235
+	Background: dialog3
+	Children:
+		Label@TITLE:
+			X: 0
+			Y: 40
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Bold
+			Align: Center
+			Text: Start Game?
+		Label@TEXTA:
+			X: 0
+			Y: 67
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+			Text: One or more players are not yet ready.
+		Label@TEXTB:
+			X: 0
+			Y: 85
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+			Text: Are you sure that you want to force start the game?
+		Container@KICK_WARNING:
+			Width: PARENT_RIGHT
+			Children:
+				Label@KICK_WARNING_A:
+					X: 0
+					Y: 106
+					Width: PARENT_RIGHT
+					Height: 25
+					Font: Bold
+					Align: Center
+					Text: One or more clients are missing the selected
+				Label@KICK_WARNING_B:
+					X: 0
+					Y: 123
+					Width: PARENT_RIGHT
+					Height: 25
+					Font: Bold
+					Align: Center
+					Text: map, and will be kicked from the server.
+		Button@OK_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 + 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Start
+			Font: Bold
+		Button@CANCEL_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 - 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Cancel
+			Font: Bold
+
--- a/mods/d2k/maps/desert-twister.oramap
+++ b/mods/d2k/maps/desert-twister.oramap
--- a/mods/d2k/maps/eyesofthedesert.oramap
+++ b/mods/d2k/maps/eyesofthedesert.oramap
--- a/mods/d2k/maps/imperial-basin.oramap
+++ b/mods/d2k/maps/imperial-basin.oramap
--- a/mods/d2k/maps/kanly.oramap
+++ b/mods/d2k/maps/kanly.oramap
--- a/mods/d2k/maps/mount-idaho.oramap
+++ b/mods/d2k/maps/mount-idaho.oramap
--- a/mods/d2k/maps/mount-idaho/map.bin
+++ b/mods/d2k/maps/mount-idaho/map.bin
--- a/mods/d2k/maps/mount-idaho/map.yaml
+++ b/mods/d2k/maps/mount-idaho/map.yaml
@@ -0,0 +1,107 @@
+MapFormat: 7
+
+RequiresMod: d2k
+
+Title: Mount Idaho
+
+Author: Westwood Studios
+
+Tileset: ARRAKIS
+
+MapSize: 80,80
+
+Bounds: 8,8,64,64
+
+Visibility: Lobby
+
+Type: Conquest
+
+Videos:
+
+Options:
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		OwnsWorld: True
+		NonCombatant: True
+		Race: atreides
+	PlayerReference@Multi0:
+		Name: Multi0
+		Playable: True
+		Race: Random
+		Enemies: Creeps
+	PlayerReference@Multi1:
+		Name: Multi1
+		Playable: True
+		Race: Random
+		Enemies: Creeps
+	PlayerReference@Creeps:
+		Name: Creeps
+		NonCombatant: True
+		Race: atreides
+		Enemies: Multi0, Multi1
+
+Actors:
+	Actor0: spicebloom
+		Location: 48,12
+		Owner: Neutral
+	Actor1: spicebloom
+		Location: 44,26
+		Owner: Neutral
+	Actor2: spicebloom
+		Location: 63,26
+		Owner: Neutral
+	Actor3: spicebloom
+		Location: 14,36
+		Owner: Neutral
+	Actor4: spicebloom
+		Location: 68,31
+		Owner: Neutral
+	Actor5: spicebloom
+		Location: 33,53
+		Owner: Neutral
+	Actor6: spicebloom
+		Location: 35,60
+		Owner: Neutral
+	Actor7: spicebloom
+		Location: 45,40
+		Owner: Neutral
+	Actor8: mpspawn
+		Location: 17,15
+		Owner: Neutral
+	Actor9: mpspawn
+		Location: 57,66
+		Owner: Neutral
+	Actor10: wormspawner
+		Location: 42,47
+		Owner: Creeps
+	Actor11: wormspawner
+		Location: 40,38
+		Owner: Creeps
+	Actor12: wormspawner
+		Location: 8,71
+		Owner: Creeps
+	Actor13: wormspawner
+		Location: 71,13
+		Owner: Creeps
+
+Smudges:
+
+Rules:
+	World:
+		WormManager:
+			Minimum: 1
+			Maximum: 2
+
+Sequences:
+
+VoxelSequences:
+
+Weapons:
+
+Voices:
+
+Notifications:
+
+Translations:
--- a/mods/d2k/maps/oasis-conquest.oramap
+++ b/mods/d2k/maps/oasis-conquest.oramap
--- a/mods/d2k/maps/oasis-conquest/map.bin
+++ b/mods/d2k/maps/oasis-conquest/map.bin
--- a/mods/d2k/maps/oasis-conquest/map.yaml
+++ b/mods/d2k/maps/oasis-conquest/map.yaml
@@ -0,0 +1,174 @@
+MapFormat: 7
+
+RequiresMod: d2k
+
+Title: Oasis Conquest
+
+Description: 2v2v2 or FFA
+
+Author: Janitor
+
+Tileset: ARRAKIS
+
+MapSize: 128,128
+
+Bounds: 16,16,96,96
+
+Visibility: Lobby
+
+Type: Conquest
+
+Videos:
+
+Options:
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		OwnsWorld: True
+		NonCombatant: True
+		Race: atreides
+	PlayerReference@Multi0:
+		Name: Multi0
+		Playable: True
+		Race: Random
+		Enemies: Creeps
+	PlayerReference@Multi1:
+		Name: Multi1
+		Playable: True
+		Race: Random
+		Enemies: Creeps
+	PlayerReference@Multi2:
+		Name: Multi2
+		Playable: True
+		Race: Random
+		Enemies: Creeps
+	PlayerReference@Multi3:
+		Name: Multi3
+		Playable: True
+		Race: Random
+		Enemies: Creeps
+	PlayerReference@Multi4:
+		Name: Multi4
+		Playable: True
+		Race: Random
+		Enemies: Creeps
+	PlayerReference@Multi5:
+		Name: Multi5
+		Playable: True
+		Race: Random
+		Enemies: Creeps
+	PlayerReference@Creeps:
+		Name: Creeps
+		NonCombatant: True
+		Race: atreides
+		Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5
+
+Actors:
+	Actor0: mpspawn
+		Location: 60,37
+		Owner: Neutral
+	Actor1: spicebloom
+		Location: 34,98
+		Owner: Neutral
+	Actor3: spicebloom
+		Location: 19,73
+		Owner: Neutral
+	Actor2: spicebloom
+		Location: 48,109
+		Owner: Neutral
+	Actor4: mpspawn
+		Location: 47,42
+		Owner: Neutral
+	Actor5: mpspawn
+		Location: 88,67
+		Owner: Neutral
+	Actor14: spicebloom
+		Location: 56,62
+		Owner: Neutral
+	Actor10: spicebloom
+		Location: 86,24
+		Owner: Neutral
+	Actor11: spicebloom
+		Location: 100,104
+		Owner: Neutral
+	Actor6: spicebloom
+		Location: 28,35
+		Owner: Neutral
+	Actor7: spicebloom
+		Location: 40,26
+		Owner: Neutral
+	Actor8: spicebloom
+		Location: 59,22
+		Owner: Neutral
+	Actor12: spicebloom
+		Location: 103,51
+		Owner: Neutral
+	Actor13: spicebloom
+		Location: 106,70
+		Owner: Neutral
+	Actor9: spicebloom
+		Location: 105,84
+		Owner: Neutral
+	Actor15: spicebloom
+		Location: 63,57
+		Owner: Neutral
+	Actor16: spicebloom
+		Location: 64,68
+		Owner: Neutral
+	Actor17: spicebloom
+		Location: 27,87
+		Owner: Neutral
+	Actor18: mpspawn
+		Location: 51,90
+		Owner: Neutral
+	Actor19: mpspawn
+		Location: 42,80
+		Owner: Neutral
+	Actor21: mpspawn
+		Location: 89,81
+		Owner: Neutral
+	Actor20: wormspawner
+		Location: 16,16
+		Owner: Creeps
+	Actor22: wormspawner
+		Location: 111,16
+		Owner: Creeps
+	Actor23: wormspawner
+		Location: 111,111
+		Owner: Creeps
+	Actor24: wormspawner
+		Location: 16,111
+		Owner: Creeps
+	Actor26: wormspawner
+		Location: 72,111
+		Owner: Creeps
+	Actor27: wormspawner
+		Location: 111,46
+		Owner: Creeps
+	Actor28: wormspawner
+		Location: 78,16
+		Owner: Creeps
+	Actor30: wormspawner
+		Location: 16,81
+		Owner: Creeps
+
+Smudges:
+
+Rules:
+	World:
+		WormManager:
+			Minimum: 3
+			Maximum: 6
+
+Sequences:
+
+VoxelSequences:
+
+Weapons:
+
+Voices:
+
+Notifications:
+
+Translations:
--- a/mods/d2k/maps/pasty-mesa.oramap
+++ b/mods/d2k/maps/pasty-mesa.oramap
--- a/mods/d2k/maps/pasty-mesa/map.bin
+++ b/mods/d2k/maps/pasty-mesa/map.bin
--- a/mods/d2k/maps/pasty-mesa/map.yaml
+++ b/mods/d2k/maps/pasty-mesa/map.yaml
@@ -0,0 +1,104 @@
+MapFormat: 7
+
+RequiresMod: d2k
+
+Title: Pasty Mesa
+
+Author: Westwood Studios
+
+Tileset: ARRAKIS
+
+MapSize: 56,56
+
+Bounds: 4,4,48,48
+
+Visibility: Lobby
+
+Type: Conquest
+
+Videos:
+
+Options:
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		OwnsWorld: True
+		NonCombatant: True
+		Race: atreides
+	PlayerReference@Multi0:
+		Name: Multi0
+		Playable: True
+		Race: Random
+		Enemies: Creeps
+	PlayerReference@Multi1:
+		Name: Multi1
+		Playable: True
+		Race: Random
+		Enemies: Creeps
+	PlayerReference@Creeps:
+		Name: Creeps
+		NonCombatant: True
+		Race: atreides
+		Enemies: Multi0, Multi1
+
+Actors:
+	Actor2: spicebloom
+		Location: 7,18
+		Owner: Neutral
+	Actor4: spicebloom
+		Location: 27,6
+		Owner: Neutral
+	Actor8: spicebloom
+		Location: 34,38
+		Owner: Neutral
+	Actor5: spicebloom
+		Location: 49,26
+		Owner: Neutral
+	Actor1: mpspawn
+		Location: 18,34
+		Owner: Neutral
+	Actor0: mpspawn
+		Location: 45,12
+		Owner: Neutral
+	Actor6: spicebloom
+		Location: 6,42
+		Owner: Neutral
+	Actor7: spicebloom
+		Location: 25,49
+		Owner: Neutral
+	Actor3: spicebloom
+		Location: 30,15
+		Owner: Neutral
+	Actor9: wormspawner
+		Location: 36,51
+		Owner: Creeps
+	Actor10: wormspawner
+		Location: 4,51
+		Owner: Creeps
+	Actor11: wormspawner
+		Location: 21,4
+		Owner: Creeps
+	Actor12: wormspawner
+		Location: 4,4
+		Owner: Creeps
+
+Smudges:
+
+Rules:
+	World:
+		WormManager:
+			Minimum: 1
+			Maximum: 2
+
+Sequences:
+
+VoxelSequences:
+
+Weapons:
+
+Voices:
+
+Notifications:
+
+Translations:
--- a/mods/d2k/maps/the-duell.oramap
+++ b/mods/d2k/maps/the-duell.oramap
--- a/mods/d2k/maps/tucks-sietch.oramap
+++ b/mods/d2k/maps/tucks-sietch.oramap
--- a/mods/d2k/maps/venac-ditch.oramap
+++ b/mods/d2k/maps/venac-ditch.oramap
--- a/mods/d2k/maps/vladimirs-folly.oramap
+++ b/mods/d2k/maps/vladimirs-folly.oramap
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -80,7 +80,7 @@ ChromeLayout:
 	./mods/ra/chrome/lobby.yaml
 	./mods/ra/chrome/lobby-mappreview.yaml
 	./mods/d2k/chrome/lobby-playerbin.yaml
-	./mods/ra/chrome/lobby-dialogs.yaml
+	./mods/d2k/chrome/lobby-dialogs.yaml
 	./mods/d2k/chrome/color-picker.yaml
 	./mods/ra/chrome/map-chooser.yaml
 	./mods/ra/chrome/create-server.yaml