cosmonarchy/cosmonarchy-bw-prerelease
cosmonarchy/cosmonarchy-bw-prerelease
1
0
Fork 0
mirror of https://gitlab.com/the-no-frauds-club/cosmonarchy-bw-prerelease.git synced 2026-10-10 05:57:51 +00:00
Code

Update iscript error handling and fix many iscript bugs

Browse Source
This commit is contained in:
Pr0nogo 2025-05-07 11:21:10 -04:00
parent a27bd99420
commit 377e90f470
24 changed files with 98 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
mpq/arr/images.datex
View File

Binary file not shown.

BIN
mpq/arr/images.tbl
View File

Binary file not shown.

6
mpq/arr/images.txt
View File

@ -2038,9 +2038,9 @@ Healing Pulse Underlay
Terran Heavy Missile Aion Terran Heavy Missile Aion
Corrosive Touch Explosion Corrosive Touch Explosion
Skryrokor Death Reversed Skryrokor Death Reversed
Extended Image #1038 Askosi Structure Rubble (Large)
Extended Image #1039 Pilgrim
Extended Image #1040 Pilgrim Shadow
Extended Image #1041 Extended Image #1041
Extended Image #1042 Extended Image #1042
Extended Image #1043 Extended Image #1043

BIN
mpq/arr/sprites.datex
View File

Binary file not shown.

4
mpq/arr/sprites.txt
View File

@ -999,10 +999,10 @@ Manifold (Starbound)
Yblyleth Yblyleth
Corrosive Touch Explosion Corrosive Touch Explosion
Terran Heavy Missile Aion Terran Heavy Missile Aion
Extended Sprite #1 Pilgrim
Francisco Goska Francisco Goska
Stroluum Stroluum
Extended Sprite #1 Askosi Structure Rubble (Large)
Extended Sprite #1 Extended Sprite #1
Extended Sprite #1 Extended Sprite #1
Extended Sprite #1 Extended Sprite #1

BIN
mpq/arr/units.datex
View File

Binary file not shown.

6
mpq/arr/units.txt
View File

@ -438,9 +438,9 @@ Zerg Hydralisk (Orkoti)
Protoss Manifold (Starbound) Protoss Manifold (Starbound)
Zerg Yblyleth (Zorthos) Zerg Yblyleth (Zorthos)
Askosi Pilgrim Askosi Pilgrim
Extended Unit #213 Basic Askosi Facilities
Extended Unit #214 Advanced Askosi Facilities
Extended Unit #215 Supreme Askosi Facilities
Extended Unit #216 Extended Unit #216
Extended Unit #217 Extended Unit #217
Extended Unit #218 Extended Unit #218

BIN
mpq/arr/weapons.datex
View File

Binary file not shown.

2
mpq/arr/weapons.txt
View File

@ -237,7 +237,7 @@ Revenant Rifle (Nydus Eidolon)
Gauss Slugger (Maverick Futurist) Gauss Slugger (Maverick Futurist)
Needle Spores (Hydralisk Orkoti) Needle Spores (Hydralisk Orkoti)
Inzor Reflux (Inzorthrokor) Inzor Reflux (Inzorthrokor)
Extended Weapon #110 Mining Saber (Pilgrim)
Extended Weapon #111 Extended Weapon #111
Extended Weapon #112 Extended Weapon #112
Extended Weapon #113 Extended Weapon #113

BIN
mpq/datreq/Buttons.graft
View File

Binary file not shown.

BIN
mpq/datreq/Orders.graft
View File

Binary file not shown.

BIN
mpq/datreq/Units.graft
View File

Binary file not shown.

BIN
mpq/rez/stat_txt.tbl
View File

Binary file not shown.

BIN
mpq/rez/unitnames.tbl
View File

Binary file not shown.

BIN
mpq/scripts/iscript_askosi.bin
View File

Binary file not shown.

52
mpq/scripts/iscript_askosi.txt
View File

