Replace Grand Library and Ancestral Archives graphics; Tweak status and placeability as a result

2026-10-10 05:57:51 +00:00 · 2024-04-29 12:48:36 -04:00 · 2024-04-29 12:48:36 -04:00 · e0f34c2a67
commit e0f34c2a67
parent cad409a7fd
23 changed files with 166 additions and 37 deletions
--- a/mpq/arr/flingy.datex
+++ b/mpq/arr/flingy.datex
--- a/mpq/arr/flingy.txt
+++ b/mpq/arr/flingy.txt
@ -49,7 +49,7 @@ Accantor
 Plasma Shell
 Zealot
 Witness
-Ancestral Archives
+Templar Archives
 Aquifer
 Machinist Hall
 Citadel of Adun
@ -235,7 +235,7 @@ Othstol Oviform
 Quantum Institute
 Irulent Ivoa
 Othstoleth
-Grand Library
+Ancestral Archives
 Irol Iris
 Treasury
 Sibraelosk
@ -513,7 +513,7 @@ Chokralgant Chazsal
 Algoztalisk
 Okrimnilisk
 Cherbrathalor
-Extended Flingy #307
+Grand Library
 Extended Flingy #308
 Extended Flingy #309
 Extended Flingy #310
--- a/mpq/arr/images.datex
+++ b/mpq/arr/images.datex
--- a/mpq/arr/images.tbl
+++ b/mpq/arr/images.tbl
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@ -153,9 +153,9 @@ Zealot
 Zealot Shadow
 Zealot Death
 Zealot Warp Flash
-Ancestral Archives
-Ancestral Archives Warp Flash
-Ancestral Archives Shadow
+Templar Archives
+Templar Archives Warp Flash
+Templar Archives Shadow
 Aquifer
 Aquifer Warp Flash
 Aquifer Shadow
@ -1048,9 +1048,9 @@ Irulent Ivoa
 Irulent Ivoa Shadow
 Othstoleth
 Othstoleth Shadow
-Grand Library
-Grand Library Shadow
-Grand Library Warpin
+Ancestral Archives
+Ancestral Archives Shadow
+Ancestral Archives Warp Flash
 Irol Iris
 Irol Iris Shadow
 Starpad Shadow
@ -1849,9 +1849,9 @@ Maverick Stimpack Inject
 Maverick Stimpack Proc
 Maverick Stimpack Expire
 Sevenstep Mind Matter Overlay
-Extended Image #849
-Extended Image #850
-Extended Image #851
+Grand Library
+Grand Library Shadow
+Grand Library Warp Flash
 Extended Image #852
 Extended Image #853
 Extended Image #854
--- a/mpq/arr/sprites.datex
+++ b/mpq/arr/sprites.datex
--- a/mpq/arr/sprites.txt
+++ b/mpq/arr/sprites.txt
@ -201,7 +201,7 @@ Accantor
 Plasma Shell
 Zealot
 Witness
-Ancestral Archives
+Templar Archives
 Aquifer
 Machinist Hall
 Citadel of Adun
@ -543,7 +543,7 @@ Othstol Oviform
 Quantum Institute
 Irulent Ivoa
 Othstoleth
-Grand Library
+Ancestral Archives
 Irol Iris
 Sibraelosk
 Treasury
@ -905,7 +905,7 @@ Algoztalisk
 Okrimnilisk
 Cherbrathalor
 Sevenstep Mind Matter Overlay
-Extended Sprite #1
+Grand Library
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1
--- a/mpq/arr/units.datex
+++ b/mpq/arr/units.datex
--- a/mpq/game/icons.grp
+++ b/mpq/game/icons.grp
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@ -24403,12 +24403,12 @@ OthstolethWalkingToIdle:
 	
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
-# 1050 Grand Library (cm\protoss\grandlibrary.grp)
+# 1050 Ancestral Archives (cm\protoss\ancestral-archives.grp)
 .headerstart
 IsId          	435
 Type          	27
-Init          	GrandLibraryInit
-Death         	GrandLibraryDeath
+Init          	AncestralArchivesInit
+Death         	AncestralArchivesDeath
 GndAttkInit   	[NONE]
 AirAttkInit   	[NONE]
 Unused1       	[NONE]
@ -24423,28 +24423,28 @@ WalkingToIdle 	[NONE]
 SpecialState1 	[NONE]
 SpecialState2 	[NONE]
 AlmostBuilt   	[NONE]
-Built         	GrandLibraryBuilt
+Built         	AncestralArchivesBuilt
 Landing       	[NONE]
 LiftOff       	[NONE]
