fiddlerwoaroof/crawl - Change JCUAPVDH47W6LG4LU6S4QP6FZJJ2NVXJ6LKFSBMVY3AWMC2PALIAC

Move monster libraries from clua.cc to l_mons.cc.

Created by Robert Vollmert on October 20, 2009

JCUAPVDH47W6LG4LU6S4QP6FZJJ2NVXJ6LKFSBMVY3AWMC2PALIAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/makefile.obj at line 56 [6.79]
[4.2843]
[5.2830]
```
l_mons.o \
```

File addition: l_mons.cc (----------)

[7.24]

#include "AppHdr.h"
#include "clua.h"
#include "l_libs.h"
#include "delay.h"
#include "mon-util.h"
#include "monstuff.h"
/////////////////////////////////////////////////////////////////////
// Monster handling
#define MONS_METATABLE "monster.monsaccess"
struct MonsterWrap
{
    monsters *mons;
    long      turn;
};
void push_monster(lua_State *ls, monsters *mons)
{
    MonsterWrap *mw = clua_new_userdata< MonsterWrap >(ls, MONS_METATABLE);
    mw->turn = you.num_turns;
    mw->mons = mons;
}
#define MDEF(name)                                                      \
    static int l_mons_##name(lua_State *ls, monsters *mons,             \
                             const char *attr)                         \
#define MDEFN(name, closure)                    \
    static int l_mons_##name(lua_State *ls, monsters *mons, const char *attrs) \
    {                                                                   \
    lua_pushlightuserdata(ls, mons);                                    \
    lua_pushcclosure(ls, l_mons_do_dismiss, 1);                         \
    return (1);                                                         \
    }
