diff --git a/assets/common/items/boss_drops/exp_flask.ron b/assets/common/items/boss_drops/exp_flask.ron index fd87fb20d7..9e88c3a247 100644 --- a/assets/common/items/boss_drops/exp_flask.ron +++ b/assets/common/items/boss_drops/exp_flask.ron @@ -1,6 +1,6 @@ ItemDef( name: "Flask of Velorite Dust", - description: "Increases Exp by 250\n\nTake with plenty of water\n\n", + description: "Increases Exp by 250\n\nTake with plenty of water", kind: Consumable( kind: "PotionExp", effect: [ diff --git a/assets/common/items/boss_drops/potions.ron b/assets/common/items/boss_drops/potions.ron index a98620f489..528d0b2e88 100644 --- a/assets/common/items/boss_drops/potions.ron +++ b/assets/common/items/boss_drops/potions.ron @@ -1,12 +1,19 @@ ItemDef( name: "Potent Potion", - description: "A potent healing potion.\n\nRestores 100 health on use\n\n", + description: "A potent healing potion.\n\nRestores 100 health on use", kind: Consumable( kind: "Potion", effect: [ - Health(( - amount: 1000, - cause: Item, + Buff(( + kind: Saturation, + data: ( + strength: 1000.0, + duration: Some(( + secs: 1, + nanos: 0, + )), + ), + cat_ids: [Natural], )), ] ), diff --git a/assets/common/items/boss_drops/xp_potion.ron b/assets/common/items/boss_drops/xp_potion.ron index 447e648695..eeb78ea21e 100644 --- a/assets/common/items/boss_drops/xp_potion.ron +++ b/assets/common/items/boss_drops/xp_potion.ron @@ -1,6 +1,6 @@ ItemDef( name: "Potion of Skill", - description: "Provides 250 XP to the drinker\n\n", + description: "Provides 250 XP to the drinker", kind: Consumable( kind: "Potion", effect: [ diff --git a/assets/common/items/consumable/potion_big.ron b/assets/common/items/consumable/potion_big.ron index d09f800e2d..d5849b7926 100644 --- a/assets/common/items/consumable/potion_big.ron +++ b/assets/common/items/consumable/potion_big.ron @@ -4,9 +4,16 @@ ItemDef( kind: Consumable( kind: "PotionLarge", effect: [ - Health(( - amount: 1000, - cause: Item, + Buff(( + kind: Saturation, + data: ( + strength: 1000.0, + duration: Some(( + secs: 1, + nanos: 0, + )), + ), + cat_ids: [Natural], )), ] ), diff --git a/assets/common/items/consumable/potion_med.ron b/assets/common/items/consumable/potion_med.ron index e1ab119579..081b87cdff 100644 --- a/assets/common/items/consumable/potion_med.ron +++ b/assets/common/items/consumable/potion_med.ron @@ -4,9 +4,16 @@ ItemDef( kind: Consumable( kind: "PotionMed", effect: [ - Health(( - amount: 700, - cause: Item, + Buff(( + kind: Saturation, + data: ( + strength: 700.0, + duration: Some(( + secs: 1, + nanos: 0, + )), + ), + cat_ids: [Natural], )), ] ), diff --git a/assets/common/items/consumable/potion_minor.ron b/assets/common/items/consumable/potion_minor.ron index 7b5e648225..7794c253e1 100644 --- a/assets/common/items/consumable/potion_minor.ron +++ b/assets/common/items/consumable/potion_minor.ron @@ -4,9 +4,16 @@ ItemDef( kind: Consumable( kind: "PotionMinor", effect: [ - Health(( - amount: 500, - cause: Item, + Buff(( + kind: Saturation, + data: ( + strength: 500.0, + duration: Some(( + secs: 1, + nanos: 0, + )), + ), + cat_ids: [Natural], )), ] ), diff --git a/assets/common/items/food/apple.ron b/assets/common/items/food/apple.ron index 2969acd184..31e294f3f3 100644 --- a/assets/common/items/food/apple.ron +++ b/assets/common/items/food/apple.ron @@ -1,15 +1,15 @@ ItemDef( name: "Apple", - description: "Restores 10 Health over 10 seconds\n\nRed and juicy", + description: "Restores 10 Health over 20 seconds\n\nRed and juicy", kind: Consumable( kind: "Apple", effect: [ Buff(( kind: Saturation, data: ( - strength: 10.0, + strength: 5.0, duration: Some(( - secs: 10, + secs: 20, nanos: 0, )), ), diff --git a/assets/common/items/food/apple_mushroom_curry.ron b/assets/common/items/food/apple_mushroom_curry.ron index 4c1ed514e5..281c228969 100644 --- a/assets/common/items/food/apple_mushroom_curry.ron +++ b/assets/common/items/food/apple_mushroom_curry.ron @@ -1,15 +1,15 @@ ItemDef( name: "Mushroom Curry", - description: "Restores 120 Health over 5 seconds\n\nWho could say no to that?", + description: "Restores 120 Health over 20 seconds\n\nWho could say no to that?", kind: Consumable( kind: "AppleShroomCurry", effect: [ Buff(( kind: Saturation, data: ( - strength: 240.0, + strength: 60.0, duration: Some(( - secs: 5, + secs: 20, nanos: 0, )), ), diff --git a/assets/common/items/food/apple_stick.ron b/assets/common/items/food/apple_stick.ron index e250220d64..f975c0c1a2 100644 --- a/assets/common/items/food/apple_stick.ron +++ b/assets/common/items/food/apple_stick.ron @@ -1,15 +1,15 @@ ItemDef( name: "Apple Stick", - description: "Restores 25 Health over 5 seconds\n\nThe stick makes it easier to carry!", + description: "Restores 25 Health over 20 seconds\n\nThe stick makes it easier to carry!", kind: Consumable( kind: "AppleStick", effect: [ Buff(( kind: Saturation, data: ( - strength: 50.0, + strength: 12.5, duration: Some(( - secs: 5, + secs: 20, nanos: 0, )), ), diff --git a/assets/common/items/food/cheese.ron b/assets/common/items/food/cheese.ron index cdd967d1af..182bf88b38 100644 --- a/assets/common/items/food/cheese.ron +++ b/assets/common/items/food/cheese.ron @@ -1,15 +1,15 @@ ItemDef( name: "Dwarven Cheese", - description: "Restores 15 Health over 10 seconds\n\nAromatic and nutritious", + description: "Restores 15 Health over 20 seconds\n\nAromatic and nutritious", kind: Consumable( kind: "Cheese", effect: [ Buff(( kind: Saturation, data: ( - strength: 15.0, + strength: 7.5, duration: Some(( - secs: 10, + secs: 20, nanos: 0, )), ), diff --git a/assets/common/items/food/coconut.ron b/assets/common/items/food/coconut.ron index 75992f3335..1032ed6f57 100644 --- a/assets/common/items/food/coconut.ron +++ b/assets/common/items/food/coconut.ron @@ -1,15 +1,15 @@ ItemDef( name: "Coconut", - description: "Restores 20 health over 10 seconds\n\nReliable source of water and fat", + description: "Restores 20 health over 20 seconds\n\nReliable source of water and fat", kind: Consumable( kind: "Coconut", effect: [ Buff(( kind: Saturation, data: ( - strength: 20.0, + strength: 10.0, duration: Some(( - secs: 10, + secs: 20, nanos: 0, )), ), diff --git a/assets/common/items/food/mushroom.ron b/assets/common/items/food/mushroom.ron index 08b26aed8a..35c09905d8 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: 2.5, duration: Some(( - secs: 10, + secs: 20, nanos: 0, )), ), diff --git a/assets/common/items/food/mushroom_stick.ron b/assets/common/items/food/mushroom_stick.ron index 80cf305eb9..174e83ee26 100644 --- a/assets/common/items/food/mushroom_stick.ron +++ b/assets/common/items/food/mushroom_stick.ron @@ -1,15 +1,15 @@ ItemDef( name: "Mushroom Stick", - description: "Restores 20 Health over 5 seconds\n\nRoasted mushrooms on a stick for easy carrying.", + description: "Restores 20 Health over 20 seconds\n\nRoasted mushrooms on a stick for easy carrying", kind: Consumable( kind: "MushroomStick", effect: [ Buff(( kind: Saturation, data: ( - strength: 40.0, + strength: 10.0, duration: Some(( - secs: 5, + secs: 20, nanos: 0, )), ), diff --git a/assets/common/items/food/sunflower_icetea.ron b/assets/common/items/food/sunflower_icetea.ron index 8015388bfd..fa97fc2580 100644 --- a/assets/common/items/food/sunflower_icetea.ron +++ b/assets/common/items/food/sunflower_icetea.ron @@ -1,15 +1,15 @@ ItemDef( name: "Sunflower Ice Tea", - description: "Restores 50 Health over 5 seconds\n\nBrewed from freshly shelled sunflower seeds.", + description: "Restores 50 Health over 20 seconds\n\nBrewed from freshly shelled sunflower seeds", kind: Consumable( kind: "SunflowerTea", effect: [ Buff(( kind: Saturation, data: ( - strength: 100.0, + strength: 25.0, duration: Some(( - secs: 5, + secs: 20, nanos: 0, )), ),