-IsWorking     	GrandLibraryIsWorking
-WorkingToIdle 	GrandLibraryLocal00
-WarpIn        	GrandLibraryWarpIn
+IsWorking     	AncestralArchivesIsWorking
+WorkingToIdle 	AncestralArchivesLocal00
+WarpIn        	AncestralArchivesWarpIn
 Unused3       	[NONE]
 StarEditInit  	[NONE]
-Disable       	GrandLibraryDisabled
+Disable       	AncestralArchivesDisabled
 Burrow        	[NONE]
 UnBurrow      	[NONE]
-Enable        	GrandLibraryLocal00
+Enable        	AncestralArchivesLocal00
 .headerend
 # ----------------------------------------------------------------------------- #

-GrandLibraryInit:
-	imgul             	1051 0 0 # Grand Library Shadow (cm\protoss\grandlibrary-shad.grp)
-GrandLibraryLocal00:
+AncestralArchivesInit:
+	imgul             	1051 0 0 # Ancestral Archives Shadow (cm\protoss\ancestral-archives-shadow.grp)
+AncestralArchivesLocal00:
 	playfram          	0x00
 	goto              	ScourgeLocal00

-GrandLibraryDeath:
+AncestralArchivesDeath:
 	playsnd           	7 # Misc\ExploLrg.wav
 	imgol             	215 0 0	# Explosion (Large) (thingy\tBangX.grp)
 	wait              	3
@ -24452,15 +24452,15 @@ GrandLibraryDeath:
 	wait              	1
 	end

-GrandLibraryBuilt:
+AncestralArchivesBuilt:
 	playfram			0x00
 	goto              	ScourgeLocal00

-GrandLibraryWarpIn:
-	imgol             	1052 0 0 # Grand Library Warp Flash (cm\protoss\grandlibrary.grp)
+AncestralArchivesWarpIn:
+	imgol             	1052 0 0 # Ancestral Archives Warp Flash (cm\protoss\ancestral-archives.grp)
 	goto              	ScourgeLocal00
 	
-GrandLibraryIsWorking:
+AncestralArchivesIsWorking:
 	playfram			1
 	wait				2
 	playfram			2
@ -24468,9 +24468,9 @@ GrandLibraryIsWorking:
 	playfram			1
 	wait				2
 	playfram			0
-	goto				GrandLibraryIsWorking
+	goto				AncestralArchivesIsWorking
 	
-GrandLibraryDisabled:
+AncestralArchivesDisabled:
 	playfram			3
 	goto				ScourgeLocal00
 	
@ -50965,5 +50965,117 @@ MaverickStimpackInit:
 MaverickStimpackDeath:
 	wait              	1
 	end
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1851 Grand Library (cm\protoss\grand-library.grp)
+.headerstart
+IsId          	778
+Type          	27
+Init          	GrandLibraryInit
+Death         	AncestralArchivesDeath
+GndAttkInit   	[NONE]
+AirAttkInit   	[NONE]
+Unused1       	[NONE]
+GndAttkRpt    	[NONE]
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	[NONE]
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	[NONE]
+WalkingToIdle 	[NONE]
+SpecialState1 	GrandLibrarySpecialState1
+SpecialState2 	GrandLibrarySpecialState2
+AlmostBuilt   	GrandLibraryAlmostBuilt
+Built         	ScourgeLocal00
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	GrandLibraryIsWorking
+WorkingToIdle 	GrandLibraryWorkingToIdle
+WarpIn        	GrandLibraryAlmostBuilt
+Unused3       	[NONE]
+StarEditInit  	[NONE]
+Disable       	GrandLibraryDisable
+Burrow        	[NONE]
+UnBurrow      	[NONE]
+Enable        	GrandLibraryEnable
+.headerend
+# ----------------------------------------------------------------------------- #
+
+GrandLibraryInit:
+	imgul             	1852 0 0 # GrandLibrary Shadow (cm\protoss\grand-library-shadow.grp)
+	playfram          	0x00
+	wait              	2
+	goto              	ScourgeLocal00
+
+GrandLibrarySpecialState1:
+	playsnd           	528 # Protoss\SHUTTLE\pshBld00.wav
+	wait              	1 
+	goto              	GrandLibraryLocal00
+
+GrandLibraryLocal00:
+	wait              	255 
+	goto              	GrandLibraryLocal00
+
+GrandLibrarySpecialState2:
+	wait              	1 
+	goto              	GrandLibraryWorkingToIdle
+
+GrandLibraryWorkingToIdle:
+	playfram          	12
+	wait              	2
+	playfram          	13
+	wait              	2
+	playfram          	14
+	wait              	2
+	playfram			0
+	goto              	ScourgeLocal00
+
+GrandLibraryAlmostBuilt:
+	imgol             	1853 0 0 # Grand Library Warp Flash (cm\protoss\grand-library.grp)
+	goto              	ScourgeLocal00
+
+GrandLibraryIsWorking:
+	playfram          	1
+	wait              	2
+	playfram          	2
+	wait              	2
+	playfram          	3
+	wait              	2
+	playfram          	4
+	wait              	2
+	goto				GrandLibraryLoop
+
+GrandLibraryLoop:
+	playfram          	8
+	wait              	2
+	playfram          	9
+	wait              	2
+	playfram          	10
+	wait              	2
+	playfram          	11
+	wait              	2
+	playfram			10
+	wait              	2
+	playfram          	9
+	wait              	2
+	goto              	GrandLibraryLoop
+
+GrandLibraryDisable:
+	playfram          	0x00
+	wait              	1
+	playfram          	15
+	wait              	2
+	playfram          	16
+	wait              	1
+	goto              	ScourgeLocal00
+
+GrandLibraryEnable:
+	playfram          	15
+	wait              	2
+	playfram			0
+	wait              	1
+	goto              	ScourgeLocal00
 	
