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.5 by elmex, Wed Jan 24 19:39:14 2007 UTC vs.
Revision 1.6 by elmex, Wed Jun 6 17:41:17 2007 UTC

51 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} 52}
53 53
54cf::register_script_function "reseller::list_sells" => sub { 54cf::register_script_function "reseller::list_sells" => sub {
55 my ($who, $msg, $npc) = @_; 55 my ($who, $msg, $npc) = @_;
56 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;
57 my $hissells = $sells->{$who->name}; 58 my $hissells = $sells->{$who->name};
58 59
59 unless (keys %{$hissells || {}}) { 60 unless (keys %{$hissells || {}}) {
60 $who->reply ($npc, "I'm sorry, but you sold nothing.\n"); 61 $who->reply ($npc, "I'm sorry, but you sold nothing.\n");
61 return 0; 62 return 0;
71 0 72 0
72}; 73};
73 74
74cf::register_script_function "reseller::pay_player" => sub { 75cf::register_script_function "reseller::pay_player" => sub {
75 my ($who, $msg, $npc) = @_; 76 my ($who, $msg, $npc) = @_;
76 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;
77 my $hissells = $sells->{$who->name}; 79 my $hissells = $sells->{$who->name};
78 80
79 unless (keys %{$hissells || {}}) { 81 unless (keys %{$hissells || {}}) {
80 $who->reply ($npc, "I'm sorry, but you sold nothing.\n"); 82 $who->reply ($npc, "I'm sorry, but you sold nothing.\n");
81 return 0; 83 return 0;
89 91
90 audit_log ($who, 'collects', "$sum silver"); 92 audit_log ($who, 'collects', "$sum silver");
91 93
92 $sells->{$who->name} = {}; 94 $sells->{$who->name} = {};
93 95
94 $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;
95 98
96 0 99 0
97}; 100};
98 101
99cf::object::attachment "reseller_shopmat", 102cf::object::attachment "reseller_shopmat",
106 unless (@obs) { 109 unless (@obs) {
107 warn "Couldn't find shop keeper in " . $who->map->path . "\n"; 110 warn "Couldn't find shop keeper in " . $who->map->path . "\n";
108 return cf::override; 111 return cf::override;
109 } 112 }
110 113
111 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;
112 116
113 my $unpaid_items = {}; 117 my $unpaid_items = {};
114 118
115 for my $item (find_unpaid ($who)) { 119 for my $item (find_unpaid ($who)) {
116 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) {
151 } 155 }
152 156
153 audit_log ($who, 'removed', (join ",", @seller_noted)) 157 audit_log ($who, 'removed', (join ",", @seller_noted))
154 if @seller_noted; 158 if @seller_noted;
155 159
156 $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;
157 162
158 cf::override; 163 cf::override;
159 }, 164 },
160; 165;
161 166

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines