Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/Baylamon/Illarion-Content …
Browse files Browse the repository at this point in the history 
…into develop
  • Loading branch information
@estralis
estralis committed Sep 25, 2017
2 parents f0a915a + 237fae6 commit 78a43f9
Show file tree
Hide file tree
Showing 31 changed files with 10 additions and 1,346 deletions.
6 changes: 3 additions & 3 deletions documentation/quests.csv
View file
Expand Up @@ -349,7 +349,7 @@ ID,"Title","NPCs","Status","Responsible Author","Description"
700,"Geld_in_Hecke",,,"Miriam","Player finds info about money in the hedge on a barrel"
701,"Ask for me (Runewick message giver quest)",,,"Miriam","Zarissa asks player to talk to different NPCs"
702,"Galmair message giver quest",,,"Lillian","Charwis Irongate asks player to talk to different NPCs"
703,"Cadomyr message giver quest",,,"Zot","Jakob Lindorn asks player to talk to different NPC's"
703,"Cadomyr message giver quest",,,"Zot","Deleted - Jakob Lindorn asks player to talk to different NPC's"
704,"Cadomyr Crafting Quest",,,"Zot","Deleted -Berri Firegold asks players to gather materials for smithing/finesmithing and crafting items"
705,"Cadomyr Crafting Quest",,,"Zot","Lilli Gallfing asks players to gather materials for tailoring and crafting items"
706,"Cadomyr Crafting Quest",,,"Zot","deleted -Gerald Deloid asks players to gather materials for candle making"
Expand All @@ -358,7 +358,7 @@ ID,"Title","NPCs","Status","Responsible Author","Description"
709,"Galmair Crafting Quest",,,"Zot","Seleseth asks players to gather materials for brick making/gem grinding/masoning"
710,"Galmair Crafting Quest",,,"Zot","Tony Spirotelli asks players to gather materials for carpenting"
711,"Galmair Crafting Quest",,,"Zot","Deleted - Hannah Shepard asks players to gather materials for farming/baking/cooking"
712,"Galmair message giver quest",,,"Zot","Joey Licavoli asks player to talk to different NPC's or something like that"
712,"Galmair message giver quest",,,"Zot","Deleted - Joey Licavoli asks player to talk to different NPC's or something like that"
713,"Runewick Crafting Quest",,,"Zot","tbd asks players to gather materials for carpenting"
714,"Runewick Crafting Quest",,,"Zot","tbd aks players to gather materials for cooking/farming"
715,"Runewick Crafting Quest",,,"Zot","deleted Judith Tanner asks players to gather materials for tailoring"
Expand All @@ -374,7 +374,7 @@ ID,"Title","NPCs","Status","Responsible Author","Description"
811,"Licence Cadomyr",,,"envi","longtime_cooldown"
812,"Licence Runewick",,,"envi","longtime_cooldown"
813,"Licence Galmair",,,"envi","longtime_cooldown"
820,"Noobhelper in Runewick",,,"Lillian","Florain Dreyndel tells the player where to find easy quests"
820,"Noobhelper in Runewick",,,"Lillian","Deleted - Florain Dreyndel tells the player where to find easy quests"
850,"new player help counter",,,"Merung/Vilarion","counts how often the char warped to new players to assist them"
851,"new player help preferences",,,"Merung/Vilarion","0 == available to help new players, 1 == not available for this session"
852,"already played",,,"Banduk","to get how long new player played already. starts with 0, new player only"
Expand Down
20 changes: 4 additions & 16 deletions npc/alwin_sommerkorn.npc
View file
Expand Up @@ -100,23 +100,11 @@ english, "Oldra" -> "Oldra takes care of the fruits of the fields and the richne
english, "Adron" -> "What is better than drinking beer and smoking a pipe in the evening after a day full of work?"
"Adron" -> "Es gibt kaum etwas sch�neres als Abends bei einem Bier und einem Pfeifchen den Tag ausklingen zu lassen."

