diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index b68be726..f304eb38 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 7e6b8e9e..672eabc9 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -623,7 +623,7 @@ Grandstand (Cannon) Grandstand (Holdout) Grandstand (Vision) Mimic -Extended Flingy #417 +Intendent Extended Flingy #418 Extended Flingy #419 Extended Flingy #420 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index be05ef47..49138cbb 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 0b7400ef..3e67c037 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 a0fd96f6..f3cee004 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2216,8 +2216,8 @@ Grandstand (Vision) Grandstand (Vision) shadow Mimic Mimic Shadow -Extended Image #1216 -Extended Image #1217 +Intendent +Intendent Shadow Extended Image #1218 Extended Image #1219 Extended Image #1220 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index d635cc82..7305f171 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 c93d8b93..b84f402a 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1074,7 +1074,7 @@ Grandstand (Cannon) Grandstand (Holdout) Grandstand (Vision) Mimic -Extended Sprite #560 +Intendent Extended Sprite #561 Extended Sprite #562 Extended Sprite #563 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 43ee0f5e..0b3616b3 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 31a21ac0..33b72abc 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 4af4d520..6ffe2c4c 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Orders.graft b/mpq/datreq/Orders.graft index f10dcafc..77857f47 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index 72b772cc..b0b103e2 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 e077fa9b..dd652dfd 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 40c3beae..6c121c26 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 84c41d4d..a6fda970 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -2000,4 +2000,118 @@ MimicWalking: move 5 wait 1 playfram 0x88 - goto MimicWalking \ No newline at end of file + goto MimicWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# xxxx Intendent (cm\askosi\intendent.grp) +.headerstart +IsId 23 +Type 21 +Init IntendentInit +Death IntendentDeath +GndAttkInit IntendentGndAttkInit +AirAttkInit IntendentGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt IntendentGndAttkInit +AirAttkRpt IntendentGndAttkInit +CastSpell [NONE] +GndAttkToIdle IntendentGndAttkToIdle +AirAttkToIdle IntendentGndAttkToIdle +Unused2 [NONE] +Walking IntendentWalking +WalkingToIdle IntendentGndAttkToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +IntendentInit: + imgulnextid 0 0 # Intendent Shadow (cm\askosi\intendent-shadow.grp) + goto IntendentGndAttkToIdle + +IntendentGndAttkToIdle: + playfram 0x220 + goto SkryrokorLocal00 + +IntendentDeath: + playsnd 533 # Protoss\Scout\PScDth00.WAV + imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) + wait 2 + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + wait 1 + end + +IntendentGndAttkInit: + playfram 0x220 +IntendentGndAttkRpt: + wait 1 + nobrkcodestart + playfram 0x200 + playsndbtwn 1788 1790 # Atreus weapon fire 01, 02, 03 + attackwith 1 + wait 1 + playfram 0x220 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto IntendentGndAttkToIdle + +IntendentWalking: + move 4 + wait 1 + playfram 0x00 + move 4 + wait 1 + playfram 0x20 + move 4 + wait 1 + 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 0x100 + move 4 + wait 1 + playfram 0x120 + move 4 + wait 1 + playfram 0x140 + move 4 + wait 1 + playfram 0x160 + move 4 + wait 1 + playfram 0x180 + move 4 + wait 1 + playfram 0x1A0 + move 4 + wait 1 + playfram 0x1C0 + move 4 + wait 1 + playfram 0x1E0 + goto IntendentWalking \ No newline at end of file diff --git a/mpq/unit/cm/askosi/intendent-attack1.lol b/mpq/unit/cm/askosi/intendent-attack1.lol new file mode 100644 index 00000000..1705110e Binary files /dev/null and b/mpq/unit/cm/askosi/intendent-attack1.lol differ diff --git a/mpq/unit/cm/askosi/intendent-attack2.lol b/mpq/unit/cm/askosi/intendent-attack2.lol new file mode 100644 index 00000000..39e5ee5c Binary files /dev/null and b/mpq/unit/cm/askosi/intendent-attack2.lol differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 22c3be97..f01737b5 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 61c5a174..a5e4034a 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 e2a937aa..ab9b3c7f 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 8cc3bce5..7e0fb835 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 4f9d3eca..3cd1de52 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -52,6 +52,8 @@ - [Stockade](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/stockade): - Time cost 45 » 50 - *Slight nudge-back to first-unit timings in bio openers.* +- [Tencendur](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/tencendur): + - HP 450 » 600 ## Zerg - [Zethrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zethrokor): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 60c0080c..dc21b765 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