diff --git a/assets/common/items/food/meat/beef_large_cooked.ron b/assets/common/items/food/meat/beast_large_cooked.ron similarity index 87% rename from assets/common/items/food/meat/beef_large_cooked.ron rename to assets/common/items/food/meat/beast_large_cooked.ron index 5bc4ef4fe5..862ab6a9c2 100644 --- a/assets/common/items/food/meat/beef_large_cooked.ron +++ b/assets/common/items/food/meat/beast_large_cooked.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Cooked Slab of Beef", + name: "Cooked Meat Slab", description: "Medium Rare.", kind: Consumable( - kind: "BeefLargeCooked", + kind: "BeastLargeCooked", effect: [ Buff(( kind: Saturation, diff --git a/assets/common/items/food/meat/beef_large_raw.ron b/assets/common/items/food/meat/beast_large_raw.ron similarity index 77% rename from assets/common/items/food/meat/beef_large_raw.ron rename to assets/common/items/food/meat/beast_large_raw.ron index 04fca7cb57..ab6ef40fcf 100644 --- a/assets/common/items/food/meat/beef_large_raw.ron +++ b/assets/common/items/food/meat/beast_large_raw.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Raw Beef Slab", - description: "Chunk of animal meat, best after cooking.", + name: "Raw Meat Slab", + description: "Chunk of beastly animal meat, best after cooking.", kind: Consumable( - kind: "BeefLargeRaw", + kind: "BeastLargeRaw", effect: [ Buff(( kind: Saturation, diff --git a/assets/common/items/food/meat/beef_small_cooked.ron b/assets/common/items/food/meat/beast_small_cooked.ron similarity index 87% rename from assets/common/items/food/meat/beef_small_cooked.ron rename to assets/common/items/food/meat/beast_small_cooked.ron index ab2bf9b331..1091b9bcee 100644 --- a/assets/common/items/food/meat/beef_small_cooked.ron +++ b/assets/common/items/food/meat/beast_small_cooked.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Cooked Sliver of Beef", + name: "Cooked Meat Sliver", description: "Medium Rare.", kind: Consumable( - kind: "BeefSmallCooked", + kind: "BeastSmallCooked", effect: [ Buff(( kind: Saturation, diff --git a/assets/common/items/food/meat/beef_small_raw.ron b/assets/common/items/food/meat/beast_small_raw.ron similarity index 76% rename from assets/common/items/food/meat/beef_small_raw.ron rename to assets/common/items/food/meat/beast_small_raw.ron index d9ce4671db..c4c53f7399 100644 --- a/assets/common/items/food/meat/beef_small_raw.ron +++ b/assets/common/items/food/meat/beast_small_raw.ron @@ -1,8 +1,8 @@ ItemDef( - name: "Raw Beef Sliver", - description: "Small hunk of animal meat, best after cooking.", + name: "Raw Meat Sliver", + description: "Small hunk of beastly animal meat, best after cooking.", kind: Consumable( - kind: "BeefSmallRaw", + kind: "BeastSmallRaw", effect: [ Buff(( kind: Saturation, diff --git a/assets/common/items/food/meat/tough_cooked.ron b/assets/common/items/food/meat/tough_cooked.ron new file mode 100644 index 0000000000..0d437ebef1 --- /dev/null +++ b/assets/common/items/food/meat/tough_cooked.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Cooked Tough Meat", + description: "Tastes exotic.", + kind: Consumable( + kind: "ToughCooked", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 20.0, + duration: Some(( + secs: 10, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/tough_raw.ron b/assets/common/items/food/meat/tough_raw.ron new file mode 100644 index 0000000000..a158d36faa --- /dev/null +++ b/assets/common/items/food/meat/tough_raw.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Raw Tough Meat", + description: "Peculiar bit of meat, best after cooking.", + kind: Consumable( + kind: "ToughRaw", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 12.0, + duration: Some(( + secs: 3, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/loot_tables/creature/quad_low/default.ron b/assets/common/loot_tables/creature/quad_low/default.ron index 416cd6691f..82a2ce7e4b 100644 --- a/assets/common/loot_tables/creature/quad_low/default.ron +++ b/assets/common/loot_tables/creature/quad_low/default.ron @@ -1,4 +1,5 @@ [ - (1.0, Item("common.items.food.meat.fish_raw")), + (1.5, Item("common.items.food.meat.tough_raw")), + (0.5, Item("common.items.food.meat.tough_raw")), (3.0, Item("common.items.crafting_ing.leather_scraps")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/default.ron b/assets/common/loot_tables/creature/quad_medium/default.ron index d623d70ca7..56d8bd20c9 100644 --- a/assets/common/loot_tables/creature/quad_medium/default.ron +++ b/assets/common/loot_tables/creature/quad_medium/default.ron @@ -1,5 +1,5 @@ [ - (1.5, Item("common.items.food.meat.beef_small_raw")), - (0.5, Item("common.items.food.meat.beef_large_raw")), + (1.5, Item("common.items.food.meat.beast_small_raw")), + (0.5, Item("common.items.food.meat.beast_large_raw")), (3.0, Item("common.items.crafting_ing.leather_scraps")), ] \ No newline at end of file diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 9096c0c554..a0e9ce0d0d 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -150,10 +150,24 @@ ], craft_sprite: Some(CookingPot), ), - "Beef_small_cooked": ( - output: ("common.items.food.meat.beef_small_cooked", 1), + "beast_small_cooked": ( + output: ("common.items.food.meat.beast_small_cooked", 1), inputs: [ - (Item("common.items.food.meat.beef_small_raw"), 1), + (Item("common.items.food.meat.beast_small_raw"), 1), + ], + craft_sprite: Some(CookingPot), + ), + "beast_large_cooked": ( + output: ("common.items.food.meat.beast_large_cooked", 1), + inputs: [ + (Item("common.items.food.meat.beast_large_raw"), 1), + ], + craft_sprite: Some(CookingPot), + ), + "tough_cooked": ( + output: ("common.items.food.meat.tough_cooked", 1), + inputs: [ + (Item("common.items.food.meat.tough_raw"), 1), ], craft_sprite: Some(CookingPot), ), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 669eebb834..edca039369 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1893,20 +1893,28 @@ "voxel.sprite.food.meat.fish_cooked", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Consumable("BeefSmallRaw"): VoxTrans( - "voxel.sprite.food.meat.beef_small_raw", + Consumable("BeastSmallRaw"): VoxTrans( + "voxel.sprite.food.meat.beast_small_raw", (0.0, 0.0, 0.0), (-50.0, 10.0, 0.0), 1.0, ), - Consumable("BeefSmallCooked"): VoxTrans( - "voxel.sprite.food.meat.beef_small_cooked", + Consumable("BeastSmallCooked"): VoxTrans( + "voxel.sprite.food.meat.beast_small_cooked", (0.0, 0.0, 0.0), (-50.0, 20.0, 0.0), 1.0, ), - Consumable("BeefLargeRaw"): VoxTrans( - "voxel.sprite.food.meat.beef_large_raw", + Consumable("ToughRaw"): VoxTrans( + "voxel.sprite.food.meat.tough_raw", + (0.0, 0.0, 0.0), (-50.0, 10.0, 0.0), 1.0, + ), + Consumable("ToughCooked"): VoxTrans( + "voxel.sprite.food.meat.tough_cooked", + (0.0, 0.0, 0.0), (-50.0, 20.0, 0.0), 1.0, + ), + Consumable("BeastLargeRaw"): VoxTrans( + "voxel.sprite.food.meat.beast_large_raw", (-1.0, 0.0, 0.0), (-80.0, 40.0, 0.0), 0.8, ), - Consumable("BeefLargeCooked"): VoxTrans( - "voxel.sprite.food.meat.beef_large_cooked", + Consumable("BeastLargeCooked"): VoxTrans( + "voxel.sprite.food.meat.beast_large_cooked", (-1.0, 0.0, 0.0), (-80.0, 40.0, 0.0), 0.8, ), Consumable("PlainSalad"): VoxTrans( diff --git a/assets/voxygen/voxel/sprite/food/meat/beast_large_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/beast_large_cooked.vox new file mode 100644 index 0000000000..0a695ea72b --- /dev/null +++ b/assets/voxygen/voxel/sprite/food/meat/beast_large_cooked.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac268d850fc99139cbedc110da8371510d2fbddee57a0d85d3f2e6d45762e634 +size 2912 diff --git a/assets/voxygen/voxel/sprite/food/meat/beast_large_raw.vox b/assets/voxygen/voxel/sprite/food/meat/beast_large_raw.vox new file mode 100644 index 0000000000..edfe97d0eb --- /dev/null +++ b/assets/voxygen/voxel/sprite/food/meat/beast_large_raw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54e2b243ea6a8dc0ddc87ca48dee8318128abb6ce4a3b2e9dc326c4b2c1f4de3 +size 2928 diff --git a/assets/voxygen/voxel/sprite/food/meat/beef_small_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/beast_small_cooked.vox similarity index 100% rename from assets/voxygen/voxel/sprite/food/meat/beef_small_cooked.vox rename to assets/voxygen/voxel/sprite/food/meat/beast_small_cooked.vox diff --git a/assets/voxygen/voxel/sprite/food/meat/beef_small_raw.vox b/assets/voxygen/voxel/sprite/food/meat/beast_small_raw.vox similarity index 100% rename from assets/voxygen/voxel/sprite/food/meat/beef_small_raw.vox rename to assets/voxygen/voxel/sprite/food/meat/beast_small_raw.vox diff --git a/assets/voxygen/voxel/sprite/food/meat/beef_large_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/beef_large_cooked.vox deleted file mode 100644 index 95e2338f13..0000000000 --- a/assets/voxygen/voxel/sprite/food/meat/beef_large_cooked.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fda4a347ada5d48573f1175ec15bc0ce96bfbf3b54df4039d8fca33a7e69fcbe -size 1960 diff --git a/assets/voxygen/voxel/sprite/food/meat/beef_large_raw.vox b/assets/voxygen/voxel/sprite/food/meat/beef_large_raw.vox deleted file mode 100644 index ed65ba2321..0000000000 --- a/assets/voxygen/voxel/sprite/food/meat/beef_large_raw.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7fc577f840e04032b928549f18689ea0922a006327e9ec1124d82e626c8e94a -size 1960 diff --git a/assets/voxygen/voxel/sprite/food/meat/tough_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/tough_cooked.vox new file mode 100644 index 0000000000..fd82a0f9f8 --- /dev/null +++ b/assets/voxygen/voxel/sprite/food/meat/tough_cooked.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:467440b1e8c93a24d4ab31262eedb5e40f070bf52bbddc2885c9177b836da96e +size 1816 diff --git a/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox b/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox new file mode 100644 index 0000000000..988c21c22c --- /dev/null +++ b/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71bb21f8756acd87e1c9c2a47653553b17c07cd6b1bc81c2bce0ad9d58922e28 +size 1816