Implement HADRAL advisor and Optecton unit responses

mpq/arr/sfxdata.txt

@@ -2678,43 +2678,43 @@ Ardent Authority Selected 01
 Argosy Selected 01
 Prostration Stage Selected 01
 Hadron Selected 01
-Extended Sound #1
+HADRAL Advisor Addon Complete 01
-Extended Sound #1
+HADRAL Advisor Ally Attack A 01
-Extended Sound #1
+HADRAL Advisor Ally Attack P 01
-Extended Sound #1
+HADRAL Advisor Ally Attack T 01
-Extended Sound #1
+HADRAL Advisor Ally Attack Z 01
-Extended Sound #1
+HADRAL Advisor Army Attack 01
-Extended Sound #1
+HADRAL Advisor Base Attack 01
-Extended Sound #1
+HADRAL Advisor No Energy 01
-Extended Sound #1
+HADRAL Advisor Landing Interrupt 01
-Extended Sound #1
+HADRAL Advisor No Minerals 01
-Extended Sound #1
+HADRAL Advisor Missile Armed 01
-Extended Sound #1
+HADRAL Advisor Missile Launched 01
-Extended Sound #1
+HADRAL Advisor No Build 01
-Extended Sound #1
+HADRAL Advisor No Land 01
-Extended Sound #1
+HADRAL Advisor No Warp 01
-Extended Sound #1
+HADRAL Advisor Tech Up 01
-Extended Sound #1
+HADRAL Advisor No Vespene 01
-Extended Sound #1
+HADRAL Advisor Warp 01
-Extended Sound #1
+Optecton Ready 01
-Extended Sound #1
+Optecton Ready 02
-Extended Sound #1
+Optecton Ready 03
-Extended Sound #1
+Optecton Selected 01
-Extended Sound #1
+Optecton Selected 02
-Extended Sound #1
+Optecton Selected 03
-Extended Sound #1
+Optecton Selected 04
-Extended Sound #1
+Optecton Order Passive 01
-Extended Sound #1
+Optecton Order Passive 02
-Extended Sound #1
+Optecton Order Passive 03
-Extended Sound #1
+Optecton Order Passive 04
-Extended Sound #1
+Optecton Order Aggressive 01
-Extended Sound #1
+Optecton Order Aggressive 02
-Extended Sound #1
+Optecton Order Aggressive 03
-Extended Sound #1
+Optecton Order Aggressive 04
-Extended Sound #1
+Optecton Under Attack 01
-Extended Sound #1
+Optecton Under Attack 02
-Extended Sound #1
+Optecton Under Attack 03
-Extended Sound #1
+Optecton Under Attack 04
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -2677,4 +2677,41 @@ cm\p\dracadin\wh-03.wav
 cm\p\_building\ardent-authority.wav
 cm\p\_building\argosy.wav
 cm\p\_building\prostration-stage.wav
-cm\t\_building\hadron.wav
+cm\t\_building\hadron.wav
+cm\advisors\hadral\hadralad_addon-01.wav
+cm\advisors\hadral\hadralad_allyattack-a-01.wav
+cm\advisors\hadral\hadralad_allyattack-p-01.wav
+cm\advisors\hadral\hadralad_allyattack-t-01.wav
+cm\advisors\hadral\hadralad_allyattack-z-01.wav
+cm\advisors\hadral\hadralad_armyattack-01.wav
+cm\advisors\hadral\hadralad_baseattack-01.wav
+cm\advisors\hadral\hadralad_energy-01.wav
+cm\advisors\hadral\hadralad_intland-01.wav
+cm\advisors\hadral\hadralad_minerals-01.wav
+cm\advisors\hadral\hadralad_missile-01.wav
+cm\advisors\hadral\hadralad_missilelaunch-01.wav
+cm\advisors\hadral\hadralad_nobuild-01.wav
+cm\advisors\hadral\hadralad_noland-01.wav
+cm\advisors\hadral\hadralad_nowarp-01.wav
+cm\advisors\hadral\hadralad_tech-01.wav
+cm\advisors\hadral\hadralad_vespene-01.wav
+cm\advisors\hadral\hadralad_warp-01.wav
+cm\p\optecton\rdy-01.wav
+cm\p\optecton\rdy-02.wav
+cm\p\optecton\rdy-03.wav
+cm\p\optecton\wht-01.wav
+cm\p\optecton\wht-02.wav
+cm\p\optecton\wht-03.wav
+cm\p\optecton\wht-04.wav
+cm\p\optecton\yes-01.wav
+cm\p\optecton\yes-02.wav
+cm\p\optecton\yes-03.wav
+cm\p\optecton\yes-04.wav
+cm\p\optecton\agg-01.wav
+cm\p\optecton\agg-02.wav
+cm\p\optecton\agg-03.wav
+cm\p\optecton\agg-04.wav
+cm\p\optecton\hlp-01.wav
+cm\p\optecton\hlp-02.wav
+cm\p\optecton\hlp-03.wav
+cm\p\optecton\hlp-04.wav

mpq/scripts/iscript.txt

@@ -44407,8 +44407,8 @@ Unused1       	[NONE]
 GndAttkRpt    	MatrixGndAttkRpt
 AirAttkRpt    	MatrixGndAttkRpt
 CastSpell     	[NONE]
-GndAttkToIdle 	MatrixGndAttkToIdle
+GndAttkToIdle 	MatrixBuilt
-AirAttkToIdle 	MatrixGndAttkToIdle
+AirAttkToIdle 	MatrixBuilt
 Unused2       	[NONE]
 Walking       	[NONE]
 WalkingToIdle 	[NONE]
@@ -44423,7 +44423,7 @@ WorkingToIdle 	MatrixBuilt
 WarpIn        	MatrixWarpIn
 Unused3       	[NONE]
 StarEditInit  	[NONE]
-Disable       	MatrixDisable
+Disable       	ScourgeLocal00
 Burrow        	[NONE]
 UnBurrow      	[NONE]
 Enable        	MatrixEnable
@@ -44432,8 +44432,6 @@ Enable        	MatrixEnable
 
 MatrixInit:
 	imgul             	1010 0 0 # Matrix Shadow (cm\protoss\matrix-shadow.grp)
-MatrixLocal00:
-	playfram          	0x00
 	goto              	MatrixBuilt
 
 MatrixBuilt:
@@ -44466,20 +44464,14 @@ MatrixGndAttkRpt:
 	imgol				1163 0 -25 # Matrix impact
 	gotorepeatattk
 	ignorerest
-MatrixGndAttkToIdle:
+	goto				MatrixBuilt
-	wait              	1
-	goto              	MatrixLocal00
 	
 MatrixEnable:
 	playfram			0x00
 	goto				MatrixBuilt
 
-MatrixDisable:
-	wait				125
-	goto				MatrixDisable
-
 MatrixWarpIn:
-	imgol             	1014 0 0 # Matrix Warp Flash (cm\protoss\matrix.grp)
+	imgol             	1012 0 0 # Matrix Warp Flash (cm\protoss\matrix.grp)
 	goto              	MatrixBuilt
 
 # ----------------------------------------------------------------------------- #

patchnotes.md

@@ -23,6 +23,7 @@ Patch goals include:
 - [Custom triggers](https://www.fraudsclub.com/cosmonarchy-bw/sites/scenario-setup/#trigger-comments):
 	- Added "unit_color" custom trigger condition
 	- Added "kill", "move_unit", "set_unit_stat", and "set_unit_behavior" custom trigger actions
+- HADRAL custom advisor is now available
 
 ## Game modes
 - Faction Wars:
@@ -59,6 +60,7 @@ Patch goals include:
 	- Weaponhit: Dracadin
 - New unit responses for:
 	- Hadron, Prostration Stage, Ardent Authority, Argosy (c. IskatuMesk)
+	- Optecton
 
 ## AI
 - Improved the number of Hachirosks requested by most Zerg build orders