diff --git a/CMBW-maps/melee/1v1/(2)Sun-Starved.scx b/CMBW-maps/melee/zOutdated/(2)Sun-Starved.scx similarity index 100% rename from CMBW-maps/melee/1v1/(2)Sun-Starved.scx rename to CMBW-maps/melee/zOutdated/(2)Sun-Starved.scx diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 6f015d8e..864cdff5 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 1fb6387a..7bddaaf4 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 6f04daa4..8c12a2cb 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 aec34f7b..11affbd0 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -138,10 +138,10 @@ Archon Swirl Probe Probe Shadow Probe Warp Flash -Scout -Scout Shadow -Scout Engines -Scout Warp Flash +Scout (deprecated) +Scout Shadow (deprecated) +Panoptus Engines +Panoptus Warp Flash Accantor Accantor Shadow Accantor Warp Flash @@ -1276,7 +1276,7 @@ Protoss Accelerant Medium Protoss Accelerant Small Vagrant Vagrant Shadow -Ion Cannon Overlay +Ion Cannon Attack A2 Seeker Spores Silent Ion Field Ensnaring Brood Overlay @@ -1450,8 +1450,8 @@ Orboth Omlia Shadow Ovileth Death Reversed Zerg Air Explosion Large Reversed Zerg Air Explosion Small Reversed -Ion Cannon Underlay -Ion Cannon Attack A +Ion Cannon Mouse Response +Ion Cannon Attack A1 Ion Cannon Attack B Anthelion Teleport Depart Anthelion Teleport Arrive @@ -1699,8 +1699,8 @@ Police WAT Trooper Shadow Madrigal Dirge Proc Spirtith Colony Spirtith Colony Shadow -Extended Image #699 -Extended Image #700 +Ion Cannon Attack A3 +Ion Cannon Attack A4 Extended Image #701 Extended Image #702 Extended Image #703 diff --git a/mpq/arr/techdata.datex b/mpq/arr/techdata.datex index 00af1209..0d297406 100644 Binary files a/mpq/arr/techdata.datex and b/mpq/arr/techdata.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index db02f722..90cf2129 100644 Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 975daed9..b0b86a2c 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 7f8dc8e0..b84d96b9 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 8df6c2bc..941995b5 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 e9f5ea90..efc0ef80 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 1f8b9efe..42ae366f 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -6686,7 +6686,7 @@ ScannerSweepDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 243 Wraith (terran\phoenix.grp) +# 243 Wraith (terran\wraith.grp) .headerstart IsId 82 Type 12 @@ -6708,7 +6708,7 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # WraithInit: - imgul 244 0 42 # Wraith Shadow (terran\phoenix.grp) + imgul 244 0 42 # Wraith Shadow (terran\wraith.grp) playfram 0x00 goto WraithGndAttkToIdle @@ -6731,12 +6731,16 @@ WraithDeath: end WraithGndAttkInit: + nobrkcodestart wait 1 + playfram 0x20 attackwith 1 attackwith 1 - attackwith 1 - playsnd 74 # Bullet\TPhFi100.wav + playsnd 74 # Bullet\TPhFi100.wav + wait 1 + playfram 0x00 gotorepeatattk + nobrkcodeend goto WraithLocal00 WraithLocal00: @@ -6745,7 +6749,7 @@ WraithLocal00: WraithWalking: setvertpos 0 - imgol 245 0 0 # Wraith Engines (thingy\tphGlow.grp) + imgol 245 0 0 # Wraith Engines (terran\wraith-engine.grp) goto WraithLocal00 # ----------------------------------------------------------------------------- # @@ -11853,36 +11857,6 @@ ScoutWarpIn: imgol 143 0 0 # Scout Warp Flash (protoss\scout.grp) goto ScoutLocal00 -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 142 Scout Engines (thingy\pscGlow.grp) -.headerstart -IsId 162 -Type 12 -Init ScoutEnginesInit -Death SkrylingExplosionDeath -GndAttkInit SkrylingExplosionDeath -AirAttkInit SkrylingExplosionDeath -Unused1 [NONE] -GndAttkRpt [NONE] -AirAttkRpt [NONE] -CastSpell [NONE] -GndAttkToIdle SkrylingExplosionDeath -AirAttkToIdle SkrylingExplosionDeath -Unused2 [NONE] -Walking ScoutEnginesInit -WalkingToIdle SkrylingExplosionDeath -SpecialState1 [NONE] -.headerend -# ----------------------------------------------------------------------------- # - -ScoutEnginesInit: - wait 1 - engframe 0 - wait 1 - engframe 17 - goto ScoutEnginesInit - # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 151 Zealot (protoss\zealot.grp) @@ -24568,11 +24542,13 @@ PanoptusDeath: PanoptusGndAttkInit: nobrkcodestart - playfram 0x11 + playfram 0x00 wait 1 playsndbtwn 2020 2023 # Panoptus weaponfire 01, 02, 03, 04 attackwith 2 - playfram 0x00 + playfram 0x20 + wait 1 + playfram 0x00 nobrkcodeend gotorepeatattk ignorerest @@ -29526,10 +29502,10 @@ Type 21 Init VassalInit Death VassalDeath GndAttkInit VassalGndAttkInit -AirAttkInit VassalAirAttkInit +AirAttkInit VassalGndAttkInit Unused1 [NONE] GndAttkRpt VassalGndAttkInit -AirAttkRpt VassalAirAttkInit +AirAttkRpt VassalGndAttkInit CastSpell [NONE] GndAttkToIdle VassalGndAttkToIdle AirAttkToIdle VassalGndAttkToIdle @@ -29551,22 +29527,22 @@ WarpIn VassalWarpIn VassalInit: imgul 1140 0 42 # Vassal Shadow (cm\protoss\vassal.grp) VassalGndAttkToIdle: - playfram 0x00 # Frame set 0 + playfram 0x00 goto VassalWalkingToIdle VassalWalkingToIdle: setvertpos 0 wait 8 - setvertpos 0 + setvertpos 0 wait 8 - setvertpos -1 + setvertpos -1 wait 8 - setvertpos 0 + setvertpos 0 wait 8 goto VassalWalkingToIdle VassalDeath: - playsnd 8 # Misc\ExploMed.wav + playsnd 8 # Misc\ExploMed.wav imgol 213 0 0 # Explosion1 (Small) (thingy\tBangS.grp) wait 3 end @@ -29574,7 +29550,7 @@ VassalDeath: VassalGndAttkInit: wait 1 nobrkcodestart - playfram 0x11 + playfram 0x20 playsndbtwn 1217 1221 attackwith 1 wait 1 @@ -29585,20 +29561,7 @@ VassalGndAttkInit: goto VassalLocal00 VassalLocal00: - wait 125 - goto VassalLocal00 - -VassalAirAttkInit: - wait 1 - nobrkcodestart - playfram 0x11 - playsndbtwn 1217 1221 - attackwith 1 - wait 1 - playfram 0x00 - wait 1 - nobrkcodeend - gotorepeatattk + wait 125 goto VassalLocal00 VassalWalking: @@ -34522,7 +34485,7 @@ PlanetCrackerBlastInit: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1256 Ion Cannon (Base) (cm\terran\ioncannon-base.grp) +# 1255 Ion Cannon (Base) (cm\terran\ioncannon-base.grp) .headerstart IsId 531 Type 24 @@ -34557,8 +34520,8 @@ Burrow [NONE] IonCannonBaseInit: playfram 0x00 - imgul 1258 0 0 # Ion Cannon shadow - imgul 1452 0 0 # Ion Cannon underlay + imgul 1258 -32 -1 # Ion Cannon shadow + imgul 1452 0 0 # Ion Cannon mouse response IonCannonBaseIsWorking: wait 125 goto IonCannonBaseIsWorking @@ -34572,28 +34535,29 @@ IonCannonBaseDeath: end IonCannonBaseGndAttkInit: - playfram 0x11 + playfram 0x20 wait 3 - playfram 0x22 + playfram 0x40 IonCannonBaseGndAttkRpt: nobrkcodestart playsnd 1319 # ioncannon-charge-01 wait 71 attackwith 1 wait 8 - sproluselo 755 0 # ioncannon-attack + sproluselo 755 0 # ioncannon-attack-B nobrkcodeend gotorepeatattk goto IonCannonBaseIsWorking IonCannonBaseGndAttkToIdle: - playfram 0x11 + playfram 0x20 wait 3 playfram 0x00 goto IonCannonBaseIsWorking IonCannonBaseAlmostBuilt: - playfram 0x01 + playfram 0x4C + setfldirect 20 goto IonCannonBaseIsWorking IonCannonBaseLiftOff: @@ -34633,32 +34597,41 @@ IonCannonBaseBuilt: playfram 0x00 wait 1 tmprmgraphicstart - imgolorig 1453 # ioncannon-attack-A - imgol 1256 0 -40 # ioncannon-turret - imgolorig 1278 # ioncannon-overlay + imgol 1453 -128 -128 # ioncannon-attack-A1 + imgol 1278 127 -128 # ioncannon-attack-A2 + imgol 1701 -128 127 # ioncannon-attack-A3 + imgol 1702 127 127 # ioncannon-attack-A4 + imgol 1256 -1 -54 # ioncannon-turret setfldirect 20 goto IonCannonBaseIsWorking # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1255 Ion Cannon (Turret) (cm\terran\ioncannon-turret.grp) +# 1256 Ion Cannon (Turret) (cm\terran\ioncannon-turret.grp) +# 1258 Ion Cannon Shadow (cm\effect\ioncannon-shadow.grp) .headerstart IsId 532 Type 1 -Init IonCannonTurretInit +Init ShadowHeaderInit Death IonCannonTurretDeath .headerend # ----------------------------------------------------------------------------- # -IonCannonTurretInit: - wait 1 - followmaingraphic - goto IonCannonTurretInit - IonCannonTurretDeath: wait 4 end +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1452 Ion Cannon Mouse Response (cm\effect\ioncannon-clicky.grp) +.headerstart +IsId 628 +Type 1 +Init IonCannonAttackAInit +Death IonCannonTurretDeath +.headerend +# ----------------------------------------------------------------------------- # + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 1260 Ion Cannon Ion Field (cm\effect\ioncannon-ionfield.grp) @@ -35608,13 +35581,11 @@ IonCannonProjectileLocal00: playsndbtwn 1320 1322 #ioncannon-att-01, 02, 03 wait 1 sigorder 1 - wait 1 - goto IonCannonProjectileGndAttkInit - -IonCannonProjectileGndAttkInit: - playfram 0x11 wait 2 + playfram 0x11 + wait 3 playfram 0x22 +IonCannonProjectileGndAttkInit: wait 2 playfram 0x33 wait 2 @@ -35626,11 +35597,16 @@ IonCannonProjectileGndAttkInit: wait 2 playfram 0x77 wait 2 + playfram 0x88 + wait 2 + playfram 0x99 + wait 2 + playfram 0xAA goto IonCannonProjectileGndAttkInit IonCannonProjectileDeath: - playfram 0x88 - imgol 1105 0 0 #ioncannon-ionfield + playfram 0xBB + imgol 1105 0 0 # Ion Cannon Ion Field domissiledmg wait 2 end @@ -43393,7 +43369,6 @@ ZealotDeathReversedInit: # This header is used by images.dat entries: # 1202 Exemplar Engines (cm\protoss\exemplar-engine.grp) # 1204 Gladius Engines (cm\protoss\gladius-engine.grp) -# 1206 Vassal Engines (cm\protoss\vassal-engine.grp) # 1301 Epigraph Engines (cm\protoss\epigraph-engine.grp) .headerstart IsId 623 @@ -43586,29 +43561,10 @@ ZergAirDeathExplosionReversedInit: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1258 Ion Cannon Shadow (cm\effect\ioncannon-shadow.grp) -# 1452 Ion Cannon Underlay (cm\effect\ioncannon-underlay.grp) -.headerstart -IsId 628 -Type 1 -Init IonCannonUnderlayInit -Death IonCannonUnderlayDeath -.headerend -# ----------------------------------------------------------------------------- # - -IonCannonUnderlayInit: - playfram 0x00 -IonCannonUnderlayLocal00: - wait 125 - goto IonCannonUnderlayLocal00 - -IonCannonUnderlayDeath: - wait 4 - end - -# ----------------------------------------------------------------------------- # -# This header is used by images.dat entries: -# 1453 Ion Cannon Attack A (cm\effect\ioncannon-attack.grp) +# 1452 Ion Cannon Attack A1 (cm\effect\ioncannon-attack-A1.grp) +# 1453 Ion Cannon Attack A2 (cm\effect\ioncannon-attack-A2.grp) +# 1701 Ion Cannon Attack A3 (cm\effect\ioncannon-attack-A3.grp) +# 1702 Ion Cannon Attack A4 (cm\effect\ioncannon-attack-A4.grp) .headerstart IsId 629 Type 24 @@ -43658,57 +43614,57 @@ IonCannonAttackAGndAttkRpt: wait 31 tmprmgraphicend wait 2 - playfram 0x11 + playfram 0x20 wait 2 - playfram 0x22 + playfram 0x40 wait 2 - playfram 0x33 + playfram 0x60 wait 2 - playfram 0x44 + playfram 0x80 wait 2 - playfram 0x55 + playfram 0xA0 wait 2 - playfram 0x66 + playfram 0xC0 wait 2 - playfram 0x77 + playfram 0xE0 wait 2 - playfram 0x88 + playfram 0x100 wait 2 - playfram 0x99 + playfram 0x120 wait 2 - playfram 0xAA + playfram 0x140 wait 2 - playfram 0xBB + playfram 0x160 wait 2 - playfram 0xCC + playfram 0x180 wait 2 - playfram 0xDD + playfram 0x1A0 wait 2 - playfram 0xEE + playfram 0x1C0 wait 2 - playfram 0xFF + playfram 0x1E0 wait 2 - playfram 0x110 + playfram 0x200 wait 2 - playfram 0x121 + playfram 0x220 wait 2 - playfram 0x132 + playfram 0x240 wait 2 - playfram 0x143 + playfram 0x260 wait 2 - playfram 0x154 + playfram 0x280 wait 2 - playfram 0x165 + playfram 0x2A0 wait 2 - playfram 0x176 + playfram 0x2C0 wait 2 - playfram 0x187 + playfram 0x2E0 wait 2 goto IonCannonAttackAInit # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 1454 Ion Cannon Attack B (cm\effect\ioncannon-attack.grp) +# 1454 Ion Cannon Attack B (cm\effect\ioncannon-attack-B.grp) .headerstart IsId 630 Type 0 @@ -43718,23 +43674,21 @@ Death [NONE] # ----------------------------------------------------------------------------- # IonCannonAttackBInit: - playfram 0x198 + playfram 0x00 wait 2 - playfram 0x1A9 + playfram 0x20 wait 2 - playfram 0x1BA + playfram 0x40 wait 2 - playfram 0x1CB + playfram 0x60 wait 2 - playfram 0x1DC + playfram 0x80 wait 2 - playfram 0x1ED + playfram 0xA0 wait 2 - playfram 0x1FE + playfram 0xC0 wait 2 - playfram 0x20F - wait 2 - playfram 0x220 + playfram 0xE0 wait 2 end @@ -52439,4 +52393,37 @@ PatriarchWalkingToIdle: PatriarchWarpIn: imgol 128 0 0 # High Templar Warp Flash (protoss\templar.grp) - goto InfestedTerranLocal00 \ No newline at end of file + goto InfestedTerranLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 245 Wraith Engine (terran\wraith-engine.grp) +# 1206 Vassal Engines (cm\protoss\vassal-engine.grp) +.headerstart +IsId 730 +Type 15 +Init Engines_MultiGlowHeader_OmniInit +Death SkrylingExplosionDeath +GndAttkInit SkrylingExplosionDeath +AirAttkInit SkrylingExplosionDeath +Unused1 [NONE] +GndAttkRpt SkrylingExplosionDeath +AirAttkRpt SkrylingExplosionDeath +CastSpell SkrylingExplosionDeath +GndAttkToIdle SkrylingExplosionDeath +AirAttkToIdle SkrylingExplosionDeath +Unused2 [NONE] +Walking Engines_MultiGlowHeader_OmniInit +WalkingToIdle SkrylingExplosionDeath +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt SkrylingExplosionDeath +.headerend +# ----------------------------------------------------------------------------- # + +Engines_MultiGlowHeader_OmniInit: + engframe 0 + wait 1 + engframe 0x20 + wait 1 + goto Engines_MultiGlowHeader_OmniInit \ No newline at end of file diff --git a/mpq/unit/cm/effect/ioncannon-projectile.grp b/mpq/unit/cm/effect/ioncannon-projectile.grp index 8fec941e..36af1198 100644 Binary files a/mpq/unit/cm/effect/ioncannon-projectile.grp and b/mpq/unit/cm/effect/ioncannon-projectile.grp differ diff --git a/mpq/unit/cm/protoss/panoptus-attack.lol b/mpq/unit/cm/protoss/panoptus-attack.lol index 31147a71..ef5f034f 100644 Binary files a/mpq/unit/cm/protoss/panoptus-attack.lol and b/mpq/unit/cm/protoss/panoptus-attack.lol differ diff --git a/mpq/unit/cm/protoss/panoptus.grp b/mpq/unit/cm/protoss/panoptus.grp index e1be4e17..8fa8c8a4 100644 Binary files a/mpq/unit/cm/protoss/panoptus.grp and b/mpq/unit/cm/protoss/panoptus.grp differ diff --git a/mpq/unit/cm/protoss/vassal-engine.grp b/mpq/unit/cm/protoss/vassal-engine.grp index 759f9db8..54f278a5 100644 Binary files a/mpq/unit/cm/protoss/vassal-engine.grp and b/mpq/unit/cm/protoss/vassal-engine.grp differ diff --git a/mpq/unit/cm/protoss/vassal.grp b/mpq/unit/cm/protoss/vassal.grp index 47c1fbb1..52986b56 100644 Binary files a/mpq/unit/cm/protoss/vassal.grp and b/mpq/unit/cm/protoss/vassal.grp differ diff --git a/mpq/unit/cm/terran/ioncannon-attack.lol b/mpq/unit/cm/terran/ioncannon-attack.lol index 0fabf608..108edaf5 100644 Binary files a/mpq/unit/cm/terran/ioncannon-attack.lol and b/mpq/unit/cm/terran/ioncannon-attack.lol differ diff --git a/mpq/unit/cm/terran/ioncannon-attackA1.grp b/mpq/unit/cm/terran/ioncannon-attackA1.grp new file mode 100644 index 00000000..c2765efc Binary files /dev/null and b/mpq/unit/cm/terran/ioncannon-attackA1.grp differ diff --git a/mpq/unit/cm/terran/ioncannon-attackA2.grp b/mpq/unit/cm/terran/ioncannon-attackA2.grp new file mode 100644 index 00000000..a48bce0a Binary files /dev/null and b/mpq/unit/cm/terran/ioncannon-attackA2.grp differ diff --git a/mpq/unit/cm/terran/ioncannon-attackA3.grp b/mpq/unit/cm/terran/ioncannon-attackA3.grp new file mode 100644 index 00000000..45817adc Binary files /dev/null and b/mpq/unit/cm/terran/ioncannon-attackA3.grp differ diff --git a/mpq/unit/cm/terran/ioncannon-attackA4.grp b/mpq/unit/cm/terran/ioncannon-attackA4.grp new file mode 100644 index 00000000..0f3ae72f Binary files /dev/null and b/mpq/unit/cm/terran/ioncannon-attackA4.grp differ diff --git a/mpq/unit/cm/terran/ioncannon-attackB.grp b/mpq/unit/cm/terran/ioncannon-attackB.grp new file mode 100644 index 00000000..7835e2cb Binary files /dev/null and b/mpq/unit/cm/terran/ioncannon-attackB.grp differ diff --git a/mpq/unit/cm/terran/ioncannon-base.grp b/mpq/unit/cm/terran/ioncannon-base.grp index af654e7a..0dc4417a 100644 Binary files a/mpq/unit/cm/terran/ioncannon-base.grp and b/mpq/unit/cm/terran/ioncannon-base.grp differ diff --git a/mpq/unit/cm/terran/ioncannon-mouseresponse.grp b/mpq/unit/cm/terran/ioncannon-mouseresponse.grp new file mode 100644 index 00000000..be2a47e2 Binary files /dev/null and b/mpq/unit/cm/terran/ioncannon-mouseresponse.grp differ diff --git a/mpq/unit/cm/terran/ioncannon-overlay.lol b/mpq/unit/cm/terran/ioncannon-overlay.lol index 21de3f51..442a3217 100644 Binary files a/mpq/unit/cm/terran/ioncannon-overlay.lol and b/mpq/unit/cm/terran/ioncannon-overlay.lol differ diff --git a/mpq/unit/cm/terran/ioncannon-shad.grp b/mpq/unit/cm/terran/ioncannon-shad.grp index 86adc84c..78f1ad63 100644 Binary files a/mpq/unit/cm/terran/ioncannon-shad.grp and b/mpq/unit/cm/terran/ioncannon-shad.grp differ diff --git a/mpq/unit/cm/terran/ioncannon-turret.grp b/mpq/unit/cm/terran/ioncannon-turret.grp index 6da9e93d..a04d654d 100644 Binary files a/mpq/unit/cm/terran/ioncannon-turret.grp and b/mpq/unit/cm/terran/ioncannon-turret.grp differ diff --git a/mpq/unit/cm/terran/ioncannon-underlay.grp b/mpq/unit/cm/terran/ioncannon-underlay.grp deleted file mode 100644 index cfaef440..00000000 Binary files a/mpq/unit/cm/terran/ioncannon-underlay.grp and /dev/null differ diff --git a/mpq/unit/cm/terran/wraith-attacklaser.lol b/mpq/unit/cm/terran/wraith-attacklaser.lol index f8332e52..e53d86aa 100644 Binary files a/mpq/unit/cm/terran/wraith-attacklaser.lol and b/mpq/unit/cm/terran/wraith-attacklaser.lol differ diff --git a/mpq/unit/cm/zerg/spore-colony-attack.lol b/mpq/unit/cm/zerg/spore-colony-attack.lol deleted file mode 100644 index 35a6c058..00000000 Binary files a/mpq/unit/cm/zerg/spore-colony-attack.lol and /dev/null differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 1a32670d..9955d5f0 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 795ee74b..f1901fc7 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/terran/wraith-engine.grp b/mpq/unit/terran/wraith-engine.grp new file mode 100644 index 00000000..0b1c1e9d Binary files /dev/null and b/mpq/unit/terran/wraith-engine.grp differ diff --git a/mpq/unit/terran/wraith.grp b/mpq/unit/terran/wraith.grp new file mode 100644 index 00000000..7cec2a7f Binary files /dev/null and b/mpq/unit/terran/wraith.grp differ diff --git a/mpq/unit/thingy/pscglow.grp b/mpq/unit/thingy/pscglow.grp new file mode 100644 index 00000000..c488a1a5 Binary files /dev/null and b/mpq/unit/thingy/pscglow.grp differ diff --git a/mpq/unit/thingy/tphglow.grp b/mpq/unit/thingy/tphglow.grp new file mode 100644 index 00000000..685614fb Binary files /dev/null and b/mpq/unit/thingy/tphglow.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 0893e80b..9cf440a8 100644 Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ diff --git a/mpq/unit/wirefram/tranwire.grp b/mpq/unit/wirefram/tranwire.grp index faa0ab15..3302e3c8 100644 Binary files a/mpq/unit/wirefram/tranwire.grp and b/mpq/unit/wirefram/tranwire.grp differ diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp index 843bb7c5..ad9971f4 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 4efe95e0..16bde97a 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -12,28 +12,146 @@ Aside from that: More audiovisuals and balance updates are trickling in. - Ocsal Larvae now spawn two Vorvrokors, Kalkalisks, and Ghitorokors per egg - Hotkey conflict between Pazuzu and Anticthon has been resolved - Some incorrect armor icons and unit training strings have been corrected +- Isthrath Mound unit name and Isthrathaleth requirement string have been corrected ## Audiovisuals -- Improve: - - Sundog base graphic (c. Solstice) +- New sprites: + - Wraith, Vassal, Panoptus (c. Solstice) +- Updated sprites: + - Sundog (c. Solstice), Ion Cannon (c. DarkenedFantasies) - Fix: - Centaur engine graphics (still some cropping left to fix) ## Maps +- Sun-Starved, by Pr0nogo: + - Marked as outdated - Stardust, by knightoftherealm: - Revamped middle terrain - Reworked naturals - Added more gas to the isolated corner expos +## Terran +- [Madcap](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/madcap): + - Mineral cost now 125, from 100 +- [Heracles](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/heracles): + - Gas cost now 25, from 50 +- [Striga](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/striga): + - Mineral and gas costs now 200/0, from 175/25 +- [Autocrat](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/autocrat): + - Gas cost now 100, from 150 +- [Silvertongue](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/silvertongue): + - Gas cost now 175, from 200 +- [Ramesses](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ramesses): + - Mineral and gas costs now 225/0, from 200/25 +- [Pazuzu](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/pazuzu): + - Weapon range now 8, from 7 +- [Aion](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/aion): + - Gas cost now 450, from 500 +- [Wraith](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/wraith): + - HP now 90, from 85 + - Weapon cooldown now 0.916, from 1.083 +- [Gorgon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/gorgon): + - Gas cost now 25, from 50 +- [Sundog](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/sundog): + - Armor penetration now 2, from 1 +- [Azazel](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/azazel): + - Gas and time costs now 100/35, from 150/36 +- [Centaur](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/centaur): + - Artax Cannon weapon damage now 35, from 30 +- [Minotaur](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/minotaur): + - Weapon range now 9, from 8 +- [Ion Cannon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ion-cannon): + - Transport space cost now 40, allowing it to be transported by Pytheans +- [Iron Foundry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/iron-foundry): + - Time cost now 50, from 60 + ## Protoss +- [Barghest](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/barghest): + - Time cost now 25, from 20 +- [Charlatan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/charlatan): + - Gas cost now 175, from 200 - [Mind Tyrant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/mind-tyrant): - Now moves ~15% slower - Maelstrom projectile now significantly slower +- [Archon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/archon): + - Mineral and gas costs now 500/100, from 450/150 - [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton): - Sunsplit Beam no longer pierces targets and goes to max range, instead firing a non-tracking projectile +- [Patriarch](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/patriarch): + - Mineral and gas costs now 200/250, from 400/300 +- [Positron](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/positron): + - Gas cost now 50, from 75 +- [Demiurge](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/demiurge): + - Gas cost now 350, from 400 + - No longer a specialist + - Gods Made Flesh removed + - Weapon cooldown now 0.75, from 0.833 +- [Empress](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/empress): + - Anodyne Annex now restores 5 HP per stack and grants 1 second of timed life per stack, from 2.5 HP and 0.25 seconds of timed life +- [Aurora](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/aurora): + - Mineral cost now 125, from 150 +- [Gladius](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/gladius): + - Shields now 70, from 80 +- [Magister](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/magister): + - Gas cost now 100, from 125 +- [Epigraph](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/epigraph): + - Gas cost now 150, from 200 + - Now moves ~22% faster +- [Didact](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/didact): + - Weapon range now 6, from 5 +- [Rogue Gallery](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/rogue-gallery): + - Time cost now 45, from 40 ## Zerg +- [Iroleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/iroleth): + - Mineral, gas, and time costs now 75/25/20, from 50/50/15 +- [Cikralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/cikralisk): + - Mineral, gas, and time costs now 150/25/25, from 125/50/20 + - HP now 65, from 60 +- [Ghitorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/ghitorokor): + - Mineral and gas costs now 150/0, from 100/25 + - HP now 110, from 90 +- [Tosgrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/tosgrilisk): + - Weapon splash radius now 12/24/36, from 16/32/48 +- [Izirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/izirokor): + - Mineral cost now 150, from 200 +- [Tethzorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/tethzorokor): + - Gas cost now 0, from 25 + - HP now 200, from 180 +- [Kagralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/kagralisk): + - HP now 100, from 90 +- [Evigrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/evigrilisk): + - Gas cost now 50, from 75 + - HP now 240, from 200 + - Armor now 4, from 3 + - Transport space cost now 6, from 4 +- [Almaksalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/almaksalisk): + - Weapon armor penetration now 6, from 4 +- [Keskathalor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/keskathalor): + - Gas and time costs now 150/40, from 200/45 + - Weapon range now 14, from 13 +- [Geszithalor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/geszithalor): + - Weapon can no longer target air units +- [Matraleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/matraleth): + - Parasite: + - Energy cost now 100, from 75 + - Ensnaring Brood: + - Now passively applies to all units within 5 range of the Matraleth +- [Ultrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/ultrokor): + - Mineral, gas, and time costs now 400/0/35, from 300/50/30 + - Now moves 10% faster +- [Zarcavrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zarcavrokor): + - Mineral and gas costs now 250/50, from 200/75 + - HP now 320, from 300 +- [Tetcaerokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/tetcaerokor): + - Gas cost now 75, from 100 + - HP now 240, from 225 + - Now moves ~12.5% faster +- [Akistrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/akistrokor): + - Gas cost now 75, from 150 + - Armor now 4, from 3 + - Weapon cooldown now 0.666, from 0.791 - [Hachirosk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hachirosk): - HP now 1200, from 1000 - [Gathtelosk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/gathtelosk): - - Mineral and gas costs now 250/450, from 450/100 \ No newline at end of file + - Mineral and gas costs now 250/450, from 450/100 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index eae9747b..be3b665b 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