Merge remote-tracking branch 'darkademic/dev'

Inq8 · Dec 17, 2023 · 3acd0e0 · 3acd0e0
2 parents 44a5571 + 34fd0ea
commit 3acd0e0
Show file tree

Hide file tree

Showing 106 changed files with 1,873 additions and 2,691 deletions.
diff --git a/mods/ca/maps/ca-composition-tester/composition-tester.lua b/mods/ca/maps/ca-composition-tester/composition-tester.lua
diff --git a/mods/ca/maps/ca-composition-tournament/composition-tournament.lua b/mods/ca/maps/ca-composition-tournament/composition-tournament.lua
diff --git a/mods/ca/maps/ca-prologue-01/map.yaml b/mods/ca/maps/ca-prologue-01/map.yaml
@@ -517,6 +517,6 @@ Actors:
 		Owner: Neutral
 		Location: 63,48
 
-Rules: ca|rules/campaign-rules.yaml, ca|rules/campaign-tooltips.yaml, ca|rules/campaign-palettes.yaml, rules.yaml
+Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, rules.yaml
 
-Weapons: ca|weapons/campaign.yaml, weapons.yaml
+Weapons: ca|weapons/custom/campaign.yaml, weapons.yaml
diff --git a/mods/ca/maps/ca-prologue-01/rules.yaml b/mods/ca/maps/ca-prologue-01/rules.yaml
@@ -11,7 +11,7 @@ World:
 	MusicPlaylist:
 		StartingMusic: bigf226m
 
-TRAN.Evac:
+TRAN.evac:
 	Cargo:
 		Types: Einstein
 		MaxWeight: 1

diff --git a/mods/ca/maps/ca-prologue-02/map.yaml b/mods/ca/maps/ca-prologue-02/map.yaml
@@ -937,6 +937,6 @@ Actors:
 		SubCell: 3
 		Location: 38,43
 
-Rules: ca|rules/campaign-rules.yaml, ca|rules/campaign-tooltips.yaml, ca|rules/campaign-palettes.yaml, rules.yaml
+Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, rules.yaml
 
-Weapons: ca|weapons/campaign.yaml
+Weapons: ca|weapons/custom/campaign.yaml
diff --git a/mods/ca/maps/ca-prologue-03/ca-prologue-03.lua b/mods/ca/maps/ca-prologue-03/ca-prologue-03.lua
@@ -21,7 +21,7 @@ WorldLoaded = function()
 	ObjectiveLocateForces = GDI.AddObjective("Locate all GDI forces.")
 	ObjectiveExit = GDI.AddObjective("Find a safe exit route.")
 
