Sync editor materials and clean patch notes

CMBW-editor/ai/cm_protoss.asc3

@@ -3950,7 +3950,12 @@ script_id PMCx
 	goto request_static_defense
 	
 	:request_static_defense_check
-	var AtL|Jump mining_count_var 3 request_matrix_check_pre 13
+	var AtL|Jump mining_count_var 3 request_engram_check_pre 13
+	var AtL|Jump mining_count_var 2 request_matrix_check_pre 13
+	goto request_warden_check
+	
+	:request_engram_check_pre
+	multi request_engram_check
 	
 	:request_matrix_check_pre
 	multi request_matrix_check
@@ -3992,6 +3997,23 @@ script_id PMCx
 	add_bld 255 matrix 1 10 95
 	stop
 	
+	:request_engram_check
+	local 255 AtL 10 engram blank
+	local 255 AtL 4 engram request_engram_check2
+	add_bld 255 engram 1 4 96
+	stop
+	
+	:request_engram_check2
+	var Ex|Jump under_attack_by_ground_var 1 request_engram_check3 13
+	var Ex|Jump under_attack_by_air_var 1 request_engram_check3 13
+	var AtM|Jump mining_count_var 2 blank 13
+	add_bld 255 engram 1 7 96
+	stop
+	
+	:request_engram_check3
+	add_bld 255 engram 1 10 96
+	stop
+	
 	:request_embassy
 	wait 24
 	local 255 AtM 3 Group_Factories request_embassy

CMBW-editor/ai/cm_zerg.asc3

@@ -1041,6 +1041,7 @@ script_id ZMCx
 	wait 1
 	var Sub gas_timer_loop_var 1 13
 	var AtL|Jump gas_timer_loop_var 1 gas_timer_loop 13
+	notowns irol_iris gas_timer_loop
 	var Set build_gas_var 1 13
 	stop
 	

CMBW-editor/grafting/Buttons.txt

@@ -472,7 +472,7 @@
   4, 195, 4, 3, 195, 195, 364, 0  # Blackjack, Can Create Unit\Building ([195] Blackjack), Create Unit ([195] Blackjack)
   5, 406, 4, 3, 256, 256, 537, 0  # Matador, Can Create Unit\Building ([256] Matador), Create Unit ([256] Matador)
   4, 5, 4, 3, 5, 5, 591, 704  # Phalanx (Tank Mode), Can Create Unit\Building ([5] Phalanx (Tank Mode)), Create Unit ([5] Phalanx (Tank Mode))
-  210, 5, 4, 3, 210, 210, 443, 0  # Tarasque, Can Create Unit\Building ([210] Tarasque), Create Unit ([210] Tarasque)
+  4, 210, 4, 3, 210, 210, 443, 0  # Tarasque, Can Create Unit\Building ([210] Tarasque), Create Unit ([210] Tarasque)
   5, 27, 4, 3, 27, 27, 1144, 1143  # Madrigal, Can Create Unit\Building ([27] Madrigal), Create Unit ([27] Madrigal)
   6, 286, 13, 1, 0, 0, 672, 0  # Set Rally Point, Rally Point (0), Rally Point (0)
   7, 200, 4, 32, 200, 200, 1145, 0  # Scrapyard, Can Create Unit\Building ([200] Scrapyard), Create AddOn ([200] Scrapyard)
@@ -692,7 +692,7 @@
 115:	# [115] Supreme Protoss Structures
   1, 159, 4, 31, 159, 159, 386, 0  # Prostration Stage, Can Create Unit\Building ([159] Prostration Stage), Create Building - Protoss ([159] Prostration Stage)
 # 2, 156, 4, 31, 295, 295, 1249, 0  # Xenolith, Can Create Unit\Building ([295] Xenolith), Create Building - Protoss ([295] Xenolith)
