Fix Salvage bugs; Add Proscenium almostbuilt frame

mpq/arr/images.txt

@@ -193,10 +193,10 @@ Pylon Shadow
 Lattice
 Lattice Warp Flash
 Lattice Shadow
-Shield Battery
+Bulwark
-Shield Battery Overlay
+Bulwark Overlay
-Shield Battery Warp Flash
+Bulwark Warp Flash
-Shield Battery Shadow
+Bulwark Shadow
 Stargate
 Stargate Overlay
 Stargate Warp Flash

mpq/scripts/iscript_askosi.txt

@@ -2484,7 +2484,7 @@ ProsceniumSpecialState1:
 	goto              	SkryrokorLocal00
 
 ProsceniumAlmostBuilt:
-	playfram          	0
+	playfram          	2
 	goto              	SkryrokorLocal00
 
 ProsceniumBuilt:

mpq/scripts/iscript_protoss.txt

@@ -2487,7 +2487,7 @@ NexusWarpIn:
 # 181 Nexus Overlay (protoss\pneGlow.grp)
 .headerstart
 IsId          	178
-Type          	24
+Type          	27
 Init          	NexusOverlayInit
 Death         	Generic_Wait1End
 GndAttkInit   	[NONE]
@@ -2514,6 +2514,8 @@ Unused3       	[NONE]
 StarEditInit  	[NONE]
 Disable       	Generic_Wait1End
 Burrow        	[NONE]
+UnBurrow        [NONE]
+Enable        	SkryrokorLocal00
 .headerend
 # ----------------------------------------------------------------------------- #
 
@@ -2613,7 +2615,7 @@ WardenWarpIn:
 # 189 Pylon (protoss\pylon.grp)
 .headerstart
 IsId          	181
-Type          	21
+Type          	27
 Init          	PylonInit
 Death         	PylonDeath
 GndAttkInit   	[NONE]
@@ -2636,6 +2638,12 @@ LiftOff       	[NONE]
 IsWorking     	SkryrokorLocal00
 WorkingToIdle 	SkryrokorLocal00
 WarpIn        	PylonWarpIn
+Unused3       	[NONE]
+StarEditInit  	[NONE]
+Disable       	Generic_Wait1End
+Burrow        	[NONE]
+UnBurrow        [NONE]
+Enable        	SkryrokorLocal00
 .headerend
 # ----------------------------------------------------------------------------- #
 
@@ -2769,12 +2777,12 @@ RoboticsFacilityEnable:
 
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
-# 195 Shield Battery (protoss\sbattery.grp)
+# 195 Bulwark (protoss\sbattery.grp)
 .headerstart
 IsId          	183
 Type          	27
-Init          	ShieldBatteryInit
+Init          	BulwarkInit
-Death         	ShieldBatteryDeath
+Death         	BulwarkDeath
 GndAttkInit   	[NONE]
 AirAttkInit   	[NONE]
 Unused1       	[NONE]
@@ -2789,47 +2797,47 @@ WalkingToIdle 	[NONE]
 SpecialState1 	[NONE]
 SpecialState2 	[NONE]
 AlmostBuilt   	[NONE]
-Built         	ShieldBatteryBuilt
+Built         	BulwarkBuilt
 Landing       	[NONE]
 LiftOff       	[NONE]
 IsWorking     	SkryrokorLocal00
 WorkingToIdle 	SkryrokorLocal00
-WarpIn        	ShieldBatteryWarpIn
+WarpIn        	BulwarkWarpIn
 Unused3       	[NONE]
 StarEditInit  	[NONE]
 Disable       	SkryrokorLocal00
 Burrow        	[NONE]
 UnBurrow      	[NONE]
-Enable        	ShieldBatteryBuilt
+Enable        	BulwarkBuilt
 .headerend
 # ----------------------------------------------------------------------------- #
 
-ShieldBatteryInit:
+BulwarkInit:
-	imgul             	198 0 0	# Shield Battery Shadow (protoss\pbaShad.grp)
+	imgul             	198 0 0	# Bulwark Shadow (protoss\pbaShad.grp)
 	playfram          	0x00	# Frame set 0
 	goto              	SkryrokorLocal00
 
