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.8 by root, Fri Aug 25 15:07:43 2006 UTC vs.
Revision 1.9 by root, Sun Aug 27 15:23:30 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines