mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
added some meat
This commit is contained in:
parent
af874af771
commit
ca907f1b87
@ -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,
|
22
assets/common/items/food/meat/beef_large_raw.ron
Normal file
22
assets/common/items/food/meat/beef_large_raw.ron
Normal file
@ -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],
|
||||
)
|
22
assets/common/items/food/meat/beef_small_cooked.ron
Normal file
22
assets/common/items/food/meat/beef_small_cooked.ron
Normal file
@ -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],
|
||||
)
|
22
assets/common/items/food/meat/beef_small_raw.ron
Normal file
22
assets/common/items/food/meat/beef_small_raw.ron
Normal file
@ -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],
|
||||
)
|
22
assets/common/items/food/meat/fish_cooked.ron
Normal file
22
assets/common/items/food/meat/fish_cooked.ron
Normal file
@ -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],
|
||||
)
|
22
assets/common/items/food/meat/fish_raw.ron
Normal file
22
assets/common/items/food/meat/fish_raw.ron
Normal file
@ -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],
|
||||
)
|
@ -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
|
||||
|
@ -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")),
|
||||
]
|
@ -1,3 +1,3 @@
|
||||
[
|
||||
(1.0, Item("common.items.food.fish")),
|
||||
(1.0, Item("common.items.food.meat.fish_raw")),
|
||||
]
|
||||
|
@ -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")),
|
||||
]
|
@ -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")),
|
||||
]
|
@ -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")),
|
||||
]
|
@ -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")),
|
||||
]
|
@ -1,4 +1,3 @@
|
||||
[
|
||||
(1.0, LootTable("common.loot_tables.food.wild_ingredients")),
|
||||
(1.0, Item("common.items.crafting_ing.leather_scraps")),
|
||||
]
|
@ -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")),
|
||||
]
|
||||
|
@ -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")),
|
||||
]
|
@ -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")),
|
||||
]
|
@ -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")),
|
||||
]
|
@ -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: [
|
||||
|
@ -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,
|
||||
|
BIN
assets/voxygen/voxel/sprite/food/meat/beef_large_cooked.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/food/meat/beef_large_cooked.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/food/meat/beef_large_raw.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/food/meat/beef_large_raw.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/food/meat/beef_small_cooked.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/food/meat/beef_small_cooked.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/food/meat/beef_small_raw.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/food/meat/beef_small_raw.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/sprite/food/meat/fish_cooked.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/sprite/food/meat/fish_cooked.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user