Change name of oil bottle as proposed here: https://discord.com/chann…

…els/401855954272124940/1170886925494779904

content/treasure.lua

@@ -287,7 +287,7 @@ treasureContents[2] = {
 {187,1}, --steel hat
 {283,1}, --obsidian
 {284,1}, --sapphire
-{390,1}, --oil bottle
+{390,1}, --empty oil bottle
 {831,1}, --green hat with feather
 {1425,1}, --coppered chain helmet
 {183,1}, --short green trousers

craft/final/glassblowing.lua

@@ -46,7 +46,7 @@ product:addIngredient(41, 1) -- glass ingot
 product = glassblowing:addProduct(catId, 518, 1)
 product:addIngredient(41, 1) -- glass ingot
 
--- oil bottle
+-- empty oil bottle
 product = glassblowing:addProduct(catId, 390, 1)
 product:addIngredient(41, 2) -- glass ingot
 

craft/intermediate/pressing.lua

@@ -34,7 +34,7 @@ local catId = pressing:addCategory("Lamp oil", "Lampen
 -- Lamp oil
 local product = pressing:addProduct(catId, 469, 1)
 product:addIngredient(141 , 2) -- black thistle
-product:addIngredient(390) -- oil bottle
+product:addIngredient(390) -- empty oil bottle
 
 catId = pressing:addCategory("Wax", "Wachs")
 

npc/fronita_emery.npc

@@ -67,9 +67,9 @@ itemShoes = 369
 
 sellItems = 24, 312, 2710, 311, 2140, 314, 26, 726, 316, 2498, 790, 518, 390, 1317, 1117, 164, 41, 2055, 2457, 1908, 3642, 2588, 2183, 2184, 310, 1223, 315
 -- shovel, wooden shovel, mould, glass blow pipe, tongs, pot ash
--- clay, coarse sand, quartz sand, large empty bottle, empty juice bottle, empty rum bottle, oil bottle, empty liquor bottle, empty ink bottle, empty potion, glass ingot, glass, wine glass, glass mug, empty salve jar, bricks clay mug, clay cup, mug with lid, empty alchemy bomb, vase
+-- clay, coarse sand, quartz sand, large empty bottle, empty juice bottle, empty rum bottle, empty oil bottle, empty liquor bottle, empty ink bottle, empty potion, glass ingot, glass, wine glass, glass mug, empty salve jar, bricks clay mug, clay cup, mug with lid, empty alchemy bomb, vase
 buySecondaryItems = 314, 26, 726, 316, 2498, 790, 518, 390, 1317, 1117, 164, 41, 2055, 2457, 1908, 3642, 2588, 2183, 2184, 310, 1223, 315
--- pot ash, clay, coarse sand, quartz sand, large empty bottle, empty juice bottle, empty rum bottle, oil bottle, empty liquor bottle, empty ink bottle, empty potion, glass ingot, glass, wine glass, glass mug, empty salve jar, bricks, clay mug, clay cup, mug with lid, empty alchemy bomb, vase
+-- pot ash, clay, coarse sand, quartz sand, large empty bottle, empty juice bottle, empty rum bottle, empty oil bottle, empty liquor bottle, empty ink bottle, empty potion, glass ingot, glass, wine glass, glass mug, empty salve jar, bricks, clay mug, clay cup, mug with lid, empty alchemy bomb, vase
 
 tradeNotEnoughMoneyMsg "Oh, ich f�rchte Ihr k�nnt Euch das nicht leisten.", "Oh, I fear, you can not afford that."
 tradeFinishedMsg "Vielen Dank, beehrt mich bald wieder!", "Thank you, please come again!"

npc/jonathan_cyrus.npc

@@ -65,9 +65,9 @@ itemShoes = 770
 
 sellItems = 311, 2140, 314, 2498, 790, 518, 390, 1317, 1117, 164, 41, 2055, 2457, 1908, 3642, 2588, 2183, 2184, 310, 1223, 315
 -- glass blow pipe, tongs, pot ash
--- large empty bottle, empty juice bottle, empty rum bottle, oil bottle, empty liquor bottle, empty ink bottle, empty potion, glass ingot, glass mug, glass, wine glass, glass mug, empty salve jar, bricks, clay mug, clay cup, mug with lid, empty alchemy bomb, vase
+-- large empty bottle, empty juice bottle, empty rum bottle, empty oil bottle, empty liquor bottle, empty ink bottle, empty potion, glass ingot, glass mug, glass, wine glass, glass mug, empty salve jar, bricks, clay mug, clay cup, mug with lid, empty alchemy bomb, vase
 buyPrimaryItems = 314, 2498, 790, 518, 390, 1317, 1117, 164, 41, 2055, 2457, 1908, 3642, 2588, 2183, 2184, 310, 1223, 315
--- pot ash, large empty bottle, empty juice bottle, empty rum bottle, oil bottle, empty liquor bottle, empty ink bottle, empty potion, glass ingot, glass, wine glass, glass mug, empty salve jar, bricks, clay mug, clay cup, mug with lid, empty alchemy bomb, vase
+-- pot ash, large empty bottle, empty juice bottle, empty rum bottle, empty oil bottle, empty liquor bottle, empty ink bottle, empty potion, glass ingot, glass, wine glass, glass mug, empty salve jar, bricks, clay mug, clay cup, mug with lid, empty alchemy bomb, vase
 tradeNotEnoughMoneyMsg "Ich verlange hierf�r mehr, als ihr �berhaupt habt.", "I demand more for this than you even have."
 tradeFinishedMsg "Schaut doch bald wieder vorbei.", "See you next time."
 tradeFinishedWithoutTradingMsg "Und so trennen sich unsere Wege.", "And thus we part company."

npc/philipp_molitor.npc

@@ -903,22 +903,22 @@ queststatus(127) = 46, item(7, all) < 10, town = Cadomyr, "quest", "mission" ->
 queststatus(127) = 46, item(7, all) < 10, town = Cadomyr, "task", "adventure", "order" -> "Your order is to get ten horned helmets. Please hurry. The caravan cannot wait forever."
 queststatus(127) = 46, item(7, all) < 10, town = Cadomyr, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> "Euer Auftrag ist es, zehn H�rnerhelme zu besorgen. Beeilt euch bitte, die Karawane kann nicht ewig warten."
 
--- Order 47: Gather ten oil bottles (390) in four hours
--- Order 47 taken, get ten oil bottles, reward: twenty four sp, 1 rankpoints
-queststatus(127) = 0, english, chance(0.67114093959731547), town = Cadomyr, "quest", "mission" -> inform("[New Order] Get ten oil bottles."), "I have the following order for you. The next caravan has a demand for ten oil bottles. Please provide these goods as soon as possible for the glory of Cadomyr. Your reward will be twenty four silver coins.", queststatus(127) = 47, queststatus(128) = 48
-queststatus(127) = 0, german, chance(0.67114093959731547), town = Cadomyr, "quest", "mission" -> inform("[Neuer Auftrag] Beschaffe zehn �lflaschen."), "F�r euch liegt folgender Auftrag vor: Die n�chste Karawane ben�tigt zehn �lflaschen. Besorgt diese Waren so bald wie m�glich. Euer Lohn sollen vierundzwanzig Silberst�cke sein. F�r die Ehre von Cadomyr!", queststatus(127) = 47, queststatus(128) = 48
-queststatus(127) = 0, chance(0.67114093959731547), town = Cadomyr, "task", "adventure", "order" -> inform("[New Order] Get ten oil bottles."), "I have the following order for you. The next caravan has a demand for ten oil bottles. Please provide these goods as soon as possible for the glory of Cadomyr. Your reward will be twenty four silver coins.", queststatus(127) = 47, queststatus(128) = 48
-queststatus(127) = 0, chance(0.67114093959731547), town = Cadomyr, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> inform("[Neuer Auftrag] Beschaffe zehn �lflaschen."), "F�r euch liegt folgender Auftrag vor: Die n�chste Karawane ben�tigt zehn �lflaschen. Besorgt diese Waren so bald wie m�glich. Euer Lohn sollen vierundzwanzig Silberst�cke sein. F�r die Ehre von Cadomyr!", queststatus(127) = 47, queststatus(128) = 48
+-- Order 47: Gather ten empty oil bottles (390) in four hours
+-- Order 47 taken, get ten empty oil bottles, reward: twenty four sp, 1 rankpoints
+queststatus(127) = 0, english, chance(0.67114093959731547), town = Cadomyr, "quest", "mission" -> inform("[New Order] Get ten empty oil bottles."), "I have the following order for you. The next caravan has a demand for ten empty oil bottles. Please provide these goods as soon as possible for the glory of Cadomyr. Your reward will be twenty four silver coins.", queststatus(127) = 47, queststatus(128) = 48
+queststatus(127) = 0, german, chance(0.67114093959731547), town = Cadomyr, "quest", "mission" -> inform("[Neuer Auftrag] Beschaffe zehn leere �lflaschen."), "F�r euch liegt folgender Auftrag vor: Die n�chste Karawane ben�tigt zehn leere �lflaschen. Besorgt diese Waren so bald wie m�glich. Euer Lohn sollen vierundzwanzig Silberst�cke sein. F�r die Ehre von Cadomyr!", queststatus(127) = 47, queststatus(128) = 48
+queststatus(127) = 0, chance(0.67114093959731547), town = Cadomyr, "task", "adventure", "order" -> inform("[New Order] Get ten empty oil bottles."), "I have the following order for you. The next caravan has a demand for ten empty oil bottles. Please provide these goods as soon as possible for the glory of Cadomyr. Your reward will be twenty four silver coins.", queststatus(127) = 47, queststatus(128) = 48
+queststatus(127) = 0, chance(0.67114093959731547), town = Cadomyr, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> inform("[Neuer Auftrag] Beschaffe zehn leere �lflaschen."), "F�r euch liegt folgender Auftrag vor: Die n�chste Karawane ben�tigt zehn leere �lflaschen. Besorgt diese Waren so bald wie m�glich. Euer Lohn sollen vierundzwanzig Silberst�cke sein. F�r die Ehre von Cadomyr!", queststatus(127) = 47, queststatus(128) = 48
 
 -- Order 47 solved, reward: twenty four sp, rankpoints, delay: 4h
 queststatus(127) = 47, item(390, all) >= 10, english, town = Cadomyr, ".*" -> inform("[Order finished] You are awarded twenty four silver coins."), "Just in time. The caravan is about to depart. Here is your reward.", money + 2400, deleteItem(390, 10), queststatus(127) = 0, queststatus(128) = 0, queststatus(129) = 48, rankpoints + 1
 queststatus(127) = 47, item(390, all) >= 10, town = Cadomyr, ".*" -> inform("[Auftrag erledigt] Du erh�ltst vierundzwanzig Silberst�cke."), "Genau zur rechten Zeit. Die Karawane wird bald losziehen. Hier ist eure Belohnung.", money + 2400, deleteItem(390, 10), queststatus(127) = 0, queststatus(128) = 0, queststatus(129) = 48, rankpoints + 1
 
 -- Order 47 taken but not solved, repeat the instructions
-queststatus(127) = 47, item(390, all) < 10, english, town = Cadomyr, "quest", "mission" -> "Your order is to get ten oil bottles. Please hurry. The caravan cannot wait forever."
-queststatus(127) = 47, item(390, all) < 10, town = Cadomyr, "quest", "mission" -> "Euer Auftrag ist es, zehn �lflaschen zu besorgen. Beeilt euch bitte, die Karawane kann nicht ewig warten."
-queststatus(127) = 47, item(390, all) < 10, town = Cadomyr, "task", "adventure", "order" -> "Your order is to get ten oil bottles. Please hurry. The caravan cannot wait forever."
-queststatus(127) = 47, item(390, all) < 10, town = Cadomyr, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> "Euer Auftrag ist es, zehn �lflaschen zu besorgen. Beeilt euch bitte, die Karawane kann nicht ewig warten."
+queststatus(127) = 47, item(390, all) < 10, english, town = Cadomyr, "quest", "mission" -> "Your order is to get ten empty oil bottles. Please hurry. The caravan cannot wait forever."
+queststatus(127) = 47, item(390, all) < 10, town = Cadomyr, "quest", "mission" -> "Euer Auftrag ist es, zehn leere �lflaschen zu besorgen. Beeilt euch bitte, die Karawane kann nicht ewig warten."
+queststatus(127) = 47, item(390, all) < 10, town = Cadomyr, "task", "adventure", "order" -> "Your order is to get ten empty oil bottles. Please hurry. The caravan cannot wait forever."
+queststatus(127) = 47, item(390, all) < 10, town = Cadomyr, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> "Euer Auftrag ist es, zehn leere �lflaschen zu besorgen. Beeilt euch bitte, die Karawane kann nicht ewig warten."
 
 -- Order 48: Gather ten green hats with feather (831) in four hours
 -- Order 48 taken, get ten green hats with feather, reward: twenty four sp, 1 rankpoints

quest/philipp_molitor_127_cadomyr.lua

@@ -125,8 +125,8 @@ Description[ENGLISH][45] = "Philipp Molitor has the following order for you. The
 Description[GERMAN][45] = "Für euch liegt folgender Auftrag von Philipp Molitor vor: Die nächste Karawane benötigt zehn schwarze Stoffhandschuhe. Besorgt diese Waren so bald wie möglich. Euer Lohn sollen zweiundzwanzig Silberstücke sein. Für die Ehre von Cadomyr!"
 Description[ENGLISH][46] = "Philipp Molitor has the following order for you. The next caravan has a demand for ten horned helmets. Please provide these goods as soon as possible for the glory of Cadomyr. Your reward will be twenty four silver coins."
 Description[GERMAN][46] = "Für euch liegt folgender Auftrag von Philipp Molitor vor: Die nächste Karawane benötigt zehn Hörnerhelme. Besorgt diese Waren so bald wie möglich. Euer Lohn sollen vierundzwanzig Silberstücke sein. Für die Ehre von Cadomyr!"
-Description[ENGLISH][47] = "Philipp Molitor has the following order for you. The next caravan has a demand for ten oil bottles. Please provide these goods as soon as possible for the glory of Cadomyr. Your reward will be twenty four silver coins."
-Description[GERMAN][47] = "Für euch liegt folgender Auftrag von Philipp Molitor vor: Die nächste Karawane benötigt zehn Ölflaschen. Besorgt diese Waren so bald wie möglich. Euer Lohn sollen vierundzwanzig Silberstücke sein. Für die Ehre von Cadomyr!"
+Description[ENGLISH][47] = "Philipp Molitor has the following order for you. The next caravan has a demand for ten empty oil bottles. Please provide these goods as soon as possible for the glory of Cadomyr. Your reward will be twenty four silver coins."
+Description[GERMAN][47] = "Für euch liegt folgender Auftrag von Philipp Molitor vor: Die nächste Karawane benötigt zehn leere Ölflaschen. Besorgt diese Waren so bald wie möglich. Euer Lohn sollen vierundzwanzig Silberstücke sein. Für die Ehre von Cadomyr!"
 Description[ENGLISH][48] = "Philipp Molitor has the following order for you. The next caravan has a demand for ten green hats with feather. Please provide these goods as soon as possible for the glory of Cadomyr. Your reward will be twenty four silver coins."
 Description[GERMAN][48] = "Für euch liegt folgender Auftrag von Philipp Molitor vor: Die nächste Karawane benötigt zehn grüner Hüte mit Feder. Besorgt diese Waren so bald wie möglich. Euer Lohn sollen vierundzwanzig Silberstücke sein. Für die Ehre von Cadomyr!"
 Description[ENGLISH][49] = "Philipp Molitor has the following order for you. The next caravan has a demand for ten pairs of short green trousers. Please provide these goods as soon as possible for the glory of Cadomyr. Your reward will be twenty six silver coins."