Merge branch 'CleverRaven:master' into radio-tower

data/json/effects_on_condition/example_eocs.json

@@ -331,8 +331,8 @@
     "id": "EOC_query_tile_test_anywhere",
     "effect": [
       {
-        "if": { "u_query_tile": "anywhere", "target_var": { "context_val": "pos" }, "message": "Select point" },
-        "then": { "u_message": "<context_val:pos>" },
+        "if": { "u_query_tile": "anywhere", "target_var": { "global_val": "pos" }, "message": "Select point" },
+        "then": { "u_message": "<global_val:pos>" },
         "else": { "u_message": "Canceled" }
       }
     ]
@@ -342,8 +342,8 @@
     "id": "EOC_query_tile_test_line_of_sight",
     "effect": [
       {
-        "if": { "u_query_tile": "line_of_sight", "target_var": { "context_val": "pos" }, "message": "Select point", "range": 10 },
-        "then": { "u_message": "<context_val:pos>" },
+        "if": { "u_query_tile": "line_of_sight", "target_var": { "global_val": "pos" }, "message": "Select point", "range": 10 },
+        "then": { "u_message": "<global_val:pos>" },
         "else": { "u_message": "Canceled" }
       }
     ]
@@ -353,8 +353,8 @@
     "id": "EOC_query_tile_test_around",
     "effect": [
       {
-        "if": { "u_query_tile": "around", "target_var": { "context_val": "pos" }, "message": "Choose direction" },
-        "then": { "u_message": "<context_val:pos>" },
+        "if": { "u_query_tile": "around", "target_var": { "global_val": "pos" }, "message": "Choose direction" },
+        "then": { "u_message": "<global_val:pos>" },
         "else": { "u_message": "Canceled" }
       }
     ]
