diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 5c5cb353..d0008e22 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 2daeb26a..7c14a9c9 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -465,7 +465,7 @@ Police Dispensary Police Deputy Police WAT Trooper Spirtith Colony -Extended Flingy #259 +Skortrith Colony Extended Flingy #260 Extended Flingy #261 Extended Flingy #262 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 30627f1e..895ca6c8 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 4472b50f..c00e4e9b 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 11affbd0..25e23578 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -304,7 +304,7 @@ Physics Lab Connector Physics Lab Shadow Bunker Bunker Shadow -Bunker Overlay +Bunker Attack Overlay (Orange) Reservoir Reservoir Shadow Daedala @@ -1701,10 +1701,10 @@ Spirtith Colony Spirtith Colony Shadow Ion Cannon Attack A3 Ion Cannon Attack A4 -Extended Image #701 -Extended Image #702 -Extended Image #703 -Extended Image #704 +Skortrith Colony +Skortrith Colony Shadow +Bunker Attack Overlay (Green) +Bunker Attack Overlay (Blue) Extended Image #705 Extended Image #706 Extended Image #707 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index f5da0650..cbd1b663 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 b53baa3e..2c877dbe 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -375,8 +375,8 @@ Scarab/Anti-Matter Missile Overlay Hallucination Death1 Hallucination Death2 Hallucination Death3 -Bunker Overlay -FlameThrower +Bunker Attack Overlay (Orange) +Flamethrower Recall Field Scanner Sweep Hit Left Upper Level Door @@ -839,9 +839,9 @@ Police Deputy Police WAT Trooper Cuirass Stonewall Protocol Overlay Spirtith Colony -Extended Sprite #1 -Extended Sprite #1 -Extended Sprite #1 +Skortrith Colony +Bunker Attack Overlay (Green) +Bunker Attack Overlay (Blue) Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index f5eac23a..94142650 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 bcf28e15..d3fa5188 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -291,7 +291,7 @@ Terran Armistice Terran Pythean Zerg Ogroszaleth Zerg Spirtith Colony -Terran Heir +Zerg Skortrith Colony Terran Horseman Terran Iron Council Terran Amphitheater diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 99502fb4..71a7cb29 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 d783a36f..5a578160 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -178,7 +178,7 @@ Kaleidoscope Cannon (Hypnagogue) Cleaving Maw (Tetcaerokor) Spirtith Spores (Spirtith Colony) Signatory Salvo (Ambassador) -Usurper Flamethrower (Heir) +Skortra Tendril (Skortrith Colony) Excellency Laser Batteries (Heir) Hades Cannon (Horseman) Through the Looking Glass (Hypnagogue) diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index 11183f32..c5929243 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 9911c636..ddddbf41 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -24478,10 +24478,10 @@ Type 21 Init AuroraInit Death AuroraDeath GndAttkInit AuroraGndAttkInit -AirAttkInit AuroraAirAttkInit +AirAttkInit AuroraGndAttkInit Unused1 [NONE] GndAttkRpt AuroraGndAttkInit -AirAttkRpt AuroraAirAttkInit +AirAttkRpt AuroraGndAttkInit CastSpell [NONE] GndAttkToIdle AuroraGndAttkToIdle AirAttkToIdle AuroraGndAttkToIdle @@ -24524,14 +24524,14 @@ AuroraDeath: end AuroraGndAttkInit: - playfram 0x11 + playfram 0x20 playsnd 66 # Bullet\HKMISSLE.wav attackwith 1 - wait 2 + wait 1 playfram 0x00 - wait 2 - playfram 0x11 - wait 2 + wait 1 + playfram 0x20 + wait 1 playfram 0x00 gotorepeatattk goto AuroraLocal00 @@ -24540,19 +24540,6 @@ AuroraLocal00: wait 125 goto AuroraLocal00 -AuroraAirAttkInit: - playfram 0x11 - playsnd 66 # Bullet\HKMISSLE.wav - attackwith 1 - wait 2 - playfram 0x00 - wait 2 - playfram 0x11 - wait 2 - playfram 0x00 - gotorepeatattk - goto AuroraLocal00 - AuroraWalking: playfram 0x00 setvertpos 0 @@ -51002,7 +50989,7 @@ SequesteredIconDeath: playsnd 7 # Misc\ExploLrg.wav imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) wait 3 - lowsprul 224 0 0 # Protoss Building Rubble (Large) (thingy\PRubbleL.grp) + lowsprul 223 0 0 # Protoss Building Rubble (Small) (thingy\PRubbleS.grp) wait 1 end @@ -52476,6 +52463,7 @@ PatriarchWarpIn: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 245 Wraith Engine (terran\wraith-engine.grp) +# 1199 Aurora Engines (cm\protoss\aurora-engine.grp) # 1206 Vassal Engines (cm\protoss\vassal-engine.grp) .headerstart IsId 730 diff --git a/mpq/unit/cm/protoss/aurora-engine.grp b/mpq/unit/cm/protoss/aurora-engine.grp index 707e7cf6..b96d771c 100644 Binary files a/mpq/unit/cm/protoss/aurora-engine.grp and b/mpq/unit/cm/protoss/aurora-engine.grp differ diff --git a/mpq/unit/cm/protoss/aurora.grp b/mpq/unit/cm/protoss/aurora.grp index df882b56..3b8f26c8 100644 Binary files a/mpq/unit/cm/protoss/aurora.grp and b/mpq/unit/cm/protoss/aurora.grp differ diff --git a/mpq/unit/cm/protoss/manifold-n.grp b/mpq/unit/cm/protoss/manifold-n.grp new file mode 100644 index 00000000..d0cdf8fd Binary files /dev/null and b/mpq/unit/cm/protoss/manifold-n.grp differ diff --git a/mpq/unit/cm/protoss/panoptus.grp b/mpq/unit/cm/protoss/panoptus.grp index 8fa8c8a4..c3c312e9 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/terran/matador.grp b/mpq/unit/cm/terran/matador.grp index 7fdb91c5..138a53d5 100644 Binary files a/mpq/unit/cm/terran/matador.grp and b/mpq/unit/cm/terran/matador.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 9955d5f0..cf3dc0b7 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 f1901fc7..00a3ec9f 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/terran/bunker-attack-blue.grp b/mpq/unit/terran/bunker-attack-blue.grp new file mode 100644 index 00000000..9a3251c6 Binary files /dev/null and b/mpq/unit/terran/bunker-attack-blue.grp differ diff --git a/mpq/unit/terran/bunker-attack-green.grp b/mpq/unit/terran/bunker-attack-green.grp new file mode 100644 index 00000000..9fa014bc Binary files /dev/null and b/mpq/unit/terran/bunker-attack-green.grp differ diff --git a/mpq/unit/terran/pillboxt.grp b/mpq/unit/terran/bunker-attack-orange.grp similarity index 100% rename from mpq/unit/terran/pillboxt.grp rename to mpq/unit/terran/bunker-attack-orange.grp diff --git a/mpq/unit/terran/tpbshad.grp b/mpq/unit/terran/bunker-shad.grp similarity index 100% rename from mpq/unit/terran/tpbshad.grp rename to mpq/unit/terran/bunker-shad.grp diff --git a/mpq/unit/terran/bunker.grp b/mpq/unit/terran/bunker.grp new file mode 100644 index 00000000..5abde37f Binary files /dev/null and b/mpq/unit/terran/bunker.grp differ diff --git a/mpq/unit/terran/pillbox.loa b/mpq/unit/terran/bunker.loa similarity index 100% rename from mpq/unit/terran/pillbox.loa rename to mpq/unit/terran/bunker.loa diff --git a/mpq/unit/terran/pillbox.lof b/mpq/unit/terran/bunker.lof similarity index 100% rename from mpq/unit/terran/pillbox.lof rename to mpq/unit/terran/bunker.lof diff --git a/mpq/unit/terran/pillbox.grp b/mpq/unit/terran/pillbox.grp deleted file mode 100644 index 7f7edede..00000000 Binary files a/mpq/unit/terran/pillbox.grp and /dev/null differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 9cf440a8..361802c9 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 ad9971f4..dcd6057a 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 d1adfd7a..a49d9d51 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -9,14 +9,37 @@ Aside from that: More audiovisuals (thanks DarkenedFantasies and Solstice!), and ## Bugfixes - Mutated Zerg structures no longer fail to regress properly when killed mid-mutation (c. Veeq7) +- Stim Pack description has been corrected ## Audiovisuals +- New sprite: + - Matador, Aurora (c. Solstice) - Improved sprite: - - Bunker: attack overlay is partially-transparent and casts light on the structure (c. DarkenedFantasies) + - Bunker: attack overlay is partially-transparent, casts light on the structure, and changes based on the garrisoned unit's race (c. DarkenedFantasies) - New SFX: - - Terran structures play a sound when the landing sequence begins + - Terran structures play a sound when their landing sequence begins - Vulture Spider Mines play a sound when deployed +- Bunker now has an updated wireframe (c. jun3hong) ## Terran - Spider Mine: - - Arming time now ~5 seconds, from ~4.25 \ No newline at end of file + - Arming time now ~5 seconds, from ~4.25 +- Madrigal: + - Furia Missile range now 4, from 5 + - Furia Missile armor penetration now 1, from 2 +- Sentinel: + - Mineral cost now 225, from 200 + +## Protoss +Barghest: + - Armor now 1, from 2 + - Sight range now 5, from 7 + - Armor penetration now 1, from 2 +Cantavis: + - Psionic Storm tick damage now 16, from 12; total damage now 128, from 96 +Matrix: + - Shields now 80, from 60 + +## Zerg +Mutalisk: + - HP now 120, from 90 \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 9b66c970..5dcf502c 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