@ -19,7 +19,7 @@ Walking [NONE]
WalkingToIdle [NONE] WalkingToIdle [NONE]
SpecialState1 [NONE] SpecialState1 [NONE]
SpecialState2 [NONE] SpecialState2 [NONE]
AlmostBuilt [NONE] AlmostBuilt SkryrokorLocal00
Built LandlockBuilt Built LandlockBuilt
Landing [NONE] Landing [NONE]
LiftOff [NONE] LiftOff [NONE]
@ -39,8 +39,7 @@ LandlockDeath:
playsnd 7 # Misc\ExploLrg.wav playsnd 7 # Misc\ExploLrg.wav
imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp) imgol 215 0 0 # Explosion (Large) (thingy\tBangX.grp)
wait 3 wait 3
lowsprul 274 0 0 # Terran Building Rubble (Large) (thingy\RubbleL.grp) lowsprul 1004 0 0 # Askosi Structure Rubble (Large) (cm\askosi\a-rubble-large.grp)
# REPLACE RUBBLE
wait 1 wait 1
end end
@ -100,3 +99,50 @@ ShadowHeaderInit:
Generic_Wait1End: Generic_Wait1End:
wait 1 wait 1
end end
# ----------------------------------------------------------------------------- #
# This header is used by images.dat entries:
# 2040 Askosi Structure Rubble (Large) (cm\askosi\a-rubble-large.grp)
.headerstart
IsId 145
Type 1
Init AskosiBuildingRubbleHeaderInit
Death AskosiBuildingRubbleHeaderDeath
.headerend
# ----------------------------------------------------------------------------- #
AskosiBuildingRubbleHeaderInit:
playfram 0x00
AskosiBuildingRubbleHeaderLocal00:
playfram 1
wait 2
playfram 2
wait 2
playfram 3
wait 2
playfram 2
wait 2
playfram 1
wait 2
playfram 0
wait 2
playfram 1
wait 2
playfram 2
wait 2
playfram 3
wait 2
AskosiBuildingRubbleHeaderDeath:
playfram 4
wait 239
wait 1
playfram 5
wait 255
wait 24
playfram 6
wait 255
wait 24
playfram 7
wait 255
wait 24
end

BIN
mpq/scripts/iscript_protoss.bin
View File

Binary file not shown.

2
mpq/scripts/iscript_protoss.txt
View File

@ -7915,7 +7915,7 @@ Init GolemInit
Death GolemDeath Death GolemDeath
GndAttkInit GolemGndAttkInit GndAttkInit GolemGndAttkInit
AirAttkInit [NONE] AirAttkInit [NONE]
Unused1 [NONE] Unused1 SkryrokorLocal00
GndAttkRpt GolemGndAttkInit GndAttkRpt GolemGndAttkInit
AirAttkRpt [NONE] AirAttkRpt [NONE]
CastSpell [NONE] CastSpell [NONE]

BIN
mpq/scripts/iscript_terran.bin
View File

Binary file not shown.

52
mpq/scripts/iscript_terran.txt
View File

