diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 8381cc83..32a1140e 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 9f4ab405..002fba99 100644 Binary files a/mpq/arr/images.tbl and b/mpq/arr/images.tbl differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 719b06c7..4eff90e9 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 3c456148..1c15ff7d 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -581,21 +581,21 @@ Askosi Domain Terran Maverick (Golden) Terran Shaman (Support, Upstart) Terran Shaman (Adrenaline, Upstart) -Extended Unit #356 -Extended Unit #357 -Extended Unit #358 -Extended Unit #359 -Extended Unit #360 -Extended Unit #361 -Extended Unit #362 +Askosi Insurant +Askosi Silversoul +Askosi Ghostwrit +Askosi Azjoran +Askosi Elgird +Askosi Histrion +Askosi Egocent Extended Unit #363 -Extended Unit #364 +Askosi Begolor Extended Unit #365 Extended Unit #366 Extended Unit #367 Extended Unit #368 -Extended Unit #369 -Extended Unit #370 +Askosi Lekrot +Askosi Hearthshard Extended Unit #371 Extended Unit #372 Extended Unit #373 diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 2a08f707..c203b230 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 22cdc20d..8a889f00 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index 2c51fd2f..ad3d277f 100644 Binary files a/mpq/scripts/iscript_askosi.bin and b/mpq/scripts/iscript_askosi.bin differ diff --git a/mpq/scripts/iscript_askosi.txt b/mpq/scripts/iscript_askosi.txt index 219d0981..46eaf94b 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -19,7 +19,7 @@ Walking [NONE] WalkingToIdle [NONE] SpecialState1 [NONE] SpecialState2 [NONE] -AlmostBuilt SkryrokorLocal00 +AlmostBuilt LandlockAlmostBuilt Built LandlockBuilt Landing [NONE] LiftOff [NONE] @@ -46,6 +46,10 @@ LandlockDeath: LandlockBuilt: imgol 1820 0 0 # Architect weaponfire channel goto SkryrokorLocal00 + +LandlockAlmostBuilt: + playfram 8 + goto SkryrokorLocal00 LandlockIsWorking: playfram 1 @@ -435,7 +439,7 @@ RadixSpecialState1: goto SkryrokorLocal00 RadixAlmostBuilt: - playfram 0 + playfram 2 goto SkryrokorLocal00 RadixBuilt: @@ -1884,7 +1888,7 @@ Walking [NONE] WalkingToIdle SkryrokorLocal00 SpecialState1 [NONE] SpecialState2 GrandstandSpecialState2 -AlmostBuilt GrandstandBuilt +AlmostBuilt GrandstandAlmostBuilt Built GrandstandBuilt Landing [NONE] LiftOff [NONE] @@ -1913,6 +1917,10 @@ GrandstandBuilt: wait 255 goto GrandstandBuilt +GrandstandAlmostBuilt: + playfram 1 + goto SkryrokorLocal00 + GrandstandGndAttkInit: playfram 0 wait 1 diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index b8f1964f..d70c8548 100644 Binary files a/mpq/scripts/iscript_terran.bin and b/mpq/scripts/iscript_terran.bin differ diff --git a/mpq/scripts/iscript_terran.txt b/mpq/scripts/iscript_terran.txt index c96ed6c6..55ef5321 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -13078,147 +13078,77 @@ SpecialState1 [NONE] # ----------------------------------------------------------------------------- # AutocratInit: - imgul 1397 0 0 # Autocrat Shadow (terran\autocrat-shad.grp) + imgulnextid 0 0 # Autocrat Shadow (cm\terran\autocrat-shadow.grp) AutocratWalkingToIdle: playfram 0x00 -AutocratLocal00: - wait 62 - randcondjmp 25 AutocratLocal01 - randcondjmp 128 AutocratLocal01 - goto AutocratLocal00 - -AutocratLocal01: - playfram 0x00 - wait 1 - playfram 0x11 - wait 1 - playfram 0x22 - randcondjmp 192 AutocratLocal03 - turnccwise 2 - wait 3 - turnccwise 2 - wait 3 - turnccwise 2 - wait 3 - turnccwise 2 - wait 3 - turnccwise 2 - wait 3 - wait 6 - turncwise 2 - wait 3 - turncwise 2 - wait 3 - turncwise 2 - wait 3 - turncwise 2 - wait 3 - turncwise 2 - wait 3 - wait 6 - turnccwise 2 - wait 3 - turnccwise 2 - wait 3 - turnccwise 2 - wait 3 - goto AutocratLocal04 - -AutocratLocal04: - playfram 0x11 - wait 1 - playfram 0x00 - wait 1 - goto AutocratWalkingToIdle - -AutocratLocal03: - wait 13 - playfram 0x11 - wait 1 - playfram 0x00 - wait 1 - goto AutocratWalkingToIdle + goto SkryrokorLocal00 AutocratDeath: - playsnd 238 # Terran\Ghost\TGhDth00.wav + playsndbtwn 276 277 # Terran\MARINE\TMaDth00.WAV | Terran\MARINE\TMaDth01.WAV setfldirect 0 playfram 0x00 imgol 3 0 0 # Skryrokor Death (zerg\zavDeath.grp) wait 5 - imgol 3 0 0 # Skryrokor Death (zerg\zavDeath.grp) - wait 5 - imgol 3 0 0 # Skryrokor Death (zerg\zavDeath.grp) - wait 5 - imgol 3 0 0 # Skryrokor Death (zerg\zavDeath.grp) - wait 5 - imgol 3 0 0 # Skryrokor Death (zerg\zavDeath.grp) - wait 5 - lowsprul 230 0 0 # Eidolon Remnants (terran\tghDeath.grp) + lowsprul 236 0 0 # Maverick Remnants (terran\tmaDeath.grp) + wait 1 end -AutocratUnused1: - wait 1 - nobrkcodestart - setfldirect 0 - playsnd 1166 # Eidolon revive 01 - sprol 742 0 0 # Explosion Small Reversed - setfldirect 12 - wait 24 - nobrkcodeend - goto EidolonWalkingToIdle - AutocratGndAttkInit: - playfram 0xaa - wait 1 + playfram 0x100 + wait 1 + playfram 0x140 + wait 1 + playfram 0x180 sigorder 32 wait 22 AutocratGndAttkRpt: - wait 2 + wait 2 nobrkcodestart playsndbtwn 1474 1478 # Autocrat weaponfire 01 attack - playfram 0x99 + playfram 0x1A0 wait 1 - playfram 0xaa + playfram 0x180 wait 3 playsndbtwn 1474 1478 # Autocrat weaponfire 01 attack - playfram 0x99 + playfram 0x1A0 wait 1 - playfram 0xaa + playfram 0x180 nobrkcodeend gotorepeatattk ignorerest AutocratGndAttkToIdle: - playfram 0x00 - wait 1 + playfram 0x140 + wait 1 + playfram 0x120 + wait 1 + playfram 0x100 + wait 1 goto AutocratWalkingToIdle AutocratWalking: + playfram 0x40 move 4 wait 1 - playfram 0x11 + playfram 0x60 move 4 wait 1 - playfram 0x22 + playfram 0x80 move 4 wait 1 - playfram 0x33 + playfram 0xA0 move 4 wait 1 - playfram 0x44 - move 4 - wait 1 - playfram 0x55 + playfram 0xC0 move 4 wait 1 - playfram 0x66 + playfram 0xE0 move 4 wait 1 - playfram 0x77 + playfram 0x20 move 4 wait 1 - playfram 0x88 goto AutocratWalking # ----------------------------------------------------------------------------- # @@ -17947,25 +17877,25 @@ HelixBoltDeath: IsId 764 Type 12 Init HotshotInit -Death MadcapDeath -GndAttkInit MadcapGndAttkInit -AirAttkInit MadcapGndAttkInit +Death AutocratDeath +GndAttkInit AutocratGndAttkInit +AirAttkInit AutocratGndAttkInit Unused1 SkryrokorLocal00 -GndAttkRpt MadcapGndAttkRpt -AirAttkRpt MadcapGndAttkRpt +GndAttkRpt AutocratGndAttkRpt +AirAttkRpt AutocratGndAttkRpt CastSpell [NONE] -GndAttkToIdle MadcapGndAttkToIdle -AirAttkToIdle MadcapGndAttkToIdle +GndAttkToIdle AutocratGndAttkToIdle +AirAttkToIdle AutocratGndAttkToIdle Unused2 [NONE] -Walking MadcapWalking -WalkingToIdle MadcapWalkingToIdle +Walking AutocratWalking +WalkingToIdle AutocratWalkingToIdle SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # HotshotInit: imgul 1777 0 0 # Hotshot Shadow (cm\faction-t\hotshot-shadow.grp) - goto MadcapWalkingToIdle + goto AutocratWalkingToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: @@ -19148,25 +19078,25 @@ MaelstromHitInit: IsId 828 Type 12 Init BlackguardInit -Death MadcapDeath +Death AutocratDeath GndAttkInit BlackguardGndAttkInit AirAttkInit BlackguardGndAttkInit Unused1 SkryrokorLocal00 GndAttkRpt BlackguardGndAttkRpt AirAttkRpt BlackguardGndAttkRpt CastSpell [NONE] -GndAttkToIdle MadcapGndAttkToIdle -AirAttkToIdle MadcapGndAttkToIdle +GndAttkToIdle AutocratGndAttkToIdle +AirAttkToIdle AutocratGndAttkToIdle Unused2 [NONE] -Walking MadcapWalking -WalkingToIdle MadcapWalkingToIdle +Walking AutocratWalking +WalkingToIdle AutocratWalkingToIdle SpecialState1 [NONE] .headerend # ----------------------------------------------------------------------------- # BlackguardInit: imgul 2049 0 0 # Blackguard Shadow (cm\faction-t\blackguard-shadow.grp) - goto MadcapWalkingToIdle + goto AutocratWalkingToIdle BlackguardGndAttkInit: playfram 0x100 @@ -19188,7 +19118,7 @@ BlackguardGndAttkRpt: nobrkcodeend gotorepeatattk ignorerest - goto MadcapGndAttkToIdle + goto AutocratGndAttkToIdle # ----------------------------------------------------------------------------- # # This header is used by images.dat entries: diff --git a/mpq/unit/cm/a/endbore.grp b/mpq/unit/cm/a/endbore.grp new file mode 100644 index 00000000..79b913e8 Binary files /dev/null and b/mpq/unit/cm/a/endbore.grp differ diff --git a/mpq/unit/cm/a/grandstand-damage.lof b/mpq/unit/cm/a/grandstand-damage.lof index f976962e..fac81ed8 100644 Binary files a/mpq/unit/cm/a/grandstand-damage.lof and b/mpq/unit/cm/a/grandstand-damage.lof differ diff --git a/mpq/unit/cm/a/grandstand-shadow.grp b/mpq/unit/cm/a/grandstand-shadow.grp index e6036eab..851c933a 100644 Binary files a/mpq/unit/cm/a/grandstand-shadow.grp and b/mpq/unit/cm/a/grandstand-shadow.grp differ diff --git a/mpq/unit/cm/a/grandstand.grp b/mpq/unit/cm/a/grandstand.grp index 441f05c4..563d2896 100644 Binary files a/mpq/unit/cm/a/grandstand.grp and b/mpq/unit/cm/a/grandstand.grp differ diff --git a/mpq/unit/cm/a/landlock-damage.lof b/mpq/unit/cm/a/landlock-damage.lof new file mode 100644 index 00000000..35394261 Binary files /dev/null and b/mpq/unit/cm/a/landlock-damage.lof differ diff --git a/mpq/unit/cm/a/landlock-shadow.grp b/mpq/unit/cm/a/landlock-shadow.grp index 1054e210..d2bf2504 100644 Binary files a/mpq/unit/cm/a/landlock-shadow.grp and b/mpq/unit/cm/a/landlock-shadow.grp differ diff --git a/mpq/unit/cm/a/landlock.grp b/mpq/unit/cm/a/landlock.grp index 2932ae6c..6d6ebd82 100644 Binary files a/mpq/unit/cm/a/landlock.grp and b/mpq/unit/cm/a/landlock.grp differ diff --git a/mpq/unit/cm/a/limire.grp b/mpq/unit/cm/a/limire.grp new file mode 100644 index 00000000..9d225c28 Binary files /dev/null and b/mpq/unit/cm/a/limire.grp differ diff --git a/mpq/unit/cm/a/radix-damage.lof b/mpq/unit/cm/a/radix-damage.lof index 5bdaccc3..67c9ec8f 100644 Binary files a/mpq/unit/cm/a/radix-damage.lof and b/mpq/unit/cm/a/radix-damage.lof differ diff --git a/mpq/unit/cm/a/radix-shadow.grp b/mpq/unit/cm/a/radix-shadow.grp index ccb3d6ce..24f44b86 100644 Binary files a/mpq/unit/cm/a/radix-shadow.grp and b/mpq/unit/cm/a/radix-shadow.grp differ diff --git a/mpq/unit/cm/a/radix.grp b/mpq/unit/cm/a/radix.grp index 1ec78993..1306c301 100644 Binary files a/mpq/unit/cm/a/radix.grp and b/mpq/unit/cm/a/radix.grp differ diff --git a/mpq/unit/cm/a/tortare.grp b/mpq/unit/cm/a/tortare.grp new file mode 100644 index 00000000..8768243a Binary files /dev/null and b/mpq/unit/cm/a/tortare.grp differ diff --git a/mpq/unit/cm/p/matrix-damage.lof b/mpq/unit/cm/p/matrix-damage.lof index a4eb5664..b657b672 100644 Binary files a/mpq/unit/cm/p/matrix-damage.lof and b/mpq/unit/cm/p/matrix-damage.lof differ diff --git a/mpq/unit/cm/t/apostle-shadow.grp b/mpq/unit/cm/t/apostle-shadow.grp index e0a9f342..8de02149 100644 Binary files a/mpq/unit/cm/t/apostle-shadow.grp and b/mpq/unit/cm/t/apostle-shadow.grp differ diff --git a/mpq/unit/cm/t/apostle.grp b/mpq/unit/cm/t/apostle.grp index 7ab757e0..3ac4276f 100644 Binary files a/mpq/unit/cm/t/apostle.grp and b/mpq/unit/cm/t/apostle.grp differ diff --git a/mpq/unit/cm/t/autocrat-shadow.grp b/mpq/unit/cm/t/autocrat-shadow.grp index 1b7fddd4..3b9b7f4e 100644 Binary files a/mpq/unit/cm/t/autocrat-shadow.grp and b/mpq/unit/cm/t/autocrat-shadow.grp differ diff --git a/mpq/unit/cm/t/autocrat.grp b/mpq/unit/cm/t/autocrat.grp index 50d55ab5..f54503b7 100644 Binary files a/mpq/unit/cm/t/autocrat.grp and b/mpq/unit/cm/t/autocrat.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 449c192b..8b79a3b7 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 7c4c40d4..d0b0abf3 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 42499f25..b05e691e 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -34,6 +34,7 @@ - **Gameplay:** - Fixed target acquisition range for air weapons (e.g. **Nathrokor**) - Askosi constructing has been improved (a. DF) + - Hijacked units with more than 100 current HP are no longer set to 100 HP (r. shopkeeper dog) - Corrected **Phontis** attack damage (r. Hamster) - Fixed **Apostle - Blood Tithe** range (r. Jesse) - **Agonists** can no longer attack from mobile **Petracts** (r. Hamster) @@ -51,33 +52,46 @@ - Lardfix: Civilian (Blackjack) portrait now plays talking animations (r. lolrsks8s) ## Audiovisuals +- New model for: + - **Autocrat** +- Tweaked model for: + - **Apostle** - New portraits for: (many c. jun3hong, some c. lolrsk8s) - **TERRAN:** Maverick (Futurist & Upstart), Arhaun, Blackguard, Blackjack (Golden), Cleric (Futurist), Cyclops (Futurist), Harakan (Golden), Qilin, Tiangou - **PROTOSS:** Cicatus, Dracadin (Order), Ecclesiast (Khalendric), Extatus, Manifold (Starbound), Renesair, Zealot (Starbound) - **ZERG:** Quazrokor, Hydralisk (Orkoti) - **ASKOSI:** Auxine - New cast SFX for **Seraph Irradiate** +- Added almost built frame for: + - **Landlock**, **Grandstand**, **Radix** +- Added damage overlay for: + - **Landlock** # Balance changes ## Terran - [Apostle](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/apostle): + - Resource costs 75/200 » 75/150 - Now has 150 max energy - Now spends 5 energy every **Blood Tithe** proc - Now spends 20 energy every **Lazarus Agent** proc - Prioritizes **Blood Tithe** - [Autocrat](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/autocrat): + - Resource costs 125/250 » 125/200 - Now has 100 max energy - Now spends 25 energy every **Reclamation Fields** proc - [Anticthon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/anticthon): + - Resource costs 250/350 » 250/300 - Now has 200 max energy - Now spends 25 energy every **Counter-Proposal** proc - [Aion](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/aion): + - Resource costs 450/450 » 450/350 - Now has 200 max energy - Now spends 25 energy every **Reclamation Fields** proc ## Protoss - [Demiurge](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/demiurge): + - Resource costs 200/350 » 200/300 - Now has 100 max energy - Now spends 10 energy every **Worship** proc @@ -100,7 +114,7 @@ - Now requires Proscenium OR Zylode - [Chantry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/chantry): - **Sermon Salve:** - - Now gives units cloaking until their next attack + - Now gives units cloaking until their next attack / notable action - [Bounty](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/bounty): - Placement size 4x3 » 3x3 - Collision size adjusted to better match new graphic @@ -118,6 +132,8 @@ - Tier 2 skybound -- potent skybeast with Remote Hijack ability - [Dorminge](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/dorminge): - Tier 2 infrastructure -- shrine that slows movement speed of nearby hostiles +- [Domain](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/domain) + - Tier 3 infrastructure -- town center that harvests resources passively ## Futurist Federation - [Cutlass](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cutlass): diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 8f2eaf8b..6502f4fc 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