ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/reseller.ext
(Generate patch)

Comparing deliantra/server/ext/reseller.ext (file contents):
Revision 1.3 by root, Thu Dec 21 22:41:34 2006 UTC vs.
Revision 1.7 by root, Mon Jun 11 21:38:13 2007 UTC

1#!perl 1#!perl # mandatory
2 2
3my %unit = ( 3my %unit = (
4 silver => 1, 4 silver => 1,
5 gold => 10, 5 gold => 10,
6 platina => 50, 6 platina => 50,
25 warn 25 warn
26 sprintf "RESELLER_AUDIT(%s) %s %s: %s\n", 26 sprintf "RESELLER_AUDIT(%s) %s %s: %s\n",
27 $who->map->path, $who->name, $action, $info; 27 $who->map->path, $who->name, $action, $info;
28} 28}
29 29
30sub find_rec;
31
30sub find_rec { 32sub find_rec {
31 my ($ob, $cb) = @_; 33 my ($ob, $cb) = @_;
32 34
33 my @unpaid; 35 my @found;
34 for my $i ($ob->inv) { 36 for my $i ($ob->inv) {
35 push @unpaid, $i if $cb->($i); 37 push @found, $i if $cb->($i);
36 38 push @found, find_rec $i, $cb if $i->inv;
37 push @unpaid, find_unpaid ($i, $cb)
38 if $i->inv;
39 } 39 }
40
40 return @unpaid; 41 return @found;
41} 42}
42 43
43sub find_unpaid { 44sub find_unpaid {
44 my ($ob) = @_; 45 my ($ob) = @_;
45 my @r = find_rec ($ob, sub { $_[0]->flag (cf::FLAG_UNPAID) }); 46 find_rec $ob, sub { $_[0]->flag (cf::FLAG_UNPAID) };
46 return @r;
47} 47}
48 48
49sub find_traded { 49sub find_traded {
50 my ($ob) = @_; 50 my ($ob) = @_;
51 my @r = find_rec ($ob, sub { $_[0]->get_ob_key_value ('ext_reseller_seller') ne '' }); 51 find_rec $ob, sub { $_[0]->get_ob_key_value ('ext_reseller_seller') ne '' };
52 return @r;
53} 52}
54 53
55cf::register_script_function "reseller::list_sells" => sub { 54cf::register_script_function "reseller::list_sells" => sub {
56 my ($who, $msg, $npc) = @_; 55 my ($who, $msg, $npc) = @_;
57 my $sells = cf::from_json $npc->get_ob_key_value ('ext_reseller_sales'); 56 my $ext_re_sales = $npc->get_ob_key_value ('ext_reseller_sales');
57 my $sells = $ext_re_sales && cf::from_json $ext_re_sales;
58 my $hissells = $sells->{$who->name}; 58 my $hissells = $sells->{$who->name};
59 59
60 unless (keys %{$hissells || {}}) { 60 unless (keys %{$hissells || {}}) {
61 $who->reply ($npc, "I'm sorry, but you sold nothing.\n"); 61 $who->reply ($npc, "I'm sorry, but you sold nothing.\n");
62 return 0; 62 return 0;
72 0 72 0
73}; 73};
74 74
75cf::register_script_function "reseller::pay_player" => sub { 75cf::register_script_function "reseller::pay_player" => sub {
76 my ($who, $msg, $npc) = @_; 76 my ($who, $msg, $npc) = @_;
77 my $sells = cf::from_json $npc->get_ob_key_value ('ext_reseller_sales'); 77 my $ext_re_sales = $npc->get_ob_key_value ('ext_reseller_sales');
78 my $sells = $ext_re_sales && cf::from_json $ext_re_sales;
78 my $hissells = $sells->{$who->name}; 79 my $hissells = $sells->{$who->name};
79 80
80 unless (keys %{$hissells || {}}) { 81 unless (keys %{$hissells || {}}) {
81 $who->reply ($npc, "I'm sorry, but you sold nothing.\n"); 82 $who->reply ($npc, "I'm sorry, but you sold nothing.\n");
82 return 0; 83 return 0;
90 91
91 audit_log ($who, 'collects', "$sum silver"); 92 audit_log ($who, 'collects', "$sum silver");
92 93
93 $sells->{$who->name} = {}; 94 $sells->{$who->name} = {};
94 95
95 $npc->set_ob_key_value (ext_reseller_sales => cf::to_json $sells); 96 $npc->set_ob_key_value (ext_reseller_sales => cf::to_json $sells)
97 if $sells;
96 98
97 0 99 0
98}; 100};
99 101
100cf::object::attachment "reseller_shopmat", 102cf::object::attachment "reseller_shopmat",
107 unless (@obs) { 109 unless (@obs) {
108 warn "Couldn't find shop keeper in " . $who->map->path . "\n"; 110 warn "Couldn't find shop keeper in " . $who->map->path . "\n";
109 return cf::override; 111 return cf::override;
110 } 112 }
111 113
112 my $sells = cf::from_json $obs[0]->get_ob_key_value ('ext_reseller_sales'); 114 my $ext_re_sales = $obs[0]->get_ob_key_value ('ext_reseller_sales');
115 my $sells = $ext_re_sales && cf::from_json $ext_re_sales;
113 116
114 my $unpaid_items = {}; 117 my $unpaid_items = {};
115 118
116 for my $item (find_unpaid ($who)) { 119 for my $item (find_unpaid ($who)) {
117 if ($item->get_ob_key_value ('ext_reseller_seller') eq $who->name) { 120 if ($item->get_ob_key_value ('ext_reseller_seller') eq $who->name) {
152 } 155 }
153 156
154 audit_log ($who, 'removed', (join ",", @seller_noted)) 157 audit_log ($who, 'removed', (join ",", @seller_noted))
155 if @seller_noted; 158 if @seller_noted;
156 159
157 $obs[0]->set_ob_key_value (ext_reseller_sales => cf::to_json $sells); 160 $obs[0]->set_ob_key_value (ext_reseller_sales => cf::to_json $sells)
161 if $sells;
158 162
159 cf::override; 163 cf::override;
160 }, 164 },
161; 165;
162 166

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines