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:
---
 .../quest-debug/043-HurnscaldQuests_Kfahr.txt      | 29 ----------------------
 .../quest-debug/057-HurnscaldQuests_Kfahr.txt      | 29 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 npc/functions/quest-debug/043-HurnscaldQuests_Kfahr.txt
 create mode 100644 npc/functions/quest-debug/057-HurnscaldQuests_Kfahr.txt

(limited to 'npc/functions')

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);
+}
-- 
cgit v1.2.3-70-g09d2