-  3, 402, 4, 31, 294, 294, 1248, 0  # Engram, Can Create Unit\Building ([294] Engram), Create Building - Protoss ([294] Engram)
+  3, 444, 4, 31, 294, 294, 1248, 0  # Engram, Can Create Unit\Building ([294] Engram), Create Building - Protoss ([294] Engram)
   4, 225, 4, 31, 225, 225, 1354, 0  # Sanctum of Sorrow, Can Create Unit\Building ([225] Sanctum of Sorrow), Create Building - Protoss ([225] Sanctum of Sorrow)
   5, 428, 4, 31, 278, 278, 1113, 0  # Strident Stratum, Can Create Unit\Building ([278] Strident Stratum), Create Building - Protoss ([278] Strident Stratum)
   6, 169, 4, 31, 169, 169, 643, 0  # Fleet Beacon, Can Create Unit\Building ([169] Fleet Beacon), Create Building - Protoss ([169] Fleet Beacon)
@@ -1349,7 +1349,7 @@
   4, 254, 41, 20, 0, 0, 667, 0  # Patrol, Not Burrowed(Move\Stop\Patrol\Hold Position) (0), Patrol (0)
   5, 255, 41, 21, 0, 0, 668, 0  # Hold Position, Not Burrowed(Move\Stop\Patrol\Hold Position) (0), Hold Position (0)
   6, 39, 4, 38, 39, 39, 577, 740  # Ultrokor, Can Create Unit\Building ([39] Ultrokor), Unit Morph ([39] Ultrokor)
-  7, 40, 23, 57, 34, 0, 1136, 1136  # Reconstitution, Spell Researched ([34] Healing - Cleric), Cancel (0)
+  7, 40, 23, 57, 34, 0, 1136, 1136  # Mitosis, Spell Researched ([34] Healing - Cleric), Cancel (0)
   8, 263, 23, 57, 34, 0, 331, 331  # Swarming Omen, Spell Researched ([34] Healing - Cleric), Cancel (0)
   9, 260, 39, 42, 11, 0, 373, 0  # Unburrow, Is Using Ability ([11] Burrowing - Zerg Ground), Unburrow (0)
   9, 259, 38, 41, 11, 11, 372, 382  # Burrow, Ability Is Researched ([11] Burrowing - Zerg Ground), Burrow ([11] Burrowing - Zerg Ground)
@@ -1738,6 +1738,7 @@
 247:	# Starpad
   1, 228, 35, 9, 0, 0, 664, 0  # Move, Building Can Move And Has Lifted Off (0), Move (0)
   1, 8, 4, 3, 8, 8, 593, 0  # Wraith, Can Create Unit\Building ([8] Wraith), Create Unit ([8] Wraith)
+  1, 478, 4, 3, 328, 328, 1511, 0  # Philoc, Can Create Unit\Building ([328] Philoc), Create Unit ([328] Philoc)
   2, 229, 35, 10, 0, 0, 665, 0  # Stop, Building Can Move And Has Lifted Off (0), Stop (0)
   2, 425, 4, 3, 275, 275, 712, 703  # Wendigo, Can Create Unit\Building ([275] Wendigo), Create Unit ([275] Wendigo)
   2, 405, 4, 3, 255, 255, 525, 0  # Ancile, Can Create Unit\Building ([255] Ancile), Create Unit ([255] Ancile)
@@ -2204,6 +2205,10 @@
   7, 15, 31, 5, 5, 0, 1775, 1775  # Support Mode, Tank Is In Siege Mode ([5] Terran Deployment), Mobile Mode (0)
   8, 366, 23, 57, 34, 0, 1472, 1472  # Nanite Field, Spell Researched ([34] Healing - Cleric), Cancel (0)
 
+306:	# Attacking Structure
+  2, 229, 9, 10, 0, 0, 665, 0  # Stop, Attacking Building (0), Stop (0)
+  3, 230, 9, 13, 0, 0, 666, 0  # Attack, Attacking Building (0), Attack (Building) (0)
+
 #### Buttonsets END ####
 #### Unit Settings START ####
 
@@ -3211,8 +3216,8 @@ Unit 293: # [293] Zerg Surkith Colony
   298, 65535, 2, 1 # Button Set: [298] Skortrith Colony
                    # Stat Preset: Building
 
