16 September 2023 - Ascension #4

CMBW-editor/ai/cm_terran.asc3

@@ -1272,7 +1272,7 @@ script_id TMCx
 	
 	:under_attack_by_ground_calc
 	var AtL|Wait under_attack_var 1 13
-	player_combat 17 13 63 False Jump maverick|harakan|cyprian|eidolon|savant|madcap|heracles|apostle|siren|striga|olympian|autocrat|dilettante|sevenstep|silvertongue|sevenstep|silvertongue|vulture|cyclops|goliath|blackjack|matador|phalanx|phalanx_siege_mode|madrigal|ramesses|durendal|cataphract|paladin|cuirass|pazuzu|claymore|penumbra|anticthon|aion|zealot|dracadin|ecclesiast|legionnaire|hierophant|amaranth|atreus|herald|cantavis|vagrant|cabalist|pariah|charlatan|archon|optecton|patriarch|apostate|augur|manifold|simulacrum|idol|golem|accantor|architect|demiurge|zethrokor|quazilisk|vorvrokor|liiralisk|cikralisk|protathalor|axitrilisk|mortothrokor|hydralisk|izirokor|bactalisk|tethzorokor|kagralisk|evigrilisk|keskathalor|zoryusthaleth|lakizilisk|konvilisk|vilgorokor|rilirokor|ultrokor|zobriolisk|aspirant|cohort|tarasque Any under_attack_by_ground_calc_fin 13
+	player_combat 17 13 63 False Jump maverick|harakan|cyprian|eidolon|savant|madcap|heracles|apostle|siren|striga|olympian|autocrat|dilettante|sevenstep|hypnagogue|sevenstep|silvertongue|vulture|cyclops|goliath|blackjack|matador|phalanx|phalanx_siege_mode|madrigal|ramesses|durendal|cataphract|paladin|cuirass|pazuzu|claymore|penumbra|anticthon|aion|zealot|dracadin|ecclesiast|legionnaire|hierophant|amaranth|atreus|herald|cantavis|vagrant|cabalist|charlatan|pariah|potentate|sycophant|archon|optecton|patriarch|manifold|simulacrum|idol|golem|accantor|architect|demiurge|zethrokor|quazilisk|vorvrokor|liiralisk|cikralisk|protathalor|axitrilisk|mortothrokor|hydralisk|izirokor|bactalisk|tethzorokor|kagralisk|evigrilisk|keskathalor|zoryusthaleth|lakizilisk|konvilisk|vilgorokor|rilirokor|ultrokor|zobriolisk|aspirant|cohort|tarasque Group_Buildings|mason|talos under_attack_by_ground_calc_fin 13
 	var Set under_attack_by_ground_var 1 13
 	
 	:under_attack_by_ground_calc_fin
@@ -1281,7 +1281,7 @@ script_id TMCx
 	
 	:under_attack_by_air_calc
 	var Ex|Wait under_attack_var 1 13
-	player_combat 17 13 63 False Jump talos|wraith|gorgon|wyvern|valkyrie|salamander|sundog|centaur|minotaur|magnetar|pegasus|hippogriff|oberon|phobos|artisan|barghest|vassal|empress|aurora|panoptus|lanifect|gladius|exemplar|magister|epigraph|didact|empyrean|solarion|star_sovereign|anthelion|gosvileth|nathrokor|kalkalisk|mutalisk|ghitorokor|sovroleth|tosgrilisk|skithrokor|vithrilisk|almaksalisk|geszithalor|algoztalisk|alkajelisk|gorgrokor|rililisk|zarcavrokor|tetcaerokor|akistrokor|luminary Any under_attack_by_air_calc_fin 13
+	player_combat 17 13 63 False Jump talos|wraith|gorgon|wyvern|valkyrie|salamander|sundog|centaur|minotaur|magnetar|pegasus|hippogriff|oberon|phobos|artisan|barghest|vassal|empress|aurora|panoptus|lanifect|gladius|exemplar|magister|epigraph|didact|empyrean|solarion|star_sovereign|anthelion|gosvileth|nathrokor|kalkalisk|mutalisk|ghitorokor|sovroleth|tosgrilisk|skithrokor|vithrilisk|almaksalisk|geszithalor|algoztalisk|alkajelisk|gorgrokor|rililisk|zarcavrokor|tetcaerokor|akistrokor|luminary Group_Buildings|mason|talos under_attack_by_air_calc_fin 13
 	var Set under_attack_by_air_var 1 13
 	
 	:under_attack_by_air_calc_fin
@@ -2017,9 +2017,9 @@ script_id TMCx
 	return
 	
 	:worker_request_advanced
-	notowns parthenon blank_return
+	notowns quarry blank_return
 	local 255 AtL 10 talos blank_return
-	queue 1 talos parthenon 255 Local Loc.63 100
+	queue 1 talos quarry 255 Local Loc.63 100
 	wait 150
 	return
 	
@@ -2057,7 +2057,7 @@ script_id TMCx
 	:main_transport_loop
 	wait 12
 	bring 13 AtL_C 4 trojan|pythean Loc.63 main_wait_600
-	bring 13 Ex 0 starpad|parthenon Loc.63 main_transport_loop
+	bring 13 Ex 0 starpad|nanite_assembly Loc.63 main_transport_loop
 	var Ex|Wait under_attack_var 0 13
 	bring 13 AtL 8 trojan|pythean Loc.63 main_transport_loop
 	bring 13 AtL 4 trojan|pythean Loc.63 main_transport_pythean
@@ -2070,8 +2070,8 @@ script_id TMCx
 	goto main_transport_wait
 	
 	:main_transport_pythean
-	notowns parthenon main_transport_trojan_2
+	notowns nanite_assembly main_transport_trojan_2
-	queue 1 pythean parthenon 255 Global Loc.63 120
+	queue 1 pythean nanite_assembly 255 Global Loc.63 120
 	wait 720
 	var Ex|Jump is_island_var 1 main_transport_wait 13
 	wait 720
@@ -2092,7 +2092,7 @@ script_id TMCx
 	goto main_transport_loop
 	
 	:main_transport_on
-	bring 13 AtL_W 1 starpad|parthenon|trojan|pythean Loc.63 blank
+	bring 13 AtL_W 1 starpad|nanite_assembly|trojan|pythean Loc.63 blank
 	check_transports
 	stop
 	
@@ -2237,6 +2237,19 @@ script_id TMCx
 	wait 3600
 	return
 	
+	:wait_buildstart_towncenter
+	bring 13 AtL_W 1 ministry|treasury Loc.63 blank
+	return
+	
+	:wait_build_towncenter
+	wait 12
+	notowns ministry wait_build_towncenter_2
+	return
+	
+	:wait_build_towncenter_2
+	notowns treasury wait_build_towncenter
+	return
+	
 	:expansion_init_area_town
 	call init_area_town
 	goto expansion_body
@@ -2249,15 +2262,21 @@ script_id TMCx
 	bld 1 ministry 180
 	goto expansion_main
 	
+	:expansion_body_quarry
+	wait 12
+	notowns atlas expansion_body_quarry
+	bld 1 quarry 179
+	stop
+	
 	:expansion_body_treasury
 	bld 1 treasury 180
-	bld 1 quarry 120
+	multi expansion_body_quarry
 	
 	:expansion_main
 	multi expansion_worker_start
-	w_bldstart 1 ministry
+	call wait_buildstart_towncenter
 	var Set try_expand_var 0 13
-	w_bld 1 ministry
+	call wait_build_towncenter
 	multi count_expansion
 	var Ex|Jump skip_building_var 1 idle 13
 	placeholder_count Local AtL|Jump 2 Group_Buildings idle 13
@@ -4547,16 +4566,12 @@ script_id TMCx
 	var Ex|Wait build_done_var 1 13
 	var Ex|Wait can_build_production_var 1 13
 	
-	:request_infrastructure_parthenon
+	:request_infrastructure_anvil
-	notowns daedala request_infrastructure_silo
-	call add_parthenon_check
-	
-	:request_infrastructure_silo
 	notowns daedala request_infrastructure_quarry
 	var Ex|Jump infrastructure_cycle_var 1 request_infrastructure_loop 13
-	var Ex|Call pref_anvil 1 add_nuclear_silo 13
+	var Ex|Call pref_anvil 1 add_anvil 13
 	var Ex|Jump infrastructure_cycle_var 1 request_infrastructure_loop 13
-	call add_nuclear_silo_check
+	call add_anvil_check
 	
 	:request_infrastructure_quarry
 	var Ex|Jump infrastructure_cycle_var 1 request_infrastructure_loop 13
@@ -4570,18 +4585,10 @@ script_id TMCx
 	call main_wait_1200
 	goto request_infrastructure
 	
-	:add_parthenon_check
+	:add_anvil_check
-	local 255 AtL 1 parthenon blank_return
-	add_bld 255 parthenon 1 1 99
-	w_bldstart 1 parthenon
-	wait 60
-	call main_wait_900
-	goto add_return
-	
-	:add_nuclear_silo_check
 	local 255 AtL 1 anvil blank_return
 	
-	:add_nuclear_silo
+	:add_anvil
 	local 255 AtL 2 anvil|quarry blank_return
 	add_bld 255 anvil 1 1 98
 	var Set infrastructure_cycle_var 1 13

CMBW-editor/grafting/Orders.txt

@@ -25,10 +25,13 @@
 
 5:                  # [5] Bunker Guard
   0xFF02            # Current unit is...
-  125               # [125] Bunker
+  125               # [125] Anchor
   0xFF01            # Or
   0xFF02            # Current unit is...
   370               # [370] Dugout
+  0xFF01            # Or
+  0xFF02            # Current unit is...
+  384               # [384] Lodestone
   0xFFFF            # ==End of List==
 
 6:                  # [6] Ignore
@@ -472,6 +475,9 @@
   0xFF01            # Or
   0xFF02            # Current unit is...
   354               # [354] Ocsal Colony
+  0xFF01            # Or
+  0xFF02            # Current unit is...
+  383               # [383] Omnivale
   0xFFFF            # ==End of List==
 
 79:                 # [79] Harvest1
