Manual cleanup

2023-11-11 23:20:42 +02:00
parent db8a28f2c0
commit caad8ba44b
182 changed files with 399 additions and 424 deletions
--- a/mods/cnc/maps/cnc64gdi01/map.yaml
+++ b/mods/cnc/maps/cnc64gdi01/map.yaml
@@ -715,4 +715,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/eviction-notice/map.yaml
+++ b/mods/cnc/maps/eviction-notice/map.yaml
@@ -646,4 +646,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/funpark01/map.yaml
+++ b/mods/cnc/maps/funpark01/map.yaml
@@ -414,4 +414,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -237,4 +237,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi02/map.yaml
+++ b/mods/cnc/maps/gdi02/map.yaml
@@ -626,4 +626,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi03/en.ftl
+++ b/mods/cnc/maps/gdi03/en.ftl
@@ -1,3 +0,0 @@
-## rules.yaml
-actor-hq-description = Provides an overview of the battlefield.
-      Requires power to operate.
--- a/mods/cnc/maps/gdi03/map.yaml
+++ b/mods/cnc/maps/gdi03/map.yaml
@@ -700,4 +700,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi04a/map.yaml
+++ b/mods/cnc/maps/gdi04a/map.yaml
@@ -452,4 +452,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi04b/map.yaml
+++ b/mods/cnc/maps/gdi04b/map.yaml
@@ -529,4 +529,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi04c/map.yaml
+++ b/mods/cnc/maps/gdi04c/map.yaml
@@ -746,4 +746,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi05a/map.yaml
+++ b/mods/cnc/maps/gdi05a/map.yaml
@@ -758,4 +758,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi05b/map.yaml
+++ b/mods/cnc/maps/gdi05b/map.yaml
@@ -614,4 +614,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi05c/map.yaml
+++ b/mods/cnc/maps/gdi05c/map.yaml
@@ -767,4 +767,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi06/map.yaml
+++ b/mods/cnc/maps/gdi06/map.yaml
@@ -1021,4 +1021,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Music: music.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi07/en.ftl
+++ b/mods/cnc/maps/gdi07/en.ftl
@@ -1,3 +0,0 @@
-## rules.yaml
-actor-hq-description = Provides an overview of the battlefield.
-      Requires power to operate.
--- a/mods/cnc/maps/gdi07/map.yaml
+++ b/mods/cnc/maps/gdi07/map.yaml
@@ -1029,4 +1029,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi08a/en.ftl
+++ b/mods/cnc/maps/gdi08a/en.ftl
@@ -1,4 +0,0 @@
-## rules.yaml
-actor-c3-name = Farmer Mike
-actor-hq-description = Provides an overview of the battlefield.
-      Requires power to operate.
--- a/mods/cnc/maps/gdi08a/map.yaml
+++ b/mods/cnc/maps/gdi08a/map.yaml
@@ -888,4 +888,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi08b/en.ftl
+++ b/mods/cnc/maps/gdi08b/en.ftl
@@ -1,5 +0,0 @@
-civilian-killed = Civilian killed.
-
-## rules.yaml
-actor-hq-description = Provides an overview of the battlefield.
-      Requires power to operate.
--- a/mods/cnc/maps/gdi08b/map.yaml
+++ b/mods/cnc/maps/gdi08b/map.yaml
@@ -1063,4 +1063,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/gdi09/en.ftl
+++ b/mods/cnc/maps/gdi09/en.ftl
@@ -1,3 +0,0 @@
-## rules.yaml
-actor-hq-description = Provides an overview of the battlefield.
-      Requires power to operate.
--- a/mods/cnc/maps/gdi09/map.yaml
+++ b/mods/cnc/maps/gdi09/map.yaml
@@ -784,4 +784,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod01/en.ftl
+++ b/mods/cnc/maps/nod01/en.ftl
@@ -1,2 +0,0 @@
-## rules.yaml
-actor-c10-name = Nikoomba
--- a/mods/cnc/maps/nod01/map.yaml
+++ b/mods/cnc/maps/nod01/map.yaml
@@ -233,4 +233,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod02a/map.yaml
+++ b/mods/cnc/maps/nod02a/map.yaml
@@ -236,4 +236,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod02b/map.yaml
+++ b/mods/cnc/maps/nod02b/map.yaml
@@ -197,4 +197,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod03a/en.ftl
+++ b/mods/cnc/maps/nod03a/en.ftl
@@ -1,4 +0,0 @@
-## rules.yaml
-actor-hq-description = Provides an overview of the battlefield.
-    Requires power to operate.
-actor-miss-name = Prison
--- a/mods/cnc/maps/nod03a/map.yaml
+++ b/mods/cnc/maps/nod03a/map.yaml
@@ -436,4 +436,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod03a/rules.yaml
+++ b/mods/cnc/maps/nod03a/rules.yaml
@@ -96,7 +96,7 @@ RMBO:

 MISS:
 	Tooltip:
