Merge pull request CleverRaven#36608 from kevingranade/fix-3D-monster…

data/json/monsters/bird.json

@@ -23,7 +23,7 @@
     "melee_cut": 1,
     "dodge": 4,
     "harvest": "bird_tiny",
-    "reproduction": { "baby_egg": "egg_chicken", "baby_count": 1, "baby_timer": 5 },
+    "reproduction": { "baby_egg": "egg_chicken", "baby_count": 1, "baby_timer": 2 },
     "baby_flags": [ "SPRING", "SUMMER", "AUTUMN", "WINTER" ],
     "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 3 },
     "death_function": [ "NORMAL" ],

data/json/npcs/NPC_Brigitte_LaCroix.json

@@ -226,12 +226,12 @@
     },
     "dialogue": {
       "describe": "There is always work to be done, song to be woven.",
-      "offer": "If you wish to be set on the path to enlightenment, first you must learn to listen and hear the song. Go out, butcher a creature and feel the power between your fingertips. Then bring me the bones and I shall carve them for you.",
-      "accepted": "Excellent. Now be on your way.",
-      "rejected": "I understand your reluctancy. Feel free to return when you see the way.",
-      "advice": "The shambling corpses we see all around move in discord. Their song can be used, but for an Acolyte, this would be needlessly hard. Be sure to carve an unspoiled living creature.",
+      "offer": "If you wish to be set on the path to enlightenment, first you must learn to listen and hear the song.  Go out, butcher a creature and feel the power between your fingertips.  Then bring me the bones and I shall carve them for you.",
+      "accepted": "Excellent.  Now be on your way.",
+      "rejected": "I understand your reluctancy.  Feel free to return when you see the way.",
+      "advice": "The shambling corpses we see all around move in discord.  Their song can be used, but for an Acolyte, this would be needlessly hard.  Be sure to carve an unspoiled living creature.",
       "inquire": "Have you felt the song in your hands yet?",
-      "success": "And so, another cycle ends. You have done well. I will now bestow my mark upon you, so that others may know the path you walk and aid you.",
+      "success": "And so, another cycle ends.  You have done well.  I will now bestow my mark upon you, so that others may know the path you walk and aid you.",
       "success_lie": "So you say, but the song sings otherwise.",
       "failure": "Then you shall try again, until you hear."
     }
@@ -241,12 +241,12 @@
     "type": "talk_topic",
     "dynamic_line": {
       "has_no_available_mission": {
-        "has_no_assigned_mission": "The song is… quiet for now. Perhaps with time, more notes will be etched in the bones of this world.",
+        "has_no_assigned_mission": "The song is… quiet for now.  Perhaps with time, more notes will be etched in the bones of this world.",
         "no": { "has_many_assigned_missions": "An acolyte should not take on too many songs at once.", "no": "That is all for now." }
       },
       "no": {
         "has_many_available_missions": {
-          "has_no_assigned_mission": "There are bones to etch, songs to sing. Wish to join me?",
+          "has_no_assigned_mission": "There are bones to etch, songs to sing.  Wish to join me?",
           "no": {
             "has_many_assigned_missions": "Do you wish to take on more songs?",
             "no": "Do you believe you can take on the burden of additional bones?"

data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json

@@ -286,7 +286,7 @@
       "inquire": "How is the search going?",
       "success": "Thanks.  Here's a small reward to show my appreciation for your help.",
       "success_lie": "What good does this do us?",
-      "failure": "I wonder if the wildlife ate all the greens..."
+      "failure": "I wonder if the wildlife ate all the greens…"
     }
   },
   {

data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json

@@ -211,7 +211,7 @@
       "inquire": "Do you have the stone?",
       "success": "I appreciate it, this will make Luke happy.",
       "success_lie": "What good does this do us?",
-      "failure": "It was a lost cause anyways..."
+      "failure": "It was a lost cause anyways…"
     },
     "end": {
       "opinion": { "trust": 1, "value": 1 },
@@ -255,9 +255,9 @@
       "rejected": "Oh well.  I'll try to find time to get it myself, thanks.",
       "advice": "You can find it along river banks, or maybe landscaping supplies and hardware stores.",
       "inquire": "How is the search going?",
-      "success": "Thanks, now Luke can get started. Here's a token of my thanks.",
+      "success": "Thanks, now Luke can get started.  Here's a token of my thanks.",
       "success_lie": "What good does this do us?",
-      "failure": "I wonder where all the sand went..."
+      "failure": "I wonder where all the sand went…"
     }
   },
   {
@@ -289,7 +289,7 @@
       "inquire": "How is the search going?",
       "success": "Thanks, now Luke can get started making jugs, We'd like to give you a cow, Here's Daisy, take good care of her and she'll provide you with milk.",
       "success_lie": "What good does this do us?",
-      "failure": "I wonder where all the sand went..."
+      "failure": "I wonder where all the sand went…"
     }
   }
 ]

