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

Add default values to items and egs_user_model records.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-09-27 23:52:03 +02:00
parent 17f54fec45
commit 492b485cd9
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/psu/items.hrl
View File

@ -30,7 +30,7 @@
-record(psu_trap_item, {max_quantity}).
-record(psu_special_item_variables, {}).
-record(psu_striking_weapon_item_variables, {is_active, slot, current_pp, max_pp, element, pa}).
-record(psu_striking_weapon_item_variables, {is_active=0, slot=0, current_pp, max_pp, element, pa=#psu_pa{type=0, level=0}}).
%% Items.

12
include/records.hrl
View File

@ -35,11 +35,13 @@
%% @todo Probably can use a "param" or "extra" field to store the game-specific information (for things that don't need to be queried).
-record(egs_user_model, {
id, pid, socket, state, time, character, instancepid, partypid, areatype, area, entryid, pos,
%% psu specific fields
lid, setid, prev_area, prev_entryid,
%% temporary fields
folder
%% General information.
id, lid, pid, socket, state, time, character,
%% Location/state related information.
instancepid, partypid, areatype, area, entryid, pos=#pos{x=0.0, y=0.0, z=0.0, dir=0.0}, prev_area=#psu_area{questid=0, zoneid=0, mapid=0}, prev_entryid=0, %% universeid, shopid
%% To be moved or deleted later on.
setid=0, %% @todo Current area's set number. Move that to psu_instance probably.
folder %% @todo Temporary save location.
}).
%% @doc Character main or class level data structure.

10
src/egs_char_select.erl
View File

@ -68,7 +68,6 @@ event({char_select_create, Slot, CharBin}, #state{gid=GID}) ->
file:write_file(io_lib:format("~s.options", [File]), << 0:128, 4, 0:56 >>);
%% @doc Load the selected character into the game's universe.
%% @todo The area_change should happen only after we received 021c back from the client.
event({char_select_enter, Slot, _BackToPreviousField}, State=#state{gid=GID}) ->
{ok, User} = egs_user_model:read(GID),
[{status, 1}, {char, CharBin}, {options, OptionsBin}] = data_load(User#egs_user_model.folder, Slot),
@ -80,11 +79,10 @@ event({char_select_enter, Slot, _BackToPreviousField}, State=#state{gid=GID}) ->
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
inventory= [{16#11010000, #psu_special_item_variables{}}, {16#11020000, #psu_special_item_variables{}}, {16#11020100, #psu_special_item_variables{}}, {16#11020200, #psu_special_item_variables{}},
{16#01010900, #psu_striking_weapon_item_variables{is_active=0, slot=0, current_pp=99, max_pp=100, element=#psu_element{type=1, percent=50}, pa=#psu_pa{type=0, level=0}}},
{16#01010a00, #psu_striking_weapon_item_variables{is_active=0, slot=0, current_pp=99, max_pp=100, element=#psu_element{type=2, percent=50}, pa=#psu_pa{type=0, level=0}}},
{16#01010b00, #psu_striking_weapon_item_variables{is_active=0, slot=0, current_pp=99, max_pp=100, element=#psu_element{type=3, percent=50}, pa=#psu_pa{type=0, level=0}}}]},
User2 = User#egs_user_model{state=online, character=Character, area=#psu_area{questid=1100000, zoneid=0, mapid=4}, entryid=5,
prev_area={psu_area, 0, 0, 0}, prev_entryid=0, pos=#pos{x=0.0, y=0.0, z=0.0, dir=0.0}, setid=0},
{16#01010900, #psu_striking_weapon_item_variables{current_pp=99, max_pp=100, element=#psu_element{type=1, percent=50}}},
{16#01010a00, #psu_striking_weapon_item_variables{current_pp=99, max_pp=100, element=#psu_element{type=2, percent=50}}},
{16#01010b00, #psu_striking_weapon_item_variables{current_pp=99, max_pp=100, element=#psu_element{type=3, percent=50}}}]},
User2 = User#egs_user_model{state=online, character=Character, area=#psu_area{questid=1100000, zoneid=0, mapid=4}, entryid=5},
egs_user_model:write(User2),
psu_game:char_load(User2),
{ok, egs_game, State}.