Add camps to vanilla factions

CleverRaven · May 9, 2024 · 7232f07 · 7232f07
1 parent 30f09f6
commit 7232f07
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/data/json/npcs/factions.json b/data/json/npcs/factions.json
@@ -91,7 +91,8 @@
     "known_by_u": false,
     "size": 70,
     "power": 100,
-    "fac_food_supply": { "calories": 115200, "vitamins": {  } },
+    "//": "No food supply, they eat off of robofac's",
+    "fac_food_supply": { "calories": 0, "vitamins": {  } },
     "wealth": 75000,
     "currency": "RobofacCoin",
     "relations": {
@@ -117,6 +118,7 @@
     "known_by_u": false,
     "size": 100,
     "power": 100,
+    "//": "FIXME: No camp! One character spawns at the refugee center but can't eat out of their stores",
     "fac_food_supply": { "calories": 201600, "vitamins": {  } },
     "wealth": 100000000,
     "relations": {
@@ -241,7 +243,8 @@
     "known_by_u": false,
     "size": 5,
     "power": 0,
-    "fac_food_supply": { "calories": 1152, "vitamins": {  } },
+    "//": "No camp, on purpose! These guys will literally starve.",
+    "fac_food_supply": { "calories": 0, "vitamins": {  } },
     "wealth": 100,
     "relations": {
       "lobby_beggars": {
@@ -361,6 +364,7 @@
     "known_by_u": false,
     "size": 100,
     "power": 100,
+    "//": "No camp, on purpose! The pilgrim group should probably be full marloss, and not need to eat?",
     "fac_food_supply": { "calories": 172800, "vitamins": {  } },
     "wealth": 25000,
     "relations": {
@@ -534,6 +538,7 @@
     "size": 7,
     "power": 10,
     "currency": "signed_chit",
+    "//": "Checked down to here. Pick up here later and force push this comment out of existence :^)",
     "fac_food_supply": { "calories": 115200, "vitamins": {  } },
     "wealth": 75000,
     "relations": {

diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
@@ -443,7 +443,7 @@
       { "point": [ 0, 1, 0 ], "overmap": "hive_edge_01_north" },
       { "point": [ 0, 2, 0 ], "overmap": "hive_edge_02_north" },
       { "point": [ 1, 0, 0 ], "overmap": "hive_edge_10_north" },
-      { "point": [ 1, 1, 0 ], "overmap": "hive_north" },
+      { "point": [ 1, 1, 0 ], "overmap": "hive_north", "camp": "apis_hive", "camp_name": "???" },
       { "point": [ 1, 2, 0 ], "overmap": "hive_edge_12_north" },
       { "point": [ 2, 0, 0 ], "overmap": "hive_edge_20_north" },
       { "point": [ 2, 1, 0 ], "overmap": "hive_edge_21_north" },
@@ -2080,7 +2080,7 @@
       { "point": [ 9, 6, 0 ], "overmap": "evac_center_10_north" },
       { "point": [ 5, 7, 0 ], "overmap": "evac_center_11_north" },
       { "point": [ 6, 7, 0 ], "overmap": "evac_center_12_north" },
-      { "point": [ 7, 7, 0 ], "overmap": "evac_center_13_north" },
+      { "point": [ 7, 7, 0 ], "overmap": "evac_center_13_north", "camp": "free_merchants", "camp_name": "Refugee Center" },
       { "point": [ 8, 7, 0 ], "overmap": "evac_center_14_north" },
       { "point": [ 9, 7, 0 ], "overmap": "evac_center_15_north" },
       { "point": [ 5, 8, 0 ], "overmap": "evac_center_16_north" },
@@ -2680,7 +2680,7 @@
       { "point": [ 1, 7, 1 ], "overmap": "ranch_camp_65_roof_north" },
       { "point": [ 2, 7, 0 ], "overmap": "ranch_camp_66_north" },
       { "point": [ 2, 7, 1 ], "overmap": "ranch_camp_66_roof_north" },
-      { "point": [ 3, 7, 0 ], "overmap": "ranch_camp_67_north" },
+      { "point": [ 3, 7, 0 ], "overmap": "ranch_camp_67_north", "camp": "tacoma_commune", "camp_name": "Tacoma" },
       { "point": [ 3, 7, 1 ], "overmap": "ranch_camp_67_roof_north" },
       { "point": [ 4, 7, 0 ], "overmap": "ranch_camp_68_north" },
       { "point": [ 4, 7, 1 ], "overmap": "ranch_camp_68_roof_north" },
@@ -3583,7 +3583,7 @@
       { "point": [ 2, -1, 0 ], "overmap": "robofachq_surface_road2_north" },
       { "point": [ 3, -1, 0 ], "overmap": "robofachq_surface_road3_north" },
       { "point": [ 0, 0, 0 ], "overmap": "robofachq_surface_parking_north" },
-      { "point": [ 1, 0, 0 ], "overmap": "robofachq_surface_entrance_north" },
+      { "point": [ 1, 0, 0 ], "overmap": "robofachq_surface_entrance_north", "camp": "robofac", "camp_name": "Hub 01" },
       { "point": [ 2, 0, 0 ], "overmap": "robofachq_surface_car_entrance_north" },
       { "point": [ 3, 0, 0 ], "overmap": "robofachq_surface_a3_north" },
       { "point": [ 0, 1, 0 ], "overmap": "robofachq_surface_b0_north" },
@@ -3685,7 +3685,7 @@
     "id": "isolated_road",
     "overmaps": [
       { "point": [ 0, 0, 0 ], "overmap": "isolated_road_field_0" },
-      { "point": [ 1, 0, 0 ], "overmap": "isolated_house_farm_gunsmith" },
+      { "point": [ 1, 0, 0 ], "overmap": "isolated_house_farm_gunsmith", "camp": "isolated_artisans", "camp_name": "Cody & Jay" },
       { "point": [ 0, 1, 0 ], "overmap": "isolated_house_farm_blacksmith" },
       { "point": [ 1, 0, 1 ], "overmap": "isolated_house_farm_roof_gunsmith" },
       { "point": [ 0, 1, 1 ], "overmap": "isolated_house_farm_roof_blacksmith" },
@@ -7041,7 +7041,7 @@
     "id": "bunker shop",
     "overmaps": [
       { "point": [ 0, 0, 0 ], "overmap": "bunker_shop_g_south" },
-      { "point": [ 0, 0, -1 ], "overmap": "bunker_shop_b_south" }
+      { "point": [ 0, 0, -1 ], "overmap": "bunker_shop_b_south", "camp": "wasteland_scavengers", "camp_name": "Merchant" }
     ],
     "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road", "existing": true, "connection": "local_road", "from": [ 0, 0, 0 ] } ],
     "locations": [ "field", "forest_without_trail" ],