Revise Liiralisk, Cikralisk, Vithrilisk; Fix misc bugs; Update Zerg AI

mpq/arr/images.txt

@@ -2054,7 +2054,7 @@ Arhaun Shadow
 Morningstar Radiation Field
 Zozarc Gorge
 Zozarc Gorge Shadow
-Extended Image #1054
+Cikralisk Attack Overlay
 Extended Image #1055
 Extended Image #1056
 Extended Image #1057

mpq/arr/weapons.txt

@@ -240,7 +240,7 @@ Inzor Reflux (Inzorthrokor)
 Mining Saber (Pilgrim)
 Asoni Carbine (Blackguard)
 Phlegethon Cannons (Arhaun)
-Extended Weapon #113
+Homing Spore (Liiralisk)
 Extended Weapon #114
 Extended Weapon #115
 Extended Weapon #116

mpq/scripts/iscript_protoss.txt

@@ -121,7 +121,7 @@ Explosion_Medium_Init:
 # 334 Building Explosion (Large) (thingy\tBangX.grp)
 .headerstart
 IsId          	144
-Type            24
+Type            26
 Init          	Explosion_Large_Init
 Death         	Explosion_Large_Init
 GndAttkInit     Explosion_Large_Init

mpq/scripts/iscript_terran.txt

@@ -4964,7 +4964,7 @@ Explosion_Medium_Init:
 # 334 Building Explosion (Large) (thingy\tBangX.grp)
 .headerstart
 IsId          	144
-Type            24
+Type            26
 Init          	Explosion_Large_Init
 Death         	Explosion_Large_Init
 GndAttkInit     Explosion_Large_Init
@@ -12127,7 +12127,7 @@ AspirantWarpIn:
 # 1351 Magnetic Field (small) 	(cm\effect\magneticfield-small.grp)
 .headerstart
 IsId          	575
-Type          	2
+Type          	3
 Init          	MagneticFieldInit
 Death         	MagneticFieldDeath
 GndAttkInit   	MagneticFieldDeath

mpq/scripts/iscript_zerg.txt

@@ -6989,7 +6989,7 @@ IrolIrisIsWorking:
 # 1095 Nathrokor (cm\zerg\nathrokor.grp)
 .headerstart
 IsId          	451
-Type          	14
+Type          	26
 Init          	NathrokorInit
 Death         	NathrokorDeath
 GndAttkInit   	NathrokorGndAttkInit
@@ -7006,6 +7006,18 @@ WalkingToIdle 	NathrokorGndAttkToIdle
 SpecialState1 	SkryrokorLocal00
 SpecialState2 	SkryrokorLocal00
 AlmostBuilt   	SkryrokorLocal00
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	[NONE]
+Unused3       	[NONE]
+StarEditInit  	[NONE]
+Disable       	[NONE]
+Burrow        	[NONE]
+UnBurrow      	[NONE]
+Enable        	[NONE]
 .headerend
 # ----------------------------------------------------------------------------- #
 
@@ -8466,7 +8478,7 @@ BactaliskDenIsWorking:
 # 1243 Kalkalisk Spores (bullet\Spore2.grp)
 .headerstart
 IsId          	522
-Type          	2
+Type          	3
 Init          	KalkaliskSporesInit
 Death         	KalkaliskSporesDeath
 GndAttkInit   	KalkaliskSporesGndAttkInit
@@ -10231,10 +10243,10 @@ Type          	26
 Init          	LiiraliskInit
 Death         	LiiraliskDeath
 GndAttkInit   	LiiraliskGndAttkInit
-AirAttkInit   	LiiraliskGndAttkInit
+AirAttkInit   	LiiraliskAirAttkInit
 Unused1       	LiiraliskUnused1
 GndAttkRpt    	LiiraliskGndAttkRpt
-AirAttkRpt    	LiiraliskGndAttkRpt
+AirAttkRpt    	LiiraliskAirAttkRpt
 CastSpell     	[NONE]
 GndAttkToIdle 	LiiraliskGndAttkToIdle
 AirAttkToIdle 	LiiraliskGndAttkToIdle
@@ -10323,8 +10335,8 @@ LiiraliskGndAttkRpt:
     playfram            0x1E0
     wait                1
     playfram            0x200
-    attack
+    attackwith			1
-    attack
+    attackwith			1
     wait                1
     playfram            0x220
     wait                1
@@ -10344,6 +10356,31 @@ LiiraliskGndAttkToIdle:
     wait                1
     goto                LiiraliskWalkingToIdle
 