@ -81,10 +81,6 @@ SkryrokorLocal00:
wait 125 wait 125
goto SkryrokorLocal00 goto SkryrokorLocal00
Generic_Wait1End:
wait 1
end
LiftedTerranStructureDeath: LiftedTerranStructureDeath:
lowsprul 274 0 42 # Terran Building Rubble (Large) (thingy\RubbleL.grp) lowsprul 274 0 42 # Terran Building Rubble (Large) (thingy\RubbleL.grp)
wait 1 wait 1
@ -627,6 +623,10 @@ EidolonDeathInit:
wait 1 wait 1
end end
Generic_Wait1End:
wait 1
end
# ----------------------------------------------------------------------------- # # ----------------------------------------------------------------------------- #
# This header is used by images.dat entries: # This header is used by images.dat entries:
# 232 Nuke Beam (thingy\NukeBeam.grp) # 232 Nuke Beam (thingy\NukeBeam.grp)
@ -1820,7 +1820,7 @@ Init Phalanx_Tank_BaseInit
Death Phalanx_Tank_BaseDeath Death Phalanx_Tank_BaseDeath
GndAttkInit [NONE] GndAttkInit [NONE]
AirAttkInit [NONE] AirAttkInit [NONE]
Unused1 [NONE] Unused1 SkryrokorLocal00
GndAttkRpt [NONE] GndAttkRpt [NONE]
AirAttkRpt [NONE] AirAttkRpt [NONE]
CastSpell [NONE] CastSpell [NONE]
@ -1868,7 +1868,7 @@ Init InfestedTerranWalkingToIdle
Death Generic_Wait1End Death Generic_Wait1End
GndAttkInit Phalanx_Tank_TurretGndAttkInit GndAttkInit Phalanx_Tank_TurretGndAttkInit
AirAttkInit [NONE] AirAttkInit [NONE]
Unused1 [NONE] Unused1 SkryrokorLocal00
GndAttkRpt Phalanx_Tank_TurretGndAttkInit GndAttkRpt Phalanx_Tank_TurretGndAttkInit
AirAttkRpt [NONE] AirAttkRpt [NONE]
CastSpell [NONE] CastSpell [NONE]
@ -1906,7 +1906,7 @@ Init Phalanx_Siege_BaseInit
Death Phalanx_Siege_BaseDeath Death Phalanx_Siege_BaseDeath
GndAttkInit [NONE] GndAttkInit [NONE]
AirAttkInit [NONE] AirAttkInit [NONE]
Unused1 [NONE] Unused1 SkryrokorLocal00
GndAttkRpt [NONE] GndAttkRpt [NONE]
AirAttkRpt [NONE] AirAttkRpt [NONE]
CastSpell [NONE] CastSpell [NONE]
@ -2000,7 +2000,7 @@ Init Phalanx_Siege_TurretInit
Death Generic_Wait1End Death Generic_Wait1End
GndAttkInit Phalanx_Siege_TurretGndAttkInit GndAttkInit Phalanx_Siege_TurretGndAttkInit
AirAttkInit [NONE] AirAttkInit [NONE]
Unused1 [NONE] Unused1 SkryrokorLocal00
GndAttkRpt Phalanx_Siege_TurretGndAttkInit GndAttkRpt Phalanx_Siege_TurretGndAttkInit
AirAttkRpt [NONE] AirAttkRpt [NONE]
CastSpell [NONE] CastSpell [NONE]
@ -3456,7 +3456,7 @@ Walking [NONE]
WalkingToIdle [NONE] WalkingToIdle [NONE]
SpecialState1 [NONE] SpecialState1 [NONE]
SpecialState2 [NONE] SpecialState2 [NONE]
AlmostBuilt [NONE] AlmostBuilt SkryrokorLocal00
Built SkryrokorLocal00 Built SkryrokorLocal00
Landing PalladiumConnectorLanding Landing PalladiumConnectorLanding
LiftOff PalladiumConnectorLiftOff LiftOff PalladiumConnectorLiftOff
@ -3602,8 +3602,8 @@ CastSpell [NONE]
GndAttkToIdle Watchdog_Turret_GndAttkToIdle GndAttkToIdle Watchdog_Turret_GndAttkToIdle
AirAttkToIdle Watchdog_Turret_GndAttkToIdle AirAttkToIdle Watchdog_Turret_GndAttkToIdle
Unused2 [NONE] Unused2 [NONE]
Walking [NONE] Walking SkryrokorLocal00
WalkingToIdle [NONE] WalkingToIdle SkryrokorLocal00
SpecialState1 [NONE] SpecialState1 [NONE]
SpecialState2 [NONE] SpecialState2 [NONE]
AlmostBuilt SkryrokorLocal00 AlmostBuilt SkryrokorLocal00
@ -4152,7 +4152,7 @@ AirAttkRpt [NONE]
CastSpell [NONE] CastSpell [NONE]
GndAttkToIdle [NONE] GndAttkToIdle [NONE]
AirAttkToIdle [NONE] AirAttkToIdle [NONE]
Unused2 [NONE] Unused2 SkryrokorLocal00
Walking [NONE] Walking [NONE]
WalkingToIdle [NONE] WalkingToIdle [NONE]
SpecialState1 [NONE] SpecialState1 [NONE]
@ -7298,7 +7298,7 @@ GndAttkRpt MadrigalImperiosoTurretGndAttkInit
AirAttkRpt MadrigalImperiosoTurretGndAttkInit AirAttkRpt MadrigalImperiosoTurretGndAttkInit
CastSpell [NONE] CastSpell [NONE]
GndAttkToIdle SkryrokorLocal00 GndAttkToIdle SkryrokorLocal00
AirAttkToIdle [NONE] AirAttkToIdle SkryrokorLocal00
Unused2 [NONE] Unused2 [NONE]
Walking SkryrokorLocal00 Walking SkryrokorLocal00
WalkingToIdle SkryrokorLocal00 WalkingToIdle SkryrokorLocal00
@ -7899,7 +7899,7 @@ Init SavantPowerSiphonInit
Death MadcapDeath Death MadcapDeath
GndAttkInit MadcapGndAttkInit GndAttkInit MadcapGndAttkInit
AirAttkInit MadcapGndAttkInit AirAttkInit MadcapGndAttkInit
Unused1 [NONE] Unused1 SkryrokorLocal00
GndAttkRpt MadcapGndAttkRpt GndAttkRpt MadcapGndAttkRpt
AirAttkRpt MadcapGndAttkRpt AirAttkRpt MadcapGndAttkRpt
CastSpell [NONE] CastSpell [NONE]
@ -7932,7 +7932,7 @@ Init SavantInit
Death MadcapDeath Death MadcapDeath
GndAttkInit MadcapGndAttkInit GndAttkInit MadcapGndAttkInit
AirAttkInit MadcapGndAttkInit AirAttkInit MadcapGndAttkInit
Unused1 [NONE] Unused1 SkryrokorLocal00
GndAttkRpt MadcapGndAttkRpt GndAttkRpt MadcapGndAttkRpt
AirAttkRpt MadcapGndAttkRpt AirAttkRpt MadcapGndAttkRpt
CastSpell [NONE] CastSpell [NONE]
@ -13719,14 +13719,14 @@ CastSpell [NONE]
GndAttkToIdle IonCannonAttackAInit GndAttkToIdle IonCannonAttackAInit
AirAttkToIdle IonCannonAttackAInit AirAttkToIdle IonCannonAttackAInit
Unused2 [NONE] Unused2 [NONE]
Walking [NONE] Walking SkryrokorLocal00
WalkingToIdle [NONE] WalkingToIdle SkryrokorLocal00
SpecialState1 [NONE] SpecialState1 [NONE]
SpecialState2 [NONE] SpecialState2 [NONE]
AlmostBuilt [NONE] AlmostBuilt [NONE]
Built [NONE] Built [NONE]
Landing [NONE] Landing SkryrokorLocal00
LiftOff [NONE] LiftOff SkryrokorLocal00
IsWorking [NONE] IsWorking [NONE]
WorkingToIdle [NONE] WorkingToIdle [NONE]
WarpIn [NONE] WarpIn [NONE]
@ -14495,7 +14495,7 @@ FusionCutterHitDamagelessDeath:
# ----------------------------------------------------------------------------- # # ----------------------------------------------------------------------------- #
# This header is used by images.dat entries: # This header is used by images.dat entries:
# 296 Sentinel (Base) # 1544 Sentinel (Base) (cm\terran\sentinel-base.grp)
.headerstart .headerstart
IsId 666 IsId 666
Type 20 Type 20
@ -14567,14 +14567,14 @@ Sentinel_Base_Landing:
goto SkryrokorLocal00 goto SkryrokorLocal00
Sentinel_Base_Built: Sentinel_Base_Built:
imgol 1545 0 0 # Sentinel (Turret) imgol 1545 0 0 # Sentinel (Turret) (cm\terran\sentinel-turret.grp)
Sentinel_Base_WorkingToIdle: Sentinel_Base_WorkingToIdle:
playfram 2 playfram 2
goto SkryrokorLocal00 goto SkryrokorLocal00
# ----------------------------------------------------------------------------- # # ----------------------------------------------------------------------------- #
# This header is used by images.dat entries: # This header is used by images.dat entries:
# 297 Sentinel (Turret) # 1545 Sentinel (Turret) (cm\terran\sentinel-turret.grp)
.headerstart .headerstart
IsId 667 IsId 667
Type 24 Type 24
@ -14589,8 +14589,8 @@ CastSpell [NONE]
GndAttkToIdle Sentinel_Turret_GndAttkToIdle GndAttkToIdle Sentinel_Turret_GndAttkToIdle
AirAttkToIdle Sentinel_Turret_GndAttkToIdle AirAttkToIdle Sentinel_Turret_GndAttkToIdle
Unused2 [NONE] Unused2 [NONE]
Walking [NONE] Walking SkryrokorLocal00
WalkingToIdle [NONE] WalkingToIdle SkryrokorLocal00
SpecialState1 [NONE] SpecialState1 [NONE]
SpecialState2 [NONE] SpecialState2 [NONE]
AlmostBuilt SkryrokorLocal00 AlmostBuilt SkryrokorLocal00
@ -17166,7 +17166,7 @@ MatadorCinderModeSpecialState2:
# 1523 Matador Tank Mode Turret (cm\terran\matador-turret.grp) # 1523 Matador Tank Mode Turret (cm\terran\matador-turret.grp)
.headerstart .headerstart
IsId 738 IsId 738
Type 12 Type 13
Init InfestedTerranWalkingToIdle Init InfestedTerranWalkingToIdle
Death Generic_Wait1End Death Generic_Wait1End
GndAttkInit MatadorGndAttkInit GndAttkInit MatadorGndAttkInit
@ -17180,7 +17180,7 @@ AirAttkToIdle InfestedTerranWalkingToIdle
Unused2 [NONE] Unused2 [NONE]
Walking MatadorWalking Walking MatadorWalking
WalkingToIdle InfestedTerranWalkingToIdle WalkingToIdle InfestedTerranWalkingToIdle
SpecialState1 [NONE] SpecialState1 SkryrokorLocal00
.headerend .headerend
# ----------------------------------------------------------------------------- # # ----------------------------------------------------------------------------- #

