diff options
| author | toams <toams85@gmail.com> | 2020-05-23 20:57:38 +0200 |
|---|---|---|
| committer | toams <toams85@gmail.com> | 2020-05-23 20:57:38 +0200 |
| commit | ac16337e5ecefb26a3f4a763c9187dc26691e141 (patch) | |
| tree | 2f4be5e1a662ace4bcfb922e0a7e6034c5cab96b | |
| parent | d122829d12c7339b691022f3fe5d69b28ebc66e3 (diff) | |
| parent | 21cc2846ec5640bac2331f30c152eb2c87a9eb60 (diff) | |
| download | serverdata-kfahrcopy.tar.gz serverdata-kfahrcopy.tar.bz2 serverdata-kfahrcopy.tar.xz serverdata-kfahrcopy.zip | |
Merge branch 'kfahr' of https://gitlab.com/toams/serverdata into kfahrkfahrcopy
Add original authors
| -rw-r--r-- | db/quest_db.conf | 8 | ||||
| -rw-r--r-- | npc/008-2-2/kfahr.txt | 5 | ||||
| -rw-r--r-- | npc/functions/quest-debug/057-HurnscaldQuests_Kfahr.txt (renamed from npc/functions/quest-debug/043-HurnscaldQuests_Kfahr.txt) | 2 | ||||
| -rw-r--r-- | npc/scripts.conf | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/db/quest_db.conf b/db/quest_db.conf index 043082dc..ed92dafe 100644 --- a/db/quest_db.conf +++ b/db/quest_db.conf @@ -50,6 +50,10 @@ quest_db: ( Name: "ShipQuests_Knife" }, { + Id: 57 + Name: "HurnscaldQuests_Kfahr" +}, +{ Id: 6 Name: "ShipQuests_ArpanMoney" }, @@ -194,10 +198,6 @@ quest_db: ( Name: "General_Brotherhood" }, { - Id: 43 - Name: "HurnscaldQuests_Kfahr" -}, -{ Id: 1000 Name: "Test_testing1" }, diff --git a/npc/008-2-2/kfahr.txt b/npc/008-2-2/kfahr.txt index ee20cf58..da594512 100644 --- a/npc/008-2-2/kfahr.txt +++ b/npc/008-2-2/kfahr.txt @@ -1,7 +1,8 @@ // Evol scripts. // Author: -// Addapted for tmw revol by Toams -// Author(s) of original script unknown +// Addapted for TMW rEvolt by Toams +// Author(s) of original script: Jaxad0127 (02/11/2008) +// Additional contributors: o11c, wushin, Jessica Beller (jtoelke), Ablu, Turmfalke // Description: // Kfahr the hero. Bone knife quest and Golden Stinger quest (Needed for Setzer Quest) // Variables: diff --git a/npc/functions/quest-debug/043-HurnscaldQuests_Kfahr.txt b/npc/functions/quest-debug/057-HurnscaldQuests_Kfahr.txt index f1e9dd1a..4ee0b36e 100644 --- a/npc/functions/quest-debug/043-HurnscaldQuests_Kfahr.txt +++ b/npc/functions/quest-debug/057-HurnscaldQuests_Kfahr.txt @@ -2,7 +2,7 @@ // Author: // Toams -function script QuestDebug43 { +function script QuestDebug57 { do { clear; diff --git a/npc/scripts.conf b/npc/scripts.conf index 205ace11..4ae2e6f8 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -100,7 +100,6 @@ "npc/functions/quest-debug/040-HurnscaldQuests_WoodenShield.txt", "npc/functions/quest-debug/041-General_Cooking.txt", "npc/functions/quest-debug/042-General_Brotherhood.txt", -"npc/functions/quest-debug/043-HurnscaldQuests_Kfahr.txt", // Item functions "npc/items/cookie.txt", @@ -138,6 +137,7 @@ //"npc/placeholder/angus.txt", //"npc/placeholder/caul.txt", //"npc/placeholder/receptionist.txt", +"npc/functions/quest-debug/057-HurnscaldQuests_Kfahr.txt", // Maps specific scripts @include "npc/_import.txt" |