-ShieldBatteryDeath:
+BulwarkDeath:
 	playsnd           	7	# Misc\ExploLrg.wav
 	imgol             	215 0 0	# Explosion (Large) (thingy\tBangX.grp)
 	wait              	3 
 	end
 
-ShieldBatteryBuilt:
+BulwarkBuilt:
-	imgol             	196 0 0	# Shield Battery Overlay (protoss\pbaGlow.grp)
+	imgol             	196 0 0	# Bulwark Overlay (protoss\pbaGlow.grp)
 	goto              	SkryrokorLocal00
 
-ShieldBatteryWarpIn:
+BulwarkWarpIn:
 	imgol             	197 0 0	# Shileld Battery Warp Flash (protoss\sbattery.grp)
 	goto              	SkryrokorLocal00
 
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
-# 196 Shield Battery Overlay (protoss\pbaGlow.grp)
+# 196 Bulwark Overlay (protoss\pbaGlow.grp)
 .headerstart
 IsId          	184
-Type          	24
+Type          	27
-Init          	ShieldBatteryOverlayInit
+Init          	BulwarkOverlayInit
 Death         	Generic_Wait1End
 GndAttkInit   	[NONE]
 AirAttkInit   	[NONE]
@@ -2848,21 +2856,23 @@ AlmostBuilt   	[NONE]
 Built         	[NONE]
 Landing       	[NONE]
 LiftOff       	[NONE]
-IsWorking     	ShieldBatteryOverlayIsWorking
+IsWorking     	BulwarkOverlayIsWorking
-WorkingToIdle 	ShieldBatteryOverlayInit
+WorkingToIdle 	BulwarkOverlayInit
 WarpIn        	SkryrokorLocal00
 Unused3       	[NONE]
 StarEditInit  	[NONE]
 Disable       	Generic_Wait1End
 Burrow        	[NONE]
+UnBurrow        [NONE]
+Enable        	SkryrokorLocal00
 .headerend
 # ----------------------------------------------------------------------------- #
 
-ShieldBatteryOverlayInit:
+BulwarkOverlayInit:
 	playfram          	0x00
 	goto              	SkryrokorLocal00
 
-ShieldBatteryOverlayIsWorking:
+BulwarkOverlayIsWorking:
 	playsnd           	481	# Protoss\Bldg\PbaAct00.wav
 	playfram          	1
 	wait              	2
@@ -2880,7 +2890,7 @@ ShieldBatteryOverlayIsWorking:
 	wait              	2
 	playfram          	2
 	wait              	2
-	goto              	ShieldBatteryOverlayIsWorking
+	goto              	BulwarkOverlayIsWorking
 
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:

patchnotes.md

@@ -8,6 +8,10 @@
 
 # Core changes
 
+## Misc
+- Window name is now set to `Cosmonarchy` (c. Jesse)
+- Window icon now uses Cosmonarchy's logo (c. Jesse)
+
 ## Main menu
 - An options menu has been added to the main menu, courtesy of Jesse!
 	- This menu currently allows modifying many config options.
@@ -17,11 +21,15 @@
 - **Stability:**
 	- Fixed an occasional issue with "go to max range" attacks, further resolving UB
 	- Properly fixed a rare CPU fleeing issue that caused crashes (r. iliektoeatgrass, c. DarkenedFantasies)
+- **Gameplay:**
+	- **Bulwark**s can no longer proc Astral Splendor while being salvaged
+- **Audiovisuals:**
+	- Fixed error printouts when salvaging on **Nexus**, **Pylon**, and **Bulwark** with the **Dyad** (r. Slav)
 
 ## Audiovisuals
 - Adjusted death sequence for:
 	- Phontis
 - Added almost-built frame for:
-	- Bounty, Dorminge, Domain
+	- Bounty, Dorminge, Proscenium, Domain
 - Updated construction frames for:
 	- Bounty, Dorminge