nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Hero remembers trapped boxes

Browse Source 
After finding a trap on a chest or a large box, remember it
as trapped: "You see here a trapped large box."
Randomly generated chests and boxes can be obviously trapped.
Allow defining obviously trapped containers via lua.

Invalidates saves and bones.
This commit is contained in:
Pasi Kallinen
2024-12-19 12:37:13 +02:00
parent 27a03ef75b
commit 87694e1a95
12 changed files with 75 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sp_lev.c
View File

@@ -2277,6 +2277,8 @@ create_object(object *o, struct mkroom *croom)
}
if (o->trapped == 0 || o->trapped == 1)
otmp->otrapped = o->trapped;
if (o->trapped && (o->tknown == 0 || o->tknown == 1))
otmp->tknown = o->tknown;
otmp->greased = o->greased ? 1 : 0;
if (o->quan > 0 && objects[otmp->otyp].oc_merge) {
@@ -3517,7 +3519,7 @@ lspo_object(lua_State *L)
0, /* quan */
0, /* buried */
0, /* lit */
0, 0, 0, 0, /* eroded, locked, trapped, recharged */
0, 0, 0, 0, 0, /* eroded, locked, trapped, tknown, recharged */
0, 0, 0, 0, /* invis, greased, broken, achievement */
};
#if 0
@@ -3537,6 +3539,7 @@ lspo_object(lua_State *L)
tmpobj.spe = -127;
tmpobj.quan = -1;
tmpobj.trapped = -1;
tmpobj.tknown = -1;
tmpobj.locked = -1;
tmpobj.corpsenm = NON_PM;
@@ -3590,6 +3593,7 @@ lspo_object(lua_State *L)
tmpobj.eroded = get_table_int_opt(L, "eroded", 0);
tmpobj.locked = get_table_boolean_opt(L, "locked", -1);
tmpobj.trapped = get_table_boolean_opt(L, "trapped", -1);
tmpobj.tknown = get_table_boolean_opt(L, "trap_known", -1);
tmpobj.recharged = get_table_int_opt(L, "recharged", 0);
tmpobj.greased = get_table_boolean_opt(L, "greased", 0);
tmpobj.broken = get_table_boolean_opt(L, "broken", 0);