diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 383a57d8..ef1d0e91 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 fb6ac91f..866ad82f 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -717,9 +717,9 @@ Maverick (Golden) Gladius (Order) Shaman (Upstart, Support) Shaman (Upstart, Adrenaline) -Extended Flingy #511 -Extended Flingy #512 -Extended Flingy #513 +Ammo Crate +Medkit +Battery Cell Extended Flingy #514 Extended Flingy #515 Extended Flingy #516 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 76c33cae..970a54fd 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 931f7ce4..54eb4495 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 19c73e92..ebefac2a 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2476,15 +2476,15 @@ Droleth Mutate Shaman (Upstart, Support) Shaman (Upstart) Shadow Shaman (Upstart, Adrenaline) -Extended Image #1476 -Extended Image #1477 -Extended Image #1478 -Extended Image #1479 -Extended Image #1480 -Extended Image #1481 -Extended Image #1482 -Extended Image #1483 -Extended Image #1484 +Ammo Crate +Ammo Crate Shadow +Ammo Crate Shadow (Carried) +Medkit +Medkit Shadow +Medkit Shadow (Carried) +Battery Cell +Battery Cell Shadow +Battery Cell Shadow (Carried) Extended Image #1485 Extended Image #1486 Extended Image #1487 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index af8410b2..20c3d7d5 100644 Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 28c16f39..aa8f41c3 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4346,25 +4346,25 @@ Askosi Structure Placement 01 Iconoclast Weaponfire 01 Iconoclast Weaponfire 02 Iconoclast Weaponfire 03 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Cardinal Ready 01 +Cardinal Ready 02 +Cardinal Ready 03 +Cardinal Selected 01 +Cardinal Selected 02 +Cardinal Selected 03 +Cardinal Selected 04 +Cardinal Order Passive 01 +Cardinal Order Passive 02 +Cardinal Order Passive 03 +Cardinal Order Passive 04 +Cardinal Order Aggressive 01 +Cardinal Order Aggressive 02 +Cardinal Order Aggressive 03 +Cardinal Order Aggressive 04 +Cardinal Under Attack 01 +Cardinal Under Attack 02 +Cardinal Under Attack 03 +Cardinal Under Attack 04 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 8838f486..09913df7 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4345,4 +4345,23 @@ cm\b\cloak-damage-off-02.wav cm\a\a-placement-01.wav cm\a\iconoclast\wf-01.wav cm\a\iconoclast\wf-02.wav -cm\a\iconoclast\wf-03.wav \ No newline at end of file +cm\a\iconoclast\wf-03.wav +cm\a\cardinal\rdy-01.wav +cm\a\cardinal\rdy-02.wav +cm\a\cardinal\rdy-03.wav +cm\a\cardinal\wht-01.wav +cm\a\cardinal\wht-02.wav +cm\a\cardinal\wht-03.wav +cm\a\cardinal\wht-04.wav +cm\a\cardinal\yes-01.wav +cm\a\cardinal\yes-02.wav +cm\a\cardinal\yes-03.wav +cm\a\cardinal\yes-04.wav +cm\a\cardinal\agg-01.wav +cm\a\cardinal\agg-02.wav +cm\a\cardinal\agg-03.wav +cm\a\cardinal\agg-04.wav +cm\a\cardinal\hlp-01.wav +cm\a\cardinal\hlp-02.wav +cm\a\cardinal\hlp-03.wav +cm\a\cardinal\hlp-04.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 58fa9521..3d6d5a22 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 4f4e493b..39bcf3c1 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1189,9 +1189,9 @@ Maverick (Golden) Remains Gladius (Order) Shaman (Upstart, Support) Shaman (Upstart, Adrenaline) -Extended Sprite #675 -Extended Sprite #676 -Extended Sprite #677 +Ammo Crate +Medkit +Battery Cell Extended Sprite #678 Extended Sprite #679 Extended Sprite #680 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index 97fbf04a..8aeead27 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 c8d98cec..a7d6a943 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -633,9 +633,9 @@ Bloodsummon Nihilist Faction Selection Askosi Terran Fleshthief (Nydus) Forerunner Lumen -Extended Unit #408 -Extended Unit #409 -Extended Unit #410 +Ammo Crate +Medkit +Battery Cell Extended Unit #411 Extended Unit #412 Extended Unit #413 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index deced9d3..523f6d18 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin index 7f27fe88..057de8c2 100644 Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ diff --git a/mpq/scripts/iscript_general.bin b/mpq/scripts/iscript_general.bin index b4f02e7b..8eaddf69 100644 Binary files a/mpq/scripts/iscript_general.bin and b/mpq/scripts/iscript_general.bin differ diff --git a/mpq/scripts/iscript_general.txt b/mpq/scripts/iscript_general.txt index 6840f777..bfcb566b 100644 --- a/mpq/scripts/iscript_general.txt +++ b/mpq/scripts/iscript_general.txt @@ -5194,4 +5194,35 @@ MachinamentumDisable: MachinamentumEnable: playfram 0 wait 1 - goto MachinamentumWorkingToIdle \ No newline at end of file + goto MachinamentumWorkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2478 Ammo Crate (cm\n\ammocrate.grp) +.headerstart +IsId 385 +Type 1 +Init AmmoCrateInit +Death AmmoCrateDeath +.headerend +# ----------------------------------------------------------------------------- # + +AmmoCrateInit: + playfram 0x00 + pwrupcondjmp AmmoCrateLocal00 + imgul 2479 0 0 # Ammo Crate Shadow (Ground) (cm\n\ammocrate-shadow.grp) + goto AmmoCrateLocal01 + +AmmoCrateLocal01: + wait 125 + goto AmmoCrateLocal01 + +AmmoCrateLocal00: + wait 1 + switchul 2480 # Ammo Crate Shadow (Carried) (cm\n\ammocrate-shadow.grp) + goto AmmoCrateLocal01 + +AmmoCrateDeath: + imgol 332 0 0 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + end \ No newline at end of file diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 851f59c9..058952ab 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 e993cc2e..c1835e2e 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -20968,13 +20968,22 @@ CamazotzGndAttkRpt: wait 1 playsndbtwn 4261 4263 # Camazotz weaponfire 01, 02, 03 imgoluselo 2056 0 0 # Green projection attack - playfram 0x20 - attkshiftproj 52 - wait 1 - attkshiftproj 80 + playfram 0x20 + attkshiftproj 24 + sigorder 32 + wait 1 + attkshiftproj 54 + sigorder 32 + wait 1 + attkshiftproj 82 + sigorder 32 + wait 1 + playfram 0x00 + attkshiftproj 112 + sigorder 32 + wait 1 + attkshiftproj 140 sigorder 32 - wait 5 - playfram 0x00 wait 2 ignorerest CamazotzGndAttkToIdle: diff --git a/mpq/sound/cm/a/a-placement-01.wav b/mpq/sound/cm/a/a-placement-01.wav index 2fc89254..49e0547f 100644 Binary files a/mpq/sound/cm/a/a-placement-01.wav and b/mpq/sound/cm/a/a-placement-01.wav differ diff --git a/mpq/sound/cm/a/cardinal/agg-01.wav b/mpq/sound/cm/a/cardinal/agg-01.wav new file mode 100644 index 00000000..53a74a09 Binary files /dev/null and b/mpq/sound/cm/a/cardinal/agg-01.wav differ diff --git a/mpq/sound/cm/a/cardinal/agg-02.wav b/mpq/sound/cm/a/cardinal/agg-02.wav new file mode 100644 index 00000000..5c2a8dce Binary files /dev/null and b/mpq/sound/cm/a/cardinal/agg-02.wav differ diff --git a/mpq/sound/cm/a/cardinal/agg-03.wav b/mpq/sound/cm/a/cardinal/agg-03.wav new file mode 100644 index 00000000..09ffae19 Binary files /dev/null and b/mpq/sound/cm/a/cardinal/agg-03.wav differ diff --git a/mpq/sound/cm/a/cardinal/agg-04.wav b/mpq/sound/cm/a/cardinal/agg-04.wav new file mode 100644 index 00000000..f85a07ec Binary files /dev/null and b/mpq/sound/cm/a/cardinal/agg-04.wav differ diff --git a/mpq/sound/cm/a/cardinal/hlp-01.wav b/mpq/sound/cm/a/cardinal/hlp-01.wav new file mode 100644 index 00000000..4b52c12d Binary files /dev/null and b/mpq/sound/cm/a/cardinal/hlp-01.wav differ diff --git a/mpq/sound/cm/a/cardinal/hlp-02.wav b/mpq/sound/cm/a/cardinal/hlp-02.wav new file mode 100644 index 00000000..a3ee90d0 Binary files /dev/null and b/mpq/sound/cm/a/cardinal/hlp-02.wav differ diff --git a/mpq/sound/cm/a/cardinal/hlp-03.wav b/mpq/sound/cm/a/cardinal/hlp-03.wav new file mode 100644 index 00000000..41678a6e Binary files /dev/null and b/mpq/sound/cm/a/cardinal/hlp-03.wav differ diff --git a/mpq/sound/cm/a/cardinal/hlp-04.wav b/mpq/sound/cm/a/cardinal/hlp-04.wav new file mode 100644 index 00000000..ca9a6471 Binary files /dev/null and b/mpq/sound/cm/a/cardinal/hlp-04.wav differ diff --git a/mpq/sound/cm/a/cardinal/rdy-01.wav b/mpq/sound/cm/a/cardinal/rdy-01.wav new file mode 100644 index 00000000..c518baca Binary files /dev/null and b/mpq/sound/cm/a/cardinal/rdy-01.wav differ diff --git a/mpq/sound/cm/a/cardinal/rdy-02.wav b/mpq/sound/cm/a/cardinal/rdy-02.wav new file mode 100644 index 00000000..c02c45f1 Binary files /dev/null and b/mpq/sound/cm/a/cardinal/rdy-02.wav differ diff --git a/mpq/sound/cm/a/cardinal/rdy-03.wav b/mpq/sound/cm/a/cardinal/rdy-03.wav new file mode 100644 index 00000000..0b919d18 Binary files /dev/null and b/mpq/sound/cm/a/cardinal/rdy-03.wav differ diff --git a/mpq/sound/cm/a/cardinal/wht-01.wav b/mpq/sound/cm/a/cardinal/wht-01.wav new file mode 100644 index 00000000..0e0f44bb Binary files /dev/null and b/mpq/sound/cm/a/cardinal/wht-01.wav differ diff --git a/mpq/sound/cm/a/cardinal/wht-02.wav b/mpq/sound/cm/a/cardinal/wht-02.wav new file mode 100644 index 00000000..10b7b6b0 Binary files /dev/null and b/mpq/sound/cm/a/cardinal/wht-02.wav differ diff --git a/mpq/sound/cm/a/cardinal/wht-03.wav b/mpq/sound/cm/a/cardinal/wht-03.wav new file mode 100644 index 00000000..9e57518d Binary files /dev/null and b/mpq/sound/cm/a/cardinal/wht-03.wav differ diff --git a/mpq/sound/cm/a/cardinal/wht-04.wav b/mpq/sound/cm/a/cardinal/wht-04.wav new file mode 100644 index 00000000..5c5b02cd Binary files /dev/null and b/mpq/sound/cm/a/cardinal/wht-04.wav differ diff --git a/mpq/sound/cm/a/cardinal/yes-01.wav b/mpq/sound/cm/a/cardinal/yes-01.wav new file mode 100644 index 00000000..8021304d Binary files /dev/null and b/mpq/sound/cm/a/cardinal/yes-01.wav differ diff --git a/mpq/sound/cm/a/cardinal/yes-02.wav b/mpq/sound/cm/a/cardinal/yes-02.wav new file mode 100644 index 00000000..3477eda3 Binary files /dev/null and b/mpq/sound/cm/a/cardinal/yes-02.wav differ diff --git a/mpq/sound/cm/a/cardinal/yes-03.wav b/mpq/sound/cm/a/cardinal/yes-03.wav new file mode 100644 index 00000000..ac4498df Binary files /dev/null and b/mpq/sound/cm/a/cardinal/yes-03.wav differ diff --git a/mpq/sound/cm/a/cardinal/yes-04.wav b/mpq/sound/cm/a/cardinal/yes-04.wav new file mode 100644 index 00000000..3a358ad9 Binary files /dev/null and b/mpq/sound/cm/a/cardinal/yes-04.wav differ diff --git a/mpq/sound/cm/advisors/error-askosi.wav b/mpq/sound/cm/advisors/error-askosi.wav index 87a2f109..7432392f 100644 Binary files a/mpq/sound/cm/advisors/error-askosi.wav and b/mpq/sound/cm/advisors/error-askosi.wav differ diff --git a/mpq/unit/cm/a/crematorium-attack.lol b/mpq/unit/cm/a/crematorium-attack.lol new file mode 100644 index 00000000..d095cb8d Binary files /dev/null and b/mpq/unit/cm/a/crematorium-attack.lol differ diff --git a/mpq/unit/cm/a/iconoclast-attack.lol b/mpq/unit/cm/a/iconoclast-attack.lol new file mode 100644 index 00000000..345888ec Binary files /dev/null and b/mpq/unit/cm/a/iconoclast-attack.lol differ diff --git a/mpq/unit/cm/a/phontis-attack.lol b/mpq/unit/cm/a/phontis-attack.lol index 1ffcf368..1f6345e9 100644 Binary files a/mpq/unit/cm/a/phontis-attack.lol and b/mpq/unit/cm/a/phontis-attack.lol differ diff --git a/mpq/unit/cm/a/phontis-shadow.grp b/mpq/unit/cm/a/phontis-shadow.grp index d0fe7ccf..e77a277f 100644 Binary files a/mpq/unit/cm/a/phontis-shadow.grp and b/mpq/unit/cm/a/phontis-shadow.grp differ diff --git a/mpq/unit/cm/a/phontis.grp b/mpq/unit/cm/a/phontis.grp index 163effa3..7f5119dd 100644 Binary files a/mpq/unit/cm/a/phontis.grp and b/mpq/unit/cm/a/phontis.grp differ diff --git a/mpq/unit/cm/a/radix.grp b/mpq/unit/cm/a/radix.grp index f12d1c58..46ef6789 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/n/ammocrate-shadow.grp b/mpq/unit/cm/n/ammocrate-shadow.grp new file mode 100644 index 00000000..08fe9a96 Binary files /dev/null and b/mpq/unit/cm/n/ammocrate-shadow.grp differ diff --git a/mpq/unit/cm/n/ammocrate.grp b/mpq/unit/cm/n/ammocrate.grp new file mode 100644 index 00000000..5ce23afd Binary files /dev/null and b/mpq/unit/cm/n/ammocrate.grp differ diff --git a/mpq/unit/cm/n/medkit-shadow.grp b/mpq/unit/cm/n/medkit-shadow.grp new file mode 100644 index 00000000..b1b00b4b Binary files /dev/null and b/mpq/unit/cm/n/medkit-shadow.grp differ diff --git a/mpq/unit/cm/n/medkit.grp b/mpq/unit/cm/n/medkit.grp new file mode 100644 index 00000000..e40efdd2 Binary files /dev/null and b/mpq/unit/cm/n/medkit.grp differ diff --git a/mpq/unit/cm/z/izirokor-birth.grp b/mpq/unit/cm/z/izirokor-birth.grp index 37e21930..80e881cd 100644 Binary files a/mpq/unit/cm/z/izirokor-birth.grp and b/mpq/unit/cm/z/izirokor-birth.grp differ diff --git a/mpq/unit/cm/z/izirokor-mutate.grp b/mpq/unit/cm/z/izirokor-mutate.grp index 70b04775..096c0869 100644 Binary files a/mpq/unit/cm/z/izirokor-mutate.grp and b/mpq/unit/cm/z/izirokor-mutate.grp differ diff --git a/mpq/unit/cm/z/izirokor-remains.grp b/mpq/unit/cm/z/izirokor-remains.grp index 90bba596..2874fe12 100644 Binary files a/mpq/unit/cm/z/izirokor-remains.grp and b/mpq/unit/cm/z/izirokor-remains.grp differ diff --git a/mpq/unit/cm/z/izirokor-shadow.grp b/mpq/unit/cm/z/izirokor-shadow.grp index 2b6b3d39..8ea36a0c 100644 Binary files a/mpq/unit/cm/z/izirokor-shadow.grp and b/mpq/unit/cm/z/izirokor-shadow.grp differ diff --git a/mpq/unit/cm/z/izirokor.grp b/mpq/unit/cm/z/izirokor.grp index 33a00f50..65fd3c79 100644 Binary files a/mpq/unit/cm/z/izirokor.grp and b/mpq/unit/cm/z/izirokor.grp differ diff --git a/mpq/unit/cm/z/liiralisk-attack.lol b/mpq/unit/cm/z/liiralisk-attack.lol index efaa5f87..c0531bf2 100644 Binary files a/mpq/unit/cm/z/liiralisk-attack.lol and b/mpq/unit/cm/z/liiralisk-attack.lol differ diff --git a/mpq/unit/cm/z/liiralisk-birth.grp b/mpq/unit/cm/z/liiralisk-birth.grp index 6ced5939..aff26292 100644 Binary files a/mpq/unit/cm/z/liiralisk-birth.grp and b/mpq/unit/cm/z/liiralisk-birth.grp differ diff --git a/mpq/unit/cm/z/liiralisk-shadow.grp b/mpq/unit/cm/z/liiralisk-shadow.grp index eae94ccd..8a71dd62 100644 Binary files a/mpq/unit/cm/z/liiralisk-shadow.grp and b/mpq/unit/cm/z/liiralisk-shadow.grp differ diff --git a/mpq/unit/cm/z/liiralisk.grp b/mpq/unit/cm/z/liiralisk.grp index 1938e7a8..c3d50500 100644 Binary files a/mpq/unit/cm/z/liiralisk.grp and b/mpq/unit/cm/z/liiralisk.grp differ diff --git a/patchnotes.md b/patchnotes.md index 25bbd8e5..053198ca 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -28,10 +28,10 @@ - Mimicry no longer fails to account for weapon factor in many cases (r. shopkeeper dog) - **Egocent**s no longer fail to mimic barrage attacks properly (r. Londier) - Mimicry no longer procs on ability weapons (r. Londier) - - - **Audiovisual:** - Corrected strings for **Izirokor** tech-enable on **Skibact Scab** and **Tethvith Swamp** (r. Mimika) - Fixed bad shield overlay for **Vulture (Hecaton)** (r. Londier) + - Buttons for **Tiangou** and **Cutlass** now show as disabled when no **Scrapyard** is built (r. Pisens) - **Cyclops (Futurist)** now uses its unique shadow and attack sequence instead of the standard variant's (r. lolrsk8s) - Corrected tooltip for **Kagralisk** weapon string (r. Krankendau) @@ -42,8 +42,12 @@ - Resized model for: - Talos, Cyprian - Modified model for: - - Maverick, Maverick (Futurist), Shaman + - Maverick, Maverick (Futurist), Shaman, Phontis + - Zethrokor, Liiralisk, Izirokor (c. Solstice) +- Added weapon launch offsets for: + - Aphorist, Silversoul, Ghostwrit, Phontis, Iconoclast, Crematorium - Modified unit responses for Vorvrokor +- New unit responses for Cardinal - New error and structure placement SFX for Askosi (c. lolrsk8s) - New weapon SFX for: - Alzurokor (c. lolrsk8s) @@ -127,15 +131,24 @@ - Movement speed 9.1 » 9.8 - Collision size increased by ~23% - [Zoryusthaleth](https://cosmonarchy.com/zerg/zoryusthaleth): - - Resource cost 175/0 » 200/0 + - Resource costs 175/0 » 200/0 + - Build time 28 » 25 + - HP 200 » 220 - [Lakizilisk](https://cosmonarchy.com/zerg/lakizilisk): + - Resource costs 75/75 » 100/75 + - Build time 30 » 28 + - HP 140 » 150 - **Subterranean Spines:** - Weapon damage 12 » 15 - Weapon cooldown 1.63 » 1.75 ## Askosi -- **Shared Designs** +- **Shared Designs:** - Team building from **Pilgrim**s and **Constituent**s now increases build rate by 25% per worker, from 20% +- [Cardinal](https://cosmonarchy.com/askosi/cardinal): + - Resource costs 75/25 » 100/25 +- [Radix](https://cosmonarchy.com/askosi/radix): + - Resource costs 100/0 » 125/0 ## Askosi factions - **NEW: Sons of Ash** diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index cf966d21..3f55fd2a 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