diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..c287189 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,9 @@ + +# 0.2 +* Fixed multiple chance-based effects being guaranteed +* Nerfed all effects to level I from II for consistency with base mod +* Balance changes + * Decreased Absinthe poison duration + * Decreased Saturation durations throughout + * Soda now gives luck + * Slightly raised Kvass speed chance \ No newline at end of file diff --git a/ToTheBaikal/data/ttb/brewery_drinks/absinthe.json b/ToTheBaikal/data/ttb/brewery_drinks/absinthe.json index 3665c79..4246110 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/absinthe.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/absinthe.json @@ -33,11 +33,11 @@ "type": "potion", "locked": false, "effect": "minecraft:poison", - "time": "(quality - 5) * 60", - "value": "1" + "time": "(quality - 5) * 5", + "value": "0" } ], - "apply_check": "random() + 1 - 0.75" + "apply_check": "random() - 1 + (75 / 100)" } ] } \ No newline at end of file diff --git a/ToTheBaikal/data/ttb/brewery_drinks/ale.json b/ToTheBaikal/data/ttb/brewery_drinks/ale.json index a9419ab..fcd83f7 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/ale.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/ale.json @@ -46,15 +46,15 @@ "type": "potion", "locked": false, "effect": "minecraft:saturation", - "time": "(quality - 7) * 15 + 60", - "value": "1" + "time": "(quality - 7) * 15 + 10", + "value": "0" }, { "type": "potion", "locked": false, "effect": "minecraft:strength", "time": "(quality - 8) * 60", - "value": "1" + "value": "0" }, { "type": "random", @@ -64,10 +64,10 @@ "locked": false, "effect": "minecraft:haste", "time": "abs(11 - quality) * 60", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.50" + "apply_check": "random() + 1 - (50 / 100)" }, { "type": "delayed", @@ -80,10 +80,10 @@ "locked": false, "effect": "minecraft:weakness", "time": "abs(10.5 - quality) * 60", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.80" + "apply_check": "random() - 1 + (80 / 100)" } ], "delay": "600" @@ -99,10 +99,10 @@ "locked": false, "effect": "minecraft:slowness", "time": "15", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.30" + "apply_check": "random() - 1 + (30 / 100)" } ], "delay": "600" diff --git a/ToTheBaikal/data/ttb/brewery_drinks/baikal.json b/ToTheBaikal/data/ttb/brewery_drinks/baikal.json index 786afe1..68933f6 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/baikal.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/baikal.json @@ -47,8 +47,8 @@ "locked": false, "show_icon": false, "effect": "minecraft:saturation", - "time": "(quality - 7) * 15 + 50", - "value": "1" + "time": "(quality - 7) * 15 + 10", + "value": "0" }, { "type": "random", @@ -58,10 +58,10 @@ "locked": false, "effect": "minecraft:haste", "time": "(quality - 5) * 5 + 30", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.30" + "apply_check": "random() - 1 + (30 / 100)" } ] } \ No newline at end of file diff --git a/ToTheBaikal/data/ttb/brewery_drinks/berry_soda.json b/ToTheBaikal/data/ttb/brewery_drinks/berry_soda.json index 012417b..6491871 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/berry_soda.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/berry_soda.json @@ -4,7 +4,7 @@ "translate": "drinktype.ttb.berry_soda" }, "color": "#c493ed", - "alcoholic_value": "-1", + "alcoholic_value": "-5", "ingredients": [ { "items": [ @@ -20,5 +20,14 @@ } ], "cooking_quality_multiplier": "cos(clamp((age / 60 - 5.0) * 0.5, -2, 2))", - "base_quality_value": "10" + "base_quality_value": "10", + "entries": [ + { + "type": "potion", + "locked": false, + "effect": "minecraft:luck", + "time": "(quality - 5) * 4 + 5", + "value": "0" + } + ] } \ No newline at end of file diff --git a/ToTheBaikal/data/ttb/brewery_drinks/champagne.json b/ToTheBaikal/data/ttb/brewery_drinks/champagne.json index 7135b5c..51449c5 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/champagne.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/champagne.json @@ -53,7 +53,7 @@ "locked": false, "effect": "minecraft:speed", "time": "(quality - 5) * 5 + 120", - "value": "1" + "value": "0" }, { "type": "delayed", @@ -66,10 +66,10 @@ "locked": false, "effect": "minecraft:weakness", "time": "60", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.60" + "apply_check": "random() - 1 + (60 / 100)" } ], "delay": "(quality - 5) * 5 + 120" diff --git a/ToTheBaikal/data/ttb/brewery_drinks/coffee.json b/ToTheBaikal/data/ttb/brewery_drinks/coffee.json index 3f5c293..3671c60 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/coffee.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/coffee.json @@ -31,14 +31,14 @@ "locked": false, "effect": "minecraft:speed", "time": "(quality - 3) * 15 + 30", - "value": "1" + "value": "0" }, { "type": "potion", "locked": false, "effect": "minecraft:regeneration", "time": "(quality - 5)", - "value": "1" + "value": "0" } ] } \ No newline at end of file diff --git a/ToTheBaikal/data/ttb/brewery_drinks/cognac.json b/ToTheBaikal/data/ttb/brewery_drinks/cognac.json index 57d938b..e123665 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/cognac.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/cognac.json @@ -50,7 +50,7 @@ "locked": false, "effect": "minecraft:strength", "time": "(quality - 5) * 10 + 250", - "value": "1" + "value": "0" }, { "type": "delayed", @@ -63,10 +63,10 @@ "locked": false, "effect": "minecraft:slowness", "time": "179", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.75" + "apply_check": "random() - 1 + (75 / 100)" } ], "delay": "(quality - 5) * 10 + 250" diff --git a/ToTheBaikal/data/ttb/brewery_drinks/dobry_cola.json b/ToTheBaikal/data/ttb/brewery_drinks/dobry_cola.json index 25a08fb..01bbe3d 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/dobry_cola.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/dobry_cola.json @@ -42,8 +42,8 @@ "type": "potion", "locked": false, "effect": "minecraft:saturation", - "time": "(quality - 5) * 6", - "value": "quality / 5 - 1.2" + "time": "(quality - 5) * 6 + 15", + "value": "0" }, { "type": "potion", diff --git a/ToTheBaikal/data/ttb/brewery_drinks/gin.json b/ToTheBaikal/data/ttb/brewery_drinks/gin.json index 6dd07e0..c95a57e 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/gin.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/gin.json @@ -51,7 +51,7 @@ "locked": false, "effect": "minecraft:speed", "time": "300", - "value": "1" + "value": "0" }, { "type": "delayed", @@ -64,10 +64,10 @@ "locked": false, "effect": "minecraft:slowness", "time": "120", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.80" + "apply_check": "random() - 1 + (80 / 100)" } ], "delay": "300" diff --git a/ToTheBaikal/data/ttb/brewery_drinks/kvass.json b/ToTheBaikal/data/ttb/brewery_drinks/kvass.json index d879459..411a120 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/kvass.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/kvass.json @@ -46,8 +46,8 @@ "type": "potion", "locked": false, "effect": "minecraft:saturation", - "time": "(quality - 3) * 15 + 150", - "value": "1" + "time": "(quality - 3) * 15 + 75", + "value": "0" }, { "type": "random", @@ -57,10 +57,10 @@ "locked": false, "effect": "minecraft:speed", "time": "(quality - 5) * 10 + 100", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.30" + "apply_check": "random() - 1 + (45 / 100)" } ] } \ No newline at end of file diff --git a/ToTheBaikal/data/ttb/brewery_drinks/liquor.json b/ToTheBaikal/data/ttb/brewery_drinks/liquor.json index bbc0330..ba21e52 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/liquor.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/liquor.json @@ -48,10 +48,10 @@ "locked": false, "effect": "minecraft:regeneration", "time": "(quality - 7) * 15 + 110", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.75" + "apply_check": "random() - 1 + (75 / 100)" } ] } \ No newline at end of file diff --git a/ToTheBaikal/data/ttb/brewery_drinks/martini.json b/ToTheBaikal/data/ttb/brewery_drinks/martini.json index f9fa55c..7728518 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/martini.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/martini.json @@ -37,6 +37,5 @@ "quality_value": "quality", "reveal_time": 300 } - ], - "entries": [] + ] } \ No newline at end of file diff --git a/ToTheBaikal/data/ttb/brewery_drinks/moonshine.json b/ToTheBaikal/data/ttb/brewery_drinks/moonshine.json index b4a3e27..27ef409 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/moonshine.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/moonshine.json @@ -44,7 +44,7 @@ "locked": false, "effect": "minecraft:darkness", "time": "179", - "value": "1" + "value": "0" } ], "delay": "360" @@ -57,10 +57,10 @@ "locked": false, "effect": "minecraft:strength", "time": "(quality - 8) * 15 + 110", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.80" + "apply_check": "random() - 1 + (80 / 100)" }, { "type": "execute_command", diff --git a/ToTheBaikal/data/ttb/brewery_drinks/shining_brilliance.json b/ToTheBaikal/data/ttb/brewery_drinks/shining_brilliance.json index f3d4069..796311c 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/shining_brilliance.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/shining_brilliance.json @@ -44,7 +44,7 @@ "locked": false, "effect": "minecraft:glowing", "time": "(quality - 8) * 15 + 570", - "value": "1" + "value": "0" }, { "type": "random", @@ -54,10 +54,10 @@ "locked": false, "effect": "minecraft:nausea", "time": "60", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.30" + "apply_check": "random() - 1 + (30 / 100)" }, { "type": "delayed", @@ -70,10 +70,10 @@ "locked": false, "effect": "minecraft:darkness", "time": "15", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.75" + "apply_check": "random() - 1 + (75 / 100)" } ], "delay": "900" diff --git a/ToTheBaikal/data/ttb/brewery_drinks/soda.json b/ToTheBaikal/data/ttb/brewery_drinks/soda.json index 9eba3d7..03f77b7 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/soda.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/soda.json @@ -4,7 +4,7 @@ "translate": "drinktype.ttb.soda" }, "color": "#f4b700", - "alcoholic_value": "-1", + "alcoholic_value": "-5", "ingredients": [ { "items": [ @@ -24,5 +24,14 @@ "book_information": { "best_cooking_time": 300.0, "best_barrel_age": -1200.0 - } + }, + "entries": [ + { + "type": "potion", + "locked": false, + "effect": "minecraft:luck", + "time": "(quality - 5) * 4 + 5", + "value": "0" + } + ] } \ No newline at end of file diff --git a/ToTheBaikal/data/ttb/brewery_drinks/vodka_meine_liebe.json b/ToTheBaikal/data/ttb/brewery_drinks/vodka_meine_liebe.json index c9a5b40..b354726 100644 --- a/ToTheBaikal/data/ttb/brewery_drinks/vodka_meine_liebe.json +++ b/ToTheBaikal/data/ttb/brewery_drinks/vodka_meine_liebe.json @@ -37,10 +37,10 @@ "locked": false, "effect": "minecraft:strength", "time": "(quality - 9) * 15 * 59.5", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.75" + "apply_check": "random() - 1 + (75 / 100)" }, { "type": "random", @@ -50,10 +50,10 @@ "locked": false, "effect": "minecraft:speed", "time": "(quality - 9) * 5 * 17.5", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.80" + "apply_check": "random() - 1 + (80 / 100)" }, { "type": "delayed", @@ -66,10 +66,10 @@ "locked": false, "effect": "minecraft:darkness", "time": "(quality - 9) * 15 * 10.5", - "value": "1" + "value": "0" } ], - "apply_check": "random() + 1 - 0.10" + "apply_check": "random() - 1 + (10 / 100)" } ], "delay": "480"