diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index a0c7ba2e..69dedbc1 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 ffb03016..4ec6b2b2 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -503,10 +503,10 @@ Skithrok Scab Qilin Auriel Spoke Shell -Extended Flingy #297 -Extended Flingy #298 -Extended Flingy #299 -Extended Flingy #300 +Adherent +Extatus +Nathrelisk +Iziralisk Extended Flingy #301 Extended Flingy #302 Extended Flingy #303 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 03d5ad92..32895e0e 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 dbf0443b..84fdccae 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 72783fb5..a1d076e1 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1790,18 +1790,18 @@ Rotary Connector Auriel Auriel Shadow Spoke Shell -Extended Image #790 -Extended Image #791 -Extended Image #792 -Extended Image #793 -Extended Image #794 -Extended Image #795 -Extended Image #796 -Extended Image #797 -Extended Image #798 -Extended Image #799 -Extended Image #800 -Extended Image #801 +Adherent +Adherent Shadow +Extatus +Extatus Shadow +Extatus Engines +Nathrelisk +Nathrelisk Shadow +Nathrelisk Birth +Iziralisk +Iziralisk Shadow +Iziralisk Birth +Iziralisk Remains Extended Image #802 Extended Image #803 Extended Image #804 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index af7569f2..0e7040cb 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 b02dc32e..392b9b2c 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -893,10 +893,10 @@ Qilin Auriel Legionnaire Teleport Effect Spoke Shell -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 +Adherent +Extatus +Nathrelisk +Iziralisk Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index bf6963c5..e0312671 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 8cd40052..fade2ef3 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -386,7 +386,7 @@ Terran Lodestone Floor Hatch Terran Treasury Terran Lodestone (Standalone) -Faction Selection +Faction Selection Terran Select Faction 1 Select Faction 2 Select Faction 3 @@ -398,12 +398,12 @@ Zerg Vornath Pond Zerg Skibact Scab Terran Qilin Terran Auriel -Extended Unit #173 -Extended Unit #174 -Extended Unit #175 -Extended Unit #176 -Extended Unit #177 -Extended Unit #178 +Protoss Adherent +Protoss Extatus +Zerg Nathrelisk +Zerg Iziralisk +Faction Selection Protoss +Faction Selection Zerg Extended Unit #179 Extended Unit #180 Extended Unit #181 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 070aba44..dd2edcf9 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 6bc82e01..ec1625ba 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -208,8 +208,8 @@ Talismanic Weaver (Potentate) Phase Saber (Potentate) Dispatch Shotgun (Hotshot) Quarternary Rifle (Auriel) -Extended Weapon #81 -Extended Weapon #82 +Phase Blade (Adherent) +Signaling Spores (Nathrelisk) Extended Weapon #83 Extended Weapon #84 Extended Weapon #85 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 97394905..dd6c1288 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 765dc065..3c0e6f4f 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 7a130e3f..4730144e 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 bc5b080b..bffd276c 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 be6d2e96..fc4ea93f 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/samase/config.ini b/mpq/samase/config.ini index af68b7b6..44b9ba35 100644 --- a/mpq/samase/config.ini +++ b/mpq/samase/config.ini @@ -42,11 +42,13 @@ unit_morph_prerequisites = Add(othstoleth, alaszileth, 1) unit_morph_prerequisites = Add(zethrokor, vorvrokor, 1) unit_morph_prerequisites = Add(quazilisk, liiralisk, 1) unit_morph_prerequisites = Add(nathrokor, kalkalisk, 1) +unit_morph_prerequisites = Add(nathrelisk, kalkalisk, 1) unit_morph_prerequisites = Add(cikralisk, ghitorokor, 1) unit_morph_prerequisites = Add(protathalor, sovroleth, 1) unit_morph_prerequisites = Add(mutalisk, tosgrilisk, 1) unit_morph_prerequisites = Add(hydralisk, bactalisk, 1) unit_morph_prerequisites = Add(izirokor, tethzorokor, 1) +#unit_morph_prerequisites = Add(iziralisk, tethzorokor, 1) unit_morph_prerequisites = Add(skithrokor, vithrilisk, 1) unit_morph_prerequisites = Add(geszithalor, alkajelisk, 1) unit_morph_prerequisites = Add(konvilisk, tetcaerokor, 1) @@ -84,12 +86,14 @@ morph_train_ai = Add(othstoleth, alaszileth) morph_train_ai = Add(zethrokor, vorvrokor) morph_train_ai = Add(quazilisk, liiralisk) morph_train_ai = Add(nathrokor, kalkalisk) +morph_train_ai = Add(nathrelisk, kalkalisk) morph_train_ai = Add(cikralisk, ghitorokor) morph_train_ai = Add(protathalor, sovroleth) morph_train_ai = Add(mutalisk, tosgrilisk) morph_train_ai = Remove(mutalisk, vithrilisk) morph_train_ai = Add(hydralisk, bactalisk) morph_train_ai = Add(izirokor, tethzorokor) +#morph_train_ai = Add(iziralisk, tethzorokor) morph_train_ai = Add(skithrokor, vithrilisk) morph_train_ai = Add(geszithalor, alkajelisk) morph_train_ai = Add(konvilisk, tetcaerokor) diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index fe3c9cda..0a67501e 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 96c3934e..1c8e7aae 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -35803,9 +35803,7 @@ LegionnaireInit: imgul 1339 0 0 # Legionnaire Shadow (cm\protoss\legionnaire-shad.grp) LegionnaireWalkingToIdle: playfram 0x00 -LegionnaireLocal00: - wait 125 - goto LegionnaireLocal00 + goto ScourgeLocal00 LegionnaireDeath: playsnd 678 # Protoss\ZEALOT\PZeDth00.WAV @@ -35865,7 +35863,7 @@ LegionnaireWalking: LegionnaireWarpIn: imgol 154 0 0 # Zealot Warp Flash (protoss\zealot.grp) - goto LegionnaireLocal00 + goto ScourgeLocal00 # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -51956,4 +51954,100 @@ SpokeShellDeath: wait 1 end -## Next free IsId: 768 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1792 Adherent (cm\faction-p\adherent.grp) +.headerstart +IsId 768 +Type 21 +Init AdherentInit +Death LegionnaireDeath +GndAttkInit AdherentGndAttkInit +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt AdherentGndAttkInit +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle LegionnaireGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking LegionnaireWalking +WalkingToIdle LegionnaireWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn LegionnaireWarpIn +.headerend +# ----------------------------------------------------------------------------- # + +AdherentInit: + imgul 1793 0 0 # Adherent Shadow (cm\faction-p\adherent-shadow.grp) + goto LegionnaireWalkingToIdle + +AdherentGndAttkInit: + playfram 0x100 + nobrkcodestart + wait 2 + playsndbtwn 1231 1234 # Amaranth weaponfire 01, 02, 03, 04 + playfram 0x120 + wait 1 + playfram 0x140 + attackmelee 1 1897 # Legionnaire weapon hit 01 + wait 1 + playfram 0x160 + wait 1 + nobrkcodeend + playfram 0x120 + wait 1 + gotorepeatattk + ignorerest + goto LegionnaireGndAttkToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1797 Nathrelisk (cm\faction-z\nathrelisk.grp) +.headerstart +IsId 769 +Type 12 +Init NathreliskInit +Death NathrokorDeath +GndAttkInit NathreliskGndAttkInit +AirAttkInit NathreliskGndAttkInit +Unused1 [NONE] +GndAttkRpt NathreliskGndAttkInit +AirAttkRpt NathreliskGndAttkInit +CastSpell [NONE] +GndAttkToIdle NathrokorGndAttkToIdle +AirAttkToIdle NathrokorGndAttkToIdle +Unused2 [NONE] +Walking NathrokorWalking +WalkingToIdle NathrokorGndAttkToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +NathreliskInit: + imgul 1798 0 42 # Nathrelisk Shadow (cm\faction-z\nathrelisk.grp) + playfram 0x00 + wait 2 + goto NathrokorGndAttkToIdle + +NathreliskGndAttkInit: + playfram 0x00 + wait 1 + nobrkcodestart + playfram 0x20 + playsnd 1326 # Nathrokor weaponfire 01 + attack + wait 1 + playfram 0x00 + nobrkcodeend + gotorepeatattk + goto NathrokorGndAttkToIdle + +## Next free IsId: 770 \ No newline at end of file diff --git a/mpq/unit/cm/faction-p/adherent-shadow.grp b/mpq/unit/cm/faction-p/adherent-shadow.grp index e4e443c1..e5ce29a8 100644 Binary files a/mpq/unit/cm/faction-p/adherent-shadow.grp and b/mpq/unit/cm/faction-p/adherent-shadow.grp differ diff --git a/mpq/unit/cm/faction-p/adherent.grp b/mpq/unit/cm/faction-p/adherent.grp index f0525c62..17b705de 100644 Binary files a/mpq/unit/cm/faction-p/adherent.grp and b/mpq/unit/cm/faction-p/adherent.grp differ diff --git a/mpq/unit/cm/faction-z/nathrelisk.grp b/mpq/unit/cm/faction-z/nathrelisk.grp new file mode 100644 index 00000000..d4198c5b Binary files /dev/null and b/mpq/unit/cm/faction-z/nathrelisk.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 72100506..cc905b60 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 9f906468..888e078b 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 998a26bc..4a89f040 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 58f9b1dc..0cfe7172 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 c4f28217..bd690619 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -24,6 +24,10 @@ Patch goals include: - Added "unit_color" custom trigger condition - Added "kill", "move_unit", "set_unit_stat", and "set_unit_behavior" custom trigger actions +## Game modes +- Faction Wars: + - Protoss and Zerg faction selection has been made available + ## Maps - HYDRA refurbished -> vz02 is now available @@ -84,4 +88,10 @@ Patch goals include: - Nimble transport. Heals loaded units. - [Auriel](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/auriel): - Hecaton (replaces Apostle at Captaincy) - - Mid-range infantry with a powerful damage over time effect. Incinerates corpses to create Apollyoid fields. \ No newline at end of file + - Mid-range infantry with a powerful damage over time effect. Incinerates corpses to create Apollyoid fields. +- [Adherent](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/adherent): + - Sacred (replaces Legionnaire at Gateway) + - Durable melee brawler with increased movement speed +- [Nathrelisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/nathrelisk): + - Zorthos (replaces Nathrokor) + - Sustaining fighter strain that releases a short-lived healing field on attack \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 03753a7b..26b96cf9 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