Regenerate maps. Add a file with comments of internal state of Barbara quest.

4 files changed, 32 insertions, 2 deletions

diff --git a/npc/015-8-1/_import.txt b/npc/015-8-1/_import.txt
index d2ae0e8bb..016ede10f 100644
--- a/npc/015-8-1/_import.txt
+++ b/npc/015-8-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 015-8-1: Cave Of Trials
+// Map 015-8-1: Abandoned Ruins
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/015-8-1/campaign.txt",
 "npc/015-8-1/puzzle.txt",
diff --git a/npc/018-6-0/ctrl b/npc/018-6-0/ctrl
new file mode 100644
index 000000000..e1f7f6140
--- /dev/null
+++ b/npc/018-6-0/ctrl
@@ -0,0 +1,29 @@
+LoFQuest_Barbara
+q1
+	q3
+
+--------------------------
+0	Quest not assigned
+1	Quest was assigned
+	0	No cutscene seen
+	1	The wounded soldier seen
+	2	The footprints seen
+2	Forgotten Chamber Puzzle is in progress (warp on)
+	0	No puzzle solved
+	1	West puzzle solved (&) (west lever)
+	2	East puzzle solved (&) (east lever)
+	3	South puzzle unlocked (w/e lever)
+	4	South puzzle node (e/w lever)
+	5	South puzzle solved, access to shrine granted
+3	Forgotten Shrine has been allowed (warp on / remember to reenable NPCs on resume)
+	Bitwise boss fights:
+	1, 2, 4, 8, 16, 32, 64, 128, 256 (enable warps as win)
+	→ Once the main shrine was reached: set to 511, Mana Stone story
+	& 512 => Boss defeated, cutscene ended, magic apple now visible
+4	Ambush finished, return to elenium mines
+5	Barbara captured
+6	Reward claimed, Barbara Arrested
+7	Reward claimed, Barbara NOT Arrested
+
+Field 2: Instance ID
+
diff --git a/npc/018-6-1/main.txt b/npc/018-6-1/main.txt
index a12bb8672..89658dee9 100644
--- a/npc/018-6-1/main.txt
+++ b/npc/018-6-1/main.txt
@@ -99,6 +99,7 @@ OnInit:
 
 }
 
+///////////////////////////// Minievents
 
 
 
diff --git a/npc/functions/game-rules.txt b/npc/functions/game-rules.txt
index e3242c53d..baa60f14c 100644
--- a/npc/functions/game-rules.txt
+++ b/npc/functions/game-rules.txt
@@ -29,7 +29,7 @@ function	script	GameRules	{
         l("8. ##BThe use of real money is prohibited##b for ingame stuff, except by sponsoring."),
         l("9. ##BAdmit when you're wrong.##b Users trying to lie to or fool GMs will get no pity from them."),
         l("10. ##BDo not logout##b at Botcheck area or at Jail. We cannot unjail an offline player. The opposite of rule 9: If you believe you're right, keep your ground and explain calmly what happened. We'll calmly analyse the situation. If you were jailed without guilt, an apology will be sent to you, provided this rule is not broken."),
-        l("11. If you believe a GM is not being fair, or you believe your defense is being ignored, request a ##BCouncil Trial##b. It's your right. In a Council Trial, we'll have multiple people giving the veredict. Any player may be called to compose the council. All admins shall take part in it. An arragment relative to time and date is to be made.");
+        l("11. If you believe you are Not Guilty, but the GM deemed you guilty, request a ##BCouncil Trial##b. It's your right. In a Council Trial, we'll have multiple people giving the veredict. Any player may be called to compose the council. All admins shall take part in it. An arragment relative to time, date, and number of counsellors is to be made.");
     return;
 }