diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index ceaab7fc..b9a835a3 100644 Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index f041c4a6..16062b77 100644 --- a/mpq/arr/sfxdata.txt +++ b/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 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +HADRAL Advisor Addon Complete 01 +HADRAL Advisor Ally Attack A 01 +HADRAL Advisor Ally Attack P 01 +HADRAL Advisor Ally Attack T 01 +HADRAL Advisor Ally Attack Z 01 +HADRAL Advisor Army Attack 01 +HADRAL Advisor Base Attack 01 +HADRAL Advisor No Energy 01 +HADRAL Advisor Landing Interrupt 01 +HADRAL Advisor No Minerals 01 +HADRAL Advisor Missile Armed 01 +HADRAL Advisor Missile Launched 01 +HADRAL Advisor No Build 01 +HADRAL Advisor No Land 01 +HADRAL Advisor No Warp 01 +HADRAL Advisor Tech Up 01 +HADRAL Advisor No Vespene 01 +HADRAL Advisor Warp 01 +Optecton Ready 01 +Optecton Ready 02 +Optecton Ready 03 +Optecton Selected 01 +Optecton Selected 02 +Optecton Selected 03 +Optecton Selected 04 +Optecton Order Passive 01 +Optecton Order Passive 02 +Optecton Order Passive 03 +Optecton Order Passive 04 +Optecton Order Aggressive 01 +Optecton Order Aggressive 02 +Optecton Order Aggressive 03 +Optecton Order Aggressive 04 +Optecton Under Attack 01 +Optecton Under Attack 02 +Optecton Under Attack 03 +Optecton Under Attack 04 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 7248b77d..8c821593 100644 --- a/mpq/arr/sounds.txt +++ b/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 \ No newline at end of file +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 \ No newline at end of file diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 266a7df7..521a9fc1 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 1c8e7aae..fa557585 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -44407,8 +44407,8 @@ Unused1 [NONE] GndAttkRpt MatrixGndAttkRpt AirAttkRpt MatrixGndAttkRpt CastSpell [NONE] -GndAttkToIdle MatrixGndAttkToIdle -AirAttkToIdle MatrixGndAttkToIdle +GndAttkToIdle MatrixBuilt +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: - wait 1 - goto MatrixLocal00 + goto MatrixBuilt 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 # ----------------------------------------------------------------------------- # diff --git a/mpq/sound/cm/advisors/hadral/hadralad_addon-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_addon-01.wav new file mode 100644 index 00000000..ddf8642d Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_addon-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_allyattack-a-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_allyattack-a-01.wav new file mode 100644 index 00000000..1784e63b Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_allyattack-a-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_allyattack-p-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_allyattack-p-01.wav new file mode 100644 index 00000000..b5e3e5de Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_allyattack-p-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_allyattack-t-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_allyattack-t-01.wav new file mode 100644 index 00000000..42664e4c Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_allyattack-t-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_allyattack-z-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_allyattack-z-01.wav new file mode 100644 index 00000000..250caa44 Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_allyattack-z-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_armyattack-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_armyattack-01.wav new file mode 100644 index 00000000..f6fd525a Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_armyattack-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_baseattack-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_baseattack-01.wav new file mode 100644 index 00000000..9888fd3d Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_baseattack-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_energy-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_energy-01.wav new file mode 100644 index 00000000..a4821f69 Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_energy-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_intland-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_intland-01.wav new file mode 100644 index 00000000..49c65fbf Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_intland-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_minerals-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_minerals-01.wav new file mode 100644 index 00000000..cc3ef4de Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_minerals-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_missile-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_missile-01.wav new file mode 100644 index 00000000..3c852e74 Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_missile-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_missilelaunch-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_missilelaunch-01.wav new file mode 100644 index 00000000..be71bed7 Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_missilelaunch-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_nobuild-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_nobuild-01.wav new file mode 100644 index 00000000..43e140a2 Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_nobuild-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_noland-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_noland-01.wav new file mode 100644 index 00000000..1f5c458f Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_noland-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_nowarp-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_nowarp-01.wav new file mode 100644 index 00000000..16a2af12 Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_nowarp-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_tech-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_tech-01.wav new file mode 100644 index 00000000..4c3b1940 Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_tech-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_vespene-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_vespene-01.wav new file mode 100644 index 00000000..07eece2a Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_vespene-01.wav differ diff --git a/mpq/sound/cm/advisors/hadral/hadralad_warp-01.wav b/mpq/sound/cm/advisors/hadral/hadralad_warp-01.wav new file mode 100644 index 00000000..50bc3007 Binary files /dev/null and b/mpq/sound/cm/advisors/hadral/hadralad_warp-01.wav differ diff --git a/mpq/sound/cm/p/optecton/agg-01.wav b/mpq/sound/cm/p/optecton/agg-01.wav new file mode 100644 index 00000000..7bbef085 Binary files /dev/null and b/mpq/sound/cm/p/optecton/agg-01.wav differ diff --git a/mpq/sound/cm/p/optecton/agg-02.wav b/mpq/sound/cm/p/optecton/agg-02.wav new file mode 100644 index 00000000..01eb5473 Binary files /dev/null and b/mpq/sound/cm/p/optecton/agg-02.wav differ diff --git a/mpq/sound/cm/p/optecton/agg-03.wav b/mpq/sound/cm/p/optecton/agg-03.wav new file mode 100644 index 00000000..cf679a97 Binary files /dev/null and b/mpq/sound/cm/p/optecton/agg-03.wav differ diff --git a/mpq/sound/cm/p/optecton/agg-04.wav b/mpq/sound/cm/p/optecton/agg-04.wav new file mode 100644 index 00000000..5fbabc02 Binary files /dev/null and b/mpq/sound/cm/p/optecton/agg-04.wav differ diff --git a/mpq/sound/cm/p/optecton/hlp-01.wav b/mpq/sound/cm/p/optecton/hlp-01.wav new file mode 100644 index 00000000..0fc71e0c Binary files /dev/null and b/mpq/sound/cm/p/optecton/hlp-01.wav differ diff --git a/mpq/sound/cm/p/optecton/hlp-02.wav b/mpq/sound/cm/p/optecton/hlp-02.wav new file mode 100644 index 00000000..d83daf52 Binary files /dev/null and b/mpq/sound/cm/p/optecton/hlp-02.wav differ diff --git a/mpq/sound/cm/p/optecton/hlp-03.wav b/mpq/sound/cm/p/optecton/hlp-03.wav new file mode 100644 index 00000000..4b122803 Binary files /dev/null and b/mpq/sound/cm/p/optecton/hlp-03.wav differ diff --git a/mpq/sound/cm/p/optecton/hlp-04.wav b/mpq/sound/cm/p/optecton/hlp-04.wav new file mode 100644 index 00000000..97fcd14a Binary files /dev/null and b/mpq/sound/cm/p/optecton/hlp-04.wav differ diff --git a/mpq/sound/cm/p/optecton/rdy-01.wav b/mpq/sound/cm/p/optecton/rdy-01.wav new file mode 100644 index 00000000..7911329a Binary files /dev/null and b/mpq/sound/cm/p/optecton/rdy-01.wav differ diff --git a/mpq/sound/cm/p/optecton/rdy-02.wav b/mpq/sound/cm/p/optecton/rdy-02.wav new file mode 100644 index 00000000..13ab8d3f Binary files /dev/null and b/mpq/sound/cm/p/optecton/rdy-02.wav differ diff --git a/mpq/sound/cm/p/optecton/rdy-03.wav b/mpq/sound/cm/p/optecton/rdy-03.wav new file mode 100644 index 00000000..073706a9 Binary files /dev/null and b/mpq/sound/cm/p/optecton/rdy-03.wav differ diff --git a/mpq/sound/cm/p/optecton/wht-01.wav b/mpq/sound/cm/p/optecton/wht-01.wav new file mode 100644 index 00000000..91f00359 Binary files /dev/null and b/mpq/sound/cm/p/optecton/wht-01.wav differ diff --git a/mpq/sound/cm/p/optecton/wht-02.wav b/mpq/sound/cm/p/optecton/wht-02.wav new file mode 100644 index 00000000..bf44d1ef Binary files /dev/null and b/mpq/sound/cm/p/optecton/wht-02.wav differ diff --git a/mpq/sound/cm/p/optecton/wht-03.wav b/mpq/sound/cm/p/optecton/wht-03.wav new file mode 100644 index 00000000..b2a03b67 Binary files /dev/null and b/mpq/sound/cm/p/optecton/wht-03.wav differ diff --git a/mpq/sound/cm/p/optecton/wht-04.wav b/mpq/sound/cm/p/optecton/wht-04.wav new file mode 100644 index 00000000..a44a61eb Binary files /dev/null and b/mpq/sound/cm/p/optecton/wht-04.wav differ diff --git a/mpq/sound/cm/p/optecton/yes-01.wav b/mpq/sound/cm/p/optecton/yes-01.wav new file mode 100644 index 00000000..3b5a726f Binary files /dev/null and b/mpq/sound/cm/p/optecton/yes-01.wav differ diff --git a/mpq/sound/cm/p/optecton/yes-02.wav b/mpq/sound/cm/p/optecton/yes-02.wav new file mode 100644 index 00000000..769b2df4 Binary files /dev/null and b/mpq/sound/cm/p/optecton/yes-02.wav differ diff --git a/mpq/sound/cm/p/optecton/yes-03.wav b/mpq/sound/cm/p/optecton/yes-03.wav new file mode 100644 index 00000000..40b3414c Binary files /dev/null and b/mpq/sound/cm/p/optecton/yes-03.wav differ diff --git a/mpq/sound/cm/p/optecton/yes-04.wav b/mpq/sound/cm/p/optecton/yes-04.wav new file mode 100644 index 00000000..f1d5928c Binary files /dev/null and b/mpq/sound/cm/p/optecton/yes-04.wav differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 4a89f040..845f9504 100644 Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp index 0cfe7172..5066e00d 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/patchnotes.md b/patchnotes.md index bd690619..85e8b24c 100644 --- a/patchnotes.md +++ b/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 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index c1b7fde3..6275f095 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