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.4 by elmex, Mon Aug 14 22:00:57 2006 UTC vs.
Revision 1.14 by root, Fri Sep 8 16:22:14 2006 UTC

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

Diff Legend

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