fiddlerwoaroof/crawl - Change WNC5SY6P2PBCU62Q2DB5J2M4HPDS5EJY76ZEPHRGGCLJ4BSLBSSQC

Move clua you_lib to l_you.cc.

Also remove you.pos() from clua since grid coordinates aren't supposed to be known to the user.

Created by Robert Vollmert on October 20, 2009

WNC5SY6P2PBCU62Q2DB5J2M4HPDS5EJY76ZEPHRGGCLJ4BSLBSSQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/l_you.cc at line 6 [5.2866]

[5.2927]

#include "abl-show.h"
#include "chardump.h"
#include "delay.h"
#include "food.h"
#include "initfile.h"

Insertion in crawl-ref/source/l_you.cc at line 12 [5.2866]

[5.2944]

#include "mon-util.h"
#include "newgame.h"
#include "player.h"
#include "religion.h"
#include "skills2.h"

Insertion in crawl-ref/source/l_you.cc at line 18 [5.2866]

[5.2965]

#include "spl-util.h"
#include "transfor.h"
/////////////////////////////////////////////////////////////////////
// Bindings to get information on the player (clua).
//
static const char *transform_name()
{
    switch (you.attribute[ATTR_TRANSFORMATION])
    {
    case TRAN_SPIDER:
        return "spider";
    case TRAN_BAT:
        return "bat";
    case TRAN_BLADE_HANDS:
        return "blade";
    case TRAN_STATUE:
        return "statue";
    case TRAN_ICE_BEAST:
        return "ice";
    case TRAN_DRAGON:
        return "dragon";
    case TRAN_LICH:
        return "lich";
    case TRAN_PIG:
        return "pig";
    default:
        return "";
    }
}
LUARET1(you_turn_is_over, boolean, you.turn_is_over)
LUARET1(you_name, string, you.your_name)
LUARET1(you_race, string,
        species_name(you.species, you.experience_level).c_str())
LUARET1(you_class, string, get_class_name(you.char_class))
LUARET1(you_god, string, god_name(you.religion).c_str())
LUARET1(you_good_god, boolean,
        lua_isstring(ls, 1) ? is_good_god(str_to_god(lua_tostring(ls, 1)))
        : is_good_god(you.religion))
LUARET1(you_evil_god, boolean,
        lua_isstring(ls, 1) ? is_evil_god(str_to_god(lua_tostring(ls, 1)))
        : is_evil_god(you.religion))
LUARET1(you_god_likes_fresh_corpses, boolean,
        lua_isstring(ls, 1) ?
        god_likes_fresh_corpses(str_to_god(lua_tostring(ls, 1))) :
        god_likes_fresh_corpses(you.religion))
LUARET1(you_god_likes_butchery, boolean,
        lua_isstring(ls, 1) ?
        god_likes_butchery(str_to_god(lua_tostring(ls, 1))) :
        god_likes_butchery(you.religion))
LUARET2(you_hp, number, you.hp, you.hp_max)
LUARET2(you_mp, number, you.magic_points, you.max_magic_points)
LUARET1(you_hunger, string, hunger_level())
LUARET2(you_strength, number, you.strength, you.max_strength)
LUARET2(you_intelligence, number, you.intel, you.max_intel)
LUARET2(you_dexterity, number, you.dex, you.max_dex)
LUARET1(you_exp, number, you.experience_level)
LUARET1(you_exp_points, number, you.experience)
LUARET1(you_skill, number,
        lua_isstring(ls, 1) ? you.skills[str_to_skill(lua_tostring(ls, 1))]
                            : 0)
