Merge branch 'pr-3' into TU43
This commit is contained in:
Fireblade
@@ -14,14 +14,14 @@ void ClothDyeRecipes::addRecipes(Recipes *r)
|
||||
{
|
||||
r->addShapelessRecipy(new ItemInstance(Tile::wool, 1, ColoredTile::getItemAuxValueForTileData(i)), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, i), new ItemInstance(Item::items[Tile::wool_Id], 1, 0),L'D');
|
||||
r->addShapedRecipy(new ItemInstance(Tile::clayHardened_colored, 8, ColoredTile::getItemAuxValueForTileData(i)), //
|
||||
new ItemInstance(Item::dye, 1, i), new ItemInstance(Item::items[Tile::wool_Id], 1, 0),L'D');
|
||||
r->addShapedRecipy(new ItemInstance(Tile::stained_hardened_clay, 8, ColoredTile::getItemAuxValueForTileData(i)), //
|
||||
L"sssczczg",
|
||||
L"###",
|
||||
L"#X#",
|
||||
L"###",
|
||||
L'#', new ItemInstance(Tile::clayHardened),
|
||||
L'X', new ItemInstance(Item::dye_powder, 1, i),L'D');
|
||||
L'X', new ItemInstance(Item::dye, 1, i),L'D');
|
||||
|
||||
//#if 0
|
||||
// r->addShapedRecipy(new ItemInstance(Tile::stained_glass, 8, ColoredTile::getItemAuxValueForTileData(i)), //
|
||||
@@ -30,7 +30,7 @@ void ClothDyeRecipes::addRecipes(Recipes *r)
|
||||
// L"#X#",
|
||||
// L"###",
|
||||
// L'#', new ItemInstance(Tile::glass),
|
||||
// L'X', new ItemInstance(Item::dye_powder, 1, i), L'D');
|
||||
// L'X', new ItemInstance(Item::dye, 1, i), L'D');
|
||||
// r->addShapedRecipy(new ItemInstance(Tile::stained_glass_pane, 16, i), //
|
||||
// L"ssczg",
|
||||
// L"###",
|
||||
@@ -40,129 +40,81 @@ void ClothDyeRecipes::addRecipes(Recipes *r)
|
||||
}
|
||||
|
||||
// some dye recipes
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::YELLOW),
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 1, DyePowderItem::YELLOW),
|
||||
L"tg",
|
||||
Tile::flower,L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::RED),
|
||||
L"tg",
|
||||
Tile::rose,L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::LIGHT_BLUE),
|
||||
L"zg",
|
||||
new ItemInstance(Tile::rose, 1, Rose::BLUE_ORCHID),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::MAGENTA),
|
||||
L"zg",
|
||||
new ItemInstance(Tile::rose, 1, Rose::ALLIUM),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::SILVER),
|
||||
L"zg",
|
||||
new ItemInstance(Tile::rose, 1, Rose::AZURE_BLUET),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
L"zg",
|
||||
new ItemInstance(Tile::rose, 1, Rose::RED_TULIP),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::ORANGE),
|
||||
L"zg",
|
||||
new ItemInstance(Tile::rose, 1, Rose::ORANGE_TULIP),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::SILVER),
|
||||
L"zg",
|
||||
new ItemInstance(Tile::rose, 1, Rose::WHITE_TULIP),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK),
|
||||
L"zg",
|
||||
new ItemInstance(Tile::rose, 1, Rose::PINK_TULIP),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::SILVER),
|
||||
L"zg",
|
||||
new ItemInstance(Tile::rose, 1, Rose::OXEYE_DAISY),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::WHITE),
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 3, DyePowderItem::WHITE),
|
||||
L"ig",
|
||||
Item::bone,L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::YELLOW),
|
||||
L"zg",
|
||||
new ItemInstance(Tile::tallgrass2, 1, TallGrass2::SUNFLOWER),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::MAGENTA),
|
||||
L"zg",
|
||||
new ItemInstance(Tile::tallgrass2, 1, TallGrass2::LILAC),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::RED),
|
||||
L"zg",
|
||||
new ItemInstance(Tile::tallgrass2, 1, TallGrass2::ROSE_BUSH),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::PINK),
|
||||
L"zg",
|
||||
new ItemInstance(Tile::tallgrass2, 1, TallGrass2::PEONY),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::PINK), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::PINK), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::ORANGE), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::ORANGE), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::YELLOW),L'D');
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::YELLOW),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::LIME), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::LIME), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::GREEN),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::GRAY), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::GRAY), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::BLACK),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::SILVER), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::SILVER), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::GRAY),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::GRAY),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::SILVER), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 3, DyePowderItem::SILVER), //
|
||||
L"zzzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::BLACK),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::LIGHT_BLUE), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::LIGHT_BLUE), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::CYAN), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::CYAN), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN),L'D');
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::GREEN),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::PURPLE), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::PURPLE), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),L'D');
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::RED),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::MAGENTA), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::MAGENTA), //
|
||||
L"zzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::PURPLE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK),L'D');
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::PURPLE),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::PINK),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::MAGENTA), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 3, DyePowderItem::MAGENTA), //
|
||||
L"zzzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK),L'D');
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::PINK),L'D');
|
||||
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 4, DyePowderItem::MAGENTA), //
|
||||
r->addShapelessRecipy(new ItemInstance(Item::dye, 4, DyePowderItem::MAGENTA), //
|
||||
L"zzzzg",
|
||||
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
|
||||
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, 1, DyePowderItem::BLUE),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::RED),
|
||||
new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D');
|
||||
|
||||
for (int i = 0; i < 16; i++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user