From eb61b23d0459e43cbf7b3f1ed153085d6f921638 Mon Sep 17 00:00:00 2001 From: juliancoffee Date: Wed, 30 Jun 2021 23:48:13 +0300 Subject: [PATCH] Rebalance food for new consumables changes --- assets/common/items/consumable/potion_big.ron | 2 +- assets/common/items/consumable/potion_med.ron | 2 +- assets/common/items/consumable/potion_minor.ron | 2 +- assets/common/items/food/apple.ron | 4 ++-- .../common/items/food/apple_mushroom_curry.ron | 17 ++++++++++++++--- assets/common/items/food/apple_stick.ron | 4 ++-- assets/common/items/food/cactus_colada.ron | 6 +++--- assets/common/items/food/carrot.ron | 4 ++-- assets/common/items/food/cheese.ron | 4 ++-- assets/common/items/food/coconut.ron | 4 ++-- assets/common/items/food/coltsfoot.ron | 4 ++-- assets/common/items/food/dandelion.ron | 4 ++-- assets/common/items/food/garlic.ron | 4 ++-- assets/common/items/food/lettuce.ron | 4 ++-- .../items/food/meat/beast_large_cooked.ron | 4 ++-- .../common/items/food/meat/beast_large_raw.ron | 4 ++-- .../items/food/meat/beast_small_cooked.ron | 4 ++-- .../common/items/food/meat/beast_small_raw.ron | 4 ++-- assets/common/items/food/meat/bird_cooked.ron | 4 ++-- .../items/food/meat/bird_large_cooked.ron | 4 ++-- .../common/items/food/meat/bird_large_raw.ron | 4 ++-- assets/common/items/food/meat/bird_raw.ron | 4 ++-- assets/common/items/food/meat/fish_cooked.ron | 4 ++-- assets/common/items/food/meat/fish_raw.ron | 4 ++-- assets/common/items/food/meat/tough_cooked.ron | 4 ++-- assets/common/items/food/meat/tough_raw.ron | 4 ++-- assets/common/items/food/mushroom.ron | 4 ++-- assets/common/items/food/mushroom_stick.ron | 4 ++-- assets/common/items/food/onion.ron | 4 ++-- assets/common/items/food/plainsalad.ron | 4 ++-- assets/common/items/food/sage.ron | 4 ++-- assets/common/items/food/spore_corruption.ron | 2 +- assets/common/items/food/sunflower_icetea.ron | 6 +++--- assets/common/items/food/tomato.ron | 4 ++-- assets/common/items/food/tomatosalad.ron | 4 ++-- 35 files changed, 80 insertions(+), 69 deletions(-) diff --git a/assets/common/items/consumable/potion_big.ron b/assets/common/items/consumable/potion_big.ron index 71cd4243a7..487206c222 100644 --- a/assets/common/items/consumable/potion_big.ron +++ b/assets/common/items/consumable/potion_big.ron @@ -2,7 +2,7 @@ ItemDef( name: "Large Potion", description: "", kind: Consumable( - kind: Potion, + kind: Drink, effect: [ Buff(( kind: Potion, diff --git a/assets/common/items/consumable/potion_med.ron b/assets/common/items/consumable/potion_med.ron index 87c127cfce..d0d64c03c3 100644 --- a/assets/common/items/consumable/potion_med.ron +++ b/assets/common/items/consumable/potion_med.ron @@ -2,7 +2,7 @@ ItemDef( name: "Medium Potion", description: "", kind: Consumable( - kind: Potion, + kind: Drink, effect: [ Buff(( kind: Potion, diff --git a/assets/common/items/consumable/potion_minor.ron b/assets/common/items/consumable/potion_minor.ron index a7b5706847..ea3e76debf 100644 --- a/assets/common/items/consumable/potion_minor.ron +++ b/assets/common/items/consumable/potion_minor.ron @@ -2,7 +2,7 @@ ItemDef( name: "Minor Potion", description: "", kind: Consumable( - kind: Potion, + kind: Drink, effect: [ Buff(( kind: Potion, diff --git a/assets/common/items/food/apple.ron b/assets/common/items/food/apple.ron index d6a0316865..c55d36de55 100644 --- a/assets/common/items/food/apple.ron +++ b/assets/common/items/food/apple.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 5.0, + strength: 20.0, duration: Some(( - secs: 20, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/apple_mushroom_curry.ron b/assets/common/items/food/apple_mushroom_curry.ron index 16fd5924b6..078a706930 100644 --- a/assets/common/items/food/apple_mushroom_curry.ron +++ b/assets/common/items/food/apple_mushroom_curry.ron @@ -2,14 +2,25 @@ ItemDef( name: "Mushroom Curry", description: "Who could say no to that?", kind: Consumable( - kind: Food, + kind: ComplexFood, effect: [ Buff(( kind: Saturation, data: ( - strength: 15.0, + strength: 100.0, duration: Some(( - secs: 80, + secs: 5, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + Buff(( + kind: Regeneration, + data: ( + strength: 10.0, + duration: Some(( + secs: 70, nanos: 0, )), ), diff --git a/assets/common/items/food/apple_stick.ron b/assets/common/items/food/apple_stick.ron index 6ed79bafbd..d42eb216da 100644 --- a/assets/common/items/food/apple_stick.ron +++ b/assets/common/items/food/apple_stick.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 10.0, + strength: 50.0, duration: Some(( - secs: 25, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/cactus_colada.ron b/assets/common/items/food/cactus_colada.ron index 7b8711e806..9eb97fe43e 100644 --- a/assets/common/items/food/cactus_colada.ron +++ b/assets/common/items/food/cactus_colada.ron @@ -2,14 +2,14 @@ ItemDef( name: "Cactus Colada", description: "Giving you that special prickle.", kind: Consumable( - kind: Food, + kind: Drink, effect: [ Buff(( kind: Saturation, data: ( - strength: 10.0, + strength: 50.0, duration: Some(( - secs: 25, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/carrot.ron b/assets/common/items/food/carrot.ron index f0e5886d8b..38853ac127 100644 --- a/assets/common/items/food/carrot.ron +++ b/assets/common/items/food/carrot.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 5.0, + strength: 10.0, duration: Some(( - secs: 10, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/cheese.ron b/assets/common/items/food/cheese.ron index 0b4c501ca5..406e048d8b 100644 --- a/assets/common/items/food/cheese.ron +++ b/assets/common/items/food/cheese.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 10.0, + strength: 30.0, duration: Some(( - secs: 15, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/coconut.ron b/assets/common/items/food/coconut.ron index 265127256f..6fcef657e0 100644 --- a/assets/common/items/food/coconut.ron +++ b/assets/common/items/food/coconut.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 10.0, + strength: 40.0, duration: Some(( - secs: 20, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/coltsfoot.ron b/assets/common/items/food/coltsfoot.ron index e802299a9e..5e30d94430 100644 --- a/assets/common/items/food/coltsfoot.ron +++ b/assets/common/items/food/coltsfoot.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 5.0, + strength: 10.0, duration: Some(( - secs: 10, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/dandelion.ron b/assets/common/items/food/dandelion.ron index 339abfafdc..e6a3d334bc 100644 --- a/assets/common/items/food/dandelion.ron +++ b/assets/common/items/food/dandelion.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 5.0, + strength: 10.0, duration: Some(( - secs: 10, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/garlic.ron b/assets/common/items/food/garlic.ron index 478c954146..be8493b7d5 100644 --- a/assets/common/items/food/garlic.ron +++ b/assets/common/items/food/garlic.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 5.0, + strength: 10.0, duration: Some(( - secs: 10, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/lettuce.ron b/assets/common/items/food/lettuce.ron index 45bab6a156..25bee72caf 100644 --- a/assets/common/items/food/lettuce.ron +++ b/assets/common/items/food/lettuce.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 5.0, + strength: 10.0, duration: Some(( - secs: 10, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/meat/beast_large_cooked.ron b/assets/common/items/food/meat/beast_large_cooked.ron index e464c3fa79..adcd36e952 100644 --- a/assets/common/items/food/meat/beast_large_cooked.ron +++ b/assets/common/items/food/meat/beast_large_cooked.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 25.0, + strength: 50.0, duration: Some(( - secs: 10, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/meat/beast_large_raw.ron b/assets/common/items/food/meat/beast_large_raw.ron index 19f6dfc974..b160ba22ba 100644 --- a/assets/common/items/food/meat/beast_large_raw.ron +++ b/assets/common/items/food/meat/beast_large_raw.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 15.0, + strength: 9.0, duration: Some(( - secs: 3, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/meat/beast_small_cooked.ron b/assets/common/items/food/meat/beast_small_cooked.ron index 13833e6c5c..474caddd36 100644 --- a/assets/common/items/food/meat/beast_small_cooked.ron +++ b/assets/common/items/food/meat/beast_small_cooked.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 19.0, + strength: 30.0, duration: Some(( - secs: 8, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/meat/beast_small_raw.ron b/assets/common/items/food/meat/beast_small_raw.ron index 377cc90e6d..c147bc2798 100644 --- a/assets/common/items/food/meat/beast_small_raw.ron +++ b/assets/common/items/food/meat/beast_small_raw.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 9.0, + strength: 5.0, duration: Some(( - secs: 3, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/meat/bird_cooked.ron b/assets/common/items/food/meat/bird_cooked.ron index bee712ce23..8aede55dc7 100644 --- a/assets/common/items/food/meat/bird_cooked.ron +++ b/assets/common/items/food/meat/bird_cooked.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 25.0, + strength: 50.0, duration: Some(( - secs: 10, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/meat/bird_large_cooked.ron b/assets/common/items/food/meat/bird_large_cooked.ron index d63ca774d7..00081a8730 100644 --- a/assets/common/items/food/meat/bird_large_cooked.ron +++ b/assets/common/items/food/meat/bird_large_cooked.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 32.0, + strength: 160.0, duration: Some(( - secs: 25, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/meat/bird_large_raw.ron b/assets/common/items/food/meat/bird_large_raw.ron index b55479245b..b54389f36e 100644 --- a/assets/common/items/food/meat/bird_large_raw.ron +++ b/assets/common/items/food/meat/bird_large_raw.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 30.0, + strength: 18.0, duration: Some(( - secs: 3, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/meat/bird_raw.ron b/assets/common/items/food/meat/bird_raw.ron index 234a0c58f6..4feb3db030 100644 --- a/assets/common/items/food/meat/bird_raw.ron +++ b/assets/common/items/food/meat/bird_raw.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 15.0, + strength: 9.0, duration: Some(( - secs: 3, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/meat/fish_cooked.ron b/assets/common/items/food/meat/fish_cooked.ron index de01e9305c..ed4c83579a 100644 --- a/assets/common/items/food/meat/fish_cooked.ron +++ b/assets/common/items/food/meat/fish_cooked.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 25.0, + strength: 50.0, duration: Some(( - secs: 10, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/meat/fish_raw.ron b/assets/common/items/food/meat/fish_raw.ron index a454192290..730808377f 100644 --- a/assets/common/items/food/meat/fish_raw.ron +++ b/assets/common/items/food/meat/fish_raw.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 15.0, + strength: 9.0, duration: Some(( - secs: 3, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/meat/tough_cooked.ron b/assets/common/items/food/meat/tough_cooked.ron index 34563112fe..b575a7f934 100644 --- a/assets/common/items/food/meat/tough_cooked.ron +++ b/assets/common/items/food/meat/tough_cooked.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 20.0, + strength: 40.0, duration: Some(( - secs: 10, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/meat/tough_raw.ron b/assets/common/items/food/meat/tough_raw.ron index 548160e875..d9c75d0d59 100644 --- a/assets/common/items/food/meat/tough_raw.ron +++ b/assets/common/items/food/meat/tough_raw.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 12.0, + strength: 7.2, duration: Some(( - secs: 3, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/mushroom.ron b/assets/common/items/food/mushroom.ron index e5b4f1c23f..255b04e111 100644 --- a/assets/common/items/food/mushroom.ron +++ b/assets/common/items/food/mushroom.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 5.0, + strength: 10.0, duration: Some(( - secs: 10, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/mushroom_stick.ron b/assets/common/items/food/mushroom_stick.ron index ab42bf6059..f6ba282de5 100644 --- a/assets/common/items/food/mushroom_stick.ron +++ b/assets/common/items/food/mushroom_stick.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 10.0, + strength: 40.0, duration: Some(( - secs: 20, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/onion.ron b/assets/common/items/food/onion.ron index e37c5c23b1..f07d61c8ef 100644 --- a/assets/common/items/food/onion.ron +++ b/assets/common/items/food/onion.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 5.0, + strength: 10.0, duration: Some(( - secs: 10, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/plainsalad.ron b/assets/common/items/food/plainsalad.ron index 514ed65d10..3693776fb1 100644 --- a/assets/common/items/food/plainsalad.ron +++ b/assets/common/items/food/plainsalad.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 5.0, + strength: 20.0, duration: Some(( - secs: 20, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/sage.ron b/assets/common/items/food/sage.ron index 76535df51a..b54c851eee 100644 --- a/assets/common/items/food/sage.ron +++ b/assets/common/items/food/sage.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 5.0, + strength: 10.0, duration: Some(( - secs: 10, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/spore_corruption.ron b/assets/common/items/food/spore_corruption.ron index 17ff0a7ce8..9d0e65ef5a 100644 --- a/assets/common/items/food/spore_corruption.ron +++ b/assets/common/items/food/spore_corruption.ron @@ -2,7 +2,7 @@ ItemDef( name: "Spore of Corruption", description: "You feel an evil force pulsating within.\n\nIt may be unwise to hold on to it for too long...", kind: Consumable( - kind: Food, + kind: ComplexFood, effect: [ Buff(( kind: Frenzied, diff --git a/assets/common/items/food/sunflower_icetea.ron b/assets/common/items/food/sunflower_icetea.ron index 9e30bbf2ad..6e05c847ee 100644 --- a/assets/common/items/food/sunflower_icetea.ron +++ b/assets/common/items/food/sunflower_icetea.ron @@ -2,14 +2,14 @@ ItemDef( name: "Sunflower Ice Tea", description: "Brewed from freshly shelled sunflower seeds", kind: Consumable( - kind: Food, + kind: Drink, effect: [ Buff(( kind: Saturation, data: ( - strength: 10.0, + strength: 100.0, duration: Some(( - secs: 50, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/tomato.ron b/assets/common/items/food/tomato.ron index 80da6495ef..00d8ddfc42 100644 --- a/assets/common/items/food/tomato.ron +++ b/assets/common/items/food/tomato.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 5.0, + strength: 10.0, duration: Some(( - secs: 10, + secs: 5, nanos: 0, )), ), diff --git a/assets/common/items/food/tomatosalad.ron b/assets/common/items/food/tomatosalad.ron index 0842a003de..fe90256e3b 100644 --- a/assets/common/items/food/tomatosalad.ron +++ b/assets/common/items/food/tomatosalad.ron @@ -7,9 +7,9 @@ ItemDef( Buff(( kind: Saturation, data: ( - strength: 10.0, + strength: 30.0, duration: Some(( - secs: 15, + secs: 5, nanos: 0, )), ),