LUARET1(you_res_poison, number, player_res_poison(false))
LUARET1(you_res_fire, number, player_res_fire(false))
LUARET1(you_res_cold, number, player_res_cold(false))
LUARET1(you_res_draining, number, player_prot_life(false))
LUARET1(you_res_shock, number, player_res_electricity(false))
LUARET1(you_res_statdrain, number, player_sust_abil(false))
LUARET1(you_res_mutation, number, wearing_amulet(AMU_RESIST_MUTATION, false))
LUARET1(you_res_slowing, number, wearing_amulet(AMU_RESIST_SLOW, false))
LUARET1(you_gourmand, boolean, wearing_amulet(AMU_THE_GOURMAND, false))
LUARET1(you_saprovorous, number, player_mutation_level(MUT_SAPROVOROUS))
LUARET1(you_levitating, boolean, you.flight_mode() == FL_LEVITATE)
LUARET1(you_flying, boolean, you.flight_mode() == FL_FLY)
LUARET1(you_transform, string, transform_name())
LUARET1(you_where, string, level_id::current().describe().c_str())
LUARET1(you_branch, string, level_id::current().describe(false, false).c_str())
LUARET1(you_subdepth, number, level_id::current().depth)
// Increase by 1 because check happens on old level.
LUARET1(you_absdepth, number, you.your_level + 1)
LUAWRAP(you_stop_activity, interrupt_activity(AI_FORCE_INTERRUPT))
LUARET1(you_taking_stairs, boolean,
        current_delay_action() == DELAY_ASCENDING_STAIRS
        || current_delay_action() == DELAY_DESCENDING_STAIRS)
LUARET1(you_turns, number, you.num_turns)
LUARET1(you_can_smell, boolean, player_can_smell())
LUARET1(you_has_claws, number, you.has_claws(false))
static int _you_uniques(lua_State *ls)
{
    ASSERT_DLUA;
    bool unique_found = false;
    if (lua_gettop(ls) >= 1 && lua_isstring(ls, 1))
        unique_found = you.unique_creatures[get_monster_by_name(lua_tostring(ls, 1))];
    lua_pushboolean(ls, unique_found);
    return (1);
}
static int _you_gold(lua_State *ls)
{
    if (lua_gettop(ls) >= 1)
    {
        ASSERT_DLUA;
        const int new_gold = luaL_checkint(ls, 1);
        const int old_gold = you.gold;
        you.gold = std::max(new_gold, 0);
        if (new_gold > old_gold)
            you.attribute[ATTR_GOLD_FOUND] += new_gold - old_gold;
        else if (old_gold > new_gold)
            you.attribute[ATTR_MISC_SPENDING] += old_gold - new_gold;
    }
    PLUARET(number, you.gold);
}
void lua_push_floor_items(lua_State *ls);
static int you_floor_items(lua_State *ls)
{
    lua_push_floor_items(ls);
    return (1);
}
static int l_you_spells(lua_State *ls)
{
    lua_newtable(ls);
    int index = 0;
    for (int i = 0; i < 52; ++i)
    {
        const spell_type spell = get_spell_by_letter( index_to_letter(i) );
        if (spell == SPELL_NO_SPELL)
            continue;
        lua_pushstring(ls, spell_title(spell));
        lua_rawseti(ls, -2, ++index);
    }
    return (1);
}
static int l_you_abils(lua_State *ls)
{
    lua_newtable(ls);
    std::vector<const char *>abils = get_ability_names();
    for (int i = 0, size = abils.size(); i < size; ++i)
    {
        lua_pushstring(ls, abils[i]);
        lua_rawseti(ls, -2, i + 1);
    }
    return (1);
}
static int you_can_consume_corpses(lua_State *ls)
{
    lua_pushboolean(ls,
                    can_ingest(OBJ_FOOD, FOOD_CHUNK, true, false, false)
                    || can_ingest(OBJ_CORPSES, CORPSE_BODY, true, false, false)
                    );
    return (1);
}

Insertion in crawl-ref/source/l_you.cc at line 181 [5.2866]

[5.2966]

