diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 9e715a4c..3aba9584 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index b5e1268d..f2b078e7 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 73aa6ba8..aaa829f4 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 6f87300f..f276cec0 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2546,8 +2546,8 @@ Yvilirokor Yvilirokor Shadow Yvilirokor Birth Yvilirokor Remains -Extended Image #1546 -Extended Image #1547 +Ajax +Ajax Shadow Extended Image #1548 Extended Image #1549 Extended Image #1550 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 24dcc712..1590af31 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 a844ada0..9e342f93 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1227,7 +1227,7 @@ Rakzilisk Rakzilisk Remains Yvilirokor Yvilirokor Remains -Extended Sprite #713 +Ajax Extended Sprite #714 Extended Sprite #715 Extended Sprite #716 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index d40ce994..0afb9ee5 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index f61f742a..6f52f8f7 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt index c9c87ba2..6e8f806d 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -324,8 +324,8 @@ Erce Twinburst (Magian) Landfall (Askosi) Sizzling Venom (Rakzilisk) Extended Spikes (Yvilirokor) -Extended Weapon #197 -Extended Weapon #198 +Achaean Railgun (Ajax) +Teuceros Gauntlet (Ajax) Extended Weapon #199 Extended Weapon #200 Extended Weapon #201 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 52cf5049..b44f3316 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index e080d27f..7c83fdaa 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index d3ffe3fb..921e3b2e 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 3cedbce1..f134b6ed 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -299,8 +299,8 @@ <0> <0> <0> -<0> -<0> +v<1><4>Train Ajax <1>(<3>V<1>)<10>Versatile infantry.<0> +Ajax requires:<10> Covenant<0> ยค<3><4>Torrent of Teeth <2>(passive)<10>Upon taking damage, this strain launches three retaliatory bones in the direction of their attacker that travel up to 3 range, piercing any hostiles in their path.<0> z<1><4>Morph into Yvilirokors<1>(<3>Z<1>)<10>Shredding reactive strain.<0> Yvilir Aspect requires:<10> Tethvith Swamp<0> @@ -2322,9 +2322,9 @@ Ikta Driver<0> Erce Twinburst<0> Landfall<0> Sizzling Venom<0> -<0> -<0> -<0> +Extending Spikes<0> +Achaean Railgun<0> +Teuceros Gauntlet<0> <0> <0> <0> diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 9aa78803..d3163e7a 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 bb1b524a..069121e9 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -23871,4 +23871,121 @@ BurstLasersYellowSilentInit: BurstLasersYellowSilentDeath: imgol 2534 0 0 # Burst Lasers Yellow Hit Damaging (cm\t\burst-lasers-yellow-hit.grp) wait 1 - end \ No newline at end of file + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2548 Ajax (cm\f-t\ajax.grp) +.headerstart +IsId 871 +Type 13 +Init AjaxInit +Death AjaxDeath +GndAttkInit AjaxGndAttkInit +AirAttkInit AjaxGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt AjaxGndAttkRpt +AirAttkRpt AjaxGndAttkRpt +CastSpell [NONE] +GndAttkToIdle AjaxGndAttkToIdle +AirAttkToIdle AjaxGndAttkToIdle +Unused2 [NONE] +Walking AjaxWalking +WalkingToIdle AjaxWalkingToIdle +SpecialState1 AjaxGndAttkInitMelee +.headerend +# ----------------------------------------------------------------------------- # + +AjaxInit: + imgulnextid 0 0 # Ajax Shadow (cm\f-t\ajax-shadow.grp) +AjaxWalkingToIdle: + playfram 0x00 + goto SkryrokorLocal00 + +AjaxDeath: + playsndbtwn 276 277 # Terran\MARINE\TMaDth00.WAV | Terran\MARINE\TMaDth01.WAV + setfldirect 0 + playfram 0x00 + imgol 3 0 0 # Skryrokor Death (zerg\zavDeath.grp) + wait 5 + lowsprul 236 0 0 # Maverick Remnants (terran\tmaDeath.grp) + wait 1 + end + +AjaxGndAttkInit: + sigorder 32 + playfram 0x100 + wait 1 + playfram 0x120 + wait 1 + playfram 0x140 +AjaxGndAttkRpt: + sigorder 32 + wait 1 + nobrkcodestart + wait 1 + attackwith 2 + playsndbtwn 2739 2741 # Auriel weaponfire 01, 02, 03 + playfram 0x180 + wait 1 + playfram 0x160 + wait 1 + playfram 0x180 + wait 1 + playfram 0x160 + nobrkcodeend + gotorepeatattk + ignorerest +AjaxGndAttkToIdle: + playfram 0x140 + wait 1 + playfram 0x120 + wait 1 + playfram 0x100 + wait 1 + goto AjaxWalkingToIdle + +AjaxGndAttkInitMelee: + wait 1 + nobrkcodestart + playfram 0x1A0 + wait 1 + playfram 0x1C0 + wait 1 + playfram 0x1E0 + wait 1 + playfram 0x200 + attackmelee 3 1577 1578 1579 # Olympian Melee 01, 02, 03 + wait 1 + playfram 0x220 + wait 1 + playfram 0x240 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto AjaxWalkingToIdle + +AjaxWalking: + playfram 0x40 + move 4 + wait 1 + playfram 0x60 + move 4 + wait 1 + playfram 0x80 + move 4 + wait 1 + playfram 0xA0 + move 4 + wait 1 + playfram 0xC0 + move 4 + wait 1 + playfram 0xE0 + move 4 + wait 1 + playfram 0x20 + move 4 + wait 1 + goto AjaxWalking \ No newline at end of file diff --git a/mpq/unit/cm/f-t/ajax-shadow.grp b/mpq/unit/cm/f-t/ajax-shadow.grp new file mode 100644 index 00000000..390a5e32 Binary files /dev/null and b/mpq/unit/cm/f-t/ajax-shadow.grp differ diff --git a/mpq/unit/cm/f-t/ajax.grp b/mpq/unit/cm/f-t/ajax.grp new file mode 100644 index 00000000..2f69caa7 Binary files /dev/null and b/mpq/unit/cm/f-t/ajax.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 0833ab28..2fc0b82f 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 c321b663..4acb3acb 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 b8c8b5cd..445b36e0 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 5fd00d48..54ab09d9 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 114bec3d..d468c62b 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -7,9 +7,19 @@ - [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! - Join our communities ([Discord](https://discord.com/invite/s5SKBmY) | [Fluxer](https://fluxer.gg/1rebBmBw)), or get in touch with Pr0nogo via email! pr0nogo@fraudsclub.com +## Core +- Deprecated and removed `mtl` plugin (c. Jesse) + - Yay, more code ownership and safety! + ## Bugfixes - **Gameplay:** - Fixed Sovroleths morphing from Protathalors only providing 1 Sovroleth (r. jakulangski) + - Cantavis Hallucination no longer drains more energy than intended when targeting units instead of terrain (r. Londier) + +## Terran factions +- **NEW:** [Ajax](https://cosmonarchy.com/terran/ajax/): + - **Futurist Federation:** Savant replacement; versatile infantry. + - Community milestone reward: ko-fi monthly subscriptions! (c. HippityHoppity, un1maginative, Dat Big Boss, Vestigial) ## Zerg factions - **NEW:** [Yvilirokor](https://cosmonarchy.com/zerg/yvilirokor/): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index bd941c61..2e1b6714 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