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

items: Add consumable items to the default inventory.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-09-28 04:13:11 +02:00
parent 492b485cd9
commit c894e492de
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/psu/items.hrl
View File

@ -22,13 +22,14 @@
-record(psu_item, {name, rarity, buy_price, sell_price, data}).
-record(psu_clothing_item, {appearance, type, manufacturer, overlap, gender, colors}).
-record(psu_consumable_item, {max_quantity, pt_diff, status_effect, target, use_condition, item_effect}).
-record(psu_consumable_item, {max_quantity, pt_diff, status_effect, action, target, use_condition, item_effect}).
-record(psu_parts_item, {appearance, type, manufacturer, overlap, gender}).
-record(psu_special_item, {}).
-record(psu_striking_weapon_item, {pp, atp, ata, atp_req, shop_element, hand, max_upgrades, attack_label,
attack_sound, hitbox_a, hitbox_b, hitbox_c, hitbox_d, nb_targets, effect, model}).
-record(psu_trap_item, {max_quantity}).
-record(psu_consumable_item_variables, {quantity}).
-record(psu_special_item_variables, {}).
-record(psu_striking_weapon_item_variables, {is_active=0, slot=0, current_pp, max_pp, element, pa=#psu_pa{type=0, level=0}}).
@ -64,61 +65,61 @@
{16#03010000, #psu_item{name="Monomate",
rarity=1, buy_price=50, sell_price=5, data=#psu_consumable_item{
max_quantity=20, pt_diff=+100, status_effect=0, target=0, use_condition=0, item_effect=16#20
max_quantity=20, pt_diff=+100, status_effect=0, action=0, target=0, use_condition=0, item_effect=16#20
}}},
{16#03010100, #psu_item{name="Dimate",
rarity=2, buy_price=150, sell_price=15, data=#psu_consumable_item{
max_quantity=15, pt_diff=+1000, status_effect=0, target=0, use_condition=0, item_effect=16#20
max_quantity=15, pt_diff=+1000, status_effect=0, action=0, target=0, use_condition=0, item_effect=16#20
}}},
{16#03010200, #psu_item{name="Trimate",
rarity=3, buy_price=500, sell_price=50, data=#psu_consumable_item{
max_quantity=10, pt_diff=+100, status_effect=0, target=0, use_condition=0, item_effect=16#30
max_quantity=10, pt_diff=+100, status_effect=0, action=0, target=0, use_condition=0, item_effect=16#30
}}},
{16#03010300, #psu_item{name="Star Atomizer",
rarity=6, buy_price=1500, sell_price=150, data=#psu_consumable_item{
max_quantity=5, pt_diff=+100, status_effect=0, target=1, use_condition=0, item_effect=16#30
max_quantity=5, pt_diff=+100, status_effect=0, action=0, target=1, use_condition=0, item_effect=16#30
}}},
%% @todo Missing 03010400.
{16#03010500, #psu_item{name="Antimate",
rarity=1, buy_price=100, sell_price=10, data=#psu_consumable_item{
max_quantity=10, pt_diff=0, status_effect=0, target=0, use_condition=0, item_effect=16#60
max_quantity=10, pt_diff=0, status_effect=0, action=4, target=0, use_condition=0, item_effect=16#60
}}},
{16#03010600, #psu_item{name="Sol Atomizer",
rarity=4, buy_price=300, sell_price=30, data=#psu_consumable_item{
max_quantity=5, pt_diff=0, status_effect=0, target=1, use_condition=0, item_effect=16#60
max_quantity=5, pt_diff=0, status_effect=0, action=4, target=1, use_condition=0, item_effect=16#60
}}},
{16#03010700, #psu_item{name="Moon Atomizer",
rarity=5, buy_price=500, sell_price=50, data=#psu_consumable_item{
max_quantity=5, pt_diff=+25, status_effect=0, target=1, use_condition=0, item_effect=16#B0
max_quantity=5, pt_diff=+25, status_effect=0, action=5, target=1, use_condition=0, item_effect=16#B0
}}},
%% @todo Missing 03010800. Cosmo Atomizer?
{16#03010900, #psu_item{name="Scape Doll",
rarity=8, buy_price=10000, sell_price=10, data=#psu_consumable_item{
max_quantity=1, pt_diff=+100, status_effect=0, target=0, use_condition=0, item_effect=16#D0
max_quantity=1, pt_diff=+100, status_effect=0, action=2, target=0, use_condition=0, item_effect=16#D0
}}},
{16#03010a00, #psu_item{name="Agtaride",
rarity=3, buy_price=150, sell_price=15, data=#psu_consumable_item{
max_quantity=10, pt_diff=0, status_effect=17, target=0, use_condition=0, item_effect=16#22
max_quantity=10, pt_diff=0, status_effect=17, action=3, target=0, use_condition=0, item_effect=16#22
}}},
{16#03010b00, #psu_item{name="Defbaride",
rarity=3, buy_price=150, sell_price=15, data=#psu_consumable_item{
max_quantity=10, pt_diff=0, status_effect=19, target=0, use_condition=0, item_effect=16#22
max_quantity=10, pt_diff=0, status_effect=19, action=3, target=0, use_condition=0, item_effect=16#22
}}},
{16#03010c00, #psu_item{name="Retaride",
rarity=3, buy_price=150, sell_price=15, data=#psu_consumable_item{
max_quantity=10, pt_diff=0, status_effect=21, target=0, use_condition=0, item_effect=16#22
max_quantity=10, pt_diff=0, status_effect=21, action=3, target=0, use_condition=0, item_effect=16#22
}}},
{16#03010d00, #psu_item{name="Zodiaride",
rarity=3, buy_price=150, sell_price=15, data=#psu_consumable_item{
max_quantity=10, pt_diff=0, status_effect=23, target=0, use_condition=0, item_effect=16#22
max_quantity=10, pt_diff=0, status_effect=23, action=3, target=0, use_condition=0, item_effect=16#22
}}},
{16#03010e00, #psu_item{name="Megistaride",
rarity=4, buy_price=300, sell_price=30, data=#psu_consumable_item{
max_quantity=10, pt_diff=0, status_effect=26, target=0, use_condition=0, item_effect=16#22
max_quantity=10, pt_diff=0, status_effect=26, action=3, target=0, use_condition=0, item_effect=16#22
}}},
{16#03020000, #psu_item{name="Photon Charge",
rarity=3, buy_price=500, sell_price=50, data=#psu_consumable_item{
max_quantity=10, pt_diff=+100, status_effect=0, target=4, use_condition=4, item_effect=16#30
max_quantity=10, pt_diff=+100, status_effect=0, action=1, target=4, use_condition=4, item_effect=16#30
}}},
%% @todo Missing 03020100. Cosmo Charge?

