Merge April 2nd Event on upstream (#606)v2022.03.31

2 files changed, 14 insertions, 0 deletions

diff --git a/world/map/npc/003-1/_mobs.txt b/world/map/npc/003-1/_mobs.txt
index ebd36458..8870b7c6 100644
--- a/world/map/npc/003-1/_mobs.txt
+++ b/world/map/npc/003-1/_mobs.txt
@@ -1,3 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // 2006 Tulimshar mobs
 
+003-1,101,22,44,3|monster|Floyd|1168,7,20000ms,10000ms
diff --git a/world/map/npc/003-1/npcs.txt b/world/map/npc/003-1/npcs.txt
index 1aa0aff9..e78ea476 100644
--- a/world/map/npc/003-1/npcs.txt
+++ b/world/map/npc/003-1/npcs.txt
@@ -1,5 +1,6 @@
 003-1,27,73,0|script|Tybalt#2006|184
 {
+    if ($@PRSM_PARTY) message strcharinfo(0), strnpcinfo(1) + " : Prsm is one of the eldest clients on The Mana World Bank, of course I would come to his party.";
     set @npcname$, "Tybalt";
     callfunc "Banker";
     close;
@@ -7,6 +8,7 @@
 
 003-1,102,31,0|script|Nicolas#2006|184
 {
+    if ($@PRSM_PARTY) message strcharinfo(0), strnpcinfo(1) + " : Prsm wore the GM Cap for so long, that his hair surely got messy. We barbers must keep our best GM's hair in shape, right?";
     mes "[Nicolas]";
     mes "I'm the greatest barber in the whole mana world! Would you like a change of style or color?";
     next;
@@ -16,6 +18,8 @@
 
 003-1,39,66,0|script|Elanore#2006|184
 {
+    // Actually true
+    if ($@PRSM_PARTY) message strcharinfo(0), strnpcinfo(1) + " : Prsm is one of the kindest souls I've ever seen, and I am one of the oldest NPCs in The Mana World.";
     mes "[Elanore]";
     if (BaseLevel > 10) goto L_NoHeal;
     set .@rnd, rand(4);
@@ -37,6 +41,7 @@ L_NoHeal:
 
 003-1,57,70,0|script|Aisha#2006|184
 {
+    if ($@PRSM_PARTY) message strcharinfo(0), strnpcinfo(1) + " : Prsm always play with me, my friends and new players! My best friend want to be a GM when we grow up!";
     mes "[Aisha]";
     set .@rnd, rand(7);
     if (.@rnd == 0) mes "Maggots are soo slimey!";
@@ -51,6 +56,7 @@ L_NoHeal:
 
 003-1,120,33,0|script|Nina#2#2006|184
 {
+    if ($@PRSM_PARTY) message strcharinfo(0), strnpcinfo(1) + " : I came here to bring good wishes to Prsm. He will never be forgotten.";
     mes "[Nina]";
     set .@rnd, rand(7);
     if (.@rnd == 0) mes "If i learned anything from school, Grenxen founded Tulimshar.";
@@ -65,6 +71,7 @@ L_NoHeal:
 
 003-1,33,30,0|script|Ian#2006|184
 {
+    if ($@PRSM_PARTY) message strcharinfo(0), strnpcinfo(1) + " : Prsm probably knows more about The Mana World than me. Of course I would come to his party.";
     mes "[Ian]";
     mes "Would you like to know about something?";
     next;
@@ -174,6 +181,7 @@ L_Quit:
 
 003-1,114,43,0|script|Luca#2006|184
 {
+    if ($@PRSM_PARTY) message strcharinfo(0), strnpcinfo(1) + " : Prsm always help me when someone robs my camera... Or when I just forget it at home.";
     mes "[Luca]";
     mes "Ouch! It hurts, this wound I got from battle.";
     next;
@@ -196,6 +204,7 @@ L_Nev:
 
 003-1,48,79,0|script|Ekinu#2006|184
 {
+    if ($@PRSM_PARTY) message strcharinfo(0), strnpcinfo(1) + " : Prsm keeps the world safe from bots, scammers and spammers. And we, the guards, keep the town safe from monsters.";
     mes "[Ekinu]";
     mes "Protecting this place is my job.";
     mes "If you walk outside, there are" ;
@@ -221,6 +230,7 @@ L_Nev:
 
 003-1,39,79,0|script|Ryan#2006|184
 {
+    if ($@PRSM_PARTY) message strcharinfo(0), strnpcinfo(1) + " : ZzzZzzZ...";
     mes "[Ryan]";
     mes "ZzzZzzZ...";
     next;
@@ -234,6 +244,7 @@ L_Nev:
 
 003-1,55,51,0|script|Ishi#2006|184
 {
+    if ($@PRSM_PARTY) message strcharinfo(0), strnpcinfo(1) + " : I actually lost count of how many monster points Prsm accumulated, so I came to congratulate him.";
     mes "[Ishi]";
     mes "Welcome";
     close;
@@ -241,6 +252,7 @@ L_Nev:
 
 003-1,72,61,0|script|Sandra#2006|184
 {
+    if ($@PRSM_PARTY) message strcharinfo(0), strnpcinfo(1) + " : I wish we had more helpful people like Prsm.";
     mes "[Sandra]";
     mes "You look sturdy enough, will you help me get something?";
     menu
@@ -254,6 +266,7 @@ L_Yes:
 
 003-1,137,35,0|script|Vincent#2006|184
 {
+    if ($@PRSM_PARTY) message strcharinfo(0), strnpcinfo(1) + " : When I grow up, I want to be like Prsm!";
     emotion EMOTE_TONGUE, strcharinfo(0);
     end;
 }