Militia Community Addendum

data/json/mapgen/militia/GM_LODGE_PALETTE.json

@@ -10,24 +10,23 @@
       "-": "t_wall_w",
       ";": "t_dirtfloor",
       "B": "t_floor",
-      "C": [
-        "t_region_groundcover",
-        [ "t_grass_long", 1 ],
-        [ "t_grass_tall", 1 ],
-        [ "t_region_groundcover", 30 ],
-        [ "t_region_tree", 1 ]
-      ],
-      ",": [ "t_region_groundcover", [ "t_grass_long", 1 ], [ "t_grass_tall", 1 ], [ "t_region_groundcover", 30 ] ],
+      ",": [ "t_region_groundcover", [ "t_grass_long", 1 ], [ "t_grass_tall", 1 ], [ "t_region_groundcover", 5 ] ],
       "D": "t_floor",
       "E": "t_floor",
       "G": "t_palisade_gate",
       "H": "t_splitrail_fence_h",
       "L": "t_floor",
       "O": "t_floor",
       "S": "t_floor",
-      "T": "t_tree",
+      "T": [
+        "t_region_groundcover",
+        [ "t_grass_long", 2 ],
+        [ "t_grass_tall", 2 ],
+        [ "t_region_groundcover", 2 ],
+        [ "t_region_tree", 4 ]
+      ],
       "V": "t_splitrail_fence_v",
-      "W": "t_wall_wood",
+      "#": "t_wall_wood",
       "X": "t_region_groundcover",
       "Y": "t_floor",
       "Z": "t_floor",
@@ -45,14 +44,15 @@
       "v": "t_window_domestic",
       "w": "t_window_boarded",
       "x": "t_region_groundcover",
-      "y": "t_palisade",
+      "y": "t_splitrail_fence",
+      "|": "t_splitrail_fencegate_c",
       "z": "t_floor",
-      "|": "t_wall_w",
       "~": "t_water_sh",
       "Δ": "t_floor",
       "@": "t_floor",
-      "#": "t_floor",
+      "u": "t_floor",
       "Ŧ": "t_floor",
+      "‡": "t_floor",
       "*": "t_floor",
       "`": "t_floor",
       "1": "t_floor",
@@ -62,6 +62,7 @@
       "5": "t_floor",
       "6": "t_floor",
       "7": "t_floor",
+      "$": "t_water_pump",
       "<": "t_wood_stairs_up",
       ">": "t_wood_stairs_down",
       "F": "t_region_groundcover",
@@ -105,7 +106,7 @@
       "@": "f_bed",
       "‡": "f_woodstove",
       "Ŧ": "f_sink",
-      "#": "f_cupboard",
+      "u": "f_cupboard",
       "Δ": "f_armchair",
       "Ʌ": "f_wardrobe",
       "^": "f_dryer",
@@ -121,7 +122,7 @@
         { "item": "SUS_dresser_womens", "chance": 50, "repeat": [ 1, 2 ] }
       ],
       "!": { "item": "pool_table", "chance": 30, "repeat": [ 1, 2 ] },
