Resolve issues with Analogue passive vs melee; Replace Pythean model; Update icons; Protect against another null sprite crash

mpq/arr/images.txt

@@ -110,28 +110,28 @@ Zerg Building Spawn (Medium)
 Zerg Building Spawn (Large)
 Zerg Building Rubble (Small)
 Zerg Building Rubble (Large)
-Carrier
+Solarion
-Carrier Shadow
+Solarion Shadow
-Carrier Engines
+Solarion Engines
-Carrier Warp Flash
+Solarion Warp Flash
-Interceptor
+Steward
-Interceptor Shadow
+Steward Shadow
-Shuttle
+Envoy
-Shuttle Shadow
+Envoy Shadow
-Shuttle Engines
+Envoy Engines
-Shuttle Warp Flash
+Envoy Warp Flash
-Dragoon
+Dracadin
-Dragoon Shadow
+Dracadin Shadow
-Dragoon Remnants
+Dracadin Remnants
-Dragoon Warp Flash
+Dracadin Warp Flash
-High Templar
+Cantavis
-High Templar Shadow
+Cantavis Shadow
-High Templar Warp Flash
+Cantavis Warp Flash
-Dark Templar (Hero)
+Cabalist (Hero)
-Arbiter
+Didact
-Arbiter Shadow
+Didact Shadow
-Arbiter Engines
+Didact Engines
-Arbiter Warp Flash
+Didact Warp Flash
 Archon Energy
 Archon Being
 Archon Swirl
@@ -145,54 +145,54 @@ Panoptus Warp Flash
 Accantor
 Accantor Shadow
 Accantor Warp Flash
-Scarab
+Plasma Shell
-Observer
+Witness
-Observer Shadow
+Witness Shadow
-Observer Warp Flash
+Witness Warp Flash
 Zealot
 Zealot Shadow
 Zealot Death
 Zealot Warp Flash
-Templar Archives
+Ancestral Archives
-Templar Archives Warp Flash
+Ancestral Archives Warp Flash
-Templar Archives Shadow
+Ancestral Archives Shadow
-Assimilator
+Aquifer
-Assimilator Warp Flash
+Aquifer Warp Flash
-Assimilator Shadow
+Aquifer Shadow
-Observatory
+Machinist Hall
-Observatory Warp Flash
+Machinist Hall Warp Flash
-Observatory Shadow
+Machinist Hall Shadow
 Citadel of Adun
 Citadel of Adun Warp Flash
 Citadel of Adun Shadow
-Forge
+Embassy
-Forge Overlay
+Embassy Overlay
-Forge Warp Flash
+Embassy Warp Flash
-Forge Shadow
+Embassy Shadow
 Gateway
 Gateway Warp Flash
 Gateway Shadow
-Cybernetics Core
+Cenotaph
-Cybernetics Core Warp Flash
+Cenotaph Warp Flash
-Cybernetics Core Overlay
+Cenotaph Overlay
-Cybernetics Core Shadow
+Cenotaph Shadow
 Khaydarin Formation
 Nexus
 Nexus Warp Flash
 Nexus Overlay
 Nexus Shadow
-Photon Cannon
+Warden
-Photon Cannon Shadow
+Warden Shadow
-Photon Cannon Warp Flash
+Warden Warp Flash
-Arbiter Tribunal
+Celestial Tribune
-Arbiter Tribunal Warp Flash
+Celestial Tribune Warp Flash
-Arbiter Tribunal Shadow
+Celestial Tribune Shadow
 Pylon
 Pylon Warp Flash
 Pylon Shadow
-Robotics Facility
+Lattice
-Robotics Facility Warp Flash
+Lattice Warp Flash
-Robotics Facility Shadow
+Lattice Shadow
 Shield Battery
 Shield Battery Overlay
 Shileld Battery Warp Flash
@@ -224,12 +224,12 @@ Civilian Shadow
 Trojan
 Trojan Shadow
 Trojan Engines