MDEF(name)
{
    PLUARET(string, mons_type_name(mons->type, DESC_PLAIN).c_str());
}
MDEF(x)
{
    PLUARET(number, int(mons->pos().x) - int(you.pos().x));
}
MDEF(y)
{
    PLUARET(number, int(mons->pos().y) - int(you.pos().y));
}
MDEF(hd)
{
    PLUARET(number, mons->hit_dice);
}
static const char *_monuse_names[] =
{
    "nothing", "open_doors", "starting_equipment", "weapons_armour",
    "magic_items"
};
static const char *_monuse_to_str(mon_itemuse_type utyp)
{
    COMPILE_CHECK(ARRAYSZ(_monuse_names) == NUM_MONUSE, c1);
    return _monuse_names[utyp];
}
MDEF(muse)
{
    if (const monsterentry *me = mons->find_monsterentry())
    {
        PLUARET(string, _monuse_to_str(me->gmon_use));
    }
    return (0);
}
static const char *_moneat_names[] =
{
    "nothing", "items", "corpses", "food"
};
static const char *_moneat_to_str(mon_itemeat_type etyp)
{
    COMPILE_CHECK(ARRAYSZ(_moneat_names) == NUM_MONEAT, c1);
    return _moneat_names[etyp];
}
MDEF(meat)
{
    if (const monsterentry *me = mons->find_monsterentry())
    {
        PLUARET(string, _moneat_to_str(me->gmon_eat));
    }
    return (0);
}
static int l_mons_do_dismiss(lua_State *ls)
{
    // dismiss is only callable from dlua, not from managed VMs (i.e.
    // end-user scripts cannot dismiss monsters).
    ASSERT_DLUA;
    monsters *mons =
        util_get_userdata<monsters>(ls, lua_upvalueindex(1));
    if (mons->alive())
    {
        mons->flags |= MF_HARD_RESET;
        monster_die(mons, KILL_DISMISSED, NON_MONSTER);
    }
    return (0);
}
MDEFN(dismiss, do_dismiss)
MDEF(experience)
{
    ASSERT_DLUA;
    PLUARET(number, exper_value(mons));
}
struct MonsAccessor
{
    const char *attribute;
    int (*accessor)(lua_State *ls, monsters *mons, const char *attr);
};
static MonsAccessor mons_attrs[] =
{
    { "name", l_mons_name },
    { "x"   , l_mons_x    },
    { "y"   , l_mons_y    },
    { "hd"  , l_mons_hd   },
    { "muse", l_mons_muse },
    { "meat", l_mons_meat },
    { "dismiss", l_mons_dismiss },
    { "experience", l_mons_experience },
};
static int monster_get(lua_State *ls)
{
    MonsterWrap *mw = clua_get_userdata< MonsterWrap >(ls, MONS_METATABLE);
    if (!mw || mw->turn != you.num_turns || !mw->mons)
        return (0);
    const char *attr = luaL_checkstring(ls, 2);
    if (!attr)
        return (0);
    for (unsigned i = 0; i < sizeof(mons_attrs) / sizeof(mons_attrs[0]); ++i)
    {
        if (!strcmp(attr, mons_attrs[i].attribute))
            return (mons_attrs[i].accessor(ls, mw->mons, attr));
    }
    return (0);
}
static const char *_monster_behaviour_names[] = {
    "sleep",
    "wander",
    "seek",
    "flee",
    "cornered",
    "panic",
    "lurk"
};
static beh_type behaviour_by_name(const std::string &name) {
    ASSERT(ARRAYSZ(_monster_behaviour_names) == NUM_BEHAVIOURS);
    for (unsigned i = 0; i < ARRAYSZ(_monster_behaviour_names); ++i)
        if (name == _monster_behaviour_names[i])
            return static_cast<beh_type>(i);
    return NUM_BEHAVIOURS;
}
static int monster_set(lua_State *ls)
{
    // Changing monster behaviour is for the dungeon builder only,
    // never for user scripts.
    ASSERT_DLUA;
    MonsterWrap *mw = clua_get_userdata< MonsterWrap >(ls, MONS_METATABLE);
    if (!mw || !mw->mons)
        return (0);
    const char *attr = luaL_checkstring(ls, 2);
    if (!attr)
        return (0);
    if (!strcmp(attr, "beh")) {
        const beh_type beh =
            lua_isnumber(ls, 3) ?
            static_cast<beh_type>(luaL_checkint(ls, 3)) :
            lua_isstring(ls, 3) ? behaviour_by_name(lua_tostring(ls, 3)) :
            NUM_BEHAVIOURS;
        if (beh != NUM_BEHAVIOURS)
            mw->mons->behaviour = beh;
    }
    return (0);
}
static int mons_behaviour(lua_State *ls) {
    if (lua_gettop(ls) < 1)
        return (0);
    if (lua_isnumber(ls, 1)) {
        lua_pushvalue(ls, 1);
        return (1);
    }
    else if (lua_isstring(ls, 1)) {
        const beh_type beh = behaviour_by_name(lua_tostring(ls, 1));
        if (beh != NUM_BEHAVIOURS) {
            lua_pushnumber(ls, beh);
            return (1);
        }
    }
    return (0);
}
static const struct luaL_reg mons_lib[] =
{
    { "behaviour", mons_behaviour },
    { NULL, NULL }
};
void cluaopen_monsters(lua_State *ls)
{
    luaL_newmetatable(ls, MONS_METATABLE);
    lua_pushstring(ls, "__index");
    lua_pushcfunction(ls, monster_get);
    lua_settable(ls, -3);
    lua_pushstring(ls, "__newindex");
    lua_pushcfunction(ls, monster_set);
    lua_settable(ls, -3);
    // Pop the metatable off the stack.
    lua_pop(ls, 1);
    luaL_openlib(ls, "mons", mons_lib, 0);
}

Insertion in crawl-ref/source/l_libs.h at line 16 [9.2907]
[8.3235]
[3.10679]
```
void cluaopen_monsters(lua_State *ls);
```
Deletion in crawl-ref/source/clua.cc at line 598 [11.483969]
B:BD[10.20174] → [10.20174:20212]
```
void luaopen_monsters(lua_State *ls);
```
Replacement in crawl-ref/source/clua.cc at line 626 [11.483969]
B:BD[10.20436] → [10.20436:20466]
```
    luaopen_monsters(_state);
```
[10.20436]
[11.495232]
```
    cluaopen_monsters(_state);
```

