diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index 15e7ad0f..572dd4b3 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 5e6cc36c..3447529b 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -501,7 +501,7 @@ Hotshot Nathrok Lake Skithrok Scab Qilin -Extended Flingy #295 +Auriel Extended Flingy #296 Extended Flingy #297 Extended Flingy #298 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 56c6e333..f2e94852 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 53e14e01..b432b3c1 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 7e22bb0b..0ec3e58b 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -1787,8 +1787,8 @@ Qilin Qilin Shadow Qilin Engines Rotary Connector -Extended Image #787 -Extended Image #788 +Auriel +Auriel Shadow Extended Image #789 Extended Image #790 Extended Image #791 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 5b7857d5..f88636b9 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 d8c29c47..662ad43f 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -890,7 +890,7 @@ Hotshot Nathrok Lake Skithrok Scab Qilin -Extended Sprite #1 +Auriel Extended Sprite #1 Extended Sprite #1 Extended Sprite #1 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index a3c5ae55..05951b35 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 417bd07f..3cbacca5 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -397,7 +397,7 @@ Terran Hotshot Zerg Nathrok Lake Zerg Skithrok Scab Terran Qilin -Extended Unit #172 +Terran Auriel Extended Unit #173 Extended Unit #174 Extended Unit #175 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index d360ac60..070aba44 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 e8e68fd6..6bc82e01 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -207,7 +207,7 @@ Calcification (Gorgrokor) Talismanic Weaver (Potentate) Phase Saber (Potentate) Dispatch Shotgun (Hotshot) -Extended Weapon #80 +Quarternary Rifle (Auriel) Extended Weapon #81 Extended Weapon #82 Extended Weapon #83 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 9d161a30..97394905 100644 Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 9756a68e..d0aedafd 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 dd6fca07..7a130e3f 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl index b74e4cfe..598785ed 100644 Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 7adc1781..09f2ee46 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt index def9492e..3c747e34 100644 --- a/mpq/scripts/iscript.txt +++ b/mpq/scripts/iscript.txt @@ -5493,7 +5493,7 @@ EidolonUnused1: wait 1 nobrkcodestart setfldirect 0 - playsndbtwn 1166 1167 + playsndbtwn 1166 1167 # Eidolon revive 01, 02 playfram 228 wait 2 playfram 227 @@ -25489,7 +25489,7 @@ AirAttkInit SavantGndAttkInit Unused1 SavantUnused1 GndAttkRpt SavantGndAttkRpt AirAttkRpt SavantGndAttkRpt -CastSpell SavantCastSpell +CastSpell [NONE] GndAttkToIdle SavantGndAttkToIdle AirAttkToIdle SavantGndAttkToIdle Unused2 [NONE] @@ -25500,7 +25500,7 @@ SpecialState1 SavantSpecialState1 # ----------------------------------------------------------------------------- # SavantInit: - imgul 1074 0 -5 # Savant Shadow (cm\terran\savant-shad.grp) + imgul 1074 0 -5 # Savant Shadow (cm\terran\savant-shadow.grp) SavantWalkingToIdle: playfram 0x00 SavantLocal00: @@ -25584,6 +25584,7 @@ SavantUnused1: SavantGndAttkInit: playfram 0x99 + wait 1 SavantGndAttkRpt: wait 1 nobrkcodestart @@ -25604,21 +25605,6 @@ SavantGndAttkToIdle: wait 1 goto SavantWalkingToIdle -SavantCastSpell: - nobrkcodestart - wait 1 - playsnd 240 # Terran\GHOST\TGhLkd00.wav - playfram 0x99 - wait 2 - playfram 0xaa - castspell - wait 2 - playfram 0xbb - nobrkcodeend - gotorepeatattk - sigorder 2 - goto SavantGndAttkToIdle - SavantWalking: move 4 wait 1 @@ -51876,4 +51862,54 @@ QilinWalking: imgol 1787 0 0 # Qilin Engines (cm\faction\qilin-engine.grp) goto InfestedTerranLocal00 -## Next free IsId: 766 \ No newline at end of file +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1789 (cm\faction\auriel.grp) +.headerstart +IsId 766 +Type 13 +Init AurielInit +Death SavantDeath +GndAttkInit AurielGndAttkInit +AirAttkInit AurielGndAttkInit +Unused1 SavantUnused1 +GndAttkRpt AurielGndAttkRpt +AirAttkRpt AurielGndAttkRpt +CastSpell [NONE] +GndAttkToIdle SavantGndAttkToIdle +AirAttkToIdle SavantGndAttkToIdle +Unused2 [NONE] +Walking SavantWalking +WalkingToIdle SavantWalkingToIdle +SpecialState1 SavantSpecialState1 +.headerend +# ----------------------------------------------------------------------------- # + +AurielInit: + imgul 1790 0 -5 # Auriel Shadow (cm\faction\auriel-shadow.grp) + goto SavantWalkingToIdle + +AurielGndAttkInit: + playfram 0x99 + wait 1 +AurielGndAttkRpt: + wait 1 + nobrkcodestart + playfram 0xaa + playsnd 98 # Bullet\TGhFir00.wav + attack + wait 1 + playfram 0xbb + wait 1 + playsnd 98 # Bullet\TGhFir00.wav + attack + playfram 0xaa + wait 1 + playfram 0xbb + wait 1 + nobrkcodeend + gotorepeatattk + ignorerest + goto SavantGndAttkToIdle + +## Next free IsId: 767 \ No newline at end of file diff --git a/mpq/unit/cm/faction/aspirant-death.grp b/mpq/unit/cm/faction-t/aspirant-death.grp similarity index 100% rename from mpq/unit/cm/faction/aspirant-death.grp rename to mpq/unit/cm/faction-t/aspirant-death.grp diff --git a/mpq/unit/cm/faction/aspirant-shadow.grp b/mpq/unit/cm/faction-t/aspirant-shadow.grp similarity index 100% rename from mpq/unit/cm/faction/aspirant-shadow.grp rename to mpq/unit/cm/faction-t/aspirant-shadow.grp diff --git a/mpq/unit/cm/faction/aspirant-weapon.grp b/mpq/unit/cm/faction-t/aspirant-weapon.grp similarity index 100% rename from mpq/unit/cm/faction/aspirant-weapon.grp rename to mpq/unit/cm/faction-t/aspirant-weapon.grp diff --git a/mpq/unit/cm/faction/aspirant.grp b/mpq/unit/cm/faction-t/aspirant.grp similarity index 100% rename from mpq/unit/cm/faction/aspirant.grp rename to mpq/unit/cm/faction-t/aspirant.grp diff --git a/mpq/unit/cm/faction-t/auriel-shadow.grp b/mpq/unit/cm/faction-t/auriel-shadow.grp new file mode 100644 index 00000000..b006a31c Binary files /dev/null and b/mpq/unit/cm/faction-t/auriel-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/auriel.grp b/mpq/unit/cm/faction-t/auriel.grp new file mode 100644 index 00000000..16d29fbc Binary files /dev/null and b/mpq/unit/cm/faction-t/auriel.grp differ diff --git a/mpq/unit/cm/faction/cohort-birth.grp b/mpq/unit/cm/faction-t/cohort-birth.grp similarity index 100% rename from mpq/unit/cm/faction/cohort-birth.grp rename to mpq/unit/cm/faction-t/cohort-birth.grp diff --git a/mpq/unit/cm/faction/cohort-shadow.grp b/mpq/unit/cm/faction-t/cohort-shadow.grp similarity index 100% rename from mpq/unit/cm/faction/cohort-shadow.grp rename to mpq/unit/cm/faction-t/cohort-shadow.grp diff --git a/mpq/unit/cm/faction/cohort.grp b/mpq/unit/cm/faction-t/cohort.grp similarity index 100% rename from mpq/unit/cm/faction/cohort.grp rename to mpq/unit/cm/faction-t/cohort.grp diff --git a/mpq/unit/cm/faction/hotshot-shadow.grp b/mpq/unit/cm/faction-t/hotshot-shadow.grp similarity index 100% rename from mpq/unit/cm/faction/hotshot-shadow.grp rename to mpq/unit/cm/faction-t/hotshot-shadow.grp diff --git a/mpq/unit/cm/faction/hotshot.grp b/mpq/unit/cm/faction-t/hotshot.grp similarity index 100% rename from mpq/unit/cm/faction/hotshot.grp rename to mpq/unit/cm/faction-t/hotshot.grp diff --git a/mpq/unit/cm/faction/luminary.grp b/mpq/unit/cm/faction-t/luminary.grp similarity index 100% rename from mpq/unit/cm/faction/luminary.grp rename to mpq/unit/cm/faction-t/luminary.grp diff --git a/mpq/unit/cm/faction/philoc-engine.grp b/mpq/unit/cm/faction-t/philoc-engine.grp similarity index 100% rename from mpq/unit/cm/faction/philoc-engine.grp rename to mpq/unit/cm/faction-t/philoc-engine.grp diff --git a/mpq/unit/cm/faction/philoc.grp b/mpq/unit/cm/faction-t/philoc.grp similarity index 100% rename from mpq/unit/cm/faction/philoc.grp rename to mpq/unit/cm/faction-t/philoc.grp diff --git a/mpq/unit/cm/faction/qilin-engine.grp b/mpq/unit/cm/faction-t/qilin-engine.grp similarity index 100% rename from mpq/unit/cm/faction/qilin-engine.grp rename to mpq/unit/cm/faction-t/qilin-engine.grp diff --git a/mpq/unit/cm/faction/qilin.grp b/mpq/unit/cm/faction-t/qilin.grp similarity index 100% rename from mpq/unit/cm/faction/qilin.grp rename to mpq/unit/cm/faction-t/qilin.grp diff --git a/mpq/unit/cm/faction/southpaw-engine.grp b/mpq/unit/cm/faction-t/southpaw-engine.grp similarity index 100% rename from mpq/unit/cm/faction/southpaw-engine.grp rename to mpq/unit/cm/faction-t/southpaw-engine.grp diff --git a/mpq/unit/cm/faction/southpaw.grp b/mpq/unit/cm/faction-t/southpaw.grp similarity index 100% rename from mpq/unit/cm/faction/southpaw.grp rename to mpq/unit/cm/faction-t/southpaw.grp diff --git a/mpq/unit/cm/faction/tarasque-birth.grp b/mpq/unit/cm/faction-t/tarasque-birth.grp similarity index 100% rename from mpq/unit/cm/faction/tarasque-birth.grp rename to mpq/unit/cm/faction-t/tarasque-birth.grp diff --git a/mpq/unit/cm/faction/tarasque-muzzle-flash.grp b/mpq/unit/cm/faction-t/tarasque-muzzle-flash.grp similarity index 100% rename from mpq/unit/cm/faction/tarasque-muzzle-flash.grp rename to mpq/unit/cm/faction-t/tarasque-muzzle-flash.grp diff --git a/mpq/unit/cm/faction/tarasque-shadow.grp b/mpq/unit/cm/faction-t/tarasque-shadow.grp similarity index 100% rename from mpq/unit/cm/faction/tarasque-shadow.grp rename to mpq/unit/cm/faction-t/tarasque-shadow.grp diff --git a/mpq/unit/cm/faction/tarasque.grp b/mpq/unit/cm/faction-t/tarasque.grp similarity index 100% rename from mpq/unit/cm/faction/tarasque.grp rename to mpq/unit/cm/faction-t/tarasque.grp diff --git a/mpq/unit/cm/faction/wendigo.grp b/mpq/unit/cm/faction-t/wendigo.grp similarity index 100% rename from mpq/unit/cm/faction/wendigo.grp rename to mpq/unit/cm/faction-t/wendigo.grp diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index 545839f7..72100506 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 e8883bac..9f906468 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 6cd688f2..998a26bc 100644 Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp index 2685dc80..58f9b1dc 100644 Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ diff --git a/patchnotes.md b/patchnotes.md index 45165e9c..97319d3b 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -32,6 +32,7 @@ Patch goals include: - Fixed Lobotomy Mines not targeting units that had previously burrowed (c. DF) - Improved decollision behaviors for iscript units (c. DF) - Audiovisuals: + - Added missing Adrenal Frenzy (Nathrokor) armor tooltip - Lobotomy Mine tooltip no longer displays the Spider Mines tooltip (r. 3crow) - Corrected Star Sovereign Intervention tooltip (r. TheBeaver99) - Corrected production icons for Hotshot, Nathrok Lake, Skithrok Scab, Mortothrokor @@ -50,7 +51,13 @@ Patch goals include: ## AI - Improved the number of Hachirosks requested by most Zerg build orders +## Terran +- [Trojan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/trojan): + - Increased turn rate to improve responsivity of load/unload commands + ## Protoss +- [Envoy](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/envoy): + - Increased turn rate to improve responsivity of load/unload commands - [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire): - Weapon damage now 1x10, from 2x6 - Weapon cooldown now 0.79, from 0.83 @@ -58,5 +65,15 @@ Patch goals include: - Significantly sped up attack animation ## Zerg +- [Iroleth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/iroleth): + - Increased turn rate to improve responsivity of load/unload commands - [Liiralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/liiralisk): - - Now moves ~20% faster \ No newline at end of file + - Now moves ~20% faster + +## Factions +- [Qilin](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/qilin): + - Hecaton (replaces Trojan at Starpad) + - Nimble transport. Heals loaded units. +- [Auriel](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/auriel): + - Hecaton (replaces Apostle at Captaincy) + - Mid-range infantry with a powerful damage over time effect. Incinerates corpses to create Apollyoid fields. \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index ff33b177..174873df 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