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.1 by root, Fri Dec 15 19:29:18 2006 UTC vs.
Revision 1.16 by elmex, Thu Aug 20 18:27:21 2009 UTC

1#!perl 1#!perl # mandatory
2 2
3my %unit = ( 3sub ob2info {
4 silver => 1, 4 my ($item, $rval) = @_;
5 gold => 10, 5 sprintf "[%s from %s (%d:%d%s) nrof: %d uuid: %s]",
6 platina => 50, 6 $item->name, $item->kv_get ('ext_reseller_seller'),
7 royalty => 5000, 7 $item->kv_get ('ext_reseller_orig_value'), $item->value,
8); 8 (defined $rval ? ":$rval" : ""), $item->nrof, $item->uuid;
9}
9 10
10my %aliases = ( 11sub audit_log {
11 platinum => 'platina', 12 my ($who, $action, $info) = @_;
12 royalties => 'royalty', 13 warn
13); 14 sprintf "RESELLER_AUDIT(%s) %s %s: %s\n",
15 $who->map->path, $who->name, $action, $info;
16}
17
18sub find_rec;
14 19
15sub find_rec { 20sub find_rec {
16 my ($ob, $cb) = @_; 21 my ($ob, $cb) = @_;
17 22
18 my @unpaid; 23 my @found;
19 for my $i ($ob->inv) { 24 for my $i ($ob->inv) {
20 push @unpaid, $i if $cb->($i); 25 push @found, $i if $cb->($i);
21 26 push @found, find_rec $i, $cb if $i->inv;
22 push @unpaid, find_unpaid ($i, $cb)
23 if $i->inv;
24 } 27 }
28
25 return @unpaid; 29 return @found;
26} 30}
27 31
28sub find_unpaid { 32sub find_unpaid {
29 my ($ob) = @_; 33 my ($ob) = @_;
30 my @r = find_rec ($ob, sub { $_[0]->flag (cf::FLAG_UNPAID) }); 34 find_rec $ob, sub { $_[0]->flag (cf::FLAG_UNPAID) };
31 return @r;
32} 35}
33 36
34sub find_traded { 37sub find_traded {
35 my ($ob) = @_; 38 my ($ob) = @_;
36 my @r = find_rec ($ob, sub { $_[0]->get_ob_key_value ('ext_reseller_seller') ne '' }); 39 find_rec $ob, sub { $_[0]->kv_get ('ext_reseller_seller') ne '' };
37 return @r;
38} 40}
39 41
40cf::register_script_function "reseller::list_sells" => sub { 42cf::register_script_function "reseller::list_sells" => sub {
41 my ($who, $msg, $npc) = @_; 43 my ($who, $msg, $npc) = @_;
42 my $sells = cf::from_json $npc->get_ob_key_value ('ext_reseller_sales'); 44 my $ext_re_sales = $npc->kv_get ('ext_reseller_sales');
45 my $sells = $ext_re_sales && cf::decode_json $ext_re_sales;
43 my $hissells = $sells->{$who->name}; 46 my $hissells = $sells->{$who->name};
44 47
45 unless (keys %{$hissells || {}}) { 48 unless (keys %{$hissells || {}}) {
46 $who->reply ($npc, "I'm sorry, but you sold nothing.\n"); 49 $who->reply ($npc, "I'm sorry, but you sold nothing.\n");
47 return 0; 50 return 0;
48 } 51 }
49 52
50 $who->reply ($npc, "You sold:\n", cf::NDI_BROWN); 53 my $reply = "T<You sold:>\n\n";
54
51 for (keys %$hissells) { 55 for (keys %$hissells) {
52 my $n = $_; 56 my $n = $_;
53 $n =~ s/\s*\(unpaid\)//g; 57 $n =~ s/\s*\(unpaid\)//g;
54 $who->reply ($npc, "$n for " . cf::cost_string_from_value ($hissells->{$_}), cf::NDI_BROWN); 58 $reply .= " B<$n> (for " . cf::cost_string_from_value ($hissells->{$_}) . ")\n";
55 } 59 }
60
61 $who->reply ($npc, $reply);
56 62
57 0 63 0
58}; 64};
59 65
60cf::register_script_function "reseller::pay_player" => sub { 66cf::register_script_function "reseller::pay_player" => sub {
61 my ($who, $msg, $npc) = @_; 67 my ($who, $msg, $npc) = @_;
62 my $sells = cf::from_json $npc->get_ob_key_value ('ext_reseller_sales'); 68 my $ext_re_sales = $npc->kv_get ('ext_reseller_sales');
69 my $sells = $ext_re_sales && cf::decode_json $ext_re_sales;
63 my $hissells = $sells->{$who->name}; 70 my $hissells = $sells->{$who->name};
64 71
65 unless (keys %{$hissells || {}}) { 72 unless (keys %{$hissells || {}}) {
66 $who->reply ($npc, "I'm sorry, but you sold nothing.\n"); 73 $who->reply ($npc, "I'm sorry, but you sold nothing.\n");
67 return 0; 74 return 0;
69 76
70 my $sum = 0; 77 my $sum = 0;
71 $sum += $_ for values %$hissells; 78 $sum += $_ for values %$hissells;
72 79
73 $who->pay_player ($sum); 80 $who->pay_player ($sum);
74 $who->reply ($npc, "Here are the " . cf::cost_string_from_value ($sum) . " for your sales"); 81 $who->reply ($npc, "Here are the " . cf::cost_string_from_value ($sum) . " for your sales.");
82
83 audit_log ($who, 'collects', "$sum silver");
75 84
76 $sells->{$who->name} = {}; 85 $sells->{$who->name} = {};
77 86
78 $npc->set_ob_key_value (ext_reseller_sales => cf::to_json $sells); 87 $npc->kv_set (ext_reseller_sales => cf::encode_json $sells)
88 if $sells;
79 89
80 0 90 0
81}; 91};
82 92
83cf::register_attachment "reseller_shopmat", 93cf::object::attachment "reseller_shopmat",
84 on_move_trigger => sub { 94 on_move_trigger => sub {
85 my ($self, $who_caused, $who) = @_; 95 my ($self, $who_caused, $who) = @_;
86 96
87 my @obs = grep { $_->name eq $self->{reseller_shopmat}{npc_name} } 97 my @obs = grep { $_->name eq $self->{reseller_shopmat}{npc_name} }
88 $who->map->at ($self->{reseller_shopmat}{npc_x}, $self->{reseller_shopmat}{npc_y}); 98 $who->map->at ($self->{reseller_shopmat}{npc_x}, $self->{reseller_shopmat}{npc_y});
89 99
90 unless (@obs) { 100 unless (@obs) {
91 warn "Couldn't find shop keeper in " . $who->map . "\n"; 101 warn "Couldn't find shop keeper in " . $who->map->path . "\n";
92 return cf::override; 102 return cf::override;
93 } 103 }
94 104
95 my $sells = cf::from_json $obs[0]->get_ob_key_value ('ext_reseller_sales'); 105 my $ext_re_sales = $obs[0]->kv_get ('ext_reseller_sales');
106 my $sells = $ext_re_sales && cf::decode_json $ext_re_sales;
96 107
97 my $unpaid_items = {}; 108 my $unpaid_items = {};
98 109
99 for my $item (find_unpaid ($who)) { 110 for my $item (find_unpaid ($who)) {
100 if ($item->get_ob_key_value ('ext_reseller_seller') eq $who->name) { 111 if ($item->kv_get ('ext_reseller_seller') eq $who->name) {
112 audit_log ($who, 'removes', ob2info ($item));
101 $item->flag (cf::FLAG_UNPAID, 0); 113 $item->flag (cf::FLAG_UNPAID, 0);
102 $item->remove; 114 $item->remove;
103 $item->insert_ob_in_ob ($who); 115 give_back ($who, $item);
104 next; 116 next;
105 } 117 }
106 118
107 my $value = $item->query_cost ($who, cf::F_BUY | cf::F_SHOP); 119 my $value = $item->query_cost ($who, cf::F_BUY | cf::F_SHOP);
108 120
109 warn "Object " . $item->name . " bought by " . $who->name . " on map " 121 warn "Object " . $item->name . " bought by " . $who->name . " on map "
110 . $who->map->path . " for $value silver has no seller set\n" 122 . $who->map->path . " for $value silver has no seller set\n"
111 if $item->get_ob_key_value ('ext_reseller_seller') eq ''; 123 if $item->kv_get ('ext_reseller_seller') eq '';
112 124
113 $unpaid_items->{$item} = [$value, $item]; 125 $unpaid_items->{$item} = [$value, $item];
114 } 126 }
115 127
128 audit_log ($who, 'wants', (join ",", map { ob2info ($_->[1], $_->[0]) } values %$unpaid_items))
129 if %$unpaid_items;
130
116 $self->apply_shop_mat ($who); 131 $self->apply_shop_mat ($who);
132
133 my @seller_noted;
117 134
118 for my $item (find_traded ($who)) { 135 for my $item (find_traded ($who)) {
119 next if $item->flag (cf::FLAG_UNPAID); 136 next if $item->flag (cf::FLAG_UNPAID);
120 if (my $value = $unpaid_items->{$item}[0]) { 137 if (my $value = $unpaid_items->{$item}[0]) {
138 push @seller_noted, ob2info ($item, $value)."P";
121 $sells->{$item->get_ob_key_value ('ext_reseller_seller')}->{$item->name} += $value; 139 $sells->{$item->kv_get ('ext_reseller_seller')}->{$item->name} += $value;
140 } else {
141 push @seller_noted, ob2info ($item)."T";
122 } 142 }
123 143
124 $item->value ($item->get_ob_key_value ('ext_reseller_orig_value')); 144 $item->value ($item->kv_get ('ext_reseller_orig_value'));
125 $item->set_ob_key_value (ext_reseller_seller => ''); 145 $item->kv_del ("ext_reseller_seller");
126 } 146 }
127 147
148 audit_log ($who, 'removed', (join ",", @seller_noted))
149 if @seller_noted;
150
128 $obs[0]->set_ob_key_value (ext_reseller_sales => cf::to_json $sells); 151 $obs[0]->kv_set (ext_reseller_sales => cf::encode_json $sells)
152 if $sells;
129 153
130 cf::override; 154 cf::override;
131 }, 155 },
132; 156;
133 157
158sub give_back {
159 my ($who, $what) = @_;
160 $who->insert ($what);
161}
162
163sub give_back_with_message {
164 my ($who, $what, $msg) = @_;
165 $who->message ($msg, cf::NDI_BROWN);
166 give_back ($who, $what);
167}
168
134cf::register_attachment "reseller_floor", 169cf::object::attachment "reseller_floor",
135 on_drop_on => sub { 170 on_drop_on => sub {
136 my ($on, $what, $who) = @_; 171 my ($on, $what, $who) = @_;
137 my $name = $what->custom_name; 172 my $name = $what->custom_name;
138 173
139 return if $what->flag (cf::FLAG_UNPAID); 174 return if $what->flag (cf::FLAG_UNPAID);
140 175
141 if ($what->type == cf::MONEY) { 176 if ($what->type == cf::MONEY) {
177 give_back_with_message ($who, $what,
142 $who->message ("The shopkeeper says: Sorry, you can't sell money here.", cf::NDI_BROWN); 178 "The shopkeeper says: Sorry, you can't sell money here.");
143 $what->insert_ob_in_ob ($who);
144 return cf::override; 179 return cf::override;
145 } 180 }
146 181
147 if (!$what->flag (cf::FLAG_IDENTIFIED) && $what->need_identify) { 182 if (!$what->flag (cf::FLAG_IDENTIFIED) && $what->need_identify) {
183 give_back_with_message ($who, $what,
148 $who->message ("The shopkeeper says: Sorry, you can't sell unidentified stuff here.", cf::NDI_BROWN); 184 "The shopkeeper says: Sorry, you can't sell unidentified stuff here.");
149 $what->insert_ob_in_ob ($who);
150 return cf::override; 185 return cf::override;
151 } 186 }
152 187
153 my $orig_value = $what->value; 188 my $orig_value = $what->value;
154 my $value = 0; 189 my $value = 0;
155 190
156 if ($name =~ m/\S/) { 191 if ($name =~ m/\S/) {
157 unless ($name =~ m/\d+\s*\S+/) { 192 unless ($name =~ m/\d+\s*\S+/) {
158 $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); 193 give_back_with_message ($who, $what,
159 $what->insert_ob_in_ob ($who); 194 "The shopkeeper says: Sorry, I don't recognize '$name' as currency. "
195 . "Please name your item like '17 platinum' or '10 gold 8 silver.'");
160 return cf::override; 196 return cf::override;
161 } 197 }
162 198
163 while ($name =~ s/^\s*(\d+)\s*(\S+)//) { 199 while ($name =~ s/^\s*(\d+)\s*(\S+)//) {
164 if ($aliases{lc $2} or $unit{lc $2}) { 200 my ($v, $c) = ($1, $2);
165 $value += $1 * ($unit{lc $2} ? $unit{lc $2} : $unit{$aliases{lc $2}}); 201 if (my $coin = cf::coin_from_name $c) {
202 $value += $v * $coin->value;
166 } else { 203 } else {
167 $what->insert_ob_in_ob ($who); 204 give_back_with_message ($who, $what,
168 $who->message ("The shopkeeper says: I don't know the currency '$2'", cf::NDI_BROWN); 205 "The shopkeeper says: I don't know the currency '$c', you can use one of these currencies: "
206 . (join ", ", cf::coin_names)
207 );
169 return cf::override; 208 return cf::override;
170 } 209 }
171 } 210 }
172 } else { 211 } else {
212 # commented out the following line because too many just use the
213 # reseller shop as dumpyard:
173 $value = $what->query_cost ($who, cf::F_SELL | cf::F_SHOP) / ($what->nrof || 1); 214 # $value = $what->query_cost ($who, cf::F_SELL | cf::F_SHOP) / ($what->nrof || 1);
215 give_back_with_message ($who, $what,
216 "Sorry, you can't just sell stuff without assigning a price to it! "
217 . "Please name your item like '17 platinum' or '10 gold 8 silver' "
218 . "and drop it again. (To rename the item use the B<rename> "
219 . "entry in the inventory item popup menu)."
220 );
221 return cf::override;
222 }
223
224 if ($value > 100 ** 4) { # also for overflow prevention
225 give_back_with_message ($who, $what,
226 "The shopkeeper says: You can't sell something for such a high "
227 . "value. Please keep it below 100 royalty.");
228 return cf::override;
174 } 229 }
175 230
176 if ($value < 0) { 231 if ($value < 0) {
177 $what->insert_ob_in_ob ($who); 232 give_back_with_message ($who, $what,
178 $who->message ("The shopkeeper says: You can't sell something for a negative value: $value", cf::NDI_BROWN); 233 "The shopkeeper says: You can't sell something for a negative value: $value.");
179 return cf::override; 234 return cf::override;
180 } 235 }
181 236
182 my $fee = $value / 100; # 1% selling fee 237 my $fee = $value / 100; # 1% selling fee
183 238
184 unless ($who->pay_amount ($fee)) { 239 unless ($who->pay_amount ($fee)) {
185 $who->message ( 240 give_back_with_message ($who, $what,
186 "The shopkeeper says: You need " . cf::cost_string_from_value ($fee) . " to pay the 1% fee for this item", 241 "The shopkeeper says: You need " . cf::cost_string_from_value ($fee)
187 cf::NDI_BROWN 242 . " to pay the 1% fee for this item.");
188 );
189 $what->insert_ob_in_ob ($who);
190 return cf::override; 243 return cf::override;
191 } else { 244 } else {
192 $who->message ( 245 $who->message (
193 "The shopkeeper says: Ok, got the fee of " . cf::cost_string_from_value ($fee) . " for the item", 246 "The shopkeeper says: Ok, got the fee of " . cf::cost_string_from_value ($fee)
247 . " for the item.",
194 cf::NDI_BROWN 248 cf::NDI_BROWN
195 ); 249 );
196 } 250 }
197 251
198 $what->value ($value); 252 $what->value ($value);
214 . ($what->nrof || 1) . " " . $what->name . " to be sold for at least " 268 . ($what->nrof || 1) . " " . $what->name . " to be sold for at least "
215 . cf::cost_string_from_value ($value) 269 . cf::cost_string_from_value ($value)
216 . ($what->nrof > 1 ? " each" : ""), cf::NDI_BROWN 270 . ($what->nrof > 1 ? " each" : ""), cf::NDI_BROWN
217 ); 271 );
218 272
219 $what->set_ob_key_value (ext_reseller_seller => $who->name); 273 $what->kv_set (ext_reseller_seller => $who->name);
220 $what->set_ob_key_value (ext_reseller_orig_value => $orig_value); 274 $what->kv_set (ext_reseller_orig_value => $orig_value);
221# warn "SET SELLER ON " . $what->name . " + " . $what->{seller}->[0] . "\n"; 275# warn "SET SELLER ON " . $what->name . " + " . $what->{seller}->[0] . "\n";
222 $what->custom_name ($what->name . " (by " . $who->name . ")"); 276 $what->custom_name ($what->name . " (by " . $who->name . ")");
223 $what->flag (cf::FLAG_UNPAID, 1); 277 $what->flag (cf::FLAG_UNPAID, 1);
224 $what->insert_ob_in_map_at ($who->map, $who, cf::INS_BELOW_ORIGINATOR, $who->x, $who->y); 278 $what->insert_ob_in_map_at ($who->map, $who, cf::INS_BELOW_ORIGINATOR, $who->x, $who->y);
225 279
280 audit_log ($who, 'sells', ob2info ($what));
281
226 cf::override; 282 cf::override;
227 }, 283 },
228; 284;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines