diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index f355b054..40bb3e92 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 8871d034..040fa59e 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -6888,18 +6888,18 @@ SeraphTurretInit: .headerstart IsId 90 Type 23 -Init PhalanxTankBaseInit -Death PhalanxTankBaseDeath +Init Phalanx_Tank_BaseInit +Death Phalanx_Tank_BaseDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 PhalanxTankBaseUnused1 +Unused1 [NONE] GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] GndAttkToIdle [NONE] AirAttkToIdle [NONE] Unused2 [NONE] -Walking PhalanxTankBaseWalking +Walking Phalanx_Tank_BaseWalking WalkingToIdle InfestedTerranWalkingToIdle SpecialState1 [NONE] SpecialState2 [NONE] @@ -6911,34 +6911,22 @@ IsWorking [NONE] WorkingToIdle [NONE] WarpIn [NONE] Unused3 [NONE] -StarEditInit [NONE] +StarEditInit Phalanx_Tank_BaseStarEditInit .headerend # ----------------------------------------------------------------------------- # -PhalanxTankBaseInit: +Phalanx_Tank_BaseInit: wait 1 imgul 252 0 0 # Phalanx (Tank) Base Shadow (terran\ttaShad.grp) goto InfestedTerranWalkingToIdle -PhalanxTankBaseDeath: - playsnd 317 # Terran\TANK\TTaDth00.WAV - imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) +Phalanx_Tank_BaseDeath: + playsnd 317 # Terran\TANK\TTaDth00.WAV + imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) wait 3 - lowsprul 844 0 0 # Terran Unit Rubble Medium - wait 1 end - -PhalanxTankBaseUnused1: - wait 1 - nobrkcodestart - playsnd 1699 - sprol 744 0 0 # Explosion Orange Medium Reversed - wait 12 - setfldirect 13 - nobrkcodeend - goto InfestedTerranWalkingToIdle -PhalanxTankBaseWalking: +Phalanx_Tank_BaseWalking: move 4 wait 1 playfram 0x00 @@ -6948,7 +6936,15 @@ PhalanxTankBaseWalking: move 4 wait 1 playfram 0x22 - goto PhalanxTankBaseWalking + goto Phalanx_Tank_BaseWalking + +Phalanx_Tank_BaseStarEditInit: + setfldirect 12 + imgoluselo 251 2 0 # Phalanx (Tank) Turret (terran\tankt.grp) + wait 1 + imgul 252 0 0 # Phalanx (Tank) Base Shadow (terran\ttaShad.grp) + setfldirect 12 + goto InfestedTerranWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -6958,10 +6954,10 @@ IsId 91 Type 13 Init ScourgeLocal00 Death ScourgeExplosionDeath -GndAttkInit PhalanxTankTurretGndAttkInit +GndAttkInit Phalanx_Tank_TurretGndAttkInit AirAttkInit [NONE] Unused1 [NONE] -GndAttkRpt PhalanxTankTurretGndAttkInit +GndAttkRpt Phalanx_Tank_TurretGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] GndAttkToIdle ScourgeLocal00 @@ -6973,11 +6969,11 @@ SpecialState1 ScourgeLocal00 .headerend # ----------------------------------------------------------------------------- # -PhalanxTankTurretGndAttkInit: +Phalanx_Tank_TurretGndAttkInit: wait 1 nobrkcodestart playsnd 68 # Bullet\TTaFir00.wav - imgol 536 0 0 # Phalanx (Tank) Turret Attack Overlay (thingy\ettFlash.grp) + imgol 536 0 0 # Phalanx (Tank) Turret Attack Overlay (thingy\ettFlash.grp) wait 2 attackwith 1 nobrkcodeend @@ -6990,11 +6986,11 @@ PhalanxTankTurretGndAttkInit: .headerstart IsId 92 Type 23 -Init PhalanxSiegeBaseInit -Death PhalanxTankBaseDeath +Init Phalanx_Siege_BaseInit +Death Phalanx_Tank_BaseDeath GndAttkInit [NONE] AirAttkInit [NONE] -Unused1 PhalanxSiegeBaseUnused1 +Unused1 [NONE] GndAttkRpt [NONE] AirAttkRpt [NONE] CastSpell [NONE] @@ -7004,7 +7000,7 @@ Unused2 [NONE] Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] -SpecialState2 PhalanxSiegeBaseSpecialState2 +SpecialState2 Phalanx_Siege_BaseSpecialState2 AlmostBuilt [NONE] Built [NONE] Landing [NONE] @@ -7013,64 +7009,78 @@ IsWorking [NONE] WorkingToIdle [NONE] WarpIn [NONE] Unused3 [NONE] -StarEditInit [NONE] +StarEditInit Phalanx_Siege_BaseStarEditInit .headerend # ----------------------------------------------------------------------------- # -PhalanxSiegeBaseInit: - imgul 255 0 0 # Phalanx (Siege) Base Shadow (terran\tstShad.grp) +Phalanx_Siege_BaseInit: + playfram 0x00 + imgul 255 0 0 # Phalanx (Siege) Base Shadow (terran\tstShad.grp) wait 1 setflspeed 0 - playsnd 319 # Terran\TANK\TTaTra01.WAV - playfram 0x00 - wait 5 + playsnd 319 # Terran\TANK\TTaTra01.WAV + wait 2 playfram 0x11 - wait 5 + wait 2 playfram 0x22 - wait 5 + wait 2 playfram 0x33 - wait 5 + wait 2 playfram 0x44 - wait 38 + wait 2 + playfram 0x55 + wait 2 + playfram 0x66 + wait 2 + playfram 0x77 + wait 2 + playfram 0x88 + wait 2 + playfram 0x99 + wait 45 sigorder 1 goto ScourgeLocal00 - -PhalanxSiegeBaseUnused1: - wait 1 - nobrkcodestart - playsnd 1699 - sprol 744 0 0 # Medium orange explosion reversed - playfram 5 - wait 12 - nobrkcodeend - goto ScourgeLocal00 -PhalanxSiegeBaseSpecialState2: - wait 38 - playsnd 319 # Terran\TANK\TTaTra01.WAV +Phalanx_Siege_BaseSpecialState2: + wait 45 + playsnd 319 # Terran\TANK\TTaTra01.WAV + playfram 0x88 + wait 2 + playfram 0x77 + wait 2 + playfram 0x66 + wait 2 + playfram 0x55 + wait 2 + playfram 0x44 + wait 2 playfram 0x33 - wait 5 + wait 2 playfram 0x22 - wait 5 + wait 2 playfram 0x11 - wait 5 + wait 2 playfram 0x00 - wait 5 + wait 2 sigorder 1 goto ScourgeLocal00 +Phalanx_Siege_BaseStarEditInit: + imgoluselo 254 2 0 # Phalanx (Siege) Turret (terran\stankt.grp) + goto Phalanx_Siege_BaseInit + # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: # 254 Phalanx (Siege) Turret (terran\stankt.grp) .headerstart IsId 93 Type 14 -Init PhalanxSiegeTurretInit +Init Phalanx_Siege_TurretInit Death ScourgeExplosionDeath -GndAttkInit PhalanxSiegeTurretGndAttkInit +GndAttkInit Phalanx_Siege_TurretGndAttkInit AirAttkInit [NONE] Unused1 [NONE] -GndAttkRpt PhalanxSiegeTurretGndAttkInit +GndAttkRpt Phalanx_Siege_TurretGndAttkInit AirAttkRpt [NONE] CastSpell [NONE] GndAttkToIdle ScourgeLocal00 @@ -7079,35 +7089,51 @@ Unused2 [NONE] Walking [NONE] WalkingToIdle ScourgeLocal00 SpecialState1 ScourgeLocal00 -SpecialState2 PhalanxSiegeTurretSpecialState2 +SpecialState2 Phalanx_Siege_TurretSpecialState2 AlmostBuilt [NONE] .headerend # ----------------------------------------------------------------------------- # -PhalanxSiegeTurretInit: +Phalanx_Siege_TurretInit: playfram 0x11 wait 1 nobrkcodestart - wait 38 - playsnd 318 # Terran\TANK\TTaTra00.WAV - wait 3 + wait 14 playfram 0x22 - wait 3 + wait 2 playfram 0x33 - wait 3 + wait 2 playfram 0x44 - wait 3 + wait 20 + playsnd 318 # Terran\TANK\TTaTra00.WAV + wait 6 playfram 0x55 - wait 3 + wait 1 + playfram 0x66 + wait 1 + playfram 0x77 + wait 1 + playfram 0x88 + wait 1 + playfram 0x99 + wait 1 + playfram 0xAA + wait 1 + playfram 0xBB + wait 1 + playfram 0xCC + wait 1 + playfram 0xDD + wait 1 playfram 0x00 nobrkcodeend goto ScourgeLocal00 -PhalanxSiegeTurretGndAttkInit: +Phalanx_Siege_TurretGndAttkInit: wait 1 nobrkcodestart playsnd 96 # Bullet\TTaFi200.wav - imgoluselo 537 2 0 # Siege Tank(Siege) Turret Attack Overlay (thingy\esiFire.grp) + imgoluselo 537 2 0 # Phalanx (Siege) Turret Attack Overlay (thingy\esiFire.grp) wait 2 attackwith 1 wait 1 @@ -7117,16 +7143,33 @@ PhalanxSiegeTurretGndAttkInit: ignorerest goto ScourgeLocal00 -PhalanxSiegeTurretSpecialState2: +Phalanx_Siege_TurretSpecialState2: playsnd 318 # Terran\TANK\TTaTra00.WAV + wait 6 + playfram 0xDD + wait 1 + playfram 0xCC + wait 1 + playfram 0xBB + wait 1 + playfram 0xAA + wait 1 + playfram 0x99 + wait 1 + playfram 0x88 + wait 1 + playfram 0x77 + wait 1 + playfram 0x66 + wait 1 playfram 0x55 - wait 3 + wait 1 playfram 0x44 - wait 3 + wait 30 playfram 0x33 - wait 3 + wait 2 playfram 0x22 - wait 3 + wait 2 playfram 0x11 goto ScourgeLocal00 diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 68234c05..ec7da4d9 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 2beaf485..aea3a5c6 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/terran/stank.grp b/mpq/unit/terran/stank.grp index 205491c7..40b275a4 100644 Binary files a/mpq/unit/terran/stank.grp and b/mpq/unit/terran/stank.grp differ diff --git a/mpq/unit/terran/stankt.grp b/mpq/unit/terran/stankt.grp index 0b5def51..4eb5be72 100644 Binary files a/mpq/unit/terran/stankt.grp and b/mpq/unit/terran/stankt.grp differ diff --git a/mpq/unit/terran/tank.grp b/mpq/unit/terran/tank.grp index 6d7f7db6..d358578d 100644 Binary files a/mpq/unit/terran/tank.grp and b/mpq/unit/terran/tank.grp differ diff --git a/mpq/unit/terran/tank.lol b/mpq/unit/terran/tank.lol new file mode 100644 index 00000000..9187f8df Binary files /dev/null and b/mpq/unit/terran/tank.lol differ diff --git a/mpq/unit/terran/tankt.grp b/mpq/unit/terran/tankt.grp new file mode 100644 index 00000000..489809f3 Binary files /dev/null and b/mpq/unit/terran/tankt.grp differ diff --git a/mpq/unit/terran/tstshad.grp b/mpq/unit/terran/tstshad.grp index 0ed3d8dd..c5137639 100644 Binary files a/mpq/unit/terran/tstshad.grp and b/mpq/unit/terran/tstshad.grp differ diff --git a/mpq/unit/terran/ttashad.grp b/mpq/unit/terran/ttashad.grp new file mode 100644 index 00000000..74166518 Binary files /dev/null and b/mpq/unit/terran/ttashad.grp differ diff --git a/patchnotes.md b/patchnotes.md index 4f3b8503..b136a3d5 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,8 +1,25 @@ -# XX June 2023 - prospective patch notes +# 24 June 2023 - prospective patch notes ## Designer's Notes -TBD +Welcome to yet another update that changes the economy!!! + +This update actually brings harvesting a bit further in line with how stock Brood War works. You still have improved wandering behavior that keeps your workers more passively efficient than the silliness present in the vanilla game, but we once again leverage depleting resource nodes to further incentivize expansions and reduce the degree to which games can become static on low base counts. + +It is important to note that only mineral nodes will ever become depleted, at which point they will provide half the yield they previously had. This update does away with variable yields, instead allowing mapmakers to control how long players have before a mineral node becomes depleted. A general rule of thumb for mapmakers to keep in mind is that a saturated mineral field will lose 100 minerals per minute, so adjust your bases accordingly! + +## Resources +- Harvesting: + - Harvest time now 2 seconds + - Worker saturation now ~2.5 per node +- Minerals: + - Base mineral yield now 4, from 8 + - Minerals now deplete to a yield of 2 (and no collision) after being mined out +- Vespene: + - Ridge yield now 2 + - Uncapped geyser yield now 4 + - Tier 2 capped yield now 5 + - Tier 3 capped yield now 6 ## Audiovisuals - New sprites for: diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index f45cd561..d51461b9 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