cosmonarchy/cosmonarchy-bw-prerelease
1
0
Fork 0
mirror of https://gitlab.com/the-no-frauds-club/cosmonarchy-bw-prerelease.git synced 2026-09-17 01:01:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make misc bugfixes

Browse Source
This commit is contained in:
Pr0nogo 2024-02-15 11:45:36 -05:00
parent 731cf97e81
commit ecce0a66fa
30 changed files with 83 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
mpq/arr/sfxdata.dat
View File

Binary file not shown.

26
mpq/arr/sfxdata.txt
View File

@ -2846,19 +2846,19 @@ Legionnaire Order Passive 02
Legionnaire Order Passive 03 Legionnaire Order Passive 03
Legionnaire Order Passive 04 Legionnaire Order Passive 04
Raynor Maverick Ready 01 Raynor Maverick Ready 01
Extended Sound #1 Panoptus Weaponhit 01
Extended Sound #1 Talos Salvage Loop 01
Extended Sound #1 Bactalisk Weaponfire 01
Extended Sound #1 Bactalisk Weaponfire 02
Extended Sound #1 Bactalisk Weaponfire 03
Extended Sound #1 Bactalisk Weaponhit 01
Extended Sound #1 Bactalisk Weaponhit 02
Extended Sound #1 Bactalisk Weaponhit 03
Extended Sound #1 Hierophant Weaponfire 01
Extended Sound #1 Hierophant Weaponfire 02
Extended Sound #1 Ministry Selected 01
Extended Sound #1 Phalanx Weaponhit B 01
Extended Sound #1 Exemplar Death 01
Extended Sound #1 Extended Sound #1
Extended Sound #1 Extended Sound #1
Extended Sound #1 Extended Sound #1

15
mpq/arr/sounds.txt
View File

@ -2845,4 +2845,17 @@ cm\p\legionnaire\yes-01.wav
cm\p\legionnaire\yes-02.wav cm\p\legionnaire\yes-02.wav
cm\p\legionnaire\yes-03.wav cm\p\legionnaire\yes-03.wav
cm\p\legionnaire\yes-04.wav cm\p\legionnaire\yes-04.wav
terran\raynorm\rdy-01.wav terran\raynorm\rdy-01.wav
cm\p\panoptus\wh-01.wav
cm\t\talos\stun-01.wav
cm\z\bactalisk\wf-01.wav
cm\z\bactalisk\wf-02.wav
cm\z\bactalisk\wf-03.wav
cm\z\bactalisk\wh-01.wav
cm\z\bactalisk\wh-02.wav
cm\z\bactalisk\wh-03.wav
cm\p\hierophant\wf-01.wav
cm\p\hierophant\wf-02.wav
cm\t\_building\ministry.wav
cm\t\phalanx\wh2-01.wav
cm\p\exemplar\dth-01.wav

BIN
mpq/arr/units.datex
View File

Binary file not shown.

BIN
mpq/rez/stat_txt.tbl
View File

Binary file not shown.

106
mpq/scripts/iscript.txt
View File