-		Name: actor-miss-name
+		Name: actor-prison-name
 	CaptureManager:
 	Capturable:
 		Types: building
--- a/mods/cnc/maps/nod03b/en.ftl
+++ b/mods/cnc/maps/nod03b/en.ftl
@@ -1,4 +0,0 @@
-## rules.yaml
-actor-hq-description = Provides an overview of the battlefield.
-    Requires power to operate.
-actor-miss-name = Prison
--- a/mods/cnc/maps/nod03b/map.yaml
+++ b/mods/cnc/maps/nod03b/map.yaml
@@ -477,4 +477,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod03b/rules.yaml
+++ b/mods/cnc/maps/nod03b/rules.yaml
@@ -95,7 +95,7 @@ RMBO:

 MISS:
 	Tooltip:
-		Name: actor-miss-name
+		Name: actor-prison-name
 	CaptureManager:
 	Capturable:
 		Types: building
--- a/mods/cnc/maps/nod04a/map.yaml
+++ b/mods/cnc/maps/nod04a/map.yaml
@@ -479,4 +479,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod04b/map.yaml
+++ b/mods/cnc/maps/nod04b/map.yaml
@@ -538,4 +538,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod05/map.yaml
+++ b/mods/cnc/maps/nod05/map.yaml
@@ -377,4 +377,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod06a/map.yaml
+++ b/mods/cnc/maps/nod06a/map.yaml
@@ -669,4 +669,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, languages/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl, languages/en.ftl
--- a/mods/cnc/maps/nod06b/map.yaml
+++ b/mods/cnc/maps/nod06b/map.yaml
@@ -599,4 +599,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, languages/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl, languages/en.ftl
--- a/mods/cnc/maps/nod06c/map.yaml
+++ b/mods/cnc/maps/nod06c/map.yaml
@@ -467,4 +467,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod07a/map.yaml
+++ b/mods/cnc/maps/nod07a/map.yaml
@@ -600,4 +600,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod07b/map.yaml
+++ b/mods/cnc/maps/nod07b/map.yaml
@@ -957,4 +957,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod07c/map.yaml
+++ b/mods/cnc/maps/nod07c/map.yaml
@@ -772,4 +772,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod08a/map.yaml
+++ b/mods/cnc/maps/nod08a/map.yaml
@@ -614,4 +614,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod08b/map.yaml
+++ b/mods/cnc/maps/nod08b/map.yaml
@@ -773,4 +773,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod09/map.yaml
+++ b/mods/cnc/maps/nod09/map.yaml
@@ -886,4 +886,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r

 Weapons: weapons.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod10a/map.yaml
+++ b/mods/cnc/maps/nod10a/map.yaml
@@ -1345,4 +1345,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/nod10b/map.yaml
+++ b/mods/cnc/maps/nod10b/map.yaml
@@ -726,4 +726,4 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
--- a/mods/cnc/maps/twist-of-fate/map.yaml
+++ b/mods/cnc/maps/twist-of-fate/map.yaml
@@ -1142,6 +1142,6 @@ Actors:

 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml

-Translations: cnc|languages/lua/en.ftl, cnc|languages/difficulties/en.ftl
+Translations: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl

 Weapons: weapons.yaml