-    SetupReveals({ Reveal1, Reveal3, Reveal4 })
+	SetupReveals({ Reveal1, Reveal3, Reveal4 })
 
 	TroopGroups = {
 		{ Waypoint = Group1, Id = 1 },

diff --git a/mods/ca/maps/ca-prologue-03/map.yaml b/mods/ca/maps/ca-prologue-03/map.yaml
@@ -1178,6 +1178,6 @@ Actors:
 		Owner: Neutral
 		Location: 60,44
 
-Rules: ca|rules/campaign-rules.yaml, ca|rules/campaign-tooltips.yaml, ca|rules/campaign-palettes.yaml, rules.yaml
+Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, rules.yaml
 
-Weapons: ca|weapons/campaign.yaml
+Weapons: ca|weapons/custom/campaign.yaml
diff --git a/mods/ca/maps/ca-prologue-04/ca-prologue-04.lua b/mods/ca/maps/ca-prologue-04/ca-prologue-04.lua
@@ -49,16 +49,16 @@ WorldLoaded = function()
 
 	local aaGuns = GDI.GetActorsByType("cram")
 	Trigger.OnAllKilled(aaGuns, function()
-        local frigates = GDI.GetActorsByType("dd2")
-        ObjectiveDestroyFrigates = Nod.AddObjective("Destroy GDI naval blockade.")
+		local frigates = GDI.GetActorsByType("dd2")
+		ObjectiveDestroyFrigates = Nod.AddObjective("Destroy GDI naval blockade.")
 
-        Trigger.AfterDelay(DateTime.Seconds(6), function()
-            WarpInBanshees()
-        end)
+		Trigger.AfterDelay(DateTime.Seconds(6), function()
+			WarpInBanshees()
+		end)
 
-        Trigger.OnAllKilled(frigates, function()
-            Nod.MarkCompletedObjective(ObjectiveDestroyFrigates)
-        end)
+		Trigger.OnAllKilled(frigates, function()
+			Nod.MarkCompletedObjective(ObjectiveDestroyFrigates)
+		end)
 
 		Nod.MarkCompletedObjective(ObjectiveDestroyAA)
 	end)

diff --git a/mods/ca/maps/ca-prologue-04/map.yaml b/mods/ca/maps/ca-prologue-04/map.yaml
@@ -774,8 +774,8 @@ Actors:
 		Owner: Neutral
 		Location: 5,42
 
-Rules: ca|rules/campaign-rules.yaml, ca|rules/campaign-tooltips.yaml, ca|rules/campaign-palettes.yaml, rules.yaml
+Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, rules.yaml
 
-Weapons: ca|weapons/campaign.yaml
+Weapons: ca|weapons/custom/campaign.yaml
 
 Notifications: notifications.yaml
diff --git a/mods/ca/maps/ca-prologue-04/rules.yaml b/mods/ca/maps/ca-prologue-04/rules.yaml
@@ -15,39 +15,13 @@ Player:
 	PlayerResources:
 		DefaultCash: 10000
 
-^TDPalette:
-	RenderSprites:
-		PlayerPalette: playertdunit
-
-^Infantry:
-	RenderSprites:
-		PlayerPalette: playertdunit
-	WithDeathAnimation:
-		DeathSequencePalette: playertdunit
-
-^BuildingTD:
-	RenderSprites:
-		PlayerPalette: playertd
-
-^DefenseTD:
-	RenderSprites:
-		PlayerPalette: playertd
-
-HARV.TD:
-	RenderSprites:
-		PlayerPalette: playertd
-
 AIRS:
 	-ParatroopersPower@blackhairdrop:
 
 HQ:
 	-DropPodsPowerCA@Zocom:
 	-AirstrikePower@BlackhandFirebomb:
 
-AMCV:
-	RenderSprites:
-		PlayerPalette: playertd
-
 LTNK:
 	Mobile:
 		Locomotor: tracked
@@ -154,8 +128,6 @@ RAH:
 
 SCRN:
 	Inherits@CAMPAIGNDISABLED: ^Disabled
-	RenderSprites:
-		PlayerPalette: playertd
 
 HPAD.TD:
 	Inherits@CAMPAIGNDISABLED: ^Disabled

diff --git a/mods/ca/maps/ca01-crossrip/map.yaml b/mods/ca/maps/ca01-crossrip/map.yaml
@@ -1607,8 +1607,8 @@ Actors:
 		Location: 45,4
 		Facing: 384
 
-Rules: ca|rules/campaign-rules.yaml, ca|rules/campaign-tooltips.yaml, ca|rules/campaign-palettes.yaml, rules.yaml
+Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, rules.yaml
 
 Sequences: sequences.yaml
 
-Weapons: ca|weapons/campaign.yaml, weapons.yaml
+Weapons: ca|weapons/custom/campaign.yaml, weapons.yaml
diff --git a/mods/ca/maps/ca02-displacement/map.yaml b/mods/ca/maps/ca02-displacement/map.yaml
@@ -3015,6 +3015,6 @@ Actors:
 		Owner: Neutral
 		Location: 71,38
 
-Rules: ca|rules/campaign-rules.yaml, ca|rules/campaign-tooltips.yaml, ca|rules/campaign-palettes.yaml, rules.yaml
+Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, rules.yaml
 
-Weapons: ca|weapons/campaign.yaml
+Weapons: ca|weapons/custom/campaign.yaml
diff --git a/mods/ca/maps/ca03-deliverance/map.yaml b/mods/ca/maps/ca03-deliverance/map.yaml
@@ -3793,8 +3793,8 @@ Actors:
 		Owner: Neutral
 		Location: 40,77
 
-Rules: ca|rules/campaign-rules.yaml, ca|rules/campaign-tooltips.yaml, ca|rules/campaign-palettes.yaml, rules.yaml
+Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, rules.yaml
 
-Weapons: ca|weapons/campaign.yaml
+Weapons: ca|weapons/custom/campaign.yaml
 
 Voices: voices.yaml
diff --git a/mods/ca/maps/ca04-containment/map.yaml b/mods/ca/maps/ca04-containment/map.yaml
@@ -3446,8 +3446,8 @@ Actors:
 		Location: 88,14
 		Facing: 555
 
-Rules: ca|rules/campaign-rules.yaml, ca|rules/campaign-tooltips.yaml, ca|rules/campaign-palettes.yaml, rules.yaml
+Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, rules.yaml
 
 Sequences: sequences.yaml
 
-Weapons: ca|weapons/campaign.yaml, weapons.yaml
+Weapons: ca|weapons/custom/campaign.yaml, weapons.yaml
diff --git a/mods/ca/maps/ca04-containment/rules.yaml b/mods/ca/maps/ca04-containment/rules.yaml
@@ -186,8 +186,6 @@ SEAS:
 SAPC:
 	ExternalCondition@FORCEUNCLOAK:
 		Condition: cloak-force-disabled
-	RenderSprites:
-		PlayerPalette: playerraunit
 	AutoTarget:
 		InitialStanceAI: HoldFire
 	-Targetable:

diff --git a/mods/ca/maps/ca05-machinations/map.yaml b/mods/ca/maps/ca05-machinations/map.yaml
@@ -2323,6 +2323,6 @@ Actors:
 		Owner: Neutral
 		Location: 88,37
 
-Rules: ca|rules/campaign-rules.yaml, ca|rules/campaign-tooltips.yaml, ca|rules/campaign-palettes.yaml, rules.yaml
+Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, rules.yaml
 
-Weapons: ca|weapons/campaign.yaml
+Weapons: ca|weapons/custom/campaign.yaml
diff --git a/mods/ca/maps/ca05-machinations/rules.yaml b/mods/ca/maps/ca05-machinations/rules.yaml
@@ -24,36 +24,6 @@ Player:
 	PlayerResources:
 		DefaultCash: 6500
 
-^TDPalette:
-	RenderSprites:
-		PlayerPalette: playertdunit
-
-^Infantry:
-	RenderSprites:
-		PlayerPalette: playertdunit
-	WithDeathAnimation:
-		DeathSequencePalette: playertdunit
-
-^BuildingTD:
-	RenderSprites:
-		PlayerPalette: playertd
-
-^DefenseTD:
-	RenderSprites:
-		PlayerPalette: playertd
-
-SAPC:
-	RenderSprites:
-		PlayerPalette: playerraunit
-
-HARV.TD:
-	RenderSprites:
-		PlayerPalette: playertd
-
-AMCV:
-	RenderSprites:
-		PlayerPalette: playertd
-
 SNIP:
 	Buildable:
 		Prerequisites: tent, atek

diff --git a/mods/ca/maps/ca06-conspiracy/map.yaml b/mods/ca/maps/ca06-conspiracy/map.yaml
@@ -3922,8 +3922,8 @@ Actors:
 		Owner: Neutral
 		Location: 59,25
 
-Rules: ca|rules/campaign-rules.yaml, ca|rules/campaign-tooltips.yaml, ca|rules/campaign-palettes.yaml, rules.yaml
+Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, rules.yaml
 
-Weapons: ca|weapons/campaign.yaml, weapons.yaml
+Weapons: ca|weapons/custom/campaign.yaml, weapons.yaml
 
 Notifications: ca|rules/custom/force-cabal-eva.yaml
diff --git a/mods/ca/maps/ca06-conspiracy/rules.yaml b/mods/ca/maps/ca06-conspiracy/rules.yaml
@@ -24,42 +24,6 @@ Player:
 	PlayerResources:
 		DefaultCash: 6500
 
-^TDPalette:
-	RenderSprites:
-		PlayerPalette: playertdunit
-
-^Infantry:
-	RenderSprites:
-		PlayerPalette: playertdunit
-	WithDeathAnimation:
-		DeathSequencePalette: playertdunit
-
-SHAD:
-	RenderSprites:
-		PlayerPalette: playertd
-	WithDeathAnimation:
-		DeathSequencePalette: playertd
-
-^BuildingTD:
-	RenderSprites:
-		PlayerPalette: playertd
-
-^DefenseTD:
-	RenderSprites:
-		PlayerPalette: playertd
-
-SAPC:
-	RenderSprites:
-		PlayerPalette: playerraunit
-
-HARV.TD:
-	RenderSprites:
-		PlayerPalette: playertd
-
-AMCV:
-	RenderSprites:
-		PlayerPalette: playertd
-
 AFAC:
 	RenderSprites:
 		-FactionImages:

diff --git a/mods/ca/maps/ca07-subversion/map.yaml b/mods/ca/maps/ca07-subversion/map.yaml
@@ -4378,8 +4378,8 @@ Actors:
 		Owner: Neutral
 		Location: 37,36
 
-Rules: ca|rules/campaign-rules.yaml, ca|rules/campaign-tooltips.yaml, ca|rules/campaign-palettes.yaml, rules.yaml
+Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, rules.yaml
 
-Weapons: ca|weapons/campaign.yaml, weapons.yaml
+Weapons: ca|weapons/custom/campaign.yaml, weapons.yaml
 
 Notifications: ca|rules/custom/force-cabal-eva.yaml
diff --git a/mods/ca/maps/ca07-subversion/rules.yaml b/mods/ca/maps/ca07-subversion/rules.yaml
@@ -24,36 +24,6 @@ Player:
 	PlayerResources:
 		DefaultCash: 0
 
-^TDPalette:
-	RenderSprites:
-		PlayerPalette: playertdunit
-
-^Infantry:
-	RenderSprites:
-		PlayerPalette: playertdunit
-	WithDeathAnimation:
-		DeathSequencePalette: playertdunit
-
-^BuildingTD:
-	RenderSprites:
-		PlayerPalette: playertd
-
-^DefenseTD:
-	RenderSprites:
-		PlayerPalette: playertd
-
-SAPC:
-	RenderSprites:
-		PlayerPalette: playerraunit
-
-HARV.TD:
-	RenderSprites:
-		PlayerPalette: playertd
-
-AMCV:
-	RenderSprites:
-		PlayerPalette: playertd
-
 advcyborg.upgrade:
 	Inherits@CAMPAIGNDISABLED: ^Disabled
 

diff --git a/mods/ca/maps/ca08-salvation/ca08.lua b/mods/ca/maps/ca08-salvation/ca08.lua
@@ -271,10 +271,10 @@ SpawnWormholeUnits = function(wormhole)
 end
 
 ShuffleInPlace = function(t)
-    for i = #t, 2, -1 do
-        local j = Utils.RandomInteger(1, i)
-        t[i], t[j] = t[j], t[i]
-    end
+	for i = #t, 2, -1 do
+		local j = Utils.RandomInteger(1, i)
+		t[i], t[j] = t[j], t[i]
+	end
 end
 
 UpdateScrinCounter = function()

diff --git a/mods/ca/maps/ca08-salvation/map.yaml b/mods/ca/maps/ca08-salvation/map.yaml
@@ -1867,8 +1867,8 @@ Actors:
 		Owner: Neutral
 		Location: 21,85
 
-Rules: ca|rules/campaign-rules.yaml, ca|rules/campaign-tooltips.yaml, ca|rules/campaign-palettes.yaml, rules.yaml
+Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, rules.yaml
 
-Weapons: ca|weapons/campaign.yaml
+Weapons: ca|weapons/custom/campaign.yaml
 
 Notifications: ca|rules/custom/force-cabal-eva.yaml
diff --git a/mods/ca/maps/ca08-salvation/rules.yaml b/mods/ca/maps/ca08-salvation/rules.yaml
@@ -24,37 +24,11 @@ Player:
 	PlayerResources:
 		DefaultCash: 0
 
-^TDPalette:
-	RenderSprites:
-		PlayerPalette: playertdunit
-
-^Infantry:
-	RenderSprites:
-		PlayerPalette: playertdunit
-	WithDeathAnimation:
-		DeathSequencePalette: playertdunit
-
-^BuildingTD:
-	RenderSprites:
-		PlayerPalette: playertd
-
-^DefenseTD:
-	RenderSprites:
-		PlayerPalette: playertd
-
 SAPC:
 	Inherits@CAMPAIGNDISABLED: ^Disabled
-	RenderSprites:
-		PlayerPalette: playerraunit
-
-HARV.TD:
-	RenderSprites:
-		PlayerPalette: playertd
 
 AMCV:
 	Inherits@CAMPAIGNDISABLED: ^Disabled
-	RenderSprites:
-		PlayerPalette: playertd
 
 AIRS:
 	ParatroopersPower@markedairdrop: