Skip to content

Commit

Permalink
feat(balance): more consistent bash results for plants and stone (#4091)
Browse files Browse the repository at this point in the history
  • Loading branch information
@chaosvolt
chaosvolt authored Jan 12, 2024
1 parent 86a36a1 commit bf0fae4
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 47 deletions.
24 changes: 16 additions & 8 deletions data/json/furniture_and_terrain/furniture-terrains.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,12 @@
"str_max": 40,
"sound": "smash!",
"sound_fail": "thump.",
"items": [ { "item": "rock", "count": [ 16, 32 ] }, { "item": "sharp_rock", "count": [ 0, 6 ] } ]
"items": [
{ "item": "rock", "count": [ 16, 32 ] },
{ "item": "sharp_rock", "count": [ 0, 6 ] },
{ "item": "material_limestone", "charges": [ 3, 8 ], "prob": 80 },
{ "group": "rock_mining_extra", "prob": 8 }
]
}
},
{
Expand All @@ -818,7 +823,12 @@
"str_max": 80,
"sound": "smash!",
"sound_fail": "thump.",
"items": [ { "item": "rock", "count": [ 35, 50 ] }, { "item": "sharp_rock", "count": [ 3, 7 ] } ]
"items": [
{ "item": "rock", "count": [ 35, 50 ] },
{ "item": "sharp_rock", "count": [ 3, 7 ] },
{ "item": "material_limestone", "charges": [ 5, 15 ], "prob": 80 },
{ "group": "rock_mining_extra", "prob": 15 }
]
}
},
{
Expand All @@ -838,12 +848,10 @@
"sound": "smash!",
"sound_fail": "thump.",
"items": [
{ "item": "rock", "count": [ 65, 85 ] },
{ "item": "sharp_rock", "count": [ 5, 9 ] },
{ "item": "material_limestone", "charges": [ 2, 5 ], "prob": 30 },
{ "item": "material_rocksalt", "count": [ 0, 1 ], "prob": 10 },
{ "item": "material_rhodonite", "count": [ 0, 1 ], "prob": 1 },
{ "item": "material_zincite", "count": [ 0, 5 ], "prob": 2 }
{ "item": "rock", "count": [ 50, 70 ] },
{ "item": "sharp_rock", "count": [ 4, 7 ] },
{ "item": "material_limestone", "charges": [ 8, 20 ], "prob": 80 },
{ "group": "rock_mining_extra", "prob": 20 }
]
}
},
Expand Down
62 changes: 31 additions & 31 deletions data/json/furniture_and_terrain/terrain-flora.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@
"sound": "crunch!",
"sound_fail": "whack!",
"ter_set": "t_dirt",
"items": [ { "item": "stick_long", "count": [ 0, 5 ] } ]
"items": [ { "item": "stick_long", "count": [ 1, 4 ] } ]
}
},
{
Expand Down Expand Up @@ -1266,7 +1266,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand Down Expand Up @@ -1297,7 +1297,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand Down Expand Up @@ -1328,7 +1328,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand Down Expand Up @@ -1359,7 +1359,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand Down Expand Up @@ -1390,7 +1390,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1409,7 +1409,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1433,7 +1433,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1455,7 +1455,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand Down Expand Up @@ -1486,7 +1486,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1508,7 +1508,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand Down Expand Up @@ -1539,7 +1539,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1561,7 +1561,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand Down Expand Up @@ -1592,7 +1592,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1614,7 +1614,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand Down Expand Up @@ -1645,7 +1645,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1667,7 +1667,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand Down Expand Up @@ -1698,7 +1698,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1720,7 +1720,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand Down Expand Up @@ -1753,7 +1753,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1775,7 +1775,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1799,7 +1799,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1821,7 +1821,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1844,7 +1844,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1866,7 +1866,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1889,7 +1889,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -1911,7 +1911,7 @@
"sound": "crunch.",
"sound_fail": "brush.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand Down Expand Up @@ -2081,7 +2081,7 @@
"sound": "crunch.",
"sound_fail": "whish.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand All @@ -2103,7 +2103,7 @@
"sound": "crunch.",
"sound_fail": "whish.",
"ter_set": "t_dirt",
"items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
"items": [ { "item": "withered", "count": [ 1, 2 ] } ]
}
},
{
Expand Down Expand Up @@ -2175,7 +2175,7 @@
"sound": "crunch!",
"sound_fail": "whack!",
"ter_set": "t_dirt",
"items": [ { "item": "stick_long", "count": [ 0, 5 ] } ]
"items": [ { "item": "stick_long", "count": [ 1, 4 ] } ]
}
},
{
Expand All @@ -2196,7 +2196,7 @@
"sound": "crunch!",
"sound_fail": "whack!",
"ter_set": "t_dirt",
"items": [ { "item": "stick_long", "count": [ 0, 5 ] } ]
"items": [ { "item": "stick_long", "count": [ 1, 4 ] } ]
}
}
]
Loading

0 comments on commit bf0fae4

Please sign in to comment.