Merge branch 'jesusalva/cleanup' into 'master'

Christmas 2021 Cleanup

See merge request themanaworld/evolved/serverdata!10

3 files changed, 107 insertions, 0 deletions

diff --git a/npc/081-1/_import.txt b/npc/081-1/_import.txt
new file mode 100644
index 00000000..863a8e60
--- /dev/null
+++ b/npc/081-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 081-1: Aethyr
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/081-1/_warps.txt",
+"npc/081-1/extra.txt",
diff --git a/npc/081-1/_warps.txt b/npc/081-1/_warps.txt
new file mode 100644
index 00000000..ef049ca9
--- /dev/null
+++ b/npc/081-1/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 081-1: Aethyr warps
+081-1,58,104,0	warp	#081-1_58_104	0,0,020-1,84,75
+081-1,44,89,0	warp	#081-1_44_89	0,0,082-2,88,25
diff --git a/npc/081-1/extra.txt b/npc/081-1/extra.txt
new file mode 100644
index 00000000..7f6b489e
--- /dev/null
+++ b/npc/081-1/extra.txt
@@ -0,0 +1,99 @@
+// TMW Script.
+// Author:
+//    Jesusalva
+// Notes:
+//    Christmas 2021 - Extra NPCs & Code Injection
+
+081-1,82,68,0	script	Nut Cracker	NPC330,{
+    @npcname$ = "Nut Cracker";
+    Banker();
+    close;
+
+OnInit:
+    .distance=5;
+    end;
+}
+
+081-1,69,82,0	script	Ol' Reset	NPC329,{
+    @npcname$ = "Ol' Reset";
+    StatReset();
+    close;
+
+OnInit:
+    .distance=5;
+    end;
+}
+
+081-1,57,49,0	script	Soul Menhir#Aethyr	NPC346,{
+    @map$ = "081-1";
+    setarray @Xs, 54, 54, 54, 55, 55, 55, 56;
+    setarray @Ys, 52, 53, 54, 52, 53, 54, 54;
+    @x = 0;
+    @y = 0;
+    callfunc "SoulMenhir";
+    @map$ = "";
+    cleararray @Xs[0], 0, 7;
+    cleararray @Ys[0], 0, 7;
+    @x = 0;
+    @y = 0;
+    close;
+OnInit:
+    .distance=5;
+    end;
+}
+
+081-1,60,91,0	script	TMW Evolved Guide	NPC356,{
+    mesn;
+    mes "\""+l("Hello, and welcome to The Mana World: Evolved.");
+    mes l("This is the server which will eventually take over TMW Legacy.")+"\"";
+    next;
+    mesn;
+    mesq l("A few things are different here, you can read [@@https://wiki.themanaworld.org/index.php/Legacy:TMW_Evolved|on the wiki@@] some of the major differences.");
+    select
+        l("Thanks."),
+        l("Learn more");
+    mes "";
+    if (@menu == 1) { closeclientdialog; close; }
+    mesn;
+    mesq l("For starters, magic skills are on F5 tab and no longer can be cast from chat. Drag'n'Drop them to the shortcut bars to use. You can also level them up if you have the points.");
+    next;
+    mesn;
+    mesq l("To use magic, first select the target, and use the skill to unleash the magical attack. The next attack will only come when you use the skill again; unfortunately, it is NOT automatic.");
+    next;
+    mesn;
+    mesq l("If you have unspent status points, you can level them up to 100. Focus skills work sightly different than on TMW Legacy. YOU NEED TO REFOCUS them!");
+    next;
+    mesn;
+    mesq l("Your weight limit is a bit larger, but if it reaches 90% you will no longer be able to attack, so be careful.");
+    next;
+    mesn;
+    mesq l("When you die, you'll be taken to the Soul Menhir you touched last. There is a Soul Menhir nearby, I advise touching it as soon as possible.");
+    next;
+    mesn;
+    mesq l("Experience acquired here will be carried over to TMW Legacy once the event ends, as well as the event rewards. You can exchange the %s with GM Santa, the GM Team will be publishing the rules in turning these in level ups or ultra rare hats shortly.", getitemlink(Carrot));
+    next;
+    mesn;
+    mesq l("The \"#world\" chat tab is bridged to #themanaworld-dev on IRC and Discord, you can quickly get in touch with the whole community and report bugs using it.");
+    next;
+    mesn;
+    mesq l("Also, you may wish to use \"@resync\" or \"@resyncall\" if the monsters appear to vanish. That's mostly all, thanks for playing The Mana World. Contact staff if you need further assistance!");
+    close;
+
+OnInit:
+    .distance=5;
+    .sex = G_FEMALE;
+    end;
+}
+
+081-1,47,74,0	script	Christmas Assistant	NPC328,{
+    mesc l("They seem to be reminiscing Christmas 2021 event. Suddenly, they looks at you and shouts:");
+    mes "";
+    mesn;
+    mesq l("Come back again!");
+    close;
+
+OnInit:
+    .distance=5;
+    end;
+}
+