Christmas Cleanup

This commit is contained in:
Youssef Fahmy 2021-12-30 18:58:15 +00:00 committed by Ben Wallis
parent b8b6192a70
commit 9cd87b1af7
4 changed files with 12 additions and 22 deletions

View File

@ -7,17 +7,17 @@
Armor(Feet): Item("common.items.armor.leather_plate.foot"),
Armor(Head): Choice([
// 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"))),
]),
Lantern: Choice([
//(1.0, Some(Item("common.items.lantern.black_0"))),
//(2.0, None),
(1.0, Some(Item("common.items.lantern.black_0"))),
(2.0, None),
// Christmas event
(1.0, Some(Item("common.items.lantern.blue_0"))),
(1.0, Some(Item("common.items.lantern.polaris"))),
(2.0, Some(Item("common.items.lantern.red_0"))),
(2.0, Some(Item("common.items.lantern.green_0"))),
//(1.0, Some(Item("common.items.lantern.blue_0"))),
//(1.0, Some(Item("common.items.lantern.polaris"))),
//(2.0, Some(Item("common.items.lantern.red_0"))),
//(2.0, Some(Item("common.items.lantern.green_0"))),
]),
})

View File

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

View File

@ -1,6 +1,4 @@
[
(4.0, ItemQuantity("common.items.food.blue_cheese", 1, 15)),
(3.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")),
(3.0, ItemQuantity("common.items.food.blue_cheese", 1, 15)),
(1.0, Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap")),
]

View File

@ -296,14 +296,6 @@
],
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": (
output: ("common.items.crafting_ing.cloth.cotton", 1),
inputs: [