@@ -523,10 +529,13 @@
 
 95:                 # [95] Pick Up3
   0xFF02            # Current unit is...
-  125               # [125] Bunker
+  125               # [125] Anchor
   0xFF01            # Or
   0xFF02            # Current unit is...
   370               # [370] Dugout
+  0xFF01            # Or
+  0xFF02            # Current unit is...
+  384               # [384] Lodestone
   0xFFFF            # ==End of List==
 
 97:                 # [97] Powerup2
@@ -549,6 +558,9 @@
   0xFF01            # Or
   0xFF02            # Current unit is...
   133               # [133] Gathtelosk
+  0xFF01            # Or
+  0xFF02            # Current unit is...
+  384               # [384] Omnivale
   0xFFFF            # ==End of List==
 
 102:                # [102] Spread Creep

CMBW-editor/grafting/Tech.txt

@@ -113,19 +113,19 @@
 
 9:                  # [9] Select Shared - Zerg Structure
   0xFF02            # Current unit is...
-  131               # [131] Hatchery
+  131               # [131] Hachirosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  132               # [132] Lair
+  132               # [132] Caphrolosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  133               # [133] Hive
+  133               # [133] Gathtelosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  226               # [226] Grand Library
+  216               # [216] Larvosk Cesiant
   0xFF01            # Or
   0xFF02            # Current unit is...
-  215               # Flag
+  383               # [383] Omnivale
   0xFFFF            # ==End of List==
 
 10:                 # [10] Personnel Cloaking
@@ -292,19 +292,19 @@
 
 28:                 # [28] Select Control - Zerg Structure
   0xFF02            # Current unit is...
-  131               # [131] Hatchery
+  131               # [131] Hachirosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  132               # [132] Lair
+  132               # [132] Caphrolosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  133               # [133] Hive
+  133               # [133] Gathtelosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  226               # [226] Grand Library
+  216               # [216] Larvosk Cesiant
   0xFF01            # Or
   0xFF02            # Current unit is...
-  215               # Flag
+  383               # [383] Omnivale
   0xFFFF            # ==End of List==
 
 29:                 # [29] Grief of All Gods - Star Sovereign
@@ -329,19 +329,19 @@
 
 33:                 # [33] Select Swarm - Zerg Structure
   0xFF02            # Current unit is...
-  131               # [131] Hatchery
+  131               # [131] Hachirosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  132               # [132] Lair
+  132               # [132] Caphrolosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  133               # [133] Hive
+  133               # [133] Gathtelosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  226               # [226] Grand Library
+  216               # [216] Larvosk Cesiant
   0xFF01            # Or
   0xFF02            # Current unit is...
-  215               # Flag
+  383               # [383] Omnivale
   0xFFFF            # ==End of List==
 
 34:                 # [34] Healing - Cleric
@@ -369,19 +369,19 @@
 
 38:                 # [38] Select Assault - Zerg Structure
   0xFF02            # Current unit is...
-  131               # [131] Hatchery
+  131               # [131] Hachirosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  132               # [132] Lair
+  132               # [132] Caphrolosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  133               # [133] Hive
+  133               # [133] Gathtelosk
   0xFF01            # Or
   0xFF02            # Current unit is...
-  226               # [226] Grand Library
+  216               # [216] Larvosk Cesiant
   0xFF01            # Or
   0xFF02            # Current unit is...
-  215               # Flag
+  383               # [383] Omnivale
   0xFFFF            # ==End of List==
 
 39:                 # [39] Emergency Detonation - Terran Structure

CMBW-editor/grafting/Units.txt

@@ -2,14 +2,14 @@
 
 0:         # [0] Maverick
  0xFF02      # Current unit is...
- 111        # [111] Barracks
+ 111         # [111] Stockade
  0xFF08      # Is not constructing add-on
  0xFF05      # Is not lifted off
  0xFFFF      # ==End of List==
 
 1:         # [1] Eidolon
  0xFF02      # Current unit is...
- 111        # [111] Barracks
+ 111         # [111] Stockade
  0xFF08      # Is not constructing add-on
  0xFF05      # Is not lifted off
  0xFF04      # Must have add-on
@@ -41,10 +41,13 @@
 
 7:         # [7] Mason
  0xFF02      # Current unit is...
- 106        # [106] Command Center
+ 106         # [106] Ministry
  0xFF01      # Or
  0xFF02      # Current unit is...
  174         # [174] Quarry
+ 0xFF01      # Or
+ 0xFF02      # Current unit is...
+ 383         # [383] Omnivale
  0xFF08      # Is not constructing add-on
  0xFF05      # Is not lifted off
  0xFFFF      # ==End of List==
@@ -93,7 +96,7 @@
 
 15:         # [15] Shaman
  0xFF02      # Current unit is...
- 111        # [111] Barracks
+ 111         # [111] Stockade
  0xFF05      # Is not lifted off
  0xFF08      # Is not constructing add-on
  0xFF04      # Must have add-on
@@ -107,7 +110,7 @@
 
 17:         # [17] Architect
  0xFF02      # Current unit is...
- 304        # [304] Sequestered Icon
+ 220         # [220] Ardent Authority
  0xFFFF      # ==End of List==
 
 18:         # [18] Madcap
@@ -126,7 +129,8 @@
 
 20:         # [20] Talos
  0xFF02      # Current unit is...
- 288        # [288] Parthenon
+ 174         # [174] Quarry
+ 0xFF08      # Is not constructing add-on
  0xFF05      # Is not lifted off
  0xFFFF      # ==End of List==
 
@@ -163,7 +167,6 @@
 25:         # [25] Gladius
  0xFF02      # Current unit is...
  167         # [167] Stargate
- 184        # Has Unit: [184] Astral Omen
  0xFFFF      # ==End of List==
 
 26:         # [26] Magister
@@ -198,14 +201,14 @@
 
 32:         # [32] Harakan
  0xFF02      # Current unit is...
- 111        # [111] Barracks
+ 111         # [111] Stockade
  0xFF08      # Is not constructing add-on
  0xFF05      # Is not lifted off
  0xFFFF      # ==End of List==
 
 34:         # [34] Cleric
  0xFF02      # Current unit is...
- 111        # [111] Barracks
+ 111         # [111] Stockade
  0xFF05      # Is not lifted off
  0xFF08      # Is not constructing add-on
  0xFF04      # Must have add-on
@@ -215,7 +218,7 @@
 37:         # [37] Zethrokor
  0xFF02      # Current unit is...
  35          # [35] Larva
- 142        # Has Unit: [142] Quazrok Pool
+ 142         # Has Unit: [142] Quazeth Pool
  0xFF01      # Or
  0xFF03      # Must have...
  204         # [204] Liivral Pond
@@ -242,6 +245,9 @@
 41:         # [41] Droleth
  0xFF02      # Current unit is...
  35          # [35] Larva
+ 0xFF01      # Or
+ 0xFF02      # Current unit is...
+ 383         # [383] Omnivale
  0xFFFF      # ==End of List==
 
 42:         # [42] Ovileth
@@ -262,9 +268,6 @@
  0xFF02      # Current unit is...
  35        	 # [35] Larva
  219         # Has Unit: [219] Geszkath Grotto
- 0xFF01      # Or
- 0xFF03      # Must have...
- 212        # [212] Alkaj Chasm
  0xFFFF      # ==End of List==
 
 45:         # [45] Matraleth
@@ -291,7 +294,10 @@
  0xFF01      # Or
  0xFF02      # Current unit is...
  353         # [353] Ocsal Larva
- 152        # Has Unit: [152] Othstol Oviform
+ 224         # Has Unit: [224] Irol Iris
+ 0xFF01      # Or
+ 0xFF03      # Must have...
+ 152         # [152] Othstol Oviform
  0xFFFF      # ==End of List==
 
 48:         # [48] Alkajelisk
@@ -300,7 +306,7 @@
  0xFF01      # Or
  0xFF02      # Current unit is...
  353         # [353] Ocsal Larva
- 212        # Has Unit: [212] Alkaj Chasm
+ 219         # Has Unit: [219] Geszkath Grotto
  0xFFFF      # ==End of List==
 
 49:         # [49] Pazuzu
@@ -312,7 +318,7 @@
 
 50:         # [50] Cohort
  0xFF02      # Current unit is...
- 111        # [111] Barracks
+ 111         # [111] Stockade
  0xFF08      # Is not constructing add-on
  0xFF05      # Is not lifted off
  0xFFFF      # ==End of List==
@@ -347,7 +353,7 @@
 54:         # [54] Nathrokor
  0xFF02      # Current unit is...
  35          # [35] Larva
- 142        # Has Unit: [142] Quazrok Pool
+ 142         # Has Unit: [142] Quazeth Pool
  0xFF01      # Or
  0xFF03      # Must have...
  204         # [204] Liivral Pond
@@ -412,6 +418,9 @@
  0xFF01      # Or
  0xFF02      # Current unit is...
  166         # [166] Embassy
+ 0xFF01      # Or
+ 0xFF02      # Current unit is...
+ 383         # [383] Omnivale
  0xFFFF      # ==End of List==
 
 65:         # [65] Zealot
@@ -451,7 +460,7 @@
 
 72:         # [72] Solarion
  0xFF02      # Current unit is...
- 169        # [169] Fleet Beacon
+ 168         # [168] Argosy
  0xFFFF      # ==End of List==
 
 73:         # [73] Steward
@@ -462,7 +471,7 @@
 
 74:         # [74] Legionnaire
  0xFF02      # Current unit is...
- 164        # [164] Cenotaph
+ 160         # [160] Gateway
  0xFFFF      # ==End of List==
 
 75:         # [75] Amaranth
@@ -472,7 +481,7 @@
 
 76:         # [76] Hierophant
  0xFF02      # Current unit is...
- 164        # [164] Cenotaph
+ 160         # [160] Gateway
  0xFFFF      # ==End of List==
 
 77:         # [77] Heracles
@@ -504,7 +513,7 @@
 
 82:         # [82] Empyrean
  0xFF02      # Current unit is...
- 169        # [169] Fleet Beacon
+ 168         # [168] Argosy
  0xFFFF      # ==End of List==
 
 83:         # [83] Accantor (old)
@@ -519,10 +528,7 @@
 
 85:         # [85] Plasma Shell
  0xFF02      # Current unit is...
- 83        # [83] Accantor
+ 83          # [83] Accantor (old)
- 0xFF01      # Or
- 0xFF02      # Current unit is...
- 81        # [81] Clarion
  0xFF0E      # Has hangar space
  0xFFFF      # ==End of List==
 
@@ -548,7 +554,7 @@
 
 90:         # [90] Charlatan
  0xFF02      # Current unit is...
- 159        # [159] Prostration Stage
+ 161         # [161] Rogue Gallery
  0xFFFF      # ==End of List==
 
 91:         # [91] Wyvern
@@ -560,7 +566,7 @@
 
 92:         # [92] Cyprian
  0xFF02      # Current unit is...
- 111        # [111] Barracks
+ 111         # [111] Stockade
  0xFF08      # Is not constructing add-on
  0xFF05      # Is not lifted off
  0xFFFF      # ==End of List==
@@ -568,13 +574,12 @@
 94:         # [94] Exemplar
  0xFF02      # Current unit is...
  167         # [167] Stargate
- 184        # Has Unit: [184] Astral Omen
  0xFFFF      # ==End of List==
 
 95:         # [95] Quazilisk
  0xFF02      # Current unit is...
  35          # [35] Larva
- 142        # Has Unit: [142] Quazrok Pool
+ 142         # Has Unit: [142] Quazeth Pool
  0xFF01      # Or
  0xFF03      # Must have...
  204         # [204] Liivral Pond
@@ -584,9 +589,6 @@
  0xFF02      # Current unit is...
  35          # [35] Larva
  219         # Has Unit: [219] Geszkath Grotto
- 0xFF01      # Or
- 0xFF03      # Must have...
- 212        # [212] Alkaj Chasm
  0xFFFF      # ==End of List==
 
 97:         # [97] Zoryusthaleth
@@ -609,12 +611,12 @@
 
 99:         # [99] Idol
  0xFF02      # Current unit is...
- 158        # [158] Automaton Register
+ 155         # [155] Lattice
  0xFFFF      # ==End of List==
 
 100:        # [100] Golem
  0xFF02      # Current unit is...
- 158        # [158] Automaton Register
+ 155         # [155] Lattice
  0xFFFF      # ==End of List==
 
 102:        # [102] Augur
@@ -636,7 +638,7 @@
  161         # [161] Rogue Gallery
  0xFFFF      # ==End of List==
 
-106:        # [106] Command Center
+106:        # [106] Ministry
  0xFF02      # Current unit is...
  7           # [7] Mason
  0xFF01      # Or
@@ -647,7 +649,7 @@
 
 107:        # [107] Comsat Station
  0xFF02      # Current unit is...
- 106        # [106] Command Center
+ 106         # [106] Ministry
  0xFF01      # Or
  0xFF02      # Current unit is...
  215         # Treasury
@@ -657,7 +659,7 @@
 
 108:        # [108] Anvil
  0xFF02      # Current unit is...
- 106        # [106] Command Center
+ 106         # [106] Ministry
  0xFF01      # Or
  0xFF02      # Current unit is...
  215         # Treasury
@@ -685,7 +687,7 @@
  122         # Has Unit: [122] Atlas
  0xFFFF      # ==End of List==
 
-111:        # [111] Barracks
+111:        # [111] Stockade
  0xFF02      # Current unit is...
  7           # [7] Mason
  0xFF01      # Or
@@ -742,7 +744,7 @@
 
 117:        # [117] Covert Ops
  0xFF02      # Current unit is...
- 111        # [111] Barracks
+ 111        # [111] Stockade
  0xFF0C      # Does not have add-on attached
  0xFF07      # Is not training or morphing
  122        # Has Unit: [122] Atlas
@@ -758,7 +760,7 @@
 
 119:        # [119] Medbay
  0xFF02      # Current unit is...
- 111        # [111] Barracks
+ 111        # [111] Stockade
  0xFF0C      # Does not have add-on attached
  0xFF07      # Is not training or morphing
  0xFFFF      # ==End of List==
@@ -786,7 +788,7 @@
  0xFF02      # Current unit is...
  20        # [20] Talos
  0xFF0B      # Is not constructing
- 106        # Has Unit: [106] Command Center
+ 106        # Has Unit: [106] Ministry
  0xFFFF      # ==End of List==
 
 123:        # [123] Sovroleth
@@ -807,7 +809,7 @@
  0xFF0B      # Is not constructing
  0xFFFF      # ==End of List==
 
-125:        # [125] Bunker
+125:        # [125] Anchor
  0xFF02      # Current unit is...
  7           # [7] Mason
  0xFF01      # Or
@@ -887,7 +889,6 @@
 134:        # [134] Nydus Cesiant
  0xFF02     # Current unit is...
  143        # [143] Cagrant Cesiant
- 0xFF11      # Is not burrowed
  224        # Has Unit: [224] Irol Iris
  0xFF01     # Or
  0xFF03     # Must have...
@@ -962,7 +963,7 @@
  152        # [152] Othstol Oviform
  0xFFFF      # ==End of List==
 