3
src/egs_char_select.erl
View File

@ -79,6 +79,9 @@ 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#03010000, #psu_consumable_item_variables{quantity=10}},
{16#03020000, #psu_consumable_item_variables{quantity=3}},
{16#03010900, #psu_consumable_item_variables{quantity=1}},
{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}}}]},

6
src/psu/psu_game.erl
View File

@ -406,6 +406,12 @@ build_0a0a_item_variables([], Acc) ->
Bin = iolist_to_binary(lists:reverse(Acc)),
Padding = 17280 - 8 * byte_size(Bin),
<< Bin/binary, 0:Padding >>;
build_0a0a_item_variables([{ItemID, #psu_consumable_item_variables{quantity=Quantity}}|Tail], Acc) ->
#psu_item{rarity=Rarity, data=#psu_consumable_item{max_quantity=MaxQuantity, action=Action}} = proplists:get_value(ItemID, ?ITEMS),
ItemIndex = 0,
RarityInt = Rarity - 1,
Bin = << 0:32, ItemIndex:32/little, ItemID:32, Quantity:32/little, MaxQuantity:32/little, 0:24, RarityInt:8, Action:8, 0:88 >>,
build_0a0a_item_variables(Tail, [Bin|Acc]);
%% @todo Handle rank, rarity and hands properly.
build_0a0a_item_variables([{ItemID, Variables}|Tail], Acc) when element(1, Variables) =:= psu_striking_weapon_item_variables ->
#psu_striking_weapon_item_variables{is_active=IsActive, slot=Slot, current_pp=CurrentPP, max_pp=MaxPP,