diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Infinite Velocity.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Infinite Velocity.scx index 12f9c140..35202264 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Infinite Velocity.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Infinite Velocity.scx differ diff --git a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Sideshow.scx b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Sideshow.scx index be7d829e..04cb5f48 100644 Binary files a/CMBW-maps/melee/1v1/Competitive Class 1/(2)Sideshow.scx and b/CMBW-maps/melee/1v1/Competitive Class 1/(2)Sideshow.scx differ diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 4b129e93..eff477de 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 bf052eed..328277ac 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -497,7 +497,7 @@ Potentate Skortrith Cesiant Tentacle Cyclops Weapon Impact Sentinel Rail -Extended Flingy #291 +Hotshot Extended Flingy #292 Extended Flingy #293 Extended Flingy #294 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index a6440f70..e71ce024 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 a829d372..65c7504c 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 2c7c1950..cf68c99a 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1774,8 +1774,8 @@ Vorvrokor Shadow Burst Lasers Impact Blue Damageless Dracadin Death Explosion Lanifect Remains -Extended Image #774 -Extended Image #775 +Hotshot +Hotshot Shadow Extended Image #776 Extended Image #777 Extended Image #778 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index 5483e0f4..14229404 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 4625e2c0..65006efd 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -2615,8 +2615,8 @@ Vagrant Shade Under Attack 01 Vagrant Shade Under Attack 02 Vagrant Shade Under Attack 03 Vagrant Shade Under Attack 04 -Extended Sound #1 -Extended Sound #1 +Hotshot Weaponfire 01 +Hotshot Weaponfire 02 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index efcf07bf..9fd5e0fc 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -2614,4 +2614,6 @@ cm\p\vagrant-shade\agg-04.wav cm\p\vagrant-shade\hlp-01.wav cm\p\vagrant-shade\hlp-02.wav cm\p\vagrant-shade\hlp-03.wav -cm\p\vagrant-shade\hlp-04.wav \ No newline at end of file +cm\p\vagrant-shade\hlp-04.wav +cm\f\hotshot\wf-01.wav +cm\f\hotshot\wf-02.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index f533abf5..22d304d5 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 4a467335..cf58549d 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -886,7 +886,7 @@ Skortrith Cesiant Tentacle Cyclops Weapon Impact Sentinel Rail Lanifect Remains -Extended Sprite #1 +Hotshot Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 885941f2..a8aa87eb 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 0a8e93d2..a71d9d11 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -393,7 +393,7 @@ Select Faction 3 Select Faction 4 Select Faction 5 Select Faction 6 -Extended Unit #168 +Terran Hotshot Extended Unit #169 Extended Unit #170 Extended Unit #171 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 4aa3e738..9f1ae7cf 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 1fb85c1b..e8e68fd6 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -206,7 +206,7 @@ Nathrok Claws (Nathrokor) Calcification (Gorgrokor) Talismanic Weaver (Potentate) Phase Saber (Potentate) -Extended Weapon #79 +Dispatch Shotgun (Hotshot) Extended Weapon #80 Extended Weapon #81 Extended Weapon #82 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 127534c5..96a4a264 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 ffd18ab1..88a22399 100644 Binary files a/mpq/datreq/Units.graft and b/mpq/datreq/Units.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index a6e00022..9868a9da 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 fd513d11..e04c05ac 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index db199654..9f29b5cc 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 45d3c062..758273e1 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -51895,4 +51895,54 @@ HelixBoltDeath: wait 1 end -## Next free IsId: 764 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1141 Hotshot (cm\faction\hotshot.grp) +.headerstart +IsId 764 +Type 13 +Init HotshotInit +Death MadcapDeath +GndAttkInit HotshotGndAttkInit +AirAttkInit HotshotGndAttkInit +Unused1 [NONE] +GndAttkRpt HotshotGndAttkRpt +AirAttkRpt HotshotGndAttkRpt +CastSpell [NONE] +GndAttkToIdle MadcapGndAttkToIdle +AirAttkToIdle MadcapGndAttkToIdle +Unused2 [NONE] +Walking MadcapWalking +WalkingToIdle MadcapWalkingToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +HotshotInit: + imgul 1142 0 0 # Madcap Shadow (cm\terran\madcap-shad.grp) + goto MadcapWalkingToIdle + +HotshotGndAttkInit: + playfram 0x100 + wait 1 + playfram 0x120 + wait 1 + playfram 0x140 +HotshotGndAttkRpt: + wait 1 + nobrkcodestart + playsndbtwn 2617 2618 # Hotshot weaponfire 01, 02 + attack + playfram 0x1A0 + wait 1 + playfram 0x180 + wait 1 + playfram 0x1A0 + wait 1 + playfram 0x180 + nobrkcodeend + gotorepeatattk + ignorerest + goto MadcapGndAttkToIdle + +## Next free IsId: 765 \ No newline at end of file diff --git a/mpq/sound/cm/f/hotshot/wf-01.wav b/mpq/sound/cm/f/hotshot/wf-01.wav new file mode 100644 index 00000000..9f2438be Binary files /dev/null and b/mpq/sound/cm/f/hotshot/wf-01.wav differ diff --git a/mpq/sound/cm/f/hotshot/wf-02.wav b/mpq/sound/cm/f/hotshot/wf-02.wav new file mode 100644 index 00000000..6e88f2ed Binary files /dev/null and b/mpq/sound/cm/f/hotshot/wf-02.wav differ diff --git a/mpq/unit/cm/faction/hotshot-shadow.grp b/mpq/unit/cm/faction/hotshot-shadow.grp new file mode 100644 index 00000000..248ca063 Binary files /dev/null and b/mpq/unit/cm/faction/hotshot-shadow.grp differ diff --git a/mpq/unit/cm/faction/hotshot.grp b/mpq/unit/cm/faction/hotshot.grp new file mode 100644 index 00000000..2e654fad Binary files /dev/null and b/mpq/unit/cm/faction/hotshot.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 2f68b543..b98244e0 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 9b33bc49..41d1e43f 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/patchnotes.md b/patchnotes.md index 3c3862fb..655d49fe 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -32,6 +32,8 @@ Patch goals include: - See [this page](https://www.fraudsclub.com/cosmonarchy-bw/sites/scenario-setup/#gameplay-commands) for specific info. ## Bugfixes +- Stability: + - Fixed a rare null-sprite crash (r. neblime) - Gameplay: - Fixed burrowed units not transforming/regressing properly (c. DF) - Fixed units in Anchors being able to attack if the Anchor was loaded into a Pythean diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 9529d673..c98c584d 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