@ -5493,7 +5493,7 @@ EidolonUnused1:
wait 1 wait 1
nobrkcodestart nobrkcodestart
setfldirect 0 setfldirect 0
playsndbtwn 1166 1167 # Eidolon revive 01, 02 playsnd 1166 # Eidolon revive 01
playfram 228 playfram 228
wait 2 wait 2
playfram 227 playfram 227
@ -15090,7 +15090,7 @@ AntiMatterMissileGndAttkInit:
AntiMatterMissileDeath: AntiMatterMissileDeath:
imgol 442 0 0 # Anti-Matter Missile Hit (thingy\HKexplod.grp) imgol 442 0 0 # Anti-Matter Missile Hit (thingy\HKexplod.grp)
if bullet.weapon_id == 71 goto AntiMatterMissileEmpyrean if bullet.weapon_id == 71 goto AntiMatterMissileEmpyrean
playsnd 54 # Misc\CRITTERS\BCrWht00.wav playsnd 2848 # Panoptus weaponhit 01
domissiledmg domissiledmg
wait 1 wait 1
end end
@ -15164,7 +15164,7 @@ PhaseDisruptorDeath:
imgol 427 0 0 # Phase Disruptor Hit (thingy\HKexplod.grp) imgol 427 0 0 # Phase Disruptor Hit (thingy\HKexplod.grp)
domissiledmg domissiledmg
if bullet.weapon_id == 66 goto PhaseDisruptor_Dracadin if bullet.weapon_id == 66 goto PhaseDisruptor_Dracadin
playsnd 54 # Misc\CRITTERS\BCrWht00.wav playsnd 2848 # Panoptus weaponhit 01
wait 1 wait 1
end end
@ -15657,7 +15657,7 @@ ArcliteShockCannonHitInit:
playfram 1 playfram 1
wait 1 wait 1
ArcliteShockCannonHitDeath: ArcliteShockCannonHitDeath:
playsnd 968 # Misc\CRITTERS\PbWht01.wav playsnd 2859 # Phalanx Siege weaponhit 01
playfram 2 playfram 2
domissiledmg domissiledmg
wait 1 wait 1
@ -16045,7 +16045,7 @@ Venom_Unused_GndAttkInit:
Venom_Unused_Death: Venom_Unused_Death:
domissiledmg domissiledmg
if bullet.weapon_id == 37 goto Venom_Unused_Unused2 if bullet.weapon_id == 37 goto Venom_Unused_Unused2
playsndbtwn 49 51 # Misc\CRITTERS\JCrDth00.wav | Misc\CRITTERS\LCrWht01.wav playsndbtwn 2853 2855 # Bactalisk weaponhit 01, 02, 03
imgol 508 0 0 # Venom Hit (Unused) (thingy\etgHit.grp) imgol 508 0 0 # Venom Hit (Unused) (thingy\etgHit.grp)
wait 1 wait 1
end end
@ -16060,7 +16060,7 @@ Venom_Unused_Unused2:
end end
Venom_Unused_SpecialState1: Venom_Unused_SpecialState1:
playsndbtwn 49 51 # Misc\CRITTERS\JCrDth00.wav | Misc\CRITTERS\LCrWht01.wav playsndbtwn 2853 2855 # Bactalisk weaponhit 01, 02, 03
sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp)
domissiledmg domissiledmg
goto Venom_Unused_GndAttkInit goto Venom_Unused_GndAttkInit
@ -22027,7 +22027,7 @@ ExemplarWalkingToIdle:
goto ExemplarWalkingToIdle goto ExemplarWalkingToIdle
ExemplarDeath: ExemplarDeath:
playsnd 975 # Misc\CRITTERS\ScDeath01.wav playsnd 2860 # Exemplar death 01
imgol 1565 0 0 # Protoss Explosion (Medium) imgol 1565 0 0 # Protoss Explosion (Medium)
wait 5 wait 5
imgol 1563 -8 0 # Exemplar Death imgol 1563 -8 0 # Exemplar Death
@ -22412,42 +22412,42 @@ Death RestorationHitDeath
# ----------------------------------------------------------------------------- # # ----------------------------------------------------------------------------- #
RestorationHitInit: RestorationHitInit:
playfram 0x00 # Frame set 0 playfram 0x00
wait 1 wait 1
playfram 1 # Frame set 0, direction 1 playfram 1
wait 1 wait 1
playfram 2 # Frame set 0, direction 2 playfram 2
wait 1 wait 1
playfram 3 # Frame set 0, direction 3 playfram 3
wait 1 wait 1
playfram 4 # Frame set 0, direction 4 playfram 4
wait 1 wait 1
playfram 5 # Frame set 0, direction 5 playfram 5
wait 1 wait 1
playfram 6 # Frame set 0, direction 6 playfram 6
wait 1 wait 1
playfram 7 # Frame set 0, direction 7 playfram 7
wait 1 wait 1
playfram 8 # Frame set 0, direction 8 playfram 8
wait 1 wait 1
playfram 9 # Frame set 0, direction 9 playfram 9
wait 1 wait 1
playfram 10 # Frame set 0, direction 10 playfram 10
wait 1 wait 1
playfram 11 # Frame set 0, direction 11 playfram 11
wait 1 wait 1
playfram 12 # Frame set 0, direction 12 playfram 12
wait 1 wait 1
playfram 13 # Frame set 0, direction 13 playfram 13
wait 1 wait 1
playfram 14 # Frame set 0, direction 14 playfram 14
wait 1 wait 1
playfram 15 # Frame set 0, direction 15 playfram 15
wait 1 wait 1
goto RestorationHitDeath goto RestorationHitDeath
RestorationHitDeath: RestorationHitDeath:
wait 1 wait 1
end end
# ----------------------------------------------------------------------------- # # ----------------------------------------------------------------------------- #
@ -30315,14 +30315,14 @@ GladiusWeaponGndAttkInit:
GladiusWeaponDeath: GladiusWeaponDeath:
sprol 606 0 0 # Warden Hit (thingy\phohit.grp) sprol 606 0 0 # Warden Hit (thingy\phohit.grp)
playsnd 54 # Misc\CRITTERS\BCrWht00.wav playsnd 2848 # Panoptus weaponhit 01
domissiledmg domissiledmg
wait 1 wait 1
end end
GladiusWeaponSpecialState1: GladiusWeaponSpecialState1:
sprol 606 0 0 # Warden Hit (thingy\phohit.grp) sprol 606 0 0 # Warden Hit (thingy\phohit.grp)
playsnd 54 # Misc\CRITTERS\BCrWht00.wav playsnd 2848 # Panoptus weaponhit 01
domissiledmg domissiledmg
goto GladiusWeaponGndAttkInit goto GladiusWeaponGndAttkInit
@ -30439,7 +30439,7 @@ BactaliskUnused1:
wait 1 wait 1
nobrkcodestart nobrkcodestart
setfldirect 0 setfldirect 0
playsnd 1172 playsnd 1172 # Hydralisk Revive 01
playfram 567 playfram 567
wait 2 wait 2
playfram 566 playfram 566
@ -30469,7 +30469,7 @@ BactaliskGndAttkInit:
playfram 0xee playfram 0xee
wait 1 wait 1
playfram 0xff playfram 0xff
playsndbtwn 46 48 # Misc\CRITTERS\JCrWht00.wav | Misc\CRITTERS\JCrWht02.wav playsndbtwn 2850 2852 # Bactalisk weaponfire 01, 02, 03
sproluselo 332 0 # Needle Spines (thingy\spooge.grp) sproluselo 332 0 # Needle Spines (thingy\spooge.grp)
attackwith 1 attackwith 1
wait 2 wait 2
@ -32832,7 +32832,7 @@ BurstLasersExplosiveGndAttkInit:
BurstLasersExplosiveDeath: BurstLasersExplosiveDeath:
imgol 1245 0 0 # Arclite Shock Cannon Hit Silent (thingy\mushroom.grp) imgol 1245 0 0 # Arclite Shock Cannon Hit Silent (thingy\mushroom.grp)
if bullet.weapon_id == 39 goto BurstLasersExplosiveDeathPenumbra if bullet.weapon_id == 39 goto BurstLasersExplosiveDeathPenumbra
playsnd 968 # Misc\CRITTERS\PbWht01.wav playsnd 2859 # Phalanx Siege weaponhit 01
goto BurstLasersExplosiveDeathFinal goto BurstLasersExplosiveDeathFinal
BurstLasersExplosiveDeathPenumbra: BurstLasersExplosiveDeathPenumbra:
@ -35553,7 +35553,7 @@ HierophantGndAttkRpt:
wait 1 wait 1
playfram 0x187 playfram 0x187
wait 1 wait 1
playsndbtwn 970 971 # Misc\CRITTERS\PbWht03.wav | Misc\CRITTERS\PBDeath01.wav playsndbtwn 2856 2857 # Hierophant weaponfire 01, 02
attackwith 1 attackwith 1
playfram 0x176 playfram 0x176
wait 1 wait 1
@ -37883,7 +37883,7 @@ ArcliteShockCannonHitDamagelessInit:
wait 2 wait 2
ArcliteShockCannonHitDamagelessDeath: ArcliteShockCannonHitDamagelessDeath:
playfram 0x00 playfram 0x00
playsnd 968 # Misc\CRITTERS\PbWht01.wav playsnd 2859 # Phalanx Siege weaponhit 01
wait 1 wait 1
playfram 1 playfram 1
wait 1 wait 1
@ -37988,7 +37988,7 @@ HallucinationProjectileGndAttkInit:
HallucinationProjectileDeath: HallucinationProjectileDeath:
imgol 427 0 0 # Phase Disruptor Hit (thingy\HKexplod.grp) imgol 427 0 0 # Phase Disruptor Hit (thingy\HKexplod.grp)
playsnd 54 # Misc\CRITTERS\BCrWht00.wav playsnd 2848 # Panoptus weaponhit 01
domissiledmg domissiledmg
playfram 9 playfram 9
wait 1 wait 1
@ -38097,7 +38097,7 @@ PhaseDisruptorElectricSilentGndAttkInit:
PhaseDisruptorElectricSilentDeath: PhaseDisruptorElectricSilentDeath:
imgol 427 0 0 # Phase Disruptor Hit (thingy\HKexplod.grp) imgol 427 0 0 # Phase Disruptor Hit (thingy\HKexplod.grp)
playsnd 54 # Misc\CRITTERS\BCrWht00.wav playsnd 2848 # Panoptus weaponhit 01
domissiledmg domissiledmg
wait 1 wait 1
end end
@ -39913,7 +39913,7 @@ AnticthonGndAttkInit:
AnticthonAirAttkInit: AnticthonAirAttkInit:
playsndbtwn 1634 1636 # Anticthon weapon fire 01, 02, 03 playsndbtwn 1634 1636 # Anticthon weapon fire 01, 02, 03
attackwith 1 attackwith 1
imgol 978 0 0 imgol 978 0 0 # Anticthon/Anthelion weaponfire
wait 1 wait 1
gotorepeatattk gotorepeatattk
goto AnticthonGndAttkToIdle goto AnticthonGndAttkToIdle
@ -43264,7 +43264,7 @@ KagraliskVenomDeath:
domissiledmg domissiledmg
imgol 1097 0 0 # Nathrokor Attack Overlay imgol 1097 0 0 # Nathrokor Attack Overlay
if bullet.weapon_id == 95 goto KonviliskVenomDeath if bullet.weapon_id == 95 goto KonviliskVenomDeath
playsndbtwn 49 51 # Bactalisk weaponhit 01, 02, 03 playsndbtwn 2853 2855 # Bactalisk weaponhit 01, 02, 03
wait 1 wait 1
end end
@ -49955,14 +49955,14 @@ BactaliskAcidGndAttkInit:
goto BactaliskAcidGndAttkInit goto BactaliskAcidGndAttkInit
BactaliskAcidDeath: BactaliskAcidDeath:
playsndbtwn 49 51 # Misc\CRITTERS\JCrDth00.wav | Misc\CRITTERS\LCrWht01.wav playsndbtwn 2853 2855 # Bactalisk weaponhit 01, 02, 03
sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp)
domissiledmg domissiledmg
wait 1 wait 1
end end
BactaliskAcidSpecialState1: BactaliskAcidSpecialState1:
playsndbtwn 49 51 # Misc\CRITTERS\JCrDth00.wav | Misc\CRITTERS\LCrWht01.wav playsndbtwn 2853 2855 # Bactalisk weaponhit 01, 02, 03
sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp) sprol 365 0 0 # Glave Wurm/Seeker Spores Hit (thingy\SporeHit.grp)
domissiledmg domissiledmg
goto Venom_Unused_GndAttkInit goto Venom_Unused_GndAttkInit

0
mpq/sound/misc/critters/ScDeath01.wav → mpq/sound/cm/p/exemplar/dth-01.wav
View File

0
mpq/sound/misc/critters/PbDeath01.wav → mpq/sound/cm/p/hierophant/wf-01.wav
View File

0
mpq/sound/misc/critters/PbWht03.wav → mpq/sound/cm/p/hierophant/wf-02.wav
View File

0
mpq/sound/misc/critters/BCrWht00.WAV → mpq/sound/cm/p/panoptus/wh-01.wav
View File

0
mpq/sound/misc/critters/PbWht02.wav → mpq/sound/cm/t/_building/ministry.wav
View File

0
mpq/sound/misc/critters/PbWht01.wav → mpq/sound/cm/t/phalanx/wh2-01.wav
View File

0
mpq/sound/misc/critters/BCrWht01.wav → mpq/sound/cm/t/talos/stun-01.wav
View File

0
mpq/sound/misc/critters/JCrWht00.wav → mpq/sound/cm/z/bactalisk/wf-01.wav
View File

0
mpq/sound/misc/critters/JCrWht01.wav → mpq/sound/cm/z/bactalisk/wf-02.wav
View File

0
mpq/sound/misc/critters/JCrWht02.wav → mpq/sound/cm/z/bactalisk/wf-03.wav
View File

0
mpq/sound/misc/critters/JCrDth00.wav → mpq/sound/cm/z/bactalisk/wh-01.wav
View File

0
mpq/sound/misc/critters/LCrWht00.wav → mpq/sound/cm/z/bactalisk/wh-02.wav
View File

0
mpq/sound/misc/critters/LCrWht01.wav → mpq/sound/cm/z/bactalisk/wh-03.wav
View File

BIN
mpq/sound/misc/critters/LCrDth00.wav
View File

Binary file not shown.

BIN
mpq/sound/misc/critters/LCrWht02.wav
View File

Binary file not shown.

BIN
mpq/sound/misc/critters/ScWht01.wav
View File

Binary file not shown.

BIN
mpq/sound/misc/critters/ScWht02.wav
View File

Binary file not shown.

BIN
mpq/sound/misc/critters/ScWht03.wav
View File

Binary file not shown.

BIN
mpq/sound/misc/critters/TerDeath01.wav
View File

Binary file not shown.

BIN
mpq/sound/misc/critters/TerWht01.wav
View File

Binary file not shown.

BIN
mpq/sound/misc/critters/TerWht02.wav
View File

Binary file not shown.

BIN
mpq/sound/misc/critters/TerWht03.wav
View File

Binary file not shown.

3
patchnotes.md
View File

@ -72,6 +72,7 @@ Patch goals include:
- Fixed Lobotomy Mines not targeting units that had previously burrowed (c. DF) - Fixed Lobotomy Mines not targeting units that had previously burrowed (c. DF)
- Fixed logic for Stewards returning to Solarions upon taking any damage, instead of the intended 50% HP threshold - Fixed logic for Stewards returning to Solarions upon taking any damage, instead of the intended 50% HP threshold
- Improved decollision behaviors for iscript units (c. DF) - Improved decollision behaviors for iscript units (c. DF)
- Fixed Dilettante corpses not being consumable (r. GreenEggs'NSpam)
- Lardfix: the fading of music no longer slows down navigation between certain menus (c. DF) - Lardfix: the fading of music no longer slows down navigation between certain menus (c. DF)
- Prospectively resolved errant unit interactions when restarting maps (r. lolrsk8s, c. DF & Veeq7) - Prospectively resolved errant unit interactions when restarting maps (r. lolrsk8s, c. DF & Veeq7)
- **AI:** - **AI:**
@ -87,6 +88,7 @@ Patch goals include:
- Fixed "set_player_unit_name" custom trigger action (c. DF) - Fixed "set_player_unit_name" custom trigger action (c. DF)
- Filled in missing unit responses for Protathalor (r. jakulangski) - Filled in missing unit responses for Protathalor (r. jakulangski)
- Corrected Shaman Visionary Mode death SFX - Corrected Shaman Visionary Mode death SFX
- Corrected Luminary Aural Assault tooltip (r. GreenEggs'NSpam)
## Audiovisuals ## Audiovisuals
- **New sprites:** - **New sprites:**
@ -98,6 +100,7 @@ Patch goals include:
- Changed sound flags for Zealot death SFX to allow it to overlap - Changed sound flags for Zealot death SFX to allow it to overlap
- Improved under attack responses for Scribe, Cabalist, Mind Tyrant, Archon, Panoptus - Improved under attack responses for Scribe, Cabalist, Mind Tyrant, Archon, Panoptus
- Improved Goliath death SFX - Improved Goliath death SFX
- Removed extra Eidolon revive SFX (r. GreenEggs'NSpam)
- **New weapon SFX:** (some c. lolrsk8s & IskatuMesk) - **New weapon SFX:** (some c. lolrsk8s & IskatuMesk)
- Weaponfire: Matador (Cinder), Scribe, Artisan, Analogue - Weaponfire: Matador (Cinder), Scribe, Artisan, Analogue
- Weaponhit: Penumbra, Dracadin - Weaponhit: Penumbra, Dracadin

BIN
plugins/gptp.qdp
View File

Binary file not shown.