diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 9e421c89..4dfac0d8 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 e42a147b..63251bfb 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -698,8 +698,8 @@ Endbore Tortare Cybrene Raynor Vulture -Extended Flingy #492 -Extended Flingy #493 +Scralia +Endbore Electricity Extended Flingy #494 Extended Flingy #495 Extended Flingy #496 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 6e0be210..15467dec 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 918e4f32..697cd737 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 37fe8cc3..ad4e5032 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2393,9 +2393,9 @@ Histrion Engine Raynor Vulture Raynor Vulture Shadow Raynor Vulture Engine -Extended Image #1393 -Extended Image #1394 -Extended Image #1395 +Scralia +Scralia Shadow +Endbore Electricity Extended Image #1396 Extended Image #1397 Extended Image #1398 diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 30e2b677..5c57eec0 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4231,22 +4231,22 @@ Elgird Weaponfire 04 Histrion Weaponfire 01 Histrion Weaponfire 02 Histrion Weaponfire 03 -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 +Alacyne Weaponfire 01 +Alacyne Weaponfire 02 +Alacyne Weaponfire 03 +Silversoul Weaponfire 01 +Silversoul Weaponfire 02 +Silversoul Weaponfire 03 +Limire Weaponfire 01 +Limire Weaponfire 02 +Limire Weaponfire 03 +Endbore Weaponfire 01 +Endbore Weaponfire 02 +Endbore Weaponfire 03 +Endbore Weaponfire 04 +Tortare Weaponfire 01 +Tortare Weaponfire 02 +Tortare Weaponfire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index a1bca1a2..bb17401e 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4236,4 +4236,14 @@ cm\a\alacyne\wf-02.wav cm\a\alacyne\wf-03.wav cm\a\silversoul\wf-01.wav cm\a\silversoul\wf-02.wav -cm\a\silversoul\wf-03.wav \ No newline at end of file +cm\a\silversoul\wf-03.wav +cm\a\limire\wf-01.wav +cm\a\limire\wf-02.wav +cm\a\limire\wf-03.wav +cm\a\endbore\wf-01.wav +cm\a\endbore\wf-02.wav +cm\a\endbore\wf-03.wav +cm\a\endbore\wf-04.wav +cm\a\tortare\wf-01.wav +cm\a\tortare\wf-02.wav +cm\a\tortare\wf-03.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index d9273d0b..d6a93bbb 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 679c5883..44cfc257 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1154,8 +1154,8 @@ Tortare Cybrene Silversoul Remains Raynor Vulture -Extended Sprite #640 -Extended Sprite #641 +Scralia +Endbore Electricity Extended Sprite #642 Extended Sprite #643 Extended Sprite #644 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index c00c291d..a77c46a4 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 31cb1806..86ea9c24 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -613,7 +613,7 @@ Forerunner Machinamentum Big Infested Kerrigan Raynor Vulture Duke Battlecruiser -Extended Unit #388 +Askosi Scralia Extended Unit #389 Extended Unit #390 Extended Unit #391 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index ff2d9db5..a23d6ffc 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index ce8e627b..ec507360 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 586c6026..5bac48c6 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 7b692f86..ee2007df 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index 8e4d24c6..a4cce381 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -345,7 +345,7 @@ f<1><4>Morph into Inzorthrokor <1>(<3>F<1>)<10>Infestation strain.<0> Inzorthrokor requires:<10> Zorkiz Shroud<0> c<1><4>Train Heracles <1>(<3>C<1>)<10>Frontline infantry.<0> b<1><4>Build Tiangou <1>(<3>B<1>)<10>Relentless walker.<0> -<0> +ยค<3><4>Deathrattle Assembly <2>(passive)<10>Upon taking fatal damage while mobile and above solid ground, Tortares descend and embed themselves into the surface, becoming immobile and more heavily-armored.<10>During this time, dying hostiles within 8 range suffer from Scrapworld: Implosion.<0> c<1><4>Warp in Ecclesiast <1>(<3>C<1>)<10>Supportive ranger.<0> e<3><4>Smithy Mode <1>(<3>E<1>)<10>Switches forms, gaining the ability to repair structures at range and disabling movement.<0> e<0><4>Worker Mode <1>(<3>E<1>)<10>Returns the Ogun's repairs and mobility to normal.<0> diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index d6435de9..f5d81f64 100644 Binary files a/mpq/scripts/iscript_askosi.bin and b/mpq/scripts/iscript_askosi.bin differ diff --git a/mpq/scripts/iscript_askosi.txt b/mpq/scripts/iscript_askosi.txt index dedfb902..4e67efc6 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -5811,22 +5811,6 @@ EndboreGndAttkInit: playfram 0x00 attackwith 1 imgol 2245 0 0 # Impact Dissipation (medium) - wait 3 - playfram 0x00 - attackwith 1 - imgol 2245 0 0 # Impact Dissipation (medium) - wait 3 - playfram 0x00 - attackwith 1 - imgol 2245 0 0 # Impact Dissipation (medium) - wait 3 - playfram 0x00 - attackwith 1 - imgol 2245 0 0 # Impact Dissipation (medium) - wait 3 - playfram 0x00 - attackwith 1 - imgol 2245 0 0 # Impact Dissipation (medium) wait 1 nobrkcodeend gotorepeatattk @@ -6195,6 +6179,195 @@ EgocentUnBurrow: sigorder 4 nobrkcodeend goto EgocentWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2176 Limire (cm\a\limire.grp) +.headerstart +IsId 71 +Type 21 +Init LimireInit +Death LimireDeath +GndAttkInit LimireGndAttkInit +AirAttkInit LimireGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt LimireGndAttkInit +AirAttkRpt LimireGndAttkInit +CastSpell [NONE] +GndAttkToIdle LimireGndAttkToIdle +AirAttkToIdle LimireGndAttkToIdle +Unused2 [NONE] +Walking LimireWalking +WalkingToIdle LimireLocal00 +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +LimireInit: + imgulnextid 0 42 # Limire Shadow (cm\a\limire.grp) +LimireGndAttkToIdle: + playfram 0x00 +LimireLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto LimireLocal00 + +LimireDeath: + playsnd 257 # Terran\PHOENIX\TPhDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) + wait 1 + end + +LimireGndAttkInit: + setvertpos 0 + wait 1 + nobrkcodestart + playfram 0x00 + attackwith 2 + wait 3 + attackwith 2 + wait 3 + attackwith 2 + wait 1 + nobrkcodeend + gotorepeatattk + goto LimireGndAttkToIdle + +LimireWalking: + setvertpos 0 +# imgol 2194 0 0 # Limire Engines (cm\a\limire-engine.grp) + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2178 Tortare (cm\a\tortare.grp) +.headerstart +IsId 72 +Type 21 +Init TortareInit +Death TortareDeath +GndAttkInit TortareGndAttkInit +AirAttkInit TortareGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt TortareGndAttkInit +AirAttkRpt TortareGndAttkInit +CastSpell [NONE] +GndAttkToIdle TortareGndAttkToIdle +AirAttkToIdle TortareGndAttkToIdle +Unused2 [NONE] +Walking TortareWalking +WalkingToIdle TortareLocal00 +SpecialState1 TortareSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +TortareInit: + imgulnextid 0 42 # Tortare Shadow (cm\a\tortare.grp) +TortareGndAttkToIdle: + playfram 0x00 +TortareLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto TortareLocal00 + +TortareDeath: + playsnd 177 # Terran\BATTLE\tbaDth00.wav + imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) + wait 3 + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\a\a-rubble-tiny.grp) + wait 1 + end + +TortareGndAttkInit: + setvertpos 0 + wait 1 + nobrkcodestart + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + nobrkcodeend + gotorepeatattk + goto TortareGndAttkToIdle + +TortareWalking: + setvertpos 0 +# imgol 225 0 5 # Tortare Engines (thingy\tdrGlow.grp) + goto SkryrokorLocal00 + +TortareSpecialState1: + playfram 0x00 + wait 12 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2397 Endbore Electricity (cm\t\phobos-laser.grp) +.headerstart +IsId 73 +Type 13 +Init EndboreElectricityInit +Death EndboreElectricityDeath +GndAttkInit EndboreElectricityGndAttkInit +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 EndboreElectricitySpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +EndboreElectricityInit: + playfram 0x00 + wait 1 + sigorder 1 + goto EndboreElectricityGndAttkInit + +EndboreElectricityGndAttkInit: + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x44 + wait 1 + playfram 0x00 + wait 1 + goto EndboreElectricityGndAttkInit + +EndboreElectricityDeath: + imgol 1168 0 0 # Phobos Laser Impact (cm\terran\phobos-laser-impact.grp) + domissiledmg + wait 1 + end + +EndboreElectricitySpecialState1: + imgol 1168 0 0 # Phobos Laser Impact (cm\terran\phobos-laser-impact.grp) + playsnd 2848 # Panoptus weaponhit 01 + domissiledmg + wait 1 + goto EndboreElectricityGndAttkInit # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/sound/cm/a/endbore/wf-01.wav b/mpq/sound/cm/a/endbore/wf-01.wav new file mode 100644 index 00000000..1c954841 Binary files /dev/null and b/mpq/sound/cm/a/endbore/wf-01.wav differ diff --git a/mpq/sound/cm/a/endbore/wf-02.wav b/mpq/sound/cm/a/endbore/wf-02.wav new file mode 100644 index 00000000..2647661d Binary files /dev/null and b/mpq/sound/cm/a/endbore/wf-02.wav differ diff --git a/mpq/sound/cm/a/endbore/wf-03.wav b/mpq/sound/cm/a/endbore/wf-03.wav new file mode 100644 index 00000000..d9409cc5 Binary files /dev/null and b/mpq/sound/cm/a/endbore/wf-03.wav differ diff --git a/mpq/sound/cm/a/endbore/wf-04.wav b/mpq/sound/cm/a/endbore/wf-04.wav new file mode 100644 index 00000000..2329ea5f Binary files /dev/null and b/mpq/sound/cm/a/endbore/wf-04.wav differ diff --git a/mpq/sound/cm/a/limire/wf-01.wav b/mpq/sound/cm/a/limire/wf-01.wav new file mode 100644 index 00000000..ac8279de Binary files /dev/null and b/mpq/sound/cm/a/limire/wf-01.wav differ diff --git a/mpq/sound/cm/a/limire/wf-02.wav b/mpq/sound/cm/a/limire/wf-02.wav new file mode 100644 index 00000000..1045bfae Binary files /dev/null and b/mpq/sound/cm/a/limire/wf-02.wav differ diff --git a/mpq/sound/cm/a/limire/wf-03.wav b/mpq/sound/cm/a/limire/wf-03.wav new file mode 100644 index 00000000..671ed3fb Binary files /dev/null and b/mpq/sound/cm/a/limire/wf-03.wav differ diff --git a/mpq/sound/cm/a/tortare/wf-01.wav b/mpq/sound/cm/a/tortare/wf-01.wav new file mode 100644 index 00000000..df7f4ba0 Binary files /dev/null and b/mpq/sound/cm/a/tortare/wf-01.wav differ diff --git a/mpq/sound/cm/a/tortare/wf-02.wav b/mpq/sound/cm/a/tortare/wf-02.wav new file mode 100644 index 00000000..3735d3d6 Binary files /dev/null and b/mpq/sound/cm/a/tortare/wf-02.wav differ diff --git a/mpq/sound/cm/a/tortare/wf-03.wav b/mpq/sound/cm/a/tortare/wf-03.wav new file mode 100644 index 00000000..8310f3c2 Binary files /dev/null and b/mpq/sound/cm/a/tortare/wf-03.wav differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index ba81f80f..e1f9cf56 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 5d9fd6c2..fd22e693 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 8a778a57..8977fbaa 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 9d0a1853..58a28d9b 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 5a155df4..def77f9c 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -7,4 +7,20 @@ - Further improve audiovisuals - Tweak balance for all factions - Deploy new singleplayer content -- [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! \ No newline at end of file +- [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! + +# Core changes + +## Bugfixes +- **Gameplay:** + - **Silversoul** attacks now correctly proc **Booming Blast** (r. shopkeeper dog) + +# Balance changes + +## Askosi + +- **New arrivals:** + - [Obelisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/obelisk) -- tier 3 Skybound production + - [Limire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/limire) -- anti-ship fighter + - [Endbore](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/endbore) -- precision gunboat + - [Tortare](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/tortare) -- heavy corvette \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 5dec126e..3e4049d1 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