diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index ae916783..fa7e2e7a 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 87339c70..0f2e2f09 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -552,11 +552,11 @@ Landlock Quazrokor Dracadin (Order) Blackjack (Golden) -Extended Flingy #346 -Extended Flingy #347 -Extended Flingy #348 -Extended Flingy #349 -Extended Flingy #350 +Tiangou Base +Tiangou (Turret) +Eidolon (Nydus) +Maverick (Futurist) +Hydralisk (Orkoti) Extended Flingy #351 Extended Flingy #352 Extended Flingy #353 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 1af530bb..a3aa9cde 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 fd8efa04..5f8fb1f9 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 b876c2cc..b38be875 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2006,15 +2006,15 @@ Savant Shadow (Entropy Gauntlets) Blackjack (Golden) Blackjack Shadow (Golden) Blackjack Damaged (Golden) -Extended Image #1006 -Extended Image #1007 -Extended Image #1008 -Extended Image #1009 -Extended Image #1010 -Extended Image #1011 -Extended Image #1012 -Extended Image #1013 -Extended Image #1014 +Tiangou (Base) +Tiangou (Turret) +Tiangou Shadow +Eidolon (Nydus) +Eidolon Shadow (Nydus) +Maverick (Futurist) +Maverick Shadow (Futurist) +Hydralisk (Orkoti) +Hydralisk Shadow (Orkoti) Extended Image #1015 Extended Image #1016 Extended Image #1017 diff --git a/mpq/arr/portdata.datex b/mpq/arr/portdata.datex index 8ea3c062..4c899bd9 100644 Binary files a/mpq/arr/portdata.datex and b/mpq/arr/portdata.datex differ diff --git a/mpq/arr/portdata.txt b/mpq/arr/portdata.txt index 45df3066..58b47f72 100644 --- a/mpq/arr/portdata.txt +++ b/mpq/arr/portdata.txt @@ -273,8 +273,8 @@ Morningstar Battlemaster Trodin Saberhand Tazarain Sectarian Venammar -Extended Portrait #166 -Extended Portrait #167 +Actuary Ithintos +Justicar Kiraxxar Extended Portrait #168 Extended Portrait #169 Extended Portrait #170 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 2b175ec8..211eafc1 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 d4712451..0b5bced9 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3466,9 +3466,9 @@ Ramesses Under Attack 01 Ramesses Under Attack 02 Ramesses Under Attack 03 Ramesses Under Attack 04 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Maverick Futurist Weaponfire 01 +Maverick Futurist Weaponfire 02 +Maverick Futurist Weaponfire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index bf01b77e..a0d23ac0 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3465,4 +3465,10 @@ cm\t\ramesses\agg-04.wav cm\t\ramesses\hlp-01.wav cm\t\ramesses\hlp-02.wav cm\t\ramesses\hlp-03.wav -cm\t\ramesses\hlp-04.wav \ No newline at end of file +cm\t\ramesses\hlp-04.wav +cm\f-t\maverick-futurist\wf-01.wav +cm\f-t\maverick-futurist\wf-02.wav +cm\f-t\maverick-futurist\wf-03.wav +cm\f-t\eidolon-nydus\wf-01.wav +cm\f-t\eidolon-nydus\wf-02.wav +cm\f-t\eidolon-nydus\wf-03.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 92652c77..f13f2610 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 63cea2a4..d0a5e425 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -983,11 +983,11 @@ Dracadin (Order) Dracadin Remains (Order) Blackjack (Golden) Blackjack (Golden) Damaged -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 +Tiangou (Base) +Tiangou (Turret) +Eidolon (Nydus) +Maverick (Futurist) +Hydralisk (Orkoti) Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index df819690..97700887 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 73892be3..a39aa01f 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -431,10 +431,10 @@ Askosi Landlock Protoss Dracadin (Order) Terran Blackjack (Golden Republic) Terran Eidolon (Nydus Trinity) -Extended Unit #206 -Extended Unit #207 -Extended Unit #208 -Extended Unit #209 +Terran Tiangou (Base) +Tiangou Turret +Terran Maverick (Futurist) +Zerg Hydralisk (Orkoti) Extended Unit #210 Extended Unit #211 Extended Unit #212 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index cf26b5f3..b1aeb071 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 bc86e711..cb286b2b 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -232,9 +232,9 @@ Successive Spines (Lakizilisk, Zorthos) Rapid Spines (Zobriolisk A) Quazrok Spray (Quazrokor) Phase Disruptor (Dracadin) -Extended Weapon #105 -Extended Weapon #106 -Extended Weapon #107 +Moonbound Salvo (Tiangou) +Revenant Rifle (Nydus Eidolon) +Gauss Slugger (Maverick Futurist) Extended Weapon #108 Extended Weapon #109 Extended Weapon #110 diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index d8ff00f4..a4c226c0 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index e9a494e1..fa4e1b6e 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 401134c8..dfce9c21 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -5424,7 +5424,6 @@ EidolonGndAttkInit: EidolonGndAttkRpt: wait 1 nobrkcodestart - playsnd 98 # Bullet\TGhFir00.wav attack playfram 0xcc wait 1 @@ -6107,7 +6106,6 @@ MaverickGndAttkInit: MaverickGndAttkRpt: wait 1 nobrkcodestart - playsnd 69 # Bullet\TMaFir00.wav attackwith 1 playfram 0x33 wait 1 diff --git a/mpq/unit/cm/faction-t/eidolon-nydus.grp b/mpq/unit/cm/faction-t/eidolon-nydus.grp new file mode 100644 index 00000000..32415fb9 Binary files /dev/null and b/mpq/unit/cm/faction-t/eidolon-nydus.grp differ diff --git a/mpq/unit/cm/faction-t/tiangou-base.grp b/mpq/unit/cm/faction-t/tiangou-base.grp new file mode 100644 index 00000000..799da83f Binary files /dev/null and b/mpq/unit/cm/faction-t/tiangou-base.grp differ diff --git a/mpq/unit/cm/faction-t/tiangou-shadow.grp b/mpq/unit/cm/faction-t/tiangou-shadow.grp new file mode 100644 index 00000000..29964d8f Binary files /dev/null and b/mpq/unit/cm/faction-t/tiangou-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/tiangou-turret.grp b/mpq/unit/cm/faction-t/tiangou-turret.grp new file mode 100644 index 00000000..52daa62c Binary files /dev/null and b/mpq/unit/cm/faction-t/tiangou-turret.grp differ diff --git a/mpq/unit/cm/terran/goliath-attack.lol b/mpq/unit/cm/terran/goliath-attack.lol index 9e83b5ac..de4eec5f 100644 Binary files a/mpq/unit/cm/terran/goliath-attack.lol and b/mpq/unit/cm/terran/goliath-attack.lol differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index e421665c..08c6b4ad 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 a700c996..0f74d48f 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 ca905f80..9bcfc400 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 3eef0db3..855b7aa0 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 f05ef6d4..a5796df2 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