static const struct luaL_reg you_clib[] =
{
    { "turn_is_over", you_turn_is_over },
    { "turns"       , you_turns },
    { "spells"      , l_you_spells },
    { "abilities"   , l_you_abils },
    { "name"        , you_name },
    { "race"        , you_race },
    { "class"       , you_class },
    { "god"         , you_god },
    { "gold"        , _you_gold },
    { "good_god"    , you_good_god },
    { "evil_god"    , you_evil_god },
    { "hp"          , you_hp },
    { "mp"          , you_mp },
    { "hunger"      , you_hunger },
    { "strength"    , you_strength },
    { "intelligence", you_intelligence },
    { "dexterity"   , you_dexterity },
    { "skill"       , you_skill },
    { "uniques"     , _you_uniques },
    { "xl"          , you_exp },
    { "exp"         , you_exp_points },
    { "res_poison"  , you_res_poison },
    { "res_fire"    , you_res_fire   },
    { "res_cold"    , you_res_cold   },
    { "res_draining", you_res_draining },
    { "res_shock"   , you_res_shock },
    { "res_statdrain", you_res_statdrain },
    { "res_mutation", you_res_mutation },
    { "res_slowing",  you_res_slowing },
    { "saprovorous",  you_saprovorous },
    { "gourmand",     you_gourmand },
    { "levitating",   you_levitating },
    { "flying",       you_flying },
    { "transform",    you_transform },
    { "god_likes_fresh_corpses",  you_god_likes_fresh_corpses },
    { "god_likes_butchery",       you_god_likes_butchery },
    { "can_consume_corpses",      you_can_consume_corpses },
    { "stop_activity", you_stop_activity },
    { "taking_stairs", you_taking_stairs },
    { "floor_items",  you_floor_items },
    { "where",        you_where },
    { "branch",       you_branch },
    { "subdepth",     you_subdepth },
    { "absdepth",     you_absdepth },
    { "can_smell",         you_can_smell },
    { "has_claws",         you_has_claws },
    { NULL, NULL },
};
void cluaopen_you(lua_State *ls)
{
    luaL_openlib(ls, "you", you_clib, 0);
}
/////////////////////////////////////////////////////////////////////
// Player information (dlua). Grid coordinates etc.
//

Insertion in crawl-ref/source/l_libs.h at line 16 [6.2907]
[4.3235]
[4.3235]
```
void cluaopen_you(lua_State *ls);
```
Deletion in crawl-ref/source/clua.cc at line 594 [7.483969]
B:BD[7.494783] → [8.19967:20000]
```
void luaopen_you(lua_State *ls);
```
Replacement in crawl-ref/source/clua.cc at line 622 [7.483969]
B:BD[8.20277] → [8.20277:20302]
```
    luaopen_you(_state);
```
[8.20277]
[8.20302]
```
    cluaopen_you(_state);
```

Deletion in crawl-ref/source/clua.cc at line 730 [7.483969]

B:BD[7.498173] → [7.498173:498361]

B:BD[7.498361] → [9.25508:25549]

∅:D[9.25549] → [7.498361:498596]

B:BD[7.498361] → [7.498361:498596]

B:BD[7.498596] → [10.8702:8743]

∅:D[10.8743] → [7.498694:498829]

B:BD[7.498694] → [7.498694:498829]

B:BD[7.498829] → [11.4262:4353]

∅:D[11.4353] → [7.498904:498963]

B:BD[7.498904] → [7.498904:498963]

B:BD[7.498963] → [12.6085:6142]

∅:D[12.6142] → [13.491:777]

B:BD[14.671] → [13.491:777]

B:BD[13.777] → [2.9641:9831]

∅:D[2.9831] → [15.2752:2927]

B:BD[13.777] → [15.2752:2927]

∅:D[14.671] → [7.498963:499071]

∅:D[13.777] → [7.498963:499071]

∅:D[15.2927] → [7.498963:499071]

B:BD[7.498963] → [7.498963:499071]

B:BD[7.499071] → [16.101940:101991]

∅:D[17.3021] → [7.499071:499385]

∅:D[16.101991] → [7.499071:499385]

B:BD[7.499071] → [7.499071:499385]

B:BD[7.499385] → [18.361:464]

B:BD[18.464] → [19.17747:17780]

∅:D[18.477] → [7.499385:499955]

∅:D[20.3328] → [7.499385:499955]

∅:D[19.17780] → [7.499385:499955]

B:BD[7.499385] → [7.499385:499955]

B:BD[7.499955] → [21.34522:34595]

∅:D[21.34595] → [22.2914:3039]

B:BD[23.7369] → [22.2914:3039]

∅:D[24.912] → [7.500165:500214]

∅:D[22.3039] → [7.500165:500214]

B:BD[7.500165] → [7.500165:500214]

B:BD[7.500214] → [25.3982:4049]

B:BD[25.4049] → [26.1827:1964]

B:BD[26.1964] → [19.17781:17834]

∅:D[19.17834] → [27.972:1022]

B:BD[26.1964] → [27.972:1022]

