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 'fix' into 'master'

Browse Source 
mig fix

See merge request veloren/veloren!2393
This commit is contained in:
Marcel 2021-06-07 13:59:57 +00:00
commit 32336be160
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/migrations/V40__meat_fix.sql Normal file
View File

@ -0,0 +1,5 @@
-- xx
UPDATE item
SET item_definition_id = 'common.items.crafting_ing.cloth.linen_red' WHERE item_definition_id = 'common.items.crafting_ing.cloth_scraps_red';
UPDATE item
SET item_definition_id = 'common.items.crafting_ing.cloth.linen' WHERE item_definition_id = 'common.items.crafting_ing.cloth_scraps';

4
world/src/layer/scatter.rs
View File

@ -163,10 +163,10 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
((c.rockiness - 0.5).max(0.025) * 1.0e-3, None)
}),
(Copper, false, |c, _| {
((c.rockiness - 0.1).max(0.025) * 1.5e-3, None)
((c.rockiness - 0.5).max(0.0) * 1.5e-3, None)
}),
(Tin, false, |c, _| {
((c.rockiness - 0.5).max(0.025) * 1.5e-3, None)
((c.rockiness - 0.5).max(0.0) * 1.5e-3, None)
}),
// Don't spawn Mushrooms in snowy regions
(Mushroom, false, |c, _| {