From 1a9a72973c1a69105b75ac25493c5bc27108ed40 Mon Sep 17 00:00:00 2001
From: WildX <wildx@evolonline.org>
Date: Fri, 8 May 2020 12:59:09 +0000
Subject: Update author credits

---
 npc/008-2-2/kfahr.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/npc/008-2-2/kfahr.txt b/npc/008-2-2/kfahr.txt
index 586927d0..49a81828 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:
-- 
cgit v1.2.3-70-g09d2


From 68bb6fac68fc75c765bb1a82445991e0d1bfd094 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 8 May 2020 13:03:47 +0000
Subject: Temporary commit.

It should suppress merge conflicts with Thief branch D:
---
 db/quest_db.conf                                   |  8 +++---
 .../quest-debug/043-HurnscaldQuests_Kfahr.txt      | 29 ----------------------
 .../quest-debug/057-HurnscaldQuests_Kfahr.txt      | 29 ++++++++++++++++++++++
 npc/scripts.conf                                   |  2 +-
 4 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 npc/functions/quest-debug/043-HurnscaldQuests_Kfahr.txt
 create mode 100644 npc/functions/quest-debug/057-HurnscaldQuests_Kfahr.txt

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
@@ -49,6 +49,10 @@ quest_db: (
 	Id: 5
 	Name: "ShipQuests_Knife"
 },
+{
+	Id: 57
+	Name: "HurnscaldQuests_Kfahr"
+},
 {
 	Id: 6
 	Name: "ShipQuests_ArpanMoney"
@@ -193,10 +197,6 @@ quest_db: (
 	Id: 42
 	Name: "General_Brotherhood"
 },
-{
-	Id: 43
-	Name: "HurnscaldQuests_Kfahr"
-},
 {
 	Id: 1000
 	Name: "Test_testing1"
diff --git a/npc/functions/quest-debug/043-HurnscaldQuests_Kfahr.txt b/npc/functions/quest-debug/043-HurnscaldQuests_Kfahr.txt
deleted file mode 100644
index 3853a800..00000000
--- a/npc/functions/quest-debug/043-HurnscaldQuests_Kfahr.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-// Kfahr quest debug
-// Author:
-//    Toams
-
-function	script	QuestDebug43	{
-    do
-    {
-        clear;
-        setnpcdialogtitle l("Quest debug");
-        mes "HurnscaldQuests_Kfahr";
-        mes "---";
-        mes l("Quest state: @@", getq(HurnscaldQuests_Kfahr));
-        //mes "---";
-        //mes l("Related quests:");
-        //mes "HurnscaldQuests_Setzer: " + getq(HurnscaldQuests_Setzer);
-        next;
-
-        GenericQuestDebug HurnscaldQuests_Kfahr,
-            menuimage("actions/manage", l("Debug Kfahr")), -1,
-            l("Didn't speak with Kfahr yet"), 0,
-            l("Did speak with Kfar"), 1;
-
-        if (@menuret < 0)
-        {
-            return;
-        }
-
-    } while (1);
-}
diff --git a/npc/functions/quest-debug/057-HurnscaldQuests_Kfahr.txt b/npc/functions/quest-debug/057-HurnscaldQuests_Kfahr.txt
new file mode 100644
index 00000000..192f1fd7
--- /dev/null
+++ b/npc/functions/quest-debug/057-HurnscaldQuests_Kfahr.txt
@@ -0,0 +1,29 @@
+// Kfahr quest debug
+// Author:
+//    Toams
+
+function	script	QuestDebug57	{
+    do
+    {
+        clear;
+        setnpcdialogtitle l("Quest debug");
+        mes "HurnscaldQuests_Kfahr";
+        mes "---";
+        mes l("Quest state: @@", getq(HurnscaldQuests_Kfahr));
+        //mes "---";
+        //mes l("Related quests:");
+        //mes "HurnscaldQuests_Setzer: " + getq(HurnscaldQuests_Setzer);
+        next;
+
+        GenericQuestDebug HurnscaldQuests_Kfahr,
+            menuimage("actions/manage", l("Debug Kfahr")), -1,
+            l("Didn't speak with Kfahr yet"), 0,
+            l("Did speak with Kfar"), 1;
+
+        if (@menuret < 0)
+        {
+            return;
+        }
+
+    } while (1);
+}
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 205ace11..bd46aefa 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/043-HurnscaldQuests_Kfahr.txt",
 
 // Maps specific scripts
 @include "npc/_import.txt"
-- 
cgit v1.2.3-70-g09d2


From 21cc2846ec5640bac2331f30c152eb2c87a9eb60 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 8 May 2020 16:23:55 +0000
Subject: My typo D: Sorry toams

---
 npc/scripts.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npc/scripts.conf b/npc/scripts.conf
index bd46aefa..4ae2e6f8 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -137,7 +137,7 @@
 //"npc/placeholder/angus.txt",
 //"npc/placeholder/caul.txt",
 //"npc/placeholder/receptionist.txt",
-"npc/functions/quest-debug/043-HurnscaldQuests_Kfahr.txt",
+"npc/functions/quest-debug/057-HurnscaldQuests_Kfahr.txt",
 
 // Maps specific scripts
 @include "npc/_import.txt"
-- 
cgit v1.2.3-70-g09d2