Skip to content

Commit

Permalink
Merge pull request cataclysmbnteam#2 from CleverRaven/master
Browse files Browse the repository at this point in the history 
update to master
  • Loading branch information
@Noctifer-de-Mortem
Noctifer-de-Mortem authored Nov 3, 2017
2 parents cab917b + 12d9158 commit 06e525d
Show file tree
Hide file tree
Showing 37 changed files with 1,059 additions and 946 deletions.
6 changes: 6 additions & 0 deletions data/json/item_category.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@
"name": "SPARE PARTS",
"sort_rank": 8
},
{
"id": "artifacts",
"type": "ITEM_CATEGORY",
"name": "ARTIFACTS",
"sort_rank": 10
},
{
"id": "armor",
"type": "ITEM_CATEGORY",
Expand Down
227 changes: 0 additions & 227 deletions data/json/items/archery.json
View file
Original file line number Diff line number Diff line change
@@ -1,136 +1,4 @@
[
{
"type" : "AMMO",
"id" : "arrowhead",
"price" : 300,
"name" : "arrowhead",
"symbol" : "=",
"color" : "light_gray",
"description" : "Steel heads for an arrow. Placing these on arrows will make them more damaging and piercing.",
"material" : "steel",
"volume" : 1,
"weight" : 8,
"bashing" : 1,
"ammo_type" : "components",
"count" : 10,
"stack_size" : 20
},
{
"type" : "AMMO",
"id" : "shaft_wood",
"category" : "spare_parts",
"price" : 500,
"name" : "wooden arrow shaft",
"symbol" : "=",
"color" : "green",
"description" : "A crude shaft made from wood. It needs arrowheads and fletching to become a functional arrow.",
"material" : "wood",
"volume" : 1,
"weight" : 42,
"bashing" : 1,
"ammo_type" : "components",
"dispersion" : 510,
"count" : 10
},
{
"type" : "AMMO",
"id" : "shaft_wood_heavy",
"price" : 500,
"category" : "spare_parts",
"name" : "heavy wooden arrow shaft",
"symbol" : "=",
"color" : "green",
"description" : "A heavy shaft made from wood. It needs arrowheads and fletching to become a functional arrow.",
"material" : "wood",
"volume" : 1,
"weight" : 48,
"bashing" : 2,
"ammo_type" : "components",
"damage" : 2,
"range" : 1,
"dispersion" : 345,
"count" : 10
},
{
"type" : "AMMO",
"id" : "shaft_metal",
"price" : 1000,
"category" : "spare_parts",
"name" : "metal arrow shaft",
"symbol" : "=",
"color" : "green",
"description" : "A heavy shaft made from scrap metal. It needs arrowheads and fletching to become a functional arrow.",
"material" : "steel",
"volume" : 1,
"weight" : 54,
"bashing" : 3,
"ammo_type" : "components",
"damage" : 3,
"range" : 3,
"dispersion" : 360,
"count" : 10
},
{
"type" : "AMMO",
"id" : "arrow_fire_hardened",
"price" : 500,
"category" : "spare_parts",
"name" : "unfletched fire-hardened wooden arrow",
"symbol" : "=",
"color" : "green",
"description" : "A simple arrow shaft that has had a point carved into it and then fire-hardened. It needs fletching to be worth firing from a bow.",
"material" : "wood",
"volume" : 1,
"weight" : 42,
"bashing" : 2,
"ammo_type" : "components",
"damage" : 3,
"range" : 2,
"dispersion" : 435,
"count" : 10,
"effects" : ["RECOVER_5"]
},
{
"type" : "AMMO",
"id" : "arrow_field_point",
"price" : 700,
"category" : "spare_parts",
"name" : "unfletched field point wooden arrow",
"symbol" : "=",
"color" : "green",
"description" : "A simple arrow shaft that has a crude arrowhead. Useful for hunting small woodland creatures, but needs fletching before it is worth firing.",
"material" : "wood",
"volume" : 1,
"weight" : 44,
"bashing" : 3,
"ammo_type" : "components",
"damage" : 6,
"pierce" : 1,
"range" : 2,
"dispersion" : 435,
"count" : 10,
"effects" : ["RECOVER_5"]
},
{
"type" : "AMMO",
"id" : "arrow_small_game",
"price" : 600,
"category" : "spare_parts",
"name" : "unfletched small game arrow",
"symbol" : "=",
"color" : "green",
"description" : "A simple arrow shaft that has a wide blunt head. Useful for hunting small woodland creatures without splattering them all over the ground, but needs fletching before it is worth firing.",
"material" : "wood",
"volume" : 1,
"weight" : 44,
"bashing" : 4,
"ammo_type" : "components",
"damage" : 2,
"range" : 2,
"dispersion" : 435,
"count" : 10,
"effects" : [ "RECOVER_5", "NOGIB" ]
},
{
"type" : "AMMO",
"id" : "arrow_fire_hardened_fletched",
Expand Down Expand Up @@ -235,48 +103,6 @@
"count" : 10,
"effects" : ["RECOVER_10"]
},
{
"type" : "AMMO",
"id" : "arrow_heavy_fire_hardened",
"price" : 1000,
"category" : "spare_parts",
"name" : "unfletched heavy fire-hardened arrow",
"symbol" : "=",
"color" : "green",
"description" : "This arrow is significantly sturdier than other wooden arrows. It has a fire-hardened point, but needs fletching to be worth firing.",
"material" : "wood",
"volume" : 1,
"weight" : 49,
"bashing" : 4,
"ammo_type" : "components",
"damage" : 5,
"pierce" : 2,
"range" : 2,
"dispersion" : 375,
"count" : 10,
"effects" : ["RECOVER_10"]
},
{
"type" : "AMMO",
"id" : "arrow_heavy_field_point",
"price" : 1000,
"category" : "spare_parts",
"name" : "unfletched heavy field point arrow",
"symbol" : "=",
"color" : "green",
"description" : "This arrow is significantly sturdier than other wooden arrows. It has a field point tip, but needs fletching before it is worth firing.",
"material" : "wood",
"volume" : 1,
"weight" : 49,
"bashing" : 4,
"ammo_type" : "components",
"damage" : 6,
"pierce" : 3,
"range" : 2,
"dispersion" : 325,
"count" : 10,
"effects" : ["RECOVER_10"]
},
{
"type" : "AMMO",
"id" : "arrow_heavy_field_point_fletched",
Expand Down Expand Up @@ -319,27 +145,6 @@
"loudness": 0,
"count" : 10,
"effects" : ["RECOVER_10"]
},
{
"type" : "AMMO",
"id" : "arrow_metal_sharpened",
"price" : 1000,
"category" : "spare_parts",
"name" : "unfletched sharpened metal arrow",
"symbol" : "=",
"color" : "green",
"description" : "This metal shaft has been carefully sharpened so that it has a crude point at the end. It needs fletching to be worth firing from a bow.",
"material" : "steel",
"volume" : 1,
"weight" : 55,
"bashing" : 2,
"ammo_type" : "components",
"damage" : 5,
"pierce" : 3,
"range" : 5,
"dispersion" : 285,
"count" : 10,
"effects" : ["RECOVER_15"]
},
{
"type" : "AMMO",
Expand Down Expand Up @@ -700,38 +505,6 @@
"clip_size" : 1,
"reload" : 80,
"valid_mod_locations": [["underbarrel", 1],[ "sights", 1 ],[ "accessories", 2 ]]
},
{
"id":"shaft_plastic",
"type":"AMMO",
"symbol":"=",
"color":"green",
"name":"plastic shaft",
"description":"A crude shaft made from plastic. It needs arrowheads and fletching to become a functional arrow.",
"price": 100,
"category" : "spare_parts",
"material":"plastic",
"bashing":1,
"weight":6,
"volume":1,
"ammo_type":"components",
"dispersion":600,
"count":10
},
{
"id":"arrowhead_plastic",
"type":"AMMO",
"color":"green",
"symbol":"=",
"name":"plastic arrowhead",
"description":"Plastic heads for an arrow. Placing these on arrows will make them more damaging and piercing.",
"price": 100,
"material":"plastic",
"bashing":1,
"weight":1,
"volume":1,
"ammo_type":"components",
"count":10
},
{ "type" : "AMMO",
"id" : "throwing_knife",
Expand Down
60 changes: 60 additions & 0 deletions data/json/items/migration.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,64 @@
[
{
"id": "arrowhead",
"type": "MIGRATION",
"replace": "steel_chunk"
},
{
"id": "arrowhead_plastic",
"type": "MIGRATION",
"replace": "plastic_chunk"
},
{
"id": "shaft_wood",
"type": "MIGRATION",
"replace": "arrow_wood"
},
{
"id": "shaft_wood_heavy",
"type": "MIGRATION",
"replace": "arrow_wood_heavy"
},
{
"id": "shaft_metal",
"type": "MIGRATION",
"replace": "arrow_metal"
},
{
"id": "arrow_fire_hardened",
"type": "MIGRATION",
"replace": "arrow_fire_hardened_fletched"
},
{
"id": "arrow_field_point",
"type": "MIGRATION",
"replace": "arrow_field_point_fletched"
},
{
"id": "arrow_small_game",
"type": "MIGRATION",
"replace": "arrow_small_game_fletched"
},
{
"id": "arrow_heavy_fire_hardened",
"type": "MIGRATION",
"replace": "arrow_heavy_fire_hardened_fletched"
},
{
"id": "arrow_heavy_field_point",
"type": "MIGRATION",
"replace": "arrow_heavy_field_point_fletched"
},
{
"id": "arrow_metal_sharpened",
"type": "MIGRATION",
"replace": "arrow_metal_sharpened_fletched"
},
{
"id": "shaft_plastic",
"type": "MIGRATION",
"replace": "arrow_plastic"
},
{
"id": "40mm_acidbomb",
"type": "MIGRATION",
Expand Down
Loading

0 comments on commit 06e525d

Please sign in to comment.