From ef4175cdfae6a6981738e15cb0009d8e47ed7c80 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Mon, 15 Apr 2013 21:24:55 +0200 Subject: 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 --- example/scripts/status/jump.lua | 16 ++++++++-------- example/scripts/status/plague.lua | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'example/scripts/status') diff --git a/example/scripts/status/jump.lua b/example/scripts/status/jump.lua index 9dc01951..d28c290f 100644 --- a/example/scripts/status/jump.lua +++ b/example/scripts/status/jump.lua @@ -14,16 +14,16 @@ local function tick(target, ticknumber) if (ticknumber % 10 == 0) then - being_say(target, "I have the jumping bug!") + target:say("I have the jumping bug!") end - if (being_get_status_time(target, 2) < 2000) then - being_set_status_time(target, 2, 6000) + if (target:status_time(2) < 2000) then + target:set_status_time(2, 6000) end if (ticknumber % 50 ~= 0) then return end - local victims = get_beings_in_circle(posX(target), posY(target), 64) + local victims = get_beings_in_circle(target, 64) local count = #victims if i == 0 then return end @@ -40,16 +40,16 @@ local function tick(target, ticknumber) victim = nil i = -1 else - i = being_type(victim) + i = victim:type() end until (i == TYPE_MONSTER or i == TYPE_CHARACTER or remaining == 0) if (victim == nil) then return end - being_remove_status(target, 2) + target:remove_status(2) - being_apply_status(victim, 2, 6000) - being_say(victim, "Now I have the jumping bug") + victim:apply_status(2, 6000) + victim:say("Now I have the jumping bug") end get_status_effect("jumping status"):on_tick(tick) diff --git a/example/scripts/status/plague.lua b/example/scripts/status/plague.lua index 2f6a5f6c..e22a77ab 100644 --- a/example/scripts/status/plague.lua +++ b/example/scripts/status/plague.lua @@ -14,14 +14,14 @@ local function tick(target, ticknumber) if (ticknumber % 10 == 0) then - being_say(target, "I have the plague! :( = " .. ticknumber) + target:say("I have the plague! :( = " .. ticknumber) end - local victims = get_beings_in_circle(posX(target), posY(target), 64) + local victims = get_beings_in_circle(target, 64) local i = 1 while (victims[i]) do - if (being_has_status(victims[i], 1) == false) then - being_apply_status(victims[i], 1, 6000) - being_say(victims[i], "I don't feel so good") + if (victims[i]:has_status(1) == false) then + victims[i]:apply_status(1, 6000) + victims[i]:say("I don't feel so good") end i = i + 1 end -- cgit v1.2.3-70-g09d2