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.6 by elmex, Tue Aug 15 06:20:41 2006 UTC vs.
Revision 1.16 by elmex, Sat Nov 18 23:18:51 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) = @_;
… …
77 $npc->set_ob_key_value (ext_reseller_sales => cf::to_json $sells); 78 $npc->set_ob_key_value (ext_reseller_sales => cf::to_json $sells);
78 79
79 0 80 0
80}; 81};
81 82
82sub on_trigger { 83cf::register_attachment "reseller_shopmat",
84 on_move_trigger => sub {
83 my ($ev, $ob, $who_caused, $who) = @_; 85 my ($self, $who_caused, $who) = @_;
84 my $opt = $ev->options;
85 return 1 unless $opt =~ m/(\S+),(\d+),(\d+)/;
86 86
87 my @obs = grep { $_->name eq $1 } $who->map->at ($2, $3); 87 my @obs = grep { $_->name eq $self->{reseller_shopmat}{npc_name} }
88 $who->map->at ($self->{reseller_shopmat}{npc_x}, $self->{reseller_shopmat}{npc_y});
89
88 unless (@obs) { 90 unless (@obs) {
89 warn "Couldn't find shop keeper in " . $who->map . "\n"; 91 warn "Couldn't find shop keeper in " . $who->map . "\n";
90 return 1; 92 return cf::override;
91 } 93 }
92 94
93 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');
94 96
97 my $unpaid_items = {};
98
95 for my $item (find_unpaid ($who)) { 99 for my $item (find_unpaid ($who)) {
96 if ($item->get_ob_key_value ('ext_reseller_seller') eq $who->name) { 100 if ($item->get_ob_key_value ('ext_reseller_seller') eq $who->name) {
97 $item->set_flag (cf::FLAG_UNPAID, 0); 101 $item->flag (cf::FLAG_UNPAID, 0);
98 $item->remove; 102 $item->remove;
99 $item->insert_ob_in_ob ($who); 103 $item->insert_ob_in_ob ($who);
100 next; 104 next;
101 } 105 }
102 106
103 my $value = $item->query_cost ($who, cf::F_BUY | cf::F_SHOP); 107 my $value = $item->query_cost ($who, cf::F_BUY | cf::F_SHOP);
104 108
105 warn "Object " . $item->name . " bought by " . $who->name . " on map " 109 warn "Object " . $item->name . " bought by " . $who->name . " on map "
106 . $who->map->path . " for $value silver has no seller set\n" 110 . $who->map->path . " for $value silver has no seller set\n"
107 unless $item->get_ob_key_value ('ext_reseller_seller') ne ''; 111 if $item->get_ob_key_value ('ext_reseller_seller') eq '';
108 112
113 $unpaid_items->{$item->uuid} = $value;
114 }
115
116 $self->apply_shop_mat ($who);
117
118 for my $item (find_traded ($who)) {
119 next if $item->flag (cf::FLAG_UNPAID);
120 if (my $value = $unpaid_items->{$item->uuid}) {
109 $sells->{$item->get_ob_key_value ('ext_reseller_seller')}->{$item->name} += $value; 121 $sells->{$item->get_ob_key_value ('ext_reseller_seller')}->{$item->name} += $value;
110 } 122 }
111 123
112 $ob->apply_shop_mat ($who);
113
114 for my $item (find_traded ($who)) {
115 next if $item->get_flag (cf::FLAG_UNPAID);
116 $item->set_value ($item->get_ob_key_value ('ext_reseller_orig_value')); 124 $item->value ($item->get_ob_key_value ('ext_reseller_orig_value'));
117 $item->set_ob_key_value (ext_reseller_seller => ''); 125 $item->set_ob_key_value (ext_reseller_seller => '');
118 } 126 }
119 127
120 $obs[0]->set_ob_key_value (ext_reseller_sales => cf::to_json $sells); 128 $obs[0]->set_ob_key_value (ext_reseller_sales => cf::to_json $sells);
121 129
122 return 0; 130 cf::override;
123} 131 },
132;
124 133
125sub on_drop_on { 134cf::register_attachment "reseller_floor",
126 my ($ev, $on, $who, $what) = @_; 135 on_drop_on => sub {
136 my ($on, $what, $who) = @_;
127 my $name = $what->custom_name; 137 my $name = $what->custom_name;
128 138
129 if ($what->get_flag (cf::FLAG_UNPAID)) { 139 return if $what->flag (cf::FLAG_UNPAID);
130 return 0;
131 }
132 140
133 if ($what->type == cf::MONEY) { 141 if ($what->type == cf::MONEY) {
134 $who->message ("The shopkeeper says: Sorry, you can't sell money here.", cf::NDI_BROWN); 142 $who->message ("The shopkeeper says: Sorry, you can't sell money here.", cf::NDI_BROWN);
135 $what->insert_ob_in_ob ($who); 143 $what->insert_ob_in_ob ($who);
136 return 1; 144 return cf::override;
137 } 145 }
138 146
139 if (!$what->get_flag (cf::FLAG_IDENTIFIED) && $what->need_identify) { 147 if (!$what->flag (cf::FLAG_IDENTIFIED) && $what->need_identify) {
140 $who->message ("The shopkeeper says: Sorry, you can't sell unidentified stuff here.", cf::NDI_BROWN); 148 $who->message ("The shopkeeper says: Sorry, you can't sell unidentified stuff here.", cf::NDI_BROWN);
141 $what->insert_ob_in_ob ($who); 149 $what->insert_ob_in_ob ($who);
142 return 1; 150 return cf::override;
143 } 151 }
144 152
145 my $orig_value = $what->value; 153 my $orig_value = $what->value;
146 my $value = 0; 154 my $value = 0;
147 155
148 if ($name =~ m/\S/) { 156 if ($name =~ m/\S/) {
149 unless ($name =~ m/\d+\s*\S+/) { 157 unless ($name =~ m/\d+\s*\S+/) {
150 $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); 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);
151 $what->insert_ob_in_ob ($who);
152 return 1;
153 }
154
155 while ($name =~ s/^\s*(\d+)\s*(\S+)//) {
156 if ($aliases{lc $2} or $unit{lc $2}) {
157 $value += $1 * ($unit{lc $2} ? $unit{lc $2} : $unit{$aliases{lc $2}});
158 } else {
159 $what->insert_ob_in_ob ($who); 159 $what->insert_ob_in_ob ($who);
160 return cf::override;
161 }
162
163 while ($name =~ s/^\s*(\d+)\s*(\S+)//) {
164 if ($aliases{lc $2} or $unit{lc $2}) {
165 $value += $1 * ($unit{lc $2} ? $unit{lc $2} : $unit{$aliases{lc $2}});
166 } else {
167 $what->insert_ob_in_ob ($who);
160 $who->message ("The shopkeeper says: I don't know the currency '$2'", cf::NDI_BROWN); 168 $who->message ("The shopkeeper says: I don't know the currency '$2'", cf::NDI_BROWN);
161 return 1; 169 return cf::override;
162 } 170 }
163 } 171 }
164 } else { 172 } else {
165 $value = $what->query_cost ($who, cf::F_SELL | cf::F_SHOP) / ($what->nrof || 1); 173 $value = $what->query_cost ($who, cf::F_SELL | cf::F_SHOP) / ($what->nrof || 1);
166 } 174 }
167 175
176 if ($value < 0) {
177 $what->insert_ob_in_ob ($who);
178 $who->message ("The shopkeeper says: You can't sell something for a negative value: $value", cf::NDI_BROWN);
179 return cf::override;
180 }
181
168 my $fee = $value / 100; # 1% selling fee 182 my $fee = $value / 100; # 1% selling fee
169 183
170 unless ($who->pay_amount ($fee)) { 184 unless ($who->pay_amount ($fee)) {
171 $who->message ( 185 $who->message (
172 "The shopkeeper says: You need " . cf::cost_string_from_value ($fee) . " to pay the 1% fee for this item", 186 "The shopkeeper says: You need " . cf::cost_string_from_value ($fee) . " to pay the 1% fee for this item",
173 cf::NDI_BROWN 187 cf::NDI_BROWN
174 ); 188 );
175 $what->insert_ob_in_ob ($who); 189 $what->insert_ob_in_ob ($who);
176 return 1; 190 return cf::override;
177 } else { 191 } else {
178 $who->message ( 192 $who->message (
179 "The shopkeeper says: Ok, got the fee of " . cf::cost_string_from_value ($fee) . " for the item", 193 "The shopkeeper says: Ok, got the fee of " . cf::cost_string_from_value ($fee) . " for the item",
180 cf::NDI_BROWN 194 cf::NDI_BROWN
181 ); 195 );
182 } 196 }
183 197
184
185 $what->set_value ($value); 198 $what->value ($value);
186 my $cost = $what->query_cost ($who, cf::F_BUY | cf::F_SHOP) / ($what->nrof || 1); 199 my $cost = $what->query_cost ($who, cf::F_BUY | cf::F_SHOP) / ($what->nrof || 1);
187 200
188 my $fact = 0; 201 my $fact = 0;
189 if ($cost) { 202 if ($cost) {
190 $fact = $value / $cost; 203 $fact = $value / $cost;
191 $what->set_value (cf::ceil ($value * $fact)); 204 $what->value (cf::ceil ($value * $fact));
192 } 205 }
193 206
194# warn "END VALUE: $value * $fact => " . $what->value . "\n"; 207# warn "END VALUE: $value * $fact => " . $what->value . "\n";
195 208
196# my $cost = $what->query_cost ($who, cf::F_BUY | cf::F_SHOP) / $what->nrof; 209# my $cost = $what->query_cost ($who, cf::F_BUY | cf::F_SHOP) / $what->nrof;
197# warn "COSTS NOW: $cost\n"; 210# warn "COSTS NOW: $cost\n";
198 211
199 $who->message ( 212 $who->message (
200 "The shopkeeper says: Ok, I marked " 213 "The shopkeeper says: Ok, I marked "
201 . ($what->nrof || 1) . " " . $what->name . " to be sold for at least " 214 . ($what->nrof || 1) . " " . $what->name . " to be sold for at least "
202 . cf::cost_string_from_value ($value) 215 . cf::cost_string_from_value ($value)
203 . ($what->nrof > 1 ? " each" : ""), cf::NDI_BROWN 216 . ($what->nrof > 1 ? " each" : ""), cf::NDI_BROWN
204 ); 217 );
205 218
206 $what->set_ob_key_value (ext_reseller_seller => $who->name); 219 $what->set_ob_key_value (ext_reseller_seller => $who->name);
207 $what->set_ob_key_value (ext_reseller_orig_value => $orig_value); 220 $what->set_ob_key_value (ext_reseller_orig_value => $orig_value);
208# warn "SET SELLER ON " . $what->name . " + " . $what->{seller}->[0] . "\n"; 221# warn "SET SELLER ON " . $what->name . " + " . $what->{seller}->[0] . "\n";
209 $what->set_custom_name (
210 $what->name . " (by " . $who->name . ")" 222 $what->custom_name ($what->name . " (by " . $who->name . ")");
211 );
212 $what->set_flag (cf::FLAG_UNPAID, 1); 223 $what->flag (cf::FLAG_UNPAID, 1);
213 $what->insert_ob_in_map_at ($who->map, $who, cf::INS_BELOW_ORIGINATOR, $who->x, $who->y); 224 $what->insert_ob_in_map_at ($who->map, $who, cf::INS_BELOW_ORIGINATOR, $who->x, $who->y);
214 1; 225
215} 226 cf::override;
227 },
228;

Diff Legend

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