diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 9ecc2b95..ea3dc90b 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 d669093f..fd73b84b 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -596,17 +596,17 @@ Rove Burst Lasers Green Impact Burst Lasers Cyan Impact Kethrostalor -Extended Flingy #390 -Extended Flingy #391 +Dyad +Cipher Francisco Goska Stroluum -Extended Flingy #394 -Extended Flingy #395 -Extended Flingy #396 -Extended Flingy #397 -Extended Flingy #398 -Extended Flingy #399 -Extended Flingy #400 +Gauntlet +Cosmoscope +Helion +Tirade +Scepter +Azanthrokor +Bounty Extended Flingy #401 Extended Flingy #402 Extended Flingy #403 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index d3c49f4c..930c6bf4 100644 Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt index f156897e..4f666674 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2166,24 +2166,24 @@ Extatus Warp Flash Cicatus Warp Flash Zealot Warp Flash (Starbound) Manifold Warp Flash (Starbound) -Extended Image #1166 -Extended Image #1167 -Extended Image #1168 -Extended Image #1169 -Extended Image #1170 -Extended Image #1171 -Extended Image #1172 -Extended Image #1173 -Extended Image #1174 -Extended Image #1175 -Extended Image #1176 -Extended Image #1177 -Extended Image #1178 -Extended Image #1179 -Extended Image #1180 -Extended Image #1181 -Extended Image #1182 -Extended Image #1183 +Dyad +Dyad Shadow +Cipher +Cipher Shadow +Gauntlet +Gauntlet Shadow +Cosmoscope +Cosmoscope Shadow +Helion +Helion Shadow +Tirade +Tirade Shadow +Scepter +Scepter Shadow +Azanthrokor +Azanthrokor Shadow +Bounty +Bounty Shadow Extended Image #1184 Extended Image #1185 Extended Image #1186 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 6008eec6..0c41125b 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 cc9e4849..4e4239c0 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1045,15 +1045,15 @@ Rove Burst Lasers Green Impact Burst Lasers Cyan Impact Kethrostalor -Extended Sprite #531 -Extended Sprite #532 -Extended Sprite #533 -Extended Sprite #534 -Extended Sprite #535 -Extended Sprite #536 -Extended Sprite #537 -Extended Sprite #538 -Extended Sprite #539 +Dyad +Cipher +Gauntlet +Cosmoscope +Helion +Tirade +Scepter +Azanthrokor +Bounty Extended Sprite #540 Extended Sprite #541 Extended Sprite #542 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index c62d2b54..7815aebc 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 c2e8c163..99bbadef 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 83021e5d..dd78a45e 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -152,7 +152,7 @@ Blindside Rockets (Sundog) Twinstrike Flamethrowers (Matador) Bisecting Blades (Zarcavrokor) Bones of Reflection -Scepter Orma Scrapray +Orma Scrapray (Scepter) Ersa Driver (Intendent) Chimera Cannons (Hippogriff) Alru Burstray (Intendent) diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 10f2740e..b8e475f6 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index ee1c4735..12eec995 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index 218bcf61..2a948c33 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 8110ff71..2b418cfb 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -1132,4 +1132,472 @@ RoveGndAttkInit: RoveWalking: playfram 0x00 setvertpos 0 - goto SkryrokorLocal00 \ No newline at end of file + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2168 Dyad (cm\askosi\dyad.grp) +.headerstart +IsId 13 +Type 21 +Init DyadInit +Death DyadDeath +GndAttkInit DyadGndAttkInit +AirAttkInit [NONE] +Unused1 DyadUnused1 +GndAttkRpt DyadGndAttkInit +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle DyadGndAttkToIdle +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking DyadWalking +WalkingToIdle DyadLocal00 +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt DyadAlmostBuilt +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +DyadInit: + imgul 2169 0 7 # Dyad Shadow (cm\askosi\dyad-shadow.grp) + playfram 0x00 +DyadLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto DyadLocal00 + +DyadDeath: + playsnd 353 # Terran\VULTURE\TVuDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 920 0 42 # Inkblot remains + wait 1 + end + +DyadUnused1: + wait 1 + nobrkcodestart + setfldirect 0 + playsndbtwn 1163 1165 + sprol 742 0 0 # Explosion Small Reversed + wait 10 + setfldirect 12 + nobrkcodeend + goto DyadLocal00 + +DyadGndAttkInit: + playfram 0x00 + attackwith 1 + playsndbtwn 35 39 # terran\SCV\EDrRep00.wav | terran\SCV\EDrRep04.wav + wait 1 + gotorepeatattk + ignorerest +DyadGndAttkToIdle: + playfram 0x00 + goto DyadLocal00 + +DyadWalking: + setvertpos 0 +# imgol 225 0 5 # Inkblot Engines (thingy\tdrGlow.grp) + goto SkryrokorLocal00 + +DyadAlmostBuilt: + setvertpos 0 + wait 1 +DyadLocal01: + playfram 0x160 + useweapon 14 # Fusion Cutter (Harvest) (Fusion Cutter) + sigorder 32 + wait 2 + playfram 0x140 + wait 2 + playfram 0x120 + wait 9 + goto DyadLocal01 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2170 Cipher (cm\askosi\cipher.grp) +.headerstart +IsId 14 +Type 24 +Init CipherInit +Death LandlockDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 +SpecialState1 CipherSpecialState1 +SpecialState2 SkryrokorLocal00 +AlmostBuilt CipherAlmostBuilt +Built CipherBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking CipherIsWorking +WorkingToIdle CipherBuilt +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable CipherDisable +Burrow [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +CipherInit: + imgul 2171 0 0 # Cipher Shadow (cm\askosi\cipher-shadow.grp) + playfram 0x00 + goto SkryrokorLocal00 + +CipherSpecialState1: + playfram 0 + goto SkryrokorLocal00 + +CipherAlmostBuilt: + playfram 0 + goto SkryrokorLocal00 + +CipherBuilt: + playfram 0x00 + goto SkryrokorLocal00 + +CipherIsWorking: + playfram 1 + wait 2 + playfram 0 + waitrand 1 2 + goto CipherIsWorking + +CipherDisable: + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2172 Gauntlet (cm\askosi\gauntlet.grp) +.headerstart +IsId 15 +Type 24 +Init GauntletInit +Death LandlockDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 +SpecialState1 GauntletSpecialState1 +SpecialState2 SkryrokorLocal00 +AlmostBuilt GauntletAlmostBuilt +Built GauntletBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking GauntletIsWorking +WorkingToIdle GauntletBuilt +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable GauntletDisable +Burrow [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +GauntletInit: + imgul 2173 0 0 # Gauntlet Shadow (cm\askosi\gauntlet-shadow.grp) + playfram 0x00 + goto SkryrokorLocal00 + +GauntletSpecialState1: + playfram 0 + goto SkryrokorLocal00 + +GauntletAlmostBuilt: + playfram 0 + goto SkryrokorLocal00 + +GauntletBuilt: + playfram 0x00 + goto SkryrokorLocal00 + +GauntletIsWorking: + playfram 1 + wait 2 + playfram 0 + waitrand 1 2 + goto GauntletIsWorking + +GauntletDisable: + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2174 Cosmoscope (cm\askosi\cosmoscope.grp) +.headerstart +IsId 16 +Type 24 +Init CosmoscopeInit +Death LandlockDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 [NONE] +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle SkryrokorLocal00 +SpecialState1 CosmoscopeSpecialState1 +SpecialState2 SkryrokorLocal00 +AlmostBuilt CosmoscopeAlmostBuilt +Built CosmoscopeBuilt +Landing [NONE] +LiftOff [NONE] +IsWorking CosmoscopeIsWorking +WorkingToIdle CosmoscopeBuilt +WarpIn [NONE] +Unused3 [NONE] +StarEditInit [NONE] +Disable CosmoscopeDisable +Burrow [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +CosmoscopeInit: + imgul 2175 0 0 # Cosmoscope Shadow (cm\askosi\cosmoscope-shadow.grp) + playfram 0x00 + goto SkryrokorLocal00 + +CosmoscopeSpecialState1: + playfram 0 + goto SkryrokorLocal00 + +CosmoscopeAlmostBuilt: + playfram 0 + goto SkryrokorLocal00 + +CosmoscopeBuilt: + playfram 0x00 + goto SkryrokorLocal00 + +CosmoscopeIsWorking: + playfram 1 + wait 2 + playfram 2 + wait 2 + playfram 3 + wait 2 + playfram 4 + wait 2 + playfram 5 + wait 2 + playfram 0x00 + wait 6 + goto CosmoscopeIsWorking + +CosmoscopeDisable: + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2176 Helion (cm\askosi\helion.grp) +.headerstart +IsId 17 +Type 21 +Init HelionInit +Death HelionDeath +GndAttkInit HelionGndAttkInit +AirAttkInit HelionGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt HelionGndAttkInit +AirAttkRpt HelionGndAttkInit +CastSpell [NONE] +GndAttkToIdle HelionGndAttkToIdle +AirAttkToIdle HelionGndAttkToIdle +Unused2 [NONE] +Walking HelionWalking +WalkingToIdle HelionLocal00 +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +HelionInit: + imgul 2177 0 42 # Helion Shadow (cm\askosi\helion.grp) +HelionGndAttkToIdle: + playfram 0x00 +HelionLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto HelionLocal00 + +HelionDeath: + playsnd 257 # Terran\PHOENIX\TPhDth00.WAV + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 920 0 42 # Helion remains + wait 1 + end + +HelionGndAttkInit: + setvertpos 0 + playfram 0x00 + attackwith 2 + playsnd 106 # Bullet\tvuFir00.wav + wait 1 + gotorepeatattk + goto HelionGndAttkToIdle + +HelionWalking: + setvertpos 0 +# imgol 225 0 5 # Helion Engines (thingy\tdrGlow.grp) + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2178 Tirade (cm\askosi\tirade.grp) +.headerstart +IsId 18 +Type 21 +Init TiradeInit +Death TiradeDeath +GndAttkInit TiradeGndAttkInit +AirAttkInit TiradeGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt TiradeGndAttkInit +AirAttkRpt TiradeGndAttkInit +CastSpell [NONE] +GndAttkToIdle TiradeGndAttkToIdle +AirAttkToIdle TiradeGndAttkToIdle +Unused2 [NONE] +Walking TiradeWalking +WalkingToIdle TiradeLocal00 +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +TiradeInit: + imgul 2179 0 42 # Tirade Shadow (cm\askosi\tirade.grp) +TiradeGndAttkToIdle: + playfram 0x00 +TiradeLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto TiradeLocal00 + +TiradeDeath: + playsndbtwn 1249 1251 # Gorgon death 01, 02, 03 + imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) + wait 3 + lowsprul 920 0 42 # Tirade remains + wait 1 + end + +TiradeGndAttkInit: + setvertpos 0 + playfram 0x00 + attackwith 1 + playsndbtwn 1252 1253 # Gorgon weaponfire 01, 02 + wait 1 + gotorepeatattk + goto TiradeGndAttkToIdle + +TiradeWalking: + setvertpos 0 +# imgol 225 0 5 # Tirade Engines (thingy\tdrGlow.grp) + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2180 Scepter (cm\askosi\scepter.grp) +.headerstart +IsId 19 +Type 21 +Init ScepterInit +Death ScepterDeath +GndAttkInit ScepterGndAttkInit +AirAttkInit ScepterGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt ScepterGndAttkInit +AirAttkRpt ScepterGndAttkInit +CastSpell [NONE] +GndAttkToIdle ScepterGndAttkToIdle +AirAttkToIdle ScepterGndAttkToIdle +Unused2 [NONE] +Walking ScepterWalking +WalkingToIdle ScepterLocal00 +SpecialState1 [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +ScepterInit: + imgul 2181 0 7 # Scepter Shadow (cm\askosi\scepter.grp) +ScepterGndAttkToIdle: + playfram 0x00 +ScepterLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto ScepterLocal00 + +ScepterDeath: + playsndbtwn 1385 1386 # Matador death 01, 02 + imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) + wait 3 + lowsprul 920 0 42 # Scepter remains + wait 1 + end + +ScepterGndAttkInit: + setvertpos 0 + playfram 0x00 + attackwith 1 + playsndbtwn 1302 1306 # Minotaur weapon fire 01, 02, 03, 04, 05 + wait 1 + gotorepeatattk + goto ScepterGndAttkToIdle + +ScepterWalking: + setvertpos 0 +# imgol 225 0 5 # Scepter Engines (thingy\tdrGlow.grp) + goto SkryrokorLocal00 \ No newline at end of file diff --git a/patchnotes.md b/patchnotes.md index a65db47d..614cfea8 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -6,4 +6,41 @@ - Continue balancing for all races - Continue Askosi development - Further improve audiovisuals and AI -- [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! \ No newline at end of file +- [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes! + +## Terran +- [Cyprian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyprian): + - Armor 0 » 1 +- [Cyclops](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyclops): + - HP 95 » 110 +- [Shaman](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/shaman): + - HP 120 » 150 +- [Goliath](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/goliath): + - Build time 25 » 22 + - HP 200 » 240 +- [Blackjack](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/blackjack): + - Resource costs 75/0 » 50/0 + - Build time 16 » 18 +- [Matador](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/matador): + - HP 160 » 180 + - Build time 18 » 20 +- [Ancile](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/ancile): + - HP 80 » 100 +- [Cyclops (Futurist)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyclops-futurist): + - HP 110 » 120 + +## Protoss +- [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire): + - HP 60 » 75 + +## Zerg +- [Zethrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/zethrokor): + - HP 40 » 50 +- [Nathrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/nathrokor): + - HP 75 » 90 +- [Liiralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/liiralisk): + - HP 90 » 115 +- [Bactalisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/bactalisk): + - Movement speed 4 » 3.6 +- [Skithrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/skithrokor): + - HP 140 » 160 \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index fa0340a7..18bd4585 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