Merge pull request #83317 from Uwuewsky/xtr-subtypes

Few translation fixes

Author: Uwuewsky

data/json/damage_types.json

@@ -6,7 +6,7 @@
     "melee_only": true,
     "physical": true,
     "magic_color": "magenta",
-    "name": "bash",
+    "name": { "ctxt": "damage_type", "str": "bash" },
     "skill": "bashing",
     "bash_conversion_factor": 1.0,
     "mon_difficulty": true,
@@ -57,7 +57,7 @@
     "physical": true,
     "edged": true,
     "magic_color": "light_red",
-    "name": "pierce",
+    "name": { "ctxt": "damage_type", "str": "pierce" },
     "skill": "stabbing",
     "mon_difficulty": true,
     "//2": "derived from cut only for monster defs",
@@ -82,7 +82,7 @@
     "physical": true,
     "magic_color": "light_red",
     "mon_difficulty": true,
-    "name": "ballistic",
+    "name": { "ctxt": "damage_type", "str": "ballistic" },
     "material_required": true,
     "immune_flags": { "character": [ "BULLET_IMMUNE" ], "monster": [ "BULLETPROOF" ] }
   },
@@ -104,7 +104,7 @@
     "physical": false,
     "environmental": true,
     "magic_color": "light_green",
-    "name": "acid",
+    "name": { "ctxt": "damage_type", "str": "acid" },
     "//2": "derived from cut only for monster defs",
     "derived_from": [ "cut", 0.5 ],
     "material_required": true,
@@ -127,7 +127,7 @@
     "type": "damage_type",
     "physical": false,
     "magic_color": "light_blue",
-    "name": "electric",
+    "name": { "ctxt": "damage_type", "str": "electric" },
     "immune_flags": { "character": [ "ELECTRIC_IMMUNE" ], "monster": [ "ELECTRIC", "ELECTRIC_FIELD" ] }
   },
   {
@@ -148,7 +148,7 @@
     "physical": false,
     "environmental": true,
     "magic_color": "red",
-    "name": "fire",
+    "name": { "ctxt": "damage_type", "str": "fire" },
     "material_required": true,
     "immune_flags": { "character": [ "HEAT_IMMUNE" ] }
   },
@@ -169,7 +169,7 @@
     "type": "damage_type",
     "physical": false,
     "magic_color": "white",
-    "name": "cold",
+    "name": { "ctxt": "damage_type", "str": "cold" },
     "immune_flags": { "character": [ "COLD_IMMUNE" ], "monster": [ "COLDPROOF" ] }
   },
   {
@@ -189,7 +189,7 @@
     "type": "damage_type",
     "physical": false,
     "magic_color": "green",
-    "name": "biological",
+    "name": { "ctxt": "damage_type", "str": "biological" },
     "immune_flags": { "character": [ "BIO_IMMUNE" ], "monster": [ "BIOLOGICALPROOF" ] },
     "no_resist": true
   },
@@ -209,7 +209,7 @@
     "type": "damage_type",
     "physical": false,
     "magic_color": "dark_gray",
-    "name": "pure",
+    "name": { "ctxt": "damage_type", "str": "pure" },
     "no_resist": true
   },
   {

data/mods/Magiclysm/damage_types.json

@@ -18,7 +18,7 @@
     "melee_only": false,
     "physical": false,
     "magic_color": "green",
-    "name": "poison",
+    "name": { "ctxt": "damage_type", "str": "poison" },
     "mon_difficulty": true,
     "material_required": false,
     "immune_flags": { "character": [ "POISON_IMMUNE" ], "monster": [ "POISONPROOF" ] }
@@ -40,7 +40,7 @@
     "melee_only": false,
     "physical": false,
     "magic_color": "yellow",
-    "name": "light",
+    "name": { "ctxt": "damage_type", "str": "light" },
     "derived_from": [ "heat", 2 ],
     "mon_difficulty": true,
     "material_required": false
@@ -62,7 +62,7 @@
     "melee_only": false,
     "physical": false,
     "magic_color": "black_green",
-    "name": "necrotic",
+    "name": { "ctxt": "damage_type", "str": "necrotic" },
     "mon_difficulty": true,
     "material_required": false,
     "immune_flags": { "monster": [ "TIMELESS" ] }
@@ -84,7 +84,7 @@
     "melee_only": false,
     "physical": false,
     "magic_color": "h_white",
-    "name": "sonic",
+    "name": { "ctxt": "damage_type", "str": "sonic" },
     "derived_from": [ "bash", 0.4 ],
     "mon_difficulty": true,
     "material_required": false
@@ -106,7 +106,7 @@
     "melee_only": false,
     "physical": false,
     "magic_color": "pink",
-    "name": "psionic",
+    "name": { "ctxt": "damage_type", "str": "psionic" },
     "mon_difficulty": true,
     "material_required": false,
     "immune_flags": { "character": [ "PSIONIC_IMMUNE" ], "monster": [ "PSIONICPROOF" ] }
@@ -128,7 +128,7 @@
     "melee_only": false,
     "physical": false,
     "magic_color": "white_magenta",
-    "name": "gravity",
+    "name": { "ctxt": "damage_type", "str": "gravity" },
     "mon_difficulty": true,
     "material_required": false
   },
@@ -149,7 +149,7 @@
     "melee_only": false,
     "physical": false,
     "magic_color": "i_pink",
