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

Remove the #level record.

Browse Source
This commit is contained in:
Loïc Hoguin 2011-02-27 20:12:43 +01:00
parent c7cb5ab589
commit d9cde30b0b
5 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/records.hrl
View File

@ -58,7 +58,8 @@
race,
gender,
class,
mainlevel = {level, 1, 0},
level = 1,
exp = 0,
currenthp = 100,
maxhp = 100,
stats = {stats, 1000, 2000, 3000, 4000, 5000, 6000, 7000},
@ -119,10 +120,6 @@
faceboxx=65535, faceboxy=65535
}).
%% @doc Character main or class level data structure.
-record(level, {number, exp}).
%% @doc Character stats data structure.
-record(stats, {atp, ata, tp, dfp, evp, mst, sta}).

4
src/egs_game.erl
View File

@ -520,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.mainlevel)#level.number),
TmpNPCUser = egs_npc_db:create(NPCid, User#users.level),
%% Create and join party.
case User#users.partypid of
undefined ->
@ -548,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.mainlevel)#level.number),
TmpNPCUser = egs_npc_db:create(NPCid, User#users.level),
%% Create and join party.
case User#users.partypid of
undefined ->

2
src/egs_npc_db.erl
View File

@ -67,7 +67,7 @@ handle_call({create, NPCid, BaseLevel}, _From, State) ->
Padding = 8 * (64 - byte_size(TmpUCS2Name)),
UCS2Name = << TmpUCS2Name/binary, 0:Padding >>,
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,
level=calc_level(BaseLevel, LevelDiff), blastbar=0, luck=2, money=0,
stats={stats, 0, 0, 0, 0, 0, 0, 0}, currenthp=100, maxhp=100,
areatype=lobby, area={0, 0, 0}, entryid=0},
{reply, User, State};

7
src/egs_proto.erl
View File

@ -1576,8 +1576,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, npcid=NPCid, name=Name, mainlevel=MainLevel, area={QuestID, ZoneID, MapID}, entryid=EntryID} = User,
Level = MainLevel#level.number,
#users{gid=GID, npcid=NPCid, name=Name, level=Level, area={QuestID, ZoneID, MapID}, entryid=EntryID} = User,
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,
Level:16/little, 16#ffff:16,
@ -1600,7 +1599,7 @@ 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(User, #client{socket=Socket, gid=DestGID}) ->
#users{name=Name, mainlevel=#level{number=Level}, currenthp=CurrentHP, maxhp=MaxHP} = User,
#users{name=Name, level=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,
@ -1842,7 +1841,7 @@ send_1a07(#client{socket=Socket, gid=DestGID, lid=DestLID}) ->
%% Common binary building functions.
%% @todo Handle class levels.
build_char_level(#users{type=Type, mainlevel=#level{number=Level, exp=EXP}, blastbar=BlastBar, luck=Luck, money=Money}) ->
build_char_level(#users{type=Type, level=Level, exp=EXP, blastbar=BlastBar, luck=Luck, money=Money}) ->
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,

5
src/psu/psu_characters.erl
View File

@ -45,9 +45,8 @@ 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, npcid=NPCid, type=Type, mainlevel=Level, stats=Stats, currenthp=CurrentHP, maxhp=MaxHP,
#users{gid=CharGID, lid=CharLID, npcid=NPCid, type=Type, level=Level, stats=Stats, 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(User),
StatsBin = psu_characters:stats_tuple_to_binary(Stats),
EXPNextLevel = 100,
@ -60,7 +59,7 @@ character_user_to_binary(User) ->
16#0100:16, IntDir:16/little, X:32/little-float, Y:32/little-float, Z:32/little-float, 0:64,
PrevQuestID:32/little, PrevZoneID:32/little, PrevMapID:32/little, PrevEntryID:32/little,
CharBin/binary, EXPNextLevel:32/little, EXPCurrentLevel:32/little, MaxHP:32/little,
StatsBin/binary, 0:96, LV:32/little, StatsBin/binary, CurrentHP:32/little, MaxHP:32/little,
StatsBin/binary, 0:96, Level:32/little, StatsBin/binary, CurrentHP:32/little, MaxHP:32/little,
0:1344, 16#0000803f:32, 0:64, 16#0000803f:32, 0:64, 16#0000803f:32, 0:64, 16#0000803f:32, 0:64, 16#0000803f:32, 0:160, 16#0000803f:32, 0:352 >>.
%% @doc Convert a class atom into a binary to be sent to clients.