diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-05-08 13:03:47 +0000 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-05-08 13:03:47 +0000 |
| commit | 68bb6fac68fc75c765bb1a82445991e0d1bfd094 (patch) | |
| tree | 597d946965454a1f749a9241889037c51d5fec48 | |
| parent | 1a9a72973c1a69105b75ac25493c5bc27108ed40 (diff) | |
| download | serverdata-68bb6fac68fc75c765bb1a82445991e0d1bfd094.tar.gz serverdata-68bb6fac68fc75c765bb1a82445991e0d1bfd094.tar.bz2 serverdata-68bb6fac68fc75c765bb1a82445991e0d1bfd094.tar.xz serverdata-68bb6fac68fc75c765bb1a82445991e0d1bfd094.zip | |
Temporary commit.
It should suppress merge conflicts with Thief branch D:
| -rw-r--r-- | db/quest_db.conf | 8 | ||||
| -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 |
3 files changed, 6 insertions, 6 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/functions/quest-debug/043-HurnscaldQuests_Kfahr.txt b/npc/functions/quest-debug/057-HurnscaldQuests_Kfahr.txt index 3853a800..192f1fd7 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..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" |