-    "name": "nether",
+    "name": { "ctxt": "damage_type", "str": "nether" },
     "mon_difficulty": true,
     "material_required": false,
     "immune_flags": { "character": [ "NETHER_IMMUNE" ], "monster": [ "NETHERPROOF" ] }

data/mods/MindOverMatter/damage_types.json

@@ -4,7 +4,7 @@
     "type": "damage_type",
     "physical": false,
     "magic_color": "yellow",
-    "name": "focused light",
+    "name": { "ctxt": "damage_type", "str": "focused light" },
     "skill": "metaphysics",
     "derived_from": [ "heat", 0.8 ],
     "immune_flags": { "character": [ "PHOTOKIN_CHAR_IMMUNE" ], "monster": [ "PHOTOKIN_MONSTER_IMMUNE" ] },
@@ -54,7 +54,7 @@
     "type": "damage_type",
     "physical": false,
     "magic_color": "yellow",
-    "name": "telekinetic",
+    "name": { "ctxt": "damage_type", "str": "telekinetic" },
     "skill": "metaphysics",
     "derived_from": [ "bash", 0.9 ],
     "immune_flags": { "character": [ "TELEKIN_SHIELD" ], "monster": [ "TELEKIN_IMMUNE" ] },
@@ -98,7 +98,7 @@
     "type": "damage_type",
     "physical": false,
     "magic_color": "white",
-    "name": "telepathic",
+    "name": { "ctxt": "damage_type", "str": "telepathic" },
     "skill": "metaphysics",
     "immune_flags": { "character": [ "TEEPSHIELD", "PSYSHIELD_PROTECT" ], "monster": [ "TEEP_IMMUNE" ] },
     "ondamage_eocs": [ "EOC_TELEPATHIC_DAMAGE_PSYSHIELD_CHECK", "EOC_TELEPATHIC_DAMAGE_STUN_HIVE_CHANCE" ]
@@ -210,7 +210,7 @@
     "type": "damage_type",
     "physical": false,
     "magic_color": "blue",
-    "name": "spacial realignment",
+    "name": { "ctxt": "damage_type", "str": "spacial realignment" },
     "skill": "metaphysics",
     "immune_flags": { "character": [ "DIMENSIONAL_ANCHOR", "TELESTOP" ], "monster": [ "TELEPORT_IMMUNE" ] },
     "ondamage_eocs": [ "EOC_TELEPORTING_DAMAGE_TELEPORT" ]
@@ -244,7 +244,7 @@
     "type": "damage_type",
     "physical": false,
     "magic_color": "red_green",
-    "name": "enervation",
+    "name": { "ctxt": "damage_type", "str": "enervation" },
     "skill": "metaphysics",
     "immune_flags": { "character": [ "LIFESHIELD" ], "monster": [ "ENERVATE_IMMUNE" ] },
     "ondamage_eocs": [ "EOC_ENERVATION_DRAIN" ]

data/mods/aftershock_exoplanet/damage_types.json

@@ -3,7 +3,7 @@
     "id": "afs_plasma",
     "type": "damage_type",
     "magic_color": "pink",
-    "name": "plasma",
+    "name": { "ctxt": "damage_type", "str": "plasma" },
     "derived_from": [ "heat", 0.4 ]
   },
   {
@@ -122,7 +122,7 @@
     "type": "damage_type",
     "physical": false,
     "magic_color": "yellow",
-    "name": "telekinetic",
+    "name": { "ctxt": "damage_type", "str": "telekinetic" },
     "skill": "metaphysics",
     "derived_from": [ "bash", 0.9 ],
     "immune_flags": { "character": [ "TELEKIN_SHIELD" ], "monster": [ "TELEKIN_IMMUNE" ] },
@@ -156,7 +156,7 @@
     "type": "damage_type",
     "physical": false,
     "magic_color": "white",
-    "name": "telepathic",
+    "name": { "ctxt": "damage_type", "str": "telepathic" },
     "skill": "metaphysics",
     "immune_flags": { "character": [ "TEEPSHIELD", "PSYSHIELD_PROTECT" ], "monster": [ "TEEP_IMMUNE" ] },
     "ondamage_eocs": [ "EOC_TELEPATHIC_DAMAGE_PSYSHIELD_CHECK", "EOC_TELEPATHIC_DAMAGE_STUN_HIVE_CHANCE" ]

lang/string_extractor/parsers/generic.py

@@ -87,3 +87,7 @@ def parse_generic(json, origin):
     if "relic_data" in json and "passive_effects" in json["relic_data"]:
         for enchantment in json["relic_data"]["passive_effects"]:
             parse_enchant(enchantment, origin)
+
+    write_text(json.get("e_port"), origin, comment="E-port name")
+    for e_port in json.get("e_ports_banned", []):
+        write_text(e_port, origin, comment="E-port name")

lang/update_pot.sh

@@ -47,6 +47,7 @@ if ! lang/extract_json_strings.py \
         -X data/json/furniture_and_terrain/terrain-regional-pseudo.json \
         -X data/json/furniture_and_terrain/furniture-regional-pseudo.json \
         -X data/json/items/book/abstract.json \
+        -X data/json/items/tool/debug_tools.json \
         -X data/json/npcs/TALK_TEST.json \
         -X data/json/recipes/basecamps/special_hardcoded.json \
         -X data/core/sentinels.json \