diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 21d756ae..2a033dc9 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3537,7 +3537,9 @@ cm\f-t\cannibal\wf-02.wav cm\f-t\cannibal\wf-03.wav cm\f-t\cannibal\wf-04.wav cm\advisors\goku\gokuad_addon-01.wav +cm\advisors\goku\gokuad_addon-02.wav cm\advisors\goku\gokuad_addonabandon-01.wav +cm\advisors\goku\gokuad_addonabandon-02.wav cm\advisors\goku\gokuad_allyattack-p-01.wav cm\advisors\goku\gokuad_allyattack-p-02.wav cm\advisors\goku\gokuad_allyattack-p-03.wav @@ -3557,29 +3559,33 @@ cm\advisors\goku\gokuad_allyattack-k-01.wav cm\advisors\goku\gokuad_allyattack-k-02.wav cm\advisors\goku\gokuad_allyattack-k-03.wav cm\advisors\goku\gokuad_arena-01.wav +cm\advisors\goku\gokuad_arena-02.wav cm\advisors\goku\gokuad_armyattack-01.wav cm\advisors\goku\gokuad_armyattack-02.wav cm\advisors\goku\gokuad_armyattack-03.wav -cm\advisors\goku\gokuad_armyattack-04.wav +cm\advisors\goku\gokuad_armyattack-03.wav cm\advisors\goku\gokuad_assembly-01.wav +cm\advisors\goku\gokuad_assembly-02.wav cm\advisors\goku\gokuad_baseattack-01.wav cm\advisors\goku\gokuad_baseattack-02.wav cm\advisors\goku\gokuad_baseattack-03.wav -cm\advisors\goku\gokuad_baseattack-04.wav +cm\advisors\goku\gokuad_baseattack-03.wav cm\advisors\goku\gokuad_build-01.wav cm\advisors\goku\gokuad_buildzerg-01.wav cm\advisors\goku\gokuad_energy-01.wav cm\advisors\goku\gokuad_energy-02.wav cm\advisors\goku\gokuad_energy-03.wav -cm\advisors\goku\gokuad_energy-04.wav +cm\advisors\goku\gokuad_energy-03.wav cm\advisors\goku\gokuad_intland-01.wav cm\advisors\goku\gokuad_intland-02.wav cm\advisors\goku\gokuad_minerals-01.wav cm\advisors\goku\gokuad_minerals-02.wav cm\advisors\goku\gokuad_minerals-03.wav -cm\advisors\goku\gokuad_minerals-04.wav +cm\advisors\goku\gokuad_minerals-03.wav cm\advisors\goku\gokuad_missile-01.wav +cm\advisors\goku\gokuad_missile-02.wav cm\advisors\goku\gokuad_missilelaunch-01.wav +cm\advisors\goku\gokuad_missilelaunch-02.wav cm\advisors\goku\gokuad_nobuild-01.wav cm\advisors\goku\gokuad_nobuild-02.wav cm\advisors\goku\gokuad_noland-01.wav @@ -3587,9 +3593,12 @@ cm\advisors\goku\gokuad_noland-02.wav cm\advisors\goku\gokuad_nowarp-01.wav cm\advisors\goku\gokuad_nowarp-02.wav cm\advisors\goku\gokuad_ritual-01.wav +cm\advisors\goku\gokuad_ritual-02.wav cm\advisors\goku\gokuad_tech-01.wav +cm\advisors\goku\gokuad_tech-02.wav cm\advisors\goku\gokuad_vespene-01.wav cm\advisors\goku\gokuad_vespene-02.wav cm\advisors\goku\gokuad_vespene-03.wav -cm\advisors\goku\gokuad_vespene-04.wav -cm\advisors\goku\gokuad_warp-01.wav \ No newline at end of file +cm\advisors\goku\gokuad_vespene-03.wav +cm\advisors\goku\gokuad_warp-01.wav +cm\advisors\goku\gokuad_warp-02.wav \ No newline at end of file diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 009f7713..16fe98fe 100644 Binary files a/mpq/scripts/iscript_terran.bin and b/mpq/scripts/iscript_terran.bin differ diff --git a/mpq/scripts/iscript_terran.txt b/mpq/scripts/iscript_terran.txt index 8afb9968..b2396924 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -9067,6 +9067,12 @@ SalamanderGndAttkInit: attackwith 1 wait 3 attackwith 1 + wait 3 + attackwith 1 + wait 3 + attackwith 1 + wait 3 + attackwith 1 wait 1 nobrkcodeend gotorepeatattk diff --git a/mpq/sound/cm/advisors/goku/gokuad_addon-02.wav b/mpq/sound/cm/advisors/goku/gokuad_addon-02.wav new file mode 100644 index 00000000..31b4d9a6 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_addon-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_addonabandon-02.wav b/mpq/sound/cm/advisors/goku/gokuad_addonabandon-02.wav new file mode 100644 index 00000000..9cdd5cc6 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_addonabandon-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyunderattack-a-01.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-a-01.wav similarity index 100% rename from mpq/sound/cm/advisors/goku/gokuad_allyunderattack-a-01.wav rename to mpq/sound/cm/advisors/goku/gokuad_allyattack-a-01.wav diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyattack-a-02.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-a-02.wav new file mode 100644 index 00000000..3c313531 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_allyattack-a-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyattack-a-03.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-a-03.wav new file mode 100644 index 00000000..c2a5fd8f Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_allyattack-a-03.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyunderattack-b-01.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-b-01.wav similarity index 100% rename from mpq/sound/cm/advisors/goku/gokuad_allyunderattack-b-01.wav rename to mpq/sound/cm/advisors/goku/gokuad_allyattack-b-01.wav diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyattack-b-02.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-b-02.wav new file mode 100644 index 00000000..e3f72019 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_allyattack-b-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyattack-b-03.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-b-03.wav new file mode 100644 index 00000000..0016d87b Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_allyattack-b-03.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyunderattack-p-01.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-p-01.wav similarity index 100% rename from mpq/sound/cm/advisors/goku/gokuad_allyunderattack-p-01.wav rename to mpq/sound/cm/advisors/goku/gokuad_allyattack-p-01.wav diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyattack-p-02.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-p-02.wav new file mode 100644 index 00000000..13c4322a Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_allyattack-p-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyattack-p-03.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-p-03.wav new file mode 100644 index 00000000..111684fb Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_allyattack-p-03.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyunderattack-t-01.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-t-01.wav similarity index 100% rename from mpq/sound/cm/advisors/goku/gokuad_allyunderattack-t-01.wav rename to mpq/sound/cm/advisors/goku/gokuad_allyattack-t-01.wav diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyattack-t-02.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-t-02.wav new file mode 100644 index 00000000..c40c7191 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_allyattack-t-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyattack-t-03.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-t-03.wav new file mode 100644 index 00000000..486e3032 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_allyattack-t-03.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyunderattack-z-01.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-z-01.wav similarity index 100% rename from mpq/sound/cm/advisors/goku/gokuad_allyunderattack-z-01.wav rename to mpq/sound/cm/advisors/goku/gokuad_allyattack-z-01.wav diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyattack-z-02.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-z-02.wav new file mode 100644 index 00000000..a7a83e93 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_allyattack-z-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_allyattack-z-03.wav b/mpq/sound/cm/advisors/goku/gokuad_allyattack-z-03.wav new file mode 100644 index 00000000..d425e26c Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_allyattack-z-03.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_arena-01.wav b/mpq/sound/cm/advisors/goku/gokuad_arena-01.wav new file mode 100644 index 00000000..1de699ca Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_arena-01.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_arena-02.wav b/mpq/sound/cm/advisors/goku/gokuad_arena-02.wav new file mode 100644 index 00000000..1da2c8ae Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_arena-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_armyattack-02.wav b/mpq/sound/cm/advisors/goku/gokuad_armyattack-02.wav new file mode 100644 index 00000000..948d88a6 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_armyattack-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_armyattack-03.wav b/mpq/sound/cm/advisors/goku/gokuad_armyattack-03.wav new file mode 100644 index 00000000..4d747d88 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_armyattack-03.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_assembly-01.wav b/mpq/sound/cm/advisors/goku/gokuad_assembly-01.wav new file mode 100644 index 00000000..1bb20222 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_assembly-01.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_assembly-02.wav b/mpq/sound/cm/advisors/goku/gokuad_assembly-02.wav new file mode 100644 index 00000000..35b50ef0 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_assembly-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_baseattack-02.wav b/mpq/sound/cm/advisors/goku/gokuad_baseattack-02.wav new file mode 100644 index 00000000..ebcb14a7 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_baseattack-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_baseattack-03.wav b/mpq/sound/cm/advisors/goku/gokuad_baseattack-03.wav new file mode 100644 index 00000000..0c9e4bb1 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_baseattack-03.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_build-01.wav b/mpq/sound/cm/advisors/goku/gokuad_build-01.wav new file mode 100644 index 00000000..1bb20222 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_build-01.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_buildzerg-01.wav b/mpq/sound/cm/advisors/goku/gokuad_buildzerg-01.wav new file mode 100644 index 00000000..35b50ef0 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_buildzerg-01.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_energy-02.wav b/mpq/sound/cm/advisors/goku/gokuad_energy-02.wav new file mode 100644 index 00000000..a519ac0a Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_energy-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_energy-03.wav b/mpq/sound/cm/advisors/goku/gokuad_energy-03.wav new file mode 100644 index 00000000..f616c06a Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_energy-03.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_intland-02.wav b/mpq/sound/cm/advisors/goku/gokuad_intland-02.wav new file mode 100644 index 00000000..751332be Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_intland-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_minerals-02.wav b/mpq/sound/cm/advisors/goku/gokuad_minerals-02.wav new file mode 100644 index 00000000..97b8ee67 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_minerals-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_minerals-03.wav b/mpq/sound/cm/advisors/goku/gokuad_minerals-03.wav new file mode 100644 index 00000000..f37c1e26 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_minerals-03.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_missile-02.wav b/mpq/sound/cm/advisors/goku/gokuad_missile-02.wav new file mode 100644 index 00000000..85d7bf17 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_missile-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_missilelaunch-02.wav b/mpq/sound/cm/advisors/goku/gokuad_missilelaunch-02.wav new file mode 100644 index 00000000..72a748ba Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_missilelaunch-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_nobuild-02.wav b/mpq/sound/cm/advisors/goku/gokuad_nobuild-02.wav new file mode 100644 index 00000000..de8e31cf Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_nobuild-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_noland-02.wav b/mpq/sound/cm/advisors/goku/gokuad_noland-02.wav new file mode 100644 index 00000000..4062c34a Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_noland-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_nowarp-02.wav b/mpq/sound/cm/advisors/goku/gokuad_nowarp-02.wav new file mode 100644 index 00000000..695df222 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_nowarp-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_ritual-01.wav b/mpq/sound/cm/advisors/goku/gokuad_ritual-01.wav new file mode 100644 index 00000000..f0b23f0a Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_ritual-01.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_ritual-02.wav b/mpq/sound/cm/advisors/goku/gokuad_ritual-02.wav new file mode 100644 index 00000000..c603b7a8 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_ritual-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_tech-02.wav b/mpq/sound/cm/advisors/goku/gokuad_tech-02.wav new file mode 100644 index 00000000..997276bf Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_tech-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_vespene-02.wav b/mpq/sound/cm/advisors/goku/gokuad_vespene-02.wav new file mode 100644 index 00000000..7589de32 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_vespene-02.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_vespene-03.wav b/mpq/sound/cm/advisors/goku/gokuad_vespene-03.wav new file mode 100644 index 00000000..10667b5f Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_vespene-03.wav differ diff --git a/mpq/sound/cm/advisors/goku/gokuad_warp-02.wav b/mpq/sound/cm/advisors/goku/gokuad_warp-02.wav new file mode 100644 index 00000000..d8aa5721 Binary files /dev/null and b/mpq/sound/cm/advisors/goku/gokuad_warp-02.wav differ diff --git a/patchnotes.md b/patchnotes.md index 97542b08..3d4914e0 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -8,6 +8,10 @@ - Improve audiovisuals and AI - [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! +## Config +- A new advisor, **Goku**, has been added! (c. 3crow) +- The advisors **Mesk** and **ISN** have been deprecated by author request. If you get an error message on launch, consider removing them from your configs. + ## Bugfixes - **Stability:** - Resolved a common crash after warping in a Monument of Sin (r. HitEmUp & Sosij, c. DF) @@ -41,7 +45,7 @@ - Weapon still fired at 6 range, improving chase potential - [Ancile](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ancile): - Vision range 10 » 8 -- [Salamander](): +- [Salamander](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/salamander): - - [Vestry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/vestry): - Resource costs 150/75 » 150/50 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 65bf448b..e4438907 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