Remove #characters and merge the data into #users directly.
This commit is contained in:
Loïc Hoguin
parent
3290aba95d
commit
a1bf3e43f3
@ -50,7 +50,29 @@
|
||||
lid = 16#ffff :: 0..16#ffff,
|
||||
pid :: pid(),
|
||||
time :: integer(),
|
||||
character :: tuple(), %% @todo Details.
|
||||
%% Character information.
|
||||
%% @todo Specs it.
|
||||
type = white,
|
||||
slot,
|
||||
npcid = 16#ffff,
|
||||
name,
|
||||
race,
|
||||
gender,
|
||||
class,
|
||||
mainlevel = {level, 1, 0},
|
||||
classlevels,
|
||||
currenthp = 100,
|
||||
maxhp = 100,
|
||||
stats = {stats, 1000, 2000, 3000, 4000, 5000, 6000, 7000},
|
||||
se = [],
|
||||
money = 1000000,
|
||||
blastbar = 0,
|
||||
luck = 3,
|
||||
playtime = 0,
|
||||
appearance,
|
||||
onlinestatus = 0,
|
||||
options = {options, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0},
|
||||
inventory = [],
|
||||
%% Location/state related information.
|
||||
uni :: integer(),
|
||||
questpid :: pid(),
|
||||
@ -115,34 +137,6 @@
|
||||
cutindisplay, mainmenucursorposition, camera3y, camera3x, camera1y, camera1x, controller, weaponswap,
|
||||
lockon, brightness, functionkeysetting, buttondetaildisplay}).
|
||||
|
||||
%% @doc Characters data structure.
|
||||
%% @todo Make a disk table for storing characters permanently. Also keep the current character in #users.
|
||||
|
||||
-record(characters, {
|
||||
gid,
|
||||
type=white,
|
||||
slot,
|
||||
npcid=16#ffff,
|
||||
name,
|
||||
race,
|
||||
gender,
|
||||
class,
|
||||
mainlevel={level, 1, 0},
|
||||
classlevels,
|
||||
currenthp=100,
|
||||
maxhp=100,
|
||||
stats={stats, 1000, 2000, 3000, 4000, 5000, 6000, 7000},
|
||||
se=[],
|
||||
money=1000000,
|
||||
blastbar=0,
|
||||
luck=3,
|
||||
playtime=0,
|
||||
appearance,
|
||||
onlinestatus=0,
|
||||
options={options, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0},
|
||||
inventory=[]
|
||||
}). % also: shortcuts partnercards blacklist npcs flags...
|
||||
|
||||
%% @doc Hit response data.
|
||||
|
||||
-record(hit_response, {type, user, exp, damage, targethp, targetse, events}).
|
||||
|
||||
@ -75,10 +75,10 @@ event({char_select_enter, Slot, _BackToPreviousField}, Client=#client{gid=GID})
|
||||
Class = psu_characters:class_binary_to_atom(ClassBin),
|
||||
Appearance = psu_appearance:binary_to_tuple(Race, AppearanceBin),
|
||||
Options = psu_characters:options_binary_to_tuple(OptionsBin),
|
||||
Character = #characters{slot=Slot, name=Name, race=Race, gender=Gender, class=Class, appearance=Appearance, options=Options}, % TODO: temporary set the slot here, won't be needed later
|
||||
UniID = egs_universes:defaultid(),
|
||||
egs_universes:enter(UniID),
|
||||
User = #users{gid=GID, pid=self(), uni=UniID, character=Character, area={1100000, 0, 4}, entryid=0},
|
||||
User = #users{gid=GID, pid=self(), uni=UniID, slot=Slot, name=Name, race=Race, gender=Gender,
|
||||
class=Class, appearance=Appearance, options=Options, area={1100000, 0, 4}, entryid=0},
|
||||
egs_users:write(User),
|
||||
egs_game_server:link_exit(),
|
||||
egs_users:item_add(GID, 16#11010000, #psu_special_item_variables{}),
|
||||
|
||||
@ -288,10 +288,10 @@ event({chat, _FromTypeID, FromGID, _FromName, Modifiers, ChatMsg}, #client{gid=U
|
||||
ignore;
|
||||
UserGID -> %% player chat: disregard whatever was sent except modifiers and message.
|
||||
{ok, User} = egs_users:read(UserGID),
|
||||
[16#00001200, User#users.gid, (User#users.character)#characters.name];
|
||||
[16#00001200, User#users.gid, User#users.name];
|
||||
NPCGID -> %% npc chat: @todo Check that the player is the party leader and this npc is in his party.
|
||||
{ok, User} = egs_users:read(NPCGID),
|
||||
[16#00001d00, FromGID, (User#users.character)#characters.name]
|
||||
[16#00001d00, FromGID, User#users.name]
|
||||
end,
|
||||
%% log the message as ascii to the console
|
||||
[LogName|_] = re:split(BcastName, "\\0\\0", [{return, binary}]),
|
||||
@ -366,7 +366,7 @@ event({counter_options_request, CounterID}, Client) ->
|
||||
%% @todo Handle when the party already exists! And stop doing it wrong.
|
||||
event(counter_party_info_request, Client=#client{gid=GID}) ->
|
||||
{ok, User} = egs_users:read(GID),
|
||||
egs_proto:send_1706((User#users.character)#characters.name, Client);
|
||||
egs_proto:send_1706(User#users.name, Client);
|
||||
|
||||
%% @todo Item distribution is always set to random for now.
|
||||
event(counter_party_options_request, Client) ->
|
||||
@ -392,7 +392,7 @@ event({hit, FromTargetID, ToTargetID, A, B}, Client=#client{socket=Socket, gid=G
|
||||
%% @todo also has a hit sent, we should send it too
|
||||
events(Events, Client);
|
||||
_ ->
|
||||
PlayerHP = (NewUser#users.character)#characters.currenthp,
|
||||
PlayerHP = NewUser#users.currenthp,
|
||||
case lists:member(death, TargetSE) of
|
||||
true -> SE = 16#01000200;
|
||||
false -> SE = 16#01000000
|
||||
@ -498,15 +498,12 @@ event(mission_abort, Client=#client{gid=GID}) ->
|
||||
true -> psu_instance:stop(User#users.instancepid)
|
||||
end,
|
||||
%% full hp
|
||||
Character = User#users.character,
|
||||
MaxHP = Character#characters.maxhp,
|
||||
NewCharacter = Character#characters{currenthp=MaxHP},
|
||||
NewUser = User#users{character=NewCharacter, instancepid=undefined},
|
||||
egs_users:write(NewUser),
|
||||
User2 = User#users{currenthp=User#users.maxhp, instancepid=undefined},
|
||||
egs_users:write(User2),
|
||||
%% map change
|
||||
if User#users.areatype =:= mission ->
|
||||
PrevArea = User#users.prev_area,
|
||||
event({area_change, element(1, PrevArea), element(2, PrevArea), element(3, PrevArea), User#users.prev_entryid}, Client);
|
||||
if User2#users.areatype =:= mission ->
|
||||
PrevArea = User2#users.prev_area,
|
||||
event({area_change, element(1, PrevArea), element(2, PrevArea), element(3, PrevArea), User2#users.prev_entryid}, Client);
|
||||
true -> ignore
|
||||
end;
|
||||
|
||||
@ -523,7 +520,7 @@ event({npc_force_invite, NPCid}, Client=#client{gid=GID}) ->
|
||||
{ok, User} = egs_users:read(GID),
|
||||
%% Create NPC.
|
||||
io:format("~p: npc force invite ~p~n", [GID, NPCid]),
|
||||
TmpNPCUser = egs_npc_db:create(NPCid, ((User#users.character)#characters.mainlevel)#level.number),
|
||||
TmpNPCUser = egs_npc_db:create(NPCid, (User#users.mainlevel)#level.number),
|
||||
%% Create and join party.
|
||||
case User#users.partypid of
|
||||
undefined ->
|
||||
@ -537,16 +534,13 @@ event({npc_force_invite, NPCid}, Client=#client{gid=GID}) ->
|
||||
egs_users:write(NPCUser),
|
||||
egs_users:write(User#users{partypid=PartyPid}),
|
||||
%% Send stuff.
|
||||
Character = NPCUser#users.character,
|
||||
SentNPCCharacter = Character#characters{gid=NPCid, npcid=NPCid},
|
||||
SentNPCUser = NPCUser#users{character=SentNPCCharacter},
|
||||
egs_proto:send_010d(SentNPCUser, Client),
|
||||
egs_proto:send_0201(SentNPCUser, Client),
|
||||
egs_proto:send_010d(NPCUser, Client),
|
||||
egs_proto:send_0201(NPCUser, Client),
|
||||
egs_proto:send_0215(0, Client),
|
||||
egs_proto:send_0a04(SentNPCUser#users.gid, Client),
|
||||
egs_proto:send_0a04(NPCUser#users.gid, Client),
|
||||
egs_proto:send_022c(0, 16#12, Client),
|
||||
egs_proto:send_1004(npc_mission, SentNPCUser, PartyPos, Client),
|
||||
egs_proto:send_100f((SentNPCUser#users.character)#characters.npcid, PartyPos, Client),
|
||||
egs_proto:send_1004(npc_mission, NPCUser, PartyPos, Client),
|
||||
egs_proto:send_100f(NPCUser#users.npcid, PartyPos, Client),
|
||||
egs_proto:send_1601(PartyPos, Client);
|
||||
|
||||
%% @todo Also at the end send a 101a (NPC:16, PartyPos:16, ffffffff). Not sure about PartyPos.
|
||||
@ -554,7 +548,7 @@ event({npc_invite, NPCid}, Client=#client{gid=GID}) ->
|
||||
{ok, User} = egs_users:read(GID),
|
||||
%% Create NPC.
|
||||
io:format("~p: invited npcid ~b~n", [GID, NPCid]),
|
||||
TmpNPCUser = egs_npc_db:create(NPCid, ((User#users.character)#characters.mainlevel)#level.number),
|
||||
TmpNPCUser = egs_npc_db:create(NPCid, (User#users.mainlevel)#level.number),
|
||||
%% Create and join party.
|
||||
case User#users.partypid of
|
||||
undefined ->
|
||||
@ -568,10 +562,7 @@ event({npc_invite, NPCid}, Client=#client{gid=GID}) ->
|
||||
egs_users:write(NPCUser),
|
||||
egs_users:write(User#users{partypid=PartyPid}),
|
||||
%% Send stuff.
|
||||
Character = NPCUser#users.character,
|
||||
SentNPCCharacter = Character#characters{gid=NPCid, npcid=NPCid},
|
||||
SentNPCUser = NPCUser#users{character=SentNPCCharacter},
|
||||
egs_proto:send_1004(npc_invite, SentNPCUser, PartyPos, Client),
|
||||
egs_proto:send_1004(npc_invite, NPCUser, PartyPos, Client),
|
||||
egs_proto:send_101a(NPCid, PartyPos, Client);
|
||||
|
||||
%% @todo Should be 0115(money) 010a03(confirm sale).
|
||||
@ -683,12 +674,11 @@ event({object_goggle_target_activate, ObjectID}, Client=#client{gid=GID}) ->
|
||||
%% @todo Make NPC characters heal too.
|
||||
event({object_healing_pad_tick, [_PartyPos]}, Client=#client{gid=GID}) ->
|
||||
{ok, User} = egs_users:read(GID),
|
||||
Character = User#users.character,
|
||||
if Character#characters.currenthp =:= Character#characters.maxhp -> ignore;
|
||||
if User#users.currenthp =:= User#users.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#users{character=Character#characters{currenthp=NewHP2}},
|
||||
NewHP = User#users.currenthp + User#users.maxhp div 10,
|
||||
NewHP2 = if NewHP > User#users.maxhp -> User#users.maxhp; true -> NewHP end,
|
||||
User2 = User#users{currenthp=NewHP2},
|
||||
egs_users:write(User2),
|
||||
egs_proto:send_0117(User2, Client),
|
||||
egs_proto:send_0111(User2, 4, Client)
|
||||
@ -753,7 +743,7 @@ event({party_remove_member, PartyPos}, Client=#client{gid=GID}) ->
|
||||
{ok, RemovedGID} = psu_party:get_member(DestUser#users.partypid, PartyPos),
|
||||
psu_party:remove_member(DestUser#users.partypid, PartyPos),
|
||||
{ok, RemovedUser} = egs_users:read(RemovedGID),
|
||||
case (RemovedUser#users.character)#characters.type of
|
||||
case RemovedUser#users.type of
|
||||
npc -> egs_users:delete(RemovedGID);
|
||||
_ -> ignore
|
||||
end,
|
||||
@ -772,8 +762,7 @@ event(player_death, Client=#client{gid=GID}) ->
|
||||
%% use scape:
|
||||
NewHP = 10,
|
||||
{ok, User} = egs_users:read(GID),
|
||||
Char = User#users.character,
|
||||
User2 = User#users{character=Char#characters{currenthp=NewHP}},
|
||||
User2 = User#users{currenthp=NewHP},
|
||||
egs_users:write(User2),
|
||||
egs_proto:send_0117(User2, Client),
|
||||
egs_proto:send_1022(User2, Client);
|
||||
@ -836,15 +825,15 @@ events(Events, Client) ->
|
||||
|
||||
%% @doc Load and send the character information to the client.
|
||||
char_load(User, Client) ->
|
||||
egs_proto:send_0d01(User#users.character, Client),
|
||||
egs_proto:send_0d01(User, Client),
|
||||
%% 0246
|
||||
egs_proto:send_0a0a((User#users.character)#characters.inventory, Client),
|
||||
egs_proto:send_0a0a(User#users.inventory, Client),
|
||||
egs_proto:send_1006(5, 0, Client), %% @todo The 0 here is PartyPos, save it in User.
|
||||
egs_proto:send_1005(User#users.character, Client),
|
||||
egs_proto:send_1005(User, Client),
|
||||
egs_proto:send_1006(12, Client),
|
||||
egs_proto:send_0210(Client),
|
||||
egs_proto:send_0222(User#users.uni, Client),
|
||||
egs_proto:send_1500(User#users.character, Client),
|
||||
egs_proto:send_1500(User, Client),
|
||||
egs_proto:send_1501(Client),
|
||||
egs_proto:send_1512(Client),
|
||||
%% 0303
|
||||
@ -866,7 +855,7 @@ npc_load(Leader, [{PartyPos, NPCGID}|NPCList], Client) ->
|
||||
egs_proto:send_0215(0, Client),
|
||||
egs_proto:send_0a04(NPCUser#users.gid, Client),
|
||||
egs_proto:send_1004(npc_mission, NPCUser, PartyPos, Client),
|
||||
egs_proto:send_100f((NPCUser#users.character)#characters.npcid, PartyPos, Client),
|
||||
egs_proto:send_100f(NPCUser#users.npcid, PartyPos, Client),
|
||||
egs_proto:send_1601(PartyPos, Client),
|
||||
egs_proto:send_1016(PartyPos, Client),
|
||||
npc_load(Leader, NPCList, Client).
|
||||
|
||||
@ -66,9 +66,10 @@ handle_call({create, NPCid, BaseLevel}, _From, State) ->
|
||||
TmpUCS2Name = << << X:8, 0:8 >> || X <- Name >>,
|
||||
Padding = 8 * (64 - byte_size(TmpUCS2Name)),
|
||||
UCS2Name = << TmpUCS2Name/binary, 0:Padding >>,
|
||||
Character = #characters{gid=NPCGID, slot=0, type=npc, npcid=NPCid, name=UCS2Name, race=Race, gender=Gender, class=Class, appearance=Appearance,
|
||||
mainlevel={level, calc_level(BaseLevel, LevelDiff), 0}, blastbar=0, luck=2, money=0, playtime=0, stats={stats, 0, 0, 0, 0, 0, 0, 0}, se=[], currenthp=100, maxhp=100},
|
||||
User = #users{gid=NPCGID, character=Character, areatype=lobby, area={0, 0, 0}, entryid=0},
|
||||
User = #users{gid=NPCGID, slot=0, type=npc, npcid=NPCid, name=UCS2Name, race=Race, gender=Gender, class=Class, appearance=Appearance,
|
||||
mainlevel={level, calc_level(BaseLevel, LevelDiff), 0}, blastbar=0, luck=2, money=0, playtime=0,
|
||||
stats={stats, 0, 0, 0, 0, 0, 0, 0}, se=[], currenthp=100, maxhp=100,
|
||||
areatype=lobby, area={0, 0, 0}, entryid=0},
|
||||
{reply, User, State};
|
||||
|
||||
handle_call(stop, _From, State) ->
|
||||
|
||||
@ -1235,14 +1235,14 @@ send_0113(#client{socket=Socket, gid=DestGID}) ->
|
||||
packet_send(Socket, << 16#01130300:32, 0:64, DestGID:32/little, 0:64, 16#00011300:32, DestGID:32/little, 0:64, DestGID:32/little, File/binary >>).
|
||||
|
||||
%% @doc Update the character level, blastbar, luck and money information.
|
||||
send_0115(CharUser, Client) ->
|
||||
send_0115(CharUser, 16#ffffffff, Client).
|
||||
send_0115(#users{gid=CharGID, lid=CharLID, character=Character}, EnemyTargetID, #client{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
send_0115(User, Client) ->
|
||||
send_0115(User, 16#ffffffff, Client).
|
||||
send_0115(User=#users{gid=CharGID, lid=CharLID}, EnemyTargetID, #client{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
packet_send(Socket, << 16#01150300:32, DestLID:16/little, 0:48, CharGID:32/little, 0:64, 16#00011300:32, DestGID:32/little, 0:64,
|
||||
CharGID:32/little, CharLID:32/little, EnemyTargetID:32/little, (build_char_level(Character))/binary >>).
|
||||
CharGID:32/little, CharLID:32/little, EnemyTargetID:32/little, (build_char_level(User))/binary >>).
|
||||
|
||||
%% @todo Handle class levels.
|
||||
build_char_level(#characters{type=Type, mainlevel=#level{number=Level, exp=EXP}, blastbar=BlastBar, luck=Luck, money=Money, playtime=PlayTime}) ->
|
||||
build_char_level(#users{type=Type, mainlevel=#level{number=Level, exp=EXP}, blastbar=BlastBar, luck=Luck, money=Money, playtime=PlayTime}) ->
|
||||
ClassesBin = case Type of
|
||||
npc ->
|
||||
<< 16#01000000:32, 16#01000000:32, 16#01000000:32, 16#01000000:32, 16#01000000:32, 16#01000000:32, 16#01000000:32, 16#01000000:32,
|
||||
@ -1257,7 +1257,7 @@ build_char_level(#characters{type=Type, mainlevel=#level{number=Level, exp=EXP},
|
||||
|
||||
%% @doc Revive player with optional SEs.
|
||||
%% @todo SEs.
|
||||
send_0117(#users{gid=CharGID, lid=CharLID, character=#characters{currenthp=HP}}, #client{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
send_0117(#users{gid=CharGID, lid=CharLID, currenthp=HP}, #client{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
SE = << 0:64 >>,
|
||||
packet_send(Socket, << 16#01170300:32, DestLID:16/little, 0:48, CharGID:32/little, 0:64, 16#00011300:32, DestGID:32/little, 0:64,
|
||||
CharGID:32/little, CharLID:32/little, SE/binary, HP:32/little, 0:32 >>).
|
||||
@ -1275,7 +1275,7 @@ send_0200(ZoneID, ZoneType, #client{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
|
||||
%% @doc Send character location, appearance and other information.
|
||||
send_0201(CharUser, #client{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
[CharTypeID, GameVersion] = case (CharUser#users.character)#characters.type of
|
||||
[CharTypeID, GameVersion] = case CharUser#users.type of
|
||||
npc -> [16#00001d00, 255];
|
||||
_ -> [16#00001200, 0]
|
||||
end,
|
||||
@ -1299,7 +1299,7 @@ send_0203(#users{gid=CharGID, lid=CharLID}, #client{socket=Socket, gid=DestGID,
|
||||
%% @doc Unspawn the given character.
|
||||
%% @todo The last 4 bytes are probably the number of players remaining in the zone.
|
||||
send_0204(User, #client{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
CharTypeID = case (User#users.character)#characters.type of
|
||||
CharTypeID = case User#users.type of
|
||||
npc -> 16#00001d00;
|
||||
_ -> 16#00001200
|
||||
end,
|
||||
@ -1469,7 +1469,7 @@ send_0a05(#client{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
|
||||
%% @doc Send the list of ItemUUID for the items in the inventory.
|
||||
send_0a06(CharUser, #client{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
Len = length((CharUser#users.character)#characters.inventory),
|
||||
Len = length(CharUser#users.inventory),
|
||||
UUIDs = lists:seq(1, Len),
|
||||
Bin = iolist_to_binary([ << N:32/little >> || N <- UUIDs]),
|
||||
Blanks = lists:seq(1, 60 - Len),
|
||||
@ -1548,9 +1548,9 @@ send_0c10(Options, #client{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
|
||||
%% @doc Send the general data and flags for the selected character.
|
||||
%% @todo Handle bitflags and value flags properly.
|
||||
send_0d01(Character, #client{socket=Socket, gid=DestGID}) ->
|
||||
CharBin = psu_characters:character_tuple_to_binary(Character),
|
||||
OptionsBin = psu_characters:options_tuple_to_binary(Character#characters.options),
|
||||
send_0d01(User, #client{socket=Socket, gid=DestGID}) ->
|
||||
CharBin = psu_characters:character_tuple_to_binary(User),
|
||||
OptionsBin = psu_characters:options_tuple_to_binary(User#users.options),
|
||||
packet_send(Socket, << 16#0d010300:32, 16#ffff:16, 0:144, 16#00011300:32, DestGID:32/little, 0:64, CharBin/binary,
|
||||
16#ffbbef1c:32, 16#f8ff0700:32, 16#fc810916:32, 16#7802134c:32, 16#b0c0040f:32, 16#7cf0e583:32,
|
||||
16#b7bce0c6:32, 16#7ff8f963:32, 16#3fd7ffff:32, 16#fff7ffff:32, 16#f3ff63e0:32, 16#1fe00000:32,
|
||||
@ -1590,8 +1590,7 @@ send_1004(Type, User, PartyPos, #client{socket=Socket, gid=DestGID}) ->
|
||||
npc_invite -> [0, 16#ffffffff, 3];
|
||||
_ -> 1 %% seems to be for players
|
||||
end,
|
||||
#users{gid=GID, character=Character, area={QuestID, ZoneID, MapID}, entryid=EntryID} = User,
|
||||
#characters{npcid=NPCid, name=Name, mainlevel=MainLevel} = Character,
|
||||
#users{gid=GID, npcid=NPCid, name=Name, mainlevel=MainLevel, area={QuestID, ZoneID, MapID}, entryid=EntryID} = User,
|
||||
Level = MainLevel#level.number,
|
||||
packet_send(Socket, << 16#10040300:32, 16#ffff0000:32, 0:128, 16#00011300:32, DestGID:32/little, 0:64,
|
||||
TypeID:32, GID:32/little, 0:64, Name/binary,
|
||||
@ -1614,8 +1613,8 @@ send_1004(Type, User, PartyPos, #client{socket=Socket, gid=DestGID}) ->
|
||||
|
||||
%% @doc Send the client's own player's party information, on the bottom left of the screen.
|
||||
%% @todo Location and the 20 bytes following sometimes have values, not sure why; when joining a party maybe?
|
||||
send_1005(Character, #client{socket=Socket, gid=DestGID}) ->
|
||||
#characters{name=Name, mainlevel=#level{number=Level}, currenthp=CurrentHP, maxhp=MaxHP} = Character,
|
||||
send_1005(User, #client{socket=Socket, gid=DestGID}) ->
|
||||
#users{name=Name, mainlevel=#level{number=Level}, currenthp=CurrentHP, maxhp=MaxHP} = User,
|
||||
Location = << 0:512 >>,
|
||||
packet_send(Socket, << 16#10050300:32, 16#ffff:16, 0:144, 16#00011300:32, DestGID:32/little, 0:64,
|
||||
16#00000100:32, 0:32, 16#ffffffff:32, 0:32, 16#00011200:32, DestGID:32/little, 0:64,
|
||||
@ -1684,7 +1683,7 @@ send_1020(#client{socket=Socket, gid=DestGID}) ->
|
||||
|
||||
%% @doc Update HP in the party members information on the left.
|
||||
%% @todo Handle PartyPos. Probably only pass HP later.
|
||||
send_1022(#users{character=#characters{currenthp=HP}}, #client{socket=Socket, gid=DestGID}) ->
|
||||
send_1022(#users{currenthp=HP}, #client{socket=Socket, gid=DestGID}) ->
|
||||
PartyPos = 0,
|
||||
packet_send(Socket, << 16#10220300:32, 16#ffff:16, 0:144, 16#00011300:32, DestGID:32/little, 0:64, HP:32/little, PartyPos:32/little >>).
|
||||
|
||||
@ -1753,8 +1752,8 @@ send_1216(Value, #client{socket=Socket, gid=DestGID}) ->
|
||||
|
||||
%% @doc Send the player's partner card.
|
||||
%% @todo Handle the LID and comment properly.
|
||||
send_1500(Character, #client{socket=Socket, gid=DestGID}) ->
|
||||
#characters{slot=Slot, name=Name, race=Race, gender=Gender, class=Class, appearance=Appearance} = Character,
|
||||
send_1500(User, #client{socket=Socket, gid=DestGID}) ->
|
||||
#users{slot=Slot, name=Name, race=Race, gender=Gender, class=Class, appearance=Appearance} = User,
|
||||
case Appearance of
|
||||
#flesh_appearance{voicetype=VoiceType, voicepitch=VoicePitch} -> ok;
|
||||
#metal_appearance{voicetype=VoiceType, voicepitch=VoicePitch} -> ok
|
||||
@ -1833,11 +1832,10 @@ send_1a02(A, B, C, D, #client{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
A:16/little, B:16/little, C:16/little, D:16/little >>).
|
||||
|
||||
%% @doc Lumilass available hairstyles/headtypes handler.
|
||||
send_1a03(CharUser, #client{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
send_1a03(User, #client{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
{ok, Conf} = file:consult("priv/lumilass.conf"),
|
||||
Character = CharUser#users.character,
|
||||
NbHeadtypes = proplists:get_value({headtypes, Character#characters.gender, Character#characters.race}, Conf, 0),
|
||||
HairstylesList = proplists:get_value({hairstyles, Character#characters.gender}, Conf),
|
||||
NbHeadtypes = proplists:get_value({headtypes, User#users.gender, User#users.race}, Conf, 0),
|
||||
HairstylesList = proplists:get_value({hairstyles, User#users.gender}, Conf),
|
||||
NbHairstyles = length(HairstylesList),
|
||||
HairstylesBin = iolist_to_binary([ << N:32 >> || N <- HairstylesList]),
|
||||
packet_send(Socket, << 16#1a030300:32, DestLID:16/little, 0:144, 16#00011300:32, DestGID:32/little, 0:96,
|
||||
|
||||
@ -129,67 +129,61 @@ handle_call({delete, GID}, _From, State) ->
|
||||
|
||||
handle_call({item_nth, GID, ItemIndex}, _From, State) ->
|
||||
{GID, User} = lists:keyfind(GID, 1, State#state.users),
|
||||
Item = lists:nth(ItemIndex + 1, (User#users.character)#characters.inventory),
|
||||
Item = lists:nth(ItemIndex + 1, User#users.inventory),
|
||||
{reply, Item, State};
|
||||
|
||||
handle_call({item_add, GID, ItemID, Variables}, _From, State) ->
|
||||
{GID, User} = lists:keyfind(GID, 1, State#state.users),
|
||||
Character = User#users.character,
|
||||
Inventory = Character#characters.inventory,
|
||||
Inventory2 = case Variables of
|
||||
Inventory = case Variables of
|
||||
#psu_consumable_item_variables{quantity=Quantity} ->
|
||||
#psu_item{data=#psu_consumable_item{max_quantity=MaxQuantity}} = egs_items_db:read(ItemID),
|
||||
{ItemID, #psu_consumable_item_variables{quantity=Quantity2}} = case lists:keyfind(ItemID, 1, Inventory) of
|
||||
{ItemID, #psu_consumable_item_variables{quantity=Quantity2}} = case lists:keyfind(ItemID, 1, User#users.inventory) of
|
||||
false -> New = true, {ItemID, #psu_consumable_item_variables{quantity=0}};
|
||||
Tuple -> New = false, Tuple
|
||||
end,
|
||||
Quantity3 = Quantity + Quantity2,
|
||||
if Quantity3 =< MaxQuantity ->
|
||||
lists:keystore(ItemID, 1, Inventory, {ItemID, #psu_consumable_item_variables{quantity=Quantity3}})
|
||||
lists:keystore(ItemID, 1, User#users.inventory, {ItemID, #psu_consumable_item_variables{quantity=Quantity3}})
|
||||
end;
|
||||
#psu_trap_item_variables{quantity=Quantity} ->
|
||||
#psu_item{data=#psu_trap_item{max_quantity=MaxQuantity}} = egs_items_db:read(ItemID),
|
||||
{ItemID, #psu_trap_item_variables{quantity=Quantity2}} = case lists:keyfind(ItemID, 1, Inventory) of
|
||||
{ItemID, #psu_trap_item_variables{quantity=Quantity2}} = case lists:keyfind(ItemID, 1, User#users.inventory) of
|
||||
false -> New = true, {ItemID, #psu_trap_item_variables{quantity=0}};
|
||||
Tuple -> New = false, Tuple
|
||||
end,
|
||||
Quantity3 = Quantity + Quantity2,
|
||||
if Quantity3 =< MaxQuantity ->
|
||||
lists:keystore(ItemID, 1, Inventory, {ItemID, #psu_trap_item_variables{quantity=Quantity3}})
|
||||
lists:keystore(ItemID, 1, User#users.inventory, {ItemID, #psu_trap_item_variables{quantity=Quantity3}})
|
||||
end;
|
||||
_ ->
|
||||
New = true,
|
||||
if length(Inventory) < 60 ->
|
||||
Inventory ++ [{ItemID, Variables}]
|
||||
if length(User#users.inventory) < 60 ->
|
||||
User#users.inventory ++ [{ItemID, Variables}]
|
||||
end
|
||||
end,
|
||||
Character2 = Character#characters{inventory=Inventory2},
|
||||
Users2 = lists:keydelete(User#users.gid, 1, State#state.users),
|
||||
State2 = State#state{users=[{GID, User#users{character=Character2}}|Users2]},
|
||||
State2 = State#state{users=[{GID, User#users{inventory=Inventory}}|Users2]},
|
||||
case New of
|
||||
false -> {reply, 16#ffffffff, State2};
|
||||
true -> {reply, length(Inventory2), State2}
|
||||
true -> {reply, length(Inventory), State2}
|
||||
end;
|
||||
|
||||
handle_call({item_qty_add, GID, ItemIndex, QuantityDiff}, _From, State) ->
|
||||
{GID, User} = lists:keyfind(GID, 1, State#state.users),
|
||||
Character = User#users.character,
|
||||
Inventory = Character#characters.inventory,
|
||||
{ItemID, Variables} = lists:nth(ItemIndex + 1, Inventory),
|
||||
case Variables of
|
||||
{ItemID, Variables} = lists:nth(ItemIndex + 1, User#users.inventory),
|
||||
Inventory = case Variables of
|
||||
#psu_trap_item_variables{quantity=Quantity} ->
|
||||
#psu_item{data=#psu_trap_item{max_quantity=MaxQuantity}} = egs_items_db:read(ItemID),
|
||||
Quantity2 = Quantity + QuantityDiff,
|
||||
if Quantity2 =:= 0 ->
|
||||
Inventory2 = string:substr(Inventory, 1, ItemIndex) ++ string:substr(Inventory, ItemIndex + 2);
|
||||
string:substr(User#users.inventory, 1, ItemIndex) ++ string:substr(User#users.inventory, ItemIndex + 2);
|
||||
Quantity2 > 0, Quantity2 =< MaxQuantity ->
|
||||
Variables2 = Variables#psu_trap_item_variables{quantity=Quantity2},
|
||||
Inventory2 = string:substr(Inventory, 1, ItemIndex) ++ [{ItemID, Variables2}] ++ string:substr(Inventory, ItemIndex + 2)
|
||||
string:substr(User#users.inventory, 1, ItemIndex) ++ [{ItemID, Variables2}] ++ string:substr(User#users.inventory, ItemIndex + 2)
|
||||
end
|
||||
end,
|
||||
Character2 = Character#characters{inventory=Inventory2},
|
||||
Users2 = lists:keydelete(User#users.gid, 1, State#state.users),
|
||||
{reply, ok, State#state{users=[{GID, User#users{character=Character2}}|Users2]}};
|
||||
{reply, ok, State#state{users=[{GID, User#users{inventory=Inventory}}|Users2]}};
|
||||
|
||||
handle_call({shop_enter, GID, ShopID}, _From, State) ->
|
||||
{GID, User} = lists:keyfind(GID, 1, State#state.users),
|
||||
@ -207,12 +201,10 @@ handle_call({shop_get, GID}, _From, State) ->
|
||||
|
||||
handle_call({money_add, GID, MoneyDiff}, _From, State) ->
|
||||
{GID, User} = lists:keyfind(GID, 1, State#state.users),
|
||||
Character = User#users.character,
|
||||
Money = Character#characters.money + MoneyDiff,
|
||||
Money = User#users.money + MoneyDiff,
|
||||
if Money >= 0 ->
|
||||
Character2 = Character#characters{money=Money},
|
||||
Users2 = lists:delete({GID, User}, State#state.users),
|
||||
{reply, ok, [{GID, User#users{character=Character2}}|Users2]}
|
||||
{reply, ok, [{GID, User#users{money=Money}}|Users2]}
|
||||
end;
|
||||
|
||||
handle_call(stop, _From, State) ->
|
||||
|
||||
@ -28,9 +28,9 @@
|
||||
|
||||
%% @doc Convert a character tuple into a binary to be sent to clients.
|
||||
%% Only contains the actually saved data, not the stats and related information.
|
||||
|
||||
%% @todo The name isn't very good anymore now that I switched #characters to #users.
|
||||
character_tuple_to_binary(Tuple) ->
|
||||
#characters{name=Name, race=Race, gender=Gender, class=Class, appearance=Appearance} = Tuple,
|
||||
#users{name=Name, race=Race, gender=Gender, class=Class, appearance=Appearance} = Tuple,
|
||||
RaceBin = race_atom_to_binary(Race),
|
||||
GenderBin = gender_atom_to_binary(Gender),
|
||||
ClassBin = class_atom_to_binary(Class),
|
||||
@ -45,11 +45,10 @@ character_tuple_to_binary(Tuple) ->
|
||||
%% @todo The value before IntDir seems to be the player's current animation. 01 stand up, 08 ?, 17 normal sit
|
||||
|
||||
character_user_to_binary(User) ->
|
||||
#users{gid=CharGID, lid=CharLID, character=Character, pos={X, Y, Z, Dir}, area={QuestID, ZoneID, MapID}, entryid=EntryID,
|
||||
prev_area={PrevQuestID, PrevZoneID, PrevMapID}, prev_entryid=PrevEntryID} = User,
|
||||
#characters{npcid=NPCid, type=Type, mainlevel=Level, stats=Stats, se=SE, currenthp=CurrentHP, maxhp=MaxHP} = Character,
|
||||
#users{gid=CharGID, lid=CharLID, npcid=NPCid, type=Type, mainlevel=Level, stats=Stats, se=SE, currenthp=CurrentHP, maxhp=MaxHP,
|
||||
pos={X, Y, Z, Dir}, area={QuestID, ZoneID, MapID}, entryid=EntryID, prev_area={PrevQuestID, PrevZoneID, PrevMapID}, prev_entryid=PrevEntryID} = User,
|
||||
#level{number=LV} = Level,
|
||||
CharBin = psu_characters:character_tuple_to_binary(Character),
|
||||
CharBin = psu_characters:character_tuple_to_binary(User),
|
||||
StatsBin = psu_characters:stats_tuple_to_binary(Stats),
|
||||
SEBin = psu_characters:se_list_to_binary(SE),
|
||||
EXPNextLevel = 100,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user