data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json

@@ -327,7 +327,7 @@
       "inquire": "How is the search going?",
       "success": "Wow, perfect.  Thanks.  Here's your reward.",
       "success_lie": "What good does this do us?",
-      "failure": "I wonder where all the jars went..."
+      "failure": "I wonder where all the jars went…"
     }
   },
   {
@@ -359,7 +359,7 @@
       "inquire": "How is the search going?",
       "success": "Wow, perfect.  Thanks.  Here's your reward.",
       "success_lie": "What good does this do us?",
-      "failure": "I wonder where all the seeds went..."
+      "failure": "I wonder where all the seeds went…"
     }
   }
 ]

data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json

@@ -202,9 +202,9 @@
       "rejected": "Thanks anyway, we will try some traps.",
       "advice": "A gun will probably help.",
       "inquire": "Did you kill it?",
-      "success": "I appreciate it, I've got this old saddle I want you to have. I'll be happy to put a horse under it if you want to do some more heroics.",
+      "success": "I appreciate it, I've got this old saddle I want you to have.  I'll be happy to put a horse under it if you want to do some more heroics.",
       "success_lie": "Show me the bodies.",
-      "failure": "It was a lost cause anyways..."
+      "failure": "It was a lost cause anyways…"
     },
     "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "riding_saddle", "count": 1 } ] }
   },
@@ -228,9 +228,9 @@
       "rejected": "Thanks anyway, we will try some traps.",
       "advice": "A gun will probably help.",
       "inquire": "Did you kill it?",
-      "success": "I appreciate it, I've got this old saddle I want you to have. I'll be happy to put a horse under it if you want to do some more heroics.",
+      "success": "I appreciate it, I've got this old saddle I want you to have.  I'll be happy to put a horse under it if you want to do some more heroics.",
       "success_lie": "Show me the bodies.",
-      "failure": "It was a lost cause anyways..."
+      "failure": "It was a lost cause anyways…"
     },
     "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "riding_saddle", "count": 1 } ] }
   },
@@ -254,9 +254,9 @@
       "rejected": "Thanks anyway, we will try some traps.",
       "advice": "A gun will probably help.",
       "inquire": "Did you kill it?",
-      "success": "I appreciate it, this will help keep our animals safe. This is, Steve, he's a good, steady horse.  You should talk to Carlos about some armor for him.",
+      "success": "I appreciate it, this will help keep our animals safe.  This is, Steve, he's a good, steady horse.  You should talk to Carlos about some armor for him.",
       "success_lie": "Show me the bodies.",
-      "failure": "It was a lost cause anyways..."
+      "failure": "It was a lost cause anyways…"
     },
     "end": {
       "opinion": { "trust": 1, "value": 1 },

data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json

@@ -171,8 +171,8 @@
       "advice": "A library, bookstore or a glass blower's studio should have one.",
       "inquire": "Do you have the book?",
       "success": "I appreciate it, this will make my life so much easier.",
-      "success_lie": "I don't see a book...?",
-      "failure": "At least you escaped with your life..."
+      "success_lie": "I don't see a book…?",
+      "failure": "At least you escaped with your life…"
     }
   },
   {
@@ -197,8 +197,8 @@
       "advice": "A library, bookstore should have one, schools are another good idea.",
       "inquire": "Do you have the book?",
       "success": "I appreciate it, this will make my life so much easier.",
-      "success_lie": "I don't see a book...?",
-      "failure": "At least you escaped with your life..."
+      "success_lie": "I don't see a book…?",
+      "failure": "At least you escaped with your life…"
     }
   }
 ]