-Firebat
+Harakan
-Firebat Shadow
+Harakan Shadow
-Ghost
+Eidolon
-Ghost Shadow
+Eidolon Shadow
-Ghost Remnants
+Eidolon Remnants
-Ghost Death
+Eidolon Death
 Nuke Beam
 Nuke Target Dot
 Goliath Base
@@ -237,10 +237,10 @@ Goliath Turret
 Goliath Shadow
 Sarah Kerrigan
 Sarah Kerrigan Shadow
-Marine
+Maverick
-Marine Shadow
+Maverick Shadow
-Marine Remnants
+Maverick Remnants
-Marine Death
+Maverick Death
 Wraith
 Wraith Shadow
 Wraith Engines
@@ -258,9 +258,9 @@ Vulture
 Vulture Shadow
 Spider Mine
 Spider Mine Shadow
-Science Vessel (Base)
+Seraph (Base)
-Science Vessel (Turret)
+Seraph (Turret)
-Science Vessel Shadow
+Seraph Shadow
 Fountainhead
 Fountainhead Overlay
 Fountainhead Shadow
@@ -1732,7 +1732,7 @@ Wyvern Turret Shadow
 Analogue
 Analogue Shadow
 Zerg Spore Explosion Large
-Extended Image #732
+Pythean Engines
 Extended Image #733
 Extended Image #734
 Extended Image #735

mpq/arr/weapons.txt

@@ -97,7 +97,7 @@ Sowing Spores (Konvilisk)
 Charybdal Rifle (Siren)
 Astral Blaster (Ecclesiast)
 Dauntless Disruption Cannon (Atreus)
-Psi Cleaver (Amaranth)
+Phase Cleaver (Amaranth)
 Neutron Flare (Lanifect)
 Sequencing Spore (Charlatan)
 Acrid Barbs (Quazilisk)
@@ -111,7 +111,7 @@ Subterranean Spines (Lakizilisk)
 Piercing Spines (Almaksalisk)
 Warp Blades (Cabalist)
 Prismatic Blasters (Idol)
-Psi Lances (Golem)
+Phase Lances (Golem)
 Ray of Agony (Barghest)
 Iconoclast's Flurry (Pariah)
 Eminence Rifle (Autocrat)

mpq/scripts/iscript.txt

@@ -26498,7 +26498,7 @@ PytheanDeath:
 
 PytheanWalking:
 	setvertpos        	0
-#	imgol             	225 0 0 # Trojan Engines (thingy\tdrGlow.grp)
+	imgol             	1734 0 0 # Pythean Engines (cm\terran\pythean-engine.grp)
 	goto              	InfestedTerranLocal00
 	
 # ----------------------------------------------------------------------------- #
@@ -52089,7 +52089,7 @@ WyvernTurretGndAttkInit:
 	playfram			0x00
 	wait				1
 	nobrkcodestart
-	playfram			0x20
+#	playfram			0x20
 	attackwith        	1
 	nobrkcodeend
 	gotorepeatattk

patchnotes.md

@@ -56,6 +56,7 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m
 - Terran lifted buildings now play the "base is under attack" notification
 - Replays are now auto-saved (with a config option to disable this feature) (c. Veeq7)
 - Team UI now has a config option for showing your own stats in the same style, defaulting to off (c. Veeq7)
+- Non-UMS modes no longer show in singleplayer (c. DarkenedFantasies)
 - A new emoji has been added to the font (c. DarkenedFantasies)
 
 ## Terran
@@ -186,6 +187,9 @@ We will revise reclamation (and other corpse interactions), as well as Vulture m
 	- Armor penetration now 0, from 1
 	- Weapon cooldown now 1.5, from 1.25
 	- Weapon range now 5, from 6
+	- Ability rework:
+		- Spider Mines removed
+		- Now lays [Lobotomy Mines](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/lobotomy-mine), which stun and slow affected targets
 - [Cyclops](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyclops):
 	- Weapon damage now 6, from 5
 	- Armor penetration now 1, from 2