-      "#": [
+      "u": [
         { "item": "dishes_dining", "chance": 30 },
         { "item": "tea_dishes", "chance": 10, "repeat": [ 1, 2 ] },
         { "item": "baked_goods", "chance": 5 },

data/json/npcs/militia/GM_Militia_Guard.json

@@ -38,7 +38,7 @@
       "context": "first_meeting",
       "value": "yes",
       "yes": "Hello again.",
-      "no": "I'm busy on watch duty.  Talk to the Boss inside."
+      "no": "I'm busy on watch duty.  Talk to the Boss upstairs."
     },
     "responses": [
       { "text": "What are you doing?", "topic": "TALK_MILITIA_GUARD1_Introduction" },
@@ -48,7 +48,7 @@
   {
     "type": "talk_topic",
     "id": "TALK_MILITIA_GUARD1_Introduction",
-    "dynamic_line": "I'm on watch duty.  Talk to the Boss.  He's inside.",
+    "dynamic_line": "I'm on watch duty.  Talk to the Boss.  He's upstairs.",
     "responses": [ { "text": "…", "topic": "TALK_NONE" } ]
   },
   {

data/json/npcs/militia/GM_Militia_Merchant.json

@@ -130,33 +130,7 @@
       [ "crowbar", 25 ],
       [ "machete", 25 ],
       [ "ax", 25 ],
-      [ "spear_knife", 30 ],
-      [ "22_lr", 25 ],
-      [ "22_fmj", 1 ],
-      [ "223", 15 ],
-      [ "308", 10 ],
-      [ "3006", 10 ],
-      [ "45_acp", 10 ],
-      [ "45_jhp", 1 ],
-      [ "rifle_9mm", 20 ],
-      [ "rifle_22", 20 ],
-      [ "crossbow", 15 ],
-      [ "sig_mosquito", 15 ],
-      [ "ruger_mk4", 15 ],
-      [ "glock_19", 15 ],
-      [ "usp_9mm", 10 ],
-      [ "m9", 35 ],
-      [ "remington_700", 5 ],
-      [ "ruger_1022", 10 ],
-      [ "marlin_9a", 10 ],
-      [ "remington_870", 10 ],
-      [ "mossberg_500", 5 ],
-      [ "shotgun_d", 5 ],
-      [ "molotov", 10 ],
-      [ "recurbow", 15 ],
-      [ "arrow_metal", 25 ],
-      [ "bolt_steel", 10 ],
-      [ "ashot", 5 ]
+      [ "spear_knife", 30 ]
     ]
   },
   {
@@ -189,7 +163,7 @@
       },
       { "text": "Do you have anything to trade?", "topic": "TALK_MILITIA_TRADE" },
       {
-        "text": "Time for me to leave.",
+        "text": "Time for me to leave",
         "topic": "TALK_MILITIA_BYE",
         "condition": { "u_has_var": "talked_to_MILITIAMAIN", "type": "dialogue", "context": "first_meeting", "value": "yes" }
       }
@@ -204,13 +178,13 @@
   {
     "type": "talk_topic",
     "id": "TALK_MILITIA_BACKGROUND",
-    "dynamic_line": "Well, that's a long story.  We are whats left of the Grey Moose militia.  We had plans for when things went south cause of crazy politicians or war, but we didn't expect people to go crazy then turn zombie.  Only a handful of our members actually made it through all that madness.  What's worse is that we lost so much of our supplies and gear due to military checkpoints and trigger happy soldiers.  It didn't matter that half of us were former military the checkpoint guards just saw weapons, panicked and then confiscated everything but the clothes on our back.  So here we are at our planned escape location with not even a fraction of our manpower or supplies.",
+    "dynamic_line": "Well, that's a long story.  We are what's left of the Grey Moose militia.  We had plans for when things went south cause of crazy politicians or war, but we didn't expect people to go crazy then turn zombie.  Only a handful of our members actually made it through all that madness.  What's worse is that we lost so much of our supplies and gear due to military checkpoints and trigger happy soldiers.  It didn't matter that half of us were former military the checkpoint guards just saw weapons, panicked and then confiscated everything but the clothes on our back.  So here we are at our planned escape location with not even a fraction of our manpower or supplies.",
     "responses": [ { "text": "I see.", "topic": "TALK_NONE" } ]
   },
   {
     "type": "talk_topic",
     "id": "TALK_MILITIA_HELP",
-    "dynamic_line": "I can't say I can think of anything at the moment.  Our remoteness is our defense.  We want to keep a low profile and try to keep out of any trouble in this isolated location.  We are willing to buy weapons and ammo though.  Keeping the nearby area clear and hunting is always eating away at our supplies.",
+    "dynamic_line": "I can't say I can think of anything at the moment.  Our remoteness is our defense.  We want to keep a low profile and try to keep out of any trouble in this isolated location.  We are willing to trade for weapons and ammo though.  Keeping the nearby area clear and hunting is always eating away at our supplies.",
     "responses": [ { "text": "Keeping a low profile is good.", "topic": "TALK_NONE" } ]
   },
   {

data/json/overmap/overmap_special/specials.json

@@ -6740,36 +6740,35 @@
     "type": "overmap_special",
     "id": "Militia Lodge",
     "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "GMLODGE1_1" },
-      { "point": [ 1, 0, 0 ], "overmap": "GMLODGE1_2" },
-      { "point": [ 2, 0, 0 ], "overmap": "GMLODGE1_3" },
-      { "point": [ 3, 0, 0 ], "overmap": "GMLODGE1_4" },
-      { "point": [ 0, 1, 0 ], "overmap": "GMLODGE2_1" },
-      { "point": [ 1, 1, 0 ], "overmap": "GMLODGE2_2" },
-      { "point": [ 2, 1, 0 ], "overmap": "GMLODGE2_3" },
-      { "point": [ 3, 1, 0 ], "overmap": "GMLODGE2_4" },
-      { "point": [ 0, 2, 0 ], "overmap": "GMLODGE3_1" },
-      { "point": [ 1, 2, 0 ], "overmap": "GMLODGE3_2" },
-      { "point": [ 2, 2, 0 ], "overmap": "GMLODGE3_3" },
-      { "point": [ 3, 2, 0 ], "overmap": "GMLODGE3_4" },
-      { "point": [ 0, 3, 0 ], "overmap": "GMLODGE4_1" },
-      { "point": [ 1, 3, 0 ], "overmap": "GMLODGE4_2" },
-      { "point": [ 2, 3, 0 ], "overmap": "GMLODGE4_3" },
-      { "point": [ 3, 3, 0 ], "overmap": "GMLODGE4_4" },
-      { "point": [ 1, 1, 1 ], "overmap": "GMLODGE2_2_2" },
-      { "point": [ 2, 1, 1 ], "overmap": "GMLODGE2_3_2" },
-      { "point": [ 1, 2, 1 ], "overmap": "GMLODGE3_2_2" },
-      { "point": [ 2, 2, 1 ], "overmap": "GMLODGE3_3_2" },
-      { "point": [ 1, 1, 2 ], "overmap": "GMLODGE2_roof_2" },
-      { "point": [ 2, 1, 2 ], "overmap": "GMLODGE2_roof_3" },
-      { "point": [ 1, 2, 2 ], "overmap": "GMLODGE3_roof_2" },
-      { "point": [ 2, 2, 2 ], "overmap": "GMLODGE3_roof_3" }
+      { "point": [ 0, 0, 0 ], "overmap": "GMLODGE1_1_north" },
+      { "point": [ 1, 0, 0 ], "overmap": "GMLODGE1_2_north" },
+      { "point": [ 2, 0, 0 ], "overmap": "GMLODGE1_3_north" },
+      { "point": [ 3, 0, 0 ], "overmap": "GMLODGE1_4_north" },
+      { "point": [ 0, 1, 0 ], "overmap": "GMLODGE2_1_north" },
+      { "point": [ 1, 1, 0 ], "overmap": "GMLODGE2_2_north" },
+      { "point": [ 2, 1, 0 ], "overmap": "GMLODGE2_3_north" },
+      { "point": [ 3, 1, 0 ], "overmap": "GMLODGE2_4_north" },
+      { "point": [ 0, 2, 0 ], "overmap": "GMLODGE3_1_north" },
+      { "point": [ 1, 2, 0 ], "overmap": "GMLODGE3_2_north" },
+      { "point": [ 2, 2, 0 ], "overmap": "GMLODGE3_3_north" },
+      { "point": [ 3, 2, 0 ], "overmap": "GMLODGE3_4_north" },
+      { "point": [ 0, 3, 0 ], "overmap": "GMLODGE4_1_north" },
+      { "point": [ 1, 3, 0 ], "overmap": "GMLODGE4_2_north" },
+      { "point": [ 2, 3, 0 ], "overmap": "GMLODGE4_3_north" },
+      { "point": [ 3, 3, 0 ], "overmap": "GMLODGE4_4_north" },
+      { "point": [ 1, 1, 1 ], "overmap": "GMLODGE2_2_2_north" },
+      { "point": [ 2, 1, 1 ], "overmap": "GMLODGE2_3_2_north" },
+      { "point": [ 1, 2, 1 ], "overmap": "GMLODGE3_2_2_north" },
+      { "point": [ 2, 2, 1 ], "overmap": "GMLODGE3_3_2_north" },
+      { "point": [ 1, 1, 2 ], "overmap": "GMLODGE2_roof_2_north" },
+      { "point": [ 2, 1, 2 ], "overmap": "GMLODGE2_roof_3_north" },
+      { "point": [ 1, 2, 2 ], "overmap": "GMLODGE3_roof_2_north" },
+      { "point": [ 2, 2, 2 ], "overmap": "GMLODGE3_roof_3_north" }
     ],
     "locations": [ "forest" ],
     "city_distance": [ 7, 15 ],
     "occurrences": [ 50, 100 ],
     "connections": [ { "point": [ 2, 4, 0 ], "terrain": "forest_trail", "connection": "forest_trail", "from": [ 2, 0, 0 ] } ],
-    "rotate": false,
     "flags": [ "WILDERNESS", "GLOBALLY_UNIQUE", "MAN_MADE" ]
   }
 ]

data/json/overmap/overmap_terrain/overmap_terrain_militia.json

@@ -29,8 +29,7 @@
     ],
     "name": "Militia Lodge",
     "sym": "L",
-    "color": "blue",
-    "see_cost": 5,
-    "flags": [ "NO_ROTATE" ]
+    "color": "brown",
+    "see_cost": 5
   }
 ]