diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 9926741c..e8ae0028 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 592bffdf..8038bbe1 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -678,7 +678,7 @@ Ferrum Chalyb Circitor Exigo -Extended Flingy #472 +Athla Extended Flingy #473 Extended Flingy #474 Extended Flingy #475 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 213d39fd..a49383af 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 25f8e442..80eb9273 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 bf0cab80..9d194ab8 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2345,9 +2345,9 @@ Circitor Warp Flash Exigo Exigo Shadow Exigo Warp Flash -Extended Image #1345 -Extended Image #1346 -Extended Image #1347 +Athla +Athla Shadow +Athla Warp Flash Extended Image #1348 Extended Image #1349 Extended Image #1350 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 34fef8fa..1f3447aa 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 3c09fc10..bb017b45 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1133,7 +1133,7 @@ Ferrum Chalyb Circitor Exigo -Extended Sprite #619 +Athla Extended Sprite #620 Extended Sprite #621 Extended Sprite #622 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 29faa450..c9d06bb1 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 5d7ae731..ad5932ba 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -607,7 +607,7 @@ Forerunner Ferrum Forerunner Chalyb Forerunner Circitor Forerunner Exigo -Extended Unit #382 +Forerunner Athla Extended Unit #383 Extended Unit #384 Extended Unit #385 diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 15f63106..a709de6d 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt index d61c2c08..3f441a7a 100644 --- a/mpq/samase/unitdef.txt +++ b/mpq/samase/unitdef.txt @@ -435,6 +435,91 @@ building skibact_scab = 397 building eskigant = 421 building zozarc_gorge = 493 +# Askosi units +military proselyte = 443 +military missionary = 445 +military cardinal = 446 +military mimic = 447 +military vicar = 448 +military rove = 449 +military object = 450 +military scepter = 451 +military intendent = 452 +military helion = 453 +military emissary = 454 +military inkblot = 455 +military tirade = 456 +military avatar = 538 +military thaumalogue = 542 +military petract = 543 +military crematorium = 544 +military aphorist = 551 +military doronin = 552 +military agonist = 553 +military phontis = 554 +military zonguard = 555 +military akreno = 556 +military iconoclast = 557 +military paraclete = 558 +military eyelet = 564 +military auxine = 565 +military insurant = 583 +military silversoul = 584 +military ghostwrit = 585 +military azjoran = 586 +military histrion = 587 +military elgird = 588 +military egocent = 589 +military alacyne = 590 +military begolor = 591 +military limire = 592 +military endbore = 593 +military tortare = 594 +military cybrene = 595 + +# Askosi buildings +building pilgrim = 439 +building dyad = 444 +building constituent = 566 +# +building landlock = 429 +building arch = 457 +building grandstand = 458 +building chantry = 459 +building radix = 460 +building cipher = 461 +building function = 462 +building gauntlet = 463 +building cosmoscope = 464 +building Bounty = 510 +building grandstand_holdout = 532 +building grandstand_vision = 533 +building abutment = 539 +building proscenium = 540 +building zylode = 545 +building astrolabe = 546 +building panoply = 550 +building bestiary = 561 +building conduit = 562 +building obelisk = 563 +building dorminge = 577 +building lotiro = 578 +building domain = 579 +building lekrot = 596 +building hearthshard = 597 + +# Forerunner units +military ferrum = 605 +military chalyb = 606 +military circitor = 607 +military exigo = 608 +military vicere = 610 + +# Forerunner buildings +building athla = 609 +# +building machimentum = 611 + # Misc units military goliath_turret = 4 military t_tank_turret = 6 diff --git a/mpq/scripts/iscript_protoss.bin b/mpq/scripts/iscript_protoss.bin index 563ca462..e39363c6 100644 Binary files a/mpq/scripts/iscript_protoss.bin and b/mpq/scripts/iscript_protoss.bin differ diff --git a/mpq/scripts/iscript_protoss.txt b/mpq/scripts/iscript_protoss.txt index 3493328c..fde9c1e0 100644 --- a/mpq/scripts/iscript_protoss.txt +++ b/mpq/scripts/iscript_protoss.txt @@ -15787,17 +15787,13 @@ PathlightGndAttkInit: playfram 0x20 playsndbtwn 2020 2023 # Pathlight weaponfire 01, 02, 03, 04 attack - wait 1 - playfram 0x00 wait 2 + playfram 0x00 + wait 4 + playfram 0x20 playsndbtwn 2020 2023 # Pathlight weaponfire 01, 02, 03, 04 attack - wait 1 - playfram 0x00 wait 2 - playsndbtwn 2020 2023 # Pathlight weaponfire 01, 02, 03, 04 - attack - wait 1 playfram 0x00 wait 1 nobrkcodeend diff --git a/mpq/unit/hl/fr/athla-special.loo b/mpq/unit/hl/fr/athla-special.loo new file mode 100644 index 00000000..d5a92432 Binary files /dev/null and b/mpq/unit/hl/fr/athla-special.loo differ diff --git a/mpq/unit/hl/fr/athla.grp b/mpq/unit/hl/fr/athla.grp new file mode 100644 index 00000000..f05a9d09 Binary files /dev/null and b/mpq/unit/hl/fr/athla.grp differ diff --git a/mpq/unit/hl/fr/vincere.grp b/mpq/unit/hl/fr/vincere.grp new file mode 100644 index 00000000..78c4a1f2 Binary files /dev/null and b/mpq/unit/hl/fr/vincere.grp differ diff --git a/patchnotes.md b/patchnotes.md index 0ec47267..2a7ddcb9 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -30,4 +30,11 @@ - [Anvil](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/anvil): - Resource costs 200/200 » 150/150 - [Starpad](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/starpad): - - Vision range 10 » 9 \ No newline at end of file + - Vision range 10 » 9 + +## Askosi +- [Doronin](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/doronin): + - Transport weight 2 » 6 +- [Bounty](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/bounty): + - HP 1200 » 800 + - Armor 4 » 3 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 30b71cf6..1ca345ff 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