From a57ce52a263eaba525ea761afc7831e7575d4555 Mon Sep 17 00:00:00 2001 From: brightrim Date: Thu, 14 May 2026 04:05:18 +0200 Subject: [PATCH 1/8] Revert "testing disabled in preparation for release" This reverts commit cb6b404f725aaff6d16aacfbc305bee0dd58ae17. --- base/testing.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/testing.lua b/base/testing.lua index 71bbdad02..b42d1d310 100644 --- a/base/testing.lua +++ b/base/testing.lua @@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . ]] -return {active = false} +return {active = true} --[[ Set this to true if testing and false if releasing. This way we don't have to remove useful testing logging before release and can instead just set it behind From 14a554cac84b458b08bf186b030d9a3c687c1791 Mon Sep 17 00:00:00 2001 From: EviePryler Date: Sat, 30 May 2026 00:36:10 -0500 Subject: [PATCH 2/8] Issue #549 Various Typos --- npc/boumaug_firesmash.npc | 2 +- npc/charwis_irongate.npc | 4 ++-- npc/uriel_urch.npc | 2 +- quest/anthar_vilicon_119_cadomyr.lua | 2 +- triggerfield/labour_camp_dumping.lua | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/npc/boumaug_firesmash.npc b/npc/boumaug_firesmash.npc index 5eea5dadd..5ec6559c2 100644 --- a/npc/boumaug_firesmash.npc +++ b/npc/boumaug_firesmash.npc @@ -183,7 +183,7 @@ queststatus(155) = 7, town = Galmair, ".*" -> "Zwanzig Steinquader f -- Quest 4: Patrol the tunnel to the Dark Hole Mine, Harbour, Black Bridge (ambush), beehives queststatus(155) = 8, english, town = Galmair, "quest", "mission" -> inform("[New Quest] As a Galmair Guard IV"), queststatus(155) = 9, "Yous are going out now! Go check da tunnel to da Dark Hole Mine, Galmair Harbour to da north, da Black Bridge, and da honey houses far to da east in da Plains of Nargún!" queststatus(155) = 8, town = Galmair, "quest", "mission" -> inform("[Neues Quest] Als Wache Galmairs IV"), queststatus(155) = 9, "Du jetzt gehen los! Kontrolliere den Tunnel zur Dunkellochmine, Galmairs Hafen in nördlicher Richtung, die Schwarzbrücke und den Bienenstock fern im Osten der Nargúnebene." -queststatus(155) = 8, town = Galmair, "task", "adventure", "order" -> inform("[New Quest]As a Galmair Guard IV"), queststatus(155) = 9, "Yous are going out now! Go check da tunnel to da Darrk Hole Mine, Galmair Harbour to da north, da Black Bridge, and da honey houses far to da east in da Plains of Nargún!" +queststatus(155) = 8, town = Galmair, "task", "adventure", "order" -> inform("[New Quest]As a Galmair Guard IV"), queststatus(155) = 9, "Yous are going out now! Go check da tunnel to da Dark Hole Mine, Galmair Harbour to da north, da Black Bridge, and da honey houses far to da east in da Plains of Nargún!" queststatus(155) = 8, town = Galmair, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> inform("[Neues Quest] Als Wache Galmairs IV"), queststatus(155) = 9, "Du jetzt gehen los! Kontrolliere den Tunnel zur Dunkellochmine, Galmairs Hafen in nördlicher Richtung, die Schwarzbrücke und den Bienenstock fern im Osten der Nargúnebene." -- Quest 4 solved, reward: Orc helmet (2287), 15 rankpoints diff --git a/npc/charwis_irongate.npc b/npc/charwis_irongate.npc index afce0bac8..73e10cc0d 100644 --- a/npc/charwis_irongate.npc +++ b/npc/charwis_irongate.npc @@ -162,8 +162,8 @@ queststatus(702) = 13, town = Galmair, "task", "adventure", "order" -> "Please t queststatus(702) = 13, town = Galmair, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> "Bitte bringt Elvaine Morgan seinen Stab zurück. Er wird ihn vermissen." -- 5th quest solved, reward silvered sword 98, 5 Silver, + 12 rankpoints -queststatus(702) = 14, english, town = Galmair, ".+" -> inform("[Quest solved] You solved the quest. You are awarded a silvered longsword and some coins."), money + 500, item(98, 1, 222, "descriptionEn" = "This sword was a present from Charwis Irongate", "rareness" = "1", "descriptionDe" = "Dieses Schwert war ein Geschenk von Charwis Irongate."), queststatus(702) = 15, rankpoints + 4, "Thank you. Take this for your trouble." -queststatus(702) = 14, town = Galmair, ".+" -> inform("[Quest gelöst] Du hast das Quest gelöst. Du wirst mit einem versilberten Langschwert und ein paar Silbermünzen belohnt."), money + 500, item(98, 1, 222, "descriptionEn" = "This wand was a present from Charwis Irongate", "rareness" = "1", "descriptionDe" = "Dieses Schwert war ein Geschenk von Charwis Irongate."), queststatus(702) = 15, rankpoints + 4, "Danke, nehmt dies als Belohnung." +queststatus(702) = 14, english, town = Galmair, ".+" -> inform("[Quest solved] You solved the quest. You are awarded a silvered longsword and some coins."), money + 500, item(98, 1, 222, "descriptionEn" = "This sword was a present from Charwis Irongate.", "rareness" = "1", "descriptionDe" = "Dieses Schwert war ein Geschenk von Charwis Irongate."), queststatus(702) = 15, rankpoints + 4, "Thank you. Take this for your trouble." +queststatus(702) = 14, town = Galmair, ".+" -> inform("[Quest gelöst] Du hast das Quest gelöst. Du wirst mit einem versilberten Langschwert und ein paar Silbermünzen belohnt."), money + 500, item(98, 1, 222, "descriptionEn" = "This wand was a present from Charwis Irongate.", "rareness" = "1", "descriptionDe" = "Dieses Schwert war ein Geschenk von Charwis Irongate."), queststatus(702) = 15, rankpoints + 4, "Danke, nehmt dies als Belohnung." -- Final dialogue: No more quests, just nice hints queststatus(702) = 15, english, "quest", "mission" -> "Thank you. I have nothing else for you to do." diff --git a/npc/uriel_urch.npc b/npc/uriel_urch.npc index 36616f802..9dd2ca6d0 100644 --- a/npc/uriel_urch.npc +++ b/npc/uriel_urch.npc @@ -204,7 +204,7 @@ english, "Uriel", "Urch" -> "Hrmpf? What do you want?", "That's me. What's the m -- Emotes are possible also starting with "#me ....". cycletext "#me gähnt ausgiebig.", "#me yawns." -cycletext "#me blickt auf das Wappen an seiner Brustplatte, ein sanftes Lächeln umspielt seine Lippen für einen kurzen Moment.", "#me looks at the crest on his chest place, a soft smile playing across his lips." +cycletext "#me blickt auf das Wappen an seiner Brustplatte, ein sanftes Lächeln umspielt seine Lippen für einen kurzen Moment.", "#me looks at the crest on his chestplate, a soft smile playing across his lips." cycletext "#me schüttelt den Kopf und murmelt zu sich selbst. 'Verdammte Albarianer.'", "#me sighs, muttering to himself. 'Bloody Albarians.'" cycletext "#me kratzt sich an der Nase.", "#me scratches his nose." cycletext "#me kratzt sich kurz zwischen den Beinen.", "#me has a quick scratch between his legs." diff --git a/quest/anthar_vilicon_119_cadomyr.lua b/quest/anthar_vilicon_119_cadomyr.lua index ac53b59e4..beabb79a1 100644 --- a/quest/anthar_vilicon_119_cadomyr.lua +++ b/quest/anthar_vilicon_119_cadomyr.lua @@ -66,7 +66,7 @@ Description[GERMAN][11] = "Ah, ein ergebender Diener ihrer Majest Description[ENGLISH][11] = "Ah, a loyal servant of her Majesty, very good. I plan a banquet to honour the royal family. We'll serve a delicious asparagus cream soup, but soup bowls aren't available in sufficient amounts. Please obtain twenty soup bowls of highest quality and bring them to me." Description[GERMAN][12] = "Ein Notfall ist eingetreten, das Königreich ist in ernsthafter Gefahr. Königin Rosaline hat ihren Spiegel zerbrochen - ihr wisst, wie aufbrausend sie sein kann und wie viel Wert sie auf ihre Schönheit legt. Um Überstürztheiten ihrerseits zuvorzukommen, besorgt sofort einen neuen Spiegel. Gehorcht!" -Description[ENGLISH][12] = "An emergency has occured, the kingdom is seriously endangered. Queen Rosaline broke her mirror - you know how irascible she is and what beauty means to her. To prevent possible misjudgements by her, get a new mirror at once. Obey!" +Description[ENGLISH][12] = "An emergency has occurred, the kingdom is seriously endangered. Queen Rosaline broke her mirror - you know how irascible she is and what beauty means to her. To prevent possible misjudgements by her, get a new mirror at once. Obey!" Description[GERMAN][13] = "Ich habe einen wichtigen Auftrag: Königin Rosaline empfängt demnächste eine Delegation aus Siebenbergen, ein Zwergenreich. Sie möchte diese bärtigen Wichte mit einem besonderen Geschenk beeindrucken: Ein Kamm für ihre zotteligen Bärte. Es ist an euch, einen geeigneten Kamm auszusuchen und mir zu bringen." Description[ENGLISH][13] = "I have an important order: Queen Rosaline will welcome a delegation from Sevenhill, a dwarven kingdom. She wants to impress those bearded wretches with a special present: A comb for their shaggy beards. It is your duty to select a proper comb and bring it to me." diff --git a/triggerfield/labour_camp_dumping.lua b/triggerfield/labour_camp_dumping.lua index 26c7ce0b3..54bc975d9 100644 --- a/triggerfield/labour_camp_dumping.lua +++ b/triggerfield/labour_camp_dumping.lua @@ -45,7 +45,7 @@ function M.PutItemOnField(Item,User) local theItemStats = world:getItemStats(Item) local itemNumberPay = common.Limit(Item.number,0,workLoad) -- we do only count the items a char has to deliver - local payToFaction = itemNumberPay * theItemStats.Worth * 0.1 -- 10% of teh value + local payToFaction = itemNumberPay * theItemStats.Worth * 0.1 -- 10% of the value if town ~= "None" then townTreasure.ChangeTownTreasure(town, payToFaction) -- add to the town treasure From 8f2f4208687a4217b19a46dc6d1d1c405eae295a Mon Sep 17 00:00:00 2001 From: EviePryler Date: Sat, 30 May 2026 00:59:59 -0500 Subject: [PATCH 3/8] Issue #549 Typos --- npc/hairdresser.lua | 2 +- quest/valandil_elensar_69_wilderness.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npc/hairdresser.lua b/npc/hairdresser.lua index 5ae184467..fc4b02121 100644 --- a/npc/hairdresser.lua +++ b/npc/hairdresser.lua @@ -98,7 +98,7 @@ local cycleText = { {"Haare schneiden fast im Vorbeigehen.", "Hair one moment. Gone the next!"}, {"Einige Krieger kommen und wollen 'Aim the for the flat-top'. Was immer das sein soll.", "Some warrior once told me, 'Aim the for the flat-top!' Whatever that means."}, {"Zeit Euch zu rasieren!?", "Time for a shave yes?"}, -{"Oh Götter, da ist eine tote Ratte auf Eurem Kopf.", "Oh my gods! There's a dead rat on your head!."}, +{"Oh Götter, da ist eine tote Ratte auf Eurem Kopf.", "Oh my gods! There's a dead rat on your head!"}, {"Ich schneid dem Nächsten die Kehle durch, der mir mit .. Oh Hallo, braucht Ihr eine Rasur?", "I'll kill the next fella that.. Oh hello there, care for a shave?"} } diff --git a/quest/valandil_elensar_69_wilderness.lua b/quest/valandil_elensar_69_wilderness.lua index cde9710dc..3c0f24787 100644 --- a/quest/valandil_elensar_69_wilderness.lua +++ b/quest/valandil_elensar_69_wilderness.lua @@ -41,7 +41,7 @@ Description[ENGLISH][3] = "Collect twenty logs of cherry wood and take them back Description[GERMAN][4] = "Geh zu Valandil Elensar im Elsbaumwald. Er hat bestimmt noch eine Aufgabe für dich." Description[ENGLISH][4] = "Go back to Valandil Elensar in the Elstree Forest, he will certainly have another task for you." Description[GERMAN][5] = "Sammel fünf Zweige und bringe diese Valandil Elensar. Um Zweige zu sammeln, nimmst du das Beil in die Hand und benutzt es, während du vor einer Tanne oder Scandrel­Kiefer stehst." -Description[ENGLISH][5] = "Collect five branches and take them back to Valandil Elensar. To collect branches use the hatchet in your hand, whilst standing in front of a fir tree or scandrel pine." +Description[ENGLISH][5] = "Collect five boughs and take them back to Valandil Elensar. To collect branches use the hatchet in your hand, whilst standing in front of a fir tree or scandrel pine." Description[GERMAN][6] = "Geh zu Valandil Elensar im Elsbaumwald. Er hat bestimmt noch eine Aufgabe für dich." Description[ENGLISH][6] = "Go back to Valandil Elensar in the Elstree Forest, he will certainly have another task for you." Description[GERMAN][7] = "Besorge zehn Bündel Getreide und bringe sie Valandil Elensar. Du kannst Getreide auf einem Feld anbauen und mit einer Sense ernten oder die Getreidebündel bei einem Händler kaufen." From f2955c897256d0598b364a8b70cd3b7ea63df4c2 Mon Sep 17 00:00:00 2001 From: EviePryler Date: Sat, 30 May 2026 01:31:35 -0500 Subject: [PATCH 4/8] Issue #549 more typos --- npc/antonius_copperhand.npc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npc/antonius_copperhand.npc b/npc/antonius_copperhand.npc index 10f8657f6..d6e45b3b0 100644 --- a/npc/antonius_copperhand.npc +++ b/npc/antonius_copperhand.npc @@ -120,4 +120,4 @@ cycletext "#me pfeift eine Melodie.", "#me whistles a melody." cycletext "#me wischt sich den Schweiß von der Stirn.", "#me wipes the sweat off his forehead." cycletext "#me betrachtet zufrieden seine geschmiedeten Werke.", "#me looks at his smithed works with a content face." cycletext "#me hält ein Amulett gegen das Licht, um es besser zu betrachten.", "#me holds an amulet up to the light to have a better look at it." -cycletext "Schmiedewaren! Schöner Schmuck! Kaufste woanders, dann bereustes!", "Smithed goods! Fine Jewelry! Ya buy elsewhere, and ya will regret it!" +cycletext "Schmiedewaren! Schöner Schmuck! Kaufste woanders, dann bereustes!", "Smithed goods! Fine jewellry! Ya buy elsewhere, and ya will regret it!" From d9a302cea4d75970926b1dde2f969a807b48d8c9 Mon Sep 17 00:00:00 2001 From: EviePryler Date: Tue, 2 Jun 2026 13:45:56 -0500 Subject: [PATCH 5/8] Update market message for the change in Hempty's name to Troll's Haven --- scheduled/market.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scheduled/market.lua b/scheduled/market.lua index d1776e48a..e887441d8 100644 --- a/scheduled/market.lua +++ b/scheduled/market.lua @@ -58,7 +58,7 @@ function M.market() --Announce the market day one ingame hour before it takes place if (hour == 11) and not announced then - world:broadcast("In etwa zwanzig Minuten wird auf dem Gelände des Gasthofs zur Hanfschlinge der Markt des Monats "..monthString.." veranstaltet. Macht eure Waren bereit!","In around twenty minutes, the market of the month "..monthString.." will be held on the premises of the Hemp Necktie Inn. Get your goods ready!"); + world:broadcast("In etwa zwanzig Minuten wird auf dem Gelände von Trolls Haven der Markt des Monats beginnen "..monthString.." veranstaltet. Macht eure Waren bereit!","In around twenty minutes, the market of the month "..monthString.." will be held on the premises of the Troll's Haven Inn. Get your goods ready!"); announced=true; started=false; over=false; @@ -67,7 +67,7 @@ function M.market() --Invites the players elseif (hour == 12) and not started then - world:broadcast("Der Markt des Monats "..monthString.." hat soeben auf dem Gelände des Gasthofs zur Hanfschlinge begonnen!","The market of the month "..monthString.." has started on the premises of the Hemp Necktie Inn!"); + world:broadcast("Der Markt des Monats "..monthString.." hat soeben auf dem Gelände von Trolls Haven begonnen!","The market of the month "..monthString.." has started on the premises of the Troll's Haven Inn!"); announced=false; started=true; over=false; From de9849152a59631e4c05b7453c13f52fd6032635 Mon Sep 17 00:00:00 2001 From: EviePryler Date: Tue, 2 Jun 2026 14:02:41 -0500 Subject: [PATCH 6/8] Isue #551 fixing the A Question of Honour Quest for Crafting Changes --- npc/beror_oakaxe.npc | 8 ++++---- quest/beror_oakaxe_111_cadomyr.lua | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/npc/beror_oakaxe.npc b/npc/beror_oakaxe.npc index 56be94e3f..e2e406542 100644 --- a/npc/beror_oakaxe.npc +++ b/npc/beror_oakaxe.npc @@ -236,10 +236,10 @@ queststatus(111) = 17, item(334, all) > 0, item(315, all) > 0, english, town = C queststatus(111) = 17, item(334, all) > 0, item(315, all) > 0, town = Cadomyr, ".*" -> inform("[Quest gelöst] Du erhältst einen Ritterschild und einen magischen Amethysten."), deleteItem(334, 1), deleteItem(315, 1), item(20, 1, 999,"descriptionEn" = "This shield bears the crest of Cadomyr.", "descriptionDe" = "Dieser Schild trägt das Wappen Cadomyrs.","rareness" = "3"), item(3519, 1, 333, "gemLevel" = "2"), queststatus(111) = 18, rankpoints + 3, "Du bist wahrhaftig ein selbstloser Ritter Cadomyrs. Trage fortan das Wappen Cadomyrs auf deinem Schild, der Schild eines Ritters. Ich salutiere vor dir!" -- Quest 7 taken but not solved, repeat the instructions -queststatus(111) = 17, english, town = Cadomyr, "quest", "mission" -> "The queen demands a charm of the icebird, a ring of the archmage and a vase. Bring it to me and do not dare to bother herself." -queststatus(111) = 17, town = Cadomyr, "quest", "mission" -> "Die Königin verlangt nach einem Eisvogelamulett, einem Erzmagierring und einer Vase. Bringt diese Dinge zu mir und wagt es nicht, sie mit dieser Angelegenheit zu behelligen." -queststatus(111) = 17, town = Cadomyr, "task", "adventure", "order" -> "The queen demands a charm of the icebird, a ring of the archmage and a vase. Bring it to me and do not dare to bother herself." -queststatus(111) = 17, town = Cadomyr, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> "Die Königin verlangt nach einem Eisvogelamulett, einem Erzmagierring und einer Vase. Bringt diese Dinge zu mir und wagt es nicht, sie mit dieser Angelegenheit zu behelligen." +queststatus(111) = 17, english, town = Cadomyr, "quest", "mission" -> "The queen demands a charm of the icebird and a vase. Bring it to me and do not dare to bother herself." +queststatus(111) = 17, town = Cadomyr, "quest", "mission" -> "Die Königin verlangt nach einem Eisvogelamulett und einer Vase. Bringt diese Dinge zu mir und wagt es nicht, sie mit dieser Angelegenheit zu behelligen." +queststatus(111) = 17, town = Cadomyr, "task", "adventure", "order" -> "The queen demands a charm of the icebird and a vase. Bring it to me and do not dare to bother herself." +queststatus(111) = 17, town = Cadomyr, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> "Die Königin verlangt nach einem Eisvogelamulett und einer Vase. Bringt diese Dinge zu mir und wagt es nicht, sie mit dieser Angelegenheit zu behelligen." -- No more quests, just nice words of gratitude queststatus(111) = 18, english, town = Cadomyr, "quest", "mission" -> "You might become one of Cadomyr's heroes one day. Now set out and do good deeds in the name of the Queen!" diff --git a/quest/beror_oakaxe_111_cadomyr.lua b/quest/beror_oakaxe_111_cadomyr.lua index 3f6620316..da68f6696 100644 --- a/quest/beror_oakaxe_111_cadomyr.lua +++ b/quest/beror_oakaxe_111_cadomyr.lua @@ -65,8 +65,8 @@ Description[GERMAN][15] = "Besorge zwanzig Naldorholzbretter und bringe sie Bero Description[ENGLISH][15] = "Produce twenty naldor wood boards and bring them to Beror. You can buy them from a merchant or saw naldor wood into boards by using a workbench as you stand in front of it, with the saw in your hand. You can find workbenches in Runewick or Galmair." Description[GERMAN][16] = "Geh zu Beror Oakaxe, der sich in der Stube des Wachtmeisters von Cadomyr aufhält. Er hat bestimmt noch eine Aufgabe für dich." Description[ENGLISH][16] = "Go back to Beror Oakaxe in the Sergeant Store of Cadomyr, he will certainly have another task for you." -Description[GERMAN][17] = "Besorge ein Eisvogelamulett, einen Erzmagierring und eine Vase und bringe sie Beror. Du kannst sie als Goldschmied bzw. Glasbläser herstellen. Dazu nimmst du den Feinschmiedhammer in die Hand und benutzt ihn, während du vor einem Amboss stehst und das Glasblasrohr, während du vor einem Glasschmelzofen stehst." -Description[ENGLISH][17] = "Produce a charm of the icebird and a vase and bring them to Beror. You can produce them as goldsmith and glass blower respectively. Therefor use the finesmithing hammer in your hand, while standing in front of an anvil or use the glass blow pipe in your hand, while standing in front of an glass melting oven." +Description[GERMAN][17] = "Stelle ein Eisvogelamulett und eine Vase her und bringe sie zu Beror. Du kannst sie als Goldschmied und Töpfer herstellen. Verwende dazu den Feinschmiedehammer in deiner Hand, während du vor einem Amboss stehst, oder die Zange in deiner Hand, während du vor einem Brennofen stehst." +Description[ENGLISH][17] = "Produce a charm of the icebird and a vase and bring them to Beror. You can produce them as goldsmith and potter respectively. Therefore use the finesmithing hammer in your hand, while standing in front of an anvil or use the tongs in your hand, while standing in front of an kiln." Description[GERMAN][18] = "Du hast alle Aufgaben von Beror Oakaxe erfüllt." Description[ENGLISH][18] = "You have fulfilled all the tasks for Beror Oakaxe." From 7f8f9b17ef1ef45517e290e58fa400bb5dc0fbed Mon Sep 17 00:00:00 2001 From: EviePryler Date: Sun, 14 Jun 2026 17:54:22 -0500 Subject: [PATCH 7/8] Changing the books Portal book NPC sells to Trolls Haven to match what Mages craft and the teleporter --- npc/lobely.npc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npc/lobely.npc b/npc/lobely.npc index 531e52d38..a6957767b 100644 --- a/npc/lobely.npc +++ b/npc/lobely.npc @@ -64,7 +64,7 @@ itemShoes = 53 sellItem = id(1061), de("Portalbuch nach Cadomyr"), en("Portal book to Cadomyr"), price(5000), stack(1), quality(399), data("destinationCoordsY" = "647", "destinationCoordsX" = "126", "destinationCoordsZ" = "0", "descriptionDe" = "Portal nach Cadomyr", "descriptionEn" = "Portal to Cadomyr") sellItem = id(1061), de("Portalbuch nach Galmair"), en("Portal book to Galmair"), price(5000), stack(1), quality(399), data("destinationCoordsY" = "246", "destinationCoordsX" = "423", "destinationCoordsZ" = "0", "descriptionDe" = "Portal nach Galmair", "descriptionEn" = "Portal to Galmair") sellItem = id(1061), de("Portalbuch nach Runewick"), en("Portal book to Runewick"), price(5000), stack(1), quality(399), data("destinationCoordsY" = "813", "destinationCoordsX" = "835", "destinationCoordsZ" = "0", "descriptionDe" = "Portal nach Runewick", "descriptionEn" = "Portal to Runewick") -sellItem = id(1061), de("Portalbuch zum Gasthof zur Hanfschlinge"), en("Portal book to the Hemp Necktie Inn"), price(5000), stack(1), quality(399), data("destinationCoordsY" = "307", "destinationCoordsX" = "684", "destinationCoordsZ" = "0", "descriptionDe" = "Portal zum Gasthof zur Hanfschlinge", "descriptionEn" = "Portal to the Hemp Necktie Inn") +sellItem = id(1061), de("Portalbuch zum Trollshaven"), en("Portal book to the Troll's Haven"), price(5000), stack(1), quality(399), data("destinationCoordsY" = "307", "destinationCoordsX" = "684", "destinationCoordsZ" = "0", "descriptionDe" = "Portal zum Trollshaven", "descriptionEn" = "Portal to the Troll's Haven") tradeNotEnoughMoneyMsg "Du hast nicht genug Geld!", "You don't have enough money!" tradeFinishedMsg "Danke, komm doch bald wieder.", "Thanks, come back soon." From 5a7197d99b0089f0d432770b8aff089952bac211 Mon Sep 17 00:00:00 2001 From: estralis Date: Sat, 18 Jul 2026 12:17:32 +0200 Subject: [PATCH 8/8] Implement https://github.com/Illarion-eV/Illarion-Content/pull/550 that was closed due to AI agent spam. --- item/id_224_goldengoblet.lua | 2 +- npc/anthar_vilicon.npc | 6 +++--- npc/anthony_devries.npc | 2 +- npc/graznok.npc | 8 ++++---- npc/gurzad_gutri.npc | 2 +- npc/ioannes_faber.npc | 2 +- npc/pesnar_rolemnes.npc | 2 +- npc/philipp_molitor.npc | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/item/id_224_goldengoblet.lua b/item/id_224_goldengoblet.lua index c1427dc92..38594bc3d 100644 --- a/item/id_224_goldengoblet.lua +++ b/item/id_224_goldengoblet.lua @@ -38,7 +38,7 @@ function M.UseItem(user, sourceItem) end --- This function is called from the coin scripts. It stores the coins in teh goblet. +-- This function is called from the coin scripts. It stores the coins in the goblet. function M.putCoinsInGoblet(user, sourceItem) if common.isSpecialItem(sourceItem) then return false diff --git a/npc/anthar_vilicon.npc b/npc/anthar_vilicon.npc index 4c715d625..422b0d7b6 100644 --- a/npc/anthar_vilicon.npc +++ b/npc/anthar_vilicon.npc @@ -319,9 +319,9 @@ queststatus(119) = 11, item(2935, all) < 20, town = Cadomyr, "task", "adventure" queststatus(119) = 11, item(2935, all) < 20, town = Cadomyr, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> "Die Vorbereitungen für das Bankett haben bereits begonnen und ihr habt die zwanzig Suppenschüsseln noch nicht besorgt? Wie sollen wir der Königin die Suppe servieren - in einem Eimer!?" -- 12: Quest 12 taken, get a mirror (336), reward: 700cp, 5 rankpoints -queststatus(119) = 0, english, chance(11.11), town = Cadomyr, "quest", "mission" -> inform("[New Quest] Do a good turn daily for Cadomyr"), queststatus(119) = 12, queststatus(159) = 36, "An emergency has occured, the kingdom is seriously endangered. Queen Rosaline broke her mirror - you know how irascible she is and what beauty means to her. To prevent possible misjudgements by her, get a new mirror at once. Obey!" +queststatus(119) = 0, english, chance(11.11), town = Cadomyr, "quest", "mission" -> inform("[New Quest] Do a good turn daily for Cadomyr"), queststatus(119) = 12, queststatus(159) = 36, "An emergency has occurred, the kingdom is seriously endangered. Queen Rosaline broke her mirror - you know how irascible she is and what beauty means to her. To prevent possible misjudgements by her, get a new mirror at once. Obey!" queststatus(119) = 0, german, chance(11.11), town = Cadomyr, "quest", "mission" -> inform("[Neues Quest] Jeden Tag eine gute Tat für Cadomyr"), queststatus(119) = 12, queststatus(159) = 36, "Ein Notfall ist eingetreten, das Königreich ist in ernsthafter Gefahr. Königin Rosaline hat ihren Spiegel zerbrochen - ihr wisst, wie aufbrausend sie sein kann und wie viel Wert sie auf ihre Schönheit legt. Um Überstürztheiten ihrerseits zuvorzukommen, besorgt sofort einen neuen Spiegel. Gehorcht!" -queststatus(119) = 0, chance(11.11), town = Cadomyr, "task", "adventure", "order" -> inform("[New Quest] Do a good turn daily for Cadomyr"), queststatus(119) = 12, queststatus(159) = 36, "An emergency has occured, the kingdom is seriously endangered. Queen Rosaline broke her mirror - you know how irascible she is and what beauty means to her. To prevent possible misjudgements by her, get a new mirror at once. Obey!" +queststatus(119) = 0, chance(11.11), town = Cadomyr, "task", "adventure", "order" -> inform("[New Quest] Do a good turn daily for Cadomyr"), queststatus(119) = 12, queststatus(159) = 36, "An emergency has occurred, the kingdom is seriously endangered. Queen Rosaline broke her mirror - you know how irascible she is and what beauty means to her. To prevent possible misjudgements by her, get a new mirror at once. Obey!" queststatus(119) = 0, chance(11.11), town = Cadomyr, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> inform("[Neues Quest] Jeden Tag eine gute Tat für Cadomyr"), queststatus(119) = 12, queststatus(159) = 36, "Ein Notfall ist eingetreten, das Königreich ist in ernsthafter Gefahr. Königin Rosaline hat ihren Spiegel zerbrochen - ihr wisst, wie aufbrausend sie sein kann und wie viel Wert sie auf ihre Schönheit legt. Um Überstürztheiten ihrerseits zuvorzukommen, besorgt sofort einen neuen Spiegel. Gehorcht!" -- Quest 12 solved, reward: 700cp, 5 rankpoints, delay: 5h @@ -462,7 +462,7 @@ queststatus(119) = 20, item(236, all) < 1, town = Cadomyr, "quest", "mission" -> queststatus(119) = 20, item(236, all) < 1, town = Cadomyr, "task", "adventure", "order" -> "Out of my sight and do not dare to come back before you brought me a gold ingot." queststatus(119) = 20, item(236, all) < 1, town = Cadomyr, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> "Aus meinen Augen und wagt es nicht eher wiederzukommen, als dass ihr nicht einen Goldbarren dabei habt." --- Outlaw exception: If 'quest' is not triggered until here, the speaker is an outlaw or an error occured. Condition town=none does not work! +-- Outlaw exception: If 'quest' is not triggered until here, the speaker is an outlaw or an error occurred. Condition town=none does not work! english, "quest", "mission" -> "I have a special assignment for you: Go back to Wilderland and don't come back to the palace unless her Majesty summons you." "quest", "mission" -> "Ich habe eine besondere Mission für euch: Geht zurück nach Wilderland und wagt es nicht, den Palast wieder zu betreten, es sei denn, ihre Majestät befiehlt es euch." "task", "adventure", "order", "order" -> "I have a special assignment for you: Go back to Wilderland and don't come back to the palace unless her Majesty summons you." diff --git a/npc/anthony_devries.npc b/npc/anthony_devries.npc index 712d8659e..9215ca1b6 100644 --- a/npc/anthony_devries.npc +++ b/npc/anthony_devries.npc @@ -5170,7 +5170,7 @@ queststatus(210) = 297, item(2626, all) < 5, town = Galmair, "quest", "mission" queststatus(210) = 297, item(2626, all) < 5, town = Galmair, "task", "adventure", "order" -> "My client requires five magical waraxes. Shall I give the contract to someone else or will you deliver on time?" queststatus(210) = 297, item(2626, all) < 5, town = Galmair, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> "Mein Auftraggeber benötigt fünf magische Kriegsäxte. Wirst du pünktlich liefern oder muss ich den Vertrag anderweitig vergeben?" --- Outlaw exception: If 'quest' is not triggered until here, the speaker is an outlaw or an error occured. Condition town=none does not work! +-- Outlaw exception: If 'quest' is not triggered until here, the speaker is an outlaw or an error occurred. Condition town=none does not work! english, "quest", "mission" -> "Get lost, bum!" "quest", "mission" -> "Hau ab du Penner!" "task", "adventure", "order", "order" -> "Get lost, bum!" diff --git a/npc/graznok.npc b/npc/graznok.npc index 60cb4b341..4516d0657 100644 --- a/npc/graznok.npc +++ b/npc/graznok.npc @@ -109,9 +109,9 @@ english, "Ciao", "Adieu", "Au revoir", "Farebba" -> "Go wid dat Moshi, and when -- 1st quest: Provide a torch. -- Give out quest 1 -queststatus(3) = 0, english, "quest", "mission" -> inform("[New quest] The Craven Orc I"), queststatus(3) = 1, "Yoos gottur help mes. Mes want teh explore dat cave over dere, but nub hab torch fer light. Gimme torch so mes can find place fer clan fer dwellin'." +queststatus(3) = 0, english, "quest", "mission" -> inform("[New quest] The Craven Orc I"), queststatus(3) = 1, "Yoos gottur help mes. Mes want the explore dat cave over dere, but nub hab torch fer light. Gimme torch so mes can find place fer clan fer dwellin'." queststatus(3) = 0, "quest", "mission" -> inform("[Neues Quest] Der feige Ork I"), queststatus(3) = 1, "Du mirr hilfst. Mirr wolle erkunden Höhle drüben dort. Aber nix hab Fackl für Licht. Gibst mirr Fackl. Mir findet Platz fürr Klan. Beißn Knochn." -queststatus(3) = 0, "task", "adventure" -> inform("[New quest] The Craven Orc I"), queststatus(3) = 1, "Yoos gottur help mes. Mes want teh explore dat cave over dere, but nub hab torch fer light. Gimme torch so mes can find place fer clan fer dwellin'." +queststatus(3) = 0, "task", "adventure" -> inform("[New quest] The Craven Orc I"), queststatus(3) = 1, "Yoos gottur help mes. Mes want the explore dat cave over dere, but nub hab torch fer light. Gimme torch so mes can find place fer clan fer dwellin'." queststatus(3) = 0, "Auftrag", "Aufgabe", "Abenteuer" -> inform("[Neues Quest] Der feige Ork I"), queststatus(3) = 1, "Du mirr hilfst. Mirr wolle erkunden Höhle drüben dort. Aber nix hab Fackl für Licht. Gibst mirr Fackl. Mir findet Platz fürr Klan. Beißn Knochn." -- Quest 1 taken but not solved, repeat the instructions @@ -147,9 +147,9 @@ queststatus(3) = 8, ".+" -> inform("[Quest gel -- 3rd quest: Kill 10 skeletons -- Give out quest 3 -queststatus(3) = 9, english, "quest", "mission" -> inform("[New quest] The Craven Orc III"), queststatus(3) = 10, "Cave be much more cozy widout ragmen, but dere sum bonemen, deep in cave. Nub want teh dwell in same cave as bonemen. Smash as many as yoos can count wid yoos hands!" +queststatus(3) = 9, english, "quest", "mission" -> inform("[New quest] The Craven Orc III"), queststatus(3) = 10, "Cave be much more cozy widout ragmen, but dere sum bonemen, deep in cave. Nub want the dwell in same cave as bonemen. Smash as many as yoos can count wid yoos hands!" queststatus(3) = 9, "quest", "mission" -> inform("[Neues Quest] Der feige Ork III"), queststatus(3) = 10, "Höhle viel mehr gemütlich, ohne Lumpenmanns. Aber dort Knochenmanns sind. Tief in Höhle. Mir nix nagn Knochen in selbe Höhle wie Knochnman. Du zerhaust Knochenmans, so viel zu abzählst auf dein Hände." -queststatus(3) = 9, "task", "adventure" -> inform("[New quest] The Craven Orc III"), queststatus(3) = 10, "Cave be much more cozy widout ragmen, but dere sum bonemen, deep in cave. Nub want teh dwell in same cave as bonemen. Smash as many as yoos can count wid yoos hands!" +queststatus(3) = 9, "task", "adventure" -> inform("[New quest] The Craven Orc III"), queststatus(3) = 10, "Cave be much more cozy widout ragmen, but dere sum bonemen, deep in cave. Nub want the dwell in same cave as bonemen. Smash as many as yoos can count wid yoos hands!" queststatus(3) = 9, "Auftrag", "Aufgabe", "Abenteuer" -> inform("[Neues Quest] Der feige Ork III"), queststatus(3) = 10, "Höhle viel mehr gemütlich, ohne Lumpenmanns. Aber dort Knochenmanns sind. Tief in Höhle. Mir nix nagn Knochen in selbe Höhle wie Knochnman. Du zerhaust Knochenmans, so viel zu abzählst auf dein Hände." -- Quest 3 taken but not solved, repeat the instructions diff --git a/npc/gurzad_gutri.npc b/npc/gurzad_gutri.npc index b4f0992c3..a47c7ecc2 100644 --- a/npc/gurzad_gutri.npc +++ b/npc/gurzad_gutri.npc @@ -456,7 +456,7 @@ queststatus(152) = 20, item(234, all) < 1, town = Galmair, "quest", "mission" -> queststatus(152) = 20, item(234, all) < 1, town = Galmair, "task", "adventure", "order" -> "Have you brought it? No!? Well don't return until you have one gold nugget for me!" queststatus(152) = 20, item(234, all) < 1, town = Galmair, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> "Bringt Ihr mir das Nugget? Nein?! Kommt nicht wieder, bevor Ihr nicht ein Goldnugget für mich habt!" --- Outlaw exception: If 'quest' is not triggered until here, the speaker is an outlaw or an error occured. Condition town=none does not work! +-- Outlaw exception: If 'quest' is not triggered until here, the speaker is an outlaw or an error occurred. Condition town=none does not work! english, "quest", "mission" -> "We don't need no help from anyone from that stinkin' Necktie Inn. Don't let me see you in here again." "quest", "mission" -> "Wir brauchen keine Hilfe von jemandem aus diesem stinkenden Gasthof zur Hanfschlinge! Lasst Euch hier nicht wieder blicken." "task", "adventure", "order" -> "We don't need no help from anyone from that stinkin' Necktie Inn. Don't let me see you in here again." diff --git a/npc/ioannes_faber.npc b/npc/ioannes_faber.npc index c0aebbeca..72e9732cd 100644 --- a/npc/ioannes_faber.npc +++ b/npc/ioannes_faber.npc @@ -127,7 +127,7 @@ queststatus(151) = 3, town = Cadomyr, "quest", "mission" -> "Wenn ihr weitere Ta queststatus(151) = 3, town = Cadomyr, "task", "adventure", "order" -> "If you want to do further deeds in the name of Cadomyr, ask Chancellor Anthar Vilicon." queststatus(151) = 3, town = Cadomyr, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> "Wenn ihr weitere Taten im Namen Cadomyrs vollbringen wollt, fragt Kanzler Anthar Vilicon." --- Outlaw exception: If 'quest' is not triggered until here, the speaker is an outlaw or an error occured. Condition town=none does not work! +-- Outlaw exception: If 'quest' is not triggered until here, the speaker is an outlaw or an error occurred. Condition town=none does not work! english, "quest", "mission" -> "You have no business here, outcast." "quest", "mission" -> "Für Ausgestoßene gibt es hier nichts zu holen." "task", "adventure", "order", "order" -> "You have no business here, outcast." diff --git a/npc/pesnar_rolemnes.npc b/npc/pesnar_rolemnes.npc index 74d32b193..d3f6b7f03 100644 --- a/npc/pesnar_rolemnes.npc +++ b/npc/pesnar_rolemnes.npc @@ -4286,7 +4286,7 @@ queststatus(213) = 245, item(3916, all) < 40, town = Runewick, "quest", "mission queststatus(213) = 245, item(3916, all) < 40, town = Runewick, "task", "adventure", "order" -> "Will I ever see my spouse again? Earning money as seafarer became so difficult. And without your forty smoked salmon, I cannot set sail." queststatus(213) = 245, item(3916, all) < 40, town = Runewick, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> "Werde ich jemals meine Gattin wiedersehen? Das Leben als Seefahrer ist nicht allzu einträglich. Und ohne eure vierzig Räucherlachse steche ich nicht in See." --- Outlaw exception: If 'quest' is not triggered until here, the speaker is an outlaw or an error occured. Condition town=none does not work! +-- Outlaw exception: If 'quest' is not triggered until here, the speaker is an outlaw or an error occurred. Condition town=none does not work! english, "quest", "mission" -> "I am so sorry that I cannot offer you an order. But my customers require goods of certified Runewick origin. I cannot state compliance to that requirement if I take the goods from you." "quest", "mission" -> "Es tut mir leid, aber ich kann euch keinen Auftrag anbieten. Meine Kunden verlangen nur nach Waren mit zertifizierter Herkunft aus Runewick. Dieser Anforderung kann ich nicht genüge tun, wenn ich eure Waren akzeptiere." "task", "adventure", "order", "order" -> "I am so sorry that I cannot offer you an order. But my customers require goods of certified Runewick origin. I cannot state compliance to that requirement if I take the goods from you." diff --git a/npc/philipp_molitor.npc b/npc/philipp_molitor.npc index 7005c2cde..d5ae52aa7 100644 --- a/npc/philipp_molitor.npc +++ b/npc/philipp_molitor.npc @@ -3436,7 +3436,7 @@ queststatus(127) = 195, item(1437, all) < 5, town = Cadomyr, "quest", "mission" queststatus(127) = 195, item(1437, all) < 5, town = Cadomyr, "task", "adventure", "order" -> "Your order is to get five assassin's armours of darkness. Please hurry. The caravan cannot wait forever." queststatus(127) = 195, item(1437, all) < 5, town = Cadomyr, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> "Euer Auftrag ist es, fünf Attentäterrüstungen der Dunkelheit zu besorgen. Beeilt euch bitte, die Karawane kann nicht ewig warten." --- Outlaw exception: If 'quest' is not triggered until here, the speaker is an outlaw or an error occured. Condition town=none does not work! +-- Outlaw exception: If 'quest' is not triggered until here, the speaker is an outlaw or an error occurred. Condition town=none does not work! english, "quest", "mission" -> "Get lost, outlaw!" "quest", "mission" -> "Haut ab, Gesetzloser!" "task", "adventure", "order", "order" -> "Get lost, outlaw!"