diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 4d725dd3..6fa2ffbe 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 925ffcc0..d8feb78c 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -401,7 +401,7 @@ Empress Tarasque Spores Tarasque Neutron Flare Orange Damageless -Orboth Omlia +Axtoth Axis Shock Cannon Impact Damageless Silent Magnetar Izirokor @@ -482,7 +482,7 @@ Matador Turret (Tank Mode) Matador Turret (Cinder Mode) Wyvern Turret Analogue -Extended Flingy #276 +Mortothrokor Extended Flingy #277 Extended Flingy #278 Extended Flingy #279 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index b9e3a57e..d4f2f205 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 48577ecf..1f019265 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 a61b2498..a1a3f60f 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1361,8 +1361,8 @@ Claymore Claymore Shadow Aion Shadow Scribe Remnants -Orboth Omlia -Orboth Omlia Shadow +unused +unused Warp Anchor Underlay Alaszileth Alaszileth Shadow @@ -1445,8 +1445,8 @@ Explosion Medium Reversed Explosion Blue Medium Reversed Zealot Death Reversed Neutron Flare Orange Damageless -Orboth Omlia -Orboth Omlia Shadow +Axtoth Axis +Axtoth Axis Shadow Ovileth Death Reversed Zerg Air Explosion Large Reversed Zerg Air Explosion Small Reversed @@ -1733,9 +1733,9 @@ Analogue Analogue Shadow Zerg Spore Explosion Large Pythean Engines -Extended Image #733 -Extended Image #734 -Extended Image #735 +Mortothrokor +Mortothrokor Shadow +Mortothrokor Remnants Extended Image #736 Extended Image #737 Extended Image #738 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 80a2076a..b461bf1a 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 cbf22e79..6c0a201a 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -749,7 +749,7 @@ Neutron Flare (Orange, Damageless) Mind Control Hit (Small) Mind Control Hit (Medium) Mind Control Hit (Large) -Orboth Omlia +Axtoth Axis Ovileth Death (Reversed) Zerg Air Explosion Large Reversed Zerg Air Explosion Small Reversed @@ -865,8 +865,8 @@ Matador Turret (Tank Mode) Matador Turret (Cinder Mode) Wyvern Turret Analogue -Extended Sprite #1 -Extended Sprite #1 +Mortothrokor +Mortothrokor Remnants Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 80e024c5..daab9f23 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 7e5265da..56b101b2 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -128,7 +128,7 @@ Zerg Kagralisk Terran Ion Cannon Zerg Vorvrokor Zerg Bactalisk -Zerg Orboth Omlia +Zerg Axtoth Axis Zerg Hachirosk Zerg Caphrolosk Zerg Gathstelosk @@ -326,7 +326,7 @@ Zerg Begrothilisk Zerg Oztukrokor Zerg Kethrostalor Zerg Rakzilisk -Zerg Axtoth Axis +Unused Unit ID Zerg Begrozith Barrow Zerg Chokralgant Chazsal Protoss Bulwark @@ -375,7 +375,7 @@ Matador Turret (Tank Mode) Matador Turret (Cinder Mode) Lobotomy Mine Wyvern Turret -Extended Unit #150 +Zerg Axitrilisk (Weaponless) Extended Unit #151 Extended Unit #152 Extended Unit #153 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 7d69b1c0..25d2178a 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 4f592685..f8f02f6e 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index a9000455..db42b11b 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 291c0a4b..1ddad06e 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index ec0075be..672c4b64 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -2341,34 +2341,34 @@ UltrokorGndAttkRpt: goto UltrokorGndAttkToIdle UltrokorWalking: - move 2 + move 5 wait 1 playfram 0x00 move 5 wait 1 playfram 0x11 - move 4 + move 5 wait 1 playfram 0x22 - move 3 + move 5 wait 1 playfram 0x33 - move 2 + move 5 wait 1 playfram 0x44 - move 6 + move 5 wait 1 playfram 0x55 - move 6 + move 5 wait 1 playfram 0x66 - move 6 + move 5 wait 1 playfram 0x77 - move 6 + move 5 wait 1 playfram 0x88 - move 6 + move 5 wait 1 playfram 0x99 goto UltrokorWalking @@ -42588,12 +42588,12 @@ NeutronFlareDamagelessInit: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1447 Orboth Omlia (cm\zerg\orbothomlia.grp) +# 1447 Axtoth Axis (cm\zerg\axtothaxis.grp) .headerstart IsId 625 Type 20 -Init OrbothOmliaInit -Death OrbothOmliaDeath +Init AxtothAxisInit +Death AxtothAxisDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -42607,22 +42607,22 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt OrbothOmliaAlmostBuilt -Built OrbothOmliaBuilt +AlmostBuilt AxtothAxisAlmostBuilt +Built AxtothAxisBuilt Landing [NONE] LiftOff [NONE] -IsWorking OrbothOmliaIsWorking -WorkingToIdle OrbothOmliaWorkingToIdle +IsWorking [NONE] +WorkingToIdle AxtothAxisWorkingToIdle WarpIn [NONE] .headerend # ----------------------------------------------------------------------------- # -OrbothOmliaInit: +AxtothAxisInit: playfram 0x00 - imgul 1448 0 0 # Orboth Omlia Shadow (cm\zerg\orbothomlia-shad.grp) - goto OrbothOmliaWorkingToIdle + imgul 1448 0 0 # Axtoth Axis Shadow (cm\zerg\axtothaxis-shad.grp) + goto AxtothAxisWorkingToIdle -OrbothOmliaWorkingToIdle: +AxtothAxisWorkingToIdle: playfram 0x00 wait 2 playfram 1 @@ -42635,9 +42635,9 @@ OrbothOmliaWorkingToIdle: wait 2 playfram 1 wait 2 - goto OrbothOmliaWorkingToIdle + goto AxtothAxisWorkingToIdle -OrbothOmliaDeath: +AxtothAxisDeath: playsnd 774 # Zerg\Bldg\ZBldgDth.WAV imgol 60 0 0 # Zerg Building Explosion (thingy\zBldDthS.grp) wait 3 @@ -42645,30 +42645,15 @@ OrbothOmliaDeath: wait 1 end -OrbothOmliaAlmostBuilt: +AxtothAxisAlmostBuilt: imgol 108 0 0 # Zerg Building Spawn (Medium) (zerg\zSpawn02.grp) playfram 0x00 - goto OrbothOmliaBuilt + goto AxtothAxisBuilt -OrbothOmliaBuilt: +AxtothAxisBuilt: playfram 0x00 wait 2 - goto OrbothOmliaWorkingToIdle - -OrbothOmliaIsWorking: - playfram 0x00 - wait 1 - playfram 1 - wait 1 - playfram 2 - wait 1 - playfram 3 - waitrand 1 2 - playfram 2 - wait 1 - playfram 1 - wait 1 - goto OrbothOmliaIsWorking + goto AxtothAxisWorkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -52224,4 +52209,203 @@ ZergSporeExplosionLargeInit: ZergSporeExplosionLargeDeath: wait 1 - end \ No newline at end of file + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 050 Mortothrokor (cm\zerg\mortothrokor.grp) +.headerstart +IsId 743 +Type 26 +Init MortothrokorInit +Death MortothrokorDeath +GndAttkInit MortothrokorGndAttkInit +AirAttkInit [NONE] +Unused1 MortothrokorUnused1 +GndAttkRpt MortothrokorGndAttkRpt +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle MortothrokorGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking MortothrokorWalking +WalkingToIdle MortothrokorGndAttkToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable [NONE] +Burrow [NONE] +UnBurrow [NONE] +Enable [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +MortothrokorInit: + imgul 1736 0 0 # Mortothrokor Shadow (cm\zerg\mortothrokor-shadow.grp) +MortothrokorGndAttkToIdle: + playfram 0x00 + goto MortothrokorLocal00 + +MortothrokorLocal00: + wait 1 + waitrand 62 74 + randcondjmp 25 MortothrokorLocal01 + randcondjmp 128 MortothrokorLocal02 + goto MortothrokorLocal00 + +MortothrokorLocal01: + playfram 0x55 + wait 1 + playfram 0x66 + wait 10 + playfram 0x55 + wait 1 + playfram 0x00 + wait 1 + goto MortothrokorGndAttkToIdle + +MortothrokorLocal02: + randcondjmp 128 MortothrokorLocal03 + playfram 0x11 + wait 1 + turnccwise 1 + playfram 0x22 + wait 1 + turnccwise 1 + playfram 0x33 + wait 1 + turnccwise 1 + playfram 0x44 + wait 1 + turnccwise 1 + playfram 0x33 + wait 1 + turnccwise 1 + playfram 0x22 + wait 1 + turnccwise 1 + playfram 0x11 + wait 1 + turnccwise 1 + goto MortothrokorGndAttkToIdle + +MortothrokorLocal03: + playfram 0x11 + wait 1 + turncwise 1 + playfram 0x22 + wait 1 + turncwise 1 + playfram 0x33 + wait 1 + turncwise 1 + playfram 0x44 + wait 1 + turncwise 1 + playfram 0x33 + wait 1 + turncwise 1 + playfram 0x22 + wait 1 + turncwise 1 + playfram 0x11 + wait 1 + turncwise 1 + goto MortothrokorGndAttkToIdle + +MortothrokorDeath: + playsnd 878 # Zerg\Ultra\ZUlDth00.WAV + setfldirect 0 + playfram 170 + wait 2 + playfram 171 + wait 2 + playfram 172 + wait 2 + playfram 173 + wait 2 + playfram 174 + wait 2 + lowsprul 1737 0 0 # Mortothrokor Remnants (cm\zerg\mortothrokor-remnants.grp) + wait 1 + end + +MortothrokorUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsnd 1181 # Ultrokor revive 01 + playfram 173 + wait 2 + playfram 172 + wait 2 + playfram 171 + wait 2 + playfram 170 + wait 12 + setfldirect 14 + nobrkcodeend + goto MortothrokorGndAttkToIdle + +MortothrokorGndAttkInit: + playfram 0x55 +MortothrokorGndAttkRpt: + wait 1 + nobrkcodestart + playsndrand 3 891 892 893 # Zerg\Ultra\zulAtt00.WAV | Zerg\Ultra\zulAtt01.WAV | Zerg\Ultra\zulAtt02.WAV + wait 1 + playfram 0x66 + wait 1 + playfram 0x77 + attackmelee 2 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV + wait 2 + playfram 0x66 + wait 2 + playfram 0x77 + attackmelee 2 894 895 # Zerg\Ultra\zulHit00.WAV | Zerg\Ultra\zulHit01.WAV + wait 1 + playfram 0x66 + wait 1 + playfram 0x88 + wait 1 + playfram 0x99 + wait 1 + nobrkcodeend + gotorepeatattk + goto MortothrokorGndAttkToIdle + +MortothrokorWalking: + move 4 + playfram 0x11 + wait 1 + move 4 + wait 1 + move 4 + playfram 0x22 + wait 1 + move 4 + wait 1 + move 4 + playfram 0x33 + wait 1 + move 4 + wait 1 + move 4 + playfram 0x44 + wait 1 + move 4 + wait 1 + move 4 + playfram 0x22 + wait 1 + move 4 + wait 1 + goto MortothrokorWalking \ No newline at end of file diff --git a/mpq/unit/cm/zerg/orbothomlia-damage.lof b/mpq/unit/cm/zerg/axtoth-axis-damage.lof similarity index 100% rename from mpq/unit/cm/zerg/orbothomlia-damage.lof rename to mpq/unit/cm/zerg/axtoth-axis-damage.lof diff --git a/mpq/unit/cm/zerg/orbothomlia-shad.grp b/mpq/unit/cm/zerg/axtoth-axis-shadow.grp similarity index 100% rename from mpq/unit/cm/zerg/orbothomlia-shad.grp rename to mpq/unit/cm/zerg/axtoth-axis-shadow.grp diff --git a/mpq/unit/cm/zerg/orbothomlia.grp b/mpq/unit/cm/zerg/axtoth-axis.grp similarity index 100% rename from mpq/unit/cm/zerg/orbothomlia.grp rename to mpq/unit/cm/zerg/axtoth-axis.grp diff --git a/mpq/unit/cm/zerg/mortothrokor-remnants.grp b/mpq/unit/cm/zerg/mortothrokor-remnants.grp new file mode 100644 index 00000000..564ea014 Binary files /dev/null and b/mpq/unit/cm/zerg/mortothrokor-remnants.grp differ diff --git a/mpq/unit/cm/zerg/mortothrokor-shadow.grp b/mpq/unit/cm/zerg/mortothrokor-shadow.grp new file mode 100644 index 00000000..8b1844a2 Binary files /dev/null and b/mpq/unit/cm/zerg/mortothrokor-shadow.grp differ diff --git a/mpq/unit/cm/zerg/mortothrokor.grp b/mpq/unit/cm/zerg/mortothrokor.grp new file mode 100644 index 00000000..38346815 Binary files /dev/null and b/mpq/unit/cm/zerg/mortothrokor.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 024003db..3753c864 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 d49eefb2..06b13633 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 954b4d06..44f0f76d 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -15,8 +15,8 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m - Uncapped Geysers now return 6, from 4 - Tier 2 refineries now return 8, from 6 - Tier 3 refineries are new, and return 10 -- Zerg regression now applies to units as well as structures (c. Veeq7) - - We will also add structure -> Droleth regression once we can get it working without issues! +- Zerg regression now applies to units, and structures regress to Droleths (c. Veeq7) + - If structures were produced by Gosvileths, they do not regress - The melee weapons of the following units have had their ranges mildly adjusted, with the aim of improving responsivity: - Zealot, Cabalist, Pariah, Golem, Zethrokor, Vorvrokor, Nathrokor, Gorgrokor, Rilirokor, Ultrokor - Healing no longer cleanses debuffs (intended to be removed a lot earlier... c. Veeq7) @@ -798,6 +798,7 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m - [Rililisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/rililisk): - Armor penetration now 0, from 2 - [Ultrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/ultrokor): + - Now moves slightly faster as a result of having its per-frame movement standardized - Armor penetration now 5, from 8 - [Zarcavrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zarcavrokor): - HP now 320, from 300 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 4e6bb88f..29d84afa 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