@@ -381,20 +381,20 @@
     "id": "EOC_can_see_location_test",
     "effect": [
       {
-        "if": { "u_query_tile": "anywhere", "target_var": { "context_val": "pos" }, "message": "Select point" },
+        "if": { "u_query_tile": "anywhere", "target_var": { "global_val": "pos" }, "message": "Select point" },
         "then": [
           {
-            "if": { "u_can_see_location": { "context_val": "pos" } },
-            "then": { "u_message": "You can see <context_val:pos>." },
-            "else": { "u_message": "You can't see <context_val:pos>." }
+            "if": { "u_can_see_location": { "global_val": "pos" } },
+            "then": { "u_message": "You can see <global_val:pos>." },
+            "else": { "u_message": "You can't see <global_val:pos>." }
           },
           {
             "u_run_npc_eocs": [
               {
                 "id": "EOC_can_see_location_test_nest",
-                "condition": { "u_can_see_location": { "context_val": "pos" } },
-                "effect": { "message": "<u_name> can see <context_val:pos>." },
-                "false_effect": { "message": "<u_name> can't see <context_val:pos>." }
+                "condition": { "u_can_see_location": { "global_val": "pos" } },
+                "effect": { "message": "<u_name> can see <global_val:pos>." },
+                "false_effect": { "message": "<u_name> can't see <global_val:pos>." }
               }
             ],
             "local": true
@@ -438,10 +438,10 @@
     "id": "EOC_teleport_test_other",
     "effect": [
       {
-        "if": { "u_query_tile": "anywhere", "target_var": { "context_val": "loc" }, "message": "Select point" },
+        "if": { "u_query_tile": "anywhere", "target_var": { "global_val": "loc" }, "message": "Select point" },
         "then": {
           "run_eoc_with": { "id": "EOC_teleport_test_other_do", "effect": { "npc_teleport": { "global_val": "teleport_test_pos" } } },
-          "beta_loc": { "context_val": "loc" },
+          "beta_loc": { "global_val": "loc" },
           "false_eocs": { "id": "EOC_teleport_test_other_do_fail_msg", "effect": { "message": "Please select a creature." } }
         },
         "else": { "u_message": "Canceled" }
@@ -467,13 +467,13 @@
     "effect": [
       { "u_set_talker": { "global_val": "player_id" } },
       {
-        "if": { "u_query_tile": "anywhere", "target_var": { "context_val": "loc" }, "message": "Select point" },
+        "if": { "u_query_tile": "anywhere", "target_var": { "global_val": "loc" }, "message": "Select point" },
         "then": {
           "run_eoc_with": {
             "id": "_EOC_control_npc_do",
             "effect": [ { "if": "npc_is_npc", "then": [ "follow", "take_control" ], "else": { "message": "Please select a NPC." } } ]
           },
-          "beta_loc": { "context_val": "loc" },
+          "beta_loc": { "global_val": "loc" },
           "false_eocs": { "id": "_EOC_control_npc_fail_msg", "effect": { "message": "Please select a NPC." } }
         },
         "else": { "u_message": "Canceled" }

data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json

@@ -29,7 +29,7 @@
     "name": "reinforced concrete wall",
     "looks_like": "t_concrete_wall",
     "description": "An extremely resilient wall, filled with concrete and rebar.  Best suited for supporting multi-level buildings, only serious explosives and high-speed impacts would be capable of damaging this wall.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "move_cost": 0,
     "coverage": 100,
@@ -44,7 +44,7 @@
     "id": "t_folded_wall",
     "name": "folded wall",
     "description": "When looked at out of the side of the eye, this wall seems to bend and curve in on itself and when looked at head on it seems to be a repeating pattern of solid concrete hexagons.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "yellow_cyan",
     "move_cost": 0,
     "coverage": 100,
@@ -59,7 +59,7 @@
     "id": "t_unfolded_wall",
     "name": "unfolded wall",
     "description": "This wall tessellates as you view it.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "cyan_red",
     "move_cost": 0,
     "coverage": 100,
@@ -201,7 +201,7 @@
     "name": "reinforced concrete wall",
     "looks_like": "t_concrete_wall",
     "description": "You can see every side of every crack in this worn concrete, all the way down.  You can't look at it for too long.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "move_cost": 0,
     "coverage": 100,

data/json/furniture_and_terrain/furniture-flora.json

@@ -550,7 +550,7 @@
     "id": "f_hedge_short",
     "name": "short hedge",
     "description": "A shrub with small green leaves, trimmed into a squared shape.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "green",
     "looks_like": "t_shrub",
     "move_cost_mod": 3,
@@ -576,7 +576,7 @@
     "id": "f_hedge_tall",
     "name": "tall hedge",
     "description": "A tall shrub with small green leaves, trimmed into a squared shape.  You can't see past this thick hedgerow.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "green",
     "looks_like": "t_shrub",
     "move_cost_mod": -1,

data/json/furniture_and_terrain/special_use/bullet_trailer.json

@@ -19,20 +19,20 @@
     "connect_groups": "WALL",
     "connects_to": "WALL",
     "flags": [ "SUPPORTS_ROOF", "WALL", "REDUCE_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray"
   },
   {
     "type": "terrain",
     "id": "t_bullettrailer_nwall",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "copy-from": "t_bullettrailer_nwall_westcorner"
   },
   {
     "type": "terrain",
     "id": "t_bullettrailer_nwall_window",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "looks_like": "t_window",
     "connect_groups": "WALL",
@@ -43,36 +43,36 @@
   {
     "type": "terrain",
     "id": "t_bullettrailer_nwall_eastcorner",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "copy-from": "t_bullettrailer_nwall_westcorner"
   },
   {
     "type": "terrain",
     "id": "t_bullettrailer_wwall",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "copy-from": "t_bullettrailer_nwall_westcorner"
   },
   {
     "type": "terrain",
     "id": "t_bullettrailer_ewall",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "copy-from": "t_bullettrailer_nwall_westcorner"
   },
   {
     "type": "terrain",
     "id": "t_bullettrailer_inner_westcorner",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "copy-from": "t_bullettrailer_nwall_westcorner"
   },
   {
     "type": "terrain",
     "id": "t_bullettrailer_inner_T",
     "copy-from": "t_bullettrailer_nwall_westcorner",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "name": "bullet trailer interior wall",
     "description": "A simple wall paneled in a coarsely textured gray laminate of some sort."
@@ -81,15 +81,15 @@
     "type": "terrain",
     "id": "t_bullettrailer_inner_eastcorner",
     "copy-from": "t_bullettrailer_inner_T",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray"
   },
   {
     "type": "terrain",
     "id": "t_bullettrailer_swall_westcorner",
     "name": "bullet trailer exterior wall",
     "description": "A smooth wall of gleaming chrome, slightly dusty from the road.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "copy-from": "t_bullettrailer_nwall_westcorner"
   },
@@ -137,14 +137,14 @@
   {
     "type": "terrain",
     "id": "t_bullettrailer_swall",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "copy-from": "t_bullettrailer_swall_westcorner"
   },
   {
     "type": "terrain",
     "id": "t_bullettrailer_swall_eastcorner",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "copy-from": "t_bullettrailer_swall_westcorner"
   },

data/json/furniture_and_terrain/terrain-doors.json

@@ -2452,7 +2452,7 @@
     "id": "t_secretdoor_metal_c",
     "name": "metal wall",
     "description": "An industrially fabricated thick sheet carefully positioned and joined seamlessly with perimeter sealant, this wall is capable of resisting extreme elements as well as hostile forces.  Blast load rated and extremely fire-retardant, breaching it will require specialized tools or an industrial vehicle.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "looks_like": "t_wall_metal",
     "color": "cyan",
     "move_cost": 0,
@@ -2499,7 +2499,7 @@
     "id": "t_secretdoor_concrete_c",
     "name": "concrete wall",
     "description": "A faux concrete wall positioned and joined seamlessly with the wall, this wall is capable of resisting extreme elements as well as hostile forces.  Blast load rated and extremely fire-retardant, breaching it will require specialized tools or an industrial vehicle.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "looks_like": "t_concrete_wall",
     "color": "light_gray",
     "move_cost": 0,

data/json/furniture_and_terrain/terrain-fences-gates.json

@@ -511,7 +511,7 @@
     "id": "t_fence",
     "name": "picket fence",
     "description": "A barrier made of wood, it's nothing complicated.  Mildly suggests where not to go.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "brown",
     "move_cost": 3,
     "flags": [
@@ -550,7 +550,7 @@
     "id": "t_wattle_fence",
     "name": "woven wattle fence",
     "description": "A flimsy barrier made of woven sticks.  Suitable for small animals.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "brown",
     "looks_like": "t_fence",
     "move_cost": 0,
@@ -604,7 +604,7 @@
     "id": "t_chainfence",
     "name": "chain link fence",
     "description": "A tall fence made of woven wires.  There aren't any gaps big enough for you to fit through, so you'll have to cut it, climb it, or find a way around.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "cyan",
     "move_cost": 0,
     "boltcut": {
@@ -671,7 +671,7 @@
     "id": "t_chickenwire_fence",
     "name": "chickenwire fence",
     "description": "A tall, rather flimsy fence made of planks and woven wire, suitable for containing small livestock like chickens.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "brown",
     "looks_like": "t_chainfence",
     "move_cost": 0,
@@ -697,7 +697,7 @@
     "id": "t_screened_porch_wall",
     "name": "screen mesh wall",
     "description": "A tall, rather flimsy wall made of planks and screen mesh, suitable for keeping the bugs out.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "brown",
     "looks_like": "t_chickenwire_fence",
     "move_cost": 0,
@@ -836,7 +836,7 @@
     "id": "t_splitrail_fence",
     "name": "split rail fence",
     "description": "A rather stout fence made of planks and fence posts, suitable for containing livestock like horses, cows and pigs.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "brown",
     "looks_like": "t_fence",
     "move_cost": 0,
@@ -946,7 +946,7 @@
     "id": "t_fence_metal",
     "name": "metal fence",
     "description": "A simple metal fence.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "looks_like": "t_metal_railing",
     "move_cost": 0,
@@ -1063,7 +1063,7 @@
     "id": "t_privacy_fence",
     "name": "wooden privacy fence",
     "description": "A rather stout fence made of planks and fence posts, it is tall enough to prevent people from seeing into your yard.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "brown",
     "looks_like": "t_fence",
     "move_cost": 0,
@@ -1164,7 +1164,7 @@
     "id": "t_railing",
     "name": "railing",
     "description": "A section of wooden railing.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "yellow",
     "move_cost": 3,
     "flags": [ "FLAMMABLE_ASH", "TRANSPARENT", "NOITEM", "THIN_OBSTACLE", "MOUNTABLE", "SHORT", "AUTO_WALL_SYMBOL", "BURROWABLE" ],
@@ -1189,7 +1189,7 @@
     "id": "t_glass_railing",
     "name": "glass railing",
     "description": "A section of railing made out of glass.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "cyan",
     "move_cost": 3,
     "flags": [ "TRANSPARENT", "NOITEM", "THIN_OBSTACLE", "MOUNTABLE", "SHORT", "AUTO_WALL_SYMBOL", "BURROWABLE" ],
@@ -1214,7 +1214,7 @@
     "id": "t_metal_railing",
     "name": "metal railing",
     "description": "A section of metal railing.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "dark_gray",
     "move_cost": 3,
     "flags": [ "TRANSPARENT", "NOITEM", "THIN_OBSTACLE", "MOUNTABLE", "SHORT", "AUTO_WALL_SYMBOL", "BURROWABLE" ],
@@ -1239,7 +1239,7 @@
     "id": "t_concrete_railing",
     "name": "concrete railing",
     "description": "A section of cemented concrete railing.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "cyan",
     "looks_like": "t_ponywall",
     "move_cost": 3,
@@ -1320,7 +1320,7 @@
     "id": "t_cattle_feeder",
     "name": "cattle feeder",
     "description": "A section of tall steel with a solid base and feed spaces above to allow livestock to reach the contained food.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "dark_gray",
     "looks_like": "t_metal_railing",
     "move_cost": 0,

data/json/furniture_and_terrain/terrain-flesh.json

@@ -24,7 +24,7 @@
     "id": "t_concrete_wall_flesh",
     "name": "overgrown wall",
     "description": "A concrete wall overgrown by a grotesque grid of veins and knotted flesh.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "magenta_yellow",
     "move_cost": 0,
     "coverage": 100,

data/json/furniture_and_terrain/terrain-floors-indoor.json

@@ -1493,7 +1493,7 @@
     "name": "junk metal floor",
     "looks_like": "t_scrap_floor",
     "description": "A simple roof of rusty scrap metal bolted and wire-tied to a makeshift frame.  Very fashionable in post-apocalyptic shantytowns.  Hope you like the sound of rain on corrugated metal.  Can support a roof.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "dark_gray",
     "move_cost": 2,
     "connect_groups": "INDOORFLOOR",