-Unit 294: # [294] Terran Horseman
+Unit 294: # [294] Protoss Engram
-  12, 65535, 1, 0  # Button Set: [12] Basic Commands
+  306, 65535, 1, 0  # Button Set: [306] Attacking Structure
                    # Stat Preset: Normal Unit
 
 Unit 297: # [297] Terran Sevenstep
@@ -3263,6 +3268,10 @@ Unit 319: # [319] Zerg Mortothrokor
   287, 65535, 1, 0  # Button Set: Mortothrokor
                    # Stat Preset: Normal Unit
 
+Unit 328: # [238] Terran Philoc
+  12, 65535, 1, 0  # Button Set: [12] Basic Commands
+                   # Stat Preset: Normal Unit
+
 Unit 332: # [332] Terran Civilian
   14, 65535, 3, 2  # Button Set: [14] Transport
                    # Stat Preset: Normal Unit

CMBW-editor/grafting/Orders.txt

@@ -111,7 +111,7 @@
   293               # [293] Skortrith Colony
   0xFF01            # Or
   0xFF02            # Current unit is...
-  162               # [294] Engram
+  294               # [294] Engram
   0xFFFF            # ==End of List==
 
 19:                 # [19] Tower Attack
@@ -143,7 +143,7 @@
   293               # [293] Skortrith Colony
   0xFF01            # Or
   0xFF02            # Current unit is...
-  162               # [294] Engram
+  294               # [294] Engram
   0xFFFF            # ==End of List==
 
 20:                 # [20] Vulture Mine

CMBW-editor/grafting/Units.txt

@@ -1132,7 +1132,7 @@
   182               # [182] Artisan
   0xFFFF            # ==End of List==
 
-162:                # [162] Photon Cannon
+162:                # [162] Warden
   0xFF02            # Current unit is...
   64                # [64] Scribe
   0xFF01            # Or
@@ -1920,11 +1920,12 @@
   0xFF05            # Is not lifted off
   0xFFFF            # ==End of List==
 
-294:                # [294] Horseman
+294:                # [294] Engram
   0xFF02            # Current unit is...
-  295               # [295] Iron Council
+  64                # [64] Scribe
-  0xFF08            # Is not constructing add-on
+  0xFF01            # Or
-  0xFF05            # Is not lifted off
+  0xFF02            # Current unit is...
+  182               # [182] Artisan
   0xFFFF            # ==End of List==
 
 295:                # [295] Iron Council
@@ -2101,14 +2102,10 @@
   303               # Has Unit: [303] Rakzogth Roost
   0xFFFF            # ==End of List==
 
-328:                # [328] Axtoth Axis
+328:                # [328] Philoc
   0xFF02            # Current unit is...
-  41                # [41] Droleth
+  254               # [254] Starpad
-  0xFF01            # Or
+  0xFF05            # Is not lifted off
-  0xFF02            # Current unit is...
-  47                # [47] Gosvileth
-  0xFF11            # Is not burrowed
-  152               # Has Unit: [152] Othstol Oviform
   0xFFFF            # ==End of List==
 
 329:                # [329] Begrozith Barrow

CMBW-editor/unitdef.txt

@@ -36,7 +36,7 @@ military seraph = 9
 @spellcaster(seraph)
 military trojan = 11
 military minotaur = 12
-military nuclear_missile = 14
+military morningstar = 14
 military harakan = 32
 military cleric = 34
 @spellcaster(cleric)
@@ -98,32 +98,32 @@ military jester = 301
 # Terran buildings
 building mason = 7
 #
-building command_center = 106
+building ministry = 106
 building comsat_station = 107
-building missile_silo = 108
+building anvil = 108
 building supply_depot = 109
 building reservoir = 110
-building barracks = 111
+building stockade = 111
 building fulcrum = 113
 building starport = 114
 building commandment = 115
 building daedala = 116
-building covert_ops = 117
+building covenant = 117
-building machine_shop = 120
+building palladium = 120
 building atlas = 122
 building watchdog = 124