+LiiraliskAirAttkInit:
+    playfram            0x00
+    wait                1
+    playfram            0x1C0
+    wait                2
+LiiraliskAirAttkRpt:
+    wait                1
+    nobrkcodestart
+    playsndbtwn         2014 2015 # Liiralisk attack 01, 02
+    playfram            0x1E0
+    wait                1
+    playfram            0x200
+    attackwith			2
+    wait                1
+    playfram            0x220
+    wait                1
+    playfram            0x240
+    wait                1
+    playfram            0x260
+    wait                1
+    nobrkcodeend
+    gotorepeatattk
+    ignorerest
+	goto				LiiraliskGndAttkToIdle
+
 LiiraliskWalking:
 	move              	6
 	wait              	1
@@ -12005,11 +12042,11 @@ AlkagItethIsWorking:
 # 1536 Kagralisk Venom
 .headerstart
 IsId          	664
-Type          	2
+Type          	3
 Init          	KagraliskVenomInit
 Death         	KagraliskVenomDeath
 GndAttkInit   	KagraliskVenomGndAttkInit
-AirAttkInit   	[NONE]
+AirAttkInit   	KagraliskVenomGndAttkInit
 .headerend
 # ----------------------------------------------------------------------------- #
 
@@ -13210,24 +13247,29 @@ CikraliskGndAttkInit:
 	playfram          	0x120
 	wait              	1
 	nobrkcodestart
-	playfram          	0x140
+	playfram			0x140
 	wait              	1
-	playfram          	0x160
+	playfram			0x160
-	attackwith			1
 	wait              	1
-	playfram          	0x180
+	playfram			0x180
 	playsndbtwn			3027 3029 # Cikralisk weaponfire 01, 02, 03
-	attackwith			1
+	imgoluselo			2056 0 0 # Green projection attack
+	attkshiftproj		24
+	wait              	1
+	attkshiftproj		54
+	wait				1
+	playfram			0x160
+	attkshiftproj		82
+	wait              	1
+	playfram			0x140
+	attkshiftproj		112
+	wait              	1
+	playfram			0x120
+	attkshiftproj		140
+	sigorder			32
 	wait				1
 	nobrkcodeend
-	playfram			0x160
-	wait				1
-	playfram			0x140
-	wait				1
-	playfram			0x120
-	wait				1
 	gotorepeatattk
-	ignorerest
 	goto				CikraliskGndAttkToIdle
 
 CikraliskWalking:
@@ -16255,7 +16297,7 @@ AirAttkToIdle 	SkryrokorLocal00
 Unused2       	SkryrokorLocal00
 Walking       	SkryrokorLocal00
 WalkingToIdle 	SkryrokorLocal00
-SpecialState1 	SkryrokorLocal00
+SpecialState1 	[NONE]
 .headerend
 # ----------------------------------------------------------------------------- #
 

patchnotes.md

@@ -9,6 +9,15 @@
 - Improve audiovisuals
 - [Subscribe on ko-fi](https://ko-fi.com/pr0nogoandveeq7) to get a sneak peek of the incoming changes!
 
+## Bugfixes
+- **Stability:**
+	- Fixed several iscript errors
+- **Gameplay:**
+	- Improved **Oscilliant** Binding Plasma proc consistency (r. ArbuzBudesh)
+- **Audiovisual:**
+	- Corrected **Liiralisk** placeholder corpse
+	- Corrected **Striga** retaliation overlay when attacking **Analogue**s
+
 ## AI
 - Updated aiscripts and requirements to properly handle this patch's changes
 
@@ -183,6 +192,23 @@
 ## Zerg
 - **Tech nodes:**
 	- Evolutions no longer require Irol Iris or Othstol Oviform
+- [Liiralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/liiralisk):
+	- Transport cost 2 » 1
+	- Vision range 8 » 7
+	- **NEW: Homing Spores:**
+		- Anti-air attack with generous splash radius; does not bounce
+- [Cikralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/cikralisk):
+	- HP 100 » 130
+	- Movement speed 5 » 6.5
+	- **Acid Salvo:**
+		- Now a line attack (e.g. Striga / Pariah) with new stats
+- [Vithrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vithrilisk):
+	- HP 200 » 240
+	- Armor 2 » 3
+	- Sight range 8 » 7
+	- **Corrosive Pathogen:**
+		- Range 2 » 4
+		- No longer requires the target to have Corrosive Touch first
 - [Lakizilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/lakizilisk):
 	- HP 140 » 150
 	- Movement speed 5 » 5.2