-- fix
queststatus(718) > 0, queststatus(820) = 25, english, town = Runewick, "quest", "mission", "florain", "dreyndel" -> queststatus(820) = 26, "Florain sent you, but you have already asked me for something to do."
queststatus(718) > 0, queststatus(820) = 25, town = Runewick, "quest", "mission", "florain", "dreyndel" -> queststatus(820) = 26, "Der Florain schickt dich? Du hast aber schon nach einer Aufgabe gefragt."
queststatus(718) > 0, queststatus(820) = 25, town = Runewick, "task", "adventure", "order" -> queststatus(820) = 26, "Florain sent you, but you have already asked me for something to do."
queststatus(718) > 0, queststatus(820) = 25, town = Runewick, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> queststatus(820) = 26, "Der Florain schickt dich? Du hast aber schon nach einer Aufgabe gefragt."

-- 1st quest
queststatus(718) = 0, queststatus(820) = 25, english, town = Runewick, "quest", "mission", "Florain", "dreyndel" -> inform("[New quest] Relaxed fishing in Runewick I"), item(72, 1, 444, "descriptionEn" = "Alwin's old fishing rod.", "descriptionDe" = "Alwins alte Angel."), queststatus(718) = 1, queststatus(820) = 26, "You want to learn how to fish, do you? Try to fish for ten trout. I give you my old fishing rod for that."
queststatus(718) = 0, queststatus(820) = 25, town = Runewick, "quest", "mission", "Florain", "dreyndel" -> inform("[Neues Quest] Entspanntes Fischen in Runewick I"), item(72, 1, 444, "descriptionEn" = "Alwin's old fishing rod.", "descriptionDe" = "Alwins alte Angel."), queststatus(718) = 1, queststatus(820) = 26, "Du willst das Angeln lernen, nich wahr? Probier mal zehn Forellen zu fangen. Hier nimm meine alte Angel daf�r."
queststatus(718) = 0, queststatus(820) = 25, town = Runewick, "task", "adventure", "order" -> inform("[New quest] Relaxed fishing in Runewick I"), item(72, 1, 444, "descriptionEn" = "Alwin's old fishing rod.", "descriptionDe" = "Alwins alte Angel."), queststatus(718) = 1, queststatus(820) = 26, "You want to learn how to fish, do you? Try to fish for ten trout. I give you my old fishing rod for that."
queststatus(718) = 0, queststatus(820) = 25, town = Runewick, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> inform("[Neues Quest] Entspanntes Fischen in Runewick I"), item(72, 1, 444, "descriptionEn" = "Alwin's old fishing rod.", "descriptionDe" = "Alwins alte Angel."), queststatus(718) = 1, queststatus(820) = 26, "Du willst das Angeln lernen, nich wahr? Probier mal zehn Forellen zu fangen. Hier nimm meine alte Angel daf�r."

-- 1st quest
queststatus(718) = 0, english, town = Runewick, "quest", "mission", "Florain", "dreyndel" -> inform("[New quest] Relaxed fishing in Runewick I"), item(72, 1, 444, "descriptionEn" = "Alwin's old fishing rod.", "descriptionDe" = "Alwins alte Angel."), queststatus(718) = 1, queststatus(820) = 26, "You want to learn how to fish, do you? Try to fish for ten trout. I give you my old fishing rod for that."
queststatus(718) = 0, town = Runewick, "quest", "mission", "Florain", "dreyndel" -> inform("[Neues Quest] Entspanntes Fischen in Runewick I"), item(72, 1, 444, "descriptionEn" = "Alwin's old fishing rod.", "descriptionDe" = "Alwins alte Angel."), queststatus(718) = 1, queststatus(820) = 26, "Du willst das Angeln lernen, nich wahr? Probier mal zehn Forellen zu fangen. Hier nimm meine alte Angel daf�r."
queststatus(718) = 0, town = Runewick, "task", "adventure", "order" -> inform("[New quest] Relaxed fishing in Runewick I"), item(72, 1, 444, "descriptionEn" = "Alwin's old fishing rod.", "descriptionDe" = "Alwins alte Angel."), queststatus(718) = 1, queststatus(820) = 26, "You want to learn how to fish, do you? Try to fish for ten trout. I give you my old fishing rod for that."
queststatus(718) = 0, town = Runewick, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> inform("[Neues Quest] Entspanntes Fischen in Runewick I"), item(72, 1, 444, "descriptionEn" = "Alwin's old fishing rod.", "descriptionDe" = "Alwins alte Angel."), queststatus(718) = 1, queststatus(820) = 26, "Du willst das Angeln lernen, nich wahr? Probier mal zehn Forellen zu fangen. Hier nimm meine alte Angel daf�r."
queststatus(718) = 0, english, town = Runewick, "quest", "mission", "Florain", "dreyndel" -> inform("[New quest] Relaxed fishing in Runewick I"), item(72, 1, 444, "descriptionEn" = "Alwin's old fishing rod.", "descriptionDe" = "Alwins alte Angel."), queststatus(718) = 1, "You want to learn how to fish, do you? Try to fish for ten trout. I give you my old fishing rod for that."
queststatus(718) = 0, town = Runewick, "quest", "mission", "Florain", "dreyndel" -> inform("[Neues Quest] Entspanntes Fischen in Runewick I"), item(72, 1, 444, "descriptionEn" = "Alwin's old fishing rod.", "descriptionDe" = "Alwins alte Angel."), queststatus(718) = 1, "Du willst das Angeln lernen, nich wahr? Probier mal zehn Forellen zu fangen. Hier nimm meine alte Angel daf�r."
queststatus(718) = 0, town = Runewick, "task", "adventure", "order" -> inform("[New quest] Relaxed fishing in Runewick I"), item(72, 1, 444, "descriptionEn" = "Alwin's old fishing rod.", "descriptionDe" = "Alwins alte Angel."), queststatus(718) = 1, "You want to learn how to fish, do you? Try to fish for ten trout. I give you my old fishing rod for that."
queststatus(718) = 0, town = Runewick, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> inform("[Neues Quest] Entspanntes Fischen in Runewick I"), item(72, 1, 444, "descriptionEn" = "Alwin's old fishing rod.", "descriptionDe" = "Alwins alte Angel."), queststatus(718) = 1, "Du willst das Angeln lernen, nich wahr? Probier mal zehn Forellen zu fangen. Hier nimm meine alte Angel daf�r."

-- 1st quest: Not enough items
queststatus(718) = 1, item(73, all) < 10, english, town = Runewick, "quest", "mission" -> "Try the places where you can see the fish. There you don't need a long time to fish for ten trout."
Expand Down
12 changes: 0 additions & 12 deletions npc/baldo_proudtoe.npc
View file
Expand Up @@ -86,18 +86,6 @@ english, "Ciao", "Adieu", "Au revoir", "Farebba" -> "Have a nice day and do not
"your name", "who are you", "who art thou" -> "My name is Baldo, Baldo Proudtoe. I'm the local gardener!", "Proudtoe. Baldo Proudtoe.", "I'm Baldo, the gardener. A garden requires a lot of attention."
"ihr name", "dein name", "wer bist du", "wer seid ihr", "wie hei�t", "wie heisst" -> "Mein Name ist Baldo, Baldo Proudtoe. Ich bin hier der G�rtner!", "Proudtoe. Baldo Proudtoe.", "Ich bin Baldo, der G�rtner. So ein Garten verlangt nach einer Menge Pflege."

-- fix
queststatus(118) > 0, queststatus(820) = 9, english, town = Runewick, "quest", "mission", "florain", "dreyndel" -> queststatus(820) = 10, "Ah Florain send you but you already ask me for something to do."
queststatus(118) > 0, queststatus(820) = 9, town = Runewick, "quest", "mission", "florain", "dreyndel" -> queststatus(820) = 10, "Ah Florain hat Euch geschickt aber Ihr habt mich bereits nach einer Aufgabe gefragt."
queststatus(118) > 0, queststatus(820) = 9, town = Runewick, "task", "adventure", "order" -> queststatus(820) = 10, "Ah Florain send you but you already ask me for something to do."
queststatus(118) > 0, queststatus(820) = 9, town = Runewick, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> queststatus(820) = 10, "Ah Florain hat Euch geschickt aber Ihr habt mich bereits nach einer Aufgabe gefragt."

