diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 8fe181ab..764a4dad 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 265f1538..5b5784ea 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 b360a74b..65c3cd86 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2207,7 +2207,7 @@ Simulacrum (Astral) Simulacrum (Astral) Shadow Herald Glow Maverick Remains (Futurist) -Extended Image #1207 +Vulture (Hecaton) Engines Extended Image #1208 Extended Image #1209 Extended Image #1210 diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 5a2a3988..5aebe5e6 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index f1b8e22e..354d4314 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 69d7b7a1..d9a00c68 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -20336,4 +20336,82 @@ MaverickFuturistWalking: move 4 wait 1 playfram 0x80 - goto MaverickFuturistWalking \ No newline at end of file + goto MaverickFuturistWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2098 Vulture (Hecaton) (cm\faction-t\vulture-hecaton.grp) +.headerstart +IsId 839 +Type 13 +Init VultureHecatonInit +Death VultureHecatonDeath +GndAttkInit VultureHecatonGndAttkInit +AirAttkInit [NONE] +Unused1 VultureHecatonUnused1 +GndAttkRpt VultureHecatonGndAttkInit +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle VultureHecatonGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking VultureHecatonWalking +WalkingToIdle VultureHecatonGndAttkToIdle +SpecialState1 VultureHecatonSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +VultureHecatonInit: + imgul 2099 0 7 # Vulture (Hecaton) Shadow (cm\faction-t\vulture-hecaton.grp) + playfram 0x00 + goto VultureHecatonGndAttkToIdle + +VultureHecatonGndAttkToIdle: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto VultureHecatonGndAttkToIdle + +VultureHecatonDeath: + playsnd 353 # Terran\VULTURE\TVuDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 813 0 0 # Vulture Remains + end + +VultureHecatonUnused1: + wait 1 + nobrkcodestart + tmprmgraphicstart + playsnd 1699 # Vulture revive 01 + sprol 742 0 0 + wait 10 + setfldirect 12 + tmprmgraphicend + nobrkcodeend + goto VultureHecatonGndAttkToIdle + +VultureHecatonGndAttkInit: + wait 1 + attackwith 1 + attackwith 1 + playsnd 106 # Bullet\tvuFir00.wav + gotorepeatattk + goto VultureHecatonGndAttkToIdle + +VultureHecatonWalking: + playfram 0x00 + setvertpos 0 + imgol 2209 0 0 # Vulture (Hecaton) Engines + goto SkryrokorLocal00 + +VultureHecatonSpecialState1: + attackwith 1 + sigorder 1 + wait 1 + end \ No newline at end of file diff --git a/mpq/unit/cm/faction-t/vulture-hecaton-attack.lol b/mpq/unit/cm/faction-t/vulture-hecaton-attack.lol new file mode 100644 index 00000000..dfa40a86 Binary files /dev/null and b/mpq/unit/cm/faction-t/vulture-hecaton-attack.lol differ diff --git a/mpq/unit/cm/faction-t/vulture-hecaton-engine.grp b/mpq/unit/cm/faction-t/vulture-hecaton-engine.grp new file mode 100644 index 00000000..a81181f0 Binary files /dev/null and b/mpq/unit/cm/faction-t/vulture-hecaton-engine.grp differ diff --git a/mpq/unit/cm/faction-t/vulture-hecaton.grp b/mpq/unit/cm/faction-t/vulture-hecaton.grp index 71e3c24c..cca5bed4 100644 Binary files a/mpq/unit/cm/faction-t/vulture-hecaton.grp and b/mpq/unit/cm/faction-t/vulture-hecaton.grp differ diff --git a/mpq/unit/cm/terran/vulture-attack.lol b/mpq/unit/cm/terran/vulture-attack.lol index 511ef672..22b0bd38 100644 Binary files a/mpq/unit/cm/terran/vulture-attack.lol and b/mpq/unit/cm/terran/vulture-attack.lol differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index a2f1f8d4..d1670b6a 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 4afc99cd..8ba4d99e 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 60e1ca21..fc2d3443 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 6596256c..012affe9 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 94f329db..95bbe973 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -13,7 +13,7 @@ ## Audiovisuals - New model for: (c. Solstice) - - **Maverick** (incl. Futurist variant), **Vulture**, **Herald** + - **Maverick** (incl. Futurist variant), **Vulture** (incl. Hecaton variant), **Herald** - New portrait for: (c. Solstice) - **Herald** - Modified models for: (c. Solstice)