diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 0a1cde70..43cdba54 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt index 6e5f0de8..723c5a9f 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -572,7 +572,7 @@ Arhaun Base Arhaun Turret Morningstar Radiation Field Zozarc Gorge -Extended Flingy #366 +Autocort Extended Flingy #367 Extended Flingy #368 Extended Flingy #369 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 31d74de5..79bf2cd2 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.tbl b/mpq/arr/images.tbl index cd2d98d1..b2a37661 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index 9913dd83..7a63aaa8 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2055,8 +2055,8 @@ Morningstar Radiation Field Zozarc Gorge Zozarc Gorge Shadow Cikralisk Attack Overlay -Extended Image #1055 -Extended Image #1056 +Autocort +Autocort Shadow Extended Image #1057 Extended Image #1058 Extended Image #1059 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 5fc7e7dd..440af326 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -1539,7 +1539,7 @@ cm\z\skithrokor\rdy-01.wav cm\z\skithrokor\wht-01.wav cm\z\skithrokor\wht-02.wav cm\z\skithrokor\wht-03.wav -cm\z\skithrokor\wht-04.wav +cm\z\skithrokor\wht-03.wav cm\z\skithrokor\yes-01.wav cm\z\skithrokor\yes-02.wav cm\z\skithrokor\yes-03.wav @@ -1595,7 +1595,7 @@ cm\p\anthelion\arr-03.wav cm\p\anthelion\wf-01.wav cm\p\anthelion\wf-02.wav cm\p\anthelion\wf-03.wav -cm\p\anthelion\awf-04.wav +cm\p\anthelion\wf-04.wav cm\t\cyclops\dth-01.wav cm\t\cyclops\dth-02.wav cm\t\cyclops\dth-03.wav @@ -1623,7 +1623,7 @@ cm\z\axitrilisk\wht-04.wav cm\z\axitrilisk\yes-01.wav cm\z\axitrilisk\yes-02.wav cm\z\axitrilisk\yes-03.wav -cm\z\axitrilisk\yes-04.wav +cm\z\axitrilisk\yes-03.wav cm\z\axitrilisk\wf-01.wav cm\z\axitrilisk\wf-02.wav cm\z\axitrilisk\wf-03.wav @@ -1829,15 +1829,15 @@ cm\p\atreus\yes-01.wav cm\p\atreus\yes-02.wav cm\p\atreus\yes-03.wav cm\p\atreus\yes-04.wav -cm\p\augur\augur-ready-01.wav -cm\p\augur\augur-what-01.wav -cm\p\augur\augur-what-02.wav -cm\p\augur\augur-what-03.wav -cm\p\augur\augur-what-04.wav -cm\p\augur\augur-yes-01.wav -cm\p\augur\augur-yes-02.wav -cm\p\augur\augur-yes-03.wav -cm\p\augur\augur-yes-04.wav +cm\p\augur\rdy-01.wav +cm\p\augur\wht-01.wav +cm\p\augur\wht-02.wav +cm\p\augur\wht-03.wav +cm\p\augur\wht-04.wav +cm\p\augur\yes-01.wav +cm\p\augur\yes-02.wav +cm\p\augur\yes-03.wav +cm\p\augur\yes-04.wav cm\p\empyrean\rdy-01.wav cm\p\empyrean\wht-01.wav cm\p\empyrean\wht-02.wav @@ -1899,7 +1899,7 @@ cm\p\legionnaire\wh-01.wav cm\z\evigrilisk\wf-01.wav cm\z\evigrilisk\wf-02.wav cm\z\evigrilisk\wf-03.wav -cm\z\evigrilisk\ready-01.wav +cm\z\evigrilisk\rdy-01.wav cm\p\dracadin\revive-01.wav caw.wav caw.wav @@ -2129,11 +2129,11 @@ cm\p\vagrant\wf-02.wav cm\p\vagrant\wf-03.wav cm\p\vagrant\wf-04.wav cm\p\vagrant\wf-05.wav -cm\p\vagrant-shadow\wf-01.wav -cm\p\vagrant-shadow\wf-02.wav -cm\p\vagrant-shadow\wf-03.wav -cm\p\vagrant-shadow\wf-04.wav -cm\p\vagrant-shadow\wf-05.wav +cm\p\vagrant-shade\wf-01.wav +cm\p\vagrant-shade\wf-02.wav +cm\p\vagrant-shade\wf-03.wav +cm\p\vagrant-shade\wf-04.wav +cm\p\vagrant-shade\wf-05.wav cm\p\optecton\wfb-01.wav cm\p\optecton\wfb-02.wav cm\p\optecton\wfb-03.wav @@ -2487,10 +2487,10 @@ cm\z\droleth\wf-01.wav cm\t\silvertongue\rdy-01.wav cm\t\silvertongue\rdy-01.wav cm\t\silvertongue\rdy-01.wav -cm\t\silvertongue\help-01.wav -cm\t\silvertongue\help-02.wav -cm\t\silvertongue\help-02.wav -cm\t\silvertongue\help-02.wav +cm\t\silvertongue\hlp-01.wav +cm\t\silvertongue\hlp-02.wav +cm\t\silvertongue\hlp-02.wav +cm\t\silvertongue\hlp-02.wav cm\z\nathrokor\wh-a-01.wav cm\advisors\iskatumesk\meskad_minerals-01.wav cm\advisors\iskatumesk\meskad_minerals-02.wav diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 60bff619..d99fac2f 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt index c8476f80..a8cc40fd 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1014,7 +1014,7 @@ Arhaun Base Arhaun Turret Morningstar Radiation Field Zozarc Gorge -Extended Sprite #1 +Autocort Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index c19eae83..66a25405 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt index 01953566..dc2a909f 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -492,8 +492,8 @@ Terran Arhaun (Base) Arhaun Turret Terran Addon Submenu Zerg Zozarc Gorge -Extended Unit #267 -Extended Unit #268 +Terran Ogun +Protoss Autocort Extended Unit #269 Extended Unit #270 Extended Unit #271 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 2723442e..6dbde51a 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Orders.graft b/mpq/datreq/Orders.graft index e004b5a2..e47f646e 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 263421c3..7bd53f02 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 6af98cde..d746e399 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 951ac21f..75eb356b 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index a9ed587f..a09e7efb 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index 9b5a926e..a0f2b1de 100644 Binary files a/mpq/scripts/iscript_protoss.bin and b/mpq/scripts/iscript_protoss.bin differ diff --git a/mpq/scripts/iscript_protoss.txt b/mpq/scripts/iscript_protoss.txt index 3593e0fb..61639944 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -14924,3 +14924,106 @@ DurendalWeaponfireInit: playfram 6 wait 1 goto Generic_Wait1End + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2057 Autocort (cm\protoss\autocort.grp) +.headerstart +IsId 731 +Type 21 +Init AutocortInit +Death AutocortDeath +GndAttkInit AutocortGndAttkInit +AirAttkInit [NONE] +Unused1 AutocortUnused1 +GndAttkRpt AutocortGndAttkInit +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle SkryrokorLocal00 +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking AutocortWalking +WalkingToIdle SkryrokorLocal00 +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt AutocortAlmostBuilt +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn AutocortWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +AutocortInit: + imgul 2058 0 7 # Autocort Shadow (cm\protoss\autocort.grp) + playfram 0x00 + goto SkryrokorLocal00 + +AutocortDeath: + setfldirect 0 + playsnd 598 # Protoss\PROBE\PPrDth00.WAV + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + playfram 17 + wait 1 + playfram 18 + wait 1 + playfram 19 + wait 1 + playfram 20 + wait 1 + lowsprul 691 0 0 # Autocort Remnants (cm\protoss\autocort-death.grp) + wait 1 + end + +AutocortUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsnd 1352 # Autocort Revive 01 + playfram 20 + wait 1 + playfram 19 + wait 1 + playfram 18 + wait 1 + playfram 17 + sprol 740 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 1 + playfram 0x00 + wait 1 + setfldirect 10 + nobrkcodeend + goto SkryrokorLocal00 + +AutocortGndAttkInit: + wait 1 + nobrkcodestart + playfram 0x20 + attackwith 1 + playsndbtwn 2670 2672 # Autocort weaponfire 01, 02, 03 + wait 1 + playfram 0x00 + nobrkcodeend + gotorepeatattk + goto SkryrokorLocal00 + +AutocortWalking: + setvertpos 0 + goto AutocortWalkingLoop + +AutocortWalkingLoop: + move 5 + wait 1 + goto AutocortWalkingLoop + +AutocortAlmostBuilt: + useweapon 63 # Particle Beam (Harvest) (Particle Beam) + playsnd 614 # Protoss\PROBE\PPrMin00.WAV + wait 9 + goto AutocortAlmostBuilt + +AutocortWarpIn: + imgol 139 0 0 # Autocort Warp Flash (protoss\probe.grp) + goto SkryrokorLocal00 diff --git a/mpq/sound/cm/advisors/kortar/kortarad_noenergy-01.wav b/mpq/sound/cm/advisors/kortar/kortarad_energy-01.wav similarity index 100% rename from mpq/sound/cm/advisors/kortar/kortarad_noenergy-01.wav rename to mpq/sound/cm/advisors/kortar/kortarad_energy-01.wav diff --git a/mpq/sound/cm/advisors/kortar/kortarad_noenergy-02.wav b/mpq/sound/cm/advisors/kortar/kortarad_energy-02.wav similarity index 100% rename from mpq/sound/cm/advisors/kortar/kortarad_noenergy-02.wav rename to mpq/sound/cm/advisors/kortar/kortarad_energy-02.wav diff --git a/mpq/sound/cm/advisors/kortar/kortarad_noenergy-03.wav b/mpq/sound/cm/advisors/kortar/kortarad_energy-03.wav similarity index 100% rename from mpq/sound/cm/advisors/kortar/kortarad_noenergy-03.wav rename to mpq/sound/cm/advisors/kortar/kortarad_energy-03.wav diff --git a/mpq/sound/cm/advisors/kortar/kortarad_noenergy-04.wav b/mpq/sound/cm/advisors/kortar/kortarad_energy-04.wav similarity index 100% rename from mpq/sound/cm/advisors/kortar/kortarad_noenergy-04.wav rename to mpq/sound/cm/advisors/kortar/kortarad_energy-04.wav diff --git a/mpq/sound/cm/p/augur/augur-dth-01.wav b/mpq/sound/cm/p/augur/dth-01.wav similarity index 100% rename from mpq/sound/cm/p/augur/augur-dth-01.wav rename to mpq/sound/cm/p/augur/dth-01.wav diff --git a/mpq/sound/cm/p/augur/augur-dth-02.wav b/mpq/sound/cm/p/augur/dth-02.wav similarity index 100% rename from mpq/sound/cm/p/augur/augur-dth-02.wav rename to mpq/sound/cm/p/augur/dth-02.wav diff --git a/mpq/sound/cm/p/augur/augur-dth-03.wav b/mpq/sound/cm/p/augur/dth-03.wav similarity index 100% rename from mpq/sound/cm/p/augur/augur-dth-03.wav rename to mpq/sound/cm/p/augur/dth-03.wav diff --git a/mpq/sound/cm/p/augur/augur-dth-04.wav b/mpq/sound/cm/p/augur/dth-04.wav similarity index 100% rename from mpq/sound/cm/p/augur/augur-dth-04.wav rename to mpq/sound/cm/p/augur/dth-04.wav diff --git a/mpq/sound/cm/p/augur/augur-ready-01.wav b/mpq/sound/cm/p/augur/rdy-01.wav similarity index 100% rename from mpq/sound/cm/p/augur/augur-ready-01.wav rename to mpq/sound/cm/p/augur/rdy-01.wav diff --git a/mpq/sound/cm/p/augur/augur-what-01.wav b/mpq/sound/cm/p/augur/wht-01.wav similarity index 100% rename from mpq/sound/cm/p/augur/augur-what-01.wav rename to mpq/sound/cm/p/augur/wht-01.wav diff --git a/mpq/sound/cm/p/augur/augur-what-02.wav b/mpq/sound/cm/p/augur/wht-02.wav similarity index 100% rename from mpq/sound/cm/p/augur/augur-what-02.wav rename to mpq/sound/cm/p/augur/wht-02.wav diff --git a/mpq/sound/cm/p/augur/augur-what-03.wav b/mpq/sound/cm/p/augur/wht-03.wav similarity index 100% rename from mpq/sound/cm/p/augur/augur-what-03.wav rename to mpq/sound/cm/p/augur/wht-03.wav diff --git a/mpq/sound/cm/p/augur/augur-what-04.wav b/mpq/sound/cm/p/augur/wht-04.wav similarity index 100% rename from mpq/sound/cm/p/augur/augur-what-04.wav rename to mpq/sound/cm/p/augur/wht-04.wav diff --git a/mpq/sound/cm/p/augur/augur-yes-01.wav b/mpq/sound/cm/p/augur/yes-01.wav similarity index 100% rename from mpq/sound/cm/p/augur/augur-yes-01.wav rename to mpq/sound/cm/p/augur/yes-01.wav diff --git a/mpq/sound/cm/p/augur/augur-yes-02.wav b/mpq/sound/cm/p/augur/yes-02.wav similarity index 100% rename from mpq/sound/cm/p/augur/augur-yes-02.wav rename to mpq/sound/cm/p/augur/yes-02.wav diff --git a/mpq/sound/cm/p/augur/augur-yes-03.wav b/mpq/sound/cm/p/augur/yes-03.wav similarity index 100% rename from mpq/sound/cm/p/augur/augur-yes-03.wav rename to mpq/sound/cm/p/augur/yes-03.wav diff --git a/mpq/sound/cm/p/augur/augur-yes-04.wav b/mpq/sound/cm/p/augur/yes-04.wav similarity index 100% rename from mpq/sound/cm/p/augur/augur-yes-04.wav rename to mpq/sound/cm/p/augur/yes-04.wav diff --git a/mpq/sound/cm/p/empyrean/yes-4.wav b/mpq/sound/cm/p/empyrean/yes-04.wav similarity index 100% rename from mpq/sound/cm/p/empyrean/yes-4.wav rename to mpq/sound/cm/p/empyrean/yes-04.wav diff --git a/mpq/sound/cm/p/vagrant-shade/wht-01.pk b/mpq/sound/cm/p/vagrant-shade/wht-01.pk deleted file mode 100644 index 02d437bd..00000000 Binary files a/mpq/sound/cm/p/vagrant-shade/wht-01.pk and /dev/null differ diff --git a/mpq/unit/cm/protoss/autocort.grp b/mpq/unit/cm/protoss/autocort.grp new file mode 100644 index 00000000..598dfc2d Binary files /dev/null and b/mpq/unit/cm/protoss/autocort.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 89cd379d..ce022739 100644 Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ diff --git a/mpq/unit/cmdbtns/uniticons.grp b/mpq/unit/cmdbtns/uniticons.grp index e6b03e83..f90bc6ee 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 269d492c..f1d8b3ed 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 f3c9eba2..4e42b385 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 06cb8c1f..fac75e24 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -10,4 +10,21 @@ ## Bugfixes - **AI:** - - Resolved an issue preventing Zerg AI from making **Axtoth Axis** and related units (r. GreenEggs'NSpam) \ No newline at end of file + - Resolved an issue preventing Zerg AI from making **Axtoth Axis** and related units (r. GreenEggs'NSpam) +- **Audiovisual:** + - Corrected filenames for a few miscellaneous sound files (r. Mimika) + +## Protoss +- **NEW:** [Autocort](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/autocort): + - Advanced constructor with personal power field; trained from Embassy + +## Zerg +- [Sovroleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/sovroleth): + - Build time 25 » 24 + - **Corpse Cocoon:** + - Gestation time 4 » 12 (half of training time) +- [Sasyrvoleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/sasyrvoleth): + - Resource costs 100/200 » 100/300 + - Build time 30 » 40 + - HP 140 » 200 + - Movement speed 5 » 4.16 \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index fe9d5557..84f72b30 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