Merge pull request cataclysmbnteam#2 from Rod995/Long-Rods

Long Stick
Coolthulhu · Jun 20, 2018 · ca2679d · ca2679d
2 parents 9acc2fa + be7f685
commit ca2679d
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 30 deletions.
diff --git a/data/json/items/melee.json b/data/json/items/melee.json
@@ -29,6 +29,20 @@
         "bashing": 14,
         "to_hit": -2
     },
+    {
+        "type":"GENERIC",
+        "id": "stick_long",
+        "symbol": "/",
+        "color": "brown",
+        "name": "long stick",
+        "description": "A long stick.  Makes a decent melee weapon, and can be broken into heavy sticks for crafting.",
+        "material": "wood",
+        "flags": "TRADER_AVOID",
+        "weight": 3400,
+        "volume": 10,
+        "bashing": 18,
+        "to_hit": -1
+    },
     {
         "type":"GENERIC",
         "id": "spear_rebar",

diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -2102,6 +2102,13 @@
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
     "components": [ [ [ "scrap", 7 ] ] ]
   },
+  {
+    "result": "stick_long",
+    "type": "uncraft",
+    "time": 1000,
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "stick", 2] ] ]
+  },
   {
     "result": "straw_basket",
     "type": "uncraft",

diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json
@@ -163,7 +163,7 @@
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "tools": [ [ [ "fire", -1 ] ] ],
     "components": [
-      [ [ "stick", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ], [ "pointy_stick", 1 ] ],
+      [ [ "stick_long", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ], [ "pointy_stick", 1 ] ],
       [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ],
       [ [ "duct_tape", 20 ], [ "filament", 20, "LIST" ] ]
     ]
@@ -181,7 +181,7 @@
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [
-      [ [ "stick", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ], [ "pointy_stick", 1 ] ],
+      [ [ "stick_long", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ], [ "pointy_stick", 1 ] ],
       [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ],
       [ [ "duct_tape", 20 ], [ "cordage_short", 1, "LIST" ], [ "filament", 20, "LIST" ] ],
       [ [ "scrap_copper", 3 ], [ "copper", 300 ] ]
@@ -201,7 +201,7 @@
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
     "//": "Extra duct tape/string needed to attach the spikes; rag/leather for grip.",
     "components": [
-      [ [ "stick", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ] ],
+      [ [ "stick_long", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ] ],
       [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ],
       [ [ "cordage", 2, "LIST" ], [ "duct_tape", 75 ] ],
       [ [ "spike", 3 ] ]
@@ -250,7 +250,7 @@
     "reversible": true,
     "autolearn": true,
     "components": [
-      [ [ "stick", 1 ], [ "2x4", 1 ], [ "broom", 1 ] ],
+      [ [ "stick_long", 1 ], [ "2x4", 1 ], [ "broom", 1 ] ],
       [ [ "spike", 1 ] ],
       [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ],
       [ [ "cordage", 1, "LIST" ], [ "duct_tape", 50 ] ]

diff --git a/data/json/terrain.json b/data/json/terrain.json
@@ -3078,7 +3078,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3097,7 +3097,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3116,7 +3116,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                 { "item": "stick", "count": [0, 5] }
+                 { "item": "stick_long", "count": [0, 5] }
             ]
         }
     },{
@@ -3139,7 +3139,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3160,7 +3160,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3184,7 +3184,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3205,7 +3205,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3229,7 +3229,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3250,7 +3250,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3274,7 +3274,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3295,7 +3295,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3319,7 +3319,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3340,7 +3340,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3364,7 +3364,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3385,7 +3385,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3409,7 +3409,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3428,7 +3428,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3452,7 +3452,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3471,7 +3471,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3494,7 +3494,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3512,7 +3512,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3531,7 +3531,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3550,7 +3550,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3573,7 +3573,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3593,7 +3593,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }
@@ -3611,7 +3611,7 @@
             "sound_fail": "whack!",
             "ter_set": "t_dirt",
             "items": [
-                { "item": "stick", "count": [3, 10] },
+                { "item": "stick_long", "count": [3, 10] },
                 { "item": "splinter", "count": [10, 25] }
             ]
         }

diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp
@@ -2148,6 +2148,7 @@ void activity_handlers::chop_logs_finish( player_activity *act, player *p ) {
 
     g->m.ter_set( pos, t_dirt );
     g->m.spawn_item( pos.x, pos.y, "log", rng( 2, 3 ), 0, calendar::turn );
+    g->m.spawn_item( pos.x, pos.y, "stick_long", rng( 0, 1 ), 0, calendar::turn );
 
     p->mod_hunger( 5 );
     p->mod_thirst( 5 );