diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 3cfeea23..ebc4db43 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 71db4c8f..b0cc604e 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 aa294bb7..efc81128 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2455,8 +2455,8 @@ Sovrokor Mutate Zethrokor Mutate Eidolon (Nydus) Remains Hydralisk (Orkoti) Mutate -Extended Image #1455 -Extended Image #1456 +Valkyrie (Hecaton) Shadow +Valkyrie (Hecaton) Engines Extended Image #1457 Extended Image #1458 Extended Image #1459 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 30a0e383..f573a087 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 5829c936..bace9c38 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 ddd6656c..b932fde0 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 19a4745d..2320f4b3 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -6712,7 +6712,7 @@ GenericRemnantsFourDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 939 Valkyrie (terran\bomber.grp) +# 939 Valkyrie (terran\valkyrie.grp) .headerstart IsId 362 Type 12 @@ -6734,7 +6734,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # ValkyrieInit: - imgul 940 0 42 # Valkyrie Shadow (terran\bomber.grp) + imgulnextid 0 42 # Valkyrie Shadow (terran\valkyrie.grp) playfram 0x00 goto TrojanLocal00 @@ -6764,7 +6764,7 @@ ValkyrieAirAttkInit: ValkyrieWalking: setvertpos 0 - imgol 941 0 0 # Valkyrie Engines (thingy\tbmGlow.grp) + imgol 941 0 0 # Valkyrie Engines (terran\valkyrie-engine.grp) sigorder 64 goto SkryrokorLocal00 @@ -20395,7 +20395,7 @@ VultureHecatonSpecialState1: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 2226 Quadriga (cm\faction-t\quadriga.grp) +# 2226 Quadriga (cm\f-t\quadriga.grp) .headerstart IsId 840 Type 12 @@ -20417,7 +20417,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # QuadrigaInit: - imgulnextid 0 42 # Quadriga Shadow (cm\faction-t\quadriga.grp) + imgulnextid 0 42 # Quadriga Shadow (cm\f-t\quadriga.grp) playfram 0x00 goto TrojanLocal00 @@ -20447,7 +20447,7 @@ QuadrigaAirAttkInit: QuadrigaWalking: setvertpos 0 - imgol 2228 0 0 # Quadriga Engines (cm\faction-t\quadriga-engine.grp) + imgol 2228 0 0 # Quadriga Engines (cm\f-t\quadriga-engine.grp) sigorder 64 goto SkryrokorLocal00 @@ -21114,4 +21114,66 @@ ArquebusWalking: playfram 0x80 move 3 wait 1 - goto ArquebusWalking \ No newline at end of file + goto ArquebusWalking + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 939 Valkyrie (Hecaton) (cm\f-t\valkyrie-hecaton.grp) +.headerstart +IsId 849 +Type 12 +Init ValkyrieHecatonInit +Death ValkyrieHecatonDeath +GndAttkInit ValkyrieHecatonAirAttkInit +AirAttkInit ValkyrieHecatonAirAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt ValkyrieHecatonAirAttkInit +AirAttkRpt ValkyrieHecatonAirAttkInit +CastSpell [NONE] +GndAttkToIdle TrojanLocal00 +AirAttkToIdle TrojanLocal00 +Unused2 [NONE] +Walking ValkyrieHecatonWalking +WalkingToIdle ValkyrieHecatonWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +ValkyrieHecatonInit: + imgul 2457 0 42 # Valkyrie (Hecaton) Shadow (cm\f-t\valkyrie-hecaton.grp) + playfram 0x00 + goto TrojanLocal00 + +ValkyrieHecatonDeath: + playsnd 1040 # Terran\FRIGATE\TVkDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 844 0 42 # Terran Unit Rubble Medium + wait 1 + end + +ValkyrieHecatonAirAttkInit: + wait 2 + nobrkcodestart + attackwith 2 + wait 6 + attackwith 2 + wait 6 + attackwith 2 + wait 6 + attackwith 2 + wait 6 + attackwith 2 + nobrkcodeend + gotorepeatattk + goto TrojanLocal00 + +ValkyrieHecatonWalking: + setvertpos 0 + imgol 2458 0 0 # Valkyrie (Hecaton) Engines (cm\f-t\valkyrie-hecaton-engine.grp) + sigorder 64 + goto SkryrokorLocal00 + +ValkyrieHecatonWalkingToIdle: + orderdone 64 + goto TrojanLocal00 \ No newline at end of file diff --git a/mpq/unit/cm/f-t/valkyrie-attack.lol b/mpq/unit/cm/f-t/valkyrie-attack.lol new file mode 100644 index 00000000..0a97ee4c Binary files /dev/null and b/mpq/unit/cm/f-t/valkyrie-attack.lol differ diff --git a/mpq/unit/cm/f-t/valkyrie-hecaton-attack.lol b/mpq/unit/cm/f-t/valkyrie-hecaton-attack.lol new file mode 100644 index 00000000..86275756 Binary files /dev/null and b/mpq/unit/cm/f-t/valkyrie-hecaton-attack.lol differ diff --git a/mpq/unit/cm/f-t/valkyrie-hecaton-engine.grp b/mpq/unit/cm/f-t/valkyrie-hecaton-engine.grp new file mode 100644 index 00000000..1117c45a Binary files /dev/null and b/mpq/unit/cm/f-t/valkyrie-hecaton-engine.grp differ diff --git a/mpq/unit/cm/f-t/valkyrie-hecaton.grp b/mpq/unit/cm/f-t/valkyrie-hecaton.grp index d0e7a55b..e914b1f3 100644 Binary files a/mpq/unit/cm/f-t/valkyrie-hecaton.grp and b/mpq/unit/cm/f-t/valkyrie-hecaton.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index a9c1ed14..ed5ab512 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 72cc8aaf..35c73b0b 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/thingy/tdrglow.grp b/mpq/unit/terran/trojan-engine.grp similarity index 100% rename from mpq/unit/thingy/tdrglow.grp rename to mpq/unit/terran/trojan-engine.grp diff --git a/mpq/unit/terran/trojan.grp b/mpq/unit/terran/trojan.grp new file mode 100644 index 00000000..c3fecea6 Binary files /dev/null and b/mpq/unit/terran/trojan.grp differ diff --git a/mpq/unit/terran/valkyrie-attack.lol b/mpq/unit/terran/valkyrie-attack.lol new file mode 100644 index 00000000..4d8e1885 Binary files /dev/null and b/mpq/unit/terran/valkyrie-attack.lol differ diff --git a/mpq/unit/terran/valkyrie-engine.grp b/mpq/unit/terran/valkyrie-engine.grp new file mode 100644 index 00000000..20e4cd0e Binary files /dev/null and b/mpq/unit/terran/valkyrie-engine.grp differ diff --git a/mpq/unit/terran/valkyrie.grp b/mpq/unit/terran/valkyrie.grp index 1a0b5dde..82eea103 100644 Binary files a/mpq/unit/terran/valkyrie.grp and b/mpq/unit/terran/valkyrie.grp differ diff --git a/mpq/unit/terran/valkyrie.lol b/mpq/unit/terran/valkyrie.lol new file mode 100644 index 00000000..86275756 Binary files /dev/null and b/mpq/unit/terran/valkyrie.lol differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 9ebd6660..a505fde3 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