Merge load of bugfixes, warning cleanups, and distracting monsters wi…

…th loud noises.
utunnels · Aug 13, 2013 · 881bf58 · 881bf58
5 parents 85048a3 + 7e95eb0 + b7d841f + c9ae998 + ea9c5ee
commit 881bf58
Show file tree

Hide file tree

Showing 29 changed files with 653 additions and 174 deletions.
diff --git a/bionics.cpp b/bionics.cpp
@@ -206,7 +206,7 @@ void player::activate_bionic(int b, game *g)
 // Not-on units, or those with zero charge, have to pay the power cost
   if (bionics[bio.id]->charge_time > 0) {
    my_bionics[b].powered = true;
-   my_bionics[b].charge = bionics[bio.id]->charge_time;
+   my_bionics[b].charge = bionics[bio.id]->charge_time - 1;
   }
   power_level -= power_cost;
  }

diff --git a/building_generation.cpp b/building_generation.cpp
@@ -129,19 +129,28 @@ void mapgen_crater(map *m, mapgendata dat)
 
 void mapgen_field(map *m, int turn)
 {
+    // There's a chance this field will be thick with strawberry
+    // and blueberry bushes.
+    int berry_bush_factor = 200;
+    int bush_factor = 120;
+    if(one_in(120)) {
+        berry_bush_factor = 2;
+        bush_factor = 40;
+    }
+
     for (int i = 0; i < SEEX * 2; i++)
     {
         for (int j = 0; j < SEEY * 2; j++)
         {
             m->ter_set(i, j, grass_or_dirt());
-            if (one_in(120))
+            if (one_in(bush_factor))
             {
-                if (one_in(30))
+                if (one_in(berry_bush_factor))
                 {
                     m->ter_set(i, j, t_shrub_blueberry);
                 }
                 else
-                if (one_in(30))
+                if (one_in(berry_bush_factor))
                 {
                     m->ter_set(i, j, t_shrub_strawberry);
                 }

diff --git a/data/raw/item_groups.json b/data/raw/item_groups.json
@@ -99,6 +99,7 @@
       ["matches", 60],
       ["extinguisher", 20],
       ["mp3", 18],
+      ["portable_game", 8],
       ["usb_drive", 5],
       ["beer", 60],
       ["cell_phone", 50],
@@ -224,10 +225,10 @@
       ["manual_mechanics", 35],
       ["hammer", 35],
       ["flashlight", 40],
-      ["soldering_iron", 70],
+      ["soldering_iron", 30],
       ["bubblewrap", 50],
       ["binoculars", 20],
-      ["duct_tape", 60],
+      ["duct_tape", 70],
       ["lawnmower", 25],
       ["foot_crank", 10],
       ["boltcutters", 5],
@@ -284,6 +285,7 @@
       ["radio", 20],
       ["syringe", 8],
       ["mp3", 18],
+      ["portable_game", 8],
       ["usb_drive", 5],
       ["firecracker_pack", 5],
       ["firecracker", 5],
@@ -510,6 +512,7 @@
       ["extinguisher", 20],
       ["tazer", 3],
       ["mp3", 18],
+      ["portable_game", 8],
       ["roadmap", 40],
       ["money_bundle", 55]
     ]
@@ -726,6 +729,7 @@
       ["processor", 15],
       ["RAM", 22],
       ["mp3", 18],
+      ["portable_game", 12],
       ["flashlight", 40],
       ["radio", 20],
       ["hotplate", 10],
@@ -1469,6 +1473,7 @@
       ["scalpel", 48],
       ["syringe", 8],
       ["gloves_medical", 70],
+      ["stethoscope", 30],
       ["mask_dust", 65],
       ["vacutainer", 10],
       ["rag_bloody", 1],
@@ -1541,6 +1546,7 @@
       ["matches", 60],
       ["extinguisher", 20],
       ["mp3", 18],
+      ["portable_game", 8],
       ["umbrella", 5]
     ]
   },
@@ -1663,6 +1669,7 @@
       ["UPS_off", 5],
       ["tazer", 3],
       ["mp3", 18],
+      ["portable_game", 8],
       ["fur", 0],
       ["leather", 0],
       ["string_36", 40],

diff --git a/data/raw/items/archery.json b/data/raw/items/archery.json
@@ -736,7 +736,7 @@
       "bashing" : 4,
       "cutting" : 0,
       "to_hit" : -0,
-      "ranged_damage" : -6,
+      "ranged_damage" : 7,
       "range" : 6,
       "dispersion" : 12,
       "recoil" : 0,
@@ -763,7 +763,7 @@
       "bashing" : 11,
       "cutting" : 0,
       "to_hit" : 1,
-      "ranged_damage" : 0,
+      "ranged_damage" : 13,
       "range" : 10,
       "dispersion" : 10,
       "recoil" : 0,
@@ -817,7 +817,7 @@
       "bashing" : 13,
       "cutting" : 0,
       "to_hit" : -1,
-      "ranged_damage" : -2,
+      "ranged_damage" : 10,
       "range" : 8,
       "dispersion" : 22,
       "recoil" : 15,

diff --git a/data/raw/items/comestibles.json b/data/raw/items/comestibles.json
@@ -418,7 +418,7 @@
         "charges" : 1,
         "rarity" : 15,
         "bashing" : 0,
-        "flags" : ["EATEN_HOT"],
+        "flags" : ["EATEN_HOT", "USE_EAT_VERB"],
         "fun" : 2
     },
     {
@@ -449,7 +449,7 @@
         "charges" : 1,
         "rarity" : 15,
         "bashing" : 0,
-        "flags" : ["EATEN_HOT"],
+        "flags" : ["EATEN_HOT", "USE_EAT_VERB"],
         "fun" : 2
     },
     {
@@ -480,7 +480,7 @@
         "charges" : 1,
         "rarity" : 15,
         "bashing" : 0,
-        "flags" : ["EATEN_HOT"],
+        "flags" : ["EATEN_HOT", "USE_EAT_VERB"],
         "fun" : 1
     },
     {
@@ -511,7 +511,7 @@
         "charges" : 1,
         "rarity" : 15,
         "bashing" : 0,
-        "flags" : ["EATEN_HOT"],
+        "flags" : ["EATEN_HOT", "USE_EAT_VERB"],
         "fun" : 2
     },
     {
@@ -5331,5 +5331,129 @@
         "rarity" : 8,
         "bashing" : 0,
         "fun" : -40
+    },
+    {
+        "type" : "COMESTIBLE",
+        "id" : "strawberries_cooked",
+        "name" : "cooked strawberries",
+        "weight" : 100,
+        "color" : "red",
+        "addiction_type" : "none",
+        "spoils_in" : 3,
+        "use_action" : "NONE",
+        "stim" : -24,
+        "container" : "jar_3l_glass",
+        "to_hit" : 0,
+        "comestible_type" : "DRINK",
+        "symbol" : "~",
+        "quench" : 0,
+        "heal" : 0,
+        "addiction_potential" : 0,
+        "nutrition" : 18,
+        "description" : "It's like strawberry jam, only without sugar.",
+        "price" : 10,
+        "material" : "null",
+        "tool" : "null",
+        "volume" : 1,
+        "cutting" : 0,
+        "phase" : "liquid",
+        "charges" : 1,
+        "rarity" : 8,
+        "bashing" : 0,
+        "fun" : -2,
+        "flags" : ["USE_EAT_VERB"]
+    },
+    {
+        "type" : "COMESTIBLE",
+        "id" : "blueberries_cooked",
+        "name" : "cooked blueberries",
+        "weight" : 100,
+        "color" : "blue",
+        "addiction_type" : "none",
+        "spoils_in" : 3,
+        "use_action" : "NONE",
+        "stim" : -24,
+        "container" : "jar_3l_glass",
+        "to_hit" : 0,
+        "comestible_type" : "DRINK",
+        "symbol" : "~",
+        "quench" : 0,
+        "heal" : 0,
+        "addiction_potential" : 0,
+        "nutrition" : 18,
+        "description" : "It's like blueberry jam, only without sugar.",
+        "price" : 10,
+        "material" : "null",
+        "tool" : "null",
+        "volume" : 1,
+        "cutting" : 0,
+        "phase" : "liquid",
+        "charges" : 1,
+        "rarity" : 8,
+        "bashing" : 0,
+        "fun" : -2,
+        "flags" : ["USE_EAT_VERB"]
+    },
+    {
+        "type" : "COMESTIBLE",
+        "id" : "jam_strawberries",
+        "name" : "strawberry jam",
+        "weight" : 150,
+        "color" : "blue",
+        "addiction_type" : "none",
+        "spoils_in" : 30,
+        "use_action" : "NONE",
+        "stim" : -24,
+        "container" : "jar_3l_glass",
+        "to_hit" : 0,
+        "comestible_type" : "DRINK",
+        "symbol" : "~",
+        "quench" : 0,
+        "heal" : 0,
+        "addiction_potential" : 0,
+        "nutrition" : 30,
+        "description" : "Fresh strawberries, cooked with sugar to make them last longer.",
+        "price" : 10,
+        "material" : "null",
+        "tool" : "null",
+        "volume" : 1,
+        "cutting" : 0,
+        "phase" : "liquid",
+        "charges" : 1,
+        "rarity" : 8,
+        "bashing" : 0,
+        "fun" : 10,
+        "flags" : ["USE_EAT_VERB"]
+    },
+    {
+        "type" : "COMESTIBLE",
+        "id" : "jam_blueberries",
+        "name" : "blueberry jam",
+        "weight" : 150,
+        "color" : "blue",
+        "addiction_type" : "none",
+        "spoils_in" : 30,
+        "use_action" : "NONE",
+        "stim" : -24,
+        "container" : "jar_3l_glass",
+        "to_hit" : 0,
+        "comestible_type" : "DRINK",
+        "symbol" : "~",
+        "quench" : 0,
+        "heal" : 0,
+        "addiction_potential" : 0,
+        "nutrition" : 30,
+        "description" : "Fresh blueberries, cooked with sugar to make them last longer.",
+        "price" : 10,
+        "material" : "null",
+        "tool" : "null",
+        "volume" : 1,
+        "cutting" : 0,
+        "phase" : "liquid",
+        "charges" : 1,
+        "rarity" : 8,
+        "bashing" : 0,
+        "fun" : 10,
+        "flags" : ["USE_EAT_VERB"]
     }
 ]
