Sancaros/egs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egs_game: Handle object_healing_pad_tick for the player's character.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-09-24 02:33:22 +02:00
parent 1a6b9549a3
commit f5e32c4460
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/egs_game.erl
View File

@ -585,6 +585,20 @@ event({object_goggle_target_activate, ObjectID}, #state{gid=GID}) ->
psu_game:send_1205(EventID, BlockID, 0),
psu_game:send_1213(ObjectID, 8);
%% @todo Make NPC characters heal too.
event({object_healing_pad_tick, [_PartyPos]}, State=#state{gid=GID}) ->
{ok, User} = egs_user_model:read(GID),
Character = User#egs_user_model.character,
if Character#characters.currenthp =:= Character#characters.maxhp -> ignore;
true ->
NewHP = Character#characters.currenthp + Character#characters.maxhp div 10,
NewHP2 = if NewHP > Character#characters.maxhp -> Character#characters.maxhp; true -> NewHP end,
User2 = User#egs_user_model{character=Character#characters{currenthp=NewHP2}},
egs_user_model:write(User2),
psu_proto:send_0117(User2#egs_user_model{lid=0}, State),
psu_proto:send_0111(User2#egs_user_model{lid=0}, 4, State)
end;
event({object_key_console_enable, ObjectID}, #state{gid=GID}) ->
{ok, User} = egs_user_model:read(GID),
{BlockID, [EventID|_]} = psu_instance:std_event(User#egs_user_model.instancepid, (User#egs_user_model.area)#psu_area.zoneid, ObjectID),

13
src/psu/psu_proto.erl
View File

@ -838,7 +838,7 @@ parse(Size, 16#0f0a, Channel, Data) ->
<< _LID:16/little, VarA:16/little, VarB:32/little, VarC:32/little, VarD:32/little, VarE:32/little,
VarF:32/little, VarG:32/little, VarH:32/little, VarI:32/little, BlockID:16/little, ListNb:16/little,
ObjectNb:16/little, _MapID:16/little, ObjectID:16/little, VarJ:16/little, ObjectTargetID:32/little,
ObjectType:16/little, VarK:16/little, ObjectBaseTargetID:16/little, VarL:16/little, _PartyPosOrLID:32/little,
ObjectType:16/little, VarK:16/little, ObjectBaseTargetID:16/little, VarL:16/little, PartyPosOrLID:32/little,
VarN:32/little, VarO:32/little, VarP:32/little, VarQ:32/little, VarR:32/little, VarS:32/little,
VarT:32/little, VarU:32/little, ObjectType2:16/little, EventID:8, VarV:8, VarW:32/little >> = Data,
?ASSERT_EQ(Size, 112),
@ -965,6 +965,17 @@ parse(Size, 16#0f0a, Channel, Data) ->
?ASSERT_EQ(VarV, 1),
?ASSERT_EQ(VarW, 0),
{object_crystal_activate, ObjectID};
[50, 9] ->
%% @todo Make NPC characters be healed too. This would use VarN and VarO as PartyPosOrLID, and VarV would be > 1.
?ASSERT_EQ(VarJ, 134),
?ASSERT_EQ(ObjectTargetID, 16#ffffffff),
?ASSERT_EQ(ObjectBaseTargetID, 16#ffff),
?ASSERT_EQ(VarL, 116),
?ASSERT_EQ(VarN, 16#ffffffff),
?ASSERT_EQ(VarO, 16#ffffffff),
?ASSERT_EQ(VarV, 1),
?ASSERT_EQ(VarW, 0),
{object_healing_pad_tick, [PartyPosOrLID]};
[51, 1] ->
?ASSERT_EQ(VarL, 116),
?ASSERT_EQ(ObjectTargetID, VarN),