Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mossdrake_and_wood_fix' into 'master'

Browse Source 
reduce mossdrake, fix woodgolem loottable

See merge request veloren/veloren!3700
This commit is contained in:
Justin Shipsey 2022-11-21 14:22:16 +00:00
commit a75b1bc21c
7 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/common/loot_tables/creature/quad_low/moss.ron
View File

@ -1,5 +1,4 @@
[ [
(1.0, Item("common.items.crafting_ing.hide.animal_hide")),
(1.0, Item("common.items.crafting_ing.resin")), (1.0, Item("common.items.crafting_ing.resin")),
(1.0, Item("common.items.log.hardwood")), (1.0, Item("common.items.log.hardwood")),
(1.0, Item("common.items.flowers.plant_fiber")), (1.0, Item("common.items.flowers.plant_fiber")),

3
assets/common/loot_tables/dungeon/tier-0/woodgolem.ron
View File

@ -6,7 +6,6 @@
// Consumables // Consumables
(2.0, LootTable("common.loot_tables.consumable.poor")), (2.0, LootTable("common.loot_tables.consumable.poor")),
// Crafting ingredients // Crafting ingredients
(1.0, ItemQuantity("common.items.log.hardwood", 5, 10)), (1.0, ItemQuantity("common.items.log.wood", 5, 10)),
(0.5, LootTable("common.loot_tables.weapons.components.secondary.sceptre")), (0.5, LootTable("common.loot_tables.weapons.components.secondary.sceptre")),
(1.0, Item("common.items.crafting_ing.resin")),
] ]

1
assets/world/wildlife/spawn/jungle/rainforest.ron
View File

@ -14,6 +14,7 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.aggressive.mighty_saurok")), (1, (1, 1, "common.entity.wild.aggressive.mighty_saurok")),
(1, (1, 1, "common.entity.wild.aggressive.occult_saurok")), (1, (1, 1, "common.entity.wild.aggressive.occult_saurok")),
(1, (1, 1, "common.entity.wild.aggressive.sly_saurok")), (1, (1, 1, "common.entity.wild.aggressive.sly_saurok")),
(1, (1, 1, "common.entity.wild.aggressive.mossdrake")),
], ],
spawn_mode: Land, spawn_mode: Land,
day_period: [Morning, Noon, Evening], day_period: [Morning, Noon, Evening],

1
assets/world/wildlife/spawn/jungle/rainforest_area.ron
View File

@ -14,7 +14,6 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.aggressive.stag_beetle")), (1, (1, 1, "common.entity.wild.aggressive.stag_beetle")),
(1, (1, 1, "common.entity.wild.peaceful.crawler_moss")), (1, (1, 1, "common.entity.wild.peaceful.crawler_moss")),
(1, (1, 1, "common.entity.wild.aggressive.rootsnapper")), (1, (1, 1, "common.entity.wild.aggressive.rootsnapper")),
(1, (1, 1, "common.entity.wild.aggressive.mossdrake")),
], ],
spawn_mode: Land, spawn_mode: Land,
day_period: [Morning, Noon, Evening], day_period: [Morning, Noon, Evening],

1
assets/world/wildlife/spawn/temperate/rare.ron
View File

@ -7,7 +7,6 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.aggressive.ogre")), (1, (1, 1, "common.entity.wild.aggressive.ogre")),
(1, (1, 1, "common.entity.wild.aggressive.swamp_troll")), (1, (1, 1, "common.entity.wild.aggressive.swamp_troll")),
(1, (1, 1, "common.entity.wild.aggressive.cyclops")), (1, (1, 1, "common.entity.wild.aggressive.cyclops")),
(1, (1, 1, "common.entity.wild.aggressive.mossdrake")),
], ],
spawn_mode: Land, spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening], day_period: [Night, Morning, Noon, Evening],

1
assets/world/wildlife/spawn/tropical/rainforest.ron
View File

@ -6,7 +6,6 @@ SpawnEntry (
groups: [ groups: [
(1, (1, 2, "common.entity.wild.aggressive.male_lion")), (1, (1, 2, "common.entity.wild.aggressive.male_lion")),
(1, (1, 3, "common.entity.wild.aggressive.hyena")), (1, (1, 3, "common.entity.wild.aggressive.hyena")),
(1, (1, 1, "common.entity.wild.aggressive.mossdrake")),
], ],
spawn_mode: Land, spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening], day_period: [Night, Morning, Noon, Evening],

8
voxygen/anim/src/theropod/mod.rs
View File

@ -157,7 +157,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Sunlizard, _) => (2.0, -2.5), (Sunlizard, _) => (2.0, -2.5),
(Yale, _) => (2.0, -9.5), (Yale, _) => (2.0, -9.5),
(Dodarock, _) => (0.0, -5.0), (Dodarock, _) => (0.0, -5.0),
(Ntouka, _) => (0.0, 0.0), (Ntouka, _) => (0.0, -4.0),
}, },
neck: match (body.species, body.body_type) { neck: match (body.species, body.body_type) {
(Archaeos, _) => (4.5, -2.0), (Archaeos, _) => (4.5, -2.0),
@ -209,10 +209,10 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Sandraptor, _) => (-10.5, 0.5), (Sandraptor, _) => (-10.5, 0.5),
(Snowraptor, _) => (-10.5, 1.0), (Snowraptor, _) => (-10.5, 1.0),
(Woodraptor, _) => (-10.5, 0.5), (Woodraptor, _) => (-10.5, 0.5),
(Sunlizard, _) => (-10.0, -1.5), (Sunlizard, _) => (-10.0, -0.5),
(Yale, _) => (-5.0, -2.5), (Yale, _) => (-5.0, -2.5),
(Dodarock, _) => (-8.5, -2.0), (Dodarock, _) => (-8.5, -2.0),
(Ntouka, _) => (-9.5, -2.5), (Ntouka, _) => (-9.5, -2.0),
}, },
hand: match (body.species, body.body_type) { hand: match (body.species, body.body_type) {
(Archaeos, _) => (3.0, 0.0, -4.0), (Archaeos, _) => (3.0, 0.0, -4.0),
@ -223,7 +223,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Sunlizard, _) => (2.5, 1.5, -0.5), (Sunlizard, _) => (2.5, 1.5, -0.5),
(Yale, _) => (3.0, 2.0, -0.5), (Yale, _) => (3.0, 2.0, -0.5),
(Dodarock, _) => (3.5, 3.0, -5.0), (Dodarock, _) => (3.5, 3.0, -5.0),
(Ntouka, _) => (3.5, 3.0, 1.0), (Ntouka, _) => (3.5, 3.0, -4.0),
}, },
leg: match (body.species, body.body_type) { leg: match (body.species, body.body_type) {
(Archaeos, _) => (2.5, -3.0, -4.0), (Archaeos, _) => (2.5, -3.0, -4.0),