-- 1st quest: Gather 10 apples
queststatus(118) = 0, queststatus(820) = 9, english, "quest", "mission", "florain", "dreyndel" -> inform("[New quest] Runewick Gardens I"), queststatus(118) = 1, queststatus(820) = 10, "Ah, you want to help me? Look, I'd like to plant some apple trees in my garden. But for that, I need apple seeds. So, please, bring me ten apples!"
queststatus(118) = 0, queststatus(820) = 9, "quest", "mission", "florain", "dreyndel" -> inform("[Neues Quest] Die G�rten von Runewick I"), queststatus(118) = 1, queststatus(820) = 10, "Ah, ihr wollt mir also helfen? Ich w�rde gerne einige Apfelb�ume in meinem Garten pflanzen. Aber daf�r brauche ich Apfelsamen. Also bringt mir doch bitte zehn �pfel!"
queststatus(118) = 0, queststatus(820) = 9, "task", "adventure", "order" -> inform("[New quest] Runewick Gardens I"), queststatus(118) = 1, queststatus(820) = 10, "Ah, you want to help me? Look, I'd like to plant some apple trees in my garden. But for that, I need apple seeds. So, please, bring me ten apples!"
queststatus(118) = 0, queststatus(820) = 9, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> inform("[Neues Quest] Die G�rten von Runewick I"), queststatus(118) = 1, queststatus(820) = 10, "Ah, ihr wollt mir also helfen? Ich w�rde gerne einige Apfelb�ume in meinem Garten pflanzen. Aber daf�r brauche ich Apfelsamen. Also bringt mir doch bitte zehn �pfel!"

-- 1st quest: Gather 10 apples
queststatus(118) = 0, english, "quest", "mission" -> inform("[New quest] Runewick Gardens I"), queststatus(118) = 1, "Ah, you want to help me? Look, I'd like to plant some apple trees in my garden. But for that, I need apple seeds. So, please, bring me ten apples!"
queststatus(118) = 0, "quest", "mission" -> inform("[Neues Quest] Die G�rten von Runewick I"), queststatus(118) = 1, "Ah, ihr wollt mir also helfen? Ich w�rde gerne einige Apfelb�ume in meinem Garten pflanzen. Aber daf�r brauche ich Apfelsamen. Also bringt mir doch bitte zehn �pfel!"
Expand Down
12 changes: 0 additions & 12 deletions npc/bruno_blackhole.npc
View file
Expand Up @@ -98,25 +98,13 @@ english, "Ciao", "Adieu", "Au revoir", "Farebba" -> "Farewell is what we say aro
"your name", "who are you", "who art thou" -> "I'm Bruno Blackhole.", "I'm a dwarven miner named Bruno.", "Just call meh Bruno for now."
"ihr name", "dein name", "wer bist du", "wer seid ihr", "wie hei�t", "wie heisst" -> "Ich bin Bruno Blackhole.", "Ich bin 'n zwergischer Bergarbeiter namens Bruno.", "Nenn' mich einfach Bruno."

-- fix
queststatus(65) > 0, queststatus(712) = 9, english, town = Galmair, "quest", "mission", "joey", "licavoli" -> queststatus(712) = 10, "Ah Joey send you but you already ask me for something to do."
queststatus(65) > 0, queststatus(712) = 9, town = Galmair, "quest", "mission", "joey", "licavoli" -> queststatus(712) = 10, "Ah Joey hat dich geschickt aber du hast mich bereits nach einer Aufgabe gefragt."
queststatus(65) > 0, queststatus(712) = 9, town = Galmair, "task", "adventure", "order" -> queststatus(712) = 10, "Ah Joey send you but you already ask me for something to do."
queststatus(65) > 0, queststatus(712) = 9, town = Galmair, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> queststatus(712) = 10, "Ah Joey hat dich geschickt aber du hast mich bereits nach einer Aufgabe gefragt."

