diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt index d2e4a879..9d477e3a 100644 --- a/mpq/arr/sfxdata.txt +++ b/mpq/arr/sfxdata.txt @@ -4454,31 +4454,31 @@ Tetcaerokor Weaponhit 02 Garvrokor Weaponhit 01 Garvrokor Weaponhit 02 Garvrokor Weaponhit 03 -Cyprian Weaponfire 01 -Cyprian Weaponfire 02 -Cyprian Weaponfire 03 -Cyprian Weaponfire 04 -Cyprian Weaponfire 05 -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 -Extended Sound #1 +Cyprian Hecaton Weaponfire 01 +Cyprian Hecaton Weaponfire 02 +Cyprian Hecaton Weaponfire 03 +Cyprian Hecaton Weaponfire 04 +Cyprian Hecaton Weaponfire 05 +Ifrit Tank Weaponfire 01 +Ifrit Tank Weaponfire 02 +Ifrit Tank Weaponfire 03 +Ifrit Tank Weaponfire 04 +Ifrit Tank Weaponfire 05 +Ifrit Tank Weaponfire 06 +Ifrit Siege Weaponfire 01 +Ifrit Siege Weaponfire 02 +Ifrit Siege Weaponfire 03 +Ifrit Siege Weaponfire 04 +Ifrit Siege Weaponfire 05 +Ifrit Siege Weaponfire 06 +Quadriga Weaponfire 01 +Quadriga Weaponfire 02 +Quadriga Weaponfire 03 +Shaman Upstart Weaponfire 01 +Shaman Upstart Weaponfire 02 +Arquebus Weaponfire 01 +Arquebus Weaponfire 02 +Arquebus Weaponfire 03 Extended Sound #1 Extended Sound #1 Extended Sound #1 diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt index 62bf8f5a..cce91b6f 100644 --- a/mpq/arr/sounds.txt +++ b/mpq/arr/sounds.txt @@ -4458,4 +4458,24 @@ cm\f-t\cyprian-hecaton\wf-01.wav cm\f-t\cyprian-hecaton\wf-02.wav cm\f-t\cyprian-hecaton\wf-03.wav cm\f-t\cyprian-hecaton\wf-04.wav -cm\f-t\cyprian-hecaton\wf-05.wav \ No newline at end of file +cm\f-t\cyprian-hecaton\wf-05.wav +cm\f-t\ifrit\wf-a-01.wav +cm\f-t\ifrit\wf-a-02.wav +cm\f-t\ifrit\wf-a-03.wav +cm\f-t\ifrit\wf-a-04.wav +cm\f-t\ifrit\wf-a-05.wav +cm\f-t\ifrit\wf-a-06.wav +cm\f-t\ifrit\wf-b-01.wav +cm\f-t\ifrit\wf-b-02.wav +cm\f-t\ifrit\wf-b-03.wav +cm\f-t\ifrit\wf-b-04.wav +cm\f-t\ifrit\wf-b-05.wav +cm\f-t\ifrit\wf-b-06.wav +cm\f-t\quadriga\wf-01.wav +cm\f-t\quadriga\wf-02.wav +cm\f-t\quadriga\wf-03.wav +cm\f-t\shaman-upstart\wf-01.wav +cm\f-t\shaman-upstart\wf-02.wav +cm\f-t\arquebus\wf-01.wav +cm\f-t\arquebus\wf-02.wav +cm\f-t\arquebus\wf-03.wav \ No newline at end of file diff --git a/mpq/rez/stat.txt b/mpq/rez/stat.txt index 2e2c2c38..ce15d51b 100644 --- a/mpq/rez/stat.txt +++ b/mpq/rez/stat.txt @@ -331,7 +331,7 @@ t<3><4>Inject Stimpack <1>(<3>T<1>)<10>Take a dangerous injection that deals 5 d ¤<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> 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> +r<3><4>Rejoinder of Service <1>(<3>R<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 10 damage. After a 1.5 second delay, gain 75% movement speed and 100% attack speed for 7.5 seconds.<0> e<3><4>Lay Lobotomy Mines <1>(<3>E<1>)<10>Places a Lobotomy Mine at the target site. Lobotomy Mines stun and slow targets that trip them.<0> e<3><4>Lay Tartarus Mines <1>(<3>E<1>)<10>Places a Tartarus Mine at the target site. Tartarus Mines incinerate and rend the armor of targets that trip them.<0> diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin index b378f8b8..6d138b7b 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 f161eac3..027d6e1a 100644 --- a/mpq/scripts/iscript_terran.txt +++ b/mpq/scripts/iscript_terran.txt @@ -20518,14 +20518,19 @@ QuadrigaDeath: QuadrigaAirAttkInit: wait 2 nobrkcodestart + playsndbtwn 4473 4475 # Quadriga weaponfire 01, 02, 03 attackwith 2 wait 6 + playsndbtwn 4473 4475 # Quadriga weaponfire 01, 02, 03 attackwith 2 wait 6 + playsndbtwn 4473 4475 # Quadriga weaponfire 01, 02, 03 attackwith 2 wait 6 + playsndbtwn 4473 4475 # Quadriga weaponfire 01, 02, 03 attackwith 2 wait 6 + playsndbtwn 4473 4475 # Quadriga weaponfire 01, 02, 03 attackwith 2 nobrkcodeend gotorepeatattk @@ -21152,7 +21157,7 @@ ArquebusGndAttkInit: wait 1 nobrkcodestart playfram 0x220 - playsndbtwn 2347 2350 # Arquebus weapon fire 01, 02, 03, 04 + playsndbtwn 4478 4480 # Arquebus weapon fire 01, 02, 03 attackwith 1 wait 1 playfram 0x00 @@ -21740,7 +21745,7 @@ ShamanUpstartSupportModeUnused1: ShamanUpstartSupportGndAttkInit: wait 1 playfram 0x20 - playsndbtwn 2775 2776 # Cuirass weapon fire 01, 02 + playsndbtwn 4476 4477 # Shaman (Upstart) weaponfire 01, 02 attack wait 1 playfram 0x00 @@ -23007,19 +23012,19 @@ IfritGndAttkInit: wait 1 nobrkcodestart playfram 0x100 - playsnd 68 # Bullet\TTaFir00.wav + playsndbtwn 4461 4466 # Ifrit (Tank) weaponfire 01, 02, 03, 04, 05, 06 attack wait 1 playfram 0x00 wait 5 playfram 0x100 - playsnd 68 # Bullet\TTaFir00.wav + playsndbtwn 4461 4466 # Ifrit (Tank) weaponfire 01, 02, 03, 04, 05, 06 attack wait 1 playfram 0x00 wait 5 playfram 0x100 - playsnd 68 # Bullet\TTaFir00.wav + playsndbtwn 4461 4466 # Ifrit (Tank) weaponfire 01, 02, 03, 04, 05, 06 attack wait 1 playfram 0x00 @@ -23137,22 +23142,22 @@ IfritSiegeModeGndAttkInit: wait 1 nobrkcodestart playfram 0x1A0 - playsnd 96 # Bullet\TTaFi200.wav - imgoluselo 537 2 0 # Siege Tank(Siege) Turret Attack Overlay (thingy\esiFire.grp) + playsndbtwn 4467 4472 # Ifrit (Siege) weaponfire 01, 02, 03, 04, 05, 06 + imgoluselo 537 2 0 # Phalanx (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) + playsndbtwn 4467 4472 # Ifrit (Siege) weaponfire 01, 02, 03, 04, 05, 06 + imgoluselo 537 2 0 # Phalanx (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) + playsndbtwn 4467 4472 # Ifrit (Siege) weaponfire 01, 02, 03, 04, 05, 06 + imgoluselo 537 2 0 # Phalanx (Siege) Turret Attack Overlay (thingy\esiFire.grp) attack wait 1 playfram 0x180 diff --git a/mpq/sound/cm/f-t/arquebus/wf-01.wav b/mpq/sound/cm/f-t/arquebus/wf-01.wav new file mode 100644 index 00000000..581f8143 Binary files /dev/null and b/mpq/sound/cm/f-t/arquebus/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/arquebus/wf-02.wav b/mpq/sound/cm/f-t/arquebus/wf-02.wav new file mode 100644 index 00000000..3be0e34b Binary files /dev/null and b/mpq/sound/cm/f-t/arquebus/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/arquebus/wf-03.wav b/mpq/sound/cm/f-t/arquebus/wf-03.wav new file mode 100644 index 00000000..78acc95a Binary files /dev/null and b/mpq/sound/cm/f-t/arquebus/wf-03.wav differ diff --git a/mpq/sound/cm/f-t/ifrit/wf-a-01.wav b/mpq/sound/cm/f-t/ifrit/wf-a-01.wav new file mode 100644 index 00000000..997ed888 Binary files /dev/null and b/mpq/sound/cm/f-t/ifrit/wf-a-01.wav differ diff --git a/mpq/sound/cm/f-t/ifrit/wf-a-02.wav b/mpq/sound/cm/f-t/ifrit/wf-a-02.wav new file mode 100644 index 00000000..73ec83e7 Binary files /dev/null and b/mpq/sound/cm/f-t/ifrit/wf-a-02.wav differ diff --git a/mpq/sound/cm/f-t/ifrit/wf-a-03.wav b/mpq/sound/cm/f-t/ifrit/wf-a-03.wav new file mode 100644 index 00000000..164623ae Binary files /dev/null and b/mpq/sound/cm/f-t/ifrit/wf-a-03.wav differ diff --git a/mpq/sound/cm/f-t/ifrit/wf-a-04.wav b/mpq/sound/cm/f-t/ifrit/wf-a-04.wav new file mode 100644 index 00000000..7dc07d5c Binary files /dev/null and b/mpq/sound/cm/f-t/ifrit/wf-a-04.wav differ diff --git a/mpq/sound/cm/f-t/ifrit/wf-a-05.wav b/mpq/sound/cm/f-t/ifrit/wf-a-05.wav new file mode 100644 index 00000000..714adad1 Binary files /dev/null and b/mpq/sound/cm/f-t/ifrit/wf-a-05.wav differ diff --git a/mpq/sound/cm/f-t/ifrit/wf-a-06.wav b/mpq/sound/cm/f-t/ifrit/wf-a-06.wav new file mode 100644 index 00000000..c45085f9 Binary files /dev/null and b/mpq/sound/cm/f-t/ifrit/wf-a-06.wav differ diff --git a/mpq/sound/cm/f-t/ifrit/wf-b-01.wav b/mpq/sound/cm/f-t/ifrit/wf-b-01.wav new file mode 100644 index 00000000..ec3f3be5 Binary files /dev/null and b/mpq/sound/cm/f-t/ifrit/wf-b-01.wav differ diff --git a/mpq/sound/cm/f-t/ifrit/wf-b-02.wav b/mpq/sound/cm/f-t/ifrit/wf-b-02.wav new file mode 100644 index 00000000..0492c15d Binary files /dev/null and b/mpq/sound/cm/f-t/ifrit/wf-b-02.wav differ diff --git a/mpq/sound/cm/f-t/ifrit/wf-b-03.wav b/mpq/sound/cm/f-t/ifrit/wf-b-03.wav new file mode 100644 index 00000000..420352d5 Binary files /dev/null and b/mpq/sound/cm/f-t/ifrit/wf-b-03.wav differ diff --git a/mpq/sound/cm/f-t/ifrit/wf-b-04.wav b/mpq/sound/cm/f-t/ifrit/wf-b-04.wav new file mode 100644 index 00000000..406467e4 Binary files /dev/null and b/mpq/sound/cm/f-t/ifrit/wf-b-04.wav differ diff --git a/mpq/sound/cm/f-t/ifrit/wf-b-05.wav b/mpq/sound/cm/f-t/ifrit/wf-b-05.wav new file mode 100644 index 00000000..1dce8f4f Binary files /dev/null and b/mpq/sound/cm/f-t/ifrit/wf-b-05.wav differ diff --git a/mpq/sound/cm/f-t/ifrit/wf-b-06.wav b/mpq/sound/cm/f-t/ifrit/wf-b-06.wav new file mode 100644 index 00000000..1b4f3807 Binary files /dev/null and b/mpq/sound/cm/f-t/ifrit/wf-b-06.wav differ diff --git a/mpq/sound/cm/f-t/quadriga/wf-01.wav b/mpq/sound/cm/f-t/quadriga/wf-01.wav new file mode 100644 index 00000000..fe0f10f9 Binary files /dev/null and b/mpq/sound/cm/f-t/quadriga/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/quadriga/wf-02.wav b/mpq/sound/cm/f-t/quadriga/wf-02.wav new file mode 100644 index 00000000..382d9800 Binary files /dev/null and b/mpq/sound/cm/f-t/quadriga/wf-02.wav differ diff --git a/mpq/sound/cm/f-t/quadriga/wf-03.wav b/mpq/sound/cm/f-t/quadriga/wf-03.wav new file mode 100644 index 00000000..cf9f888a Binary files /dev/null and b/mpq/sound/cm/f-t/quadriga/wf-03.wav differ diff --git a/mpq/sound/cm/f-t/shaman-upstart/wf-01.wav b/mpq/sound/cm/f-t/shaman-upstart/wf-01.wav new file mode 100644 index 00000000..e2a2beea Binary files /dev/null and b/mpq/sound/cm/f-t/shaman-upstart/wf-01.wav differ diff --git a/mpq/sound/cm/f-t/shaman-upstart/wf-02.wav b/mpq/sound/cm/f-t/shaman-upstart/wf-02.wav new file mode 100644 index 00000000..f2cd84e6 Binary files /dev/null and b/mpq/sound/cm/f-t/shaman-upstart/wf-02.wav differ diff --git a/patchnotes.md b/patchnotes.md index 392d1fcc..64aef375 100644 --- a/patchnotes.md +++ b/patchnotes.md @@ -52,9 +52,14 @@ - New selection responses for: - Wellbore, Engram, Chokral Chazsal (c. jun3hong) - New weapon SFX for: - - Durendal, Cyprian (Hecaton), Adherent, Engram, Gosvileth, Ghitorokor, Inzorthrokor, Zobriolisk, Tetcaerokor, Garvrokor (c. lolrsk8s) + - Durendal, Cyprian (Hecaton), Shaman (Upstart), Arquebus, Quadriga, Adherent, Engram, Gosvileth, Ghitorokor, Inzorthrokor, Zobriolisk, Tetcaerokor, Garvrokor (c. lolrsk8s) - New unit responses for Gosvileth +## Terran factions +- **NEW:** [Ifrit](https://cosmonarchy.com/terran/ifrit): + - Hecaton Coalition - Phalanx replacement. Incendiary artillery. + - Community milestone reward, thanks to TheNightFox! + ## Protoss - [Lattice](https://cosmonarchy.com/protoss/lattice/): - Shields 300 » 350 diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp index cc87f512..b1027058 100644 Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