Skip to content

"ASLEEP" flag for triggers #398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahigerd wants to merge 2 commits into
base: main
Choose a base branch
from
Open

"ASLEEP" flag for triggers #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54a61ba
halt triggers if mob is asleep
adamhigerd Jan 5, 2026
e0ca71d
add ASLEEP flag for triggers
adamhigerd Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/dg_scripts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,20 @@
/* mob trigger types */
const char *trig_types[] = {"Global", "Random", "Command", "Speech", "Act", "Death", "Greet",
"Greet-All", "Entry", "Receive", "Fight", "HitPrcnt", "Bribe", "SpeechTo*",
"Load", "Cast", "Leave", "Door", "Look", "Time", "\n"};
"Load", "Cast", "Leave", "Door", "Look", "Time", "Asleep",
"\n"};

/* obj trigger types */
const char *otrig_types[] = {"Global", "Random", "Command", "Attack", "Defense", "Timer", "Get",
"Drop", "Give", "Wear", "Death", "Remove", "Look", "Use",
"Load", "Cast", "Leave", "UNUSED", "Consume", "Time", "\n"};
"Load", "Cast", "Leave", "UNUSED", "Consume", "Time", "UNUSED",
"\n"};

/* wld trigger types */
const char *wtrig_types[] = {"Global", "Random", "Command", "Speech", "UNUSED", "Reset", "Preentry",
"Drop", "Postentry", "UNUSED", "UNUSED", "UNUSED", "UNUSED", "UNUSED",
"UNUSED", "Cast", "Leave", "Door", "UNUSED", "Time", "\n"};
"UNUSED", "Cast", "Leave", "Door", "UNUSED", "Time", "UNUSED",
"\n"};

TrigData *trigger_list = nullptr; /* all attached triggers */

