Add all bits of lore regarding the end of the Second Era and the Mana War.

Add the final relevant bits of lore regarding your parents mission.
Lore about the Third Era itself should be placed earlier.

Meanwhile, The First and Second Era aren't important in any shape or form.
But if we add some other race settlement, e.g. Modanung's Village...
...Then it just *might* be worth a mention ;-)

5 files changed, 196 insertions, 2 deletions

diff --git a/db/constants.conf b/db/constants.conf
index d853f4abe..45ec831be 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -2092,6 +2092,7 @@ constants_db: {
 	EE_SEWERS:            128
 	EE_AETHYR:            256
 	EE_SNOWMAN:           512
+	EE_CRAZYFEFE:        1024
 
 	comment__: "Teleporter enum"
 	TP_NONE:                0
diff --git a/npc/001-1/portal.txt b/npc/001-1/portal.txt
index 897ca6c66..221080ea6 100644
--- a/npc/001-1/portal.txt
+++ b/npc/001-1/portal.txt
@@ -104,7 +104,7 @@ L_TranslationFix:
     mesc l("WARNING: The %s is a %s. Besides being insanely powerful, no duplicate of them exist in the world. They can be tweaked freely and can hold multiple cards as well, and scale according to your level. Use its powers wisely. However, beware: This weapon cannot be traded except with \"@grantpower\" command, and if you abandon the world, the weapon will abandon you as well!", getitemlink(Acorn), b(l("legendary weapon"))), 1;
     mesc l("%s, you did your best to avenge a fallen comrade. It is my wish that you continue protecting this world. Therefore, I bestow upon you, the legendary %s. Please use its powers to protect your friend and the world peace!", "", getitemlink(Acorn)), 2;
     mesc l("%s, you did your best to protect this world inhabitants. It is my wish that you continue protecting this world. Therefore, I bestow upon you, the legendary %s. Please use its powers to protect your friend and the world peace!", "", getitemlink(Acorn)), 2;
-    mesc l("%s, you did your best to entretain me. It is my wish that you continue protecting this world. Therefore, I bestow upon you, the legendary %s. Please use its powers to protect your friend and the world peace!", "", getitemlink(Acorn)), 2;
+    mesc l("%s, you did your best to entertain me. It is my wish that you continue protecting this world. Therefore, I bestow upon you, the legendary %s. Please use its powers to protect your friend and the world peace!", "", getitemlink(Acorn)), 2;
     mesc l("%s, you proved your worth today. It is my wish that you continue protecting this world. Therefore, I bestow upon you, the legendary %s. Please use its powers to protect your friend and the world peace!", "", getitemlink(Acorn)), 2;
     mesc l("%s, your dedication is touching. It is my wish that you continue protecting this world. Therefore, I bestow upon you, the legendary %s. Please use its powers to protect your friend and the world peace!", "", getitemlink(Acorn)), 2;
 
diff --git a/npc/006-10/_import.txt b/npc/006-10/_import.txt
index ae9c15b27..94e3360e2 100644
--- a/npc/006-10/_import.txt
+++ b/npc/006-10/_import.txt
@@ -1,4 +1,6 @@
 // Map 006-10: Fefe's Crypt
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-10/006-10_blackbox.txt",
 "npc/006-10/_mobs.txt",
 "npc/006-10/_warps.txt",
+"npc/006-10/logic.txt",
diff --git a/npc/006-10/logic.txt b/npc/006-10/logic.txt
new file mode 100644
index 000000000..1e047e2dd
--- /dev/null
+++ b/npc/006-10/logic.txt
@@ -0,0 +1,191 @@
+// TMW2 Script
+// Author:
+//  Jesusalva
+// Description:
+//  Crazyfefe's Shrine (lore bits)
+
+006-10,46,45,0	script	#00610WA	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 53, 46; end;
+}
+
+006-10,58,45,0	script	#00610WB	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 54, 38; end;
+}
+
+006-10,49,38,0	script	#00610WC	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 42, 40; end;
+}
+
+006-10,55,37,0	script	#00610WD	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 45, 46; end;
+}
+
+006-10,44,39,0	script	#00610WE	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 50, 38; end;
+}
+
+006-10,38,39,0	script	#00610WF	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 35, 35; end;
+}
+
+006-10,30,34,0	script	#00610WG	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 33, 25; end;
+}
+
+006-10,38,24,0	script	#00610WH	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 45, 22; end;
+}
+
+006-10,50,21,0	script	#00610WI	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 57, 29; end;
+}
+
+006-10,52,28,0	script	#00610WJ	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 45, 31; end;
+}
+
+006-10,40,30,0	script	#00610WK	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 37, 25; end;
+}
+
+006-10,32,24,0	script	#00610WL	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 31, 46; end;
+}
+
+006-10,36,45,0	script	#00610WM	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 41, 46; end;
+}
+
+006-10,30,45,0	script	#00610WN	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 57, 46; end;
+}
+// --------------------------------------------------
+006-10,52,45,0	script	#00610WO	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 45, 46; end;
+}
+
+006-10,40,45,0	script	#00610WP	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 35, 35; end;
+}
+
+006-10,36,34,0	script	#00610WQ	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 40, 40; end;
+}
+
+006-10,58,28,0	script	#00610WR	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 49, 22; end;
+}
+
+006-10,46,30,0	script	#00610WS	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 53, 29; end;
+}
+
+006-10,44,21,0	script	#00610WT	NPC_HIDDEN,0,3,{
+    end;
+OnTouch:
+    slide 37, 25; end;
+}
+// --------------------------------------------------
+006-10,43,28,0	script	Crypt#Fefe	NPC_NO_SPRITE,{
+    mesn l("Crypt");
+    mesc l("Herein lies Fefe, for his great bravure and heroic deeds, savior of our realm, valiantly defeated in combat against the Monster King, may the mana shine upon him forever.");
+    next;
+    mesn l("Crypt");
+    mesc l("Herein also lies Raid Yahoo, enemy of manakind and nemesis of Saul, the one hated by many and loved by few, greedy mana stone collector, but who still opposed to the Monster King and lost her life for it.");
+    next;
+    mesn l("Crypt");
+    mesc l("May their memory be remembered, but may their struggle be forgotten, their bodies never profaned, and in the æthyr, may they find eternal rest and comfort for their souls.");
+    close;
+
+OnInit:
+    .distance=2;
+    end;
+}
+
+
+006-10,33,44,0	script	Diary#Fefe	NPC_NO_SPRITE,{
+    mesc l("Here lies a diary, presumably from Fefe.");
+    next;
+    mes "";
+    mesn b(l("Tulimshar, Tonori - 2nd March 300 AT"));
+    mesc l("Tomorrow is the day, when we shall march against Raid, in order to free our people from the oppression of her mages.");
+    dnext;
+    mesc l("Saul will lead the frontal assault, Mr. Saves shall provide distraction, and I'll infiltrate within the Mage Tower.");
+    dnext;
+    mesc l("I can't sleep, so I'm writing this entry. It'll take a considerable amount of time to decrypt the shield frequency Raid is using, and when Saul's army is marching towards their deaths, time is of essence. Every second I waste, is a comrade who will die.");
+    dnext;
+    mesc l("I'm a pro, this will be GG EZ. But Raid is not a foe to be underestimated, and I have no hopes for reinforcements. I refuse to leave last words, I shall either triumph, or be forgotten in shame.");
+    next;
+    mes "";
+    mesn b(l("Wizards Tower, Tonori - 6th March 300 AT"));
+    mesc l("...I knew bandits were not be trusted, but Saul insisted in doing so. I hate him so much right now. Even if he is my brother.");
+    dnext;
+    mesc l("Raid and me have been in hot pursuit for a while, but I fear it is already too late. Yesterday there was another earthquake, and we're receiving summons to return to Tulimshar at once. Apparently, it is under attack.");
+    dnext;
+    mesc l("Saul will deal with it. His mess, he will clean up. Raid and me will keep the pursuit. And this time, we shall triumph.");
+    next;
+    mes "";
+    mesn b(l("Wizards Tower, Tonori - 8th April 300 AT"));
+    mesc l("The Monster King once again eluded us. How long has it been? His minions are laying waste to all towns, Saul has been killed, Raid has been wounded.");
+    dnext;
+    mesc l("I'm fine, but I can't keep carrying dead weights with me. Candor is a special place, I shall make a base there... Because I know the Monster King will eventually head there.");
+    dnext;
+    mesc l("This time, I'll be prepared. His reign of terror has its days counted.");
+    next;
+    mes "";
+    mesn b(l("Saxso's Basement, Candor - 27th July 300 AT"));
+    mesc l("This is my chance - the biggest Mana Quake ever, it feels like a whole world crushing in ours. I can feel the drain from Candor's Mana Reserves all the way up here.");
+    dnext;
+    mesc l("Now to head inside the caves, until the last floor, and have my showdown and revenge against the Monster King. I do not plan in failing.");
+    dnext;
+    mesc l("But if I do, I'll not return. Neither me, nor Raid. Which is why I'm taking precautions: This diary. In the event of my death, please bury my body and contact Halinarzo.");
+    dnext;
+    mesc l("If I can't beat him, no one else can, and if our species are to survive, we'll need to return to the Edge. Even if it means... Fulfilling the prophecy. %s. Whatever the cost.", b("Per Asper Ad Salvos"));
+    next;
+    00610_Init_BlackBox();
+    closeclientdialog;
+    close;
+
+OnInit:
+    .distance=2;
+    end;
+}
+
diff --git a/npc/006-6/core.txt b/npc/006-6/core.txt
index fb303d469..502f3ffc0 100644
--- a/npc/006-6/core.txt
+++ b/npc/006-6/core.txt
@@ -13,7 +13,7 @@ OnTouch:
 
     // FIXME: B4F is not ready, so fallthrough to L_Reject
 L_Reject:
-    //warp "006-10", 49, 52;
+    //warp "006-10", 42, 48;
     specialeffect(5000, SELF, getcharid(3));
     dispbottom l("The power which lies in Candor rejects your strength.");
     sleep2(3000);