Deletion in crawl-ref/source/clua.cc at line 1707 [11.483969]

∅:D[12.3409] → [11.532380:532582]

B:BD[11.532380] → [11.532380:532582]

B:BD[11.532582] → [13.18692:18914]

∅:D[13.18914] → [11.532582:532583]

B:BD[11.532582] → [11.532582:532583]

B:BD[11.532583] → [13.18915:19348]

B:BD[13.19605] → [13.19605:19617]

∅:D[13.19617] → [11.532655:532657]

B:BD[11.532655] → [11.532655:532657]

B:BD[11.532657] → [13.19618:19687]

∅:D[13.19687] → [11.532815:532818]

B:BD[11.532815] → [11.532815:532818]

B:BD[11.532818] → [13.19688:19885]

B:BD[13.19885] → [14.13060:13099]

B:BD[14.13099] → [15.10019:10106]

∅:D[15.10106] → [14.13200:13204]

B:BD[14.13200] → [14.13200:13204]

B:BD[14.13204] → [15.10107:10164]

∅:D[15.10164] → [14.13261:13263]

B:BD[14.13261] → [14.13261:13263]

B:BD[14.13263] → [16.3194:3255]

B:BD[16.3255] → [15.10165:10197]

∅:D[15.10197] → [14.13345:13482]

B:BD[14.13345] → [14.13345:13482]

B:BD[14.13482] → [15.10198:10597]

∅:D[15.10597] → [14.13482:13507]

B:BD[14.13482] → [14.13482:13507]

∅:D[14.13507] → [13.19885:19929]

B:BD[13.19885] → [13.19885:19929]

∅:D[13.19929] → [11.532887:532889]

B:BD[11.532887] → [11.532887:532889]

B:BD[11.532889] → [13.19930:20295]

∅:D[13.20295] → [11.532960:532963]

B:BD[11.532960] → [11.532960:532963]

B:BD[11.532963] → [13.20296:20341]

∅:D[13.20341] → [11.533032:533034]

B:BD[11.533032] → [11.533032:533034]

B:BD[11.533034] → [13.20342:20399]

∅:D[13.20399] → [11.533105:533108]

B:BD[11.533105] → [11.533105:533108]

B:BD[11.533108] → [17.88560:88582]

∅:D[17.88582] → [11.533130:533355]

B:BD[11.533130] → [11.533130:533355]

B:BD[11.533355] → [13.20400:20429]

B:BD[13.20429] → [14.13508:13537]

B:BD[14.13537] → [15.10598:10627]

∅:D[15.10627] → [13.20429:20505]

∅:D[14.13537] → [13.20429:20505]

B:BD[13.20429] → [13.20429:20505]

∅:D[13.20505] → [11.533355:533862]

B:BD[11.533355] → [11.533355:533862]

B:BD[11.533862] → [18.4720:5181]

}
/////////////////////////////////////////////////////////////////////
// Monster handling
#define MONS_METATABLE "monster.monsaccess"
struct MonsterWrap
{
    monsters *mons;
    long      turn;
};
#define MDEF(name)                                                      \
    static int l_mons_##name(lua_State *ls, monsters *mons,             \
                             const char *attr)                         \
#define MDEFN(name, closure)                    \
    static int l_mons_##name(lua_State *ls, monsters *mons, const char *attrs) \
    {                                                                   \
    lua_pushlightuserdata(ls, mons);                                    \
    lua_pushcclosure(ls, l_mons_do_dismiss, 1);                         \
    return (1);                                                         \
    }