-142:        # [142] Quazrok Pool
+142:        # [142] Quazeth Pool
  0xFF02      # Current unit is...
  41        # [41] Droleth
  0xFF01      # Or
@@ -1232,12 +1233,13 @@
 
 174:        # [174] Quarry
  0xFF02     # Current unit is...
- 106        # [106] Command Center
+ 106        # [106] Ministry
  0xFF01     # Or
  0xFF02     # Current unit is...
  215        # Treasury
  0xFF07     # Is not training or morphing
  0xFF0C     # Does not have add-on attached
+ 122        # Has Unit: [122] Atlas
  0xFFFF     # ==End of List==
 
 175:        # [175] Tinkerer's Tower
@@ -1304,7 +1306,7 @@
 
 187:        # [187] Savant
  0xFF02      # Current unit is...
- 111        # [111] Barracks
+ 111        # [111] Stockade
  0xFF08      # Is not constructing add-on
  0xFF05      # Is not lifted off
  0xFF04      # Must have add-on
@@ -1429,7 +1431,7 @@
 
 204:        # [204] Liivral Pond
  0xFF02      # Current unit is...
- 142        # [142] Quazrok Pool
+ 142        # [142] Quazeth Pool
  0xFF07      # Is not training or morphing
  224        # Has Unit: [224] Irol Iris
  0xFF01      # Or
@@ -1490,6 +1492,10 @@
 216:        # [216] Larvosk Cesiant
  0xFF02     # Current unit is...
  143        # [143] Cagrant Cesiant
+ 224        # Has Unit: [224] Irol Iris
+ 0xFF01     # Or
+ 0xFF03     # Must have...
+ 152        # [152] Othstol Oviform
  0xFFFF     # ==End of List==
 
 217:        # [217] Konvilisk
@@ -1891,8 +1897,9 @@
 
 290:        # [290] Pythean
  0xFF02      # Current unit is...
- 288        # [288] Parthenon
+ 203         # [203] Nanite Assembly
  0xFF05      # Is not lifted off
+ 0xFF08      # Is not constructing add-on
  0xFFFF      # ==End of List==
 
 291:        # [291] Ogroszaleth
@@ -2149,9 +2156,14 @@
 
 352:        # [352] Accantor
  0xFF02      # Current unit is...
- 304        # [304] Sequestered Icon
+ 220        # [220] Ardent Authority
  0xFFFF      # ==End of List==
  
+354:		# [354] Ocsal Cesiant
+ 0xFF02     # Current unit is...
+ 216        # [216] Larvosk Cesiant
+ 152        # Has Unit: [152] Othstol Oviform
+
 360:        # [360] Vassal
  0xFF02      # Current unit is...
  155         # [155] Lattice
@@ -2194,3 +2206,13 @@
  0xFF02      # Current unit is...
  366         # [366] Academy
  0xFFFF      # ==End of List==
+
+384:        # [384] Lodestone
+ 0xFF02      # Current unit is...
+ 106         # [106] Ministry
+ 0xFF01      # Or
+ 0xFF02      # Current unit is...
+ 215         # Treasury
+ 0xFF07      # Is not training or morphing
+ 0xFF0C      # Does not have add-on attached
+ 0xFFFF      # ==End of List==

mpq/arr/flingy.txt

@@ -159,7 +159,7 @@ Psionic Storm
 Yamato Gun
 Phase Disruptor
 STA/STS Cannon Overlay
-Sunken Colony Tentacle
+Surkith Cesiant Tentacle
 Venom
 Acid Spore
 Plasma Drip Hit (Unused)
@@ -493,9 +493,9 @@ Sevenstep Projectile
 Omnivale
 Lodestone
 Ocsal Cesiant
-Extended Flingy #287
+Potentate
-Extended Flingy #288
+Skortrith Cesiant Tentacle
-Extended Flingy #289
+Cyclops Weapon Impact
 Extended Flingy #290
 Extended Flingy #291
 Extended Flingy #292

mpq/arr/images.txt

@@ -78,8 +78,8 @@ Surkith Colony
 Surkith Colony Shadow
 Mature Chrysalis
 Mature Chrysalis Shadow
-Vithrath Haunt
+Tosvrol Haunt
-Vithrath Haunt Shadow
+Tosvrol Haunt Shadow
 Sovthrath Mound
 Sovthrath Mound Shadow
 Matravil Nest
@@ -504,7 +504,7 @@ Building Lifting Dust Type4
 White Circle
 Needle Spine Hit
 Plasma Drip Hit (Unused)
-Sunken Colony Tentacle
+Surkith Cesiant Tentacle
 Venom
 Venom Hit (Unused)
 Acid Spore
@@ -1701,8 +1701,8 @@ Spirtith Colony
 Spirtith Colony Shadow
 Diadem Attack A3
 Diadem Attack A4
-Skortrith Colony
+Skortrith Cesiant
-Skortrith Colony Shadow
+Skortrith Cesiant Shadow
 Anchor Attack Overlay (Green)
 Anchor Attack Overlay (Blue)
 Terran Unit Rubble (Medium)
@@ -1762,10 +1762,10 @@ Lodestone Overlay
 Lodestone Shadow
 Ocsal Cesiant
 Ocsal Cesiant Shadow
-Extended Image #762
+Potentate
-Extended Image #763
+Potentate Shadow
-Extended Image #764
+Skortrith Cesiant Tentacle
-Extended Image #765
+Cyclops Weapon Impact
 Extended Image #766
 Extended Image #767
 Extended Image #768

mpq/arr/sfxdata.txt

@@ -1400,11 +1400,11 @@ Siren Weapon Fire 03
 Keskathalor Weapon Fire 01
 Keskathalor Weapon Fire 02
 Ancile Passive Deactivate 01
-Cohort Weapon Fire 01
+Cohort Weaponfire 01
-Cohort Weapon Fire 02
+Cohort Weaponfire 02
-Cohort Weapon Fire 03
+Cohort Weaponfire 03
-Demiurge Weapon Fire 01
+Demiurge Weaponhit 01
-Demiurge Weapon Fire 02
+Demiurge Weaponhit 02
 Demiurge Gods Made Flesh Cast 01
 Demiurge Gods Made Flesh Cast 02
 Aspirant Weapon Fire 01
@@ -2083,9 +2083,9 @@ Azazel Help 01
 Azazel Help 02
 Azazel Help 03
 Azazel Help 04
-Cyclops Weaponfire 01
+Ramesses Weaponfire 01
-Cyclops Weaponfire 02
+Ramesses Weaponfire 02
-Cyclops Weaponfire 03
+Ramesses Weaponfire 03
 Dilettante Weaponfire 01
 Dilettante Weaponfire 02
 Dilettante Weaponfire 03
@@ -2516,45 +2516,45 @@ Mesk Advisor Tech 01
 Mesk Advisor Tech 02
 Mesk Advisor Warp 01
 Omnivale Selected 01
-Extended Sound #1
+Cataphract Weaponhit 01
-Extended Sound #1
+Cataphract Weaponhit 02
-Extended Sound #1
+Cataphract Weaponhit 03
-Extended Sound #1
+Claymore Weaponhit 01
-Extended Sound #1
+Claymore Weaponhit 02
-Extended Sound #1
+Potentate Weaponfire 01
-Extended Sound #1
+Potentate Weaponfire 02
-Extended Sound #1
+Demiurge Weaponfire 01
-Extended Sound #1
+Demiurge Weaponfire 02
-Extended Sound #1
+Demiurge Weaponfire 03
-Extended Sound #1
+Epigraph Weaponfire 01
-Extended Sound #1
+Epigraph Weaponfire 02
-Extended Sound #1
+Epigraph Weaponfire 03
-Extended Sound #1
+Gorgrokor Weaponfire B 01
-Extended Sound #1
+Gorgrokor Weaponfire B 02
-Extended Sound #1
+Gorgrokor Weaponfire B 03
-Extended Sound #1
+Tosgrilisk Weaponfire 01
-Extended Sound #1
+Tosgrilisk Weaponfire 02
-Extended Sound #1
+Protathalor Weaponfire 01
-Extended Sound #1
+Protathalor Weaponfire 02
-Extended Sound #1
+Protathalor Weaponfire 03
-Extended Sound #1
+Bactalisk Death 01
-Extended Sound #1
+Skortrith Weaponfire 01
-Extended Sound #1
+Skortrith Weaponhit 01
-Extended Sound #1
+Spirtith Weaponfire 01
-Extended Sound #1
+Spirtith Weaponfire 02
-Extended Sound #1
+Spirtith Weaponfire 03
-Extended Sound #1
+Spirtith Weaponhit 01
-Extended Sound #1
+Spirtith Weaponhit 02
-Extended Sound #1
+Psionic Storm Cast 01
-Extended Sound #1
+Cyclops Weaponfire 01
-Extended Sound #1
+Cyclops Weaponfire 02
-Extended Sound #1
+Cyclops Weapon Channel
-Extended Sound #1
+Cyclops Weaponhit 01
-Extended Sound #1
+Cyclops Weaponhit 02
-Extended Sound #1
+Cyclops Weaponhit 03
-Extended Sound #1
+Patriarch Weaponfire 01
-Extended Sound #1
+Patriarch Weaponfire 02
-Extended Sound #1
+Patriarch Weaponfire 03
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -1403,8 +1403,8 @@ cm\t\ancile\pas-b-01.wav
 cm\f\cohort\wf-01.wav
 cm\f\cohort\wf-02.wav
 cm\f\cohort\wf-03.wav
-cm\p\demiurge\wf-01.wav
+cm\p\demiurge\wh-01.wav
-cm\p\demiurge\wf-02.wav
+cm\p\demiurge\wh-02.wav
 cm\p\demiurge\cast-01.wav
 cm\p\demiurge\cast-02.wav
 cm\f\aspirant\wf-01.wav
@@ -2083,9 +2083,9 @@ cm\t\azazel\help-01.wav
 cm\t\azazel\help-02.wav
 cm\t\azazel\help-03.wav
 cm\t\azazel\help-04.wav
