diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 354070a3..d02af0a1 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 7445e597..11da6e0b 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -566,10 +566,10 @@ Pilgrim Large Protoss Laser Vorvrokor Bactalisk -Extended Flingy #360 -Extended Flingy #361 -Extended Flingy #362 -Extended Flingy #363 +Blackguard +Arhaun Projectile +Arhaun Base +Arhaun Turret Extended Flingy #364 Extended Flingy #365 Extended Flingy #366 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 55b0e6b2..e528cbaa 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 c234fb8f..bb79b2e4 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 fc092d89..8e472e67 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2046,11 +2046,11 @@ Skibact Scab Shadow Vorvrokor Bactalisk Stasis Cell Shadow -Extended Image #1046 -Extended Image #1047 -Extended Image #1048 -Extended Image #1049 -Extended Image #1050 +Blackguard +Blackguard Shadow +Arhaun Base +Arhaun Turret +Arhaun Shadow Extended Image #1051 Extended Image #1052 Extended Image #1053 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 55e3f07f..13a70922 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 152a9f87..d56ba29b 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -3510,17 +3510,17 @@ Cikralisk Death 01 Cikralisk Death 02 Cikralisk Death 03 Apostle Revive 01 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Blackguard Charge 01 +Blackguard Charge 02 +Blackguard Charge 03 +Blackguard Charge 04 +Blackguard Weaponfire 01 +Blackguard Weaponfire 02 +Blackguard Weaponfire 03 +Blackguard Weaponfire 04 +Arhaun Weaponfire 01 +Arhaun Weaponfire 02 +Arhaun Weaponfire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index d66d5146..ddc7e493 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -3509,4 +3509,15 @@ cm\z\cikralisk\hlp-04.wav cm\z\cikralisk\dth-01.wav cm\z\cikralisk\dth-02.wav cm\z\cikralisk\dth-02.wav -cm\t\apostle\revive-01.wav \ No newline at end of file +cm\t\apostle\revive-01.wav +cm\f-t\blackguard\ch-01.wav +cm\f-t\blackguard\ch-02.wav +cm\f-t\blackguard\ch-03.wav +cm\f-t\blackguard\ch-04.wav +cm\f-t\blackguard\wf-01.wav +cm\f-t\blackguard\wf-02.wav +cm\f-t\blackguard\wf-03.wav +cm\f-t\blackguard\wf-04.wav +cm\f-t\arhaun\wf-01.wav +cm\f-t\arhaun\wf-02.wav +cm\f-t\arhaun\wf-03.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 65f6cb11..ae653966 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 5a02661c..ca1c1894 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1009,9 +1009,9 @@ Askosi Structure Rubble (Small) Large Protoss Laser Vorvrokor Bactalisk -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 +Blackguard +Arhaun Base +Arhaun Turret Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 775b737f..1b0419ce 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 f3154437..56f2418e 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -487,9 +487,9 @@ Zerg Vespene Depleted Terran Beacon Protoss Beacon Zerg Beacon -Extended Unit #262 -Extended Unit #263 -Extended Unit #264 +Terran Blackguard +Terran Arhaun (Base) +Arhaun Turret Extended Unit #265 Extended Unit #266 Extended Unit #267 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 9ba7afc5..0473dc68 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 c33fec43..6f2154ee 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -238,8 +238,8 @@ Gauss Slugger (Maverick Futurist) Needle Spores (Hydralisk Orkoti) Inzor Reflux (Inzorthrokor) Mining Saber (Pilgrim) -Extended Weapon #111 -Extended Weapon #112 +Asoni Carbine (Blackguard) +Phlegethon Cannons (Arhaun) Extended Weapon #113 Extended Weapon #114 Extended Weapon #115 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 8813a4f6..dcaa62a2 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 3bbcdaaf..4391de81 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index 09ccee16..f7f4e843 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 7e9c8556..e5990762 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 7fc3b862..4cb823fd 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index f8593db2..61c3b52b 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 2bf6cb6d..42f89113 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -1898,7 +1898,8 @@ SpecialState1 SkryrokorLocal00 Phalanx_Tank_TurretInit: playfram 0x00 Phalanx_Tank_TurretLocal00: - waitrand 63 75 + wait 1 + waitrand 62 74 randcondjmp 230 Phalanx_Tank_TurretLocal00 sigorder 8 randcondjmp 127 Phalanx_Tank_TurretLocal01 @@ -1910,11 +1911,11 @@ Phalanx_Tank_TurretLocal00: goto Phalanx_Tank_TurretLocal00 Phalanx_Tank_TurretLocal01: - turn1cwise 1 + turn1cwise wait 3 - turn1cwise 1 + turn1cwise wait 3 - turn1cwise 1 + turn1cwise goto Phalanx_Tank_TurretLocal00 Phalanx_Tank_TurretGndAttkInit: @@ -18847,3 +18848,117 @@ MaelstromHitInit: playfram 8 wait 2 end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2048 Blackguard (cm\faction-t\blackguard.grp) +.headerstart +IsId 820 +Type 12 +Init BlackguardInit +Death MadcapDeath +GndAttkInit BlackguardGndAttkInit +AirAttkInit BlackguardGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt BlackguardGndAttkRpt +AirAttkRpt BlackguardGndAttkRpt +CastSpell [NONE] +GndAttkToIdle MadcapGndAttkToIdle +AirAttkToIdle MadcapGndAttkToIdle +Unused2 [NONE] +Walking MadcapWalking +WalkingToIdle MadcapWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +BlackguardInit: + imgul 2049 0 0 # Blackguard Shadow (cm\faction-t\blackguard-shadow.grp) + goto MadcapWalkingToIdle + +BlackguardGndAttkInit: + playfram 0x100 + wait 1 + playfram 0x120 + wait 1 + playfram 0x140 +BlackguardGndAttkRpt: + wait 1 + nobrkcodestart + playsndbtwn 3512 3515 # Blackguard weapon charge 01, 02, 03, 04 + wait 1 + playfram 0x180 + wait 11 + attack + playfram 0x1A0 + wait 1 + playfram 0x180 + nobrkcodeend + gotorepeatattk + ignorerest + goto MadcapGndAttkToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2050 Arhaun Base (cm\faction-t\arhaun-base.grp) +.headerstart +IsId 821 +Type 12 +Init Arhaun_Base_Init +Death Goliath_Base_Death +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 Goliath_Base_Unused1 +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking Goliath_Base_Walking +WalkingToIdle Goliath_Base_WalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +Arhaun_Base_Init: + imgul 2052 0 0 # Arhaun Shadow (cm\faction-t\arhaun-shadow.grp) + goto Goliath_Base_WalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2051 Arhaun Turret (cm\faction-t\arhaun-turret.grp) +.headerstart +IsId 822 +Type 12 +Init Goliath_Turret_Init +Death Generic_Wait1End +GndAttkInit Arhaun_Turret_GndAttkInit +AirAttkInit Arhaun_Turret_GndAttkInit +Unused1 [NONE] +GndAttkRpt Arhaun_Turret_GndAttkInit +AirAttkRpt Arhaun_Turret_GndAttkInit +CastSpell [NONE] +GndAttkToIdle Goliath_Turret_Init +AirAttkToIdle Goliath_Turret_Init +Unused2 [NONE] +Walking Goliath_Turret_Walking +WalkingToIdle Goliath_Turret_Init +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +Arhaun_Turret_GndAttkInit: + wait 1 + nobrkcodestart + playfram 0xdd + playsndbtwn 3520 3522 # Arhaun weaponfire 01, 02, 03 + attackwith 1 + attackwith 1 + wait 1 + playfram 0x00 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto Goliath_Turret_Init \ No newline at end of file diff --git a/mpq/sound/cm/f-t/arhaun/wf-01.wav b/mpq/sound/cm/f-t/arhaun/wf-01.wav new file mode 100644 index 00000000..3b85a542 Binary files /dev/null and b/mpq/sound/cm/f-t/arhaun/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/arhaun/wf-02.wav b/mpq/sound/cm/f-t/arhaun/wf-02.wav new file mode 100644 index 00000000..ceec8647 Binary files /dev/null and b/mpq/sound/cm/f-t/arhaun/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/arhaun/wf-03.wav b/mpq/sound/cm/f-t/arhaun/wf-03.wav new file mode 100644 index 00000000..bcc98d6f Binary files /dev/null and b/mpq/sound/cm/f-t/arhaun/wf-03.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/ch-01.wav b/mpq/sound/cm/f-t/blackguard/ch-01.wav new file mode 100644 index 00000000..46e7b5d7 Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/ch-01.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/ch-02.wav b/mpq/sound/cm/f-t/blackguard/ch-02.wav new file mode 100644 index 00000000..6dead53d Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/ch-02.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/ch-03.wav b/mpq/sound/cm/f-t/blackguard/ch-03.wav new file mode 100644 index 00000000..61cc5426 Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/ch-03.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/ch-04.wav b/mpq/sound/cm/f-t/blackguard/ch-04.wav new file mode 100644 index 00000000..6a69b5b4 Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/ch-04.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/wf-01.wav b/mpq/sound/cm/f-t/blackguard/wf-01.wav new file mode 100644 index 00000000..5197687b Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/wf-02.wav b/mpq/sound/cm/f-t/blackguard/wf-02.wav new file mode 100644 index 00000000..1c67faee Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/wf-03.wav b/mpq/sound/cm/f-t/blackguard/wf-03.wav new file mode 100644 index 00000000..ef7f65a6 Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/wf-03.wav differ diff --git a/mpq/sound/cm/f-t/blackguard/wf-04.wav b/mpq/sound/cm/f-t/blackguard/wf-04.wav new file mode 100644 index 00000000..5715c36a Binary files /dev/null and b/mpq/sound/cm/f-t/blackguard/wf-04.wav differ diff --git a/mpq/unit/cm/faction-t/arhaun-attack.lol b/mpq/unit/cm/faction-t/arhaun-attack.lol new file mode 100644 index 00000000..028115d4 Binary files /dev/null and b/mpq/unit/cm/faction-t/arhaun-attack.lol differ diff --git a/mpq/unit/cm/faction-t/arhaun-base.grp b/mpq/unit/cm/faction-t/arhaun-base.grp new file mode 100644 index 00000000..84ca1351 Binary files /dev/null and b/mpq/unit/cm/faction-t/arhaun-base.grp differ diff --git a/mpq/unit/cm/faction-t/arhaun-shadow.grp b/mpq/unit/cm/faction-t/arhaun-shadow.grp new file mode 100644 index 00000000..e8867c0c Binary files /dev/null and b/mpq/unit/cm/faction-t/arhaun-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/arhaun-turret.grp b/mpq/unit/cm/faction-t/arhaun-turret.grp new file mode 100644 index 00000000..33cb9c6b Binary files /dev/null and b/mpq/unit/cm/faction-t/arhaun-turret.grp differ diff --git a/mpq/unit/cm/faction-t/blackguard-attack.lol b/mpq/unit/cm/faction-t/blackguard-attack.lol new file mode 100644 index 00000000..2227ac13 Binary files /dev/null and b/mpq/unit/cm/faction-t/blackguard-attack.lol differ diff --git a/mpq/unit/cm/faction-t/blackguard-shadow.grp b/mpq/unit/cm/faction-t/blackguard-shadow.grp new file mode 100644 index 00000000..084dc585 Binary files /dev/null and b/mpq/unit/cm/faction-t/blackguard-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/blackguard.grp b/mpq/unit/cm/faction-t/blackguard.grp new file mode 100644 index 00000000..283b5353 Binary files /dev/null and b/mpq/unit/cm/faction-t/blackguard.grp differ diff --git a/mpq/unit/cm/terran/goliath-attack.lol b/mpq/unit/cm/terran/goliath-attack.lol index de4eec5f..9e83b5ac 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 5cd6f619..36c52ac3 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 a4741569..fcbd4f09 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 1e1242c0..11b3bba3 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 4cc2ccbb..d0d2e373 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 2d3e4782..e10ffe49 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -23,4 +23,10 @@ - Lardfix: Corrected unit responses for Ultrokor (r. DF) **Audiovisuals:** -- New fidget animations for tank mode Phalanx (c. DF) \ No newline at end of file +- New fidget animations for tank mode Phalanx (c. DF) + +## Terran +- **NEW:** [Blackguard](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/blackguard): + - Futurist Federation; long-range penetrating infantry; replaces Madcap +- **NEW:** [Arhaun](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/arhaun): + - Hecaton Coalition; anti-ground strike walker; replaces Goliath \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 582c1406..41edc582 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