-- Quest 107: A message from Groktan Flintsplit

queststatus(107) = 6, "message", "news", "letter", "scroll", "parchment" -> inform("[Quest status] The Reminder III: You deliver the message from Groktan Flintsplit to Bruno Blackhole."), queststatus(107) = 7, "Oh my goodness! How will I pay that amount of money to the Don? I just know what I get when I don't pay..."
queststatus(107) = 6, "nachricht", "brief", "Botschaft", "Schriftrolle", "Pergament" -> inform("[Queststatus] Die Erinnerung III: Du �berbringst Bruno Blackhole die Nachricht von Groktan Flintsplit."), queststatus(107) = 7, "Ach du meine G�te! Wie soll ich nur so viel Geld and den Don zahlen? Ich wei� nur, was mir bl�ht, wenn ich nicht zahle..."
queststatus(107) = 6, english, "Groktan", "Flintsplit" -> inform("[Quest status] The Reminder III: You deliver the message from Groktan Flintsplit to Bruno Blackhole."), queststatus(107) = 7, "Oh my goodness! How will I pay that amount of money to the Don? I just know what I get when I don't pay..."
queststatus(107) = 6, "Groktan", "Flintsplit" -> inform("[Queststatus] Die Erinnerung III: Du �berbringst Bruno Blackhole die Nachricht von Groktan Flintsplit."), queststatus(107) = 7, "Ach du meine G�te! Wie soll ich nur so viel Geld and den Don zahlen? Ich wei� nur, was mir bl�ht, wenn ich nicht zahle..."

-- 1st quest: Take a tool and gather 10 raw materials for 50cp.
queststatus(65) = 0, queststatus(712) = 9, town = Galmair, english, "quest", "mission" -> inform("[New quest] Malachite Mine I"), item(2763, 1, 333), queststatus(65) = 1, queststatus(712) = 10, "Aye, I hope ya like hard work. Bring meh ten raw stones and I will give you a little something."
queststatus(65) = 0, queststatus(712) = 9, town = Galmair, "quest", "mission" -> inform("[Neues Quest] Malachitmine I"), item(2763, 1, 333), queststatus(65) = 1, queststatus(712) = 10, "Aye, ich hoffe du magst harte Arbeit. Bring mir zehn rohe Steine, dann gebe ich dir 'ne Kleinigkeit."
queststatus(65) = 0, queststatus(712) = 9, town = Galmair, "task", "adventure", "order" -> inform("[New quest] Malachite Mine I"), item(2763, 1, 333), queststatus(65) = 1, queststatus(712) = 10, "Aye, I hope ya like hard work. Bring meh ten raw stones and I will give ya a little something."
queststatus(65) = 0, queststatus(712) = 9, town = Galmair, "Auftrag", "Aufgabe", "Abenteuer", "Befehl", "Befehl" -> inform("[Neues Quest] Malachitmine I"), item(2763, 1, 333), queststatus(65) = 1, queststatus(712) = 10, "Aye, ich hoffe du magst harte Arbeit. Bring mir zehn rohe Steine, dann gebe ich dir 'ne Kleinigkeit."

queststatus(65) = 0, english, "quest", "mission" -> inform("[New quest] Malachite Mine I"), item(2763, 1, 333), queststatus(65) = 1, "Aye, I hope ya like hard work. Bring meh ten raw stones and I will give you a little something."
queststatus(65) = 0, "quest", "mission" -> inform("[Neues Quest] Malachitmine I"), item(2763, 1, 333), queststatus(65) = 1, "Aye, ich hoffe du magst harte Arbeit. Bring mir zehn rohe Steine, dann gebe ich dir 'ne Kleinigkeit."
queststatus(65) = 0, "task", "adventure", "order" -> inform("[New quest] Malachite Mine I"), item(2763, 1, 333), queststatus(65) = 1, "Aye, I hope ya like hard work. Bring meh ten raw stones and I will give ya a little something."
Expand Down
9 changes: 0 additions & 9 deletions npc/charwis_irongate.npc
View file
Expand Up @@ -86,15 +86,6 @@ english, "Ciao", "Adieu", "Au revoir", "Farebba" -> "Irmorom be with you."