-building bunker = 125
+building anchor = 125
 
 # Terran NGS buildings
-building medbay = 119
+building vestry = 119
-building munitions_bay = 121
+building rotary = 121
-building ion_cannon = 127
+building diadem = 127
 building guildhall = 147
 building fountainhead = 163
 building quarry = 174
 building tinkerers_tower = 175
-building particle_accelerator = 189
+building hadron = 189
-building biotic_base = 190
+building biotic_bastion = 190
 building iron_foundry = 198
 building captaincy = 199
 building scrapyard = 200
@@ -238,6 +238,7 @@ building grand_library = 226
 building matrix = 252
 building strident_stratum = 278
 building auxiliary_oasis = 279
+building engram = 294
 building sequestered_icon = 304
 building unitary_union = 305
 building hall_of_heretics = 349

patchnotes.md

@@ -1,54 +1,5 @@
-# 18 June 2023 - prospective patch notes
+# XX June 2023 - prospective patch notes
 
 ## Designer's Notes
 
-Much of this update is targeted at bringing AI back up to snuff, to complement the latest campaign mission developments. Bugfixes and stability improvements are also featured, with the hope of achieving sufficient stability for a 1v1 tournament later this month!
+TBD
-
-## Bugfixes
-- Many more nullsprite crashes, along with other assorted instabilities, have been protected against
-- Spamming orders on Paladins during their attack sequence is no longer unstable, nor does it spam the target lock sound effect
-- A worker wandering edge case (fairly common in the early game) has been fixed (c. Veeq7)
-- Dual birth units created by Ocsal Larvae no longer regress into base strains
-- Units with Offset: Linear can no longer fail to update their line target
-- Units created by the custom "spawn" trigger command no longer move anywhere if %move_pos is not defined
-- Konvilisks and Akistrokors now correctly play order acknowledgement unit responses
-- Lardfix: Text in transmissions now remains onscreen for the total transmission length instead of sound file length (fixes text display coupled with short sounds; c. DarkenedFantasies)
-
-## AI
-- Worker allocation has been better optimized for the new resource model (c. Veeq7)
-- AI should now harvest from more than 3 vespene nodes (c. Veeq7)
-- Terran and Zerg AI should no longer occasionally get refinery requests before unlocking tier 2
-- Terran and Zerg AI now request advanced refineries when tier 3 is unlocked
-- AI combatants will now focus deployed units (e.g. Matador, Phalanx) more often
-
-## Audiovisuals
-- New model for:
-	- Southpaw
-	- Manifold
-	- Gladius (c. Solstice)
-- Adjusted visuals for:
-	- Cyprian (shadow moved up visually)
-- New effect for:
-	- Madrigal (Imperioso weaponhit)
-	- Aion (weaponhit)
-- New names for:
-	- Stockade (formerly Barracks)
-	- Vestry (formerly Medbay)
-	- Covenant (formerly Covert Ops)
-- Improved collision for:
-	- Scrapyard
-	- Palladium
-
-## Factions
-- [Futurist Federation](https://www.fraudsclub.com/cosmonarchy-bw/terran.php?faction=futurist-federation) now enables:
-	- [Philoc](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/philoc) from Starpad (replaces Wraith)
-- [Golden Republic](https://www.fraudsclub.com/cosmonarchy-bw/terran.php?faction=golden-republic) now enables:
-	- [Aspirant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/aspirant) from Fulcrum (replaces Goliath)
-	- [Luminary](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/luminary) from Starport (replaces Seraph)
-- [Nydus Trinity](https://www.fraudsclub.com/cosmonarchy-bw/terran.php?faction=nydus-trinity) now enables:
-	- [Cohort](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cohort) from Barracks (replaces Cyprian)
-	- [Tarasque](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/tarasque) from Fulcrum with attached Palladium (replaces Phalanx)
-
-## Protoss
-- **NEW:** [Engram](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/engram):
-	- Heavy tower; Warped from Scribe and Artisan