diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt index 58d17797..bbe18a69 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -230,9 +230,9 @@ Cuirass Centaur Missile Madrigal Furia Missile Augur -Kalkiivorv Sathrant +Kalkiir Lake Othstol Oviform -Quantum Institute +Cestus Irulent Ivoa Othstoleth Ancestral Archives diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 43125873..8280e8ca 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 4cc44fee..7c82c5e3 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 68f6173f..e2386c41 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1042,8 +1042,8 @@ Kalkiir Pond Othstol Oviform Kalkiir Pond Shadow Othstol Oviform Shadow -Quantum Institute -Quantum Institute Shadow +Cestus +Cestus Shadow Irulent Ivoa Irulent Ivoa Shadow Othstoleth diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index c32b6e9d..465cfa4f 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 dafd020c..9e3628c4 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -540,7 +540,7 @@ Centaur Missile Augur Vorval Pond Othstol Oviform -Quantum Institute +Cestus Irulent Ivoa Othstoleth Ancestral Archives diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 8d907aad..26f7cfa6 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index c7fdedb2..eadb159e 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 5eaa7329..9e7e8dca 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 51485904..7943327e 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 07f0a9c5..b6bffb5a 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 e9b319a6..7b90b5ef 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 2b8cd2d1..83dfc439 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -2018,9 +2018,9 @@ Death [NONE] # ----------------------------------------------------------------------------- # MatralethDeathInit: - playfram 0x00 # Frame set 0 + playfram 0x00 wait 2 - imgol 58 0 0 # Zerg Air Death Explosion (Large) (thingy\zAirDthL.grp) + imgol 58 0 0 # Zerg Air Death Explosion (Large) (thingy\zAirDthL.grp) wait 1 end @@ -5280,13 +5280,13 @@ Type 13 Init EidolonInit Death EidolonDeath GndAttkInit EidolonGndAttkInit -AirAttkInit EidolonAirAttkInit +AirAttkInit EidolonGndAttkInit Unused1 EidolonUnused1 GndAttkRpt EidolonGndAttkRpt -AirAttkRpt EidolonAirAttkRpt +AirAttkRpt EidolonGndAttkRpt CastSpell EidolonCastSpell GndAttkToIdle EidolonGndAttkToIdle -AirAttkToIdle EidolonAirAttkToIdle +AirAttkToIdle EidolonGndAttkToIdle Unused2 [NONE] Walking EidolonWalking WalkingToIdle EidolonWalkingToIdle @@ -5369,26 +5369,7 @@ EidolonLocal02: EidolonDeath: playsnd 238 # Terran\GHOST\TGhDth00.wav - setfldirect 0 - playfram 221 - wait 2 - playfram 222 - wait 2 - playfram 223 - wait 2 - playfram 224 - wait 2 - playfram 225 - wait 2 - playfram 226 - wait 2 - playfram 227 - wait 2 - playfram 228 - wait 2 - lowsprul 230 0 0 # Eidolon Remnants (terran\tghDeath.grp) - wait 1 - end + goto EidolonDeathInit EidolonUnused1: wait 1 @@ -5438,30 +5419,6 @@ EidolonGndAttkToIdle: wait 1 goto EidolonWalkingToIdle -EidolonAirAttkInit: - playfram 0x00 - wait 1 - playfram 0x11 - wait 1 - playfram 0x22 -EidolonAirAttkRpt: - wait 1 - nobrkcodestart - playsnd 98 # Bullet\TGhFir00.wav - attack - playfram 0xcc - wait 1 - playfram 0x22 - nobrkcodeend - gotorepeatattk - ignorerest -EidolonAirAttkToIdle: - playfram 0x11 - wait 1 - playfram 0x00 - wait 1 - goto EidolonWalkingToIdle - EidolonCastSpell: nobrkcodestart wait 1 @@ -24330,7 +24287,7 @@ AlmostBuilt TreasuryAlmostBuilt Built TreasuryBuilt Landing TreasuryLanding LiftOff TreasuryLiftoff -IsWorking TreasuryIsWorking +IsWorking [NONE] WorkingToIdle TreasuryBuilt WarpIn [NONE] .headerend @@ -24389,49 +24346,6 @@ TreasuryLiftoff: sigorder 16 nobrkcodeend goto ScourgeLocal00 - -TreasuryIsWorking: - playfram 1 - wait 2 - playfram 2 - waitrand 2 4 - playfram 3 - wait 2 - playfram 4 - waitrand 2 4 - playfram 5 - wait 2 - playfram 6 - waitrand 2 4 - playfram 7 - wait 2 - playfram 8 - waitrand 2 4 - playfram 9 - wait 2 - playfram 10 - waitrand 2 4 - playfram 11 - wait 2 - playfram 12 - waitrand 2 4 - playfram 13 - wait 2 - playfram 14 - waitrand 2 4 - playfram 15 - wait 2 - playfram 16 - waitrand 2 4 - playfram 17 - wait 2 - playfram 18 - waitrand 2 4 - playfram 19 - wait 2 - playfram 0x00 - waitrand 2 4 - goto TreasuryIsWorking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -52610,4 +52524,95 @@ InzorthrokorGndAttkInit: gotorepeatattk goto ZoryusthalethGndAttkToIdle -## Next free IsId: 821 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1044 Cestus (cm\terran\cestus.grp) +.headerstart +IsId 821 +Type 20 +Init CestusInit +Death AtelierDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt CestusAlmostBuilt +Built CestusWorkingToIdle +Landing CestusLanding +LiftOff CestusLiftOff +IsWorking ScourgeLocal00 +WorkingToIdle CestusWorkingToIdle +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +CestusInit: + imgul 1045 0 0 # Cestus Shadow (cm\terran\cestus-shadow.grp) + playfram 0x00 + goto ScourgeLocal00 + +CestusAlmostBuilt: + playfram 1 + goto ScourgeLocal00 + +CestusWorkingToIdle: + playfram 0x00 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 6 + wait 2 + playfram 7 + goto CestusWorkingToIdle + +CestusLanding: + nobrkcodestart + wait 25 + playsnd 472 # Misc\Land.WAV + playfram 0x00 +# playfram 4 +# wait 4 +# playfram 2 +# wait 4 +# playfram 3 +# wait 4 +# playfram 5 +# wait 4 +# playfram 0x00 + wait 16 + sigorder 16 + nobrkcodeend + goto CestusWorkingToIdle + +CestusLiftOff: + nobrkcodestart + playsnd 471 # Misc\LiftOff.WAV +# playfram 5 +# wait 4 +# playfram 3 +# wait 4 +# playfram 2 +# wait 4 +# playfram 4 + wait 16 + playfram 0x00 + sigorder 16 + nobrkcodeend + goto ScourgeLocal00 + +## Next free IsId: 822 \ No newline at end of file diff --git a/mpq/unit/cm/terran/cestus-damage.lof b/mpq/unit/cm/terran/cestus-damage.lof new file mode 100644 index 00000000..db077227 Binary files /dev/null and b/mpq/unit/cm/terran/cestus-damage.lof differ diff --git a/mpq/unit/cm/terran/cestus-shadow.grp b/mpq/unit/cm/terran/cestus-shadow.grp new file mode 100644 index 00000000..258608c3 Binary files /dev/null and b/mpq/unit/cm/terran/cestus-shadow.grp differ diff --git a/mpq/unit/cm/terran/cestus.grp b/mpq/unit/cm/terran/cestus.grp new file mode 100644 index 00000000..c8ea7a7f Binary files /dev/null and b/mpq/unit/cm/terran/cestus.grp differ diff --git a/mpq/unit/cm/terran/quantum-institute-damage.lof b/mpq/unit/cm/terran/quantum-institute-damage.lof deleted file mode 100644 index 713cd8af..00000000 Binary files a/mpq/unit/cm/terran/quantum-institute-damage.lof and /dev/null differ diff --git a/mpq/unit/cm/terran/quantum-institute-shadow.grp b/mpq/unit/cm/terran/quantum-institute-shadow.grp deleted file mode 100644 index 38cad673..00000000 Binary files a/mpq/unit/cm/terran/quantum-institute-shadow.grp and /dev/null differ diff --git a/mpq/unit/cm/terran/quantum-institute.grp b/mpq/unit/cm/terran/quantum-institute.grp deleted file mode 100644 index e2f990a9..00000000 Binary files a/mpq/unit/cm/terran/quantum-institute.grp and /dev/null differ diff --git a/mpq/unit/cm/zerg/liivral-pond-damage.lof b/mpq/unit/cm/zerg/kalkiir-lake-damage.lof similarity index 100% rename from mpq/unit/cm/zerg/liivral-pond-damage.lof rename to mpq/unit/cm/zerg/kalkiir-lake-damage.lof diff --git a/mpq/unit/cm/zerg/liivral-pond-shadow.grp b/mpq/unit/cm/zerg/kalkiir-lake-shadow.grp similarity index 100% rename from mpq/unit/cm/zerg/liivral-pond-shadow.grp rename to mpq/unit/cm/zerg/kalkiir-lake-shadow.grp diff --git a/mpq/unit/cm/zerg/liivral-pond.grp b/mpq/unit/cm/zerg/kalkiir-lake.grp similarity index 100% rename from mpq/unit/cm/zerg/liivral-pond.grp rename to mpq/unit/cm/zerg/kalkiir-lake.grp diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index a4d2d23c..15a48307 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 59127c06..c5826676 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 7a3c65c0..0197b008 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 0b74d34f..3ae39d08 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 62d6fe9e..32637f14 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -16,7 +16,9 @@ Our goals for the next patch (22 March 2025) include: - **Steward**s are no longer affected by speed modifiers, fixing bugs with attacking targets (r. ArbuzBudesh) - Fixed bad buttonset for Futurist Federation **Stockade**s (r. Londier) - **Audiovisuals:** + - Fixed **Manifold** and variant weapon SFX being muted (r. lolrsk8s) - Fixed debug errors in **Piety Ward** death animations (r. Londier) + - Fixed bad **Starbound Manifold** passive string (.r lolrsk8s) ## Terran - [Wraith](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/wraith): @@ -27,4 +29,6 @@ Our goals for the next patch (22 March 2025) include: - **Sublime Shepherd:** - Effect range 4 ยป 6 - Now always applies to structures - - Now applies if the attacker dies before the attack lands \ No newline at end of file + - Now applies if the attacker dies before the attack lands +- **NEW:** [Cestus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cestus): + - Warding outpost; detects and provides armor; no tech requirement \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 397911f3..b6aa455a 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