Moved functions to entity members where appropriate

Some functions were skipped for now because they may need a new name
or change of behavior. Changes:

    chr_warp                        entity:warp
    chr_get_inventory               entity:inventory
    chr_inv_change                  entity:inv_change
    chr_inv_count                   entity:inv_count
    chr_get_equipment               entity:equipment
    chr_equip_slot                  entity:equip_slot
    chr_equip_item                  entity:equip_item
    chr_unequip_slot                entity:unequip_slot
    chr_unequip_item                entity:unequip_item
    chr_get_level                   entity:level
    chr_get_exp                     entity:xp
    chr_give_exp                    entity:give_xp
    chr_get_rights                  entity:rights
    chr_set_hair_style              entity:set_hair_style
    chr_get_hair_style              entity:hair_style
    chr_set_hair_color              entity:set_hair_color
    chr_get_hair_color              entity:hair_color
    chr_get_kill_count              entity:kill_count
    chr_give_special                entity:give_special
    chr_has_special                 entity:has_special
    chr_take_special                entity:take_special
    chr_set_special_recharge_speed  entity:set_special_recharge_speed
    chr_get_special_recharge_speed  entity:special_recharge_speed
    chr_set_special_mana            entity:set_special_mana
    chr_get_special_mana            entity:special_mana
    chr_kick                        entity:kick
    exp_for_level                   xp_for_level
    monster_get_id                  entity:monster_id
    monster_change_anger            entity:change_anger
    monster_drop_anger              entity:drop_anger
    monster_get_angerlist           entity:angerlist
    being_apply_status              entity:apply_status
    being_remove_status             entity:remove_status
    being_has_status                entity:has_status
    being_set_status_time           entity:set_status_time
    being_get_status_time           entity:status_time
    being_get_gender                entity:gender
    being_set_gender                entity:set_gender
    being_type                      entity:type
    being_walk                      entity:walk
    being_say                       entity:say
    being_damage                    entity:damage
    being_heal                      entity:heal
    being_get_name                  entity:name
    being_get_action                entity:action
    being_set_action                entity:set_action
    being_get_direction             entity:direction
    being_set_direction             entity:set_direction
    being_apply_attribute_modifier  entity:apply_attribute_modifier
    being_remove_attribute_modifier entity:remove_attribute_modifier
    being_set_base_attribute        entity:set_base_attribute
    being_get_modified_attribute    entity:modified_attribute
    being_get_base_attribute        entity:base_attribute
    being_set_walkmask              entity:set_walkmask
    being_get_walkmask              entity:walkmask
    being_get_mapid                 entity:mapid
    chat_message                    entity:message
    being_register                  entity:register
    chr_shake_screen                entity:shake_screen
    chr_create_text_particle        entity:show_text_particle
    -                               entity:position
    posX                            entity:x
    posY                            entity:y
    monster_get_name                monsterclass:name
    item_get_name                   itemclass:name

1 files changed, 4 insertions, 4 deletions

diff --git a/example/scripts/npcs/merchant.lua b/example/scripts/npcs/merchant.lua
index 185ce342..89882da7 100644
--- a/example/scripts/npcs/merchant.lua
+++ b/example/scripts/npcs/merchant.lua
@@ -18,11 +18,11 @@ function Merchant(npc, ch, buy_sell_table)
     -- buy_sell_table[1] will corresponds to the first table (used to list
     -- boughtable items, and buy_sell_table[2] listing sellable items.
 
-    local rights = chr_get_rights(ch);
+    local rights = ch:rights()
 
     if (rights >= 128) then
-        announce(being_get_name(ch) .. " the big administrator was at my shop!",
-                 being_get_name(npc))
+        announce(ch:name() .. " the big administrator was at my shop!",
+                 npc:name())
         say "Oh mighty server administrator, how can I avoid your wrath?"
     elseif (rights >= 8) then
         say "How can I be of assistance, sir gamemaster?"
@@ -31,7 +31,7 @@ function Merchant(npc, ch, buy_sell_table)
     elseif (rights >= 2) then
         say "How can I assist you in your testing duties?"
     elseif (rights >= 1) then
-        if being_get_gender(ch) == GENDER_FEMALE then
+        if ch:gender() == GENDER_FEMALE then
             say "What do you want, Madam?"
         else
             say "What do you want, Sir?"