Merge pull request #9 from CleverRaven/master

Update
CleverRaven · Jun 17, 2018 · b51f97c · b51f97c
2 parents 19483da + ff6b4af
commit b51f97c
Show file tree

Hide file tree

Showing 43 changed files with 1,157 additions and 352 deletions.
diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -742,7 +742,7 @@
     },
     {
         "type" : "item_action",
-        "id" : "FEEDCATTLE",
+        "id" : "CATTLEFODDER",
         "name" : "Place"
     },
     {

diff --git a/data/json/items/tools.json b/data/json/items/tools.json
@@ -8301,7 +8301,7 @@
     "material": "veggy",
     "symbol": ";",
     "color": "brown",
-    "use_action": "FEEDCATTLE"
+    "use_action": "CATTLEFODDER"
   },
   {
     "id": "link_sheet",

diff --git a/data/json/items/vehicle_parts.json b/data/json/items/vehicle_parts.json
@@ -68,32 +68,50 @@
         "id" : "basket",
         "name" : "wire basket",
         "description" : "A large wire basket from a shopping cart.",
-        "weight" : 3000,
+        "weight" : 6000,
         "to_hit" : -5,
         "color" : "cyan",
         "symbol" : "]",
         "material" : ["steel"],
         "techniques" : ["DEF_DISARM"],
-        "volume" : 60,
+        "volume" : 90,
         "bashing" : 20,
         "category" : "veh_parts",
-        "price" : 5500
-    },{
+        "price" : 10000
+    },
+    {
         "type":"GENERIC",
         "id" : "folding_basket",
         "name" : "folding wire basket",
         "description" : "A large wire basket from a shopping cart, modified to be foldable.",
-        "weight" : 4000,
+        "weight" : 7000,
         "to_hit" : -5,
         "color" : "cyan",
         "symbol" : "]",
         "material" : ["steel"],
         "techniques" : ["DEF_DISARM"],
-        "volume" : 60,
+        "volume" : 90,
         "bashing" : 20,
         "category" : "veh_parts",
-        "price" : 5500
-    },{
+        "price" : 10000
+    },
+    {
+        "type":"GENERIC",
+        "id" : "bike_basket",
+        "name" : "bike basket",
+        "description" : "A simple bike basket. It is small and foldable.",
+        "weight" : 1200,
+        "to_hit" : -5,
+        "color" : "cyan",
+        "symbol" : "]",
+        "material" : ["steel"],
+        "techniques" : ["DEF_DISARM"],
+        "volume" : 20,
+        "bashing" : 20,
+        "category" : "veh_parts",
+        "price" : 3500
+    },
+    {
         "type":"GENERIC",
         "id" : "frame_wood",
         "name" : "wooden frame",

diff --git a/data/json/monsters.json b/data/json/monsters.json
@@ -1289,7 +1289,7 @@
     "melee_cut": 6,
     "dodge": 2,
     "armor_bash": 2,
-    "starting_ammo": { "milk": 4 },
+    "starting_ammo": { "milk": 10 },
     "path_settings": { "max_dist": 10 },
     "anger_triggers": [ "HURT" ],
     "fear_triggers": [ "PLAYER_CLOSE" ],
@@ -1301,7 +1301,7 @@
     },
     "death_function": [ "NORMAL" ],
     "harvest": "animal_large",
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "MILKABLE", "PET_WONT_FOLLOW" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "CATTLEFODDER", "MILKABLE", "PET_WONT_FOLLOW", "BONES", "FAT", "LEATHER" ]
   },
   {
     "id": "mon_coyote",
@@ -2867,7 +2867,7 @@
     "placate_triggers": [ "PLAYER_WEAK" ],
     "death_function": [ "NORMAL" ],
     "harvest": "animal_large",
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "CATTLEFODDER", "PET_WONT_FOLLOW", "PATH_AVOID_DANGER_1", "WARM", "BONES", "FAT", "LEATHER" ]
   },
   {
     "id": "mon_human_snail",
@@ -3888,11 +3888,12 @@
     "melee_dice_sides": 6,
     "melee_cut": 2,
     "dodge": 2,
+    "starting_ammo": { "milk": 2 },
     "anger_triggers": [],
     "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ],
     "placate_triggers": [ "PLAYER_WEAK" ],
     "death_function": [ "NORMAL" ],
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "WOOL", "BONES", "FAT" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "WOOL", "BONES", "FAT", "CATTLEFODDER", "MILKABLE", "PET_WONT_FOLLOW" ]
   },
   {
     "id": "mon_shia",

diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
@@ -1148,27 +1148,38 @@
     "category": "CC_OTHER",
     "subcategory": "CSC_OTHER_PARTS",
     "skill_used": "fabrication",
-    "difficulty": 1,
-    "time": 8000,
+    "difficulty": 2,
+    "time": 50000,
     "reversible": true,
     "autolearn": true,
-    "qualities": [ { "id": "GLARE", "level": 2 } ],
-    "tools": [ [ [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ], [ "oxy_torch", 10 ] ] ],
-    "components": [ [ [ "wire", 6 ] ] ]
+    "using": [ [ "welding_standard", 5 ], [ "cutting_wire_standard", 1 ] ],
+    "components": [ [ [ "wire", 40 ] ] ]
   },
   {
     "type": "recipe",
     "result": "folding_basket",
     "category": "CC_OTHER",
     "subcategory": "CSC_OTHER_PARTS",
     "skill_used": "fabrication",
+    "difficulty": 2,
+    "time": 60000,
+    "reversible": true,
+    "autolearn": true,
+    "using": [ [ "welding_standard", 5 ], [ "cutting_wire_standard", 1 ] ],
+    "components": [ [ [ "wire", 40 ], [ "basket", 1 ] ], [ [ "scrap", 8 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "bike_basket",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_PARTS",
+    "skill_used": "fabrication",
     "difficulty": 1,
-    "time": 8000,
+    "time": 35000,
     "reversible": true,
     "autolearn": true,
-    "qualities": [ { "id": "GLARE", "level": 2 } ],
-    "tools": [ [ [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ], [ "oxy_torch", 10 ] ] ],
-    "components": [ [ [ "wire", 6 ], [ "basket", 1 ] ], [ [ "scrap", 8 ] ] ]
+    "using": [ [ "welding_standard", 2 ], [ "cutting_wire_standard", 1 ] ],
+    "components": [ [ [ "wire", 8 ] ] ]
   },
   {
     "type": "recipe",

diff --git a/data/json/requirements/toolsets.json b/data/json/requirements/toolsets.json
@@ -40,5 +40,11 @@
     "type": "requirement",
     "//": "Soldering metal items",
     "tools": [ [ [ "soldering_iron", 1 ], [ "toolset", 1 ] ] ]
+  },
+  {
+    "id": "cutting_wire_standard",
+    "type": "requirement",
+    "//": "Cutting wires",
+    "tools": [ [ [ "hacksaw", -1 ], [ "multitool", -1 ], [ "boltcutters", -1 ], [ "toolset", -1 ] ] ]
   }
 ]
diff --git a/data/json/terrain.json b/data/json/terrain.json
@@ -43,7 +43,10 @@
             "sound": "crash!",
             "sound_fail": "bash!",
             "ter_set": "t_null",
-            "items": [ { "item": "rock", "count": [6, 10] } ]
+            "items": [
+                { "item": "rock", "count": [5, 8] },
+                { "item": "brick", "count": [1, 3] }
+            ]
         }
     },{
         "type" : "terrain",
@@ -61,7 +64,8 @@
             "sound_fail": "bash!",
             "ter_set": "t_null",
             "items": [
-                { "item": "rock", "count": [10, 20] }
+                { "item": "rock", "count": [8, 15] },
+                { "item": "brick", "count": [2, 6] }
             ]
         }
     },{

diff --git a/data/json/vehicle_parts.json b/data/json/vehicle_parts.json
@@ -776,12 +776,16 @@
     "broken_color": "brown",
     "damage_modifier": 60,
     "durability": 75,
-    "folded_volume": 4,
-    "size": 60,
-    "item": "wire",
+    "folded_volume": 6,
+    "size": 80,
+    "item": "bike_basket",
     "difficulty": 1,
     "location": "center",
-    "flags": [ "CARGO", "TOOL_SCREWDRIVER", "BOARDABLE", "FOLDABLE" ]
+    "flags": [ "CARGO", "TOOL_SCREWDRIVER", "BOARDABLE", "FOLDABLE" ],
+    "requirements": {
+      "install": { "time": 15000, "skills": [ [ "mechanics", 1 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ] },
+      "repair": { "skills": [ [ "mechanics", 1 ], [ "fabrication", 1 ] ], "time": 25000, "using": [ [ "welding_standard", 1 ] ] },
+      "removal": { "skills": [ [ "mechanics", 1 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ] } }
   },
   {
     "type": "vehicle_part",
@@ -793,11 +797,15 @@
     "broken_color": "brown",
     "damage_modifier": 60,
     "durability": 75,
-    "size": 200,
+    "size": 600,
     "item": "basket",
     "difficulty": 1,
     "location": "center",
-    "flags": [ "CARGO", "OBSTACLE" ]
+    "flags": [ "CARGO", "OBSTACLE" ],
+    "requirements": {
+      "install": { "time": 45000, "skills": [ [ "mechanics", 1 ] ], "using": [ [ "welding_standard", 2 ] ] },
+      "repair": { "skills": [ [ "mechanics", 1 ], [ "fabrication", 2 ] ], "time": 35000, "using": [ [ "welding_standard", 2 ] ] },
+      "removal": { "skills": [ [ "mechanics", 1 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ] } }
   },
   {
     "type": "vehicle_part",
@@ -809,12 +817,16 @@
     "broken_color": "brown",
     "damage_modifier": 60,
     "durability": 75,
-    "size": 200,
+    "size": 600,
+    "folded_volume": 24,
     "item": "folding_basket",
     "difficulty": 1,
     "location": "center",
     "flags": [ "CARGO", "OBSTACLE", "FOLDABLE" ],
-    "folded_volume": 12
+    "requirements": {
+      "install": { "time": 45000, "skills": [ [ "mechanics", 1 ] ], "using": [ [ "welding_standard", 2 ] ] },
+      "repair": { "skills": [ [ "mechanics", 1 ], [ "fabrication", 2 ] ], "time": 35000, "using": [ [ "welding_standard", 2 ] ] },
+      "removal": { "skills": [ [ "mechanics", 1 ] ], "qualities": [ { "id": "SAW_M", "level": 1 } ] } }
   },
   {
     "type": "vehicle_part",

diff --git a/doc/JSON_FLAGS.md b/doc/JSON_FLAGS.md
@@ -219,6 +219,7 @@ Flags used to describe monsters and define their properties and abilities.
 - ```BORES``` Tunnels through just about anything (15x bash multiplier: dark wyrms' bash skill 12->180)
 - ```CAN_DIG``` Can dig _and_ walk.
 - ```CATFOOD``` Becomes friendly / tamed with cat food.
+- ```CATTLEFODDER``` Becomes friendly / tamed with cattle fodder.
 - ```CBM_CIV``` May produce a common CBM a power CBM when butchered.
 - ```CBM_OP``` May produce a CBM or two from 'bionics_op' item group when butchered.
 - ```CBM_POWER``` May produce a power CBM when butchered, independent of CBM.
@@ -255,6 +256,7 @@ Flags used to describe monsters and define their properties and abilities.
 - ```KEENNOSE``` Keen sense of smell.
 - ```LARVA``` Creature is a larva. Currently used for gib and blood handling.
 - ```LEATHER``` May produce leather when butchered.
+- ```MILKABLE``` Produces milk when milked.
 - ```NIGHT_INVISIBILITY``` Monster becomes invisible if it's more than one tile away and the lighting on its tile is LL_LOW or less. Visibility is not affected by night vision.
 - ```NOHEAD``` Headshots not allowed!
 - ```NOGIB``` Does not leave gibs / meat chunks when killed with huge damage.
@@ -752,6 +754,7 @@ Some armor flags, such as `WATCH` and `ALARMCLOCK` are compatible with other ite
 - ```BLECH``` Causes vomiting.
 - ```CAFF``` Reduces fatigue.
 - ```CATFOOD``` Makes a cat friendly.
+- ```CATTLEFODDER``` Makes a large herbivore friendly.
 - ```CHEW``` Displays message "You chew your %s", but otherwise does nothing.
 - ```CIG``` Alleviates nicotine cravings. Adds disease `cig`.
 - ```COKE``` Decreases hunger. Adds disease `high`.