diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex index ed1ee2b4..60938a99 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 a226adc8..7c6c6457 100644 --- a/mpq/arr/flingy.txt +++ b/mpq/arr/flingy.txt @@ -731,10 +731,10 @@ Fragmentary Shells (with damage) Floor Flame Trap Zethalisk Athuzelon -Extended Flingy #525 -Extended Flingy #526 -Extended Flingy #527 -Extended Flingy #528 +Ifrit (Tank Mode) +Ifrit Turret (Tank Mode) +Ifrit (Siege Mode) +Ifrit Turret (Siege Mode) Extended Flingy #529 Extended Flingy #530 Extended Flingy #531 diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex index a9846493..bc1bcce4 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 c9edad0c..e933ba07 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 16acfd26..ebd90b3e 100644 --- a/mpq/arr/images.txt +++ b/mpq/arr/images.txt @@ -2514,16 +2514,16 @@ Athuzelon Athuzelon Glow Athuzelon Shadow Athuzelon Warp Flash -Extended Image #1514 -Extended Image #1515 -Extended Image #1516 -Extended Image #1517 -Extended Image #1518 -Extended Image #1519 -Extended Image #1520 -Extended Image #1521 -Extended Image #1522 -Extended Image #1523 +Rejoinder of Service (Small) +Rejoinder of Service (Medium) +Rejoinder of Service (Large) +Rejoinder of Service (XLarge) +Ifrit (Tank Mode) +Ifrit (Tank Mode) Shadow +Ifrit (Tank Mode) Turret +Ifrit (Siege Mode) +Ifrit (Siege Mode) Shadow +Ifrit (Siege Mode) Turret Extended Image #1524 Extended Image #1525 Extended Image #1526 diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex index a212e0a4..9702ce45 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 15b03f04..0c34573a 100644 --- a/mpq/arr/sprites.txt +++ b/mpq/arr/sprites.txt @@ -1212,10 +1212,10 @@ Zethalisk Zethalisk Remains Athuzelon Athuzelon Glow -Extended Sprite #698 -Extended Sprite #699 -Extended Sprite #700 -Extended Sprite #701 +Ifrit (Tank Mode) +Ifrit Turret (Tank Mode) +Ifrit (Siege Mode) +Ifrit Turret (Siege Mode) Extended Sprite #702 Extended Sprite #703 Extended Sprite #704 diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex index bdda1829..72840b33 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 949b3eb8..8b960434 100644 --- a/mpq/arr/units.txt +++ b/mpq/arr/units.txt @@ -655,11 +655,11 @@ Forerunner Incaendium Forerunner Ossum Forerunner Voluntatis Protoss Athuzelon -Extended Unit #430 -Extended Unit #431 -Extended Unit #432 -Extended Unit #433 -Extended Unit #434 +Terran Ifrit (Tank) +Ifrit Turret (Tank) +Terran Ifrit (Siege) +Ifrit Turret (Siege) +Askosi Magian Extended Unit #435 Extended Unit #436 Extended Unit #437 diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex index 26fd3721..beadd1f9 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 452f50a1..9011f178 100644 --- a/mpq/arr/weapons.txt +++ b/mpq/arr/weapons.txt @@ -317,8 +317,8 @@ Vigil Autocannon (Gun Trap) Flamethrower (Flame Trap) Zethal Spores (Zethalisk) Sacred Saber (Athuzelon) -Extended Weapon #190 -Extended Weapon #191 +Incendiary Cannon (Ifrit, Tank) +Incendiary Strike Cannon (Ifrit, Siege) Extended Weapon #192 Extended Weapon #193 Extended Weapon #194 diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft index 38be2c89..84a8ccbe 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 23cc30da..c0382658 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 45d27e47..08117f2f 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 8e04c224..954c3c47 100644 Binary files a/mpq/game/icons.grp and b/mpq/game/icons.grp differ diff --git a/mpq/music/askosi2.ogg b/mpq/music/askosi2.ogg index 293e5cd5..5d2919f0 100644 Binary files a/mpq/music/askosi2.ogg and b/mpq/music/askosi2.ogg differ diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index a6896581..2e2c2c38 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -306,8 +306,8 @@ <0> <0> <0> -<0> -<0> +e<3><4>Siege Mode <1>(<3>E<1>)<10>Switches forms, gaining splash radius and weapon range, while disabling movement.<0> +e<0><4>Tank Mode <1>(<3>E<1>)<10>Returns the Ifrit's weapon and mobility to normal.<0> ¤<3><4>Plasma Conduit <2>(passive)<10>Effects that restore shields are twice as effective for this combatant.<0> a<1><4>Build Memphis <1>(<3>A<1>)<10>Flak microtank.<0> Memphis Requires:<10> Scrapyard<0> @@ -568,7 +568,7 @@ g<1><4>Morph into Agrileth <1>(<3>G<1>)<10>Construction strain.<0> x<1><4>Build Aion <1>(<3>X<1>)<10>Reclaiming armor.<0> r<1><4>Morph into Nathrelisk <1>(<3>R<1>)<10>Sustaining fighter strain.<0> ¤<3><4>Corrosive Pathogen <2>(passive)<10>This strain's attacks debuff all hostiles within 4 range of their target, reducing their attack speed by 25% and armor by 1 for 3 seconds.<0> -¤<3><4>Corrosive Touch <2>(passive)<10>This strain's attacks debuff enemies, increasing attack cooldown by 25% and reducing armor by 1 for 3 seconds.<0> +¤<3><4>Corrosive Touch <2>(passive)<10>This strain's attacks debuff enemies, reducing their attack speed by 25% and armor by 1 for 3 seconds.<0> Nathrelisk requires:<10> Vornath Pond<0> Stewards<0> ESC<0> @@ -1104,7 +1104,7 @@ Alkag Iteth requires:<10> Irol Iris<0> e<3><4>Place Piety Ward <1>(<3>E<1>)<10>Places a defensive ward that shields allies from attacks.<0> a<1><4>Assemble Renesair <1>(<3>A<1>)<10>Reconstructing interceptor.<0> ¤<3><4>Lucilleri Pheremones <2>(passive)<10>Allies within 5 range of the Sasyrvoleth have 100% base lifesteal.<0> -¤<3><4>Astral Tether <2>(passive)<10>When the Matrix attacks, it radiates power from both itself and its target, restoring 2 shields to any allies of the Matrix within 3 range.<0> +¤<3><4>Astral Tether <2>(passive)<10>When the Matrix attacks, it radiates power from both itself and its target, restoring 5 shields to any allies of the Matrix within 3 range.<0> ¤<3><4>Triumphant Rise <2>(passive)<10>Victims of this warrior's attacks become energized for 1.5 seconds. Attacks on energized enemies bleed 2 shield points to all allies of the warrior within 3 range.<0> d<1><4>Train Madcap <1>(<3>D<1>)<10>Mechanized infantry.<0> ¤<3><4>Cabeirus Feeders <2>(passive)<10>While stationary, the Madcap gains a 15% attack speed bonus per attack, capping at a 150% bonus. This bonus falls off by 20% for every second the Madcap spends moving.<0> @@ -1233,8 +1233,8 @@ Nanite Drones:<10> Must be in Smithy Mode<0> ¤<3><4>Retaliation Assembly<2>(passive)<10>Upon taking fatal damage while mobile, Thaumalogues embed themselves into the surface, becoming immobile and more heavily-armored. During this time, they gain increased 50% attack speed when damaged.<0> ¤<3><4>Scrapworld: Ash Heap <2>(passive)<10>This combatant's attacks debuff hostiles for 2 seconds. While debuffed, the hostiles lose 1 armor every 2 seconds.<10>If a victim dies during this time, its corpse is turned to ash, spreading the armor debuff to hostiles within 2 range.<0> ¤<3><4>Corpse Cocoon <2>(passive)<10>Corpses touched by this strain are consumed, transforming into eggs that spawn an additional combatant. The gestation time is equal to half of the strain's build time.<0> -<0> -<0> +t<1><4>Build Ifrit <1>(<3>T<1>)<10>Incendiary artillery.<0> +Ifrit requires:<10> Palladium<0> <0> <0> ¤<3><4>Villanous Fervor <2>(passive)<10>As long as the Mind Tyrant remains within 10 range, damage dealt to the malefactor is first inflicted upon the Mind Tyrant's energy, they gain 33% increased movement speed, and hostiles they strike are tyrannized on death.<0> @@ -2316,8 +2316,8 @@ Vigil Autocannon<0> Flamethrower<0> Zethal Spores<0> Sacred Saber<0> -<0> -<0> +Incendiary Cannon<0> +Incendiary Strike Cannon<0> <0> <0> <0> diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl index 1202388c..2f701815 100644 Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ diff --git a/mpq/rez/unitnames.txt b/mpq/rez/unitnames.txt index 044cd151..0b483dbd 100644 --- a/mpq/rez/unitnames.txt +++ b/mpq/rez/unitnames.txt @@ -202,7 +202,7 @@ Terran Scrapyard<0>*<0>Buildings<0> Protoss Crucible<0>*<0>Buildings<0> Dark Swarm<0>*<0>Special<0> Floor Missile Trap<0>*<0>Special<0> -Zerg Kalkiir Lake<0>*<0>Buildings<0> +Floor Hatch<0>*<0>Special<0> Left Upper Level Door<0>*<0>Doors<0> Right Upper Level Door<0>*<0>Doors<0> Left Pit Door<0>*<0>Doors<0> @@ -547,7 +547,7 @@ Askosi Zylode<0>*<0>Buildings<0> Askosi Astrolabe<0>*<0>Buildings<0> Terran Serathiel<0>Hecaton Coalition<0>Factional Units<0> Zerg Malkothrokor<0>*<0>Ground Units<0> -<0> +Zerg Kalkiir Lake<0>*<0>Buildings<0> Askosi Panoply<0>*<0>Structures<0> Askosi Aphorist<0>*<0>Ground Units<0> Askosi Doronin<0>*<0>Ground Units<0> @@ -644,22 +644,22 @@ Terran Memphis<0>Tank<0>Factional Units<0> Memphis Turret<0>Tank<0>Factional Units<0> Terran Memphis<0>Flak<0>Factional Units<0> Memphis Turret<0>Flak<0>Factional Units<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> -<0> +Forerunner Processus<0>*<0>Buildings<0> +Forerunner Aestuarius<0>*<0>Buildings<0> +Forerunner Corcillum<0>*<0>Buildings<0> +Floor Flame Trap<0>*<0>Special<0> +Forerunner Bastilius<0>*<0>Buildings<0> +Forerunner Molaris<0>*<0>Buildings<0> +Forerunner Insignis<0>*<0>Buildings<0> +Forerunner Incaendium<0>*<0>Buildings<0> +Forerunner Ossum<0>*<0>Air Units<0> +Forerunner Voluntatis<0>*<0>Buildings<0> +Protoss Athuzelon<0>Order of the Sacred Saber<0>Factional Units<0> +Terran Ifrit<0>Tank Mode<0>Factional Units<0> +Ifrit Turret<0>Tank Mode<0>Factional Units<0> +Terran Ifrit<0>Siege Mode<0>Factional Units<0> +Ifrit Turret<0>Siege Mode<0>Factional Units<0> +Askosi Magian<0>Sons of Ash<0>Factional Units<0> <0> <0> <0> diff --git a/mpq/scripts/iscript_general.bin b/mpq/scripts/iscript_general.bin index c6cd4108..9f9bf0e8 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 bd667089..340194f3 100644 --- a/mpq/scripts/iscript_general.txt +++ b/mpq/scripts/iscript_general.txt @@ -4906,15 +4906,15 @@ ExigoDeath: ExigoGndAttkInit: wait 1 nobrkcodestart - attack + attackwith 1 wait 6 - attack + attackwith 1 wait 6 - attack + attackwith 1 wait 6 - attack + attackwith 1 wait 6 - attack + attackwith 1 wait 2 nobrkcodeend gotorepeatattk @@ -4989,7 +4989,7 @@ VicereDeath: VicereGndAttkInit: wait 1 - attack + attackwith 1 wait 2 gotorepeatattk ignorerest diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index 7674055f..b378f8b8 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 03a909e0..f161eac3 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -22944,4 +22944,311 @@ CyclopsFragmentaryExplosionDamageInit: CyclopsFragmentaryExplosionDamageDeath: wait 1 - end \ No newline at end of file + end + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 2520 Phalanx (Hecaton) Tank Mode (cm\f-t\phalanx-hecaton.grp) +.headerstart +IsId 866 +Type 23 +Init IfritInit +Death IfritDeath +GndAttkInit IfritGndAttkInit +AirAttkInit IfritGndAttkInit +Unused1 IfritUnused1 +GndAttkRpt IfritGndAttkInit +AirAttkRpt IfritGndAttkInit +CastSpell [NONE] +GndAttkToIdle InfestedTerranWalkingToIdle +AirAttkToIdle InfestedTerranWalkingToIdle +Unused2 [NONE] +Walking IfritWalking +WalkingToIdle InfestedTerranWalkingToIdle +SpecialState1 [NONE] +SpecialState2 [NONE] +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit Ifrit_Tank_BaseStarEditInit +.headerend +# ----------------------------------------------------------------------------- # + +IfritInit: + imgulnextid 0 0 # Phalanx (Hecaton) Shadow (cm\f-t\phalanx-hecaton-shadow.grp) + playfram 0x00 + goto InfestedTerranWalkingToIdle + +IfritDeath: + playsndbtwn 1385 1386 # Phalanx (Hecaton) 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 + +IfritUnused1: + wait 1 + nobrkcodestart + playsndbtwn 1705 1706 + sprol 742 0 0 + setfldirect 12 + wait 12 + nobrkcodeend + goto InfestedTerranWalkingToIdle + +IfritGndAttkInit: + playfram 0x00 + wait 1 + nobrkcodestart + playfram 0x100 + playsnd 68 # Bullet\TTaFir00.wav + attack + wait 1 + playfram 0x00 + wait 5 + playfram 0x100 + playsnd 68 # Bullet\TTaFir00.wav + attack + wait 1 + playfram 0x00 + wait 5 + playfram 0x100 + playsnd 68 # Bullet\TTaFir00.wav + attack + wait 1 + playfram 0x00 + wait 5 + nobrkcodeend + gotorepeatattk + goto InfestedTerranWalkingToIdle + +IfritWalking: + 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 IfritWalking + +Ifrit_Tank_BaseStarEditInit: + setfldirect 12 + imgoluselo 2522 2 0 # Phalanx (Hecaton, Tank) Turret (cm\f-t\phalanx-hecaton-turret.grp) + wait 1 + imgul 2521 0 0 # Phalanx (Hecaton, Tank) Base Shadow (cm\f-t\phalanx-hecaton-shadow.grp) + setfldirect 12 + playfram 0x00 + goto InfestedTerranWalkingToIdle + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1726 Phalanx (Hecaton) Siege Mode (cm\f-t\phalanx-hecaton.grp) +.headerstart +IsId 867 +Type 23 +Init IfritSiegeModeInit +Death IfritSiegeModeDeath +GndAttkInit IfritSiegeModeGndAttkInit +AirAttkInit IfritSiegeModeGndAttkInit +Unused1 IfritSiegeModeUnused1 +GndAttkRpt [NONE] +AirAttkRpt [NONE] +CastSpell [NONE] +GndAttkToIdle IfritSiegeModeGndAttkToIdle +AirAttkToIdle IfritSiegeModeGndAttkToIdle +Unused2 [NONE] +Walking [NONE] +WalkingToIdle SkryrokorLocal00 +SpecialState1 IfritSiegeModeSpecialState2 +SpecialState2 IfritSiegeModeSpecialState2 +AlmostBuilt [NONE] +Built [NONE] +Landing [NONE] +LiftOff [NONE] +IsWorking [NONE] +WorkingToIdle [NONE] +WarpIn [NONE] +Unused3 [NONE] +StarEditInit IfritSiegeModeStarEditInit +.headerend +# ----------------------------------------------------------------------------- # + +IfritSiegeModeInit: + imgul 2524 0 0 # Phalanx (Hecaton) Shadow (cm\f-t\hecaton-shadow.grp) + wait 1 + playsnd 2429 # Phalanx (Hecaton) Siege Transform + setflspeed 0 + playfram 0x120 + wait 1 + playfram 0x140 + wait 1 + playfram 0x160 + wait 1 + playfram 0x180 + wait 12 + sigorder 1 + goto IfritSiegeModeGndAttkToIdle + +IfritSiegeModeGndAttkToIdle: + playfram 0x180 + goto SkryrokorLocal00 + +IfritSiegeModeDeath: + playsndbtwn 1385 1386 # Ifrit 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 + +IfritSiegeModeUnused1: + wait 1 + nobrkcodestart + playsndbtwn 1705 1706 + sprol 742 0 0 + setfldirect 12 + wait 12 + nobrkcodeend + goto IfritSiegeModeGndAttkToIdle + +IfritSiegeModeGndAttkInit: + playfram 0x180 + wait 1 + nobrkcodestart + playfram 0x1A0 + playsnd 96 # Bullet\TTaFi200.wav + imgoluselo 537 2 0 # Siege Tank(Siege) Turret Attack Overlay (thingy\esiFire.grp) + attack + wait 1 + playfram 0x180 + wait 8 + playfram 0x1A0 + playsnd 96 # Bullet\TTaFi200.wav + imgoluselo 537 2 0 # Siege Tank(Siege) Turret Attack Overlay (thingy\esiFire.grp) + attack + wait 1 + playfram 0x180 + wait 8 + playfram 0x1A0 + playsnd 96 # Bullet\TTaFi200.wav + imgoluselo 537 2 0 # Siege Tank(Siege) Turret Attack Overlay (thingy\esiFire.grp) + attack + wait 1 + playfram 0x180 + wait 8 + nobrkcodeend + gotorepeatattk + goto IfritSiegeModeGndAttkToIdle + +IfritSiegeModeSpecialState2: + playsnd 2430 # Phalanx (Hecaton) Tank Transform + playfram 0x160 + wait 1 + playfram 0x140 + wait 1 + playfram 0x120 + wait 1 + playfram 0x00 + wait 12 + sigorder 1 + goto SkryrokorLocal00 + +IfritSiegeModeStarEditInit: + imgoluselo 2525 2 0 # Phalanx (Hecaton) Siege Turret (cm\f-t\phalanx-hecaton-turret.grp) + imgul 2524 0 0 # Phalanx (Hecaton) Siege Base Shadow (cm\f-t\phalanx-hecaton-shadow.grp) + wait 1 + setflspeed 0 + playsnd 2430 # Phalanx (Hecaton) Tank Transform + playfram 0x160 + wait 1 + playfram 0x140 + wait 1 + playfram 0x120 + wait 1 + playfram 0x00 + wait 12 + sigorder 1 + goto SkryrokorLocal00 + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1523 Ifrit Tank Mode Turret (cm\terran\matador-turret.grp) +.headerstart +IsId 868 +Type 13 +Init InfestedTerranWalkingToIdle +Death Generic_Wait1End +GndAttkInit IfritGndAttkInit +AirAttkInit IfritGndAttkInit +Unused1 [NONE] +GndAttkRpt IfritGndAttkInit +AirAttkRpt IfritGndAttkInit +CastSpell [NONE] +GndAttkToIdle InfestedTerranWalkingToIdle +AirAttkToIdle InfestedTerranWalkingToIdle +Unused2 [NONE] +Walking IfritWalking +WalkingToIdle InfestedTerranWalkingToIdle +SpecialState1 SkryrokorLocal00 +.headerend +# ----------------------------------------------------------------------------- # + +# ----------------------------------------------------------------------------- # +# This header is used by images.dat entries: +# 1726 Ifrit Turret Siege Mode (cm\terran\matador-turret.grp) +.headerstart +IsId 869 +Type 14 +Init IfritSiegeModeTurretInit +Death Generic_Wait1End +GndAttkInit IfritSiegeModeGndAttkInit +AirAttkInit IfritSiegeModeGndAttkInit +Unused1 [NONE] +GndAttkRpt IfritSiegeModeGndAttkInit +AirAttkRpt IfritSiegeModeGndAttkInit +CastSpell [NONE] +GndAttkToIdle IfritSiegeModeGndAttkToIdle +AirAttkToIdle IfritSiegeModeGndAttkToIdle +Unused2 [NONE] +Walking [NONE] +WalkingToIdle [NONE] +SpecialState1 IfritSiegeModeSpecialState2 +SpecialState2 IfritSiegeModeSpecialState2 +AlmostBuilt [NONE] +.headerend +# ----------------------------------------------------------------------------- # + +IfritSiegeModeTurretInit: + wait 1 + setflspeed 0 + playfram 0x120 + wait 1 + playfram 0x140 + wait 1 + playfram 0x160 + wait 1 + playfram 0x180 + wait 6 + sigorder 1 + goto IfritSiegeModeGndAttkToIdle \ No newline at end of file diff --git a/mpq/unit/cm/f-p/athuzelon.grp b/mpq/unit/cm/f-p/athuzelon.grp index e6e9d9e7..b152e7df 100644 Binary files a/mpq/unit/cm/f-p/athuzelon.grp and b/mpq/unit/cm/f-p/athuzelon.grp differ diff --git a/mpq/unit/cm/f-t/ifrit-attack.lol b/mpq/unit/cm/f-t/ifrit-attack.lol new file mode 100644 index 00000000..9cabcadc Binary files /dev/null and b/mpq/unit/cm/f-t/ifrit-attack.lol differ diff --git a/mpq/unit/cm/f-t/ifrit-shadow.grp b/mpq/unit/cm/f-t/ifrit-shadow.grp new file mode 100644 index 00000000..5c162015 Binary files /dev/null and b/mpq/unit/cm/f-t/ifrit-shadow.grp differ diff --git a/mpq/unit/cm/f-t/ifrit-turret.grp b/mpq/unit/cm/f-t/ifrit-turret.grp new file mode 100644 index 00000000..ee4009bb Binary files /dev/null and b/mpq/unit/cm/f-t/ifrit-turret.grp differ diff --git a/mpq/unit/cm/f-t/ifrit-turret.lol b/mpq/unit/cm/f-t/ifrit-turret.lol new file mode 100644 index 00000000..aa915d50 Binary files /dev/null and b/mpq/unit/cm/f-t/ifrit-turret.lol differ diff --git a/mpq/unit/cm/f-t/ifrit.grp b/mpq/unit/cm/f-t/ifrit.grp new file mode 100644 index 00000000..0facaf44 Binary files /dev/null and b/mpq/unit/cm/f-t/ifrit.grp differ diff --git a/mpq/unit/cm/f-t/rejoinder-overlay-large.grp b/mpq/unit/cm/f-t/rejoinder-overlay-large.grp new file mode 100644 index 00000000..ceb4fd2e Binary files /dev/null and b/mpq/unit/cm/f-t/rejoinder-overlay-large.grp differ diff --git a/mpq/unit/cm/f-t/rejoinder-overlay-medium.grp b/mpq/unit/cm/f-t/rejoinder-overlay-medium.grp new file mode 100644 index 00000000..12ebd97d Binary files /dev/null and b/mpq/unit/cm/f-t/rejoinder-overlay-medium.grp differ diff --git a/mpq/unit/cm/f-t/rejoinder-overlay-small.grp b/mpq/unit/cm/f-t/rejoinder-overlay-small.grp new file mode 100644 index 00000000..908a3604 Binary files /dev/null and b/mpq/unit/cm/f-t/rejoinder-overlay-small.grp differ diff --git a/mpq/unit/cm/f-t/rejoinder-overlay-xlarge.grp b/mpq/unit/cm/f-t/rejoinder-overlay-xlarge.grp new file mode 100644 index 00000000..751e26c8 Binary files /dev/null and b/mpq/unit/cm/f-t/rejoinder-overlay-xlarge.grp differ diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp index bf82b191..8e9dff0f 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 88644fbb..17696904 100644 Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ diff --git a/mpq/unit/hl/fr/exigo-attack1.lol b/mpq/unit/hl/fr/exigo-attack1.lol index 6a020fda..27104e0a 100644 Binary files a/mpq/unit/hl/fr/exigo-attack1.lol and b/mpq/unit/hl/fr/exigo-attack1.lol differ diff --git a/mpq/unit/hl/fr/exigo-attack2.lol b/mpq/unit/hl/fr/exigo-attack2.lol index c3cef8c9..8ab69794 100644 Binary files a/mpq/unit/hl/fr/exigo-attack2.lol and b/mpq/unit/hl/fr/exigo-attack2.lol differ diff --git a/mpq/unit/hl/fr/exigo.grp b/mpq/unit/hl/fr/exigo.grp index bc8e0084..324b4fe3 100644 Binary files a/mpq/unit/hl/fr/exigo.grp and b/mpq/unit/hl/fr/exigo.grp differ diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp index 80716fc9..40049bcc 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 4156183c..5ab796e8 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 b4a52b99..392d1fcc 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -24,10 +24,15 @@ - **Gameplay:** - Fixed bad transport calculations allowing for "clown-car" interactions (r. Londier) - Droleths can no longer morph into Agrileths in certain circumstances (r. jakulangski) + - Corrected Ultrokor Kaiser Rampage timeout (r. Londier) + - Fixed edge cases regarding Dorminge Crushing Delivery slow (r. Londier) - Properly-restricted Dyad Salvage to one Dyad per target (r. Slav) - - Terran Mines and Askosi Wards now always benefit from Sublime Shepherd, as with structures + - Terran Mines and Askosi Wards now always benefit from Sublime Shepherd, as with structures (r. Londier) + - Hive Organ (from Malkothrokor) structures can no longer regress on cancel or death (r. jakulangski) + - Circitor on-hit effect has been corrected (r. jakulangski) - **Audiovisual:** - Added garrison handling for project attacks and Golden Harakan flamethrower overlay (r. Londier) + - Added many missing aura displays (r. Londier & SkirmishBadger) - Resolved iscript issues with Egg and Vilgoleth - Fixed bad cropping on Apostle, Atreus (r. TheBeaver99) - Fixed wrong weaponfire SFX for Star Sovereign (r. lolrsk8s) @@ -41,6 +46,7 @@ ## Audiovisuals - New models for: - Iconoclast, Chantry (c. fasswawds) +- New VFX for Serathiel Rejoinder of Service - New portrait for Vassal (c. fasswawds & Solstice) - Updated placeholder portrait framerate for many portraits (c. jun3hong) - New selection responses for: diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index 84300c1d..cc87f512 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