Skip to content

Commit

Permalink
Rope and cordage overhaul (#35700)
Browse files Browse the repository at this point in the history
* Rope and cordage overhaul

* Add extra comments about weight/length
  • Loading branch information
Rail-Runner authored and ZhilkinSerg committed Dec 4, 2019
1 parent 9f74eae commit 172f04f
Show file tree
Hide file tree
Showing 19 changed files with 250 additions and 198 deletions.
71 changes: 49 additions & 22 deletions data/json/items/generic/string.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,28 @@
[
{
"id": "cordage_6",
"copy-from": "string_6",
"type": "GENERIC",
"name": "short cordage piece",
"description": "A 6-inch (or about 15 cm) long piece of natural cordage. Useful for some purposes, but not as strong or flexible as proper string.",
"proportional": { "price": 0.5 },
"material": "dry_plant"
},
{
"id": "cordage_36",
"copy-from": "string_36",
"type": "GENERIC",
"name": "long cordage piece",
"description": "A 3-foot (or about 90 cm) long piece of natural cordage. Useful for some purposes, but not as strong or flexible as proper string.",
"proportional": { "price": 0.5 },
"material": "dry_plant"
},
{
"id": "string_6",
"type": "GENERIC",
"category": "spare_parts",
"name": "small string",
"description": "A 6-inch long piece of cotton string.",
"name": "short string",
"description": "A 6-inch (or about 15 cm) long piece of cotton string.",
"weight": "6 g",
"volume": "10ml",
"price": 10,
Expand All @@ -18,54 +36,63 @@
"copy-from": "string_6",
"type": "GENERIC",
"name": "long string",
"description": "A 3-foot long piece of cotton string. Disassemble it to cut it into smaller pieces.",
"description": "A 3-foot (or about 90 cm) long piece of cotton string.",
"proportional": { "weight": 6, "volume": 6, "price": 6 }
},
{
"id": "rope_6",
"copy-from": "string_36",
"type": "GENERIC",
"name": "short rope",
"description": "A six-foot long piece of rope. Too small to be of much use.",
"description": "A 6-foot (or about 180 cm) long piece of rope. Too small to be of much use.",
"armor_data": { "covers": [ "TORSO" ], "coverage": 5, "encumbrance": 3, "material_thickness": 2 },
"proportional": { "weight": 6, "volume": 6, "price": 6 },
"extend": { "flags": [ "TIE_UP" ] }
"extend": { "flags": [ "TIE_UP", "BELTED", "WATER_FRIENDLY", "OVERSIZE" ] }
},
{
"id": "rope_30",
"copy-from": "rope_6",
"type": "GENERIC",
"name": "long rope",
"description": "A 30-foot long rope. Useful for keeping yourself safe from falls.",
"description": "A 30-foot (or about 9 m) long rope. Useful for keeping yourself safe from falls.",
"armor_data": { "covers": [ "TORSO" ], "coverage": 10, "encumbrance": 12, "material_thickness": 6 },
"proportional": { "weight": 5, "volume": 5, "price": 5 },
"extend": { "flags": [ "BELTED" ] }
"proportional": { "weight": 5, "volume": 5, "price": 5 }
},
{
"id": "vine_6",
"copy-from": "rope_6",
"type": "GENERIC",
"name": "short vine",
"description": "A sturdy 6-foot (or about 180 cm) long vine. Too small to be of much use.",
"material": "dry_plant",
"color": "light_green",
"proportional": { "price": 0.9 }
},
{
"id": "vine_30",
"copy-from": "rope_30",
"type": "GENERIC",
"name": "vine",
"description": "A sturdy 30-foot long vine. Could easily be used as a rope, but can't be disassembled. Strong enough to suspend a large corpse for butchering.",
"material": "veggy",
"color": "light_green"
"name": "long vine",
"description": "A sturdy 30-foot (or about 9 m) long vine. Could easily be used as a rope. Strong enough to suspend a large corpse for butchering.",
"material": "dry_plant",
"color": "light_green",
"proportional": { "price": 0.9 }
},
{
"id": "rope_makeshift_6",
"copy-from": "rope_6",
"copy-from": "vine_6",
"type": "GENERIC",
"name": "short makeshift rope",
"description": "A six-foot long piece of rough rope, woven from natural cordage. Useful for some purposes, but not as strong or flexible as proper rope.",
"material": "veggy"
"name": "short cordage rope",
"description": "A 6-foot (or about 180 cm) long piece of rough rope, woven from natural cordage. Useful for some purposes, but not as strong or flexible as proper rope.",
"proportional": { "price": 0.5 }
},
{
"id": "rope_makeshift_30",
"copy-from": "rope_makeshift_6",
"copy-from": "vine_30",
"type": "GENERIC",
"name": "long makeshift rope",
"description": "A 30-foot long rough rope, woven from natural cordage. Not strong enough to hold up to falls, but still useful for some things, such as suspending large corpses for butchering.",
"armor_data": { "covers": [ "TORSO" ], "coverage": 12, "encumbrance": 14, "material_thickness": 6 },
"proportional": { "weight": 5, "volume": 5, "price": 5 },
"extend": { "flags": [ "BELTED" ] }
"name": "long cordage rope",
"description": "A 30-foot (or about 9 m) long rough rope, woven from natural cordage. Not strong enough to hold up to falls, but still useful for some things, such as suspending large corpses for butchering.",
"proportional": { "price": 0.5 }
},
{
"id": "stick_fiber",
Expand Down
20 changes: 20 additions & 0 deletions data/json/materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,26 @@
"burn_data": [ { "fuel": 10, "smoke": 1, "burn": 10 }, { "fuel": 8, "smoke": 1, "burn": 20 }, { "fuel": 5, "smoke": 1, "burn": 50 } ],
"burn_products": [ [ "ash", 0.013 ] ]
},
{
"type": "material",
"ident": "dry_plant",
"name": "Dry Plant",
"density": 4,
"specific_heat_liquid": 1.34,
"specific_heat_solid": 1.34,
"latent_heat": 333,
"bash_resist": 1,
"cut_resist": 1,
"acid_resist": 1,
"fire_resist": 0,
"elec_resist": 2,
"chip_resist": 0,
"dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
"bash_dmg_verb": "ripped",
"cut_dmg_verb": "cut",
"burn_data": [ { "fuel": 10, "smoke": 1, "burn": 10 }, { "fuel": 8, "smoke": 1, "burn": 20 }, { "fuel": 5, "smoke": 1, "burn": 50 } ],
"burn_products": [ [ "ash", 0.013 ] ]
},
{
"type": "material",
"ident": "plastic",
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/armor/arms.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"difficulty": 5,
"time": "30 m",
"autolearn": true,
"components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "chitin_piece", 12 ] ] ]
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "chitin_piece", 12 ] ] ]
},
{
"result": "armguard_acidchitin",
Expand All @@ -47,7 +47,7 @@
"time": "60 m",
"autolearn": true,
"qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
"components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "acidchitin_piece", 12 ] ] ]
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 12 ] ] ]
},
{
"result": "armguard_hard",
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/armor/feet.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
"time": "40 m",
"book_learn": [ [ "tailor_japanese", 2 ] ],
"qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 1 } ],
"components": [ [ [ "2x4", 1 ] ], [ [ "string_6", 1 ] ] ]
"components": [ [ [ "2x4", 1 ] ], [ [ "cordage_short", 1, "LIST" ] ] ]
},
{
"result": "footrags",
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/armor/hands.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"difficulty": 4,
"time": "30 m",
"autolearn": true,
"components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "chitin_piece", 10 ] ] ]
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "chitin_piece", 10 ] ] ]
},
{
"result": "gauntlets_acidchitin",
Expand All @@ -21,7 +21,7 @@
"time": "1 h",
"autolearn": true,
"qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
"components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "acidchitin_piece", 10 ] ] ]
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 10 ] ] ]
},
{
"result": "gauntlets_larmor",
Expand Down
6 changes: 3 additions & 3 deletions data/json/recipes/armor/head.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
"time": "8 m",
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "string_36", 1 ], [ "string_6", 2 ] ], [ [ "bottle_plastic", 1 ], [ "bottle_plastic_small", 2 ] ] ]
"components": [ [ [ "cordage", 1, "LIST" ] ], [ [ "bottle_plastic", 1 ], [ "bottle_plastic_small", 2 ] ] ]
},
{
"result": "goggles_swim",
Expand Down Expand Up @@ -363,7 +363,7 @@
"difficulty": 6,
"time": "1 h",
"autolearn": true,
"components": [ [ [ "string_36", 1 ], [ "string_6", 5 ] ], [ [ "chitin_piece", 12 ] ] ]
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "chitin_piece", 12 ] ] ]
},
{
"result": "helmet_conical",
Expand All @@ -390,7 +390,7 @@
"time": "2 h",
"autolearn": true,
"qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
"components": [ [ [ "string_36", 1 ], [ "string_6", 5 ] ], [ [ "acidchitin_piece", 12 ] ] ]
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 12 ] ] ]
},
{
"result": "helmet_galea",
Expand Down
10 changes: 5 additions & 5 deletions data/json/recipes/armor/other.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"time": "10 m",
"reversible": true,
"autolearn": true,
"components": [ [ [ "wooden_bead", 10 ] ], [ [ "string_6", 1 ] ] ]
"components": [ [ [ "wooden_bead", 10 ] ], [ [ "cordage_short", 1, "LIST" ] ] ]
},
{
"result": "bead_necklace",
Expand All @@ -99,7 +99,7 @@
"reversible": true,
"autolearn": true,
"type": "recipe",
"components": [ [ [ "wooden_bead", 30 ] ], [ [ "string_36", 1 ] ] ]
"components": [ [ [ "wooden_bead", 30 ] ], [ [ "cordage", 1, "LIST" ] ] ]
},
{
"result": "down_blanket",
Expand Down Expand Up @@ -141,7 +141,7 @@
"tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
"components": [
[ [ "fur", 4 ] ],
[ [ "string_36", 1 ] ],
[ [ "cordage", 1, "LIST" ] ],
[ [ "plastic_chunk", 10 ], [ "bottle_plastic", 5 ], [ "bottle_plastic_small", 10 ], [ "jug_plastic", 1 ] ]
]
},
Expand All @@ -158,7 +158,7 @@
"tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
"components": [
[ [ "faux_fur", 4 ] ],
[ [ "string_36", 1 ] ],
[ [ "cordage", 1, "LIST" ] ],
[ [ "plastic_chunk", 10 ], [ "bottle_plastic", 5 ], [ "bottle_plastic_small", 10 ], [ "jug_plastic", 1 ] ]
]
},
Expand Down Expand Up @@ -214,7 +214,7 @@
"tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
"components": [
[ [ "leather", 4 ] ],
[ [ "string_36", 1 ] ],
[ [ "cordage", 1, "LIST" ] ],
[ [ "plastic_chunk", 10 ], [ "bottle_plastic", 5 ], [ "bottle_plastic_small", 10 ], [ "jug_plastic", 1 ] ]
]
},
Expand Down
Loading

0 comments on commit 172f04f

Please sign in to comment.