∅:D[27.1022] → [7.500214:500281]

∅:D[26.2010] → [7.500214:500281]

∅:D[25.4049] → [7.500214:500281]

B:BD[7.500214] → [7.500214:500281]

B:BD[7.500281] → [17.3022:3177]

∅:D[17.3177] → [28.36742:36784]

B:BD[7.500281] → [28.36742:36784]

B:BD[29.16971] → [30.2401:2453]

B:BD[30.2453] → [15.2928:2981]

B:BD[15.2981] → [3.3208:3497]

∅:D[15.2981] → [7.500281:500282]

∅:D[3.3497] → [7.500281:500282]

∅:D[31.3948] → [7.500281:500282]

∅:D[28.36877] → [7.500281:500282]

B:BD[7.500281] → [7.500281:500282]

B:BD[7.500282] → [32.7178:7323]

B:BD[32.7323] → [33.3685:3724]

∅:D[33.3724] → [32.7323:7365]

B:BD[32.7323] → [32.7323:7365]

B:BD[32.7397] → [33.3725:3933]

∅:D[33.3933] → [32.7397:7437]

B:BD[32.7397] → [32.7397:7437]

∅:D[32.7437] → [7.500282:500538]

B:BD[7.500282] → [7.500282:500538]

B:BD[7.500538] → [34.53778:53854]

∅:D[34.53854] → [7.500607:501041]

B:BD[7.500607] → [7.500607:501041]

B:BD[7.501041] → [15.2982:3253]

∅:D[15.3253] → [7.501041:501145]

B:BD[7.501041] → [7.501041:501145]

B:BD[7.501145] → [28.36878:36913]

∅:D[28.36913] → [7.501145:501323]

B:BD[7.501145] → [7.501145:501323]

B:BD[7.501323] → [14.672:705]

B:BD[14.705] → [32.7438:7473]

∅:D[32.7473] → [13.778:854]

B:BD[14.705] → [13.778:854]

∅:D[14.705] → [7.501323:501387]

∅:D[13.854] → [7.501323:501387]

B:BD[7.501323] → [7.501323:501387]

B:BD[7.501387] → [17.3178:3211]

∅:D[17.3211] → [7.501387:501542]

B:BD[7.501387] → [7.501387:501542]

B:BD[7.501542] → [18.478:513]

B:BD[18.513] → [3.3498:3536]

∅:D[18.513] → [26.2011:2084]

∅:D[20.3366] → [26.2011:2084]

∅:D[3.3536] → [26.2011:2084]

B:BD[7.501542] → [26.2011:2084]

B:BD[7.501616] → [7.501616:501944]

B:BD[7.501944] → [23.7370:7411]

∅:D[23.7411] → [7.501944:502098]

B:BD[7.501944] → [7.501944:502098]

B:BD[7.502098] → [2.9832:10018]

∅:D[2.10018] → [15.3366:3367]

B:BD[15.3366] → [15.3366:3367]

∅:D[15.3367] → [7.502098:502142]

B:BD[7.502098] → [7.502098:502142]

B:BD[7.502142] → [17.3212:3256]

∅:D[17.3256] → [7.502142:502184]

B:BD[7.502142] → [7.502142:502184]

B:BD[7.502184] → [25.4050:4051]

B:BD[25.4051] → [26.2085:2232]

B:BD[26.2232] → [28.36914:36915]

B:BD[29.17067] → [30.2454:2498]

B:BD[30.2498] → [15.3368:3412]

∅:D[30.2498] → [35.483:484]

∅:D[15.3412] → [35.483:484]

B:BD[29.17067] → [35.483:484]

∅:D[35.567] → [7.502184:502208]

∅:D[26.2232] → [7.502184:502208]

∅:D[25.4079] → [7.502184:502208]

∅:D[28.36958] → [7.502184:502208]

B:BD[7.502184] → [7.502184:502208]

B:BD[7.502208] → [8.20497:20529]

∅:D[8.20529] → [7.502241:502357]

B:BD[7.502241] → [7.502241:502357]

