summaryrefslogtreecommitdiff
path: root/npc-03_godco-update.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2022-01-25 23:39:30 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2022-01-25 23:39:30 -0800
commit7406a4d8fad98609db9486e27f35e2347c87e70f (patch)
treebf59f93eda0b1200ca0f7630ee4b6832234b1c6d /npc-03_godco-update.patch
parentUpdate PKGUILD (diff)
downloadcataclysm-bn-7406a4d8fad98609db9486e27f35e2347c87e70f.tar.xz
Fix many patch fuzzing warnings.
Fix vampires not ignoring ambient temperature.
Diffstat (limited to 'npc-03_godco-update.patch')
-rw-r--r--npc-03_godco-update.patch9
1 files changed, 6 insertions, 3 deletions
diff --git a/npc-03_godco-update.patch b/npc-03_godco-update.patch
index f3feab8..140a797 100644
--- a/npc-03_godco-update.patch
+++ b/npc-03_godco-update.patch
@@ -533,7 +533,7 @@
"responses": [
{ "text": "Oh, okay.", "topic": "TALK_GODCO_cook_1" },
{ "text": "What can I buy here?", "topic": "TALK_GODCO_cook_ask_goods" }
-@@ -209,7 +209,7 @@
+@@ -209,8 +209,8 @@
"rejected": "It's okay, I can do without them. Just let me know if you reconsider.",
"advice": "There's a lot of places to look. They are common in house kitchens, restaurants or grocery stores.",
"inquire": "How is the search going? Have you found 'em?",
@@ -543,7 +543,8 @@
+ "success_lie": "Thanks for trying… I guess.",
"failure": "Don't worry about it, it's not that important."
},
-@@ -232,9 +232,9 @@
+ "end": { "effect": [ { "u_buy_item": "icon", "count": 2 } ] }
+@@ -232,10 +232,10 @@
"offer": "This task is bit more serious. I don't have enough jars to preserve perishables for the future, and we can't just store everything in salt. We could do our own canning if we had some more glass jars. I could get by with 5 for now.",
"accepted": "Thanks for accepting this task. It'll take a load off my shoulders. I finally won't have to worry about this problem anymore.",
"rejected": "Just let me know if you change your mind.",
@@ -555,7 +556,8 @@
+ "success_lie": "Thanks for trying… I guess.",
"failure": "It's not a big deal, it isn't that urgent."
},
-@@ -259,6 +259,6 @@
+ "end": { "effect": [ { "u_buy_item": "icon", "count": 5 } ] }
+@@ -259,7 +259,7 @@
"advice": "Butcher knives are not that rare to find. They are commonly found in kitchens.",
"inquire": "Do you have that knife now?",
"success": "I am grateful for the help you've done.",
@@ -563,6 +565,7 @@
+ "success_lie": "Thanks for trying… I guess.",
"failure": "Don't worry about it, it's not that important."
},
+ "end": { "effect": [ { "u_buy_item": "icon", "count": 3 } ] }
--- a/data/json/mapgen/cground3x3.json
+++ b/data/json/mapgen/cground3x3.json
@@ -22,83 +22,120 @@