diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 74782590..3c2cba33 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 f4c82005..4a201ad3 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 020e5107..6ca9d08a 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4203,12 +4203,12 @@ Cloak Zerg On Cloak Zerg Off Cloak Askosi On Cloak Askosi Off -Forerunner Sentinel Weaponfire 01 -Forerunner Sentinel Weaponfire 02 -Forerunner Sentinel Weaponfire 03 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Ferrum Weaponfire 01 +Ferrum Weaponfire 02 +Ferrum Weaponfire 03 +Insurant Weaponfire 01 +Insurant Weaponfire 02 +Insurant Weaponfire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 65c663d2..1eaa2df1 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4205,4 +4205,7 @@ cm\a\cloak-askosi-on.wav cm\a\cloak-askosi-off.wav cm\sp\h\sentinel\wf-01.wav cm\sp\h\sentinel\wf-02.wav -cm\sp\h\sentinel\wf-03.wav \ No newline at end of file +cm\sp\h\sentinel\wf-03.wav +cm\a\insurant\wf-01.wav +cm\a\insurant\wf-02.wav +cm\a\insurant\wf-03.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 2adbb5de..91e984d1 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 9af98a7a..a5795bd8 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index fe840f4d..76c831b0 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 20270bfc..e6eb12d2 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index 7904834e..23e2b0ff 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 7fe12db9..d4f0bd69 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -5192,6 +5192,169 @@ HearthshardIsWorking: HearthshardDisable: goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2362 Insurant (cm\a\insurant.grp) +.headerstart +IsId 63 +Type 12 +Init InsurantInit +Death InsurantDeath +GndAttkInit InsurantGndAttkInit +AirAttkInit InsurantGndAttkInit +Unused1 InsurantUnused1 +GndAttkRpt InsurantGndAttkRpt +AirAttkRpt InsurantGndAttkRpt +CastSpell [NONE] +GndAttkToIdle InsurantGndAttkToIdle +AirAttkToIdle InsurantGndAttkToIdle +Unused2 [NONE] +Walking InsurantWalking +WalkingToIdle InsurantWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +InsurantInit: + imgulnextid 0 0 # Insurant Shadow (cm\a\insurant-shadow.grp) +InsurantWalkingToIdle: + playfram 0x00 +InsurantLocal00: + wait 63 + randcondjmp 25 InsurantLocal01 + randcondjmp 128 InsurantLocal02 + goto InsurantLocal00 + +InsurantLocal01: + playfram 0x20 + wait 1 + randcondjmp 192 InsurantLocal03 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + wait 6 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + turncwise 2 + wait 3 + wait 6 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + turnccwise 2 + wait 3 + goto InsurantWalkingToIdle + +InsurantLocal03: + wait 13 + goto InsurantWalkingToIdle + +InsurantLocal02: + playfram 0x80 + wait 1 + playfram 0xA0 + wait 1 + turnrand 3 + wait 1 + playfram 0x80 + wait 1 + goto InsurantWalkingToIdle + +InsurantDeath: + playsndbtwn 296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV + imgol 2089 0 0 # Askosi Death Explosion Small (cm\a\a-death-small.grp) + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + setfldirect 0 + wait 8 + lowsprul 1031 0 0 # Insurant Remnants (cm\a\insurant-remnants.grp) + wait 1 + end + +InsurantUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsndbtwn 1163 1165 + sprol 742 0 0 # Explosion Small Reversed +# playfram 176 + wait 2 +# playfram 175 + wait 2 +# playfram 174 + wait 2 +# playfram 173 + wait 2 +# playfram 172 + wait 2 +# playfram 171 + wait 2 +# playfram 170 + wait 2 + setfldirect 12 + nobrkcodeend + goto InsurantWalkingToIdle + +InsurantGndAttkInit: + playfram 0x20 +InsurantGndAttkRpt: + wait 1 + nobrkcodestart + playfram 0x40 + attackwith 1 + wait 1 + playfram 0x20 + wait 1 + playfram 0x40 + wait 1 + playfram 0x20 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest +InsurantGndAttkToIdle: + goto InsurantWalkingToIdle + +InsurantWalking: + 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 0x100 + move 4 + wait 1 + playfram 0x120 + move 4 + wait 1 + playfram 0x140 + move 4 + wait 1 + playfram 0x60 + goto InsurantWalking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/sound/cm/a/insurant/wf-01.wav b/mpq/sound/cm/a/insurant/wf-01.wav new file mode 100644 index 00000000..0f625aa7 Binary files /dev/null and b/mpq/sound/cm/a/insurant/wf-01.wav differ diff --git a/mpq/sound/cm/a/insurant/wf-02.wav b/mpq/sound/cm/a/insurant/wf-02.wav new file mode 100644 index 00000000..e9357f81 Binary files /dev/null and b/mpq/sound/cm/a/insurant/wf-02.wav differ diff --git a/mpq/sound/cm/a/insurant/wf-03.wav b/mpq/sound/cm/a/insurant/wf-03.wav new file mode 100644 index 00000000..73e4fc63 Binary files /dev/null and b/mpq/sound/cm/a/insurant/wf-03.wav differ diff --git a/mpq/unit/cm/a/insurant-shadow.grp b/mpq/unit/cm/a/insurant-shadow.grp new file mode 100644 index 00000000..195495d8 Binary files /dev/null and b/mpq/unit/cm/a/insurant-shadow.grp differ diff --git a/mpq/unit/cm/a/insurant.grp b/mpq/unit/cm/a/insurant.grp new file mode 100644 index 00000000..4f6adfb5 Binary files /dev/null and b/mpq/unit/cm/a/insurant.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 62d80a0c..4778686c 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 ce0eb6c4..94606103 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/patchnotes.md b/patchnotes.md index b0e7d8c5..c7f790f6 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -39,8 +39,27 @@ - Vision range 10 » 9 ## Askosi +- [Cardinal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/cardinal): + - Resource costs 75/50 » 75/25 +- [Mimic](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/mimic): + - Resource costs 50/100 » 50/75 +- [Thaumalogue](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/thaumalogue): + - Resource costs 100/25 » 75/25 - [Doronin](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/doronin): + - Resource costs 250/0 » 225/0 - Transport weight 2 » 6 +- [Object](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/object): + - Resource costs 175/50 » 125/50 +- [Scepter](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/scepter): + - Resource costs 200/75 » 150/75 +- [Agonist](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/agonist): + - HP 95 » 125 +- [Petract](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/petract): + - Resource costs 200/0 » 150/0 +- [Tirade](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/tirade): + - Resource costs 150/100 » 150/75 +- [Crematorium](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/crematorium): + - HP 200 » 300 - [Bounty](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/bounty): - HP 1200 » 800 - Armor 4 » 3 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 9c66f519..f8b54d95 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