11 January 2025 update

master changelog.md

@@ -5,6 +5,7 @@ Since December 2022, this changelog shows only past changes.
 See patchnotes.md for info on the most recent patch!
 
 # Table of Contents
+- [28 December 2024](#28-december-2024)
 - [22 November 2024](#22-november-2024)
 - [25 October 2024](#25-october-2024)
 - [22 July 2024](#22-july-2024)
@@ -91,6 +92,198 @@ See patchnotes.md for info on the most recent patch!
 - [13 August 2020](#13-august-2020)
 - [12 August 2020](#12-august-2020)
 
+# 28 December 2024
+## Year 2, month 12, patch 1
+## Acropolis #2 - End of Tournament
+
+This patch will include new features, balance adjustments, bugfixes, and audiovisual improvements.
+
+Download [Fraud Launcher 2](https://fraudsclub.com/files/Fraud%20Launcher%202.zip) for easier setup and maintenance! Version 2.2 and up now includes an automatic download of CrownLink, a networking alternative for Cosmonarchy!
+
+We are still hunting for desyncs! Please submit your `Critical` and `Sync Randoms` text files from the `logs` folder to the **cm-issues** "[Desync error megathread](https://discord.com/channels/139276012058968064/1251318131671175198)" on [our Discord server](https://discord.com/invite/s5SKBmY).
+
+## Patch summary
+
+A video going over all changes is forthcoming. This section will be edited with a link and more text at that time.
+
+## Core Mechanics
+- **Height advantage:**
+	- Range bonus +2 per level » +1 per level
+
+## Mapmaking
+- **NEW: Collision brushes** (c. Veeq7)
+	- Neutral (P12) **Spider Mine**s:
+		- Makes pathfinder regions unpathable and disconnects it from walkable space
+		- You can preview pathfinder regions in SCMDraft 2, where each region is denoted by a bold yellow outline
+	- Neutral (P12) **Supply Depot**s:
+		- Sets the tile they are placed on to full collision (unwalkable)
+		- This is not as reliable as **Spider Mine**s
+
+## Game Modes
+- **Massacre:**
+	- Now gives 2x units per training / morphing
+- **NEW: Dark Ages** (c. Veeq7)
+	- -20% to base sight range and base weapon range
+	- Cliff advantage gives 0.5 weapon range, from 1
+	- Attacking flyers are forbidden
+		- **Caveat:** AI still train them currently
+- **Massacre:**
+	- Unit creation now gives twice as many units
+
+## Bugfixes
+- **The Turning:**
+	- Fixed cancelled units being added to the dead unit pool (c. Veeq7)
+	- Improved performance during all stages of the game (c. Veeq7)
+- **Gameplay:**
+	- Significantly improve melee air unit target tracking (c. DF)
+	- Lardfix: Resolve rare ownership jank with Morningstars (c. DF)
+- **Audiovisual:**
+	- Fixed improper mineral chunk being used for non-depleted Mineral Field harvests (r. jakulangski)
+	- `celebrations-enabled` config option functionality restored (c. Veeq7)
+	- Added aura displays for **Barghest Repentent Chorus** and **Manifold Concurring Chorus** (r. shopkeeper dog)
+	- **Hypnagogue Through the Looking Glass** tooltip corrected (displayed incorrect range; r. GreenEggs'NSpam)
+	- **Cleric Nanorepair** tooltip corrected (displayed incorrect heal amount)
+
+## Terran
+- [Maverick](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/maverick):
+	- HP 50 » 60
+- [Cleric](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cleric):
+	- HP 75 » 80
+	- **Nanorepair:**
+		- Now adds non-stacking +1 armor to affected units; expires after 1 second
+		- *Visual read not yet implemented*
+- [Shaman](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/shaman):
+	- **Nanite Field** ability range 4/8 » 4/6
+- [Savant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/savant):
+	- HP 95 » 110
+	- Armor penetration 2 » 3
+- [Madcap](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/madcap):
+	- Resource costs 125/0 » 100/0
+	- *While Madcaps seem very powerful statistically, it may be safe to make them more spammable. We shall see...*
+- [Heracles](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/heracles):
+	- HP 150 » 180
+- [Striga](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/striga):
+	- HP 120 » 160
+- [Olympian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/olympian):
+	- HP 180 » 220
+- [Dilettante](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/dilettante):
+	- HP 90 » 110
+- [Vulture](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/vulture):
+	- HP 90 » 100
+	- Movement speed 7.71 » 8.33
+- [Goliath](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/goliath):
+	- HP 200 » 220
+- [Blackjack](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/blackjack):
+	- Armor 2 » 1
+	- **Monogun:**
+		- Weapon cooldown 0.49 » 0.54
+- [Matador](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/matador):
+	- HP 140 » 150
+- [Phalanx](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/phalanx):
+	- HP 200 » 240
+- [Durendal](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/durendal):
+	- HP 225 » 260
+- [Tarasque](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/tarasque):
+	- Build time 32 » 30
+	- Vision range 9 » 8
+
+## Protoss
+- [Witness](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/witness):
+	- Shields 20 » 40
+	- Movement speed 4.58 » 5.41
+- [Zealot](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/zealot):
+	- HP 120 » 150
+- [Amaranth](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/amaranth):
+	- Shields 40 » 60
+- [Herald](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/herald):
+	- HP 120 » 160
+- [Atreus](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/atreus):
+	- HP 150 » 160
+- [Cabalist](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/cabalist):
+	- **Silent Strides**:
+		- After decloaking, the first strike deals 150% damage
+- [Charlatan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/charlatan):
+	- **Fervent Blaster:**
+		- Weapon range 5 » 6
+		- Splash radii 8/16/24 » 12/24/32
+		- Projectile speed 60 » 90
+		- Projectile acceleration ~300% faster
+- [Pariah](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/pariah):
+	- HP 300 » 400
+- [Sycophant](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/sycophant):
+	- HP 100 » 200
+- [Archon](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/archon):
+	- Build time 45 » 30
+- [Optecton](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/optecton):
+	- **Sunsplit Beam:**
+		- Weapon damage 10x10 » 12x12
+		- Weapon range 10 » 12
+- [Manifold](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/manifold):
+	- **Concurring Chorus:**
+		- Effect range 2 » 3
+- [Golem](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/golem):
+	- Shields 60 » 120
+- [Idol](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/idol):
+	- **Prismatic Blaster:**
+		- Weapon damage 1x10 » 2x6
+		- Armor penetration 2 » 0
+		- Weapon cooldown 0.92 » 0.71
+- [Servitor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/servitor):
+	- HP 80 » 100
+	- Build time 18 » 15
+- [Positron](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/positron):
+	- Movement speed 4.16 » 5.83
+- [Didact](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/didact):
+	- HP 150 » 200
+- [Steward](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/steward):
+	- HP 70 » 80
+- [Star Sovereign](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/star-sovereign):
+	- Shields 150 » 200
+- [Embassy](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/embassy):
+	- Resource costs 125/75 » 125/50
+- [Rogue Gallery](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/rogue-gallery):
+	- Resource costs 150/100 » 150/75
+	- Build time 50 » 55
+- [Lattice](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=protoss/lattice):
+	- Resource costs 150/50 » 150/25
+
+## Zerg
+- **Broodspawn**
+	- Incubation procs now complete on unit death (c. Veeq7)
+- [Nathrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/nathrokor):
+	- **Vestigial Strike:**
+		- Weapon damage 1x8 » 1x4
+		- Weapon cooldown 0.83 » 0.75
+	- **Nathrok Claws:**
+		- Weapon damage 2x4 » 2x6
+- [Liiralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/liiralisk):
+	- Weapon range 6 » 5
+- [Mortothrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/mortothrokor):
+	- HP 180 » 250
+- [Hydralisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/hydralisk):
+	- Movement speed 6.16 » 6.52
+	- Attack windup 4 frames » 2 frames
+- [Izirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/izirokor):
+	- HP 130 » 160
+- [Skithrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/skithrokor):
+	- Armor 1 » 2
+	- **Skittering Spores:**
+		- Projectile speed 60 » 30
+		- Projectile acceleration now ~50% slower
+- [Tethzorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/tethzorokor):
+	- HP 180 » 240
+- [Vithrilisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vithrilisk):
+	- HP 180 » 200
+- [Rilirokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/rilirokor) and [Rililisk](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/rililisk):
+	- **Death Cycle:**
+		- On death and expiry, now applies Ensnare to hostiles within 2 range; lasts 1 second.
+- [Gorgrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/gorgrokor):
+	- HP 220 » 250
+- [Vilgorokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/vilgorokor):
+	- HP 200 » 280
+- [Ultrokor](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=zerg/ultrokor):
+	- HP 440 » 500
+
 # 22 November 2024
 ## Year 2, month 11, patch 1
 ## Acropolis #2 - Main Stages

mpq/arr/flingy.txt

@@ -531,11 +531,11 @@ Zealot (Starbound)
 Ecclesiast (Khalendric Knights)
 Vibrance
 Charlatan Projectile
-Extended Flingy #325
+Phase Disruptor Large
-Extended Flingy #326
+Harakan (Golden)
-Extended Flingy #327
+Iziralisk
-Extended Flingy #328
+Cicatus
-Extended Flingy #329
+White Circle (Instant)
 Extended Flingy #330
 Extended Flingy #331
 Extended Flingy #332

mpq/arr/images.txt

@@ -1947,19 +1947,19 @@ Ecclesiast Shadow (Khalendric Knights)
 Vibrance
 Vibrance Shadow
 Blackjack (Damaged)
-Extended Image #947
+Phase Disruptor Large
-Extended Image #948
+Harakan (Golden)
-Extended Image #949
+Harakan (Golden) Shadow
-Extended Image #950
+Iziralisk
-Extended Image #951
+Iziralisk Shadow
-Extended Image #952
+Iziralisk Remains
-Extended Image #953
+Iziralisk Birth
-Extended Image #954
+Iziralisk Spore
-Extended Image #955
+Iziralisk Mutate
-Extended Image #956
+Cicatus
-Extended Image #957
+Cicatus Shadow
-Extended Image #958
+White Circle (Instant)
-Extended Image #959
+Gorgrokor Remains
 Extended Image #960
 Extended Image #961
 Extended Image #962

mpq/arr/sfxdata.txt

@@ -3240,30 +3240,30 @@ Zerg Construction Start 01
 Broodspawn Overlay Proc
 Terran Construction End 01
 Terran Construction Start 01
-Extended Sound #1
+Broodspawn Spawn Proc
-Extended Sound #1
+Potentate Ready 01
-Extended Sound #1
+Potentate Ready 02
-Extended Sound #1
+Potentate Ready 03
-Extended Sound #1
+Potentate Selected 01
-Extended Sound #1
+Potentate Selected 02
-Extended Sound #1
+Potentate Selected 03
-Extended Sound #1
+Potentate Selected 04
-Extended Sound #1
+Potentate Order Passive 01
-Extended Sound #1
+Potentate Order Passive 02
-Extended Sound #1
+Potentate Order Passive 03
-Extended Sound #1
+Potentate Order Passive 04
-Extended Sound #1
+Potentate Order Aggressive 01
-Extended Sound #1
+Potentate Order Aggressive 02
-Extended Sound #1
+Potentate Order Aggressive 03
-Extended Sound #1
+Potentate Order Aggressive 04
-Extended Sound #1
+Potentate Under Attack 01
-Extended Sound #1
+Potentate Under Attack 02
-Extended Sound #1
+Potentate Under Attack 03
-Extended Sound #1
+Potentate Under Attack 04
-Extended Sound #1
+Potentate Banter 01
-Extended Sound #1
+Potentate Banter 02
-Extended Sound #1
+Potentate Banter 03
-Extended Sound #1
+Potentate Banter 04
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1

mpq/arr/sounds.txt

@@ -1352,10 +1352,10 @@ caw.wav
 cm\p\lanifect\dth-01.wav
 cm\e\lazarus\revive-scribe-01.wav
 cm\t\phobos\pas-01.wav
-cm\p\ecclesiast\what-01.wav
+cm\p\ecclesiast\wht-01.wav
-cm\p\ecclesiast\what-02.wav
+cm\p\ecclesiast\wht-02.wav
-cm\p\ecclesiast\what-03.wav
+cm\p\ecclesiast\wht-03.wav
-cm\p\ecclesiast\what-04.wav
+cm\p\ecclesiast\wht-04.wav
 cm\p\ecclesiast\yes-01.wav
 cm\p\ecclesiast\yes-02.wav
 cm\p\ecclesiast\yes-03.wav
@@ -1993,12 +1993,12 @@ cm\p\pariah\agg-01.wav
 cm\p\pariah\agg-02.wav
 cm\p\pariah\agg-03.wav
 cm\p\pariah\agg-04.wav
-cm\p\ecclesiast\ready-01.wav
+cm\p\ecclesiast\rdy-01.wav
-cm\p\ecclesiast\ready-02.wav
+cm\p\ecclesiast\rdy-02.wav
-cm\p\ecclesiast\ready-03.wav
+cm\p\ecclesiast\rdy-03.wav
-cm\p\ecclesiast\help-01.wav
+cm\p\ecclesiast\hlp-01.wav
-cm\p\ecclesiast\help-02.wav
+cm\p\ecclesiast\hlp-02.wav
-cm\p\ecclesiast\help-03.wav
+cm\p\ecclesiast\hlp-03.wav
 cm\p\starsovereign\rdy-01.wav
 cm\p\starsovereign\rdy-02.wav
 cm\p\starsovereign\rdy-03.wav
@@ -3239,4 +3239,28 @@ cm\z\_building\z-construction-03.wav
 cm\z\_building\z-construction-start-01.wav
 Zerg\BROODLING\ZBrPss02.WAV
 cm\t\_building\t-construction-end-01.wav
-cm\t\_building\t-construction-start-01.wav
+cm\t\_building\t-construction-start-01.wav
+Zerg\BROODLING\ZBrRdy00.WAV
+cm\p\potentate\rdy-01.wav
+cm\p\potentate\rdy-02.wav
+cm\p\potentate\rdy-03.wav
+cm\p\potentate\wht-01.wav
+cm\p\potentate\wht-02.wav
+cm\p\potentate\wht-03.wav
+cm\p\potentate\wht-04.wav
+cm\p\potentate\yes-01.wav
+cm\p\potentate\yes-02.wav
+cm\p\potentate\yes-03.wav
+cm\p\potentate\yes-04.wav
+cm\p\potentate\agg-01.wav
+cm\p\potentate\agg-02.wav
+cm\p\potentate\agg-03.wav
+cm\p\potentate\agg-04.wav
+cm\p\potentate\hlp-01.wav
+cm\p\potentate\hlp-02.wav
+cm\p\potentate\hlp-03.wav
+cm\p\potentate\hlp-04.wav
+cm\p\potentate\bnt-01.wav
+cm\p\potentate\bnt-02.wav
+cm\p\potentate\bnt-03.wav
+cm\p\potentate\bnt-04.wav

mpq/arr/sprites.txt

@@ -761,7 +761,7 @@ Arclite Shock Cannon (Damageless, Silent)
 Magnetar
 Izirokor
 Izirokor Projectile
-Izirokor Remnants
+Izirokor Remains
 Entropy Gauntlets Overlay
 Cyclops Fragmentary Explosion
 Zerg Air Explosion (Large)
@@ -955,13 +955,13 @@ Zealot (Starbound)
 Ecclesiast (Khalendric Knights)
 Vibrance
 Blackjack (Damaged)
-Extended Sprite #1
+Phase Disruptor Large
-Extended Sprite #1
+Harakan (Golden)
-Extended Sprite #1
+Iziralisk
-Extended Sprite #1
+Iziralisk Remains
-Extended Sprite #1
+Cicatus
-Extended Sprite #1
+White Circle (Instant)
-Extended Sprite #1
+Gorgrokor Remains
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1

mpq/arr/units.txt

@@ -411,10 +411,10 @@ Ackmed
 Terran Cyclops (Futurist Federation)
 Protoss Zealot (Starbound)
 Protoss Ecclesiast (Khalendric Knights)
-Extended Unit #186
+Terran Harakan (Golden Republic)
-Extended Unit #187
+Protoss Cicatus (Starbound)
-Extended Unit #188
+Zerg Inzorthrokor (Imicren)
-Extended Unit #189
+Volatile Egg
 Extended Unit #190
 Extended Unit #191
 Extended Unit #192

mpq/arr/weapons.txt

@@ -218,9 +218,9 @@ Angeltear Rockets (Salamander)
 Brontes Payload (Cyclops)
 Flak Cannons (Cyclops Futurist)
 Sensory Overload (Vibrance)
-Extended Weapon #91
+Flamethrower (Harakan, Golden)
-Extended Weapon #92
+Corrosive Bioplasma (Iziralisk)
-Extended Weapon #93
+Phase Claws (Cicatus)
 Extended Weapon #94
 Extended Weapon #95
 Extended Weapon #96

mpq/samase/config.ini

@@ -23,7 +23,7 @@ gptp_globals = true
 debug_upgrade_req = false
 #
 #
-###COSMONARCHY BW
+###COSMONARCHY
 ##
 ##
 ##
@@ -55,6 +55,7 @@ unit_morph_prerequisites = Add(konvilisk, tetcaerokor, 1)
 unit_morph_prerequisites = Add(vilgorokor, isthrathaleth, 1)
 unit_morph_prerequisites = Add(matraleth, akistrokor, 1)
 unit_morph_prerequisites = Add(zoryusthaleth, ultrokor, 1)
+unit_morph_prerequisites = Add(inzorthrokor, ultrokor, 1)
 unit_morph_prerequisites = Add(lakizilisk, zobriolisk, 1)
 unit_morph_prerequisites = Add(gorgrokor, zarcavrokor, 1)
 #
@@ -101,6 +102,7 @@ morph_train_ai = Add(konvilisk, tetcaerokor)
 morph_train_ai = Add(vilgorokor, isthrathaleth)
 morph_train_ai = Add(matraleth, akistrokor)
 morph_train_ai = Add(zoryusthaleth, ultrokor)
+morph_train_ai = Add(inzorthrokor, ultrokor)
 morph_train_ai = Add(lakizilisk, zobriolisk)
 morph_train_ai = Add(gorgrokor, zarcavrokor)
 #

mpq/samase/unitdef.txt

@@ -31,6 +31,12 @@ building xelnaga_temple = 345
 building warp_gate = 346
 building stasis_cell = 347
 
+# Heroes
+military ackmed = 408
+military goska = 500
+military stroluum = 501
+building tuzor = 502
+
 # Terran factional units
 military cohort = 50
 military luminary = 150
@@ -40,14 +46,20 @@ military philoc = 328
 military hotshot = 395
 military qilin = 398
 military auriel = 399
+military cyclops_futurist = 410
+military harakan_golden = 413
 
 # Protoss factional units
 military adherent = 400
 military extatus = 401
+military zealot_starbound = 411
+military ecclesiast_khalendric = 412
+military cicatus = 414
 
 # Zerg factional units
 military nathrelisk = 402
 military iziralisk = 403
+military iziralisk = 415
 
 # Terran military units
 military maverick = 0
@@ -166,6 +178,7 @@ building parthenon = 288
 building iron_council = 295
 building amphitheater = 296
 building throneroom = 299
+building tencendur = 408
 
 # Protoss military units
 military lanifect = 60
@@ -329,6 +342,7 @@ military oztukrokor = 325
 military kethrostalor = 326
 military rakzilisk = 327
 military sasyrvoleth = 407
+military skryrokor = 503
 
 # Zerg misc
 military larva = 35

mpq/scripts/iscript.txt

@@ -22707,7 +22707,7 @@ GorgrokorDeath:
 	playsnd           	852	# Zerg\Guardian\ZGuDth00.WAV
 	imgol             	28 0 0 # Geszithalor Death (zerg\zguDeath.grp)
 	wait              	1
-	lowsprul			186 0 42 # Zerg Building Rubble Small
+	lowsprul			963 0 42 # Zerg Building Rubble Small
 	wait              	1
 	end
 
@@ -23197,7 +23197,7 @@ CentaurUnused1:
 	wait				1
 	nobrkcodestart
 	playsndbtwn			2024 2026 # Centaur death 01, 02, 03
-	sprol				744 0 0
+	imgol				1443 0 0
 	wait				7
 	playsndbtwn			2024 2026 # Centaur death 01, 02, 03
 	imgol				334 5 5
@@ -29533,31 +29533,31 @@ AirAttkInit   	[NONE]
 
 MaelstromProjectileInit:
 	playsnd           	99	# Bullet\DragBull.wav
-	wait              	1 
+	wait              	1
-	sigorder          	1 
+	sigorder          	1
-	wait              	1 
+	wait              	1
 MaelstromProjectileGndAttkInit:
-	playfram          	0x00	# Frame set 0
+	playfram          	0x00
-	wait              	1 
+	wait              	1
-	playfram          	1	# Frame set 0, direction 1
+	playfram          	1
-	wait              	1 
+	wait              	1
-	playfram          	2	# Frame set 0, direction 2
+	playfram          	2
-	wait              	1 
+	wait              	1
-	playfram          	3	# Frame set 0, direction 3
+	playfram          	3
-	wait              	1 
+	wait              	1
 	playfram			4
-	wait              	1 
+	wait              	1
 	playfram			5
-	wait              	1 
+	wait              	1
 	playfram			6
-	wait              	1 
+	wait              	1
 	playfram			7
 	wait				1
 	goto              	MaelstromProjectileGndAttkInit
 
 MaelstromProjectileDeath:
 	domissiledmg
-	wait              	1 
+	wait              	1
 	end
 	
 # ----------------------------------------------------------------------------- #
@@ -33721,10 +33721,10 @@ Type          	12
 Init          	HeraclesInit
 Death         	HeraclesDeath
 GndAttkInit   	HeraclesGndAttkInit
-AirAttkInit   	HeraclesAirAttkInit
+AirAttkInit   	HeraclesGndAttkInit
 Unused1       	HeraclesUnused1
 GndAttkRpt    	HeraclesGndAttkInit
-AirAttkRpt    	HeraclesAirAttkInit
+AirAttkRpt    	HeraclesGndAttkInit
 CastSpell     	[NONE]
 GndAttkToIdle 	HeraclesGndAttkToIdle
 AirAttkToIdle 	HeraclesGndAttkToIdle
@@ -33778,47 +33778,31 @@ HeraclesGndAttkToIdle:
 	playfram			0xbb
 	goto              	HeraclesWalkingToIdle
 
-HeraclesAirAttkInit:
-	playfram          	0xbb
-	wait              	1
-	nobrkcodestart
-	playfram			0x99
-	playsndbtwn			1369 1371
-	attack
-	wait              	1
-	playfram			0xaa
-	wait				1
-	playfram			0xbb
-	nobrkcodeend
-	gotorepeatattk
-	ignorerest
-	goto              	HeraclesWalkingToIdle
-
 HeraclesWalking:
-	move              	4 
+	move              	4
-	wait              	1 
+	wait              	1
-	playfram          	0x11	# Frame set 1
+	playfram          	0x11
-	move              	4 
+	move              	4
-	wait              	1 
+	wait              	1
-	playfram          	0x22	# Frame set 2
+	playfram          	0x22
-	move              	4 
+	move              	4
-	wait              	1 
+	wait              	1
-	playfram          	0x33	# Frame set 3
+	playfram          	0x33
-	move              	4 
+	move              	4
-	wait              	1 
+	wait              	1
-	playfram          	0x44	# Frame set 4
+	playfram          	0x44
-	move              	4 
+	move              	4
-	wait              	1 
+	wait              	1
-	playfram          	0x55	# Frame set 5
+	playfram          	0x55
-	move              	4 
+	move              	4
-	wait              	1 
+	wait              	1
-	playfram          	0x66	# Frame set 6
+	playfram          	0x66
-	move              	4 
+	move              	4
-	wait              	1 
+	wait              	1
-	playfram          	0x77	# Frame set 7
+	playfram          	0x77
-	move              	4 
+	move              	4
-	wait              	1 
+	wait              	1
-	playfram          	0x88	# Frame set 8
+	playfram          	0x88
 	goto              	HeraclesWalking
 	
 # ----------------------------------------------------------------------------- #
@@ -34222,11 +34206,11 @@ IsId          	569
 Type          	21
 Init          	ClarionInit
 Death         	ClarionDeath
-GndAttkInit   	ClarionGndAttkInit
+GndAttkInit   	ClarionGndAttkToIdle
-AirAttkInit   	ClarionGndAttkInit
+AirAttkInit   	ClarionGndAttkToIdle
 Unused1       	[NONE]
-GndAttkRpt    	ClarionGndAttkRpt
+GndAttkRpt    	ClarionGndAttkToIdle
-AirAttkRpt    	ClarionGndAttkRpt
+AirAttkRpt    	ClarionGndAttkToIdle
 CastSpell     	[NONE]
 GndAttkToIdle 	ClarionGndAttkToIdle
 AirAttkToIdle 	ClarionGndAttkToIdle
@@ -34293,18 +34277,6 @@ ClarionDeath:
 	wait              	1
 	end
 
-ClarionGndAttkInit:
-	playfram          	0x00
-ClarionGndAttkRpt:
-	wait              	1
-	nobrkcodestart
-	playsnd           	66 # Bullet\HKMISSLE.wav
-	attackwith        	1
-	wait              	1
-	nobrkcodeend
-	gotorepeatattk
-	goto              	ScourgeLocal00
-
 ClarionWalking:
 	playfram          	0x00
 	wait				1
@@ -34599,13 +34571,13 @@ Type          	26
 Init          	CohortInit
 Death         	CohortDeath
 GndAttkInit   	CohortGndAttkInit
-AirAttkInit   	CohortAirAttkInit
+AirAttkInit   	CohortGndAttkInit
 Unused1       	CohortUnused1
 GndAttkRpt    	CohortGndAttkRpt
-AirAttkRpt    	CohortAirAttkRpt
+AirAttkRpt    	CohortGndAttkRpt
 CastSpell     	[NONE]
 GndAttkToIdle 	CohortGndAttkToIdle
-AirAttkToIdle 	CohortAirAttkToIdle
+AirAttkToIdle 	CohortGndAttkToIdle
 Unused2       	[NONE]
 Walking       	CohortWalking
 WalkingToIdle 	CohortWalkingToIdle
@@ -34776,36 +34748,6 @@ CohortGndAttkToIdle:
 	wait              	1
 	goto              	CohortWalkingToIdle
 
-CohortAirAttkInit:
-	playfram          	0x00
-	wait              	1
-	playfram          	0x11
-	wait              	1
-	playfram          	0x22
-CohortAirAttkRpt:
-	wait              	1
-	nobrkcodestart
-	playsndbtwn       	1402 1404 # Cohort weapon fire 01, 02, 03
-	attackwith        	1
-	playfram          	0x33
-	wait              	1
-	playfram          	0x22
-	wait              	1
-	attackwith        	1
-	playfram          	0x33
-	wait              	1
-	playfram          	0x22
-	wait              	1
-	nobrkcodeend
-	gotorepeatattk
-	ignorerest
-CohortAirAttkToIdle:
-	playfram          	0x11
-	wait              	1
-	playfram          	0x00
-	wait              	1
-	goto              	CohortWalkingToIdle
-
 CohortSpecialState2:
 	playfram          	0xee
 	goto              	ScourgeLocal00
@@ -37347,13 +37289,13 @@ Type          	12
 Init          	AutocratInit
 Death         	AutocratDeath
 GndAttkInit   	AutocratGndAttkInit
-AirAttkInit   	AutocratAirAttkInit
+AirAttkInit   	AutocratGndAttkInit
 Unused1       	[NONE]
 GndAttkRpt    	AutocratGndAttkRpt
-AirAttkRpt    	AutocratAirAttkRpt
+AirAttkRpt    	AutocratGndAttkRpt
 CastSpell     	[NONE]
 GndAttkToIdle 	AutocratGndAttkToIdle
-AirAttkToIdle 	AutocratAirAttkToIdle
+AirAttkToIdle 	AutocratGndAttkToIdle
 Unused2       	[NONE]
 Walking       	AutocratWalking
 WalkingToIdle 	AutocratWalkingToIdle
@@ -37451,24 +37393,6 @@ AutocratGndAttkToIdle:
 	wait              	1 
 	goto              	AutocratWalkingToIdle
 
-AutocratAirAttkInit:
-	playfram          	0xaa
-AutocratAirAttkRpt:
-	wait              	1
-	nobrkcodestart
-	playsndbtwn			1474 1478
-	attack
-	playfram          	0x99
-	wait              	1
-	playfram          	0xaa
-	nobrkcodeend
-	gotorepeatattk
-	ignorerest
-AutocratAirAttkToIdle:
-	playfram          	0x00
-	wait              	1
-	goto              	AutocratWalkingToIdle
-
 AutocratWalking:
 	move              	4
 	wait              	1
@@ -38016,10 +37940,10 @@ Type          	21
 Init          	AnthelionInit
 Death         	AnthelionDeath
 GndAttkInit   	AnthelionGndAttkInit
-AirAttkInit   	AnthelionAirAttkInit
+AirAttkInit   	AnthelionGndAttkInit
 Unused1       	[NONE]
 GndAttkRpt    	AnthelionGndAttkInit
-AirAttkRpt    	AnthelionAirAttkInit
+AirAttkRpt    	AnthelionGndAttkInit
 CastSpell     	[NONE]
 GndAttkToIdle 	AnthelionGndAttkToIdle
 AirAttkToIdle 	AnthelionGndAttkToIdle
@@ -38109,7 +38033,6 @@ AnthelionDeath:
 	end
 
 AnthelionGndAttkInit:
-	#playsndbtwn       	1227 1230
 	attackwith        	1 
 	attackwith        	1 
 	wait              	2
@@ -38120,14 +38043,6 @@ AnthelionLocal00:
 	wait              	125 
 	goto              	AnthelionGndAttkToIdle
 
-AnthelionAirAttkInit:
-	#playsndbtwn       	1227 1230
-	attackwith        	1 
-	attackwith        	1 
-	wait              	2
-	gotorepeatattk
-	goto              	AnthelionGndAttkToIdle
-
 AnthelionWalking:
 	playfram			1
 	wait				1
@@ -38184,10 +38099,10 @@ Type          	12
 Init          	AnticthonInit
 Death         	AnticthonDeath
 GndAttkInit   	AnticthonGndAttkInit
-AirAttkInit   	AnticthonAirAttkInit
+AirAttkInit   	AnticthonGndAttkInit
 Unused1       	AnticthonUnused1
 GndAttkRpt    	AnticthonGndAttkInit
-AirAttkRpt    	AnticthonAirAttkInit
+AirAttkRpt    	AnticthonGndAttkInit
 CastSpell     	[NONE]
 GndAttkToIdle 	AnticthonGndAttkToIdle
 AirAttkToIdle 	AnticthonGndAttkToIdle
@@ -38255,14 +38170,6 @@ AnticthonGndAttkInit:
 	wait              	1
 	gotorepeatattk
 	goto              	AnticthonGndAttkToIdle
-	
-AnticthonAirAttkInit:
-	playsndbtwn       	1634 1636 # Anticthon weapon fire 01, 02, 03
-	attackwith        	1 
-	imgol				978 0 0 # Anticthon/Anthelion weaponfire
-	wait              	1
-	gotorepeatattk
-	goto              	AnticthonGndAttkToIdle
 
 AnticthonWalking:
 	playfram			1
@@ -38692,10 +38599,10 @@ Type          	21
 Init          	EmpressInit
 Death         	EmpressDeath
 GndAttkInit   	EmpressGndAttkInit
-AirAttkInit   	EmpressAirAttkInit
+AirAttkInit   	EmpressGndAttkInit
 Unused1       	[NONE]
 GndAttkRpt    	EmpressGndAttkInit
-AirAttkRpt    	EmpressAirAttkInit
+AirAttkRpt    	EmpressGndAttkInit
 CastSpell     	[NONE]
 GndAttkToIdle 	EmpressGndAttkToIdle
 AirAttkToIdle 	EmpressGndAttkToIdle
@@ -38747,16 +38654,6 @@ EmpressGndAttkInit:
 	gotorepeatattk
 	goto              	EmpressGndAttkToIdle
 
-EmpressAirAttkInit:
-	wait              	1 
-	nobrkcodestart
-	playsndbtwn       	1781 1783 # Empress weapon fire 01, 02, 03
-	attackwith        	1 
-	wait              	2
-	nobrkcodeend
-	gotorepeatattk
-	goto              	EmpressGndAttkToIdle
-
 EmpressWalking:
 	setvertpos        	0 
 	#imgol             	1203 0 0 # Empress Engines (cm\shared\empress-engine.grp)
@@ -45221,11 +45118,11 @@ IsId          	700
 Type          	12
 Init          	AzazelInit
 Death         	AzazelDeath
-GndAttkInit   	AzazelGndAttkInit
+GndAttkInit   	AzazelGndAttkToIdle
-AirAttkInit   	AzazelGndAttkInit
+AirAttkInit   	AzazelGndAttkToIdle
 Unused1       	[NONE]
-GndAttkRpt    	AzazelGndAttkInit
+GndAttkRpt    	AzazelGndAttkToIdle
-AirAttkRpt    	AzazelGndAttkInit
+AirAttkRpt    	AzazelGndAttkToIdle
 CastSpell     	AzazelCastSpell
 GndAttkToIdle 	AzazelGndAttkToIdle
 AirAttkToIdle 	AzazelGndAttkToIdle
@@ -45260,12 +45157,6 @@ AzazelDeath:
 	wait              	1
 	end
 
-AzazelGndAttkInit:
-	wait              	1
-	attack
-	gotorepeatattk
-	goto              	AzazelLocal00
-
 AzazelLocal00:
 	wait              	125
 	goto              	AzazelLocal00
@@ -51877,7 +51768,7 @@ AckmedInit:
 .headerstart
 IsId          	795
 Type          	13
-Init          	LiiraliskGlaveInit
+Init          	GlaveWurmInit
 Death         	LiiraliskGlaveDeath
 GndAttkInit   	GlaveWurmGndAttkInit
 AirAttkInit   	[NONE]
@@ -51894,13 +51785,6 @@ SpecialState1 	LiiraliskGlaveSpecialState1
 .headerend
 # ----------------------------------------------------------------------------- #
 
-LiiraliskGlaveInit:
-	playfram          	0x00
-	wait              	1
-	sigorder          	1
-	wait              	1
-	goto				GlaveWurmGndAttkInit
-
 LiiraliskGlaveDeath:
 	playsnd           	93 # Bullet\ZQuHit02.wav
 	sprol             	944 0 0 # Spore Hit Green Small (cm\zerg\spore-hit-green-small.grp)
@@ -52021,5 +51905,86 @@ SpecialState1 	[NONE]
 #	playfram          	0x00
 #	wait				2
 #	goto				AnalogueGndAttkToIdle
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1960 White Circle Instant (bullet\circle14.grp)
+.headerstart
+IsId          	799
+Type          	2
+Init          	WhiteCircleInstantInit
+Death         	WhiteCircleInstantDeath
+GndAttkInit   	WhiteCircleInstantDeath
+AirAttkInit   	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+WhiteCircleInstantInit:
+	wait              	1
+	sigorder          	1
+	wait              	1
+WhiteCircleInstantDeath:
+	playfram          	0x00
+	wait              	1
+	domissiledmg
+	wait              	1
+	end
+
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 1958 Cicatus (cm\faction-p\cicatus.grp)
+.headerstart
+IsId          	800
+Type          	21
+Init          	CicatusInit
+Death         	LegionnaireDeath
+GndAttkInit   	CicatusGndAttkInit
+AirAttkInit   	[NONE]
+Unused1       	[NONE]
+GndAttkRpt    	CicatusGndAttkRpt
+AirAttkRpt    	[NONE]
+CastSpell     	[NONE]
+GndAttkToIdle 	LegionnaireGndAttkToIdle
+AirAttkToIdle 	[NONE]
+Unused2       	[NONE]
+Walking       	LegionnaireWalking
+WalkingToIdle 	LegionnaireWalkingToIdle
+SpecialState1 	[NONE]
+SpecialState2 	[NONE]
+AlmostBuilt   	[NONE]
+Built         	[NONE]
+Landing       	[NONE]
+LiftOff       	[NONE]
+IsWorking     	[NONE]
+WorkingToIdle 	[NONE]
+WarpIn        	LegionnaireWarpIn
+.headerend
+# ----------------------------------------------------------------------------- #
+
+CicatusInit:
+	imgul             	1959 0 0 # Cicatus Shadow (cm\faction-p\cicatus-shadow.grp)
+	goto				HarakanWalkingToIdle
 	
-## Next free IsId: 799
+CicatusGndAttkInit:
+	playfram          	0x100
+CicatusGndAttkRpt:
+	playfram          	0x100
+	nobrkcodestart
+	wait              	1
+	playsnd				1896 # Legionnaire weapon fire 01
+	playfram          	0x120
+	attackmelee       	1 1897 # Legionnaire weapon hit 01
+	wait              	1
+	playfram          	0x140
+	attackmelee       	1 1897 # Legionnaire weapon hit 01
+	wait              	1
+	playfram          	0x160
+	wait              	1
+	nobrkcodeend
+	playfram          	0x120
+	wait              	1
+	gotorepeatattk
+	ignorerest
+	goto				LegionnaireGndAttkToIdle
+	
+## Next free IsId: 801