mirror of
https://github.com/neoStudiosLCE/neoLegacy.git
synced 2026-07-27 03:37:09 +00:00
Merge remote-tracking branch 'origin/main' into exp/worldgen
This commit is contained in:
commit
2b4a5d1e8c
|
|
@ -38,6 +38,8 @@ void ClothDyeRecipes::addRecipes(Recipes *r)
|
||||||
}
|
}
|
||||||
|
|
||||||
// some dye recipes
|
// some dye recipes
|
||||||
|
|
||||||
|
//flowers
|
||||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::YELLOW),
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::YELLOW),
|
||||||
L"tg",
|
L"tg",
|
||||||
Tile::flower,L'D');
|
Tile::flower,L'D');
|
||||||
|
|
@ -46,6 +48,44 @@ void ClothDyeRecipes::addRecipes(Recipes *r)
|
||||||
L"tg",
|
L"tg",
|
||||||
Tile::rose,L'D');
|
Tile::rose,L'D');
|
||||||
|
|
||||||
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::LIGHT_BLUE),
|
||||||
|
L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::BLUE_ORCHID), L'D');
|
||||||
|
|
||||||
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::MAGENTA),
|
||||||
|
L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::ALLIUM), L'D');
|
||||||
|
|
||||||
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::SILVER),
|
||||||
|
L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::AZURE_BLUET), L'D');
|
||||||
|
|
||||||
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||||
|
L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::RED_TULIP), L'D');
|
||||||
|
|
||||||
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK),
|
||||||
|
L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::PINK_TULIP), L'D');
|
||||||
|
|
||||||
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::SILVER),
|
||||||
|
L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::WHITE_TULIP), L'D');
|
||||||
|
|
||||||
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::ORANGE),
|
||||||
|
L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::ORANGE_TULIP), L'D');
|
||||||
|
|
||||||
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::SILVER),
|
||||||
|
L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::OXEYE_DAISY), L'D');
|
||||||
|
|
||||||
|
// Tall flowers
|
||||||
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::YELLOW),
|
||||||
|
L"zg", new ItemInstance(Item::items[Tile::tallgrass2_Id], 1, TallGrass2::SUNFLOWER), L'D');
|
||||||
|
|
||||||
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::MAGENTA),
|
||||||
|
L"zg", new ItemInstance(Item::items[Tile::tallgrass2_Id], 1, TallGrass2::LILAC), L'D');
|
||||||
|
|
||||||
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::RED),
|
||||||
|
L"zg", new ItemInstance(Item::items[Tile::tallgrass2_Id], 1, TallGrass2::ROSE_BUSH), L'D');
|
||||||
|
|
||||||
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::MAGENTA),
|
||||||
|
L"zg", new ItemInstance(Item::items[Tile::tallgrass2_Id], 1, TallGrass2::PEONY), L'D');
|
||||||
|
|
||||||
|
|
||||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::WHITE),
|
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::WHITE),
|
||||||
L"ig",
|
L"ig",
|
||||||
Item::bone,L'D');
|
Item::bone,L'D');
|
||||||
|
|
@ -114,6 +154,9 @@ void ClothDyeRecipes::addRecipes(Recipes *r)
|
||||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for (int i = 0; i < 16; i++)
|
for (int i = 0; i < 16; i++)
|
||||||
{
|
{
|
||||||
r->addShapedRecipy(new ItemInstance(Tile::woolCarpet, 3, i),
|
r->addShapedRecipy(new ItemInstance(Tile::woolCarpet, 3, i),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue