diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 439e6c51..61c80c2f 100644 Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index bb83f786..4af7272c 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 a271ce25..13bf1f2e 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 313f4af7..3baa953a 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2276,8 +2276,8 @@ Zylode Shadow Astrolabe Astrolabe Shadow Ash Heap Overlay -Extended Image #1276 -Extended Image #1277 +Crematorium +Crematorium Shadow Extended Image #1278 Extended Image #1279 Extended Image #1280 diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index 4eeed4f8..77259591 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4165,9 +4165,9 @@ Aphorist Weaponhit 03 Phontis Weaponfire 01 Phontis Weaponfire 02 Phontis Weaponfire 03 -Extended Sound #1 -Extended Sound #1 -Extended Sound #1 +Crematorium Weaponfire 01 +Crematorium Weaponfire 02 +Crematorium Weaponfire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index b3e2961a..27b7ddad 100644 Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index baca21e8..7275bb77 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 0c740617..b9271651 100644 Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 3ca7d226..c5b1f4eb 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Tech.graft b/mpq/datreq/Tech.graft index 4024dd68..a164677f 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/game/icons.grp b/mpq/game/icons.grp index e9084737..8e75c5ce 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index 1f8b049e..9c02d87b 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -940,7 +940,7 @@ v<1><4>Raise Avatar <1>(<3>V<1>)<10>Subsuming trooper.<0> d<1><4>Raise Doronin <1>(<3>D<1>)<10>Eviscerating cyberbeast.<0> Avatar requires:<10> Conduit<0> Doronin requires:<10> Bestiary<0> -a<1><4>Meld Agonist <1>(<3>A<1>)<10>.<0> +a<1><4>Meld Agonist <1>(<3>A<1>)<10>Incessant vehicle.<0> r<1><4>Meld Petract <1>(<3>R<1>)<10>Frontal transport.<0> t<1><4>Raise Phontis <1>(<3>T<1>)<10>Ironclad crawler.<0> z<1><4>Raise Zonguard <1>(<3>Z<1>)<10>Ravenous mechbeast.<0> @@ -1090,7 +1090,7 @@ g<1><4>Assemble Golem <1>(<3>G<1>)<10>Sturdy frontline drone.<0> t<1><4>Build Mantle <1>(<3>T<1>)<10>Walker outpost.<0> ¤<3><4>Apollyoid Adhesive <2>(passive)<10>Flame-based attacks set victims alight, rending 1 armor per stack, and dealing 3 damage every second.<10><10>Apollyoid Adhesive burns itself out after 2 seconds of not being stacked.<0> ¤<3><4>Sustaining Sermon <2>(passive)<10>Every second strike, the Cardinal's weapon releases a restorative pulse, granting to all allies within 3 range a heal equal to damage dealt.<0> -¤<3><4>Impact Dissipation <2>(passive)<10>Each time this combatant is attacked by a hostile, it gains 33% increased movement speed for 3 seconds.<0> +¤<3><4>Impact Dissipation <2>(passive)<10>Each time this combatant is attacked by a hostile, it gains 33% increased movement speed for 3 seconds, and regenerates 15 HP over time..<0> Mining Efficiency<0> ¤<3><4>Schematic Unity <2>(passive)<10>Up to 5 Askosi workers can collaborate on construction efforts.<10>When Dyads assist in construction, they increase construction rate by 30%.<0> ¤<3><4>Shared Designs <2>(passive)<10>Up to 5 Askosi workers can collaborate on construction efforts.<10>Each additional Pilgrim increases construction rate by 20%.<0> diff --git a/mpq/scripts/iscript_askosi.bin b/mpq/scripts/iscript_askosi.bin index b2144f3c..5602482a 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 d90c55be..802f8bd2 100644 --- a/mpq/scripts/iscript_askosi.txt +++ b/mpq/scripts/iscript_askosi.txt @@ -3135,11 +3135,11 @@ ZylodeInit: goto SkryrokorLocal00 ZylodeSpecialState1: - playfram 0 + playfram 9 goto SkryrokorLocal00 ZylodeAlmostBuilt: - playfram 0 + playfram 9 goto SkryrokorLocal00 ZylodeBuilt: @@ -3149,8 +3149,20 @@ ZylodeBuilt: ZylodeIsWorking: playfram 1 wait 2 - playfram 0 - waitrand 1 2 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 goto ZylodeIsWorking ZylodeDisable: @@ -3197,11 +3209,11 @@ AstrolabeInit: goto SkryrokorLocal00 AstrolabeSpecialState1: - playfram 0 + playfram 1 goto SkryrokorLocal00 AstrolabeAlmostBuilt: - playfram 0 + playfram 1 goto SkryrokorLocal00 AstrolabeBuilt: @@ -3209,10 +3221,40 @@ AstrolabeBuilt: goto SkryrokorLocal00 AstrolabeIsWorking: - playfram 1 - wait 2 + playfram 2 + wait 1 + playfram 3 + wait 1 + playfram 4 + wait 1 + playfram 5 + wait 1 + playfram 6 + wait 1 + playfram 7 + wait 1 + playfram 8 + wait 1 + playfram 9 + wait 1 + playfram 10 + wait 1 + playfram 11 + wait 1 + playfram 12 + wait 1 + playfram 13 + wait 1 + playfram 14 + wait 1 + playfram 15 + wait 1 + playfram 16 + wait 1 + playfram 17 + wait 1 playfram 0 - waitrand 1 2 + wait 1 goto AstrolabeIsWorking AstrolabeDisable: @@ -3594,4 +3636,84 @@ Flames_Small_Init: Flames_Small_Death: wait 1 - end \ No newline at end of file + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2178 Crematorium (cm\askosi\crematorium.grp) +.headerstart +IsId 43 +Type 21 +Init CrematoriumInit +Death CrematoriumDeath +GndAttkInit CrematoriumGndAttkInit +AirAttkInit CrematoriumGndAttkInit +Unused1 SkryrokorLocal00 +GndAttkRpt CrematoriumGndAttkInit +AirAttkRpt CrematoriumGndAttkInit +CastSpell [NONE] +GndAttkToIdle CrematoriumGndAttkToIdle +AirAttkToIdle CrematoriumGndAttkToIdle +Unused2 [NONE] +Walking CrematoriumWalking +WalkingToIdle CrematoriumLocal00 +SpecialState1 CrematoriumSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +CrematoriumInit: + imgulnextid 0 42 # Crematorium Shadow (cm\askosi\crematorium.grp) +CrematoriumGndAttkToIdle: + playfram 0x00 +CrematoriumLocal00: + setvertpos 0 + wait 8 + setvertpos 0 + wait 8 + setvertpos -1 + wait 8 + setvertpos 0 + wait 8 + goto CrematoriumLocal00 + +CrematoriumDeath: + playsnd 177 # Terran\BATTLE\tbaDth00.wav + imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) + wait 3 + lowsprul 1065 0 42 # Askosi Unit Rubble (cm\askosi\a-rubble-tiny.grp) + wait 1 + end + +CrematoriumGndAttkInit: + setvertpos 0 + wait 1 + nobrkcodestart + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 3 + playfram 0x00 + attackwith 1 + imgol 2245 0 0 # Impact Dissipation (medium) + wait 1 + nobrkcodeend + gotorepeatattk + goto CrematoriumGndAttkToIdle + +CrematoriumWalking: + setvertpos 0 +# imgol 225 0 5 # Crematorium Engines (thingy\tdrGlow.grp) + goto SkryrokorLocal00 + +CrematoriumSpecialState1: + playfram 0x00 + wait 12 + goto SkryrokorLocal00 \ No newline at end of file diff --git a/mpq/sound/cm/a/crematorium/wf-01.wav b/mpq/sound/cm/a/crematorium/wf-01.wav new file mode 100644 index 00000000..4657e8d3 Binary files /dev/null and b/mpq/sound/cm/a/crematorium/wf-01.wav differ diff --git a/mpq/sound/cm/a/crematorium/wf-02.wav b/mpq/sound/cm/a/crematorium/wf-02.wav new file mode 100644 index 00000000..ce88b5a7 Binary files /dev/null and b/mpq/sound/cm/a/crematorium/wf-02.wav differ diff --git a/mpq/sound/cm/a/crematorium/wf-03.wav b/mpq/sound/cm/a/crematorium/wf-03.wav new file mode 100644 index 00000000..efb2ea55 Binary files /dev/null and b/mpq/sound/cm/a/crematorium/wf-03.wav differ diff --git a/mpq/unit/cm/askosi/obelisk.grp b/mpq/unit/cm/askosi/obelisk.grp new file mode 100644 index 00000000..2a7b5c50 Binary files /dev/null and b/mpq/unit/cm/askosi/obelisk.grp differ diff --git a/mpq/unit/cm/askosi/proscenium.grp b/mpq/unit/cm/askosi/proscenium.grp index c424679a..00d9ba67 100644 Binary files a/mpq/unit/cm/askosi/proscenium.grp and b/mpq/unit/cm/askosi/proscenium.grp differ diff --git a/mpq/unit/cm/askosi/zylode.grp b/mpq/unit/cm/askosi/zylode.grp index ab4fe365..feec3b97 100644 Binary files a/mpq/unit/cm/askosi/zylode.grp and b/mpq/unit/cm/askosi/zylode.grp differ diff --git a/mpq/unit/cm/faction-p/zealot-starbound-shadow.grp b/mpq/unit/cm/faction-p/zealot-starbound-shadow.grp index 678097dd..1d24885e 100644 Binary files a/mpq/unit/cm/faction-p/zealot-starbound-shadow.grp and b/mpq/unit/cm/faction-p/zealot-starbound-shadow.grp differ diff --git a/mpq/unit/cm/faction-p/zealot-starbound.grp b/mpq/unit/cm/faction-p/zealot-starbound.grp index dac16fcf..35e5c3ee 100644 Binary files a/mpq/unit/cm/faction-p/zealot-starbound.grp and b/mpq/unit/cm/faction-p/zealot-starbound.grp differ diff --git a/mpq/unit/cm/faction-z/scrylyleth.loa b/mpq/unit/cm/faction-z/scrylyleth.loa new file mode 100644 index 00000000..e1731c1a Binary files /dev/null and b/mpq/unit/cm/faction-z/scrylyleth.loa differ diff --git a/mpq/unit/cm/faction-z/zethalor.grp b/mpq/unit/cm/faction-z/zethalor.grp index bef869da..44d5de45 100644 Binary files a/mpq/unit/cm/faction-z/zethalor.grp and b/mpq/unit/cm/faction-z/zethalor.grp differ diff --git a/mpq/unit/cmdbtns/.cmdicons.grp-ojvamg b/mpq/unit/cmdbtns/.cmdicons.grp-ojvamg new file mode 100644 index 00000000..a702f462 Binary files /dev/null and b/mpq/unit/cmdbtns/.cmdicons.grp-ojvamg differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index eff9b0fe..db1e1a0c 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 c4050c25..9fd2530c 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 01577fa9..27d6bbbe 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -23,7 +23,7 @@ ## Audiovisuals - New sprite for: - - **Zealot** (c. Solstice) + - **Zealot** (incl. Starbound variant; c. Solstice) - New unit responses for: - **Striga** (c. OunceOfMilia) @@ -54,8 +54,11 @@ - [Rove](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/rove): - Armor 1 » 0 - [Intendent](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/intendent): + - Resource costs 150/50 » 125/50 + - HP 140 » 120 - Armor 2 » 1 - **Ersa Driver:** + - Armor penetration 3 » 0 - Weapon range 6 » 5 - [Helion](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/helion): - **Usko Scrapray:** diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 0e8992b2..2061f12a 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