-## Next free IsId: 778
+## Next free IsId: 779
--- a/mpq/tileset/Desert.vf4
+++ b/mpq/tileset/Desert.vf4
--- a/mpq/unit/cm/protoss/ancestral-archives-damage.lof
+++ b/mpq/unit/cm/protoss/ancestral-archives-damage.lof
--- a/mpq/unit/cm/protoss/ancestral-archives-shadow.grp
+++ b/mpq/unit/cm/protoss/ancestral-archives-shadow.grp
--- a/mpq/unit/cm/protoss/ancestral-archives.grp
+++ b/mpq/unit/cm/protoss/ancestral-archives.grp
--- a/mpq/unit/cm/protoss/grand-library-damage.lof
+++ b/mpq/unit/cm/protoss/grand-library-damage.lof
--- a/mpq/unit/cm/protoss/grand-library-shadow.grp
+++ b/mpq/unit/cm/protoss/grand-library-shadow.grp
--- a/mpq/unit/cm/protoss/grand-library.grp
+++ b/mpq/unit/cm/protoss/grand-library.grp
--- a/mpq/unit/cmdbtns/cmdicons.grp
+++ b/mpq/unit/cmdbtns/cmdicons.grp
--- a/mpq/unit/cmdbtns/uniticons.grp
+++ b/mpq/unit/cmdbtns/uniticons.grp
--- a/mpq/unit/wirefram/grpwire.grp
+++ b/mpq/unit/wirefram/grpwire.grp
--- a/mpq/unit/wirefram/wirefram.grp
+++ b/mpq/unit/wirefram/wirefram.grp
--- a/patchnotes.md
+++ b/patchnotes.md
@ -22,6 +22,9 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 	- Konvilisk and Cherbrathalor attacks can no longer bounce more than once (r. lolrsk8s)
 	- Successive Sevenstep attacks no longer reset Mind Matter handling (r. lolrsk8s)
 	- Treasuries now leave behind corpses
+	- Ocsal Gosvileths no longer pass on Ocsal debuff to structures (r. TheBeaver99)
+- Audiovisuals:
+	- Olympian Mythical Might SFX no longer plays more often than intended (r. lolrsk8s)
 - Triggers:
 	- Restored 'Set Next Scenario' trigger action functionality

@ -36,7 +39,7 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 		- Missile arming
 		- Missile launching (c. DF)

-## Terran:
+## Terran
 - [Cyprian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyprian):
 	- Weapon range now 7, from 6
 - [Shaman](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/shaman):
@ -56,4 +59,18 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 	- Weapon range now 6, from 5
 - [Paladin](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/paladin):
 	- Splash radii now 24/48/72, from 12/24/48
-	- Missiles now move notably faster
+	- Missiles now move notably faster
+
+## Protoss
+- [Legionnaire](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/legionnaire):
+	- Sight range now 6, from 7
+- [Gateway](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/gateway):
+	- Armor now 3, from 4
+- [Grand Library](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/grand-library):
+	- HP now 800, from 1000
+	- Shields now 400, from 500
+	- Build area now 4x4, from 5x4
+- [Ancestral Archives](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/ancestral-archives):
+	- HP now 900, from 600
+	- Armor now 5, from 4
+	- Build area now 5x4, from 3x2
--- a/plugins/gptp.qdp
+++ b/plugins/gptp.qdp