BIN
mpq/scripts/iscript_zerg.bin
View File

Binary file not shown.

18
mpq/scripts/iscript_zerg.txt
View File

@ -271,7 +271,7 @@ InfestedTerranExplosionInit:
# 011 Zerg Cocoon (zerg\cocoon.grp) # 011 Zerg Cocoon (zerg\cocoon.grp)
.headerstart .headerstart
IsId 8 IsId 8
Type 14 Type 21
Init ZergCocoonInit Init ZergCocoonInit
Death ZergCocoonDeath Death ZergCocoonDeath
GndAttkInit [NONE] GndAttkInit [NONE]
@ -288,6 +288,12 @@ WalkingToIdle [NONE]
SpecialState1 ZergCocoonSpecialState1 SpecialState1 ZergCocoonSpecialState1
SpecialState2 ZergCocoonSpecialState2 SpecialState2 ZergCocoonSpecialState2
AlmostBuilt ZergCocoonAlmostBuilt AlmostBuilt ZergCocoonAlmostBuilt
Built [NONE]
Landing [NONE]
LiftOff [NONE]
IsWorking [NONE]
WorkingToIdle [NONE]
WarpIn [NONE]
.headerend .headerend
# ----------------------------------------------------------------------------- # # ----------------------------------------------------------------------------- #
@ -4931,7 +4937,7 @@ Init VorvrokorInit
Death VorvrokorDeath Death VorvrokorDeath
GndAttkInit VorvrokorGndAttkInit GndAttkInit VorvrokorGndAttkInit
AirAttkInit [NONE] AirAttkInit [NONE]
Unused1 [NONE] Unused1 SkryrokorLocal00
GndAttkRpt VorvrokorGndAttkInit GndAttkRpt VorvrokorGndAttkInit
AirAttkRpt [NONE] AirAttkRpt [NONE]
CastSpell [NONE] CastSpell [NONE]
@ -14855,11 +14861,11 @@ IsId 773
Type 26 Type 26
Init OkrimniliskInit Init OkrimniliskInit
Death CherbrathalorDeath Death CherbrathalorDeath
GndAttkInit [NONE] GndAttkInit SkryrokorLocal00
AirAttkInit [NONE] AirAttkInit SkryrokorLocal00
Unused1 OkrimniliskUnused1 Unused1 OkrimniliskUnused1
GndAttkRpt [NONE] GndAttkRpt SkryrokorLocal00
AirAttkRpt [NONE] AirAttkRpt SkryrokorLocal00
CastSpell [NONE] CastSpell [NONE]
GndAttkToIdle OkrimniliskGndAttkToIdle GndAttkToIdle OkrimniliskGndAttkToIdle
AirAttkToIdle OkrimniliskGndAttkToIdle AirAttkToIdle OkrimniliskGndAttkToIdle

BIN
mpq/unit/cm/askosi/a-rubble-large.grp Normal file
View File

Binary file not shown.

BIN
plugins/gptp.qdp
View File

Binary file not shown.