Merge pull request #30 from CleverRaven/master

Fixed body window to show broken limb healing progress. (CleverRaven#…
fengjixuchui · Dec 30, 2019 · e081172 · e081172
2 parents 54a3a82 + 5b3dcd7
commit e081172
Show file tree

Hide file tree

Showing 74 changed files with 2,092 additions and 1,222 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -197,7 +197,7 @@ jobs:
       compiler: clang
       addons: &clang60
         apt:
-          packages: ["clang-6.0", "g++-multilib", "libc6-dbg", "g++-6", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
+          packages: ["clang-6.0", "g++-multilib", "libc6-dbg", "g++-6", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev", "libpulse-dev", "libpulse0=1:8.0-0ubuntu3.10", "libpulse-mainloop-glib0=1:8.0-0ubuntu3.10"]
           sources: [*apt_sources, llvm-toolchain-xenial-6.0]
 
     - env: CLANG=clang++-7

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -3236,5 +3236,16 @@
     "components": [ [ [ "log", 1 ] ] ],
     "pre_special": "check_empty",
     "post_terrain": "f_logstool"
+  },
+  {
+    "type": "construction",
+    "description": "Build Decorative Tree",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "20 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
+    "components": [ [ [ "stick", 4 ], [ "log", 1 ] ], [ [ "nail", 20 ] ], [ [ "pine_bough", 8 ] ] ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_decorative_tree"
   }
 ]
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -391,6 +391,12 @@
     "//": "Prevents the item from participating in the encumbrance system when worn.",
     "info": "It seems <info>partially intangible</info>, and can occupy the same space as other things when worn."
   },
+  {
+    "id": "SHEATH_AXE",
+    "type": "json_flag",
+    "context": [ "GENERIC", "TOOL" ],
+    "//": "This item can be stored in a sheath of the appropriate size."
+  },
   {
     "id": "SHEATH_KNIFE",
     "type": "json_flag",

diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json
@@ -205,5 +205,39 @@
         { "item": "pipe", "count": [ 0, 1 ] }
       ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_winter_wreath",
+    "name": "pine wreath",
+    "description": "A decorative wreath for the winter holidays.",
+    "symbol": "o",
+    "color": "light_green",
+    "move_cost_mod": -1,
+    "required_str": 10,
+    "flags": [ "PLACE_ITEM" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_decorative_tree",
+    "name": "decorative tree",
+    "description": "A decorative tree for the winter holidays.",
+    "symbol": "+",
+    "color": "light_green",
+    "looks_like": "t_tree_pine",
+    "move_cost_mod": -1,
+    "required_str": 10,
+    "flags": [ "BLOCKSDOOR", "PLACE_ITEM", "EASY_DECONSTRUCT" ],
+    "bash": {
+      "str_min": 20,
+      "str_max": 40,
+      "sound": "smash!",
+      "sound_fail": "thump.",
+      "items": [
+        { "item": "pine_bough", "count": [ 4, 6 ] },
+        { "item": "nail", "count": [ 5, 14 ] },
+        { "item": "stick", "count": [ 1, 3 ] }
+      ]
+    }
   }
 ]
diff --git a/data/json/itemgroups/monster_drops_advtech.json b/data/json/itemgroups/monster_drops_advtech.json
@@ -66,53 +66,6 @@
     "id": "molebot",
     "items": [ [ "spiked_plate", 15 ], [ "hard_plate", 30 ], [ "robot_controls", 5 ] ]
   },
