Replace Vicar model; Fix progress bars for Conduit, Bestiary

mpq/scripts/iscript_askosi.txt

@@ -616,7 +616,7 @@ SpecialState1 	[NONE]
 # ----------------------------------------------------------------------------- #
 
 MissionaryInit:
-	imgul             	2084 0 0 # Missionary Shadow (cm\a\missionary-shadow.grp)
+	imgulnextid			0 0 # Missionary Shadow (cm\a\missionary-shadow.grp)
 MissionaryWalkingToIdle:
 	playfram          	0x00
 MissionaryLocal00:
@@ -872,7 +872,7 @@ AirAttkInit   	VicarGndAttkInit
 Unused1       	VicarUnused1
 GndAttkRpt    	VicarGndAttkRpt
 AirAttkRpt    	VicarGndAttkRpt
-CastSpell     	VicarCastSpell
+CastSpell     	[NONE]
 GndAttkToIdle 	VicarGndAttkToIdle
 AirAttkToIdle 	VicarGndAttkToIdle
 Unused2       	[NONE]
@@ -883,18 +883,71 @@ SpecialState1 	[NONE]
 # ----------------------------------------------------------------------------- #
 
 VicarInit:
-	imgul             	2081 0 0 # Vicar Shadow (cm\a\vicar-shadow.grp)
+	imgulnextid			0 0 # Vicar Shadow (cm\a\vicar-shadow.grp)
 VicarWalkingToIdle:
-	playfram          	0x77
+	playfram          	0x00
-	goto				SkryrokorLocal00
+VicarLocal00:
+	wait				63
+	randcondjmp       	25 VicarLocal01
+	randcondjmp       	128 VicarLocal02
+	goto              	VicarLocal00
+
+VicarLocal01:
+	playfram          	0x20
+	wait              	1
+	randcondjmp       	192 VicarLocal03
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	wait              	6
+	turncwise         	2
+	wait              	3
+	turncwise         	2
+	wait              	3
+	turncwise         	2
+	wait              	3
+	turncwise         	2
+	wait              	3
+	turncwise         	2
+	wait              	3
+	wait              	6
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	turnccwise        	2
+	wait              	3
+	goto              	VicarWalkingToIdle
+
+VicarLocal03:
+	wait              	13 
+	goto              	VicarWalkingToIdle
+
+VicarLocal02:
+	playfram          	0x80
+	wait              	1
+	playfram          	0xA0
+	wait              	1
+	turnrand          	3
+	wait              	1
+	playfram          	0x80
+	wait              	1
+	goto              	VicarWalkingToIdle
 
 VicarDeath:
 	playsndbtwn       	296 298 # Terran\Firebat\TFBDth00.WAV | Terran\Firebat\TFBDth02.WAV
 	imgol             	2089 0 0 # Askosi Death Explosion Small (cm\a\a-death-small.grp)
 	imgol             	213 0 0 # Explosion1 (Small) (thingy\tBangS.grp)
 	setfldirect       	0
-	wait				8
+	wait              	8
-	lowsprul          	1029 0 0 # Vicar Remnants (cm\a\vicar-remnants.grp)
+	lowsprul          	1031 0 0 # Vicar Remnants (cm\a\vicar-remnants.grp)
 	wait              	1
 	end
 	
@@ -904,29 +957,38 @@ VicarUnused1:
 	setfldirect       	0
 	playsndbtwn			1163 1165
 	sprol				742 0 0 # Explosion Small Reversed
-	wait				10
+#	playfram			176
+	wait				2
+#	playfram			175
+	wait				2
+#	playfram			174
+	wait				2
+#	playfram			173
+	wait				2
+#	playfram			172
+	wait				2
+#	playfram			171
+	wait				2
+#	playfram			170
+	wait              	2
 	setfldirect       	12
 	nobrkcodeend
 	goto				VicarWalkingToIdle
 
 VicarGndAttkInit:
-	playfram          	0x88
+	playfram          	0x20
 VicarGndAttkRpt:
 	wait              	1
 	nobrkcodestart
-	playfram          	0xbb
+	playfram          	0x40
 	attackwith			1
 	wait              	1
-	playfram          	0xcc
+	playfram          	0x20
 	wait              	1
-	playfram          	0xbb
+	playfram          	0x40
 	attackwith			1
 	wait              	1
-	playfram          	0xcc
+	playfram          	0x20
-	wait              	1
-	playfram          	0xaa
-	wait              	1
-	playfram          	0x99
 	wait              	1
 	nobrkcodeend
 	gotorepeatattk
@@ -934,42 +996,31 @@ VicarGndAttkRpt:
 VicarGndAttkToIdle:
 	goto              	VicarWalkingToIdle
 
-VicarCastSpell:
-	playfram          	0x88
-	wait              	1
-	nobrkcodestart
-	playfram          	0xbb
-	wait              	1
-	playfram          	0xcc
-	wait              	1
-	castspell
-	nobrkcodeend
-	sigorder			2
-	gotorepeatattk
-	goto              	VicarWalkingToIdle
-
 VicarWalking:
 	move              	4
 	wait              	1
-	playfram          	0x22
+	playfram          	0x80
 	move              	4
 	wait              	1
-	playfram          	0x33
+	playfram          	0xA0
 	move              	4
 	wait              	1
-	playfram          	0x44
+	playfram          	0xC0
 	move              	4
 	wait              	1
-	playfram          	0x55
+	playfram          	0xE0
 	move              	4
 	wait              	1
-	playfram          	0x66
+	playfram          	0x100
 	move              	4
 	wait              	1
-	playfram          	0x00
+	playfram          	0x120
 	move              	4
 	wait              	1
-	playfram          	0x11
+	playfram          	0x140
+	move              	4
+	wait              	1
+	playfram          	0x60
 	goto              	VicarWalking
 
 # ----------------------------------------------------------------------------- #

patchnotes.md

@@ -24,9 +24,12 @@
 	- Fixed various mnemonic hotkey conflicts for Askosi structures (r. Neblime)
 	- Adjusted regeneration code so rare combinations of status effects scale expectedly (c. Veeq7)
 - **Audiovisuals**
+	- Fixed missing progress bars for **Conduit**, **Bestiary** (r. shopkeeper dog)
 	- Corrected **Thaumalogue** corpse graphic
 
 ## Audiovisuals
+- New model for:
+	- Vicar
 - New SFX for:
 	- Zerg and Askosi cloaking / decloaking (c. lolrsk8s)
 - New wireframe for: (c. jun3hong)