MDEF(name)
{
    PLUARET(string, mons_type_name(mons->type, DESC_PLAIN).c_str());
}
MDEF(x)
{
    PLUARET(number, int(mons->pos().x) - int(you.pos().x));
}
MDEF(y)
{
    PLUARET(number, int(mons->pos().y) - int(you.pos().y));
}
MDEF(hd)
{
    PLUARET(number, mons->hit_dice);
}
static const char *_monuse_names[] =
{
    "nothing", "open_doors", "starting_equipment", "weapons_armour",
    "magic_items"
};
static const char *_monuse_to_str(mon_itemuse_type utyp)
{
    COMPILE_CHECK(ARRAYSZ(_monuse_names) == NUM_MONUSE, c1);
    return _monuse_names[utyp];
}
MDEF(muse)
{
    if (const monsterentry *me = mons->find_monsterentry())
    {
        PLUARET(string, _monuse_to_str(me->gmon_use));
    }
    return (0);
}
static const char *_moneat_names[] =
{
    "nothing", "items", "corpses", "food"
};
static const char *_moneat_to_str(mon_itemeat_type etyp)
{
    COMPILE_CHECK(ARRAYSZ(_moneat_names) == NUM_MONEAT, c1);
    return _moneat_names[etyp];
}
MDEF(meat)
{
    if (const monsterentry *me = mons->find_monsterentry())
    {
        PLUARET(string, _moneat_to_str(me->gmon_eat));
    }
    return (0);
}
static int l_mons_do_dismiss(lua_State *ls)
{
    // dismiss is only callable from dlua, not from managed VMs (i.e.
    // end-user scripts cannot dismiss monsters).
    ASSERT_DLUA;
    monsters *mons =
        util_get_userdata<monsters>(ls, lua_upvalueindex(1));
    if (mons->alive())
    {
        mons->flags |= MF_HARD_RESET;
        monster_die(mons, KILL_DISMISSED, NON_MONSTER);
    }
    return (0);
}
MDEFN(dismiss, do_dismiss)
MDEF(experience)
{
    ASSERT_DLUA;
    PLUARET(number, exper_value(mons));
}
struct MonsAccessor
{
    const char *attribute;
    int (*accessor)(lua_State *ls, monsters *mons, const char *attr);
};
static MonsAccessor mons_attrs[] =
{
    { "name", l_mons_name },
    { "x"   , l_mons_x    },
    { "y"   , l_mons_y    },
    { "hd"  , l_mons_hd   },
    { "muse", l_mons_muse },
    { "meat", l_mons_meat },
    { "dismiss", l_mons_dismiss },
    { "experience", l_mons_experience },
};
static int monster_get(lua_State *ls)
{
    MonsterWrap *mw = clua_get_userdata< MonsterWrap >(ls, MONS_METATABLE);
    if (!mw || mw->turn != you.num_turns || !mw->mons)
        return (0);
    const char *attr = luaL_checkstring(ls, 2);
    if (!attr)
        return (0);
    for (unsigned i = 0; i < sizeof(mons_attrs) / sizeof(mons_attrs[0]); ++i)
    {
        if (!strcmp(attr, mons_attrs[i].attribute))
            return (mons_attrs[i].accessor(ls, mw->mons, attr));
    }
    return (0);
}
static const char *_monster_behaviour_names[] = {
    "sleep",
    "wander",
    "seek",
    "flee",
    "cornered",
    "panic",
    "lurk"
};
static beh_type behaviour_by_name(const std::string &name) {
    ASSERT(ARRAYSZ(_monster_behaviour_names) == NUM_BEHAVIOURS);
    for (unsigned i = 0; i < ARRAYSZ(_monster_behaviour_names); ++i)
        if (name == _monster_behaviour_names[i])
            return static_cast<beh_type>(i);
    return NUM_BEHAVIOURS;

Replacement in crawl-ref/source/clua.cc at line 1709 [11.483969]
∅:D[18.5184] → [11.533915:533955]
B:BD[11.533915] → [11.533915:533955]
B:BD[11.533955] → [18.5185:5300]
```
static int monster_set(lua_State *ls)
{
    // Changing monster behaviour is for the dungeon builder only,
    // never for user scripts.
    ASSERT_DLUA;
```
[18.5184]
[18.5300]
```
// Pushing various objects.
```

Deletion in crawl-ref/source/clua.cc at line 1711 [11.483969]

B:BD[18.5301] → [18.5301:5603]

B:BD[18.5603] → [2.2855:2913]

∅:D[2.2913] → [18.5660:5844]

B:BD[18.5660] → [18.5660:5844]

∅:D[18.5844] → [11.533955:533974]

B:BD[11.533955] → [11.533955:533974]

    MonsterWrap *mw = clua_get_userdata< MonsterWrap >(ls, MONS_METATABLE);
    if (!mw || !mw->mons)
        return (0);
    const char *attr = luaL_checkstring(ls, 2);
    if (!attr)
        return (0);
    if (!strcmp(attr, "beh")) {
        const beh_type beh =
            lua_isnumber(ls, 3) ?
            static_cast<beh_type>(luaL_checkint(ls, 3)) :
            lua_isstring(ls, 3) ? behaviour_by_name(lua_tostring(ls, 3)) :
            NUM_BEHAVIOURS;
        if (beh != NUM_BEHAVIOURS)
            mw->mons->behaviour = beh;
    }
    return (0);
}

