summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2024-08-13 11:50:30 -0300
committerJesusaves <cpntb1@ymail.com>2024-08-13 11:50:30 -0300
commit173144c4909342410afd85c8324dbc8a76a432e0 (patch)
tree4541f824285c146c9b3f31e1abf9f43fe48845a7
parent6414af1947328fed0c4539e88ef2d332050774b5 (diff)
downloadserverdata-173144c4909342410afd85c8324dbc8a76a432e0.tar.gz
serverdata-173144c4909342410afd85c8324dbc8a76a432e0.tar.bz2
serverdata-173144c4909342410afd85c8324dbc8a76a432e0.tar.xz
serverdata-173144c4909342410afd85c8324dbc8a76a432e0.zip
Crazyfefe: If all players online are in Candor Cave, allow to skip the announce.
-rw-r--r--npc/006-1/crazyfefe.txt2
-rw-r--r--npc/sec_pri/jailer.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/npc/006-1/crazyfefe.txt b/npc/006-1/crazyfefe.txt
index 864720702..95ef8b113 100644
--- a/npc/006-1/crazyfefe.txt
+++ b/npc/006-1/crazyfefe.txt
@@ -162,7 +162,7 @@ function Challenge {
menuint
l("Sorry, I misclicked the first button. Have a nice nap, great Crazyfefe!"), -1,
- rif(is_gm() || $EVENT$ == "Candor", l("WHAT ARE WE WAITING FOR?! START ALREADY!")), 0,
+ rif(is_gm() || $EVENT$ == "Candor" || getusers(1) == getmapusers("006-1"), l("WHAT ARE WE WAITING FOR?! START ALREADY!")), 0,
l("Yeah, I have the money. Give me FIVE minutes, and Bring it on!"), 5,
l("Yeah, I have the money. Give me TEN minutes, and Bring it on!"), 10,
l("Yeah, I have the money. Give me FIFTEEN minutes, and Bring it on!"), 15,
diff --git a/npc/sec_pri/jailer.txt b/npc/sec_pri/jailer.txt
index 751558f8b..ea6af5b07 100644
--- a/npc/sec_pri/jailer.txt
+++ b/npc/sec_pri/jailer.txt
@@ -39,6 +39,7 @@ sec_pri,22,21,0 script Warp Feltchstick NPC_PLAYER,{
closeclientdialog;
// TODO: Say some random anecdote, maybe steal from Confused Tree + Elli
// Using npctalk3
+ legiontalk();
}
close;