From e7213fe9780ae79f30db8961560a718081415dd9 Mon Sep 17 00:00:00 2001 From: brightrim Date: Sat, 12 Oct 2024 20:06:43 +0200 Subject: [PATCH] Last minute addition of the forgotten rum bottle + rum shotglass graphics --- content/specialeggs.lua | 1 - content/treasure.lua | 1 - craft/final/brewing.lua | 2 +- craft/final/cooking.lua | 2 +- craft/final/glassblowing.lua | 4 ---- item/bottles.lua | 15 +++++++++++++++ item/drinks.lua | 11 +++++++++-- item/id_3894_mystical_cracker.lua | 1 - item/id_463_quill.lua | 2 +- npc/borgate_northoff.npc | 4 ++-- npc/fronita_emery.npc | 4 ++-- npc/hagar_wernson.npc | 4 ++-- npc/jonathan_cyrus.npc | 4 ++-- npc/rose_deepdelver.npc | 6 +++--- npc/severus_rabon.npc | 6 +++--- npc/thomas_weste.npc | 6 +++--- 16 files changed, 44 insertions(+), 29 deletions(-) diff --git a/content/specialeggs.lua b/content/specialeggs.lua index b494116b3e..0c7f9cd2ed 100644 --- a/content/specialeggs.lua +++ b/content/specialeggs.lua @@ -648,7 +648,6 @@ local itemList = { 1050 ,--Schattenranseur shadow ranseur 835 ,--schwarz-graues Kleid black grey dress 790 ,--Leere Saftflasche empty juice bottle -518 ,--leere bauchige Flasche empty round body bottle 2560 ,--Apfelholz applewood 1062 ,--Silbererz silver ore 1059 ,--Würfelbecher dice cup diff --git a/content/treasure.lua b/content/treasure.lua index 506f989061..088a340634 100644 --- a/content/treasure.lua +++ b/content/treasure.lua @@ -273,7 +273,6 @@ treasureContents[2] = { {254,1}, --raw diamond {326,1}, --steel boots {463,1}, --quill -{518,1}, --empty rum bottle {1057,1}, --robust jackboots {1416,1}, --simple horned helmet {1429,1}, --reinforced steel cap diff --git a/craft/final/brewing.lua b/craft/final/brewing.lua index 0e64919961..72d7baca39 100644 --- a/craft/final/brewing.lua +++ b/craft/final/brewing.lua @@ -173,7 +173,7 @@ catId = brewing:addCategory("Hard Liquors", "Stark alkoholische Getr -- bottle of rum product = brewing:addProduct(catId, 517, 1) -product:addIngredient(518, 1) -- empty rum bottle +product:addIngredient(1317, 1) -- empty liquor bottle product:addIngredient(778, 3) -- sugarcane product:addIngredient(52, 1) -- bucket of water product:addRemnant(51, 1) -- bucket diff --git a/craft/final/cooking.lua b/craft/final/cooking.lua index f9442ef904..eb43694108 100644 --- a/craft/final/cooking.lua +++ b/craft/final/cooking.lua @@ -132,7 +132,7 @@ product:addIngredient(3709, 3) -- smoked chicken product:addIngredient(290, 2) -- cabbage product:addIngredient(2493, 3) -- carrots product:addIngredient(517, 1) -- bottle of rum -product:addRemnant(518, 1) -- empty rum bottle +product:addRemnant(Item.emptyLiquorBottle, 1) product = cooking:addProduct(catId, Item.rosefishDish, 1) product:addIngredient(Item.woodenPlate, 1) diff --git a/craft/final/glassblowing.lua b/craft/final/glassblowing.lua index fb6003c8d4..9a04c3f0e7 100644 --- a/craft/final/glassblowing.lua +++ b/craft/final/glassblowing.lua @@ -50,10 +50,6 @@ product:addIngredient(41, 1) -- glass ingot product = glassblowing:addProduct(catId, Item.fruitJuiceBottle, 1) product:addIngredient(41, 1) -- glass ingot --- empty rum bottle -product = glassblowing:addProduct(catId, 518, 1) -product:addIngredient(41, 1) -- glass ingot - -- empty tea bottle product = glassblowing:addProduct(catId, Item.teaBottle, 1) product:addIngredient(41, 2) -- glass ingot diff --git a/item/bottles.lua b/item/bottles.lua index 0d5849802b..6203e777e9 100644 --- a/item/bottles.lua +++ b/item/bottles.lua @@ -381,6 +381,21 @@ local bottles = { {empty = Item.shotGlass, filled = Item.shotGlassWithOrangeSchnapps, amount = 1} }, }, + { + full = {Item.bottleOfRum}, + half = {Item.bottleOfRumHalf}, + quarter = {Item.bottleOfRumQuarter}, + empty = {Item.emptyLiquorBottle}, + vessels = { + {empty = Item.clayShotGlass, filled = Item.clayShotGlassWithRum, amount = 1}, + {empty = Item.ceramicShotGlass, filled = Item.ceramicShotGlassWithRum, amount = 1}, + {empty = Item.ironShotGlass, filled = Item.ironShotGlassWithRum, amount = 1}, + {empty = Item.copperShotGlass, filled = Item.copperShotGlassWithRum, amount = 1}, + {empty = Item.silverShotGlass, filled = Item.silverShotGlassWithRum, amount = 1}, + {empty = Item.goldShotGlass, filled = Item.goldShotGlassWithRum, amount = 1}, + {empty = Item.shotGlass, filled = Item.shotGlassWithRum, amount = 1} + }, + }, { full = {Item.bottleOfStoneFace}, half = {Item.bottleOfStoneFaceHalf}, diff --git a/item/drinks.lua b/item/drinks.lua index b4da6f4f5d..958ef832da 100644 --- a/item/drinks.lua +++ b/item/drinks.lua @@ -125,6 +125,7 @@ M.drinkList[Item.clayShotGlassWithElvenWine] = {800, Item.clayShotGlass} M.drinkList[Item.clayShotGlassWithMulledWine] = {800, Item.clayShotGlass} M.drinkList[Item.clayShotGlassWithOrangeSchnapps] = {800, Item.clayShotGlass} M.drinkList[Item.clayShotGlassWithStoneFace] = {800, Item.clayShotGlass} +M.drinkList[Item.clayShotGlassWithRum] = {800, Item.clayShotGlass} M.drinkList[Item.ceramicShotGlassWithAbsinthe] = {800, Item.ceramicShotGlass} M.drinkList[Item.ceramicShotGlassWithBearSlayer] = {800, Item.ceramicShotGlass} @@ -134,6 +135,7 @@ M.drinkList[Item.ceramicShotGlassWithElvenWine] = {800, Item.ceramicShotGlass} M.drinkList[Item.ceramicShotGlassWithMulledWine] = {800, Item.ceramicShotGlass} M.drinkList[Item.ceramicShotGlassWithOrangeSchnapps] = {800, Item.ceramicShotGlass} M.drinkList[Item.ceramicShotGlassWithStoneFace] = {800, Item.ceramicShotGlass} +M.drinkList[Item.ceramicShotGlassWithRum] = {800, Item.ceramicShotGlass} M.drinkList[Item.ironShotGlassWithAbsinthe] = {800, Item.ironShotGlass} M.drinkList[Item.ironShotGlassWithBearSlayer] = {800, Item.ironShotGlass} @@ -143,6 +145,7 @@ M.drinkList[Item.ironShotGlassWithElvenWine] = {800, Item.ironShotGlass} M.drinkList[Item.ironShotGlassWithMulledWine] = {800, Item.ironShotGlass} M.drinkList[Item.ironShotGlassWithOrangeSchnapps] = {800, Item.ironShotGlass} M.drinkList[Item.ironShotGlassWithStoneFace] = {800, Item.ironShotGlass} +M.drinkList[Item.ironShotGlassWithRum] = {800, Item.ironShotGlass} M.drinkList[Item.copperShotGlassWithAbsinthe] = {800, Item.copperShotGlass} M.drinkList[Item.copperShotGlassWithBearSlayer] = {800, Item.copperShotGlass} @@ -152,6 +155,8 @@ M.drinkList[Item.copperShotGlassWithElvenWine] = {800, Item.copperShotGlass} M.drinkList[Item.copperShotGlassWithMulledWine] = {800, Item.copperShotGlass} M.drinkList[Item.copperShotGlassWithOrangeSchnapps] = {800, Item.copperShotGlass} M.drinkList[Item.copperShotGlassWithStoneFace] = {800, Item.copperShotGlass} +M.drinkList[Item.copperShotGlassWithRum] = {800, Item.copperShotGlass} + M.drinkList[Item.silverShotGlassWithAbsinthe] = {800, Item.silverShotGlass} M.drinkList[Item.silverShotGlassWithBearSlayer] = {800, Item.silverShotGlass} @@ -161,6 +166,8 @@ M.drinkList[Item.silverShotGlassWithElvenWine] = {800, Item.silverShotGlass} M.drinkList[Item.silverShotGlassWithMulledWine] = {800, Item.silverShotGlass} M.drinkList[Item.silverShotGlassWithOrangeSchnapps] = {800, Item.silverShotGlass} M.drinkList[Item.silverShotGlassWithStoneFace] = {800, Item.silverShotGlass} +M.drinkList[Item.silverShotGlassWithRum] = {800, Item.silverShotGlass} + M.drinkList[Item.goldShotGlassWithAbsinthe] = {800, Item.goldShotGlass} M.drinkList[Item.goldShotGlassWithBearSlayer] = {800, Item.goldShotGlass} @@ -170,6 +177,7 @@ M.drinkList[Item.goldShotGlassWithElvenWine] = {800, Item.goldShotGlass} M.drinkList[Item.goldShotGlassWithMulledWine] = {800, Item.goldShotGlass} M.drinkList[Item.goldShotGlassWithOrangeSchnapps] = {800, Item.goldShotGlass} M.drinkList[Item.goldShotGlassWithStoneFace] = {800, Item.goldShotGlass} +M.drinkList[Item.goldShotGlassWithRum] = {800, Item.goldShotGlass} M.drinkList[Item.shotGlassWithAbsinthe] = {800, Item.shotGlass} M.drinkList[Item.shotGlassWithBearSlayer] = {800, Item.shotGlass} @@ -179,6 +187,7 @@ M.drinkList[Item.shotGlassWithElvenWine] = {800, Item.shotGlass} M.drinkList[Item.shotGlassWithMulledWine] = {800, Item.shotGlass} M.drinkList[Item.shotGlassWithOrangeSchnapps] = {800, Item.shotGlass} M.drinkList[Item.shotGlassWithStoneFace] = {800, Item.shotGlass} +M.drinkList[Item.shotGlassWithRum] = {800, Item.shotGlass} M.drinkList[Item.clayTeaCupDruid] = {1000, Item.clayTeaCup} M.drinkList[Item.clayTeaCupFirNeedle] = {1000, Item.clayTeaCup} @@ -215,8 +224,6 @@ M.drinkList[Item.glassTeaCupFirNeedle] = {1000, Item.glassTeaCup} M.drinkList[Item.glassTeaCupGreen] = {1000, Item.glassTeaCup} M.drinkList[Item.glassTeaCupVirginWeed] = {1000, Item.glassTeaCup} -M.drinkList[Item.bottleOfRum] = {1000, Item.emptyRumBottle} - function M.UseItem(user, SourceItem) diff --git a/item/id_3894_mystical_cracker.lua b/item/id_3894_mystical_cracker.lua index 75a195ab0d..9454d23fee 100644 --- a/item/id_3894_mystical_cracker.lua +++ b/item/id_3894_mystical_cracker.lua @@ -649,7 +649,6 @@ local itemList = { 1050 ,--Schattenranseur shadow ranseur 835 ,--schwarz-graues Kleid black grey dress 790 ,--Leere Saftflasche empty juice bottle -518 ,--leere bauchige Flasche empty round body bottle 2560 ,--Apfelholz applewood 1062 ,--Silbererz silver ore 1059 ,--Würfelbecher dice cup diff --git a/item/id_463_quill.lua b/item/id_463_quill.lua index fb70720dea..2c43404ab0 100644 --- a/item/id_463_quill.lua +++ b/item/id_463_quill.lua @@ -46,7 +46,7 @@ local function CheckIfContainerPresent(User) return nil end -local emptyBottleList = {518, 1317, 790, 164, 2498} +local emptyBottleList = {1317, 790, 164, 2498} local function CheckIfEmptyBottlePresent(User) diff --git a/npc/borgate_northoff.npc b/npc/borgate_northoff.npc index ccf5273460..410d1d6348 100644 --- a/npc/borgate_northoff.npc +++ b/npc/borgate_northoff.npc @@ -69,9 +69,9 @@ itemShoes = 53 -- You want a ceramic cup for your wine? Well too bad, Borgate can only offer you a golden goblet as he is all out. -- Thank your lucky stars that he at least bothered to clean it before pouring your drink... or did he? -sellItems = 1909, 4460, 4425, 4435, 4418, 4455, 4465, 4448, 4476, 4572, 4568, 4584, 4600, 2058, 1860, 4344, 4352, 4411 +sellItems = 1909, 4460, 4425, 4435, 4418, 4455, 4812, 4465, 4448, 4476, 4572, 4568, 4584, 4600, 2058, 1860, 4344, 4352, 4411 -- glass mug with beer, iron shotglass with absinthe, clay shotglass of bear slayer, copper shotglass of berry booze, ceramic shotglass with cherry schnapps --- gold shotglass with elven wine, iron shotglass with mulled wine, shotglass with orange schnapps, silver shotglass with stoneface +-- gold shotglass with elven wine, shotglass with rum, iron shotglass with mulled wine, shotglass with orange schnapps, silver shotglass with stoneface -- clay teacup with druids tea, ceramic teacup with firneedle tea, silver teacup with green tea, glass teacup with virgins weed tea -- glass with water, silver goblet with wine, clay cup with mead, iron goblet with cider, ceramic cup with milk diff --git a/npc/fronita_emery.npc b/npc/fronita_emery.npc index a6803dad78..41c87daecd 100644 --- a/npc/fronita_emery.npc +++ b/npc/fronita_emery.npc @@ -65,10 +65,10 @@ itemShoes = 369 -- Here are all items the NPCs is able to trade. They will be displayed inside -- the merchant dialog. -sellItems = 24, 312, 2710, 311, 2140, 314, 26, 726, 316, 2498, 790, 4634, 4626, 4639, 518, 390, 1317, 1117, 164, 41, 4798, 4791, 4441, 4596, 4525, 4553, 2055, 2457, 1908, 3642, 2588, 4796, 4789, 4423, 4571, 4548, 4485, 4795, 4788, 4407, 4414, 4566, 4547, 4477, 2183, 2184, 310, 1223, 315, 4803 +sellItems = 24, 312, 2710, 311, 2140, 314, 26, 726, 316, 2498, 790, 4634, 4626, 4639, 390, 1317, 1117, 164, 41, 4798, 4791, 4441, 4596, 4525, 4553, 2055, 2457, 1908, 3642, 2588, 4796, 4789, 4423, 4571, 4548, 4485, 4795, 4788, 4407, 4414, 4566, 4547, 4477, 2183, 2184, 310, 1223, 315, 4803 -- shovel, wooden shovel, mould, glass blow pipe, tongs -- pot ash, clay, coarse sand, quartz sand, large empty bottle, berry juice bottle, vegetable juice bottle, fruit juice bottle, tea bottle, empty rum bottle, empty oil bottle, empty liquor bottle, empty ink bottle, empty potion, glass ingot, glass plate, glass bowl, shotglass, glass tea cup, glass serving jug, glass teapot, glass, wine glass, glass mug, empty salve jar, bricks, clay plate, clay bowl, clay shotglass, clay teacup, clay teapot, clay serving jug, ceramic plate, ceramic bowl, ceramic cup, ceramic shotglass, ceramic teacup, ceramic teapot, ceramic serving jug, clay mug, clay cup, mug with lid, empty alchemy bomb, vase, empty honeyjar -buySecondaryItems = 314, 26, 726, 316, 2498, 790, 4634, 4626, 4639, 518, 390, 1317, 1117, 164, 41, 4798, 4791, 4441, 4596, 4525, 4553, 2055, 2457, 1908, 3642, 2588, 4796, 4789, 4423, 4571, 4548, 4485, 4795, 4788, 4407, 4414, 4566, 4547, 4477, 2183, 2184, 310, 1223, 315, 4803 +buySecondaryItems = 314, 26, 726, 316, 2498, 790, 4634, 4626, 4639, 390, 1317, 1117, 164, 41, 4798, 4791, 4441, 4596, 4525, 4553, 2055, 2457, 1908, 3642, 2588, 4796, 4789, 4423, 4571, 4548, 4485, 4795, 4788, 4407, 4414, 4566, 4547, 4477, 2183, 2184, 310, 1223, 315, 4803 -- pot ash, clay, coarse sand, quartz sand, large empty bottle, berry juice bottle, vegetable juice bottle, fruit juice bottle, tea bottle, empty rum bottle, empty oil bottle, empty liquor bottle, empty ink bottle, empty potion, glass ingot, glass plate, glass bowl, shotglass, glass tea cup, glass serving jug, glass teapot, glass, wine glass, glass mug, empty salve jar, bricks, clay plate, clay bowl, clay shotglass, clay teacup, clay teapot, clay serving jug, ceramic plate, ceramic bowl, ceramic cup, ceramic shotglass, ceramic teacup, ceramic teapot, ceramic serving jug, clay mug, clay cup, mug with lid, empty alchemy bomb, vase, empty honeyjar tradeNotEnoughMoneyMsg "Oh, ich fürchte Ihr könnt Euch das nicht leisten.", "Oh, I fear, you can not afford that." diff --git a/npc/hagar_wernson.npc b/npc/hagar_wernson.npc index 6b1c42e1c3..fcc1fa4d63 100644 --- a/npc/hagar_wernson.npc +++ b/npc/hagar_wernson.npc @@ -64,8 +64,8 @@ itemShoes = 369 -- Of course, it has to be profitable, so all drinkware he offers is made of locally sourced metals. -- With the caveat of beer mugs, that he has to begrudingly import from Cadomyr's potters and glassblowers. -sellItems = 4351, 1909, 4355, 4354, 4353, 4352, 4363, 4592, 4593, 4594, 4595, 4460, 4461, 4462, 4463, 4464, 4465, 4466, 4467, 1841, 1842, 1843, 1844, 4359, 4577, 4578, 4579, 4580, 4433, 4434, 4435, 4436, 4437, 4438, 4439, 4440, 1855, 1860, 1853, 1859, 4361, 4582, 4583, 4584, 4585, 4469, 4470, 4471, 4472, 4473, 4474, 4475, 4476, 1854, 1857, 1856, 1861, 4360, 4587, 4588, 4589, 4590, 4451, 4452, 4453, 4454, 4455, 4456, 4457, 4458 -buySecondaryItems = 4351, 1909, 4355, 4354, 4353, 4352, 4363, 4592, 4593, 4594, 4595, 4460, 4461, 4462, 4463, 4464, 4465, 4466, 4467, 1841, 1842, 1843, 1844, 4359, 4577, 4578, 4579, 4580, 4433, 4434, 4435, 4436, 4437, 4438, 4439, 4440, 1855, 1860, 1853, 1859, 4361, 4582, 4583, 4584, 4585, 4469, 4470, 4471, 4472, 4473, 4474, 4475, 4476, 1854, 1857, 1856, 1861, 4360, 4587, 4588, 4589, 4590, 4451, 4452, 4453, 4454, 4455, 4456, 4457, 4458 +sellItems = 4351, 1909, 4355, 4354, 4353, 4352, 4363, 4592, 4593, 4594, 4595, 4460, 4461, 4462, 4463, 4464, 4465, 4466, 4467, 1841, 1842, 1843, 1844, 4359, 4577, 4578, 4579, 4580, 4433, 4434, 4435, 4436, 4437, 4438, 4439, 4440, 1855, 1860, 1853, 1859, 4361, 4582, 4583, 4584, 4585, 4469, 4470, 4471, 4472, 4473, 4474, 4475, 4476, 1854, 1857, 1856, 1861, 4360, 4587, 4588, 4589, 4590, 4451, 4452, 4453, 4454, 4455, 4456, 4457, 4458, 4808, 4809, 4810, 4811 +buySecondaryItems = 4351, 1909, 4355, 4354, 4353, 4352, 4363, 4592, 4593, 4594, 4595, 4460, 4461, 4462, 4463, 4464, 4465, 4466, 4467, 1841, 1842, 1843, 1844, 4359, 4577, 4578, 4579, 4580, 4433, 4434, 4435, 4436, 4437, 4438, 4439, 4440, 1855, 1860, 1853, 1859, 4361, 4582, 4583, 4584, 4585, 4469, 4470, 4471, 4472, 4473, 4474, 4475, 4476, 1854, 1857, 1856, 1861, 4360, 4587, 4588, 4589, 4590, 4451, 4452, 4453, 4454, 4455, 4456, 4457, 4458, 4808, 4809, 4810, 4811 -- For both the above: clay beer mug with beer, glass beer mug with beer, iron then copper then silver then gold of the following: goblet with(water, wine, mead, cider, milk), teacup with (druids tea, firneedle tea, green tea, virgins weed tea), shotglass with(absinthe, bear slayer, berry booze, cherry schnapps, elven wine, mulled wine, orange schnapps, stone face) tradeNotEnoughMoneyMsg "Bei mir kann man nicht anschreiben lassen!", "You can't chalk up the drinks!" diff --git a/npc/jonathan_cyrus.npc b/npc/jonathan_cyrus.npc index a055abb46a..40f099ccc3 100644 --- a/npc/jonathan_cyrus.npc +++ b/npc/jonathan_cyrus.npc @@ -63,10 +63,10 @@ itemShoes = 770 -- Here are all items the NPCs is able to trade. They will be displayed inside -- the merchant dialog. -sellItems = 311, 2140, 314, 26, 726, 316, 2498, 790, 4634, 4626, 4639, 518, 390, 1317, 1117, 164, 41, 4798, 4791, 4441, 4596, 4525, 4553, 2055, 2457, 1908, 3642, 2588, 4796, 4789, 4423, 4571, 4548, 4485, 4795, 4788, 4407, 4414, 4566, 4547, 4477, 2183, 2184, 310, 1223, 315, 4803 +sellItems = 311, 2140, 314, 26, 726, 316, 2498, 790, 4634, 4626, 4639, 390, 1317, 1117, 164, 41, 4798, 4791, 4441, 4596, 4525, 4553, 2055, 2457, 1908, 3642, 2588, 4796, 4789, 4423, 4571, 4548, 4485, 4795, 4788, 4407, 4414, 4566, 4547, 4477, 2183, 2184, 310, 1223, 315, 4803 -- glass blow pipe, tongs -- pot ash, clay, coarse sand, quartz sand, large empty bottle, berry juice bottle, vegetable juice bottle, fruit juice bottle, tea bottle, empty rum bottle, empty oil bottle, empty liquor bottle, empty ink bottle, empty potion, glass ingot, glass plate, glass bowl, shotglass, glass tea cup, glass serving jug, glass teapot, glass, wine glass, glass mug, empty salve jar, bricks, clay plate, clay bowl, clay shotglass, clay teacup, clay teapot, clay serving jug, ceramic plate, ceramic bowl, ceramic cup, ceramic shotglass, ceramic teacup, ceramic teapot, ceramic serving jug, clay mug, clay cup, mug with lid, empty alchemy bomb, vase, empty honeyjar -buyPrimaryItems = 314, 26, 726, 316, 2498, 790, 4634, 4626, 4639, 518, 390, 1317, 1117, 164, 41, 4798, 4791, 4441, 4596, 4525, 4553, 2055, 2457, 1908, 3642, 2588, 4796, 4789, 4423, 4571, 4548, 4485, 4795, 4788, 4407, 4414, 4566, 4547, 4477, 2183, 2184, 310, 1223, 315, 4803 +buyPrimaryItems = 314, 26, 726, 316, 2498, 790, 4634, 4626, 4639, 390, 1317, 1117, 164, 41, 4798, 4791, 4441, 4596, 4525, 4553, 2055, 2457, 1908, 3642, 2588, 4796, 4789, 4423, 4571, 4548, 4485, 4795, 4788, 4407, 4414, 4566, 4547, 4477, 2183, 2184, 310, 1223, 315, 4803 -- pot ash, clay, coarse sand, quartz sand, large empty bottle, berry juice bottle, vegetable juice bottle, fruit juice bottle, tea bottle, empty rum bottle, empty oil bottle, empty liquor bottle, empty ink bottle, empty potion, glass ingot, glass plate, glass bowl, shotglass, glass tea cup, glass serving jug, glass teapot, glass, wine glass, glass mug, empty salve jar, bricks, clay plate, clay bowl, clay shotglass, clay teacup, clay teapot, clay serving jug, ceramic plate, ceramic bowl, ceramic cup, ceramic shotglass, ceramic teacup, ceramic teapot, ceramic serving jug, clay mug, clay cup, mug with lid, empty alchemy bomb, vase, empty honeyjar diff --git a/npc/rose_deepdelver.npc b/npc/rose_deepdelver.npc index 42fffbfa52..19db5179f9 100644 --- a/npc/rose_deepdelver.npc +++ b/npc/rose_deepdelver.npc @@ -65,9 +65,9 @@ itemShoes = 369 -- In Runewick, its people are learned enough to realise that no matter the drinking vessel, its all the same filth they are drinking anyways. -- Thus, Rose only offers the cheaper drinking vessels. Locally produced, of course. (wood and clay aka carpentry and pottery) -sellItems = 2186, 2187, 2188, 2189, 4362, 4345, 4346, 4344, 4347, 4357, 4572, 4573, 4574, 4575, 4424, 4425, 4426, 4427, 4428, 4429, 4430, 4431, 4351 -buySecondaryItems = 2186, 2187, 2188, 2189, 4362, 4345, 4346, 4344, 4347, 4357, 4572, 4573, 4574, 4575, 4424, 4425, 4426, 4427, 4428, 4429, 4430, 4431, 4351 --- For both of the above: wooden and clay cups with water, wine, mead, cider, milk, followed by clay tea cups with druids, firneedle, green and virginsweed tea, followed by clay shotglasses with absinthe, bear slayer, berry booze, cherry schnapps, elven wine, mulled wine, orange schnapps and stone face, and lastly a clay mug of beer +sellItems = 2186, 2187, 2188, 2189, 4362, 4345, 4346, 4344, 4347, 4357, 4572, 4573, 4574, 4575, 4424, 4813, 4425, 4426, 4427, 4428, 4429, 4430, 4431, 4351 +buySecondaryItems = 2186, 2187, 2188, 2189, 4362, 4345, 4346, 4344, 4347, 4357, 4572, 4573, 4574, 4575, 4424, 4813, 4425, 4426, 4427, 4428, 4429, 4430, 4431, 4351 +-- For both of the above: wooden and clay cups with water, wine, mead, cider, milk, followed by clay tea cups with druids, firneedle, green and virginsweed tea, followed by clay shotglasses with absinthe, rum, bear slayer, berry booze, cherry schnapps, elven wine, mulled wine, orange schnapps and stone face, and lastly a clay mug of beer tradeNotEnoughMoneyMsg "Überprüfe bitte deine Geldbörse.", "Please check your purse." tradeFinishedMsg "Bis bald!", "See you soon." diff --git a/npc/severus_rabon.npc b/npc/severus_rabon.npc index 82ec942e0a..8f51b230f2 100644 --- a/npc/severus_rabon.npc +++ b/npc/severus_rabon.npc @@ -67,9 +67,9 @@ itemShoes = 369 -- Cadomyr. A people full of knights and nobles. Where the taste of the drink is not as important as the vessel it comes in. -- So as a matter of course, Severus only serves his drinks in the finest drinkware(gold, ceramic, glass). Locally produced, of course. -sellItems = 2058, 2057, 2056, 2059, 4358, 4442, 4443, 4444, 4445, 4446, 4447, 4448, 4449, 4597, 4598, 4599, 4600, 1909, 4412, 4413, 4410, 4408, 4411, 4415, 4416, 4417, 4418, 4419, 4420, 4421, 4422, 4567, 4568, 4569, 4570, 1854, 1857, 1856, 1861, 4360, 4451, 4452, 4453, 4454, 4455, 4456, 4457, 4458, 4587, 4588, 4589, 4590 -buySecondaryItems = 2058, 2057, 2056, 2059, 4358, 4442, 4443, 4444, 4445, 4446, 4447, 4448, 4449, 4597, 4598, 4599, 4600, 1909, 4412, 4413, 4410, 4408, 4411, 4415, 4416, 4417, 4418, 4419, 4420, 4421, 4422, 4567, 4568, 4569, 4570, 1854, 1857, 1856, 1861, 4360, 4451, 4452, 4453, 4454, 4455, 4456, 4457, 4458, 4587, 4588, 4589, 4590 --- For both of the above: glass with(water, wine, mead, cider, milk), shotglass with(absinthe, bear slayer, berry booze, cherry schnapps, elven wine, mulled wine, orange schnapps, stone face), glass teacup with (druids tea, firneedle tea, green tea, virgins weed tea), glass beer mug with beer, ceramic cup with(water, wine, mead, cider, milk), ceramic shotglass with(absinthe, bear slayer, berry booze, cherry schnapps, elven wine, mulled wine, orange schnapps, stone face), ceramic teacup with (druids tea, firneedle tea, green tea, virgins weed tea), golden goblet with(water, wine, mead, cider, milk), gold shotglass with(absinthe, bear slayer, berry booze, cherry schnapps, elven wine, mulled wine, orange schnapps, stone face), gold teacup with (druids tea, firneedle tea, green tea, virgins weed tea) +sellItems = 2058, 2057, 2056, 2059, 4358, 4442, 4812, 4443, 4444, 4445, 4446, 4447, 4448, 4449, 4597, 4598, 4599, 4600, 1909, 4412, 4413, 4410, 4408, 4411, 4415, 4814, 4416, 4417, 4418, 4419, 4420, 4421, 4422, 4567, 4568, 4569, 4570, 1854, 1857, 1856, 1861, 4360, 4451, 4811, 4452, 4453, 4454, 4455, 4456, 4457, 4458, 4587, 4588, 4589, 4590 +buySecondaryItems = 2058, 2057, 2056, 2059, 4358, 4442, 4812, 4443, 4444, 4445, 4446, 4447, 4448, 4449, 4597, 4598, 4599, 4600, 1909, 4412, 4413, 4410, 4408, 4411, 4415, 4814, 4416, 4417, 4418, 4419, 4420, 4421, 4422, 4567, 4568, 4569, 4570, 1854, 1857, 1856, 1861, 4360, 4451, 4811, 4452, 4453, 4454, 4455, 4456, 4457, 4458, 4587, 4588, 4589, 4590 +-- For both of the above: glass with(water, wine, mead, cider, milk), shotglass with(absinthe, rum, bear slayer, berry booze, cherry schnapps, elven wine, mulled wine, orange schnapps, stone face), glass teacup with (druids tea, firneedle tea, green tea, virgins weed tea), glass beer mug with beer, ceramic cup with(water, wine, mead, cider, milk), ceramic shotglass with(absinthe, rum, bear slayer, berry booze, cherry schnapps, elven wine, mulled wine, orange schnapps, stone face), ceramic teacup with (druids tea, firneedle tea, green tea, virgins weed tea), golden goblet with(water, wine, mead, cider, milk), gold shotglass with(absinthe, rum, bear slayer, berry booze, cherry schnapps, elven wine, mulled wine, orange schnapps, stone face), gold teacup with (druids tea, firneedle tea, green tea, virgins weed tea) tradeNotEnoughMoneyMsg "Ihr könnt eure Rechnung nicht begleichen.", "You can't settle your bill." tradeFinishedMsg "Einen schönen Tag noch.", "Have a nice day." diff --git a/npc/thomas_weste.npc b/npc/thomas_weste.npc index 060c081fab..09d15b7c2c 100644 --- a/npc/thomas_weste.npc +++ b/npc/thomas_weste.npc @@ -189,9 +189,9 @@ skill(brewing) < 40, queststatus(716) = 9, town = Runewick, "task", "adventure", skill(brewing) < 40, queststatus(716) = 9, town = Runewick, "quest", "mission", "Auftrag", "Aufgabe", "Abenteuer", "Befehl", "Rang" -> "Selber trinken ist schon in Ordnung. Aber hin und wieder musst du auch mal einen Sud rühren, wenn du befördert werden willst. Du wirst im Rang eines Initiatens geführt.", inform("[Gildenrang] Du brauchst Level 40 in Brauen um in Adrons Braukunstschule aufzusteigen.") -- Level 50: Specialist / Spezialist. Reward: 10 Uncommon resources (e.g. handles) -skill(brewing) > 49, queststatus(716) = 10, english, town = Runewick, "quest", "mission" -> inform("[Guild rank] You advance to the rank of Specialist with Adron's Brewery School of Runewick. You are awarded ten rum bottles."), item(518, 10, 333), queststatus(716) = 11, "Cheers. You not only know how to drink, you know how to make drinks. Adron's Brewery School of Runewick wants to ease your path with some rum bottles. Come back to me once you have brewed new drinks that I can taste." -skill(brewing) > 49, queststatus(716) = 10, town = Runewick, "task", "adventure", "order", "rank" -> inform("[Guild rank] You advance to the rank of Specialist with Adron's Brewery School of Runewick. You are awarded ten rum bottles."), item(518, 10, 333), queststatus(716) = 11, "Cheers. You not only know how to drink, you know how to make drinks. Adron's Brewery School of Runewick wants to ease your path with some rum bottles. Come back to me once you have brewed new drinks that I can taste." -skill(brewing) > 49, queststatus(716) = 10, town = Runewick, "quest", "mission", "Auftrag", "Aufgabe", "Abenteuer", "Befehl", "Rang" -> inform("[Gildenrang] Adrons Braukunstschule zu Runewick erhebt dich in den Rang eines Spezialistens. Du erhältst zehn Rumflaschen."), item(518, 10, 333), queststatus(716) = 11, "Prost. Du kannst ja nicht nur trinken sondern auch Tränke. Adrons Braukunstschule zu Runewick gibt dir gerne einige Rumflaschen. Komm erneut zu mir, wenn ich mehr probieren kann." +skill(brewing) > 49, queststatus(716) = 10, english, town = Runewick, "quest", "mission" -> inform("[Guild rank] You advance to the rank of Specialist with Adron's Brewery School of Runewick. You are awarded ten liquor bottles."), item(1317, 10, 333), queststatus(716) = 11, "Cheers. You not only know how to drink, you know how to make drinks. Adron's Brewery School of Runewick wants to ease your path with some liquor bottles. Come back to me once you have brewed new drinks that I can taste." +skill(brewing) > 49, queststatus(716) = 10, town = Runewick, "task", "adventure", "order", "rank" -> inform("[Guild rank] You advance to the rank of Specialist with Adron's Brewery School of Runewick. You are awarded ten liquor bottles."), item(1317, 10, 333), queststatus(716) = 11, "Cheers. You not only know how to drink, you know how to make drinks. Adron's Brewery School of Runewick wants to ease your path with some liquor bottles. Come back to me once you have brewed new drinks that I can taste." +skill(brewing) > 49, queststatus(716) = 10, town = Runewick, "quest", "mission", "Auftrag", "Aufgabe", "Abenteuer", "Befehl", "Rang" -> inform("[Gildenrang] Adrons Braukunstschule zu Runewick erhebt dich in den Rang eines Spezialistens. Du erhältst zehn Likörflaschen."), item(1317, 10, 333), queststatus(716) = 11, "Prost. Du kannst ja nicht nur trinken sondern auch Tränke. Adrons Braukunstschule zu Runewick gibt dir gerne einige Likörflaschen. Komm erneut zu mir, wenn ich mehr probieren kann." -- Level < 50: Not experienced enough skill(brewing) < 50, queststatus(716) = 10, english, town = Runewick, "quest", "mission" -> "Drinking is fine. But from time to time you have to stir a brew in the barrel too to be eligible for a promotion. Your current rank is Journeyman.", inform("[Guild rank] You need skill level 50 in brewing to advance in the ranks of Adron's Brewery School.")