diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 0631f514..ad7a30f6 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 3edbfa69..5936c304 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -414,7 +414,7 @@ Future Station Keskathalor Spores Seeker Spores Double Silent Kagralisk -Izkag Iteth +Alkag Iteth Kagralisk Venom Neutron Flare Impact Silent Evigrilisk @@ -509,8 +509,8 @@ Nathrelisk Iziralisk Anchor (Grounded) Carapace Swarm (Small) -Extended Flingy #303 -Extended Flingy #304 +Chokralgant Chazsal +Algoztalisk Extended Flingy #305 Extended Flingy #306 Extended Flingy #307 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index f72762d7..672f3181 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 5f67f0ab..a146daab 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 826076a1..1eff6b5f 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1533,8 +1533,8 @@ Kagralisk Shadow Kagralisk Remains Matador (Tank Mode) Shadow Kagralisk Weaponhit -Izkag Iteth -Izkag Iteth Shadow +Alkag Iteth +Alkag Iteth Shadow Kagralisk Venom Kagralisk Birth Neutron Flare Blue Damageless @@ -1809,14 +1809,14 @@ Addon Weld Overlay Repentant Chorus Small Repentant Chorus Medium Repentant Chorus Large -Extended Image #809 -Extended Image #810 -Extended Image #811 -Extended Image #812 -Extended Image #813 -Extended Image #814 -Extended Image #815 -Extended Image #816 +Chokralgant Chaszal +Chokralgant Chaszal Shadow +Algoztalisk +Algoztalisk Shadow +Okrimnilisk +Okrimnilisk Shadow +Cherbrathalor +Cherbrathalor Shadow Extended Image #817 Extended Image #818 Extended Image #819 diff --git a/mpq/arr/orders.datex b/mpq/arr/orders.datex index 8e39b4d9..56369bad 100644 Binary files a/mpq/arr/orders.datex and b/mpq/arr/orders.datex differ diff --git a/mpq/arr/orders.txt b/mpq/arr/orders.txt index dbd048a1..3d7ae00e 100644 --- a/mpq/arr/orders.txt +++ b/mpq/arr/orders.txt @@ -178,7 +178,7 @@ Use Ability (Heal) Move (Medic) Hold Position&Heal (Medic) Return To Idle After Heal -Use Ability (Tertiary Eyes) +Use Ability (Through the Looking Glass) Use Ability (Disruption Web) Use Ability (Tyranny) Dark Archon Meld @@ -187,7 +187,7 @@ Use Ability (Optical Flare) Use Ability (Maelstrom) Move (Junk Yard Dog) Fatal -Cast Through the Looking Glass +Extended Order #1 Extended Order #2 Extended Order #3 Extended Order #4 diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 7b3a31bf..abe1e9fb 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -2943,12 +2943,12 @@ ISN Advisor Addon 01 ISN Advisor Addon 02 ISN Advisor Addon Abandon 01 ISN Advisor Addon Abandon 02 -ISN Advisor Ally Under Attack T 01 -ISN Advisor Ally Under Attack T 02 -ISN Advisor Ally Under Attack T 03 ISN Advisor Ally Under Attack P 01 ISN Advisor Ally Under Attack P 02 ISN Advisor Ally Under Attack P 03 +ISN Advisor Ally Under Attack T 01 +ISN Advisor Ally Under Attack T 02 +ISN Advisor Ally Under Attack T 03 ISN Advisor Ally Under Attack Z 01 ISN Advisor Ally Under Attack Z 02 ISN Advisor Ally Under Attack Z 03 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index ec23ab51..010ba964 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 ae8a19c6..d1a29cae 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -779,7 +779,7 @@ Keskathalor Spores Seeker Spores Double Silent Kagralisk Kagralisk Remnants -Izkag Iteth +Alkag Iteth Kagralisk Venom Neutron Flare Blue Damageless Evigrilisk @@ -900,8 +900,8 @@ Iziralisk Anchor (Grounded) Carapace Swarm (Small) Fusion Cutter Hit Damageless -Extended Sprite #1 -Extended Sprite #1 +Chokralgant Chaszal +Algoztalisk Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 80c43134..ec510f9e 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 5defb002..cc4e96ad 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 ec1625ba..41a35adb 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -210,10 +210,10 @@ Dispatch Shotgun (Hotshot) Quarternary Rifle (Auriel) Phase Blade (Adherent) Signaling Spores (Nathrelisk) -Extended Weapon #83 -Extended Weapon #84 -Extended Weapon #85 -Extended Weapon #86 +Bottomless Spinestacks (Algoztalisk) +Relentless Tendrils (Okrimnilisk) +Omnispores (Okrimnilisk) +Venemous Bursts (Cherbrathalor) Extended Weapon #87 Extended Weapon #88 Extended Weapon #89 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 24ff78a5..55817e61 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Orders.graft b/mpq/datreq/Orders.graft index 79627f8a..c6b9ac10 100644 Binary files a/mpq/datreq/Orders.graft and b/mpq/datreq/Orders.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 9158d5c6..fc271205 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 544192fd..e0b555b4 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 d7fea84d..25e99c04 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 365d735a..9656fb15 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/samase/config.ini b/mpq/samase/config.ini index 41f2a485..afcb5994 100644 --- a/mpq/samase/config.ini +++ b/mpq/samase/config.ini @@ -48,7 +48,7 @@ unit_morph_prerequisites = Add(protathalor, sovroleth, 1) unit_morph_prerequisites = Add(mutalisk, tosgrilisk, 1) unit_morph_prerequisites = Add(hydralisk, bactalisk, 1) unit_morph_prerequisites = Add(izirokor, tethzorokor, 1) -#unit_morph_prerequisites = Add(iziralisk, tethzorokor, 1) +unit_morph_prerequisites = Add(iziralisk, tethzorokor, 1) unit_morph_prerequisites = Add(skithrokor, vithrilisk, 1) unit_morph_prerequisites = Add(geszithalor, alkajelisk, 1) unit_morph_prerequisites = Add(konvilisk, tetcaerokor, 1) @@ -76,6 +76,7 @@ equivalent_ids = Add(vornath_pond, kalkiir_lake) equivalent_ids = Add(hydrith_den, skibact_scab) equivalent_ids = Add(hydrith_den, tethvith_swamp) equivalent_ids = Add(skibact_scab, tethvith_swamp) +equivalent_ids = Add(alkag_iteth, chokgralgant_chaszal) equivalent_ids = Add(mutath_spire, tosvrol_haunt) equivalent_ids = Add(matravil_nest, almakis_antre) equivalent_ids = Add(zorkiz_shroud, ultrav_cavern) @@ -93,7 +94,7 @@ morph_train_ai = Add(mutalisk, tosgrilisk) morph_train_ai = Remove(mutalisk, vithrilisk) morph_train_ai = Add(hydralisk, bactalisk) morph_train_ai = Add(izirokor, tethzorokor) -#morph_train_ai = Add(iziralisk, tethzorokor) +morph_train_ai = Add(iziralisk, tethzorokor) morph_train_ai = Add(skithrokor, vithrilisk) morph_train_ai = Add(geszithalor, alkajelisk) morph_train_ai = Add(konvilisk, tetcaerokor) diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index 5e11f536..ce4843e6 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -17,6 +17,19 @@ building right_upper_door = 206 # Special building special_control_node = 192 +building crashed_minotaur = 335 +building psi_disruptor = 336 +building power_generator = 337 +building overmind = 338 +building overmind_shell = 339 +building mature_chrysalis = 340 +building cerebrate = 341 +building overmind_cocoon = 342 +building khaydarin_formation = 343 +building protoss_temple = 344 +building xelnaga_temple = 345 +building warp_gate = 346 +building stasis_cell = 347 # Terran factional units military cohort = 50 diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index a720f0ce..fabdca6e 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -7291,11 +7291,11 @@ FountainheadOverlayDeath: # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: -# 266 Barracks (terran\TBarrack.grp) +# 266 Stockade (terran\TBarrack.grp) .headerstart IsId 96 Type 24 -Init BarracksInit +Init StockadeInit Death InfestedMinistryDeath GndAttkInit [NONE] AirAttkInit [NONE] @@ -7308,40 +7308,40 @@ AirAttkToIdle [NONE] Unused2 [NONE] Walking InfestedTerranLocal00 WalkingToIdle InfestedTerranLocal00 -SpecialState1 BarracksSpecialState1 +SpecialState1 StockadeSpecialState1 SpecialState2 [NONE] -AlmostBuilt BarracksAlmostBuilt -Built BarracksBuilt -Landing BarracksLanding -LiftOff BarracksLiftOff -IsWorking BarracksIsWorking -WorkingToIdle BarracksBuilt +AlmostBuilt StockadeAlmostBuilt +Built StockadeBuilt +Landing StockadeLanding +LiftOff StockadeLiftOff +IsWorking StockadeIsWorking +WorkingToIdle StockadeBuilt WarpIn [NONE] Unused3 [NONE] StarEditInit [NONE] -Disable BarracksDisable +Disable StockadeDisable Burrow [NONE] .headerend # ----------------------------------------------------------------------------- # -BarracksInit: +StockadeInit: playfram 0x00 - imgul 267 0 0 # Barracks Shadow (terran\tbrShad.grp) + imgul 267 0 0 # Stockade Shadow (terran\tbrShad.grp) goto InfestedTerranLocal00 -BarracksSpecialState1: +StockadeSpecialState1: playfram 4 goto InfestedTerranLocal00 -BarracksAlmostBuilt: +StockadeAlmostBuilt: playfram 1 goto InfestedTerranLocal00 -BarracksBuilt: +StockadeBuilt: playfram 0x00 goto InfestedTerranLocal00 -BarracksLanding: +StockadeLanding: nobrkcodestart wait 15 playsnd 472 # Misc\Land.WAV @@ -7358,7 +7358,7 @@ BarracksLanding: nobrkcodeend goto InfestedTerranLocal00 -BarracksLiftOff: +StockadeLiftOff: nobrkcodestart playsnd 471 # Misc\LiftOff.WAV playfram 5 @@ -7372,7 +7372,7 @@ BarracksLiftOff: nobrkcodeend goto InfestedTerranLocal00 -BarracksIsWorking: +StockadeIsWorking: playfram 7 wait 4 playfram 8 @@ -7387,9 +7387,9 @@ BarracksIsWorking: wait 2 playfram 7 wait 2 - goto BarracksIsWorking + goto StockadeIsWorking -BarracksDisable: +StockadeDisable: goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # @@ -22352,14 +22352,14 @@ AcidSpores_6_9_OverlayInit: wait 2 tmprmgraphicend AcidSpores_6_9_OverlayLocal00: - playfram 0xcc # Frame set 12 - wait 2 - playfram 0xdd # Frame set 13 - wait 2 - playfram 0xee # Frame set 14 - wait 2 - playfram 0xff # Frame set 15 - wait 2 + playfram 0xcc + wait 2 + playfram 0xdd + wait 2 + playfram 0xee + wait 2 + playfram 0xff + wait 2 goto AcidSpores_6_9_OverlayLocal00 # ----------------------------------------------------------------------------- # @@ -22379,9 +22379,9 @@ Death [NONE] # ----------------------------------------------------------------------------- # IceDoodadInit: - playfram 0x00 # Frame set 0 - setflipstate 1 - imgulnextid 0 0 + playfram 0x00 + setflipstate 1 + imgulnextid 0 0 goto InfestedTerranLocal00 # ----------------------------------------------------------------------------- # @@ -51970,4 +51970,60 @@ AnchorGroundedInit: imgul 1805 0 0 # Anchor (Grounded) Shadow (cm\terran\anchor-grounded-shadow.grp) goto AnchorBuilt -## Next free IsId: 771 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1813 Algoztalisk (cm\zerg\algoztalisk.grp) +.headerstart +IsId 771 +Type 12 +Init AlgoztaliskInit +Death GeszithalorDeath +GndAttkInit AlgoztaliskGndAttkInit +AirAttkInit AlgoztaliskGndAttkInit +Unused1 GeszithalorUnused1 +GndAttkRpt AlgoztaliskGndAttkInit +AirAttkRpt AlgoztaliskGndAttkInit +CastSpell [NONE] +GndAttkToIdle AlgoztaliskGndAttkToIdle +AirAttkToIdle AlgoztaliskGndAttkToIdle +Unused2 [NONE] +Walking AlgoztaliskWalking +WalkingToIdle AlgoztaliskGndAttkToIdle +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +AlgoztaliskInit: + imgul 1814 0 42 # Algoztalisk Shadow (cm\zerg\algoztalisk.grp).grp) + playfram 0x00 + wait 2 +AlgoztaliskGndAttkToIdle: + playfram 0x11 + wait 2 + playfram 0x22 + wait 2 + playfram 0x33 + wait 2 + playfram 0x00 + wait 2 + goto AlgoztaliskGndAttkToIdle + +AlgoztaliskGndAttkInit: + playsndbtwn 1295 1296 # Gorgrokor weapon fire 01, 02 + wait 1 + attackwith 1 + gotorepeatattk + goto AlgoztaliskGndAttkToIdle + +AlgoztaliskWalking: + playfram 0x11 + wait 1 + playfram 0x22 + wait 1 + playfram 0x33 + wait 1 + playfram 0x00 + wait 1 + goto AlgoztaliskWalking + +## Next free IsId: 772 \ No newline at end of file diff --git a/mpq/unit/cm/zerg/cherbrathalor-shadow.grp b/mpq/unit/cm/zerg/cherbrathalor-shadow.grp new file mode 100644 index 00000000..0059e37e Binary files /dev/null and b/mpq/unit/cm/zerg/cherbrathalor-shadow.grp differ diff --git a/mpq/unit/cm/zerg/cherbrathalor.grp b/mpq/unit/cm/zerg/cherbrathalor.grp new file mode 100644 index 00000000..848afc43 Binary files /dev/null and b/mpq/unit/cm/zerg/cherbrathalor.grp differ diff --git a/mpq/unit/cm/zerg/chokralgant-chaszal.grp b/mpq/unit/cm/zerg/chokralgant-chaszal.grp new file mode 100644 index 00000000..8906f249 Binary files /dev/null and b/mpq/unit/cm/zerg/chokralgant-chaszal.grp differ diff --git a/mpq/unit/cm/zerg/okrimnilisk.grp b/mpq/unit/cm/zerg/okrimnilisk.grp new file mode 100644 index 00000000..0059e37e Binary files /dev/null and b/mpq/unit/cm/zerg/okrimnilisk.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 07f15103..e6f7a1c5 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 25a803de..3b4f7de8 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 5c87b795..c10404ba 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -13,6 +13,7 @@ This patch includes stability and bugfixes, audiovisual improvements, and (event ## UI - CTRL+Q is no longer used to open the 'Quit' menu (ALT+Q can still be used for this) +- Aggressive unit responses are now used when issuing attack move orders - Players starting or completing tech tier structures will emit a minimap ping for witnesses or replay viewers ## Bugfixes @@ -26,5 +27,14 @@ This patch includes stability and bugfixes, audiovisual improvements, and (event - Khaydarin Crystal Formation is no longer invincible by default - Audiovisuals: - Fixed flipped coordinates in right-click minimap markers + - Updated icons for Ecclesiast, Charlatan, Potentate, and Monument of Sin - Reimplemented animation and shadow for Power Generator - - Corrected death animations for Power Generator, Overmind Cocoon, Overmind (with Shell), and Khaydarin Crystal Formation \ No newline at end of file + - Corrected death animations for Power Generator, Overmind Cocoon, Overmind (with Shell), and Khaydarin Crystal Formation + +## Zerg +- [Almaksalisk](): + - Sight range now 8, from 9 +- **NEW: [Algoztalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/algoztalisk)**: + - Relentless corvette strain; mutated from Almaksalisk; requires Chokral Chazsal +- **NEW: [Chokral Chaszal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/chokral-chazsal)**: + - Overwhelming assault node; mutated from Alkag Iteth \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 5c3dc2c6..d82a968d 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