diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 880e579e..de9d0e54 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 2e754720..a8168f03 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/samase/config.ini b/mpq/samase/config.ini index 3d37f148..99bf393f 100644 --- a/mpq/samase/config.ini +++ b/mpq/samase/config.ini @@ -68,8 +68,12 @@ equivalent_ids = Add(surkith_cesiant, skortrith_cesiant) equivalent_ids = Add(larvosk_cesiant, ocsal_cesiant) equivalent_ids = Add(irol_iris, othstol_oviform) equivalent_ids = Add(othstol_oviform, orboth_omlia) +equivalent_ids = Add(quazeth_pool, nathrok_lake) equivalent_ids = Add(quazeth_pool, kalkiir_pond) +equivalent_ids = Add(nathrok_lake, kalkiir_pond) +equivalent_ids = Add(hydrith_den, skithrok_scab) equivalent_ids = Add(hydrith_den, bactith_swamp) +equivalent_ids = Add(skithrok_scab, bactith_swamp) equivalent_ids = Add(mutath_spire, tosvrol_haunt) equivalent_ids = Add(matravil_nest, almakis_antre) equivalent_ids = Add(zorkiz_shroud, ultrav_cavern) diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 4ec10b53..8d825ea7 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index 4b01750b..887b119a 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -5323,12 +5323,14 @@ HarakanGndAttkRpt: nobrkcodestart imgol 421 0 0 # FlameThrower (thingy\flamer.grp) playfram 0x20 - sigorder 32 attkshiftproj 24 + sigorder 32 wait 1 attkshiftproj 52 + sigorder 32 wait 1 attkshiftproj 80 + sigorder 32 wait 5 playfram 0x00 wait 2 @@ -30073,10 +30075,10 @@ Type 21 Init PariahInit Death PariahDeath GndAttkInit PariahGndAttkInit -AirAttkInit PariahAirAttkInit +AirAttkInit PariahGndAttkInit Unused1 [NONE] GndAttkRpt PariahGndAttkInit -AirAttkRpt PariahAirAttkInit +AirAttkRpt PariahGndAttkInit CastSpell [NONE] GndAttkToIdle PariahGndAttkToIdle AirAttkToIdle PariahGndAttkToIdle @@ -30098,7 +30100,7 @@ WarpIn PariahWarpIn PariahInit: imgul 1192 0 2 # Pariah Shadow (cm\protoss\pariah-shadow.grp) PariahWalkingToIdle: - playfram 0xdd # Frame set 13 + playfram 0xdd wait 1 PariahLocal00: wait 125 @@ -30116,87 +30118,41 @@ PariahDeath: PariahGndAttkInit: playfram 0xdd - wait 1 + wait 1 nobrkcodestart playfram 0xee - wait 1 + wait 1 playfram 0xff - wait 1 + wait 1 playfram 0x110 playsndbtwn 1447 1449 # Pariah weapon fire 01, 02, 03 - imgoluselo 1195 0 0 - attkshiftproj 16 - wait 1 + imgoluselo 1195 0 0 # Blue projection blade + attkshiftproj 24 + wait 1 attkshiftproj 48 - sigorder 32 wait 1 playfram 0x121 - attkshiftproj 80 + attkshiftproj 72 sigorder 32 - wait 1 + wait 1 playfram 0x132 - attkshiftproj 112 - wait 1 + attkshiftproj 100 + wait 1 playfram 0x143 - sigorder 32 wait 1 - imgoluselo 1195 0 0 - attkshiftproj 16 - wait 1 + imgoluselo 1195 0 0 # Blue projection blade + attkshiftproj 24 + wait 1 attkshiftproj 48 sigorder 32 wait 1 playfram 0x154 - attkshiftproj 80 - sigorder 32 + attkshiftproj 72 wait 1 playfram 0xdd - attkshiftproj 112 - wait 1 - sigorder 32 - nobrkcodeend - gotorepeatattk - goto PariahGndAttkToIdle - -PariahAirAttkInit: - playfram 0xdd - wait 1 - nobrkcodestart - playfram 0xee - wait 1 - playfram 0xff - wait 1 - playfram 0x110 - playsndbtwn 1447 1449 # Pariah weapon fire 01, 02, 03 - imgoluselo 1195 0 0 - attkshiftproj 16 - wait 1 - attkshiftproj 48 + attkshiftproj 100 sigorder 32 wait 1 - playfram 0x121 - attkshiftproj 80 - sigorder 32 - wait 1 - playfram 0x132 - attkshiftproj 112 - wait 1 - playfram 0x143 - sigorder 32 - wait 1 - imgoluselo 1195 0 0 - attkshiftproj 16 - wait 1 - attkshiftproj 48 - wait 1 - playfram 0x154 - attkshiftproj 80 - sigorder 32 - wait 1 - playfram 0xdd - attkshiftproj 112 - wait 1 - sigorder 32 nobrkcodeend gotorepeatattk goto PariahGndAttkToIdle @@ -39466,21 +39422,24 @@ StrigaGndAttkInit: wait 1 playfram 0x99 playsndbtwn 1615 1616 # Striga weapon fire 01, 02 - imgoluselo 1768 0 0 + imgoluselo 1768 0 0 # Orange projection blade attkshiftproj 24 + sigorder 32 wait 1 playfram 0xaa attkshiftproj 48 + sigorder 32 wait 1 playfram 0xbb attkshiftproj 72 + sigorder 32 wait 1 playfram 0xcc attkshiftproj 100 + sigorder 32 wait 1 playfram 0xdd wait 1 - sigorder 32 nobrkcodeend gotorepeatattk goto StrigaGndAttkToIdle @@ -47696,11 +47655,14 @@ DurendalGndAttkRpt: playfram 0x260 imgol 421 0 0 # FlameThrower (thingy\flamer.grp) attkshiftproj 24 + sigorder 32 wait 1 playfram 0x280 attkshiftproj 52 + sigorder 32 wait 1 attkshiftproj 80 + sigorder 32 wait 6 nobrkcodeend gotorepeatattk @@ -50289,8 +50251,8 @@ Death MatadorCinderModeDeath GndAttkInit MatadorCinderModeGndAttkInit AirAttkInit MatadorCinderModeGndAttkInit Unused1 MatadorCinderModeUnused1 -GndAttkRpt MatadorCinderModeGndAttkInit -AirAttkRpt MatadorCinderModeGndAttkInit +GndAttkRpt [NONE] +AirAttkRpt [NONE] CastSpell [NONE] GndAttkToIdle MatadorCinderModeGndAttkToIdle AirAttkToIdle MatadorCinderModeGndAttkToIdle @@ -50361,12 +50323,15 @@ MatadorCinderModeGndAttkInit: playsndbtwn 2161 2163 # Matador weaponfire 01, 02, 03 imgol 421 0 0 # FlameThrower (thingy\flamer.grp) attkshiftproj 24 + sigorder 32 wait 1 playfram 0x180 attkshiftproj 52 + sigorder 32 wait 1 attkshiftproj 80 - wait 1 + sigorder 32 + wait 4 playfram 0x180 nobrkcodeend gotorepeatattk diff --git a/mpq/unit/cm/zerg/skithrok-scab.grp b/mpq/unit/cm/zerg/skithrok-scab.grp index 2d00c0eb..37137fb5 100644 Binary files a/mpq/unit/cm/zerg/skithrok-scab.grp and b/mpq/unit/cm/zerg/skithrok-scab.grp differ diff --git a/patchnotes.md b/patchnotes.md index 19707a7e..5470dc70 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -16,6 +16,8 @@ Patch goals include: - [Ascension #7 - A Final Ascent](https://www.youtube.com/playlist?list=PLACFHAM2MlxN8pAhSHiAcq34rUfLiUpXz) - [Pr0totype #33 - Throwing Down the Gauntlet](https://youtu.be/sAtBPzaKwwQ) - [Pr0totype #34 - The Heights of Competition](https://youtu.be/iqCUmPU4Vg4) +- [Pr0totype #35 - Hanging in the Balance...](https://youtu.be/_ow8h03x6FE) +- [Pr0totype #36 - And Then, We Ascended.](https://youtu.be/Z5a3upLGIds) ## Patch summary @@ -53,6 +55,7 @@ Patch goals include: - Stability: - Protected against a rare client-side nullsprite crash (r. Veeq7) - Gameplay: + - Prospectively fixed a rare harvesting issue related to gas nodes (r. DeadInfested) - Fixed mnemonic hotkey conflict between Analogue and Architect (r. DF) - Audiovisual: - "Addon complete" notifications now correctly play for Lodestones when players have no custom advisor set @@ -102,6 +105,16 @@ Patch goals include: - Weapon damage now 1x8, from 2x6 - Armor penetration now 0, from 2 - Weapon cooldown now 0.75, from 0.833 +- [Matador](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/matador): + - Twinstrike Flamethrowers: + - Weapon damage now 1x10, from 2x8 + - Armor penetration now 0, from 2 +- [Durendal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/durendal): + - Time cost now 30, from 35 + - HP now 240, from 225 + - Abaddon Flamethrowers: + - Weapon damage now 1x12, from 2x10 + - Armor penetration now 0, from 2 - [Cataphract](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cataphract): - Transport weight now 6, from 4 - [Seraph](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/seraph): @@ -130,7 +143,6 @@ Patch goals include: - Now slows movement speed by 33% and 66%, from 50% and 75% - Now slows attack rate by 33% and 66%, from 25% and 50% - [Nathrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/nathrokor): - - Gas and time costs now 25/28, from 50/25 - Now also enabled by Nathrok Lake; No longer enabled by Quazeth Pool - [Vorvrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vorvrokor): - Adrenal Surge (movement speed towards hostiles) removed diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 8f8f0aed..4b276746 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