diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index efbb5490..fc95ae12 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 dd660198..8b98302e 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -518,8 +518,8 @@ Magister Weapon Impact Positron Projectile Sasyrvoleth Autocrat Laser -Extended Flingy #312 -Extended Flingy #313 +Angeltear Rockets +Ackmed Extended Flingy #314 Extended Flingy #315 Extended Flingy #316 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index d6793840..651573d2 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 e3d4b47e..cba6bcd3 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 164bf6e9..2e199a42 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1905,16 +1905,16 @@ Stroluum shadow Trojan Remains Envoy Remains Ovileth Remains -Extended Image #905 -Extended Image #906 -Extended Image #907 -Extended Image #908 -Extended Image #909 -Extended Image #910 -Extended Image #911 -Extended Image #912 -Extended Image #913 -Extended Image #914 +Phalanx (Tank) Remains +Phalanx (Siege) Remains +Hierophant Remains +Angeltear Rockets +Angeltear Rockets Trail +Ackmed +Ackmed Shadow +Simulacrum Remains +Vassal Remains +Nathrokor Remains Extended Image #915 Extended Image #916 Extended Image #917 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 3c7b9d43..ad003ea1 100644 Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index c4499abf..9161a406 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3107,7 +3107,6 @@ Hierophant Banter B 03 Patriarch Ready 01 Patriarch Ready 02 Patriarch Ready 03 -Patriarch Ready 04 Patriarch Selected 01 Patriarch Selected 02 Patriarch Selected 03 @@ -3128,14 +3127,15 @@ Patriarch Banter 01 Patriarch Banter 02 Patriarch Banter 03 Patriarch Banter 04 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Salamander Weapon 2 Fire 01 +Salamander Weapon 2 Fire 02 +Salamander Weapon 2 Fire 03 +Salamander Weapon 2 Fire 04 +Salamander Weapon 2 Hit 01 +Salamander Weapon 2 Hit 02 +Wyvern Weapon Charge 01 +Wyvern Weapon Charge 02 +Wyvern Weapon Charge 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 1c0a0326..d90fc281 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3127,15 +3127,15 @@ cm\p\patriarch\bnt-01.wav cm\p\patriarch\bnt-02.wav cm\p\patriarch\bnt-03.wav cm\p\patriarch\bnt-04.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav -caw.wav +cm\t\salamander\wf2-01.wav +cm\t\salamander\wf2-02.wav +cm\t\salamander\wf2-03.wav +cm\t\salamander\wf2-04.wav +cm\t\salamander\wh2-01.wav +cm\t\salamander\wh2-02.wav +cm\t\wyvern\charge-01.wav +cm\t\wyvern\charge-02.wav +cm\t\wyvern\charge-03.wav caw.wav caw.wav caw.wav diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 20a7af02..550e3135 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 6ced17c6..12d1dbaf 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -921,15 +921,15 @@ Ancile Remains Trojan Remains Envoy Remains Ovileth Remains -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 +Phalanx (Tank) Remains +Phalanx (Siege) Remains +Hierophant Remains +Angeltear Rockets +Angeltear Rockets Trail +Ackmed +Simulacrum Remains +Vassal Remains +Nathrokor Remains Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 9f853b94..452f5083 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 e9cac229..540a4672 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -407,7 +407,7 @@ Faction Selection Zerg Terran Anchor (Grounded) Zerg Sasyrvoleth Terran Tencendur -Extended Unit #182 +Ackmed Extended Unit #183 Extended Unit #184 Extended Unit #185 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 622d7cf7..7f6e0a91 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 3caeb026..6dcb8edc 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -214,7 +214,7 @@ Bottomless Spinestacks (Algoztalisk) Relentless Tendrils (Okrimnilisk) Omnispores (Okrimnilisk) Venemous Bursts (Cherbrathalor) -Extended Weapon #87 +Angeltear Rockets (Salamander) Extended Weapon #88 Extended Weapon #89 Extended Weapon #90 @@ -246,7 +246,7 @@ Extended Weapon #115 Extended Weapon #116 Extended Weapon #117 Extended Weapon #118 -Extended Weapon #119 +Micken Melter (Ackmed) Medusa Rifle (Francisco Goska) Extended Weapon #121 Magnate's Maw (Stroluum) diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index f1563d4d..12045427 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index b7bb7e08..a22ee031 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 c351a180..cf29e7bd 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 827a9f12..0b8c5314 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 9b9abea9..0b871beb 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index da7a29b4..3f944819 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -6802,7 +6802,7 @@ Phalanx_Tank_BaseDeath: playsnd 317 # Terran\TANK\TTaDth00.WAV imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 - lowsprul 273 0 0 # Terran Building Rubble Small + lowsprul 923 0 0 # Phalanx (Tank) remains wait 1 end @@ -6863,7 +6863,7 @@ Phalanx_Tank_TurretGndAttkInit: IsId 92 Type 14 Init Phalanx_Siege_BaseInit -Death Phalanx_Tank_BaseDeath +Death Phalanx_Siege_BaseDeath GndAttkInit [NONE] AirAttkInit [NONE] Unused1 [NONE] @@ -6913,6 +6913,14 @@ Phalanx_Siege_BaseInit: sigorder 1 goto ScourgeLocal00 +Phalanx_Siege_BaseDeath: + playsnd 317 # Terran\TANK\TTaDth00.WAV + imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) + wait 3 + lowsprul 924 0 0 # Phalanx (Siege) remains + wait 1 + end + Phalanx_Siege_BaseSpecialState2: wait 28 playsnd 319 # Terran\TANK\TTaTra01.WAV @@ -27139,10 +27147,10 @@ Type 12 Init SalamanderInit Death SalamanderDeath GndAttkInit SalamanderGndAttkInit -AirAttkInit SalamanderGndAttkInit +AirAttkInit SalamanderAirAttkInit Unused1 [NONE] GndAttkRpt SalamanderGndAttkInit -AirAttkRpt SalamanderGndAttkInit +AirAttkRpt SalamanderAirAttkInit CastSpell [NONE] GndAttkToIdle SalamanderGndAttkToIdle AirAttkToIdle SalamanderGndAttkToIdle @@ -27194,6 +27202,17 @@ SalamanderGndAttkInit: ignorerest goto SalamanderWalkingToIdle +SalamanderAirAttkInit: + wait 1 + nobrkcodestart + playsndbtwn 3129 3132 # Salamander weapon 2 fire 01, 02, 03 + attackwith 2 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto SalamanderWalkingToIdle + SalamanderWalking: setvertpos 0 imgol 1166 0 0 # Salamander Engines (cm\terran\salamander-engine.grp) @@ -34246,7 +34265,7 @@ HierophantDeath: wait 2 playfram 836 wait 2 - lowsprul 846 0 42 # Protoss Unit Rubble Medium + lowsprul 925 0 0 # Hierophant remains wait 1 end @@ -40689,9 +40708,15 @@ TarasqueMuzzleFlashDeath: # 1647 Goliath Remains (cm\terran\goliath-remains.grp) # 1648 Ecclesiast Remains (cm\protoss\ecclesiast-remains.grp) # 1648 Lanifect Remains (cm\protoss\lanifect-death.grp) -# 1904 Trojan Remains (cm\protoss\lanifect-death.grp) -# 1905 Envoy Remains (cm\protoss\lanifect-death.grp) -# 1906 Ovileth Remains (cm\protoss\lanifect-death.grp) +# 1904 Trojan Remains (cm\terran\trojan-death.grp) +# 1905 Envoy Remains (cm\protoss\envoy-death.grp) +# 1906 Ovileth Remains (cm\zerg\ovileth-death.grp) +# 1907 Phalanx (Tank) Remains (cm\terran\phalanx-tank-death.grp) +# 1908 Phalanx (Siege) Remains (cm\terran\phalanx-siege-death.grp) +# 1909 Hierophant Remains (cm\protoss\hierophant-death.grp) +# 1914 Simulacrum Remains (cm\protoss\simulacrum-death.grp) +# 1915 Vassal Remains (cm\protoss\vassal-death.grp) +# 1916 Nathrokor Remains (cm\zerg\nathrokor-death.grp) .headerstart IsId 650 Type 1 @@ -43330,6 +43355,8 @@ WyvernDeath: WyvernGndAttkInit: playfram 0x00 + playsndbtwn 3135 3137 # Wyvern weapon charge 01, 02, 03 + wait 12 gotorepeatattk ignorerest goto WyvernGndAttkToIdle @@ -47761,7 +47788,7 @@ OptectonInit: playfram 0x00 wait 2 goto ScourgeLocal00 - + OptectonGndAttkToIdle: playfram 0x00 wait 2 @@ -47780,41 +47807,16 @@ OptectonGndAttkRpt: wait 7 imgol 1820 0 0 # Architect charge overlay wait 8 - playfram 0x220 - imgoluselo 1855 0 0 # Optecton muzzle flash - playsndbtwn 2310 2313 # Optecton weapon fire 01, 02, 03, 04 - attackwith 1 - wait 1 - playfram 0x240 - wait 1 - playfram 0x220 - imgoluselo 1855 0 0 # Optecton muzzle flash - playsndbtwn 2310 2313 # Optecton weapon fire 01, 02, 03, 04 - attackwith 1 - wait 1 - playfram 0x240 - wait 1 - playfram 0x220 - imgoluselo 1855 0 0 # Optecton muzzle flash - playsndbtwn 2310 2313 # Optecton weapon fire 01, 02, 03, 04 - attackwith 1 - wait 1 - playfram 0x240 - wait 1 - playfram 0x220 - imgoluselo 1855 0 0 # Optecton muzzle flash - playsndbtwn 2310 2313 # Optecton weapon fire 01, 02, 03, 04 - attackwith 1 - wait 1 - playfram 0x240 - wait 1 - playfram 0x220 - imgoluselo 1855 0 0 # Optecton muzzle flash - playsndbtwn 2310 2313 # Optecton weapon fire 01, 02, 03, 04 - attackwith 1 - wait 1 - playfram 0x240 - wait 1 + call OptectonShoot + call OptectonShoot + call OptectonShoot + call OptectonShoot + call OptectonShoot + call OptectonShoot + call OptectonShoot + call OptectonShoot + call OptectonShoot + call OptectonShoot playfram 0x260 wait 1 playfram 0x00 @@ -47824,6 +47826,16 @@ OptectonGndAttkRpt: ignorerest goto OptectonGndAttkToIdle +OptectonShoot: + playfram 0x220 + imgoluselo 1855 0 0 # Optecton muzzle flash + playsndbtwn 2310 2313 # Optecton weapon fire 01, 02, 03, 04 + attackwith 1 + wait 1 + playfram 0x240 + wait 3 + return + OptectonWalking: move 4 wait 1 @@ -48589,6 +48601,7 @@ WyvernTurretGndAttkInit: playfram 0x00 wait 1 nobrkcodestart + wait 12 # playfram 0x20 attackwith 1 nobrkcodeend @@ -51867,4 +51880,61 @@ GoskaGndAttkRpt: ignorerest goto EidolonGndAttkToIdle -## Next free IsId: 792 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1910 Angeltear Rockets (bullet\SMmissle.grp) +.headerstart +IsId 792 +Type 2 +Init AngeltearRocketInit +Death AngeltearRocketDeath +GndAttkInit AngeltearRocketGndAttkInit +AirAttkInit [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +AngeltearRocketInit: + playfram 0x00 + wait 1 + sigorder 1 + wait 1 +AngeltearRocketGndAttkInit: + sprol 927 0 0 # Angeltear Rockets Trail (cm\terran\salamander-rocket-trail.grp) + wait 2 + goto AngeltearRocketGndAttkInit + +AngeltearRocketDeath: + playsndbtwn 3133 3134 # Salamander weapon 2 hit 01, 02 + imgol 530 0 0 # Gemini Missiles Explosion (thingy\ecaHit.grp) + domissiledmg + wait 1 + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1912 Ackmed (cm\heroes\ackmed.grp) +.headerstart +IsId 793 +Type 12 +Init AckmedInit +Death HarakanDeath +GndAttkInit HarakanGndAttkInit +AirAttkInit HarakanGndAttkInit +Unused1 HarakanUnused1 +GndAttkRpt HarakanGndAttkRpt +AirAttkRpt HarakanGndAttkRpt +CastSpell [NONE] +GndAttkToIdle HarakanGndAttkToIdle +AirAttkToIdle HarakanGndAttkToIdle +Unused2 [NONE] +Walking HarakanWalking +WalkingToIdle HarakanWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +AckmedInit: + imgul 1913 0 0 # Ackmed Shadow (cm\heroes\ackmed-shadow.grp) + goto HarakanWalkingToIdle + +## Next free IsId: 794 \ No newline at end of file diff --git a/mpq/sound/cm/t/salamander/wf2-01.wav b/mpq/sound/cm/t/salamander/wf2-01.wav new file mode 100644 index 00000000..f4773810 Binary files /dev/null and b/mpq/sound/cm/t/salamander/wf2-01.wav differ diff --git a/mpq/sound/cm/t/salamander/wf2-02.wav b/mpq/sound/cm/t/salamander/wf2-02.wav new file mode 100644 index 00000000..2f525be4 Binary files /dev/null and b/mpq/sound/cm/t/salamander/wf2-02.wav differ diff --git a/mpq/sound/cm/t/salamander/wf2-03.wav b/mpq/sound/cm/t/salamander/wf2-03.wav new file mode 100644 index 00000000..ed28e4ec Binary files /dev/null and b/mpq/sound/cm/t/salamander/wf2-03.wav differ diff --git a/mpq/sound/cm/t/salamander/wf2-04.wav b/mpq/sound/cm/t/salamander/wf2-04.wav new file mode 100644 index 00000000..1a615e5d Binary files /dev/null and b/mpq/sound/cm/t/salamander/wf2-04.wav differ diff --git a/mpq/sound/cm/t/salamander/wh2-01.wav b/mpq/sound/cm/t/salamander/wh2-01.wav new file mode 100644 index 00000000..a94092a8 Binary files /dev/null and b/mpq/sound/cm/t/salamander/wh2-01.wav differ diff --git a/mpq/sound/cm/t/salamander/wh2-02.wav b/mpq/sound/cm/t/salamander/wh2-02.wav new file mode 100644 index 00000000..4656f965 Binary files /dev/null and b/mpq/sound/cm/t/salamander/wh2-02.wav differ diff --git a/mpq/sound/cm/t/wyvern/charge-01.wav b/mpq/sound/cm/t/wyvern/charge-01.wav new file mode 100644 index 00000000..feac3791 Binary files /dev/null and b/mpq/sound/cm/t/wyvern/charge-01.wav differ diff --git a/mpq/sound/cm/t/wyvern/charge-02.wav b/mpq/sound/cm/t/wyvern/charge-02.wav new file mode 100644 index 00000000..e2c88c48 Binary files /dev/null and b/mpq/sound/cm/t/wyvern/charge-02.wav differ diff --git a/mpq/sound/cm/t/wyvern/charge-03.wav b/mpq/sound/cm/t/wyvern/charge-03.wav new file mode 100644 index 00000000..218438e0 Binary files /dev/null and b/mpq/sound/cm/t/wyvern/charge-03.wav differ diff --git a/mpq/unit/cm/heroes/ackmed-shadow.grp b/mpq/unit/cm/heroes/ackmed-shadow.grp new file mode 100644 index 00000000..beb41140 Binary files /dev/null and b/mpq/unit/cm/heroes/ackmed-shadow.grp differ diff --git a/mpq/unit/cm/heroes/ackmed.grp b/mpq/unit/cm/heroes/ackmed.grp new file mode 100644 index 00000000..a7a498b7 Binary files /dev/null and b/mpq/unit/cm/heroes/ackmed.grp differ diff --git a/mpq/unit/cm/protoss/hierophant-death.grp b/mpq/unit/cm/protoss/hierophant-death.grp new file mode 100644 index 00000000..8cbd6a76 Binary files /dev/null and b/mpq/unit/cm/protoss/hierophant-death.grp differ diff --git a/mpq/unit/cm/protoss/simulacrum-death.grp b/mpq/unit/cm/protoss/simulacrum-death.grp new file mode 100644 index 00000000..bd5b51c5 Binary files /dev/null and b/mpq/unit/cm/protoss/simulacrum-death.grp differ diff --git a/mpq/unit/cm/protoss/vassal-death.grp b/mpq/unit/cm/protoss/vassal-death.grp new file mode 100644 index 00000000..a078e2ef Binary files /dev/null and b/mpq/unit/cm/protoss/vassal-death.grp differ diff --git a/mpq/unit/cm/terran/phalanx-siege-death.grp b/mpq/unit/cm/terran/phalanx-siege-death.grp new file mode 100644 index 00000000..2aae7486 Binary files /dev/null and b/mpq/unit/cm/terran/phalanx-siege-death.grp differ diff --git a/mpq/unit/cm/terran/phalanx-tank-death.grp b/mpq/unit/cm/terran/phalanx-tank-death.grp new file mode 100644 index 00000000..0a7c460a Binary files /dev/null and b/mpq/unit/cm/terran/phalanx-tank-death.grp differ diff --git a/mpq/unit/cm/terran/salamander-rocket-trail.grp b/mpq/unit/cm/terran/salamander-rocket-trail.grp new file mode 100644 index 00000000..061dee8a Binary files /dev/null and b/mpq/unit/cm/terran/salamander-rocket-trail.grp differ diff --git a/mpq/unit/cm/zerg/nathrokor-death.grp b/mpq/unit/cm/zerg/nathrokor-death.grp new file mode 100644 index 00000000..bd33256b Binary files /dev/null and b/mpq/unit/cm/zerg/nathrokor-death.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 76b07a25..f69b5577 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 50a19dde..394a6f0a 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 4fb3006f..9cb704f9 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 1aa244bc..bd67e0c4 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index c6553509..c28fa667 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