-- A message Quest
-- 1st quest starts, if you are citizen of Galmair
-- fix
queststatus(702) > 0, queststatus(712) = 7, english, town = Galmair, "quest", "mission", "joey", "licavoli" -> queststatus(712) = 8, "Ah Joey sent you here, but you have already asked me for something to do."
queststatus(702) > 0, queststatus(712) = 7, town = Galmair, "quest", "mission", "joey", "licavoli" -> queststatus(712) = 8, "Ah Joey hat dich geschickt aber du hast mich bereits nach einer Aufgabe gefragt."
queststatus(702) > 0, queststatus(712) = 7, town = Galmair, "task", "adventure", "order" -> queststatus(712) = 8, "Ah Joey sent you here, but you have already asked me for something to do."
queststatus(702) > 0, queststatus(712) = 7, town = Galmair, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> queststatus(712) = 8, "Ah Joey hat dich geschickt aber du hast mich bereits nach einer Aufgabe gefragt."
queststatus(702) = 0, queststatus(712) = 7, english, town = Galmair, "quest", "mission" -> inform("[New quest] Message Delivery I"), queststatus(702) = 1, queststatus(712) = 8, "Could you help me? Nik Nilo asked me for a ruby some time ago. I found one whilst mining the other day. Could you tell him that he should talk to me?"
queststatus(702) = 0, queststatus(712) = 7, town = Galmair, "quest", "mission" -> inform("[Neues Quest] Nachrichten �berbringen I"), queststatus(702) = 1, queststatus(712) = 8, "K�nntet Ihr mir Helfen? Nik Nilo fragte mich vor einiger Zeit nach einem Rubin. Neulich habe ich eine beim Sch�rfen gefunden. K�nnt Ihr ihm bitte sagen, dass er mit mir reden m�ge?"
queststatus(702) = 0, queststatus(712) = 7, town = Galmair, "task", "adventure", "order" -> inform("[New quest] Message Delivery I"), queststatus(702) = 1, queststatus(712) = 8, "Could you help me? Nik Nilo asked me for a ruby some time ago. I found one whilst mining the other day. Could you tell him that he should talk to me?"
queststatus(702) = 0, queststatus(712) = 7, town = Galmair, "Auftrag", "Aufgabe", "Abenteuer", "Befehl" -> inform("[Neues Quest] Nachrichten �berbringen I"), queststatus(702) = 1, queststatus(712) = 8, "K�nntet Ihr mir Helfen? Nik Nilo fragte mich vor einiger Zeit nach einem Rubin. Neulich habe ich eine beim Sch�rfen gefunden. K�nnt Ihr ihm bitte sagen, dass er mit mir reden m�ge?"
queststatus(702) = 0, english, town = Galmair, "quest", "mission" -> inform("[New quest] Message Delivery I"), queststatus(702) = 1, "Could you help me? Nik Nilo asked me for a ruby some time ago. I found one whilst mining the other day. Could you tell him that he should talk to me?"
queststatus(702) = 0, town = Galmair, "quest", "mission" -> inform("[Neues Quest] Nachrichten �berbringen I"), queststatus(702) = 1, "K�nntet Ihr mir Helfen? Nik Nilo fragte mich vor einiger Zeit nach einem Rubin. Neulich habe ich eine beim Sch�rfen gefunden. K�nnt Ihr ihm bitte sagen, dass er mit mir reden m�ge?"
queststatus(702) = 0, town = Galmair, "task", "adventure", "order" -> inform("[New quest] Message Delivery I"), queststatus(702) = 1, "Could you help me? Nik Nilo asked me for a ruby some time ago. I found one whilst mining the other day. Could you tell him that he should talk to me?"
Expand Down

0 comments on commit 78a43f9

Please sign in to comment.