// Bindings to get information on the player
//
static const char *transform_name()
{
    switch (you.attribute[ATTR_TRANSFORMATION])
    {
    case TRAN_SPIDER:
        return "spider";
    case TRAN_BAT:
        return "bat";
    case TRAN_BLADE_HANDS:
        return "blade";
    case TRAN_STATUE:
        return "statue";
    case TRAN_ICE_BEAST:
        return "ice";
    case TRAN_DRAGON:
        return "dragon";
    case TRAN_LICH:
        return "lich";
    case TRAN_PIG:
        return "pig";
    default:
        return "";
    }
}
LUARET1(you_turn_is_over, boolean, you.turn_is_over)
LUARET1(you_name, string, you.your_name)
LUARET1(you_race, string,
        species_name(you.species, you.experience_level).c_str())
LUARET1(you_class, string, get_class_name(you.char_class))
LUARET1(you_god, string, god_name(you.religion).c_str())
LUARET1(you_good_god, boolean,
        lua_isstring(ls, 1) ? is_good_god(str_to_god(lua_tostring(ls, 1)))
        : is_good_god(you.religion))
LUARET1(you_evil_god, boolean,
        lua_isstring(ls, 1) ? is_evil_god(str_to_god(lua_tostring(ls, 1)))
        : is_evil_god(you.religion))
LUARET1(you_god_likes_fresh_corpses, boolean,
        lua_isstring(ls, 1) ?
        god_likes_fresh_corpses(str_to_god(lua_tostring(ls, 1))) :
        god_likes_fresh_corpses(you.religion))
LUARET1(you_god_likes_butchery, boolean,
        lua_isstring(ls, 1) ?
        god_likes_butchery(str_to_god(lua_tostring(ls, 1))) :
        god_likes_butchery(you.religion))
LUARET2(you_hp, number, you.hp, you.hp_max)
LUARET2(you_mp, number, you.magic_points, you.max_magic_points)
LUARET2(you_pos, number, you.pos().x, you.pos().y)
LUARET1(you_hunger, string, hunger_level())
LUARET2(you_strength, number, you.strength, you.max_strength)
LUARET2(you_intelligence, number, you.intel, you.max_intel)
LUARET2(you_dexterity, number, you.dex, you.max_dex)
LUARET1(you_exp, number, you.experience_level)
LUARET1(you_exp_points, number, you.experience)
LUARET1(you_skill, number,
        lua_isstring(ls, 1) ? you.skills[str_to_skill(lua_tostring(ls, 1))]
                            : 0)
LUARET1(you_res_poison, number, player_res_poison(false))
LUARET1(you_res_fire, number, player_res_fire(false))
LUARET1(you_res_cold, number, player_res_cold(false))
LUARET1(you_res_draining, number, player_prot_life(false))
LUARET1(you_res_shock, number, player_res_electricity(false))
LUARET1(you_res_statdrain, number, player_sust_abil(false))
LUARET1(you_res_mutation, number, wearing_amulet(AMU_RESIST_MUTATION, false))
LUARET1(you_res_slowing, number, wearing_amulet(AMU_RESIST_SLOW, false))
LUARET1(you_gourmand, boolean, wearing_amulet(AMU_THE_GOURMAND, false))
LUARET1(you_saprovorous, number, player_mutation_level(MUT_SAPROVOROUS))
LUARET1(you_levitating, boolean, you.flight_mode() == FL_LEVITATE)
LUARET1(you_flying, boolean, you.flight_mode() == FL_FLY)
LUARET1(you_transform, string, transform_name())
LUARET1(you_where, string, level_id::current().describe().c_str())
LUARET1(you_branch, string, level_id::current().describe(false, false).c_str())
LUARET1(you_subdepth, number, level_id::current().depth)
// Increase by 1 because check happens on old level.
LUARET1(you_absdepth, number, you.your_level + 1)
LUAWRAP(you_stop_activity, interrupt_activity(AI_FORCE_INTERRUPT))
LUARET1(you_taking_stairs, boolean,
        current_delay_action() == DELAY_ASCENDING_STAIRS
        || current_delay_action() == DELAY_DESCENDING_STAIRS)