-cm\t\cyclops\wf-01.wav
+cm\t\ramesses\wf-01.wav
-cm\t\cyclops\wf-02.wav
+cm\t\ramesses\wf-02.wav
-cm\t\cyclops\wf-03.wav
+cm\t\ramesses\wf-03.wav
 cm\t\dilettante\wf-01.wav
 cm\t\dilettante\wf-02.wav
 cm\t\dilettante\wf-03.wav
@@ -2516,3 +2516,42 @@ cm\advisors\iskatumesk\meskad_tech-01.wav
 cm\advisors\iskatumesk\meskad_tech-02.wav
 cm\advisors\iskatumesk\meskad_warp-01.wav
 cm\n\_building\omnivale-what-01.wav
+cm\t\cataphract\wh-01.wav
+cm\t\cataphract\wh-02.wav
+cm\t\cataphract\wh-03.wav
+cm\t\claymore\wh-01.wav
+cm\t\claymore\wh-02.wav
+cm\p\potentate\wf-01.wav
+cm\p\potentate\wf-02.wav
+cm\p\demiurge\wf-01.wav
+cm\p\demiurge\wf-02.wav
+cm\p\demiurge\wf-03.wav
+cm\p\epigraph\wf-01.wav
+cm\p\epigraph\wf-02.wav
+cm\p\epigraph\wf-03.wav
+cm\z\gorgrokor\wf-b-01.wav
+cm\z\gorgrokor\wf-b-02.wav
+cm\z\gorgrokor\wf-b-03.wav
+cm\z\tosgrilisk\wf-01.wav
+cm\z\tosgrilisk\wf-02.wav
+cm\z\protathalor\wf-01.wav
+cm\z\protathalor\wf-02.wav
+cm\z\protathalor\wf-03.wav
+cm\z\bactalisk\dth-01.wav
+cm\z\skortrith\wf-01.wav
+cm\z\skortrith\wh-01.wav
+cm\z\spirtith\wf-01.wav
+cm\z\spirtith\wf-02.wav
+cm\z\spirtith\wf-03.wav
+cm\z\spirtith\wh-01.wav
+cm\z\spirtith\wh-02.wav
+cm\p\cantavis\psi-cast-01.wav
+cm\t\cyclops\wf-01.wav
+cm\t\cyclops\wf-02.wav
+cm\t\cyclops\wc-01.wav
+cm\t\cyclops\wh-01.wav
+cm\t\cyclops\wh-02.wav
+cm\t\cyclops\wh-03.wav
+cm\p\patriarch\wf-01.wav
+cm\p\patriarch\wf-02.wav
+cm\p\patriarch\wf-03.wav

mpq/arr/sprites.txt

@@ -353,7 +353,7 @@ Yamato Gun Trail
 EMP Shockwave Missile
 Needle Spine Hit
 Plasma Drip Hit (Unused)
-Sunken Colony Tentacle
+Surkith Colony Tentacle
 Venom
 Acid Spore
 Glave Wurm
@@ -881,9 +881,9 @@ Quazilisk (April Fools)
 Omnivale
 Lodestone
 Ocsal Cesiant
-Extended Sprite #1
+Potentate
-Extended Sprite #1
+Skortrith Cesiant Tentacle
-Extended Sprite #1
+Cyclops Weapon Impact
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1

mpq/arr/units.txt

@@ -383,7 +383,7 @@ Terran Madrigal (Furia Mode)
 Madrigal Turret (Furia)
 Omnivale
 Terran Lodestone
-Extended Unit #158
+Floor Hatch
 Extended Unit #159
 Extended Unit #160
 Extended Unit #161

mpq/arr/weapons.txt

@@ -82,7 +82,7 @@ Prismatic Cannon (Warden)
 Swarming Spores (Rililisk)
 Plasma Shell (Accantor) (deprecated)
 Stasis Field (Didact ability)
-Psi Storm (Cantavis ability)
+Psionic Storm (Cantavis ability)
 Hollowed Spores (Liiralisk)
 Phase Spear (Legionnaire)
 Harrying Talons (Akistrokor)
@@ -131,7 +131,7 @@ Hammerfall Beacon (Diadem)
 None
 Icarus Missiles (Luminary)
 Litany Cannons (Epigraph)
-Phase Saber (Striga)
+Projection Saber (Striga)
 Searing Venom (Axitrilisk)
 Hedon Cannon (Tarasque)
 Accelerated Plasmid (Tarasque)
@@ -156,7 +156,7 @@ Retractor Batteries (Pegasus)
 Lancet Missiles (Pegasus)
 Chimera Cannons (Hippogriff)
 Axis Drivers (Oberon)
-Acheron Missiles (Oberon)
+Pegasus Missiles (Hippogriff)
 Lazarus Salvo (Aion)
 Stellar Torch (Herald)
 Acid Salvo (Cikralisk)
@@ -204,8 +204,8 @@ Cylindrical Blaster (Analogue)
 Heirloom Batteries (Philoc)
 Nathrok Claws (Nathrokor)
 Calcification (Gorgrokor)
-Extended Weapon #77
+Talismanic Weaver (Potentate)
-Extended Weapon #78
+Phase Saber (Potentate)
 Extended Weapon #79
 Extended Weapon #80
 Extended Weapon #81