diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index e0284086..57f38567 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 363a550a..f35704f4 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -659,16 +659,16 @@ Obelisk Auxine Constituent Missionary Weaponhit -Extended Flingy #453 -Extended Flingy #454 -Extended Flingy #455 -Extended Flingy #456 -Extended Flingy #457 -Extended Flingy #458 -Extended Flingy #459 -Extended Flingy #460 -Extended Flingy #461 -Extended Flingy #462 +Maverick (Upstart) +Vulture (Upstart) +Goremast +Eidolon (Upstart) +Cutlass +Cutlass Turret +Broadside +Broadside Turret +Ecclesiast (Astral) +Ajax Extended Flingy #463 Extended Flingy #464 Extended Flingy #465 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index 91dba5a5..73c27967 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 baaa44ba..304fc0ba 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 3c8fc454..90a79d75 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2302,26 +2302,26 @@ Constituent Constituent Shadow Missionary Weaponhit Rove Engine -Extended Image #1302 -Extended Image #1303 -Extended Image #1304 -Extended Image #1305 -Extended Image #1306 -Extended Image #1307 -Extended Image #1308 -Extended Image #1309 -Extended Image #1310 -Extended Image #1311 -Extended Image #1312 -Extended Image #1313 -Extended Image #1314 -Extended Image #1315 -Extended Image #1316 -Extended Image #1317 -Extended Image #1318 -Extended Image #1319 -Extended Image #1320 -Extended Image #1321 +Askosi Embedded Overlay +Maverick (Upstart) +Maverick (Upstart) Shadow +Maverick (Upstart) Remains +Vulture (Upstart) +Vulture (Upstart) Shadow +Vulture (Upstart) Engine +Goremast +Goremast Shadow +Eidolon (Upstart) +Eidolon (Upstart) Shadow +Eidolon (Upstart) Remains +Cutlass +Cutlass Shadow +Cutlass Turret +Broadside +Broadside Shadow +Broadside Turret +Ecclesiast (Astral) +Ecclesiast (Astral) Shadow Extended Image #1322 Extended Image #1323 Extended Image #1324 diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat index d9c958d0..d904a7e2 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 97a30d80..bfa2d11b 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4186,14 +4186,14 @@ Akreno Passive Charge 03 Akreno Passive Proc 01 Akreno Passive Proc 02 Akreno Passive Proc 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 +Seraph Irradiate Cast 01 +Broadside Weaponfire 01 +Broadside Weaponfire 02 +Broadside Weaponfire 03 +Cutlass Weaponfire 01 +Cutlass Weaponfire 02 +Cutlass Weaponfire 03 +Cutlass Weaponfire 04 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index b42584d5..a92f4740 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4174,6 +4174,9 @@ cm\a\zonguard\wf-b-03.wav cm\a\agonist\wf-01.wav cm\a\agonist\wf-02.wav cm\a\agonist\wf-03.wav +cm\a\petract\wf-01.wav +cm\a\petract\wf-02.wav +cm\a\petract\wf-03.wav cm\a\akreno\wf-01.wav cm\a\akreno\wf-02.wav cm\a\akreno\wf-03.wav @@ -4182,4 +4185,12 @@ cm\a\akreno\pas-charge-02.wav cm\a\akreno\pas-charge-03.wav cm\a\akreno\pas-proc-01.wav cm\a\akreno\pas-proc-02.wav -cm\a\akreno\pas-proc-03.wav \ No newline at end of file +cm\a\akreno\pas-proc-03.wav +cm\t\seraph\irradiate-cast-01.wav +cm\f-t\broadside\wf-01.wav +cm\f-t\broadside\wf-02.wav +cm\f-t\broadside\wf-03.wav +cm\f-t\cutlass\wf-01.wav +cm\f-t\cutlass\wf-02.wav +cm\f-t\cutlass\wf-03.wav +cm\f-t\cutlass\wf-04.wav \ No newline at end of file diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index 855bcc5f..a6db21e2 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 547181d2..33746dbf 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1114,16 +1114,16 @@ Obelisk Auxine Constituent Missionary Weaponhit -Extended Sprite #600 -Extended Sprite #601 -Extended Sprite #602 -Extended Sprite #603 -Extended Sprite #604 -Extended Sprite #605 -Extended Sprite #606 -Extended Sprite #607 -Extended Sprite #608 -Extended Sprite #609 +Maverick (Upstart) +Maverick (Upstart) Remains +Vulture (Upstart) +Goremast +Eidolon (Upstart) +Cutlass +Cutlass Turret +Broadside +Broadside Turret +Ecclesiast (Astral Omen) Extended Sprite #610 Extended Sprite #611 Extended Sprite #612 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index b7654ad9..e79fdce4 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 b4dd82d0..a31fe976 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -571,10 +571,10 @@ Broadside Turret (Upstart) Terran Vulture (Upstart) Terran Cutlass (Futurist) Cutlass Turret (Futurist) -Extended Unit #346 -Extended Unit #347 -Extended Unit #348 -Extended Unit #349 +Terran Maverick (Upstart) +Protoss Ecclesiast (Astral) +Terran Eidolon (Upstart) +Terran Ajax (Futurist) Extended Unit #350 Extended Unit #351 Extended Unit #352 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 92a7d354..fd60a853 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 a563133a..cb54f3bd 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 a576655e..a0e4a668 100644 Binary files a/mpq/datreq/Tech.graft and b/mpq/datreq/Tech.graft differ diff --git a/mpq/datreq/Units.graft b/mpq/datreq/Units.graft index 41dfbb79..9f774ebe 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 f465873d..2f8a59af 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 459fcd78..6d6c406c 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -314,8 +314,8 @@ <0> <0> Spider Mines<0> -<0> -<0> +Goremasts<0> +Piety Wards<0> <0> <0> <0> @@ -329,7 +329,7 @@ Anchor Attack requires:<10> Loaded ranged combatant<0> ¤<3><4>Heretical Bedlam <2>(passive)<10>Dying hostiles that were struck by the Pariah in the last 2 seconds have their corpses ascended after 1 second.<0> <0> ¤<3><4>Swarming Omen <2>(passive)<10>Hostiles afflicted by the this strain's attacks grant 125% movement speed to any of this strain's allies within 10 range.<0> -<0> +e<3><4>Plant Goremast <1>(<3>E<1>)<10>Places a Goremast at the target site. Goremasts damage and cripple targets that trip them.<0> d<3><4>Divine Discipline <1>(<3>D<1>)<10>Creates an alchemical field at the target location. Allies within the field gain 25% increased attack speed, while enemies within the field suffer 25% reduced attack speed.<0> d<3><4>Rejoinder of Service <1>(<3>D<1>)<10>Augments the combatant for 5 seconds, empowering their attacks to ignore armor.<10>If a combatant dies while under this effect, all hostiles within its vision range are pulled towards it by 2 range.<0> t<3><4>Inject Stimpack <1>(<3>T<1>)<10>Take a dangerous injection that deals 5 damage. After a 1.5 second delay, gain 75% movement speed and 100% attack speed for 7.5 seconds.<0> @@ -387,7 +387,7 @@ v<1><4>Warp in Prostration Stage <1>(<3>V<1>)<10>Relentless disciple production. z<1><4>Mutate into Zorkiz Shroud <1>(<3>Z<1>)<10>Control node. Enables Zoryusthaleths and Lakizilisks.<0> e<1><4>Warp in Rogue Gallery <1>(<3>E<1>)<10>Profane disciple production.<0> <0> -<0> +a<1><4>Build Cutlass <1>(<3>A<1>)<10>Assault armor.<0> c<1><4>Raise Constituent <1>(<3>C<1>)<10>Skybound worker.<0> e<3><4>Salvage <1>(<3>E<1>)<10>Orders the builder to deconstruct the target mechanical unit or structure, returning up to 33% of its resource cost during the channel.<0> e<3><4>Rapid Rendezvous <1>(<3>E<1>)<10>Leaps to the target ground ally within 5 range, activating Impact Dissipation for all allies within 3 range of the jump target.<0> @@ -428,7 +428,7 @@ Plasma Shields<0> t<1><4>Warp in Monument of Sin <1>(<3>T<1>)<10>Capital stellar production.<0> Axtoth Axis requires:<10> Othstol Oviform<0> f<1><4>Bestow Harakan <1>(<3>F<1>)<10>Dutiful frontline infantry.<0> -<0> +t<1><4>Build Broadside <1>(<3>T<1>)<10>Encroaching armor.<0> x<1><4>Morph into Axitrilisk <1>(<3>X<1>)<10>Sustaining skirmisher strain.<0> Axitrilisk requires:<10> Axtoth Axis<0> ¤<3><4>Perpetual Wind <2>(passive)<10>Upon taking fatal damage, Axitrilisks revert to a weaponless state and attempt to rejuvenate.<10><10>Should they survive in this form for eight seconds, Axitrilisks recover full use of their weapon.<0> @@ -451,8 +451,8 @@ d<1><4>Morph into Mortothrokor <1>(<3>D<1>)<10>Rampaging melee strain.<0> w<1><4>Build Tinkerer's Tower <1>(<3>W<1>)<10>Enables Sirens and Strigas.<0> e<1><4>Profanate Empress <1>(<3>E<1>)<10>Reinforcing destroyer.<0> ¤<3><4>Escape Velocity <2>(passive)<10>Algoztalisk projectiles gain +1 armor penetration for every range traveled.<0> -<0> -<0> +¤<3><4>Shrapnel Strike <2>(passive)<10>Goremasts inflict 15 damage to all targets within 2 range, and slow their attack and movement speeds by 33% for 3 seconds. If the trap is destroyed or manually detonated, nearby targets are only slowed.<0> +z<3><4>Detonate <1>(<3>Z<1>)<10>Trips the Goremast immediately, applying its slow effects to all combatants within 2 range.<0> ¤<3><4>Advancing Motion <2>(passive)<10>This combatant's primary weapon can be fired while moving.<0> Iron Foundry requires:<10> Daedala<0> f<1><4>Build Iron Foundry <1>(<3>F<1>)<10>Advanced vehicle production.<0> @@ -586,7 +586,7 @@ Protathalor requires:<10> Mutath Spire<0> a<1><4>Train Maverick <1>(<3>A<1>)<10>All-purpose infantry.<0> g<1><4>Train Eidolon <1>(<3>G<1>)<10>Disruptive specialist infantry.<0> f<1><4>Train Harakan <1>(<3>F<1>)<10>Durable frontline infantry.<0> -v<1><4>Build Vulture <1>(<3>V<1>)<10>Fast anti-infantry harasser.<0> +v<1><4>Build Vulture <1>(<3>V<1>)<10>Harrying vehicle.<0> g<1><4>Build Goliath <1>(<3>G<1>)<10>Versatile walker.<0> t<1><4>Build Phalanx <1>(<3>T<1>)<10>Durable artillery.<0> s<1><4>Build Mason <1>(<3>S<1>)<10>Worker.<0> @@ -1067,7 +1067,7 @@ z<0><4>Advanced Warp <1>(<3>Z<1>)<0> b<0><4>Basic Warp <1>(<3>B<1>)<0> g<1><4>Warp in Gladius <1>(<3>G<1>)<10>Crowd-controlling corvette.<0> <0> -<0> +Eyelet<0> g<1><4>Build Monogram <1>(<3>G<1>)<10>Reinforcing hovercraft.<0> g<1><4>Build Gorgon <1>(<3>G<1>)<10>All-purpose corvette.<0> a<1><4>Build Salamander <1>(<3>A<1>)<10>Area-denial cruiser.<0> @@ -1475,8 +1475,8 @@ Mortothrokor requires:<10> Axtoth Axis<0> d<1><4>Manifest Droleth <1>(<3>D<1>)<10>Worker strain.<0> a<1><4>Manifest Mason <1>(<3>A<1>)<10>Worker.<0> s<1><4>Manifest Scribe <1>(<3>S<1>)<10>Worker automata.<0> -<0> -<0> +Cutlass requires:<10> Scrapyard<0> +Broadside requires:<10> Palladium<0> ¤<3><4>Transcendent Tide <2>(passive)<10>Each time a Potentate attacks an enemy within 3 range, all allies within 3 range are ascended, granting 25% increased attack speed.<0> a<1><4>Warp in Potentate <1>(<3>A<1>)<10>Ascendent ranger<0> a<1><4>Train Hotshot <1>(<3>A<1>)<10>Close-combat infantry.<0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index e19ea6b4..9a68bffe 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 2cda70e0..b8f1964f 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 03bc3b4f..c96ed6c6 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -1795,6 +1795,7 @@ SeraphBaseDeath: SeraphBaseCastSpell: imgol 539 0 0 # Seraph Overlay (Part2) (thingy\tveGlowO.grp) nobrkcodestart + playsnd 4188 wait 3 castspell nobrkcodeend @@ -20567,4 +20568,280 @@ SerathielCastSpell: SerathielWalking: setvertpos 0 imgol 2233 0 0 # Serathiel Engines (cm\terran\serathiel-engine.grp) - goto SerathielLocal00 \ No newline at end of file + goto SerathielLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2319 Broadside (cm\faction-t\broadside.grp) +.headerstart +IsId 842 +Type 23 +Init BroadsideInit +Death BroadsideDeath +GndAttkInit [NONE] +AirAttkInit [NONE] +Unused1 BroadsideUnused1 +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle [NONE] +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking BroadsideWalking +WalkingToIdle BroadsideWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit Broadside_BaseStarEditInit +.headerend +# ----------------------------------------------------------------------------- # + +BroadsideInit: + wait 1 + imgulnextid 0 0 # Broadside Shadow + setfldirect 12 +BroadsideWalkingToIdle: + playfram 0x00 + goto SkryrokorLocal00 + +BroadsideDeath: + playsnd 317 # Terran\TANK\TTaDth00.WAV + imgol 333 0 0 # Explosion2 (Medium) (thingy\tBangL.grp) + sprol 156 0 0 # Matraleth Death (zerg\zquDeath.grp) + wait 3 + lowsprul 273 0 0 # Terran Building Rubble Small + wait 1 + end + +BroadsideUnused1: + wait 1 + nobrkcodestart + playsnd 1699 + sprol 744 0 0 + wait 12 + setfldirect 13 + nobrkcodeend + goto BroadsideWalkingToIdle + +BroadsideGndAttkInit: + playfram 0x00 + wait 1 + imgol 1499 0 0 # Broadside Muzzle Flash + playsndbtwn 1639 1641 # Broadside weapon 1 fire 01, 02, 03 + attackwith 1 + wait 1 + gotorepeatattk + ignorerest + goto BroadsideWalkingToIdle + +BroadsideWalking: + move 4 + wait 1 + playfram 0x00 + move 4 + wait 1 + playfram 0x11 + move 4 + wait 1 + playfram 0x22 + goto BroadsideWalking + +Broadside_BaseStarEditInit: + setfldirect 12 + imgoluselo 2321 2 0 # Broadside Turret (cm\faction-t\broadside-turret.grp) + wait 1 + imgul 2320 0 0 # Broadside Base Shadow (cm\faction-t\broadside-shadow.grp) + setfldirect 12 + playfram 0x00 + goto InfestedTerranWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2321 Broadside Turret (cm\faction-t\broadside-turret.grp) +.headerstart +IsId 843 +Type 13 +Init BroadsideTurretInit +Death Generic_Wait1End +GndAttkInit BroadsideTurretGndAttkInit +AirAttkInit [NONE] +Unused1 SkryrokorLocal00 +GndAttkRpt BroadsideTurretGndAttkInit +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle BroadsideTurretInit +AirAttkToIdle [NONE] +Unused2 [NONE] +Walking SkryrokorLocal00 +WalkingToIdle BroadsideTurretInit +SpecialState1 SkryrokorLocal00 +.headerend +# ----------------------------------------------------------------------------- # + +BroadsideTurretInit: + playfram 0x00 +BroadsideTurretLocal00: + wait 1 + waitrand 62 74 + randcondjmp 230 BroadsideTurretLocal00 + sigorder 8 + randcondjmp 127 BroadsideTurretLocal01 + turnccwise 1 + wait 3 + turnccwise 1 + wait 3 + turnccwise 1 + goto BroadsideTurretLocal00 + +BroadsideTurretLocal01: + turn1cwise + wait 3 + turn1cwise + wait 3 + turn1cwise + goto BroadsideTurretLocal00 + +BroadsideTurretGndAttkInit: + wait 1 + nobrkcodestart + playfram 0x00 + playsndbtwn 4189 4191 # Broadside weaponfire 01, 02, 03 + imgol 536 0 0 # Phalanx (Tank) Turret Attack Overlay (thingy\ettFlash.grp) + wait 1 + attackwith 1 + wait 3 + nobrkcodeend + gotorepeatattk + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2316 Cutlass (cm\faction-t\cutlass.grp) +.headerstart +IsId 844 +Type 23 +Init CutlassInit +Death CutlassDeath +GndAttkInit CutlassGndAttkInit +AirAttkInit CutlassGndAttkInit +Unused1 CutlassUnused1 +GndAttkRpt CutlassGndAttkInit +AirAttkRpt CutlassGndAttkInit +CastSpell [NONE] +GndAttkToIdle InfestedTerranWalkingToIdle +AirAttkToIdle InfestedTerranWalkingToIdle +Unused2 [NONE] +Walking CutlassWalking +WalkingToIdle InfestedTerranWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit Cutlass_Tank_BaseStarEditInit +.headerend +# ----------------------------------------------------------------------------- # + +CutlassInit: + imgulnextid 0 0 # Cutlass Shadow (cm\faction-t\cutlass-shadow.grp) + playfram 0x00 + goto InfestedTerranWalkingToIdle + +CutlassDeath: + playsndbtwn 1385 1386 # Cutlass death 01, 02 + imgol 332 0 -5 # Explosion2 (Small) (thingy\tBangS.grp) + wait 3 + lowsprul 845 0 0 # Terran Unit Rubble Small + wait 1 + end + +CutlassUnused1: + wait 1 + nobrkcodestart + playsndbtwn 1705 1706 + sprol 742 0 0 + setfldirect 12 + wait 12 + nobrkcodeend + goto InfestedTerranWalkingToIdle + +CutlassGndAttkInit: + playfram 0x00 + wait 1 + nobrkcodestart + playfram 0x100 + playsndbtwn 4192 4195 # Cutlass weaponfire 01, 02, 03, 04 + attackwith 1 + playfram 0x00 + wait 3 + nobrkcodeend + gotorepeatattk + goto InfestedTerranWalkingToIdle + +CutlassWalking: + playfram 0x20 + move 4 + wait 1 + playfram 0x40 + move 4 + wait 1 + playfram 0x60 + move 4 + wait 1 + playfram 0x80 + move 4 + wait 1 + playfram 0xA0 + move 4 + wait 1 + playfram 0xC0 + move 4 + wait 1 + playfram 0xE0 + move 4 + wait 1 + goto CutlassWalking + +Cutlass_Tank_BaseStarEditInit: + setfldirect 12 + imgoluselo 2318 2 0 # Cutlass (Tank) Turret (terran\matador-turret.grp) + wait 1 + imgul 2317 0 0 # Cutlass (Tank) Base Shadow (terran\matador-shadow.grp) + setfldirect 12 + playfram 0x00 + goto InfestedTerranWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2318 Cutlass Turret (cm\faction-t\cutlass-turret.grp) +.headerstart +IsId 845 +Type 13 +Init InfestedTerranWalkingToIdle +Death Generic_Wait1End +GndAttkInit CutlassGndAttkInit +AirAttkInit CutlassGndAttkInit +Unused1 [NONE] +GndAttkRpt CutlassGndAttkInit +AirAttkRpt CutlassGndAttkInit +CastSpell [NONE] +GndAttkToIdle InfestedTerranWalkingToIdle +AirAttkToIdle InfestedTerranWalkingToIdle +Unused2 [NONE] +Walking CutlassWalking +WalkingToIdle InfestedTerranWalkingToIdle +SpecialState1 SkryrokorLocal00 +.headerend +# ----------------------------------------------------------------------------- # \ No newline at end of file diff --git a/mpq/sound/cm/f-t/broadside/wf-01.wav b/mpq/sound/cm/f-t/broadside/wf-01.wav new file mode 100644 index 00000000..d31c9d82 Binary files /dev/null and b/mpq/sound/cm/f-t/broadside/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/broadside/wf-02.wav b/mpq/sound/cm/f-t/broadside/wf-02.wav new file mode 100644 index 00000000..d574fe71 Binary files /dev/null and b/mpq/sound/cm/f-t/broadside/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/broadside/wf-03.wav b/mpq/sound/cm/f-t/broadside/wf-03.wav new file mode 100644 index 00000000..e50f5cf8 Binary files /dev/null and b/mpq/sound/cm/f-t/broadside/wf-03.wav differ diff --git a/mpq/sound/cm/f-t/cutlass/wf-01.wav b/mpq/sound/cm/f-t/cutlass/wf-01.wav new file mode 100644 index 00000000..9a289beb Binary files /dev/null and b/mpq/sound/cm/f-t/cutlass/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/cutlass/wf-02.wav b/mpq/sound/cm/f-t/cutlass/wf-02.wav new file mode 100644 index 00000000..5a5f5b92 Binary files /dev/null and b/mpq/sound/cm/f-t/cutlass/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/cutlass/wf-03.wav b/mpq/sound/cm/f-t/cutlass/wf-03.wav new file mode 100644 index 00000000..272046df Binary files /dev/null and b/mpq/sound/cm/f-t/cutlass/wf-03.wav differ diff --git a/mpq/sound/cm/f-t/cutlass/wf-04.wav b/mpq/sound/cm/f-t/cutlass/wf-04.wav new file mode 100644 index 00000000..dc3d79a3 Binary files /dev/null and b/mpq/sound/cm/f-t/cutlass/wf-04.wav differ diff --git a/mpq/sound/cm/t/seraph/irradiate-cast-01.wav b/mpq/sound/cm/t/seraph/irradiate-cast-01.wav new file mode 100644 index 00000000..3c6c7ba4 Binary files /dev/null and b/mpq/sound/cm/t/seraph/irradiate-cast-01.wav differ diff --git a/mpq/unit/cm/faction-t/broadside-shadow.grp b/mpq/unit/cm/faction-t/broadside-shadow.grp new file mode 100644 index 00000000..61edc6a7 Binary files /dev/null and b/mpq/unit/cm/faction-t/broadside-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/broadside-turret.grp b/mpq/unit/cm/faction-t/broadside-turret.grp new file mode 100644 index 00000000..71f49b15 Binary files /dev/null and b/mpq/unit/cm/faction-t/broadside-turret.grp differ diff --git a/mpq/unit/cm/faction-t/broadside.grp b/mpq/unit/cm/faction-t/broadside.grp new file mode 100644 index 00000000..bbca507f Binary files /dev/null and b/mpq/unit/cm/faction-t/broadside.grp differ diff --git a/mpq/unit/cm/faction-t/cutlass-shadow.grp b/mpq/unit/cm/faction-t/cutlass-shadow.grp new file mode 100644 index 00000000..60add86c Binary files /dev/null and b/mpq/unit/cm/faction-t/cutlass-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/cutlass-turret.grp b/mpq/unit/cm/faction-t/cutlass-turret.grp index 71f49b15..151cfb6a 100644 Binary files a/mpq/unit/cm/faction-t/cutlass-turret.grp and b/mpq/unit/cm/faction-t/cutlass-turret.grp differ diff --git a/mpq/unit/cm/faction-t/cutlass-turret.lol b/mpq/unit/cm/faction-t/cutlass-turret.lol new file mode 100644 index 00000000..eb157d14 Binary files /dev/null and b/mpq/unit/cm/faction-t/cutlass-turret.lol differ diff --git a/mpq/unit/cm/faction-t/cutlass.grp b/mpq/unit/cm/faction-t/cutlass.grp new file mode 100644 index 00000000..d735f059 Binary files /dev/null and b/mpq/unit/cm/faction-t/cutlass.grp differ diff --git a/mpq/unit/cm/faction-t/eidolon-upstart-death.grp b/mpq/unit/cm/faction-t/eidolon-upstart-death.grp new file mode 100644 index 00000000..fe9c2f98 Binary files /dev/null and b/mpq/unit/cm/faction-t/eidolon-upstart-death.grp differ diff --git a/mpq/unit/cm/faction-t/eidolon-upstart-shadow.grp b/mpq/unit/cm/faction-t/eidolon-upstart-shadow.grp new file mode 100644 index 00000000..1c0015b8 Binary files /dev/null and b/mpq/unit/cm/faction-t/eidolon-upstart-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/eidolon-upstart.grp b/mpq/unit/cm/faction-t/eidolon-upstart.grp new file mode 100644 index 00000000..7b55b47f Binary files /dev/null and b/mpq/unit/cm/faction-t/eidolon-upstart.grp differ diff --git a/mpq/unit/cm/faction-t/goremast.grp b/mpq/unit/cm/faction-t/goremast.grp index ea4dd444..4081db07 100644 Binary files a/mpq/unit/cm/faction-t/goremast.grp and b/mpq/unit/cm/faction-t/goremast.grp differ diff --git a/mpq/unit/cm/faction-t/maverick-upstart-death.grp b/mpq/unit/cm/faction-t/maverick-upstart-death.grp new file mode 100644 index 00000000..64477df3 Binary files /dev/null and b/mpq/unit/cm/faction-t/maverick-upstart-death.grp differ diff --git a/mpq/unit/cm/faction-t/maverick-upstart-shadow.grp b/mpq/unit/cm/faction-t/maverick-upstart-shadow.grp new file mode 100644 index 00000000..4752907a Binary files /dev/null and b/mpq/unit/cm/faction-t/maverick-upstart-shadow.grp differ diff --git a/mpq/unit/cm/faction-t/maverick-upstart.grp b/mpq/unit/cm/faction-t/maverick-upstart.grp new file mode 100644 index 00000000..6e7ff453 Binary files /dev/null and b/mpq/unit/cm/faction-t/maverick-upstart.grp differ diff --git a/mpq/unit/cm/faction-t/vulture-upstart-engine.grp b/mpq/unit/cm/faction-t/vulture-upstart-engine.grp new file mode 100644 index 00000000..eeb51f48 Binary files /dev/null and b/mpq/unit/cm/faction-t/vulture-upstart-engine.grp differ diff --git a/mpq/unit/cm/faction-t/vulture-upstart.grp b/mpq/unit/cm/faction-t/vulture-upstart.grp new file mode 100644 index 00000000..d226f718 Binary files /dev/null and b/mpq/unit/cm/faction-t/vulture-upstart.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index e1cf10af..fc508328 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 b8005b7d..dcb9af4b 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 32ef92aa..331534c3 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 64b3eb7a..cfb0f07b 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 39c39a81..3644842d 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -1,5 +1,5 @@ -# 27 January 2026 -## Year 4, month 1, patch 2 +# 11 February 2026 +## Year 4, month 2, patch 1 ## Patch goals - Continue balancing for all races @@ -11,130 +11,29 @@ # Core changes -## Random (c. Jesse) -- Now supports **Askosi**! -- Now displays the race assigned to players on map start -- It is now possible to select which races will be eligible for random selection via config! - -## User Interface (c. Jesse) -- Launch screen version string now displays build version -- CrownLink passwords are now shown in lobby, if applicable - ## Bugfixes -- **Stability:** - - Fixed common Solarion crash (r. MuskyHusky) - - Fixed Grandstand cargo crash (r. ConcealedOrganic) - **Audiovisual** - - Fixed vespene and supply icons for Askosi (c. Jesse) - - Fixed various text display issues related to unit training and cancel context + - Corrected strings for being out of energy as Askosi (r. Sosij) ## Audiovisuals -- New sprite for: - - **Zealot** (incl. Starbound variant; c. Solstice) - - **Rove** -- New unit responses for: - - **Striga** (c. OunceOfMilia) +- New cast SFX for **Seraph Irradiate** # Balance changes -## Terran -- [Lodestone](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/lodestone): - - Sight range 10 » 12 -- [Atlas](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/atlas): - - Build time 75 » 60 -- [Daedala](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/daedala): - - Build time 120 » 100 - -## Protoss -- [Atreus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/atreus): - - Resource costs 200/50 » 200/25 -- [Grand Library](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/grand-library): - - Resource costs 250/50 » 225/50 - - Build time 55 » 60 -- [Prostration Stage](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/prostration-stage): - - Resource costs 400/200 450/200 - - Build time 65 » 70 -- [Unitary Union](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/unitary-union): - - Resource costs 400/350 450/350 - - Build time 65 » 70 -- [Argosy](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/argosy): - - Build time 70 » 75 - -## Zerg -- **Bone of Reflection:** - - *Used by Tethzorokor, Zarcavrokor** - - Armor penetration 3 » 0 -- [Agrileth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/agrileth): - - Resource costs 150/100 » 150/50 - - Transport weight 8 » 6 -- [Tethzorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/tethzorokor): - - HP 240 » 220 -- [Irol Iris](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/irol-iris): - - Build time 60 » 20 -- [Othstol Oviform](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/othstol-oviform): - - Build time 120 » 40 - ## Askosi -- **New arrivals:** - - T1: Eyelet (from Proselyte) - - T2: Constituent (from Bounty) - - T2: Biotic (Aphorist, Thaumalogue, Avatar, Doronin), Conduit, Bestiary - - T2: Skybound (Akreno, Iconoclast, Crematorium), Astrolabe -- **Booming Blast:** - - Used by **Vicar** - - Now deals friendly splash -- **Rematerialize:** - - Used by **Vicar** and **Emissary** - - Ability range 5 » 6 -- [Dyad](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/dyad): - - Resource costs 50/50 » 50/25 -- [Mimic](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/mimic): - - Sight range 8 » 9 - - **Scrapworld: Vital Remains:** - - Now grants 1 non-stacking armor pen to allies for 4 seconds -- [Vicar](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/vicar): - - Resource costs 75/50 » 100/50 - - **Ospo Twinshard:** - - Weapon range 7 » 6 -- [Rove](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/rove): - - Armor 1 » 0 - - Collision size reduced by ~10% - - Acceleration adjusted -- [Scepter](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/scepter): - - **Principality Assembly:** - - While active, now grants 1 stacking armor pen to allies within 8 range -- [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): - - Resource costs 100/50 » 100/25 - - Build time 18 » 15 - - HP 120 » 100 - - **Usko Scrapray:** - - Weapon cooldown 0.63 » 0.5 -- [Tirade](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/tirade): - - Armor 2 » 1 - - **Ikta Driver:** - - Weapon damage 10 » 7 -- [Grandstand](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/grandstand): - - No longer has **Booming Blast** - - Now has **Power Overload** -- [Chantry](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/chantry): - - Resource costs 100/50 » 75/50 - - HP 350 » 400 -- [Radix](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/radix): - - Build time 50 » 65 -- [Cipher](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/cipher): - - Build time 65 » 75 -- [Function](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/function): - - Build time 60 » 75 -- [Gauntlet](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/gauntlet): - - Resource costs 200/75 » 200/100 - - Build time 80 » 90 - [Cosmoscope](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=askosi/cosmoscope): - - Resource costs 100/150 100/100 - - Now requires Radix OR Function, from Cipher OR Gauntlet \ No newline at end of file + - Resource costs 100/150 » 100/100 + +# New units + +## Futurist Federation +- [Cutlass](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cutlass): + - Matador replacement with Kinetic Penetration and no deployment + +## Upstart Terrans +- [Maverick (Upstart)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/maverick-upstart): + - Frailer Maverick variant with faster-acting, less intense Stimpack +- [Vulture (Upstart)](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/vulture-upstart): + - Faster Vulture variant that lays [Goremast](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/goremast)s +- [Broadside](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/broadside): + - Phalanx replacement with Fore Castle and no deployment \ No newline at end of file diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 9f7006ba..c1d7ca21 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