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

Browse Source 
Christmas Cleanup

See merge request veloren/veloren!3079
This commit is contained in:
Ben Wallis 2021-12-30 18:58:16 +00:00
commit 7aa799e562
4 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assets/common/loadout/village/guard.ron
View File

@ -7,17 +7,17 @@
Armor(Feet): Item("common.items.armor.leather_plate.foot"), Armor(Feet): Item("common.items.armor.leather_plate.foot"),
Armor(Head): Choice([ Armor(Head): Choice([
// Christmas event // Christmas event
(1.0, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))), //(1.0, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
(2.0, Some(Item("common.items.armor.misc.head.helmet"))), (2.0, Some(Item("common.items.armor.misc.head.helmet"))),
]), ]),
Lantern: Choice([ Lantern: Choice([
//(1.0, Some(Item("common.items.lantern.black_0"))), (1.0, Some(Item("common.items.lantern.black_0"))),
//(2.0, None), (2.0, None),
// Christmas event // Christmas event
(1.0, Some(Item("common.items.lantern.blue_0"))), //(1.0, Some(Item("common.items.lantern.blue_0"))),
(1.0, Some(Item("common.items.lantern.polaris"))), //(1.0, Some(Item("common.items.lantern.polaris"))),
(2.0, Some(Item("common.items.lantern.red_0"))), //(2.0, Some(Item("common.items.lantern.red_0"))),
(2.0, Some(Item("common.items.lantern.green_0"))), //(2.0, Some(Item("common.items.lantern.green_0"))),
]), ]),
}) })

6
assets/common/loadout/village/villager.ron
View File

@ -21,8 +21,8 @@
]), ]),
Armor(Head): Choice([ Armor(Head): Choice([
// Christmas event // Christmas event
(1.0, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))), //(1.0, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
//(1.0, Some(Item("common.items.armor.misc.head.straw"))), (1.0, Some(Item("common.items.armor.misc.head.straw"))),
//(2.0, None), (2.0, None),
]), ]),
}) })

6
assets/common/loot_tables/calendar/christmas/yeti.ron
View File

@ -1,6 +1,4 @@
[ [
(4.0, ItemQuantity("common.items.food.blue_cheese", 1, 15)), (3.0, ItemQuantity("common.items.food.blue_cheese", 1, 15)),
(3.0, Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap")), (1.0, Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap")),
(2.0, Item("common.items.armor.misc.head.boreal_warhelm")),
(1.0, Item("common.items.lantern.polaris")),
] ]

8
assets/common/recipe_book.ron
View File

@ -296,14 +296,6 @@
], ],
craft_sprite: Some(Forge), craft_sprite: Some(Forge),
), ),
// Only for Christmas event so remove once done
"diamonds": (
output: ("common.items.mineral.gem.diamond", 1),
inputs: [
(Item("common.items.mineral.ore.coal"), 20),
],
craft_sprite: Some(Forge),
),
"cotton": ( "cotton": (
output: ("common.items.crafting_ing.cloth.cotton", 1), output: ("common.items.crafting_ing.cloth.cotton", 1),
inputs: [ inputs: [