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

Allow some makemon flags in lua monster creation

Browse Source 
Also document the des.monster hash parameter values.
This commit is contained in:
Pasi Kallinen
2021-06-24 14:38:01 +03:00
parent 8dfe963652
commit 3ddb2a91c7
3 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
doc/lua.adoc
View File

@@ -458,6 +458,40 @@ Example:
=== monster
Create a monster.
The hash parameter accepts the following keys:
[options="header"]
|===
| parameter | type | description
| id | string | specific monster type, eg. "wood nymph"
| class | string | monster class, eg "D"
| x, y | integers |
| coord | table of two integer |
| peaceful | 0 or 1 |
| asleep | 0 or 1 |
| name | string | name of the monster
| female | 0 or 1 |
| invisible | 0 or 1 |
| cancelled | 0 or 1 |
| revived | 0 or 1 |
| avenge | 0 or 1 |
| fleeing | 0 - 127 |
| blinded | 0 - 127 |
| paralyzed | 0 - 127 |
| stunned | 0 or 1 |
| confused | 0 or 1 |
| waiting | 0 or 1 | monster will wait until hero gets next to it
| tail | 0 or 1 | generate worm without a tail?
| group | 0 or 1 | generate a group of monsters?
| adjacentok | 0 or 1 | is adjacent location ok, if given one is not suitable?
| ignorewater | 0 or 1 | ignore water when choosing location for the monster
| countbirth | 0 or 1 | do we count this monster as generated
| appear_as | string | monster can appear as object, monster, or terrain. Add "obj:", "mon:", or "ter:" prefix to the value. |
| inventory | function | objects generated in the function are given to the monster
|===
Example:
des.monster();

1
include/sp_lev.h
View File

@@ -141,6 +141,7 @@ typedef struct {
paralyzed, stunned, confused, waiting;
long seentraps;
short has_invent;
long mm_flags; /* makemon flags */
} monster;
typedef struct {

14
src/sp_lev.c
View File

@@ -1865,7 +1865,7 @@ create_monster(monster* m, struct mkroom* croom)
else if (PM_ARCHEOLOGIST <= m->id && m->id <= PM_WIZARD)
mtmp = mk_mplayer(pm, x, y, FALSE);
else
mtmp = makemon(pm, x, y, NO_MM_FLAGS);
mtmp = makemon(pm, x, y, m->mm_flags);
if (mtmp) {
x = mtmp->mx, y = mtmp->my; /* sanity precaution */
@@ -3047,6 +3047,7 @@ lspo_monster(lua_State *L)
tmpmons.seentraps = 0;
tmpmons.has_invent = 0;
tmpmons.waiting = 0;
tmpmons.mm_flags = NO_MM_FLAGS;
if (argc == 1 && lua_type(L, 1) == LUA_TSTRING) {
const char *paramstr = luaL_checkstring(L, 1);
@@ -3114,6 +3115,17 @@ lspo_monster(lua_State *L)
tmpmons.seentraps = 0; /* TODO: list of trap names to bitfield */
tmpmons.has_invent = 0;
if (!get_table_int_opt(L, "tail", 1))
tmpmons.mm_flags |= MM_NOTAIL;
if (!get_table_int_opt(L, "group", 1))
tmpmons.mm_flags |= MM_NOGRP;
if (get_table_int_opt(L, "adjacentok", 0))
tmpmons.mm_flags |= MM_ADJACENTOK;
if (get_table_int_opt(L, "ignorewater", 0))
tmpmons.mm_flags |= MM_IGNOREWATER;
if (!get_table_int_opt(L, "countbirth", 1))
tmpmons.mm_flags |= MM_NOCOUNTBIRTH;
mappear = get_table_str_opt(L, "appear_as", NULL);
if (mappear) {
if (!strncmp("obj:", mappear, 4)) {