--- deliantra/server/ext/reseller.ext 2007/01/24 19:39:14 1.5 +++ deliantra/server/ext/reseller.ext 2008/04/10 15:35:16 1.11 @@ -1,16 +1,4 @@ -#!perl # MANDATORY - -my %unit = ( - silver => 1, - gold => 10, - platina => 50, - royalty => 5000, -); - -my %aliases = ( - platinum => 'platina', - royalties => 'royalty', -); +#!perl # mandatory sub ob2info { my ($item, $rval) = @_; @@ -53,7 +41,8 @@ cf::register_script_function "reseller::list_sells" => sub { my ($who, $msg, $npc) = @_; - my $sells = cf::from_json $npc->get_ob_key_value ('ext_reseller_sales'); + my $ext_re_sales = $npc->get_ob_key_value ('ext_reseller_sales'); + my $sells = $ext_re_sales && cf::decode_json $ext_re_sales; my $hissells = $sells->{$who->name}; unless (keys %{$hissells || {}}) { @@ -73,7 +62,8 @@ cf::register_script_function "reseller::pay_player" => sub { my ($who, $msg, $npc) = @_; - my $sells = cf::from_json $npc->get_ob_key_value ('ext_reseller_sales'); + my $ext_re_sales = $npc->get_ob_key_value ('ext_reseller_sales'); + my $sells = $ext_re_sales && cf::decode_json $ext_re_sales; my $hissells = $sells->{$who->name}; unless (keys %{$hissells || {}}) { @@ -91,7 +81,8 @@ $sells->{$who->name} = {}; - $npc->set_ob_key_value (ext_reseller_sales => cf::to_json $sells); + $npc->set_ob_key_value (ext_reseller_sales => cf::encode_json $sells) + if $sells; 0 }; @@ -108,7 +99,8 @@ return cf::override; } - my $sells = cf::from_json $obs[0]->get_ob_key_value ('ext_reseller_sales'); + my $ext_re_sales = $obs[0]->get_ob_key_value ('ext_reseller_sales'); + my $sells = $ext_re_sales && cf::decode_json $ext_re_sales; my $unpaid_items = {}; @@ -117,7 +109,7 @@ audit_log ($who, 'removes', ob2info ($item)); $item->flag (cf::FLAG_UNPAID, 0); $item->remove; - $item->insert_ob_in_ob ($who); + give_back ($who, $item); next; } @@ -153,12 +145,25 @@ audit_log ($who, 'removed', (join ",", @seller_noted)) if @seller_noted; - $obs[0]->set_ob_key_value (ext_reseller_sales => cf::to_json $sells); + $obs[0]->set_ob_key_value (ext_reseller_sales => cf::encode_json $sells) + if $sells; cf::override; }, ; +sub give_back { + my ($who, $what) = @_; + $who->insert ($what); + $who->esrv_send_item ($what); +} + +sub give_back_with_message { + my ($who, $what, $msg) = @_; + $who->message ($msg, cf::NDI_BROWN); + give_back ($who, $what); +} + cf::object::attachment "reseller_floor", on_drop_on => sub { my ($on, $what, $who) = @_; @@ -167,14 +172,14 @@ return if $what->flag (cf::FLAG_UNPAID); if ($what->type == cf::MONEY) { - $who->message ("The shopkeeper says: Sorry, you can't sell money here.", cf::NDI_BROWN); - $what->insert_ob_in_ob ($who); + give_back_with_message ($who, $what, + "The shopkeeper says: Sorry, you can't sell money here."); return cf::override; } if (!$what->flag (cf::FLAG_IDENTIFIED) && $what->need_identify) { - $who->message ("The shopkeeper says: Sorry, you can't sell unidentified stuff here.", cf::NDI_BROWN); - $what->insert_ob_in_ob ($who); + give_back_with_message ($who, $what, + "The shopkeeper says: Sorry, you can't sell unidentified stuff here."); return cf::override; } @@ -183,42 +188,54 @@ if ($name =~ m/\S/) { unless ($name =~ m/\d+\s*\S+/) { - $who->message ("The shopkeeper says: Sorry, I don't recognize '$name' as currency. Please name your item like '10 royalty' or '10 platinum 2 silver'", cf::NDI_BROWN); - $what->insert_ob_in_ob ($who); + give_back_with_message ($who, $what, + "The shopkeeper says: Sorry, I don't recognize '$name' as currency. " + . "Please name your item like '17 platinum' or '10 gold 8 silver'"); return cf::override; } while ($name =~ s/^\s*(\d+)\s*(\S+)//) { - if ($aliases{lc $2} or $unit{lc $2}) { - $value += $1 * ($unit{lc $2} ? $unit{lc $2} : $unit{$aliases{lc $2}}); + my ($v, $c) = ($1, $2); + if (my $coin = cf::coin_from_name $c) { + $value += $v * $coin->value; } else { - $what->insert_ob_in_ob ($who); - $who->message ("The shopkeeper says: I don't know the currency '$2'", cf::NDI_BROWN); + give_back_with_message ($who, $what, + "The shopkeeper says: I don't know the currency '$c', you can use one of these currencies: " + . (join ", ", cf::coin_names) + ); return cf::override; } } } else { - $value = $what->query_cost ($who, cf::F_SELL | cf::F_SHOP) / ($what->nrof || 1); + # commented out the following line because too many just use the + # reseller shop as dumpyard: + # $value = $what->query_cost ($who, cf::F_SELL | cf::F_SHOP) / ($what->nrof || 1); + give_back_with_message ($who, $what, + "Sorry, you can't just sell stuff without assigning a price to it! " + . "Please name your item like '17 platinum' or '10 gold 8 silver' " + . "and drop it again. (To rename the item use the 'rename' " + . "context menu item in the inventory)." + ); + return cf::override; } if ($value < 0) { - $what->insert_ob_in_ob ($who); - $who->message ("The shopkeeper says: You can't sell something for a negative value: $value", cf::NDI_BROWN); + give_back_with_message ($who, $what, + "The shopkeeper says: You can't sell something for a negative value: $value"); return cf::override; } my $fee = $value / 100; # 1% selling fee unless ($who->pay_amount ($fee)) { - $who->message ( - "The shopkeeper says: You need " . cf::cost_string_from_value ($fee) . " to pay the 1% fee for this item", - cf::NDI_BROWN - ); - $what->insert_ob_in_ob ($who); + give_back_with_message ($who, $what, + "The shopkeeper says: You need " . cf::cost_string_from_value ($fee) + . " to pay the 1% fee for this item"); return cf::override; } else { $who->message ( - "The shopkeeper says: Ok, got the fee of " . cf::cost_string_from_value ($fee) . " for the item", + "The shopkeeper says: Ok, got the fee of " . cf::cost_string_from_value ($fee) + . " for the item", cf::NDI_BROWN ); }