diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index b52928fd..8b3ad82f 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 a596e347..13313d96 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -489,7 +489,7 @@ Madrigal Turret (Imperioso) Madrigal (Furia Mode) Madrigal Turret (Furia) Philoc -Extended Flingy #283 +Sevenstep Projectile Extended Flingy #284 Extended Flingy #285 Extended Flingy #286 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 0aa1a1fb..090048d3 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 669298d1..cb675682 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 6b103b36..e8fbd69e 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -39260,38 +39260,37 @@ LiiraliskUnused1: goto LiiraliskGndAttkToIdle LiiraliskGndAttkInit: - playfram 0xee - wait 1 - playfram 0xff - wait 1 - playfram 0x110 + playfram 0x00 + wait 1 + playfram 0xee + wait 2 LiiraliskGndAttkRpt: - wait 1 - nobrkcodestart - playsndbtwn 2014 2015 # Liiralisk attack 01, 02 - playfram 0x121 - wait 1 - playfram 0x132 - attack - attack - wait 1 - playfram 0x143 - wait 1 - playfram 0x132 - wait 1 - playfram 0x121 - wait 1 - nobrkcodeend - gotorepeatattk - ignorerest + wait 1 + nobrkcodestart + playsndbtwn 2014 2015 # Liiralisk attack 01, 02 + playfram 0xff + wait 1 + playfram 0x110 + attack + attack + wait 1 + playfram 0x121 + wait 1 + playfram 0x132 + wait 1 + playfram 0x143 + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest LiiraliskGndAttkToIdle: - playfram 0x110 - wait 1 - playfram 0xff - wait 1 - playfram 0xee - wait 1 - goto LiiraliskWalkingToIdle + playfram 0xff + wait 1 + playfram 0xee + wait 1 + playfram 0x00 + wait 1 + goto LiiraliskWalkingToIdle LiiraliskWalking: move 6 @@ -50694,36 +50693,28 @@ ZarcavrokorBoneDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1718 Cyprian Rail (cm\terran\cyprian-rail.grp) # 1719 Sentinel Rail (cm\terran\sentinel-rail.grp) .headerstart IsId 733 Type 2 -Init OmniBulletOneInit +Init OmniBulletOneBlueInit Death OmniBulletOneBlueDeath -GndAttkInit OmniBulletOneGndAttkInit +GndAttkInit OmniBulletOneBlueGndAttkInit AirAttkInit [NONE] .headerend # ----------------------------------------------------------------------------- # -OmniBulletOneInit: +OmniBulletOneBlueInit: playfram 0x00 wait 1 sigorder 1 wait 1 -OmniBulletOneGndAttkInit: +OmniBulletOneBlueGndAttkInit: playfram 0x00 wait 125 - goto OmniBulletOneGndAttkInit - -OmniBulletOneDeathOrange: - imgol 530 0 0 # Gemini Missiles Explosion (thingy\ecaHit.grp) - domissiledmg - wait 1 - end + goto OmniBulletOneBlueGndAttkInit OmniBulletOneBlueDeath: - if bullet.weapon_id == 26 goto OmniBulletOneDeathOrange imgol 1249 0 0 # Burst Lasers Blue Impact (thingy\elbHit.grp) domissiledmg wait 1 @@ -51846,5 +51837,24 @@ QuaziliskAttackOverlayInit: playfram 0x44 wait 1 end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1718 Cyprian Rail (cm\terran\cyprian-rail.grp) +.headerstart +IsId 756 +Type 2 +Init OmniBulletOneBlueInit +Death OmniBulletOneOrangeDeath +GndAttkInit OmniBulletOneBlueGndAttkInit +AirAttkInit [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +OmniBulletOneOrangeDeath: + imgol 530 0 0 # Gemini Missiles Explosion (thingy\ecaHit.grp) + domissiledmg + wait 1 + end -# Next free isid: 756 \ No newline at end of file +# Next free isid: 757 \ No newline at end of file diff --git a/mpq/unit/cm/zerg/liiralisk-birth.grp b/mpq/unit/cm/zerg/liiralisk-birth.grp index 9525d940..1732f615 100644 Binary files a/mpq/unit/cm/zerg/liiralisk-birth.grp and b/mpq/unit/cm/zerg/liiralisk-birth.grp differ diff --git a/mpq/unit/cm/zerg/liiralisk-shadow.grp b/mpq/unit/cm/zerg/liiralisk-shadow.grp index 4f61f7a7..c920a311 100644 Binary files a/mpq/unit/cm/zerg/liiralisk-shadow.grp and b/mpq/unit/cm/zerg/liiralisk-shadow.grp differ diff --git a/mpq/unit/cm/zerg/liiralisk.grp b/mpq/unit/cm/zerg/liiralisk.grp index 9acddae7..f77ccbfa 100644 Binary files a/mpq/unit/cm/zerg/liiralisk.grp and b/mpq/unit/cm/zerg/liiralisk.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index dea11136..cbd88515 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 44823bff..5f006e2f 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 a9771aac..2d106612 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -9,4 +9,14 @@ TBD TBD ## UI -- Added a new config option for always showing condensed selections (c. DF) \ No newline at end of file +- Added a new config option for always showing condensed selections (c. DF) + +## Audiovisuals: +- New sprite for: + - Liiralisk (c. Solstice) + +## Bugfixes +- Stability: + - Fixed another nullsprite crash (r. Alexhandr) +- Audiovisuals: + - Fixed error printout related to Sevenstep's passive \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 317a9af0..d662c87d 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