Merge pull request #33541 from curstwist/fix-static-npcs-spawning-for…

…-random-npcs fix random npcs offering static npc missions
CleverRaven · Aug 26, 2019 · cb6380f · cb6380f
2 parents badc312 + aca6649
commit cb6380f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
@@ -158,7 +158,7 @@
     "value": 50000,
     "item": "anvil",
     "count": 1,
-    "origins": [ "ORIGIN_ANY_NPC" ],
+    "origins": [ "ORIGIN_SECONDARY" ],
     "followup": "MISSION_ISHERWOOD_CARLOS_2",
     "dialogue": {
       "describe": "I need an anvil to do advanced metal work.",

diff --git a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
@@ -173,7 +173,7 @@
       "effect": "follow",
       "assign_mission_target": { "om_terrain": "mi-go_camp2", "om_special": "Mi-Go Encampment", "reveal_radius": 3 }
     },
-    "origins": [ "ORIGIN_ANY_NPC" ],
+    "origins": [ "ORIGIN_SECONDARY" ],
     "destination": "mi-go_camp2",
     "dialogue": {
       "describe": "We need to investigate the alien encampment.",

diff --git a/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json
@@ -260,7 +260,7 @@
     "value": 20000,
     "item": "raw_dandelion",
     "count": 50,
-    "origins": [ "ORIGIN_ANY_NPC" ],
+    "origins": [ "ORIGIN_SECONDARY" ],
     "followup": "MISSION_ISHERWOOD_CLAIRE_2",
     "end": {
       "opinion": { "trust": 1, "value": 1 },

diff --git a/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
@@ -199,7 +199,7 @@
     "value": 50000,
     "item": "rock",
     "count": 120,
-    "origins": [ "ORIGIN_ANY_NPC" ],
+    "origins": [ "ORIGIN_SECONDARY" ],
     "followup": "MISSION_ISHERWOOD_EDDIE_2",
     "dialogue": {
       "describe": "We need to build some kilns.",

diff --git a/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json
@@ -311,7 +311,7 @@
     "value": 20000,
     "item": "jar_3l_glass",
     "count": 20,
-    "origins": [ "ORIGIN_ANY_NPC" ],
+    "origins": [ "ORIGIN_SECONDARY" ],
     "followup": "MISSION_ISHERWOOD_JACK_2",
     "end": {
       "opinion": { "trust": 1, "value": 1 },

diff --git a/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json
@@ -192,7 +192,7 @@
       "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "search_range": 20, "min_distance": 8 },
       "update_mapgen": { "place_monster": [ { "monster": "mon_flying_polyp", "x": 11, "y": 11, "target": true } ] }
     },
-    "origins": [ "ORIGIN_ANY_NPC" ],
+    "origins": [ "ORIGIN_SECONDARY" ],
     "dialogue": {
       "describe": "We could use some help killing some monsters.",
       "offer": "I don't know what it is, but it is very fast, I'm willing to outfit you with a horse if you succeed.",

diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json
@@ -167,7 +167,7 @@
     "value": 50000,
     "item": "glassblowing_book",
     "count": 1,
-    "origins": [ "ORIGIN_ANY_NPC" ],
+    "origins": [ "ORIGIN_SECONDARY" ],
     "followup": "MISSION_ISHERWOOD_LUKE_2",
     "dialogue": {
       "describe": "I need more knowledge to get the glass blowing started.",