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

Comparing deliantra/maps/perl/reseller.ext (file contents):
Revision 1.11 by root, Sun Aug 27 18:01:38 2006 UTC vs.
Revision 1.15 by root, Fri Oct 27 23:06:36 2006 UTC

… …
6 platina => 50, 6 platina => 50,
7 royalty => 5000, 7 royalty => 5000,
8); 8);
9 9
10my %aliases = ( 10my %aliases = (
11 platinum => 'platina', 11 platinum => 'platina',
12 royalties => 'royalty' 12 royalties => 'royalty',
13); 13);
14 14
15sub find_rec { 15sub find_rec {
16 my ($ob, $cb) = @_; 16 my ($ob, $cb) = @_;
17 17
18 my @unpaid; 18 my @unpaid;
19 for my $i ($ob->inv) { 19 for my $i ($ob->inv) {
20 push @unpaid, $i if $cb->($i); 20 push @unpaid, $i if $cb->($i);
21
21 push @unpaid, find_unpaid ($i, $cb) 22 push @unpaid, find_unpaid ($i, $cb)
22 if $i->inv; 23 if $i->inv;
23 } 24 }
24 return @unpaid; 25 return @unpaid;
25} 26}
26 27
27sub find_unpaid { 28sub find_unpaid {
28 my ($ob) = @_; 29 my ($ob) = @_;
29 my @r = find_rec ($ob, sub { $_[0]->get_flag (cf::FLAG_UNPAID) }); 30 my @r = find_rec ($ob, sub { $_[0]->flag (cf::FLAG_UNPAID) });
30 return @r; 31 return @r;
31} 32}
32 33
33sub find_traded { 34sub find_traded {
34 my ($ob) = @_; 35 my ($ob) = @_;
… …
93 94
94 my $sells = cf::from_json $obs[0]->get_ob_key_value ('ext_reseller_sales'); 95 my $sells = cf::from_json $obs[0]->get_ob_key_value ('ext_reseller_sales');
95 96
96 for my $item (find_unpaid ($who)) { 97 for my $item (find_unpaid ($who)) {
97 if ($item->get_ob_key_value ('ext_reseller_seller') eq $who->name) { 98 if ($item->get_ob_key_value ('ext_reseller_seller') eq $who->name) {
98 $item->set_flag (cf::FLAG_UNPAID, 0); 99 $item->flag (cf::FLAG_UNPAID, 0);
99 $item->remove; 100 $item->remove;
100 $item->insert_ob_in_ob ($who); 101 $item->insert_ob_in_ob ($who);
101 next; 102 next;
102 } 103 }
103 104
… …
111 } 112 }
112 113
113 $self->apply_shop_mat ($who); 114 $self->apply_shop_mat ($who);
114 115
115 for my $item (find_traded ($who)) { 116 for my $item (find_traded ($who)) {
116 next if $item->get_flag (cf::FLAG_UNPAID); 117 next if $item->flag (cf::FLAG_UNPAID);
117 $item->set_value ($item->get_ob_key_value ('ext_reseller_orig_value')); 118 $item->value ($item->get_ob_key_value ('ext_reseller_orig_value'));
118 $item->set_ob_key_value (ext_reseller_seller => ''); 119 $item->set_ob_key_value (ext_reseller_seller => '');
119 } 120 }
120 121
121 $obs[0]->set_ob_key_value (ext_reseller_sales => cf::to_json $sells); 122 $obs[0]->set_ob_key_value (ext_reseller_sales => cf::to_json $sells);
123
124 cf::override;
122 }, 125 },
123; 126;
124 127
125cf::register_attachment "reseller_floor", 128cf::register_attachment "reseller_floor",
126 on_drop_on => sub { 129 on_drop_on => sub {
127 my ($on, $what, $who) = @_; 130 my ($on, $what, $who) = @_;
128 my $name = $what->custom_name; 131 my $name = $what->custom_name;
129 132
130 return if $what->get_flag (cf::FLAG_UNPAID); 133 return if $what->flag (cf::FLAG_UNPAID);
131 134
132 if ($what->type == cf::MONEY) { 135 if ($what->type == cf::MONEY) {
133 $who->message ("The shopkeeper says: Sorry, you can't sell money here.", cf::NDI_BROWN); 136 $who->message ("The shopkeeper says: Sorry, you can't sell money here.", cf::NDI_BROWN);
134 $what->insert_ob_in_ob ($who); 137 $what->insert_ob_in_ob ($who);
135 return cf::override; 138 return cf::override;
136 } 139 }
137 140
138 if (!$what->get_flag (cf::FLAG_IDENTIFIED) && $what->need_identify) { 141 if (!$what->flag (cf::FLAG_IDENTIFIED) && $what->need_identify) {
139 $who->message ("The shopkeeper says: Sorry, you can't sell unidentified stuff here.", cf::NDI_BROWN); 142 $who->message ("The shopkeeper says: Sorry, you can't sell unidentified stuff here.", cf::NDI_BROWN);
140 $what->insert_ob_in_ob ($who); 143 $what->insert_ob_in_ob ($who);
141 return cf::override; 144 return cf::override;
142 } 145 }
143 146
… …
184 "The shopkeeper says: Ok, got the fee of " . cf::cost_string_from_value ($fee) . " for the item", 187 "The shopkeeper says: Ok, got the fee of " . cf::cost_string_from_value ($fee) . " for the item",
185 cf::NDI_BROWN 188 cf::NDI_BROWN
186 ); 189 );
187 } 190 }
188 191
189 $what->set_value ($value); 192 $what->value ($value);
190 my $cost = $what->query_cost ($who, cf::F_BUY | cf::F_SHOP) / ($what->nrof || 1); 193 my $cost = $what->query_cost ($who, cf::F_BUY | cf::F_SHOP) / ($what->nrof || 1);
191 194
192 my $fact = 0; 195 my $fact = 0;
193 if ($cost) { 196 if ($cost) {
194 $fact = $value / $cost; 197 $fact = $value / $cost;
195 $what->set_value (cf::ceil ($value * $fact)); 198 $what->value (cf::ceil ($value * $fact));
196 } 199 }
197 200
198# warn "END VALUE: $value * $fact => " . $what->value . "\n"; 201# warn "END VALUE: $value * $fact => " . $what->value . "\n";
199 202
200# my $cost = $what->query_cost ($who, cf::F_BUY | cf::F_SHOP) / $what->nrof; 203# my $cost = $what->query_cost ($who, cf::F_BUY | cf::F_SHOP) / $what->nrof;
… …
208 ); 211 );
209 212
210 $what->set_ob_key_value (ext_reseller_seller => $who->name); 213 $what->set_ob_key_value (ext_reseller_seller => $who->name);
211 $what->set_ob_key_value (ext_reseller_orig_value => $orig_value); 214 $what->set_ob_key_value (ext_reseller_orig_value => $orig_value);
212# warn "SET SELLER ON " . $what->name . " + " . $what->{seller}->[0] . "\n"; 215# warn "SET SELLER ON " . $what->name . " + " . $what->{seller}->[0] . "\n";
213 $what->set_custom_name (
214 $what->name . " (by " . $who->name . ")" 216 $what->custom_name ($what->name . " (by " . $who->name . ")");
215 );
216 $what->set_flag (cf::FLAG_UNPAID, 1); 217 $what->flag (cf::FLAG_UNPAID, 1);
217 $what->insert_ob_in_map_at ($who->map, $who, cf::INS_BELOW_ORIGINATOR, $who->x, $who->y); 218 $what->insert_ob_in_map_at ($who->map, $who, cf::INS_BELOW_ORIGINATOR, $who->x, $who->y);
218 219
219 cf::override; 220 cf::override;
220 }, 221 },
221; 222;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines