--- deliantra/server/ext/reseller.ext 2008/04/10 15:35:16 1.11 +++ deliantra/server/ext/reseller.ext 2008/10/06 18:26:35 1.15 @@ -3,8 +3,8 @@ sub ob2info { my ($item, $rval) = @_; sprintf "[%s from %s (%d:%d%s) nrof: %d uuid: %s]", - $item->name, $item->get_ob_key_value ('ext_reseller_seller'), - $item->get_ob_key_value ('ext_reseller_orig_value'), $item->value, + $item->name, $item->kv_get ('ext_reseller_seller'), + $item->kv_get ('ext_reseller_orig_value'), $item->value, (defined $rval ? ":$rval" : ""), $item->nrof, $item->uuid; } @@ -36,12 +36,12 @@ sub find_traded { my ($ob) = @_; - find_rec $ob, sub { $_[0]->get_ob_key_value ('ext_reseller_seller') ne '' }; + find_rec $ob, sub { $_[0]->kv_get ('ext_reseller_seller') ne '' }; } cf::register_script_function "reseller::list_sells" => sub { my ($who, $msg, $npc) = @_; - my $ext_re_sales = $npc->get_ob_key_value ('ext_reseller_sales'); + my $ext_re_sales = $npc->kv_get ('ext_reseller_sales'); my $sells = $ext_re_sales && cf::decode_json $ext_re_sales; my $hissells = $sells->{$who->name}; @@ -50,19 +50,22 @@ return 0; } - $who->reply ($npc, "You sold:\n", cf::NDI_BROWN); + my $reply = "T\n\n"; + for (keys %$hissells) { my $n = $_; $n =~ s/\s*\(unpaid\)//g; - $who->reply ($npc, "$n for " . cf::cost_string_from_value ($hissells->{$_}), cf::NDI_BROWN); + $reply .= " B<$n> (for " . cf::cost_string_from_value ($hissells->{$_}) . ")\n"; } + $who->reply ($npc, $reply); + 0 }; cf::register_script_function "reseller::pay_player" => sub { my ($who, $msg, $npc) = @_; - my $ext_re_sales = $npc->get_ob_key_value ('ext_reseller_sales'); + my $ext_re_sales = $npc->kv_get ('ext_reseller_sales'); my $sells = $ext_re_sales && cf::decode_json $ext_re_sales; my $hissells = $sells->{$who->name}; @@ -75,13 +78,13 @@ $sum += $_ for values %$hissells; $who->pay_player ($sum); - $who->reply ($npc, "Here are the " . cf::cost_string_from_value ($sum) . " for your sales"); + $who->reply ($npc, "Here are the " . cf::cost_string_from_value ($sum) . " for your sales."); audit_log ($who, 'collects', "$sum silver"); $sells->{$who->name} = {}; - $npc->set_ob_key_value (ext_reseller_sales => cf::encode_json $sells) + $npc->kv_set (ext_reseller_sales => cf::encode_json $sells) if $sells; 0 @@ -99,13 +102,13 @@ return cf::override; } - my $ext_re_sales = $obs[0]->get_ob_key_value ('ext_reseller_sales'); + my $ext_re_sales = $obs[0]->kv_get ('ext_reseller_sales'); my $sells = $ext_re_sales && cf::decode_json $ext_re_sales; my $unpaid_items = {}; for my $item (find_unpaid ($who)) { - if ($item->get_ob_key_value ('ext_reseller_seller') eq $who->name) { + if ($item->kv_get ('ext_reseller_seller') eq $who->name) { audit_log ($who, 'removes', ob2info ($item)); $item->flag (cf::FLAG_UNPAID, 0); $item->remove; @@ -117,7 +120,7 @@ warn "Object " . $item->name . " bought by " . $who->name . " on map " . $who->map->path . " for $value silver has no seller set\n" - if $item->get_ob_key_value ('ext_reseller_seller') eq ''; + if $item->kv_get ('ext_reseller_seller') eq ''; $unpaid_items->{$item} = [$value, $item]; } @@ -133,19 +136,19 @@ next if $item->flag (cf::FLAG_UNPAID); if (my $value = $unpaid_items->{$item}[0]) { push @seller_noted, ob2info ($item, $value)."P"; - $sells->{$item->get_ob_key_value ('ext_reseller_seller')}->{$item->name} += $value; + $sells->{$item->kv_get ('ext_reseller_seller')}->{$item->name} += $value; } else { push @seller_noted, ob2info ($item)."T"; } - $item->value ($item->get_ob_key_value ('ext_reseller_orig_value')); - $item->set_ob_key_value (ext_reseller_seller => ''); + $item->value ($item->kv_get ('ext_reseller_orig_value')); + $item->kv_del ("ext_reseller_seller"); } audit_log ($who, 'removed', (join ",", @seller_noted)) if @seller_noted; - $obs[0]->set_ob_key_value (ext_reseller_sales => cf::encode_json $sells) + $obs[0]->kv_set (ext_reseller_sales => cf::encode_json $sells) if $sells; cf::override; @@ -155,7 +158,6 @@ sub give_back { my ($who, $what) = @_; $who->insert ($what); - $who->esrv_send_item ($what); } sub give_back_with_message { @@ -190,7 +192,7 @@ unless ($name =~ m/\d+\s*\S+/) { 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'"); + . "Please name your item like '17 platinum' or '10 gold 8 silver.'"); return cf::override; } @@ -213,15 +215,15 @@ 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)." + . "and drop it again. (To rename the item use the B " + . "entry in the inventory item popup menu)." ); return cf::override; } if ($value < 0) { give_back_with_message ($who, $what, - "The shopkeeper says: You can't sell something for a negative value: $value"); + "The shopkeeper says: You can't sell something for a negative value: $value."); return cf::override; } @@ -230,12 +232,12 @@ unless ($who->pay_amount ($fee)) { 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"); + . " 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", + . " for the item.", cf::NDI_BROWN ); } @@ -261,8 +263,8 @@ . ($what->nrof > 1 ? " each" : ""), cf::NDI_BROWN ); - $what->set_ob_key_value (ext_reseller_seller => $who->name); - $what->set_ob_key_value (ext_reseller_orig_value => $orig_value); + $what->kv_set (ext_reseller_seller => $who->name); + $what->kv_set (ext_reseller_orig_value => $orig_value); # warn "SET SELLER ON " . $what->name . " + " . $what->{seller}->[0] . "\n"; $what->custom_name ($what->name . " (by " . $who->name . ")"); $what->flag (cf::FLAG_UNPAID, 1);