Skip to content

Commit de46bce

Browse files
committed
chandeliers
1 parent 46a0067 commit de46bce

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

housing/itemList.lua

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,9 +1347,7 @@ table.insert(M.items, {itemId = 3155, typeOf = "Estate", category = "Bridges", s
13471347
table.insert(M.items, {itemId = 3156, typeOf = "Estate", category = "Bridges", skill = "blacksmithing", level = 70, ingredient1 = Item.stoneBlock, ingredient1Amount = 30, ingredient2 = Item.goldIngot, ingredient2Amount = 10, ingredient3 = Item.clay, ingredient3Amount = 10, ingredient4 = nil, ingredient4Amount = nil})
13481348
table.insert(M.items, {itemId = 3157, typeOf = "Estate", category = "Bridges", skill = "blacksmithing", level = 70, ingredient1 = Item.stoneBlock, ingredient1Amount = 30, ingredient2 = Item.goldIngot, ingredient2Amount = 10, ingredient3 = Item.clay, ingredient3Amount = 10, ingredient4 = nil, ingredient4Amount = nil})
13491349
table.insert(M.items, {itemId = 3158, typeOf = "Estate", category = "Bridges", skill = "blacksmithing", level = 70, ingredient1 = Item.stoneBlock, ingredient1Amount = 30, ingredient2 = Item.goldIngot, ingredient2Amount = 10, ingredient3 = Item.clay, ingredient3Amount = 10, ingredient4 = nil, ingredient4Amount = nil})
1350-
1351-
1352-
1350+
table.insert(M.items, {itemId = Item.chandelierUnlit, typeOf = "House", category = "Lights", skill = "blacksmithing", level = 100, ingredient1 = Item.meriniumIngot, ingredient1Amount = 10, ingredient2 = Item.ironIngot, ingredient2Amount = 40, ingredient3 = Item.copperIngot, ingredient3Amount = 10, ingredient4 = nil, ingredient4Amount = nil})
13531351

13541352

13551353
M.tiles = {}

item/lights.lua

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ LightsOff[1128] = { on = 1125, req = {id = Item.candles, num = 1} } -- wall lant
6262
LightsOff[1125] = { off = 1128 }
6363
LightsOff[1130] = { on = 1126, req = {id = Item.candles, num = 1} } -- wall lantern
6464
LightsOff[1126] = { off = 1130 }
65+
-- chandelier
66+
LightsOff[Item.chandelierUnlit] = { on = Item.chandelier, req = {id = Item.candles, num = 10}}
67+
LightsOn[Item.chandelier] = {off = Item.chandelierUnlit}
6568

6669
local ReqTexts = {}
6770
ReqTexts.german = { [392] = "Fackeln", [Item.candles] = "Kerzen", [Item.lampOil] = "Lampenöl" }
@@ -118,7 +121,10 @@ local function checkIfRequirementsAreMetAndConsumeUnlitItem(user, unlitItem, sou
118121
local hasEnoughOfRequiredItem = user:countItemAt("body", unlitItem.req.id) + user:countItemAt("belt", unlitItem.req.id) >= unlitItem.req.num
119122

120123
for i = 1, 3 do
121-
local alternateCheck = user:countItemAt("body", alternative, {["rareness"] = i+1}) + user:countItemAt("belt", alternative, {["rareness"] = i+1}) >= unlitItem.req.num
124+
local alternateCheck
125+
if alternative then
126+
alternateCheck = user:countItemAt("body", alternative, {["rareness"] = i+1}) + user:countItemAt("belt", alternative, {["rareness"] = i+1}) >= unlitItem.req.num
127+
end
122128
local requiredCheck = user:countItemAt("body", unlitItem.req.id, {["rareness"] = i+1}) + user:countItemAt("belt", unlitItem.req.id, {["rareness"] = i+1}) >= unlitItem.req.num
123129
if alternateCheck then
124130
rareness = i+1

0 commit comments

Comments
 (0)