-  {
-    "type": "item_group",
-    "id": "tripod",
-    "items": [
-      { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 },
-      [ "kevlar_plate", 10 ],
-      [ "ceramic_armor", 15 ],
-      [ "alloy_plate", 10 ],
-      [ "robot_controls", 3 ]
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "chickenbot",
-    "items": [
-      [ "robot_controls", 5 ],
-      [ "ai_module", 5 ],
-      [ "sensor_module", 5 ],
-      [ "memory_module", 5 ],
-      [ "pathfinding_module", 5 ],
-      [ "identification_module", 5 ],
-      [ "reverse_jointed_legs", 40 ],
-      [ "chickenbot_chassis", 40 ],
-      [ "targeting_module", 5 ],
-      [ "gun_module", 30 ],
-      [ "mark19", 5 ],
-      [ "tazer", 5 ],
-      [ "m249", 5 ],
-      [ "storage_battery", 5 ],
-      [ "plut_cell", 5 ],
-      [ "mil_plate", 2 ]
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "tankbot",
-    "items": [
-      [ "tazer", 3 ],
-      { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 },
-      [ "556", 8 ],
-      [ "alloy_plate", 10 ],
-      [ "kevlar_plate", 10 ],
-      [ "ceramic_armor", 10 ],
-      [ "hard_plate", 30 ],
-      [ "robot_controls", 5 ]
-    ]
-  },
   {
     "type": "item_group",
     "id": "turret",

diff --git a/data/json/itemgroups/obsolete.json b/data/json/itemgroups/obsolete.json
@@ -13,5 +13,52 @@
     "id": "elec_parts",
     "type": "item_group",
     "items": [ { "group": "supplies_electronics", "prob": 100 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "chickenbot",
+    "items": [
+      [ "robot_controls", 5 ],
+      [ "ai_module", 5 ],
+      [ "sensor_module", 5 ],
+      [ "memory_module", 5 ],
+      [ "pathfinding_module", 5 ],
+      [ "identification_module", 5 ],
+      [ "reverse_jointed_legs", 40 ],
+      [ "chickenbot_chassis", 40 ],
+      [ "targeting_module", 5 ],
+      [ "gun_module", 30 ],
+      [ "mark19", 5 ],
+      [ "tazer", 5 ],
+      [ "m249", 5 ],
+      [ "storage_battery", 5 ],
+      [ "plut_cell", 5 ],
+      [ "mil_plate", 2 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "tankbot",
+    "items": [
+      [ "tazer", 3 ],
+      { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 },
+      [ "556", 8 ],
+      [ "alloy_plate", 10 ],
+      [ "kevlar_plate", 10 ],
+      [ "ceramic_armor", 10 ],
+      [ "hard_plate", 30 ],
+      [ "robot_controls", 5 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "tripod",
+    "items": [
+      { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 },
+      [ "kevlar_plate", 10 ],
+      [ "ceramic_armor", 15 ],
+      [ "alloy_plate", 10 ],
+      [ "robot_controls", 3 ]
+    ]
   }
 ]
diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json
@@ -139,12 +139,9 @@
       [ "schematics_eyebot", 50 ],
       [ "schematics_secubot", 50 ],
       [ "schematics_skitterbot", 50 ],
-      [ "schematics_chickenbot", 5 ],
       [ "schematics_hazmatbot", 50 ],
       [ "schematics_riotbot", 50 ],
       [ "schematics_sciencebot", 10 ],
-      [ "schematics_tankbot", 5 ],
-      [ "schematics_tripod", 5 ],
       [ "schematics_molebot", 20 ],
       [ "schematics_dispatch", 25 ],
       [ "schematics_dispatch_military", 20 ],

diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -16,7 +16,8 @@
       [ "hand_drill", 20 ],
       [ "nailgun", 100 ],
       [ "chisel", 10 ],
-      [ "toolbox", 15 ]
+      [ "toolbox", 12 ],
+      [ "toolbox_workshop", 3 ]
     ]
   },
   {
@@ -30,7 +31,8 @@
       [ "elec_jackhammer", 40 ],
       [ "metal_smoother", 90 ],
       [ "jackhammer", 40 ],
-      [ "toolbox", 25 ],
+      [ "toolbox", 20 ],
+      [ "toolbox_workshop", 5 ],
       [ "recharge_station", 10 ],
       [ "angular_grinder", 30 ]
     ]
@@ -193,7 +195,8 @@
       { "group": "tools_common", "prob": 100 },
       { "group": "tools_lighting", "prob": 50 },
       { "group": "tools_tailor", "prob": 50 },
-      [ "toolbox", 5 ]
+      [ "toolbox", 4 ],
+      [ "toolbox_workshop", 1 ]
     ]
   },
   {

diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
@@ -792,7 +792,7 @@
     "range": 45,
     "dispersion": 50,
     "recoil": 350,
-    "effects": [ "COOKOFF", "TRAIL", "NEVER_MISFIRES", "FRAG" ]
+    "effects": [ "COOKOFF", "NEVER_MISFIRES", "FRAG" ]
   },
   {
     "type": "AMMO",

diff --git a/data/json/items/armor.json b/data/json/items/armor.json
@@ -745,6 +745,32 @@
     "material_thickness": 1,
     "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT" ]
   },
+  {
+    "id": "axe_ring",
+    "type": "ARMOR",
+    "name": "axe ring holster",
+    "description": "A combination of leather and a metal ring to hold an axe on your waist.",
+    "weight": "130 g",
+    "volume": "600 ml",
+    "price": 3000,
+    "material": [ "leather", "steel" ],
+    "symbol": "[",
+    "looks_like": "sheath",
+    "color": "brown",
+    "covers": [ "TORSO" ],
+    "coverage": 5,
+    "encumbrance": 2,
+    "material_thickness": 1,
+    "use_action": {
+      "type": "holster",
+      "holster_prompt": "Sheath axe",
+      "holster_msg": "You sheath your %s",
+      "max_volume": "3250 ml",
+      "draw_cost": 10,
+      "flags": [ "SHEATH_AXE" ]
+    },
+    "flags": [ "NONCONDUCTIVE", "WAIST", "OVERSIZE", "WATER_FRIENDLY" ]
+  },
   {
     "id": "b_shorts",
     "type": "ARMOR",

diff --git a/data/json/items/book/electronics.json b/data/json/items/book/electronics.json
@@ -270,13 +270,6 @@
     "description": "Assembly plans, design specs, and technical drawings for the skitterbot.  Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
     "copy-from": "schematics_generic"
   },
-  {
-    "id": "schematics_chickenbot",
-    "type": "BOOK",
-    "name": { "str": "chicken walker schematics", "str_pl": "chicken walker schematics" },
-    "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the chicken walker.  Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
-    "copy-from": "schematics_generic"
-  },
   {
     "id": "schematics_hazmatbot",
     "type": "BOOK",
@@ -305,20 +298,6 @@
     "description": "Assembly plans, design specs, and technical drawings for the lab defense bot.  Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
     "copy-from": "schematics_generic"
   },
-  {
-    "id": "schematics_tankbot",
-    "type": "BOOK",
-    "name": { "str": "tank drone schematics", "str_pl": "tank drone schematics" },
-    "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the tank drone.  Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
-    "copy-from": "schematics_generic"
-  },
-  {
-    "id": "schematics_tripod",
-    "type": "BOOK",
-    "name": { "str": "tripod schematics", "str_pl": "tripod schematics" },
-    "description": "Bearing the logo of Honda, those are assembly plans, design specs, and technical drawings for the tripod.  Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
-    "copy-from": "schematics_generic"
-  },
   {
     "id": "schematics_dispatch",
     "type": "BOOK",