Skip to content

Commit

Permalink
Merge pull request #30489 from ifreund/workbench-balance
Browse files Browse the repository at this point in the history
Rebalance workbench stats
  • Loading branch information
Rivet-the-Zombie authored May 16, 2019
2 parents ca988b5 + 3c1bee7 commit 510a637
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions data/json/furniture.json
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@
"items": [ { "item": "2x4", "count": [ 1, 3 ] }, { "item": "nail", "charges": [ 2, 6 ] }, { "item": "splinter", "count": 1 } ]
},
"examine_action": "workbench",
"workbench": { "multiplier": 1.0, "mass": 100000, "volume": "100L" }
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75L" }
},
{
"type": "furniture",
Expand Down Expand Up @@ -892,7 +892,7 @@
"items": [ { "item": "2x4", "count": [ 2, 6 ] }, { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": 1 } ]
},
"examine_action": "workbench",
"workbench": { "multiplier": 1.0, "mass": 100000, "volume": "100L" }
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75L" }
},
{
"type": "furniture",
Expand Down Expand Up @@ -1011,7 +1011,7 @@
"items": [ { "item": "2x4", "count": [ 2, 6 ] }, { "item": "nail", "charges": [ 4, 8 ] }, { "item": "splinter", "count": 1 } ]
},
"examine_action": "workbench",
"workbench": { "multiplier": 1.0, "mass": 100000, "volume": "100L" }
"workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75L" }
},
{
"type": "furniture",
Expand Down Expand Up @@ -4935,7 +4935,7 @@
]
},
"examine_action": "workbench",
"workbench": { "multiplier": 1.1, "mass": 150000, "volume": "150L" }
"workbench": { "multiplier": 1.15, "mass": 300000, "volume": "100L" }
},
{
"type": "furniture",
Expand Down Expand Up @@ -6020,7 +6020,7 @@
]
},
"examine_action": "workbench",
"workbench": { "multiplier": 1.2, "mass": 250000, "volume": "250L" }
"workbench": { "multiplier": 1.2, "mass": 500000, "volume": "200L" }
},
{
"type": "furniture",
Expand All @@ -6031,7 +6031,7 @@
"color": "red",
"move_cost_mod": 2,
"required_str": -1,
"workbench": { "multiplier": 1.0, "mass": 30000, "volume": "30L" }
"workbench": { "multiplier": 1.0, "mass": 5000, "volume": "10L" }
},
{
"type": "furniture",
Expand All @@ -6042,6 +6042,6 @@
"color": "red",
"move_cost_mod": 2,
"required_str": -1,
"workbench": { "multiplier": 0.75, "mass": 50000, "volume": "100L" }
"workbench": { "multiplier": 0.7, "mass": 1000000, "volume": "1000L" }
}
]
12 changes: 6 additions & 6 deletions data/json/vehicle_parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,7 @@
"broken_color": "light_gray",
"damage_modifier": 60,
"durability": 145,
"size": 15,
"size": 80,
"item": "v_table",
"difficulty": 1,
"location": "center",
Expand All @@ -975,7 +975,7 @@
{ "item": "splinter", "count": [ 4, 6 ] },
{ "item": "nail", "charges": [ 4, 7 ] }
],
"workbench": { "multiplier": 1.0, "mass": 80000, "volume": "80L" }
"workbench": { "multiplier": 1.1, "mass": 150000, "volume": "20L" }
},
{
"type": "vehicle_part",
Expand All @@ -987,7 +987,7 @@
"broken_color": "light_gray",
"damage_modifier": 60,
"durability": 145,
"size": 15,
"size": 80,
"item": "w_table",
"difficulty": 1,
"location": "center",
Expand All @@ -997,7 +997,7 @@
{ "item": "splinter", "count": [ 4, 6 ] },
{ "item": "nail", "charges": [ 4, 7 ] }
],
"workbench": { "multiplier": 1.0, "mass": 80000, "volume": "80L" }
"workbench": { "multiplier": 1.1, "mass": 150000, "volume": "20L" }
},
{
"type": "vehicle_part",
Expand All @@ -1010,7 +1010,7 @@
"looks_like": "veh_table_wood",
"damage_modifier": 60,
"durability": 300,
"size": 20,
"size": 120,
"item": "workbench",
"difficulty": 1,
"location": "center",
Expand All @@ -1022,7 +1022,7 @@
{ "item": "steel_chunk", "count": [ 4, 8 ] },
{ "item": "scrap", "count": [ 12, 24 ] }
],
"workbench": { "multiplier": 1.2, "mass": 1500000, "volume": "150L" }
"workbench": { "multiplier": 1.2, "mass": 300000, "volume": "30L" }
},
{
"type": "vehicle_part",
Expand Down

0 comments on commit 510a637

Please sign in to comment.