Give the proper degree of disruption when the world is threatened.

16 files changed, 43 insertions, 4 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 7a7293611..6ecb676d8 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1787,9 +1787,9 @@ constants_db: {
 	NPC_STATUE_2019:        173
 	NPC_STATUE_2020:        174
 	NPC_STATUE_2021:        175
-	NPC_STATUE_R176:        176
-	NPC_STATUE_R177:        177
-	NPC_STATUE_R178:        178
+	NPC_STATUE_MUSIC:       176
+	NPC_STATUE_FISHER:      177
+	NPC_STATUE_COOK:        178
 	NPC_STATUE_EMPTY:       179
 
 	// Not animated NPCs
@@ -2388,6 +2388,17 @@ constants_db: {
 	ML_MAPMODE_PAY2KILL: 8
 	ML_MAPMODE_NOPETS:   9
 
+	ML_CH_FISHING:          1
+	ML_CH_MINING:           2
+	ML_CH_LOCKPICKING:      3
+	ML_CH_DIGGING:          4
+	ML_CH_COOKING:          5
+	ML_CH_CRAFTING:         6
+	ML_CH_KINGSQUAD:        7
+	ML_CH_EMPERORSQUAD:     8
+	ML_CH_CHANTING:         9
+	ML_CH_MUSIC:           10
+
 	comment__: "Mirror Lake Server Identifiers"
 	WORLD_ID:       2
 	MLP_CR:         1
diff --git a/npc/002-1/juliet.txt b/npc/002-1/juliet.txt
index 02488531e..3ebc0c1ea 100644
--- a/npc/002-1/juliet.txt
+++ b/npc/002-1/juliet.txt
@@ -20,6 +20,7 @@
 
 
     function sellFood {
+        AerosFall(l("I cannot sell the ship cargo"));
         closeclientdialog;
         openshop;
         close;
diff --git a/npc/002-3/nard.txt b/npc/002-3/nard.txt
index 2a47e0090..76507565d 100644
--- a/npc/002-3/nard.txt
+++ b/npc/002-3/nard.txt
@@ -249,6 +249,7 @@ L_NotYet:
     close;
 
 L_Travel:
+    AerosFall(l("travel by sea is suspended"));
     // Current nard_reputation() value for 100% discount: 15
     .@price=480;
     .@price-=min(460, nard_reputation()*32);
diff --git a/npc/003-0-1/statues.txt b/npc/003-0-1/statues.txt
index feae4f603..481e75723 100644
--- a/npc/003-0-1/statues.txt
+++ b/npc/003-0-1/statues.txt
@@ -125,7 +125,7 @@ OnInit:
     end;
 }
 
-003-0-1,68,24,0	script	#Statue2022	NPC_STATUE_R176,{
+003-0-1,68,24,0	script	#Statue2022	NPC_STATUE_EMPTY,{
 
     mes l("After the Great Fire, the annual scoreboards were no longer inscribed in stone.");
     mes l("However, the events kept happening:");
diff --git a/npc/003-1/events.txt b/npc/003-1/events.txt
index 77aaf598f..90b644e79 100644
--- a/npc/003-1/events.txt
+++ b/npc/003-1/events.txt
@@ -25,6 +25,8 @@
     function auroraSubmit;
     function auroraListRewards;
 
+    AerosFall();
+
     // Handle annuals
     //.@v_stday = getvariableofnpc(.valentine_stday, "#EventCore");
     //.@v_stmon = getvariableofnpc(.valentine_stmon, "#EventCore");
diff --git a/npc/020-1/misc.txt b/npc/020-1/misc.txt
index 88b210407..711a3ef5f 100644
--- a/npc/020-1/misc.txt
+++ b/npc/020-1/misc.txt
@@ -7,6 +7,7 @@
 // Description:
 //    The Travelers travel around the world telling stories.
 020-1,44,67,0	script	Knox The Traveler	NPC_F_COINKEEPER,{
+    AerosFall();
 
     mesn;
     if (strcharinfo(0) == $MOST_HEROIC$) mesq l("Wow! Are you @@? Everyone, in every city, talks about you!", $MOST_HEROIC$);
diff --git a/npc/024-1/guard.txt b/npc/024-1/guard.txt
index fdcc85c92..7ed6c5976 100644
--- a/npc/024-1/guard.txt
+++ b/npc/024-1/guard.txt
@@ -5,6 +5,7 @@
 //  Controls access to Frostia.
 
 024-1,93,73,0	script	Frostia Guard	NPC_ELF,{
+    AerosFall(l("access to Frostia is suspended, even for residents"));
     // Main Quest Have Precedence
     if (getq(General_Narrator) == 11)
         goto L_MainQuest;
diff --git a/npc/config/inspector.txt b/npc/config/inspector.txt
index 3fd5debae..aa90d92d0 100644
--- a/npc/config/inspector.txt
+++ b/npc/config/inspector.txt
@@ -6,6 +6,7 @@
 
 // Main logical loop, takes no argument
 function	script	inspectorQuest	{
+    AerosFall();
 	.@npc$ = strnpcinfo(0);
 	if ($@GM_OVERRIDE) debugmes .@npc$;
 	// ...So on, for each stage
diff --git a/npc/craft/smith.txt b/npc/craft/smith.txt
index 972784d4e..81871144e 100644
--- a/npc/craft/smith.txt
+++ b/npc/craft/smith.txt
@@ -22,6 +22,7 @@
 // CRAFT_GUILD - Items created will be Guild-bound
 // Returns true on success, false on failure
 function	script	SmithSystem	{
+    AerosFall(l("smithing services are suspended, due to a decree of the High Council"));
     // Set .scope, .knowledge and .success
     .scope=getarg(0, CRAFT_PLAYER);
     copyarray(.knowledge,RECIPES_EQUIPMENT,getarraysize(RECIPES_EQUIPMENT));
diff --git a/npc/functions/bank.txt b/npc/functions/bank.txt
index 9d45602ba..56f04f9ac 100644
--- a/npc/functions/bank.txt
+++ b/npc/functions/bank.txt
@@ -195,6 +195,7 @@ function	script	BKReg	{
 
 // name, city, price (defaults to 10k)
 function	script	Banker	{
+    AerosFall(l("banking services are suspended"));
     .@bankId = getvariableofnpc(.bankId, strnpcinfo(0));
     mesn getarg(0);
     mesq l("Welcome! My name is @@, I am a representative of the Merchant Guild on @@.", getarg(0), getarg(1));
diff --git a/npc/functions/news.txt b/npc/functions/news.txt
index cd8d18baf..f6a0f3259 100644
--- a/npc/functions/news.txt
+++ b/npc/functions/news.txt
@@ -375,6 +375,10 @@ function	script	EventHelp	{
 
 
 function	script	Journalman	{
+    if ($@ML_SHOWDOWN == 4) {
+        npctalk3 l("Panic spreads as a massive floating island threatens to fall in the continent!");
+        end;
+    }
     /* Random Fun Fact */
     npctalk3 any(
         ($GAME_STORYLINE >= 4 ? l("Strange dragon seem during rains! Be careful when you leave your house!") : l("We seem to be having a fine weather, despite the Monster King activity!")),
diff --git a/npc/functions/nurse.txt b/npc/functions/nurse.txt
index f0fa452d7..4edc1b85a 100644
--- a/npc/functions/nurse.txt
+++ b/npc/functions/nurse.txt
@@ -10,6 +10,7 @@
 //   2 - Only core healing
 //   3 - everything (default)
 function	script	Nurse	{
+    AerosFall(l("medical services are suspended", getmap() != "001-15"));
     // Handle redirects
     .@d=getarg(3, 3);
 
diff --git a/npc/functions/politics.txt b/npc/functions/politics.txt
index 437b621a3..d10b1dacc 100644
--- a/npc/functions/politics.txt
+++ b/npc/functions/politics.txt
@@ -319,6 +319,7 @@ function	script	POL_Information	{
 // Candidate Info and voting
 // POL_Candidate( TOWNCODE )
 function	script	POL_Candidate	{
+    AerosFall(l("elections are suspended"));
     copyarray( .@cd$, getd("$"+getarg(0)+"_CANDIDATE$"), getarraysize(getd("$"+getarg(0)+"_CANDIDATE$")) );
     copyarray( .@vt, getd("$"+getarg(0)+"_VOTES"), getarraysize(getd("$"+getarg(0)+"_VOTES")) );
 
@@ -383,6 +384,7 @@ function	script	POL_TownInfo	{
 // Town Management
 // POL_Manage( TOWNCODE )
 function	script	POL_Manage	{
+    AerosFall(l("town management is suspended"));
     .@town$="$"+getarg(0);
     .@MAYOR$=getd("$"+getarg(0)+"_MAYOR$");
     .@TP=POL_LocToTP(getarg(0));
diff --git a/npc/functions/refine.txt b/npc/functions/refine.txt
index 24683798c..fd9d5a374 100644
--- a/npc/functions/refine.txt
+++ b/npc/functions/refine.txt
@@ -8,6 +8,7 @@
 
 // (No arguments)
 function	script	refineMaster	{
+    AerosFall(l("refining services are suspended"));
     mesn;
     mesq l("Ah, hello there, funny face! Do you want to refine items?");
     mesc l("There's always some chance that THE ITEM WILL BREAK, beware!");
diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt
index a1d022363..7bbafea2c 100644
--- a/npc/functions/soul_menhir.txt
+++ b/npc/functions/soul_menhir.txt
@@ -3,6 +3,7 @@
 // With parts from The Mana World.
 
 function	script	SoulMenhir	{
+    if ($@ML_SHOWDOWN == 4) goto L_DontPanic;
     // Create @x and @y for this script
     @n = rand2(getarraysize(@Xs));
     @x = @Xs[@n];
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 345628ade..a86c4762c 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -1427,3 +1427,13 @@ function	script	announce_bosskill	{
     return;
 }
 
+// AerosFall( msg="I'm too busy to talk to you", additional_cond=true )
+function	script	AerosFall	{
+    if ($@ML_SHOWDOWN == 4 && getarg(1, true)) {
+        .@msg$=getarg(0, l("I'm too busy to talk to you"));
+        mesc l("Sorry, due to the ongoing crisis, %s.");
+        close;
+    }
+    return;
+}
+