LUARET1(you_turns, number, you.num_turns)
LUARET1(you_can_smell, boolean, player_can_smell())
LUARET1(you_has_claws, number, you.has_claws(false))
static int _you_uniques(lua_State *ls)
{
    ASSERT_DLUA;
    bool unique_found = false;
    if (lua_gettop(ls) >= 1 && lua_isstring(ls, 1))
        unique_found = you.unique_creatures[get_monster_by_name(lua_tostring(ls, 1))];
    lua_pushboolean(ls, unique_found);
    return (1);
}
static int _you_gold(lua_State *ls)
{
    if (lua_gettop(ls) >= 1)
    {
        ASSERT_DLUA;
        const int new_gold = luaL_checkint(ls, 1);
        const int old_gold = you.gold;
        you.gold = std::max(new_gold, 0);
        if (new_gold > old_gold)
            you.attribute[ATTR_GOLD_FOUND] += new_gold - old_gold;
        else if (old_gold > new_gold)
            you.attribute[ATTR_MISC_SPENDING] += old_gold - new_gold;
    }
    PLUARET(number, you.gold);
}
void lua_push_floor_items(lua_State *ls);
static int you_floor_items(lua_State *ls)
{
    lua_push_floor_items(ls);
    return (1);
}
static int l_you_spells(lua_State *ls)
{
    lua_newtable(ls);
    int index = 0;
    for (int i = 0; i < 52; ++i)
    {
        const spell_type spell = get_spell_by_letter( index_to_letter(i) );
        if (spell == SPELL_NO_SPELL)
            continue;
        lua_pushstring(ls, spell_title(spell));
        lua_rawseti(ls, -2, ++index);
    }
    return (1);
}
static int l_you_abils(lua_State *ls)
{
    lua_newtable(ls);
    std::vector<const char *>abils = get_ability_names();
    for (int i = 0, size = abils.size(); i < size; ++i)
    {
        lua_pushstring(ls, abils[i]);
        lua_rawseti(ls, -2, i + 1);
    }
    return (1);
}
static int you_can_consume_corpses(lua_State *ls)
{
    lua_pushboolean(ls,
                    can_ingest(OBJ_FOOD, FOOD_CHUNK, true, false, false)
                    || can_ingest(OBJ_CORPSES, CORPSE_BODY, true, false, false)
                    );
    return (1);
}
static const struct luaL_reg you_lib[] =
{
    { "turn_is_over", you_turn_is_over },
    { "turns"       , you_turns },
    { "spells"      , l_you_spells },
    { "abilities"   , l_you_abils },
    { "name"        , you_name },
    { "race"        , you_race },
    { "class"       , you_class },
    { "god"         , you_god },
    { "gold"        , _you_gold },
    { "good_god"    , you_good_god },
    { "evil_god"    , you_evil_god },
    { "hp"          , you_hp },
    { "mp"          , you_mp },
    { "pos"         , you_pos },
    { "hunger"      , you_hunger },
    { "strength"    , you_strength },
    { "intelligence", you_intelligence },
    { "dexterity"   , you_dexterity },
    { "skill"       , you_skill },
    { "uniques"     , _you_uniques },
    { "xl"          , you_exp },
    { "exp"         , you_exp_points },
    { "res_poison"  , you_res_poison },
    { "res_fire"    , you_res_fire   },
    { "res_cold"    , you_res_cold   },
    { "res_draining", you_res_draining },
    { "res_shock"   , you_res_shock },
    { "res_statdrain", you_res_statdrain },
    { "res_mutation", you_res_mutation },
    { "res_slowing",  you_res_slowing },
    { "saprovorous",  you_saprovorous },
    { "gourmand",     you_gourmand },
    { "levitating",   you_levitating },
    { "flying",       you_flying },
    { "transform",    you_transform },
    { "god_likes_fresh_corpses",  you_god_likes_fresh_corpses },
    { "god_likes_butchery",       you_god_likes_butchery },
    { "can_consume_corpses",      you_can_consume_corpses },
    { "stop_activity", you_stop_activity },
    { "taking_stairs", you_taking_stairs },
    { "floor_items",  you_floor_items },
    { "where",        you_where },
    { "branch",       you_branch },
    { "subdepth",     you_subdepth },
    { "absdepth",     you_absdepth },
    { "can_smell",         you_can_smell },
    { "has_claws",         you_has_claws },
    { NULL, NULL },
};
void luaopen_you(lua_State *ls)
{
    luaL_openlib(ls, "you", you_lib, 0);
}
/////////////////////////////////////////////////////////////////////