Expand Down Expand Up @@ -2359,11 +2362,9 @@ int script_driver(void *go_address, TrigData *trig, int type, int mode) {
break;

if (type == MOB_TRIGGER && !(trig->trigger_type & MTRIG_DEATH)) { /* only death trigs are immune to all tests */
if (!AWAKE((CharData *)go)) {
depth--;
if (mode == TRIG_NEW)
GET_TRIG_DEPTH(trig) = 0; /* reset trigger totally if instant bail */
return 0;
if (!check_awake(trig, (CharData *)go)) {
/* abort execution and clean up */
break;
}

if (CASTING((CharData *)go)) {
Expand Down
5 changes: 4 additions & 1 deletion src/dg_scripts.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#define DG_NO_TRIG (1u << 6u) /* don't check act trigger */

#define NUM_TRIG_TYPE_FLAGS 20
#define NUM_TRIG_TYPE_FLAGS 21

/* mob trigger types */
#define MTRIG_GLOBAL (1u << 0u) /* check even if zone empty */
Expand All @@ -47,6 +47,7 @@
#define MTRIG_DOOR (1u << 17u) /* door manipulated in room */
#define MTRIG_LOOK (1u << 18u) /* the mob is looked at */
#define MTRIG_TIME (1u << 19u) /* trigger based on game hour */
#define MTRIG_ASLEEP (1u << 20u) /* allow trigger while asleep */

/* obj trigger types */
#define OTRIG_GLOBAL (1u << 0u) /* unused */
Expand Down Expand Up @@ -211,6 +212,8 @@ void random_mtrigger(CharData *ch);
void random_otrigger(ObjData *obj);
void random_wtrigger(RoomData *ch);

bool check_awake(const TrigData* trig, const CharData* ch);

/* function prototypes from scripts.c */
void script_trigger_check(void);
void add_trigger(ScriptData *sc, TrigData *t, int loc);
Expand Down
42 changes: 33 additions & 9 deletions src/dg_triggers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ bool char_susceptible_to_triggers(const CharData *ch) {
return true;
}

bool check_awake(const TrigData* trig, const CharData* ch) {
if (!ch || !trig) {
return false;
}
return AWAKE(ch) || (trig->trigger_type & MTRIG_ASLEEP);
}

int is_substring(const char *sub, const char *string) {
const char *s;

Expand Down Expand Up @@ -162,14 +169,17 @@ int greet_mtrigger(CharData *actor, int dir) {

for (ch = world[IN_ROOM(actor)].people; ch; ch = next_in_room) {
next_in_room = ch->next_in_room;
if (!MOB_PERFORMS_SCRIPTS(ch) || !SCRIPT_CHECK(ch, MTRIG_GREET | MTRIG_GREET_ALL) || !AWAKE(ch) ||
if (!MOB_PERFORMS_SCRIPTS(ch) || !SCRIPT_CHECK(ch, MTRIG_GREET | MTRIG_GREET_ALL) ||
FIGHTING(ch) || (ch == actor))
continue;

for (t = TRIGGERS(SCRIPT(ch)); t; t = t->next) {
if (((IS_SET(GET_TRIG_TYPE(t), MTRIG_GREET) && CAN_SEE(ch, actor)) ||
IS_SET(GET_TRIG_TYPE(t), MTRIG_GREET_ALL)) &&
!GET_TRIG_DEPTH(t) && (random_number(1, 100) <= GET_TRIG_NARG(t))) {
if (!check_awake(t, ch)) {
continue;
}
add_var(&GET_TRIG_VARS(t), "direction", dirs[rev_dir[dir]]);
ADD_UID_VAR(buf, t, actor, "actor");
if (!script_driver(&ch, t, MOB_TRIGGER, TRIG_NEW))
Expand Down Expand Up @@ -264,11 +274,15 @@ void speech_mtrigger(CharData *actor, const char *str) {
ch_next = ch->next_in_room;

if (MOB_PERFORMS_SCRIPTS(ch) && (SCRIPT_CHECK(ch, MTRIG_SPEECH) || SCRIPT_CHECK(ch, MTRIG_SPEECHTO)) &&
AWAKE(ch) && actor != ch)
actor != ch)
for (t = TRIGGERS(SCRIPT(ch)); t; t = t->next) {
if (!TRIGGER_CHECK(t, MTRIG_SPEECH) && !TRIGGER_CHECK(t, MTRIG_SPEECHTO))
continue;

if (!check_awake(t, ch)) {
continue;
}

if (!GET_TRIG_ARG(t) || !*GET_TRIG_ARG(t)) {
log(LogSeverity::Stat, LVL_GOD, "SYSERR: Speech Trigger #{:d} has no text argument!",
GET_TRIG_VNUM(t));
Expand All @@ -294,12 +308,16 @@ void speech_to_mtrigger(CharData *actor, CharData *ch, const char *str) {
if (!char_susceptible_to_triggers(actor) || !char_susceptible_to_triggers(ch))
return;

if (MOB_PERFORMS_SCRIPTS(ch) && (SCRIPT_CHECK(ch, MTRIG_SPEECHTO) || SCRIPT_CHECK(ch, MTRIG_SPEECH)) && AWAKE(ch) &&
if (MOB_PERFORMS_SCRIPTS(ch) && (SCRIPT_CHECK(ch, MTRIG_SPEECHTO) || SCRIPT_CHECK(ch, MTRIG_SPEECH)) &&
actor != ch)
for (t = TRIGGERS(SCRIPT(ch)); t; t = t->next) {
if (!TRIGGER_CHECK(t, MTRIG_SPEECHTO) && !TRIGGER_CHECK(t, MTRIG_SPEECH))
continue;

if (!check_awake(t, ch)) {
continue;
}

if (!GET_TRIG_ARG(t) || !*GET_TRIG_ARG(t)) {
log(LogSeverity::Stat, LVL_GOD, "SYSERR: Speech-to Trigger #{:d} has no text argument!",
GET_TRIG_VNUM(t));
Expand Down Expand Up @@ -420,7 +438,7 @@ int receive_mtrigger(CharData *ch, CharData *actor, ObjData *obj) {
for (t = TRIGGERS(SCRIPT(ch)); t; t = t->next) {
if (IS_SET(GET_TRIG_TYPE(t), MTRIG_RECEIVE)) {

if ((GET_TRIG_ARG(t) && word_check(vnum, GET_TRIG_ARG(t)) && GET_TRIG_NARG(t)) ||
if ((GET_TRIG_ARG(t) && word_check(vnum, GET_TRIG_ARG(t)) && GET_TRIG_NARG(t)) ||
((GET_TRIG_ARG(t) && !word_check(vnum, GET_TRIG_ARG(t)) && !GET_TRIG_NARG(t))) ||
(!GET_TRIG_ARG(t) || !*GET_TRIG_ARG(t))) {

Expand Down Expand Up @@ -502,11 +520,14 @@ int leave_mtrigger(CharData *actor, int dir) {
return 1;

for (ch = world[IN_ROOM(actor)].people; ch; ch = ch->next_in_room) {
if (!MOB_PERFORMS_SCRIPTS(ch) || !SCRIPT_CHECK(ch, MTRIG_LEAVE) || !AWAKE(ch) || FIGHTING(ch) || ch == actor)
if (!MOB_PERFORMS_SCRIPTS(ch) || !SCRIPT_CHECK(ch, MTRIG_LEAVE) || FIGHTING(ch) || ch == actor)
continue;

for (t = TRIGGERS(SCRIPT(ch)); t; t = t->next) {
if (TRIGGER_CHECK(t, MTRIG_LEAVE) && CAN_SEE(ch, actor) && random_number(1, 100) <= GET_TRIG_NARG(t)) {
if (!check_awake(t, ch)) {
continue;
}
if (dir >= 0 && dir < NUM_OF_DIRS)
add_var(&GET_TRIG_VARS(t), "direction", dirs[dir]);
else
Expand All @@ -528,12 +549,15 @@ int door_mtrigger(CharData *actor, int subcmd, int dir) {
return 1;

for (ch = world[IN_ROOM(actor)].people; ch; ch = ch->next_in_room) {
if (!MOB_PERFORMS_SCRIPTS(ch) || !SCRIPT_CHECK(ch, MTRIG_DOOR) || !AWAKE(ch) || FIGHTING(ch) || ch == actor ||
if (!MOB_PERFORMS_SCRIPTS(ch) || !SCRIPT_CHECK(ch, MTRIG_DOOR) || FIGHTING(ch) || ch == actor ||
!CAN_SEE(ch, actor))
continue;

for (t = TRIGGERS(SCRIPT(ch)); t; t = t->next) {
if (TRIGGER_CHECK(t, MTRIG_DOOR) && random_number(1, 100) <= GET_TRIG_NARG(t)) {
if (!check_awake(t, ch)) {
continue;
}
add_var(&GET_TRIG_VARS(t), "cmd", cmd_door[subcmd]);
add_var(&GET_TRIG_VARS(t), "direction", dirs[dir]);
ADD_UID_VAR(buf, t, actor, "actor");
Expand Down Expand Up @@ -968,7 +992,7 @@ int look_otrigger(ObjData *obj, CharData *actor, char *name, const char *additio
str = name;

for (t = TRIGGERS(SCRIPT(obj)); t; t = t->next) {
if (GET_TRIG_ARG(t) && word_check(str, GET_TRIG_ARG(t)) ||
if (GET_TRIG_ARG(t) && word_check(str, GET_TRIG_ARG(t)) ||
(!GET_TRIG_ARG(t) || !*GET_TRIG_ARG(t)) && isname(str, obj->name)) {
if (TRIGGER_CHECK(t, OTRIG_LOOK) && (random_number(1, 100) <= GET_TRIG_NARG(t))) {
if (actor)
Expand All @@ -980,7 +1004,7 @@ int look_otrigger(ObjData *obj, CharData *actor, char *name, const char *additio
if (!script_driver(&obj, t, OBJ_TRIGGER, TRIG_NEW) && obj)
ret_val = 0;

}
}
} else
continue;
}
Expand Down Expand Up @@ -1254,4 +1278,4 @@ void time_wtrigger(RoomData *room) {
break;
}
}
}
}