diff --git a/data/raw/items/melee.json b/data/raw/items/melee.json
@@ -271,6 +271,22 @@
     "to_hit": -1
   },
 
+  {
+    "id": "small_lcd_screen",
+    "symbol": ",",
+    "color": "light_cyan",
+    "name": "small LCD screen",
+    "description": "A small backlit screen, used for displaying images. Useful in some electronics recipes.",
+    "rarity": 2,
+    "price": 340,
+    "material": "plastic",
+    "weight": 500,
+    "volume": 1,
+    "bashing": -6,
+    "cutting": -2,
+    "to_hit": -4
+  },
+
   {
     "id": "lens",
     "symbol": ".",

diff --git a/data/raw/items/tools.json b/data/raw/items/tools.json
@@ -796,6 +796,29 @@
     "use_action": "DIG"
   },
 
+  {
+    "id": "stethoscope",
+    "type": "TOOL",
+    "symbol": "y",
+    "color": "red",
+    "name": "stethoscope",
+    "description": "A listening tool. Use it to listen to things. Closely.",
+    "rarity": 50,
+    "price": 100,
+    "material": ["plastic", "steel"],
+    "weight": 150,
+    "volume": 1,
+    "bashing": 0,
+    "cutting": 0,
+    "to_hit": 0,
+    "max_charges": 0,
+    "initial_charges": 0,
+    "charges_per_use": 0,
+    "turns_per_charge": 0,
+    "ammo": "NULL",
+    "revert_to": "null",
+    "use_action": "NONE"
+  },
 
     {
         "id" : "hose",
@@ -2169,6 +2192,30 @@
     "use_action": "MP3_ON"
   },
 
+  {
+     "id": "portable_game",
+     "type": "TOOL",
+     "symbol": ";",
+     "color": "light_blue",
+     "name": "handheld game system",
+     "description": "A portable games console in working condition, with a backlit screen allowing you to play in the dark. You can use it to play it for a little while, but this requires batteries.",
+     "rarity": 8,
+     "price": 3200,
+     "material": ["iron", "plastic"],
+     "weight": 200,
+     "volume": 2,
+     "bashing": 0,
+     "cutting": 0,
+     "to_hit": 0,
+     "max_charges": 200,
+     "initial_charges": 100,
+     "charges_per_use": 0,
+     "turns_per_charge": 0,
+     "ammo": "battery",
+     "revert_to": "null",
+     "use_action": "PORTABLE_GAME"
+  },
+
   {
     "id": "vortex_stone",
     "type": "TOOL",