Deletion in crawl-ref/source/clua.cc at line 1743 [11.483969]
B:BD[11.534758] → [11.534758:534761]
B:BD[11.534761] → [19.125953:126002]
∅:D[19.126002] → [11.534817:534946]
B:BD[11.534817] → [11.534817:534946]
```
}
void push_monster(lua_State *ls, monsters *mons)
{
    MonsterWrap *mw = clua_new_userdata< MonsterWrap >(ls, MONS_METATABLE);
    mw->turn = you.num_turns;
    mw->mons = mons;
```

Deletion in crawl-ref/source/clua.cc at line 1764 [11.483969]

B:BD[10.20850] → [18.5845:5936]

static int mons_behaviour(lua_State *ls) {
    if (lua_gettop(ls) < 1)
        return (0);

Deletion in crawl-ref/source/clua.cc at line 1765 [11.483969]

B:BD[18.5937] → [18.5937:6366]

∅:D[18.6366] → [10.20850:20887]

B:BD[10.20850] → [10.20850:20887]

∅:D[10.20887] → [11.534987:535299]

B:BD[11.534987] → [11.534987:535299]

B:BD[11.535299] → [18.6367:6411]

∅:D[18.6411] → [11.535299:535301]

B:BD[11.535299] → [11.535299:535301]

∅:D[20.17959] → [11.535301:535302]

B:BD[11.535301] → [11.535301:535302]

    if (lua_isnumber(ls, 1)) {
        lua_pushvalue(ls, 1);
        return (1);
    }
    else if (lua_isstring(ls, 1)) {
        const beh_type beh = behaviour_by_name(lua_tostring(ls, 1));
        if (beh != NUM_BEHAVIOURS) {
            lua_pushnumber(ls, beh);
            return (1);
        }
    }
    return (0);
}
static const struct luaL_reg mons_lib[] =
{
    { "behaviour", mons_behaviour },
    { NULL, NULL }
};
void luaopen_monsters(lua_State *ls)
{
    luaL_newmetatable(ls, MONS_METATABLE);
    lua_pushstring(ls, "__index");
    lua_pushcfunction(ls, monster_get);
    lua_settable(ls, -3);
    lua_pushstring(ls, "__newindex");
    lua_pushcfunction(ls, monster_set);
    lua_settable(ls, -3);
    // Pop the metatable off the stack.
    lua_pop(ls, 1);
    luaL_openlib(ls, "mons", mons_lib, 0);
}

Move monster libraries from clua.cc to l_mons.cc.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/makefile.obj at line 56 [6.79]

File addition: l_mons.cc (----------)

Insertion in crawl-ref/source/l_libs.h at line 16 [9.2907]

Deletion in crawl-ref/source/clua.cc at line 598 [11.483969]

Replacement in crawl-ref/source/clua.cc at line 626 [11.483969]

Deletion in crawl-ref/source/clua.cc at line 1707 [11.483969]

Replacement in crawl-ref/source/clua.cc at line 1709 [11.483969]

Deletion in crawl-ref/source/clua.cc at line 1711 [11.483969]

Deletion in crawl-ref/source/clua.cc at line 1743 [11.483969]

Deletion in crawl-ref/source/clua.cc at line 1764 [11.483969]

Deletion in crawl-ref/source/clua.cc at line 1765 [11.483969]