Skip to content

Commit

Permalink
Feedback from testing thread implemented #416
Browse files Browse the repository at this point in the history
  • Loading branch information
@brightrim
brightrim committed Jul 27, 2024
1 parent c0d56a9 commit 0751aef
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 10 deletions.
7 changes: 7 additions & 0 deletions housing/construction.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,22 @@ local function loadIngredients(object)
local ingredient = object["ingredient" .. i]
local amount = object["ingredient".. i .. "Amount"]
if ingredient then

-- Ingredient gets loaded
table.insert(ingredients,{id = ingredient, quantity = amount, data = {}})

-- Now all there's left to do is to handle the remnants
local bucketItems = { Item.bucketOfWater, Item.blackDye, Item.greenDye, Item.blueDye, Item.redDye, Item.yellowDye, Item.whiteDye}

for _, bucketItem in pairs(bucketItems) do
if ingredient == bucketItem then
table.insert(remnants, {id = Item.bucket, quantity = amount, data = {}})
end
end

if ingredient == Item.bottleOfInk then
table.insert(remnants, {id = Item.emptyInkBottle, quantity = amount, data = {}})
end
end
end
return ingredients, remnants
Expand Down
25 changes: 15 additions & 10 deletions housing/itemList.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ table.insert(M.items, {itemId = 920, typeOf = "Estate", category = "Doors", name
table.insert(M.items, {itemId = 922, typeOf = "Estate", category = "Doors", nameDe = "Tür - Westen", nameEn = "Door West", skill = "carpentry", level = 50, ingredient1 = 2716, ingredient1Amount = 30, ingredient2 = 733, ingredient2Amount = 10, ingredient3 = 26, ingredient3Amount = 5, ingredient4 = 2738, ingredient4Amount = 25})
table.insert(M.items, {itemId = 925, typeOf = "Estate", category = "Doors", nameDe = "Tür - Norden", nameEn = "Door North", skill = "carpentry", level = 50, ingredient1 = 2716, ingredient1Amount = 30, ingredient2 = 733, ingredient2Amount = 10, ingredient3 = 26, ingredient3Amount = 5, ingredient4 = 2738, ingredient4Amount = 25})
table.insert(M.items, {itemId = 926, typeOf = "Estate", category = "Doors", nameDe = "Tür - Osten", nameEn = "Door East", skill = "carpentry", level = 50, ingredient1 = 2716, ingredient1Amount = 30, ingredient2 = 733, ingredient2Amount = 10, ingredient3 = 26, ingredient3Amount = 5, ingredient4 = 2738, ingredient4Amount = 25})
table.insert(M.items, {itemId = 972, typeOf = "Estate", category = "Arches", nameDe = "Linker Bogen - Norden", nameEn = "Left Arch North", skill = "mining", level = 40, ingredient1 = 2588, ingredient1Amount = 15, ingredient2 = 26, ingredient2Amount = 5, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 973, typeOf = "Estate", category = "Arches", nameDe = "Rechter Bogen - Norden", nameEn = "Right Arch North", skill = "mining", level = 40, ingredient1 = 2588, ingredient1Amount = 15, ingredient2 = 26, ingredient2Amount = 5, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 974, typeOf = "Estate", category = "Arches", nameDe = "Linker Bogen - Osten", nameEn = "Left Arch East", skill = "mining", level = 40, ingredient1 = 2588, ingredient1Amount = 15, ingredient2 = 26, ingredient2Amount = 5, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 975, typeOf = "Estate", category = "Arches", nameDe = "Rechter Bogen - Osten", nameEn = "Right Arch East", skill = "mining", level = 40, ingredient1 = 2588, ingredient1Amount = 15, ingredient2 = 26, ingredient2Amount = 5, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 972, typeOf = "Estate", category = "Arches", nameDe = "Linker Bogen - Norden", nameEn = "Left Arch North", skill = "mining", level = 40, ingredient1 = Item.stoneBlock, ingredient1Amount = 15, ingredient2 = Item.clay, ingredient2Amount = 5, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 973, typeOf = "Estate", category = "Arches", nameDe = "Rechter Bogen - Norden", nameEn = "Right Arch North", skill = "mining", level = 40, ingredient1 = Item.stoneBlock, ingredient1Amount = 15, ingredient2 = Item.clay, ingredient2Amount = 5, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 974, typeOf = "Estate", category = "Arches", nameDe = "Linker Bogen - Osten", nameEn = "Left Arch East", skill = "mining", level = 40, ingredient1 = Item.stoneBlock, ingredient1Amount = 15, ingredient2 = Item.clay, ingredient2Amount = 5, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 975, typeOf = "Estate", category = "Arches", nameDe = "Rechter Bogen - Osten", nameEn = "Right Arch East", skill = "mining", level = 40, ingredient1 = Item.stoneBlock, ingredient1Amount = 15, ingredient2 = Item.clay, ingredient2Amount = 5, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 1108, typeOf = "Estate", category = "Doors", nameDe = "Tür - Norden", nameEn = "Door North", skill = "carpentry", level = 50, ingredient1 = 546, ingredient1Amount = 25, ingredient2 = 733, ingredient2Amount = 10, ingredient3 = 21, ingredient3Amount = 10, ingredient4 = 2738, ingredient4Amount = 25})
table.insert(M.items, {itemId = 1109, typeOf = "Estate", category = "Doors", nameDe = "Tür - Süden", nameEn = "Door South", skill = "carpentry", level = 50, ingredient1 = 546, ingredient1Amount = 25, ingredient2 = 733, ingredient2Amount = 10, ingredient3 = 21, ingredient3Amount = 10, ingredient4 = 2738, ingredient4Amount = 25})
table.insert(M.items, {itemId = 1110, typeOf = "Estate", category = "Doors", nameDe = "Tür - Westen", nameEn = "Door West", skill = "carpentry", level = 50, ingredient1 = 546, ingredient1Amount = 25, ingredient2 = 733, ingredient2Amount = 10, ingredient3 = 21, ingredient3Amount = 10, ingredient4 = 2738, ingredient4Amount = 25})
Expand Down Expand Up @@ -266,8 +266,8 @@ table.insert(M.items, {itemId = 874, typeOf = "Estate", category = "Walls", name
table.insert(M.items, {itemId = 875, typeOf = "Estate", category = "Walls", nameDe = "Ziegelpfeiler - Nordwesten", nameEn = "Brick Pillar Northwest", skill = "pottery", level = 40, ingredient1 = 2588, ingredient1Amount = 10, ingredient2 = 26, ingredient2Amount = 5, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 876, typeOf = "Estate", category = "Walls", nameDe = "Ziegelpfeiler - Nordosten", nameEn = "Brick Pillar Northeast", skill = "pottery", level = 40, ingredient1 = 2588, ingredient1Amount = 10, ingredient2 = 26, ingredient2Amount = 5, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 921, typeOf = "Estate", category = "Walls", nameDe = "Steinmauer - Osten", nameEn = "Stone Wall East", skill = "mining", level = 40, ingredient1 = 733, ingredient1Amount = 40, ingredient2 = 26, ingredient2Amount = 10, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 970, typeOf = "Estate", category = "Walls", nameDe = "Ziegelmauer - Norden", nameEn = "Brick Wall North", skill = "pottery", level = 40, ingredient1 = 2588, ingredient1Amount = 40, ingredient2 = 26, ingredient2Amount = 10, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 971, typeOf = "Estate", category = "Walls", nameDe = "Ziegelmauer - Osten", nameEn = "Brick Wall East", skill = "pottery", level = 40, ingredient1 = 2588, ingredient1Amount = 40, ingredient2 = 26, ingredient2Amount = 10, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 970, typeOf = "Estate", category = "Walls", nameDe = "Ziegelmauer - Norden", nameEn = "Brick Wall North", skill = "mining", level = 40, ingredient1 = Item.stoneBlock, ingredient1Amount = 40, ingredient2 = Item.clay, ingredient2Amount = 10, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 971, typeOf = "Estate", category = "Walls", nameDe = "Ziegelmauer - Osten", nameEn = "Brick Wall East", skill = "mining", level = 40, ingredient1 = Item.stoneBlock, ingredient1Amount = 40, ingredient2 = Item.clay, ingredient2Amount = 10, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 985, typeOf = "Estate", category = "Walls", nameDe = "Ziegelmauer - Nordosten", nameEn = "Brick Wall Northeast", skill = "pottery", level = 40, ingredient1 = 2588, ingredient1Amount = 40, ingredient2 = 26, ingredient2Amount = 10, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 986, typeOf = "Estate", category = "Walls", nameDe = "Ziegelmauer - Süden", nameEn = "Brick Wall South", skill = "pottery", level = 40, ingredient1 = 2588, ingredient1Amount = 40, ingredient2 = 26, ingredient2Amount = 10, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 987, typeOf = "Estate", category = "Walls", nameDe = "Ziegelmauer - Westen", nameEn = "Brick Wall West", skill = "pottery", level = 40, ingredient1 = 2588, ingredient1Amount = 40, ingredient2 = 26, ingredient2Amount = 10, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
Expand Down Expand Up @@ -1093,8 +1093,8 @@ table.insert(M.items, {itemId = Item.greenSpiderEgg, typeOf = "House", category
table.insert(M.items, {itemId = Item.redSpiderEgg, typeOf = "House", category = "Small Decorations", skill = "misc", level = 0, ingredient1 = Item.spiderEgg, ingredient1Amount = 1, ingredient2 = Item.redDye, ingredient2Amount = 1, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 1174, typeOf = "House", category = "Small Decorations", skill = "misc", level = 0, ingredient1 = Item.spiderEgg, ingredient1Amount = 3, ingredient2 = Item.greenDye, ingredient2Amount = 3, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 1175, typeOf = "House", category = "Small Decorations", skill = "misc", level = 0, ingredient1 = Item.spiderEgg, ingredient1Amount = 3, ingredient2 = Item.redDye, ingredient2Amount = 3, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3784, typeOf = "House", category = "Wall Decorations", skill = "carpentry", level = 60, ingredient1 = Item.coniferWoodBoards, ingredient1Amount = 50, ingredient2 = Item.whiteDye, ingredient2Amount = 2, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3783, typeOf = "House", category = "Wall Decorations", skill = "carpentry", level = 60, ingredient1 = Item.coniferWoodBoards, ingredient1Amount = 50, ingredient2 = Item.whiteDye, ingredient2Amount = 2, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3784, typeOf = "House", category = "Wall Decorations", skill = "carpentry", level = 60, ingredient1 = Item.coniferWoodBoards, ingredient1Amount = 50, ingredient2 = Item.whiteDye, ingredient2Amount = 2, ingredient3 = Item.handcuffs, ingredient3Amount = 1, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3783, typeOf = "House", category = "Wall Decorations", skill = "carpentry", level = 60, ingredient1 = Item.coniferWoodBoards, ingredient1Amount = 50, ingredient2 = Item.whiteDye, ingredient2Amount = 2, ingredient3 = Item.handcuffs, ingredient3Amount = 1, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3782, typeOf = "House", category = "Mannequins", skill = "carpentry", level = 60, ingredient1 = Item.coniferWoodBoards, ingredient1Amount = 50, ingredient2 = Item.whiteDye, ingredient2Amount = 2, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3781, typeOf = "House", category = "Mannequins", skill = "carpentry", level = 60, ingredient1 = Item.coniferWoodBoards, ingredient1Amount = 50, ingredient2 = Item.whiteDye, ingredient2Amount = 2, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3780, typeOf = "House", category = "Mannequins", skill = "carpentry", level = 60, ingredient1 = Item.coniferWoodBoards, ingredient1Amount = 50, ingredient2 = Item.whiteDye, ingredient2Amount = 2, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
Expand All @@ -1119,8 +1119,8 @@ table.insert(M.items, {itemId = 3102, typeOf = "House", category = "Small Decora
table.insert(M.items, {itemId = 3101, typeOf = "House", category = "Small Decorations", skill = "misc", level = 0, ingredient1 = Item.redDye, ingredient1Amount = 1, ingredient2 = nil, ingredient2Amount = nil, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3763, typeOf = "Estate", category = "Windows", nameDe = "Fenster - Norden", nameEn = "Window North", skill = "blacksmithing", level = 50, ingredient1 = Item.stoneBlock, ingredient1Amount = 25, ingredient2 = Item.ironPlate, ingredient2Amount = 5, ingredient3 = Item.clay, ingredient3Amount = 5, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3762, typeOf = "Estate", category = "Windows", nameDe = "Fenster - Osten", nameEn = "Window East", skill = "blacksmithing", level = 50, ingredient1 = Item.stoneBlock, ingredient1Amount = 25, ingredient2 = Item.ironPlate, ingredient2Amount = 5, ingredient3 = Item.clay, ingredient3Amount = 5, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3764, typeOf = "Estate", category = "Windows", nameDe = "Fenster - Osten", nameEn = "Window East", skill = "blacksmithing", level = 50, ingredient1 = Item.stoneBlock, ingredient1Amount = 20, ingredient2 = Item.ironPlate, ingredient2Amount = 10, ingredient3 = Item.clay, ingredient3Amount = 5, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3765, typeOf = "Estate", category = "Windows", nameDe = "Fenster - Norden", nameEn = "Window North", skill = "blacksmithing", level = 50, ingredient1 = Item.stoneBlock, ingredient1Amount = 20, ingredient2 = Item.ironPlate, ingredient2Amount = 10, ingredient3 = Item.clay, ingredient3Amount = 5, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3764, typeOf = "Estate", category = "Walls", nameDe = " - Osten", nameEn = "Skull-Wall East", skill = "blacksmithing", level = 50, ingredient1 = Item.stoneBlock, ingredient1Amount = 30, ingredient2 = Item.clay, ingredient2Amount = 5, ingredient3 = Item.whiteDye, ingredient3Amount = 1, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3765, typeOf = "Estate", category = "Walls", nameDe = " - Norden", nameEn = "Skull-Wall North", skill = "blacksmithing", level = 50, ingredient1 = Item.stoneBlock, ingredient1Amount = 30, ingredient2 = Item.clay, ingredient2Amount = 5, ingredient3 = Item.whiteDye, ingredient3Amount = 1, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 613, typeOf = "Estate", category = "Walls", skill = "mining", level = 40, ingredient1 = Item.stoneBlock, ingredient1Amount = 60, ingredient2 = Item.clay, ingredient2Amount = 20, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3754, typeOf = "Estate", category = "Doors", nameDe = "Tür - Osten", nameEn = "Door East", skill = "blacksmithing", level = 50, ingredient1 = Item.ironPlate, ingredient1Amount = 20, ingredient2 = Item.stoneBlock, ingredient2Amount = 10, ingredient3 = Item.clay, ingredient3Amount = 5, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3756, typeOf = "Estate", category = "Doors", nameDe = "Tür - Norden", nameEn = "Door North", skill = "blacksmithing", level = 50, ingredient1 = Item.ironPlate, ingredient1Amount = 20, ingredient2 = Item.stoneBlock, ingredient2Amount = 10, ingredient3 = Item.clay, ingredient3Amount = 5, ingredient4 = nil, ingredient4Amount = nil})
Expand All @@ -1134,6 +1134,11 @@ table.insert(M.items, {itemId = 3088, typeOf = "Estate", category = "Basement Ex
table.insert(M.items, {itemId = 3087, typeOf = "Estate", category = "Basement Exclusive", skill = "mining", level = 80, ingredient1 = Item.rawStone, ingredient1Amount = 70, ingredient2 = nil, ingredient2Amount = nil, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3086, typeOf = "Estate", category = "Basement Exclusive", skill = "mining", level = 80, ingredient1 = Item.rawStone, ingredient1Amount = 70, ingredient2 = nil, ingredient2Amount = nil, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 3085, typeOf = "Estate", category = "Basement Exclusive", skill = "mining", level = 80, ingredient1 = Item.rawStone, ingredient1Amount = 70, ingredient2 = nil, ingredient2Amount = nil, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 1383, typeOf = "House", category = "Small Decorations", skill = "misc", level = 0, ingredient1 = Item.coarseSand, ingredient1Amount = 5, ingredient2 = nil, ingredient2Amount = nil, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 1384, typeOf = "House", category = "Small Decorations", skill = "misc", level = 0, ingredient1 = Item.coarseSand, ingredient1Amount = 5, ingredient2 = nil, ingredient2Amount = nil, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
table.insert(M.items, {itemId = 1385, typeOf = "House", category = "Small Decorations", skill = "misc", level = 0, ingredient1 = Item.coarseSand, ingredient1Amount = 5, ingredient2 = nil, ingredient2Amount = nil, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})



M.tiles = {}
table.insert(M.tiles, {displayId = Item.parquet , tileId = 40, typeOf = "House", category = "Parquet", skill = "carpentry", level = 0, ingredient1 = 2716, ingredient1Amount = 25})
Expand Down

0 comments on commit 0751aef

Please sign in to comment.