From ca907f1b877fe7ca5f81fff99b291a6797cec03d Mon Sep 17 00:00:00 2001 From: jshipsey Date: Tue, 4 May 2021 02:14:35 -0400 Subject: [PATCH] added some meat --- .../{fish.ron => meat/beef_large_cooked.ron} | 8 +++---- .../common/items/food/meat/beef_large_raw.ron | 22 +++++++++++++++++ .../items/food/meat/beef_small_cooked.ron | 22 +++++++++++++++++ .../common/items/food/meat/beef_small_raw.ron | 22 +++++++++++++++++ assets/common/items/food/meat/fish_cooked.ron | 22 +++++++++++++++++ assets/common/items/food/meat/fish_raw.ron | 22 +++++++++++++++++ .../creature/biped_large/saurok.ron | 2 +- .../loot_tables/creature/bird_medium.ron | 3 +-- assets/common/loot_tables/creature/fish.ron | 2 +- .../common/loot_tables/creature/humanoid.ron | 1 - .../loot_tables/creature/quad_low/default.ron | 5 ++-- .../creature/quad_medium/default.ron | 5 ++-- .../loot_tables/creature/quad_medium/ice.ron | 1 - .../creature/quad_small/default.ron | 1 - .../loot_tables/food/wild_ingredients.ron | 1 - .../loot_tables/sprite/chest-buried.ron | 1 - assets/common/loot_tables/sprite/chest.ron | 1 - assets/common/loot_tables/sprite/mud.ron | 1 - assets/common/recipe_book.ron | 14 +++++++++++ assets/voxygen/item_image_manifest.ron | 24 +++++++++++++++++-- .../sprite/food/meat/beef_large_cooked.vox | 3 +++ .../voxel/sprite/food/meat/beef_large_raw.vox | 3 +++ .../sprite/food/meat/beef_small_cooked.vox | 3 +++ .../voxel/sprite/food/meat/beef_small_raw.vox | 3 +++ .../voxel/sprite/food/meat/fish_cooked.vox | 3 +++ .../food/{meat_fish.vox => meat/fish_raw.vox} | 0 server/src/events/entity_manipulation.rs | 1 + 27 files changed, 174 insertions(+), 22 deletions(-) rename assets/common/items/food/{fish.ron => meat/beef_large_cooked.ron} (74%) create mode 100644 assets/common/items/food/meat/beef_large_raw.ron create mode 100644 assets/common/items/food/meat/beef_small_cooked.ron create mode 100644 assets/common/items/food/meat/beef_small_raw.ron create mode 100644 assets/common/items/food/meat/fish_cooked.ron create mode 100644 assets/common/items/food/meat/fish_raw.ron create mode 100644 assets/voxygen/voxel/sprite/food/meat/beef_large_cooked.vox create mode 100644 assets/voxygen/voxel/sprite/food/meat/beef_large_raw.vox create mode 100644 assets/voxygen/voxel/sprite/food/meat/beef_small_cooked.vox create mode 100644 assets/voxygen/voxel/sprite/food/meat/beef_small_raw.vox create mode 100644 assets/voxygen/voxel/sprite/food/meat/fish_cooked.vox rename assets/voxygen/voxel/sprite/food/{meat_fish.vox => meat/fish_raw.vox} (100%) diff --git a/assets/common/items/food/fish.ron b/assets/common/items/food/meat/beef_large_cooked.ron similarity index 74% rename from assets/common/items/food/fish.ron rename to assets/common/items/food/meat/beef_large_cooked.ron index 77041dbb32..5bc4ef4fe5 100644 --- a/assets/common/items/food/fish.ron +++ b/assets/common/items/food/meat/beef_large_cooked.ron @@ -1,13 +1,13 @@ ItemDef( - name: "Fish", - description: "A fresh seafood steak, chopped from a fish.", + name: "Cooked Slab of Beef", + description: "Medium Rare.", kind: Consumable( - kind: "Fish", + kind: "BeefLargeCooked", effect: [ Buff(( kind: Saturation, data: ( - strength: 5.0, + strength: 25.0, duration: Some(( secs: 10, nanos: 0, diff --git a/assets/common/items/food/meat/beef_large_raw.ron b/assets/common/items/food/meat/beef_large_raw.ron new file mode 100644 index 0000000000..04fca7cb57 --- /dev/null +++ b/assets/common/items/food/meat/beef_large_raw.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Raw Beef Slab", + description: "Chunk of animal meat, best after cooking.", + kind: Consumable( + kind: "BeefLargeRaw", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 15.0, + duration: Some(( + secs: 3, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/beef_small_cooked.ron b/assets/common/items/food/meat/beef_small_cooked.ron new file mode 100644 index 0000000000..ab2bf9b331 --- /dev/null +++ b/assets/common/items/food/meat/beef_small_cooked.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Cooked Sliver of Beef", + description: "Medium Rare.", + kind: Consumable( + kind: "BeefSmallCooked", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 15.0, + duration: Some(( + secs: 10, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/beef_small_raw.ron b/assets/common/items/food/meat/beef_small_raw.ron new file mode 100644 index 0000000000..d9ce4671db --- /dev/null +++ b/assets/common/items/food/meat/beef_small_raw.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Raw Beef Sliver", + description: "Small hunk of animal meat, best after cooking.", + kind: Consumable( + kind: "BeefSmallRaw", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 9.0, + duration: Some(( + secs: 3, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/fish_cooked.ron b/assets/common/items/food/meat/fish_cooked.ron new file mode 100644 index 0000000000..9ed8777a41 --- /dev/null +++ b/assets/common/items/food/meat/fish_cooked.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Cooked Fish", + description: "A fresh cooked seafood steak.", + kind: Consumable( + kind: "FishCooked", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 25.0, + duration: Some(( + secs: 10, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/items/food/meat/fish_raw.ron b/assets/common/items/food/meat/fish_raw.ron new file mode 100644 index 0000000000..ef5515e91c --- /dev/null +++ b/assets/common/items/food/meat/fish_raw.ron @@ -0,0 +1,22 @@ +ItemDef( + name: "Raw Fish", + description: "A steak chopped from a fish, best after cooking.", + kind: Consumable( + kind: "FishRaw", + effect: [ + Buff(( + kind: Saturation, + data: ( + strength: 15.0, + duration: Some(( + secs: 3, + nanos: 0, + )), + ), + cat_ids: [Natural], + )), + ] + ), + quality: Common, + tags: [Food], +) diff --git a/assets/common/loot_tables/creature/biped_large/saurok.ron b/assets/common/loot_tables/creature/biped_large/saurok.ron index 8dc9d108af..0d20129f77 100644 --- a/assets/common/loot_tables/creature/biped_large/saurok.ron +++ b/assets/common/loot_tables/creature/biped_large/saurok.ron @@ -1,5 +1,5 @@ [ - (7.0, LootTable("common.loot_tables.materials.common")), + (2.0, LootTable("common.loot_tables.materials.common")), // Consumables (0.5, Item("common.items.consumable.potion_minor")), // Ring diff --git a/assets/common/loot_tables/creature/bird_medium.ron b/assets/common/loot_tables/creature/bird_medium.ron index 0b7572577a..8b25c8a670 100644 --- a/assets/common/loot_tables/creature/bird_medium.ron +++ b/assets/common/loot_tables/creature/bird_medium.ron @@ -1,4 +1,3 @@ [ - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), - (1.0, LootTable("common.loot_tables.fallback")), + (1.0, Item("common.items.crafting_ing.leather_scraps")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/fish.ron b/assets/common/loot_tables/creature/fish.ron index edfafbbe43..29b683c09f 100644 --- a/assets/common/loot_tables/creature/fish.ron +++ b/assets/common/loot_tables/creature/fish.ron @@ -1,3 +1,3 @@ [ - (1.0, Item("common.items.food.fish")), + (1.0, Item("common.items.food.meat.fish_raw")), ] diff --git a/assets/common/loot_tables/creature/humanoid.ron b/assets/common/loot_tables/creature/humanoid.ron index 3547240baf..58dc68d62a 100644 --- a/assets/common/loot_tables/creature/humanoid.ron +++ b/assets/common/loot_tables/creature/humanoid.ron @@ -3,5 +3,4 @@ (1.0, LootTable("common.loot_tables.armor.swift")), (1.0, LootTable("common.loot_tables.armor.cloth")), (1.0, LootTable("common.loot_tables.weapons.starter")), - (1.0, LootTable("common.loot_tables.fallback")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/default.ron b/assets/common/loot_tables/creature/quad_low/default.ron index 0dd577cd0f..416cd6691f 100644 --- a/assets/common/loot_tables/creature/quad_low/default.ron +++ b/assets/common/loot_tables/creature/quad_low/default.ron @@ -1,5 +1,4 @@ [ - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), - (1.0, Item("common.items.crafting_ing.leather_scraps")), - (1.0, LootTable("common.loot_tables.fallback")), + (1.0, Item("common.items.food.meat.fish_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 c11cdc4259..d623d70ca7 100644 --- a/assets/common/loot_tables/creature/quad_medium/default.ron +++ b/assets/common/loot_tables/creature/quad_medium/default.ron @@ -1,4 +1,5 @@ [ - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), - (1.0, Item("common.items.crafting_ing.leather_scraps")), + (1.5, Item("common.items.food.meat.beef_small_raw")), + (0.5, Item("common.items.food.meat.beef_large_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/ice.ron b/assets/common/loot_tables/creature/quad_medium/ice.ron index ca7b5fde38..299e3d458d 100644 --- a/assets/common/loot_tables/creature/quad_medium/ice.ron +++ b/assets/common/loot_tables/creature/quad_medium/ice.ron @@ -1,5 +1,4 @@ [ - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), (1.0, Item("common.items.crafting_ing.leather_scraps")), (1.0, Item("common.items.crafting_ing.icy_fang")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_small/default.ron b/assets/common/loot_tables/creature/quad_small/default.ron index c11cdc4259..8b25c8a670 100644 --- a/assets/common/loot_tables/creature/quad_small/default.ron +++ b/assets/common/loot_tables/creature/quad_small/default.ron @@ -1,4 +1,3 @@ [ - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), (1.0, Item("common.items.crafting_ing.leather_scraps")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/food/wild_ingredients.ron b/assets/common/loot_tables/food/wild_ingredients.ron index 6af4f656da..cd99728eb1 100644 --- a/assets/common/loot_tables/food/wild_ingredients.ron +++ b/assets/common/loot_tables/food/wild_ingredients.ron @@ -1,6 +1,5 @@ [ (1.0, Item("common.items.food.apple")), - (0.3, Item("common.items.food.cheese")), (1.0, Item("common.items.food.coconut")), (1.5, Item("common.items.food.mushroom")), ] diff --git a/assets/common/loot_tables/sprite/chest-buried.ron b/assets/common/loot_tables/sprite/chest-buried.ron index 1d6ae13b6f..1dbfc39b6b 100644 --- a/assets/common/loot_tables/sprite/chest-buried.ron +++ b/assets/common/loot_tables/sprite/chest-buried.ron @@ -2,5 +2,4 @@ (1.0, LootTable("common.loot_tables.weapons.tier-1")), (1.0, LootTable("common.loot_tables.armor.cloth")), (1.0, LootTable("common.loot_tables.armor.swift")), - (1.0, LootTable("common.loot_tables.fallback")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/chest.ron b/assets/common/loot_tables/sprite/chest.ron index 98f99d2ec4..16c8c66572 100644 --- a/assets/common/loot_tables/sprite/chest.ron +++ b/assets/common/loot_tables/sprite/chest.ron @@ -4,5 +4,4 @@ (1.0, LootTable("common.loot_tables.armor.cloth")), (1.0, LootTable("common.loot_tables.armor.swift")), (0.1, LootTable("common.loot_tables.armor.plate")), - (1.0, LootTable("common.loot_tables.fallback")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/mud.ron b/assets/common/loot_tables/sprite/mud.ron index 74779a5e51..73389a2671 100644 --- a/assets/common/loot_tables/sprite/mud.ron +++ b/assets/common/loot_tables/sprite/mud.ron @@ -2,5 +2,4 @@ (1.0, LootTable("common.loot_tables.materials.common")), (1.0, LootTable("common.loot_tables.weapons.tier-0")), (1.0, LootTable("common.loot_tables.materials.underground")), - (1.0, LootTable("common.loot_tables.fallback")), ] \ No newline at end of file diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 5b1b11f81b..9096c0c554 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -143,6 +143,20 @@ ], craft_sprite: Some(CookingPot), ), + "fish_cooked": ( + output: ("common.items.food.meat.fish_cooked", 1), + inputs: [ + (Item("common.items.food.meat.fish_raw"), 1), + ], + craft_sprite: Some(CookingPot), + ), + "Beef_small_cooked": ( + output: ("common.items.food.meat.beef_small_cooked", 1), + inputs: [ + (Item("common.items.food.meat.beef_small_raw"), 1), + ], + craft_sprite: Some(CookingPot), + ), "salad_plain": ( output: ("common.items.food.plainsalad", 1), inputs: [ diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 561492b219..669eebb834 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1885,10 +1885,30 @@ "voxel.sprite.cabbage.cabbage", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), - Consumable("Fish"): VoxTrans( - "voxel.sprite.food.meat_fish", + Consumable("FishRaw"): VoxTrans( + "voxel.sprite.food.meat.fish_raw", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), + Consumable("FishCooked"): VoxTrans( + "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", + (0.0, 0.0, 0.0), (-50.0, 10.0, 0.0), 1.0, + ), + Consumable("BeefSmallCooked"): VoxTrans( + "voxel.sprite.food.meat.beef_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", + (-1.0, 0.0, 0.0), (-80.0, 40.0, 0.0), 0.8, + ), + Consumable("BeefLargeCooked"): VoxTrans( + "voxel.sprite.food.meat.beef_large_cooked", + (-1.0, 0.0, 0.0), (-80.0, 40.0, 0.0), 0.8, + ), Consumable("PlainSalad"): VoxTrans( "voxel.sprite.food.salad_plain", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, diff --git a/assets/voxygen/voxel/sprite/food/meat/beef_large_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/beef_large_cooked.vox new file mode 100644 index 0000000000..95e2338f13 --- /dev/null +++ b/assets/voxygen/voxel/sprite/food/meat/beef_large_cooked.vox @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000000..ed65ba2321 --- /dev/null +++ b/assets/voxygen/voxel/sprite/food/meat/beef_large_raw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7fc577f840e04032b928549f18689ea0922a006327e9ec1124d82e626c8e94a +size 1960 diff --git a/assets/voxygen/voxel/sprite/food/meat/beef_small_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/beef_small_cooked.vox new file mode 100644 index 0000000000..70b7223888 --- /dev/null +++ b/assets/voxygen/voxel/sprite/food/meat/beef_small_cooked.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69689ff227505bccfdbae0e2b436e75abef10ce275fe97ff3ded960cecef4a89 +size 1768 diff --git a/assets/voxygen/voxel/sprite/food/meat/beef_small_raw.vox b/assets/voxygen/voxel/sprite/food/meat/beef_small_raw.vox new file mode 100644 index 0000000000..6fe7a11372 --- /dev/null +++ b/assets/voxygen/voxel/sprite/food/meat/beef_small_raw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:057cc3e21725e6c7b59732869bec6efc274df8c72ba02efb9b0c806cd5ff008d +size 1768 diff --git a/assets/voxygen/voxel/sprite/food/meat/fish_cooked.vox b/assets/voxygen/voxel/sprite/food/meat/fish_cooked.vox new file mode 100644 index 0000000000..92fc650944 --- /dev/null +++ b/assets/voxygen/voxel/sprite/food/meat/fish_cooked.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bcc3d957abf63b5412a5b0878499c36cb3e17537dd97bb1d82a4b67c401b1db +size 1720 diff --git a/assets/voxygen/voxel/sprite/food/meat_fish.vox b/assets/voxygen/voxel/sprite/food/meat/fish_raw.vox similarity index 100% rename from assets/voxygen/voxel/sprite/food/meat_fish.vox rename to assets/voxygen/voxel/sprite/food/meat/fish_raw.vox diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 720d4e6036..36387b20fd 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -370,6 +370,7 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc Some(common::comp::Body::BirdMedium(_)) => { "common.loot_tables.creature.bird_medium" }, + Some(common::comp::Body::BirdLarge(_)) => "common.loot_tables.creature.bird_medium", Some(common::comp::Body::FishMedium(_)) => "common.loot_tables.creature.fish", Some(common::comp::Body::FishSmall(_)) => "common.loot_tables.creature.fish", Some(common::comp::Body::BipedLarge(biped_large)) => match biped_large.species {