DM -> TDG translations cleanup (#9779)

Various minor changes to tools to better-support the addition of TDG.

data/achievements.cfg

@@ -7,9 +7,6 @@
 #ifhave campaigns/Dead_Water
 {campaigns/Dead_Water/achievements.cfg}
 #endif
-#ifhave campaigns/Delfadors_Memoirs
-{campaigns/Delfadors_Memoirs/achievements.cfg}
-#endif
 #ifhave campaigns/Descent_Into_Darkness
 {campaigns/Descent_Into_Darkness/achievements.cfg}
 #endif
@@ -37,6 +34,9 @@
 #ifhave campaigns/Son_Of_The_Black_Eye
 {campaigns/Son_Of_The_Black_Eye/achievements.cfg}
 #endif
+#ifhave campaigns/The_Deceivers_Gambit
+{campaigns/The_Deceivers_Gambit/achievements.cfg}
+#endif
 #ifhave campaigns/The_Hammer_of_Thursagan
 {campaigns/The_Hammer_of_Thursagan/achievements.cfg}
 #endif

data/campaigns/The_Deceivers_Gambit/_main.cfg

@@ -6,7 +6,7 @@
 #############################
 # CAMPAIGN REQUIRES
 #############################
-#ifdef THE_DECEIVERS_GAMBIT
+#ifdef CAMPAIGN_THE_DECEIVERS_GAMBIT
 #--------------------
 # LOAD FILES
 #--------------------
@@ -106,7 +106,7 @@
     #--------------------
     # GLOBAL EVENTS
     #--------------------
-#ifdef THE_DECEIVERS_GAMBIT
+#ifdef CAMPAIGN_THE_DECEIVERS_GAMBIT
     {GLOBAL__SPELLCASTING_EVENTS}
     {GLOBAL__ANIMATIONS_RECRUIT}
     {EXPERIENCE_MODIFIER_GLOBAL}
@@ -159,7 +159,7 @@
     end_year="478 YW"
     icon="data/campaigns/The_Deceivers_Gambit/images/units/garard/garard-icon.png~RC(magenta>purple)"
     image="data/campaigns/The_Deceivers_Gambit/images/portraits/younger_delfador.webp~FL()~SCALE(400,320)"
-    define=THE_DECEIVERS_GAMBIT
+    define=CAMPAIGN_THE_DECEIVERS_GAMBIT
     first_scenario=00_Graduation
 
     {TDG_CAMPAIGN_SHARED_STUFF}
@@ -185,7 +185,7 @@ The Deceiver’s Gambit II"
     end_year="501 YW"
     icon="data/campaigns/The_Deceivers_Gambit/images/units/delfador/L3/delfador-campaign-icon.png~RC(magenta>purple)"
     image="data/campaigns/The_Deceivers_Gambit/images/portraits/young_delfador.webp~SCALE(350,350)"
-    define=THE_DECEIVERS_GAMBIT
+    define=CAMPAIGN_THE_DECEIVERS_GAMBIT
     first_scenario=07_The_Great_River
 
     {TDG_CAMPAIGN_SHARED_STUFF}

data/campaigns/The_Deceivers_Gambit/achievements.cfg

@@ -37,3 +37,7 @@ data/add-ons/The_Deceivers_Gambit/images/icons#enddef
     {ACHIEVEMENT attacks/saber-human.png      "tdg_s13"    _"Scenario 13: Stand Fast"            _"Defeat all enemy leaders in ‘<i>Revelry, Revisited</i>’."}
     {ACHIEVEMENT {PATH}/armchair-general.png  "tdg_s14"    _"Scenario 14: Armchair General"      _"Complete the first phase of ‘<i>Long Live the Queen</i>’ without moving Delfador."}
 [/achievement_group]
+
+#undef ACHIEVEMENT
+#undef HIDDEN
+#undef PATH

data/tools/wmllint

@@ -1494,7 +1494,6 @@ def is_translatable(key):
 # This is a list of mainline campaigns, used to convert UMC from
 # "data/campaigns" to "data/add-ons" while not clobbering mainline.
 mainline = ("Dead_Water",
-            "Delfadors_Memoirs",
             "Descent_Into_Darkness",
             "Eastern_Invasion",
             "Heir_To_The_Throne",
@@ -1504,6 +1503,7 @@ mainline = ("Dead_Water",
             "Sceptre_of_Fire",
             "Secrets_of_the_Ancients",
             "Son_Of_The_Black_Eye",
+            "The_Deceivers_Gambit",
             "The_Hammer_of_Thursagan",
             "The_Rise_Of_Wesnoth",
             "The_South_Guard",

utils/optiwebp.py

@@ -43,8 +43,6 @@ if subprocess.run(["cwebp", "-version"], stdout=subprocess.DEVNULL).returncode !
 image_dirs = [
     os.path.join("data", "campaigns", "Dead_Water", "images", "maps"),
     os.path.join("data", "campaigns", "Dead_Water", "images", "portraits"),
-    os.path.join("data", "campaigns", "Delfadors_Memoirs", "images", "story"),
-    os.path.join("data", "campaigns", "Delfadors_Memoirs", "images", "portraits"),
     os.path.join("data", "campaigns", "Descent_Into_Darkness", "images", "maps"),
     os.path.join("data", "campaigns", "Descent_Into_Darkness", "images", "portraits"),
     os.path.join("data", "campaigns", "Descent_Into_Darkness", "images", "story"),
@@ -67,6 +65,8 @@ image_dirs = [
     os.path.join("data", "campaigns", "Secrets_of_the_Ancients", "images", "portraits"),
     os.path.join("data", "campaigns", "Son_Of_The_Black_Eye", "images", "maps"),
     os.path.join("data", "campaigns", "Son_Of_The_Black_Eye", "images", "portraits"),
+    os.path.join("data", "campaigns", "The_Deceivers_Gambit", "images", "story"),
+    os.path.join("data", "campaigns", "The_Deceivers_Gambit", "images", "portraits"),
     os.path.join("data", "campaigns", "The_Hammer_of_Thursagan", "images", "maps"),
     os.path.join("data", "campaigns", "The_Hammer_of_Thursagan", "images", "portraits"),
     os.path.join("data", "campaigns", "The_Rise_Of_Wesnoth", "images", "maps"),