| … | |
… | |
| 52 | } |
52 | } |
| 53 | |
53 | |
| 54 | cf::register_script_function "reseller::list_sells" => sub { |
54 | cf::register_script_function "reseller::list_sells" => sub { |
| 55 | my ($who, $msg, $npc) = @_; |
55 | my ($who, $msg, $npc) = @_; |
| 56 | my $ext_re_sales = $npc->get_ob_key_value ('ext_reseller_sales'); |
56 | my $ext_re_sales = $npc->get_ob_key_value ('ext_reseller_sales'); |
| 57 | my $sells = $ext_re_sales && cf::from_json $ext_re_sales; |
57 | my $sells = $ext_re_sales && cf::decode_json $ext_re_sales; |
| 58 | my $hissells = $sells->{$who->name}; |
58 | my $hissells = $sells->{$who->name}; |
| 59 | |
59 | |
| 60 | unless (keys %{$hissells || {}}) { |
60 | unless (keys %{$hissells || {}}) { |
| 61 | $who->reply ($npc, "I'm sorry, but you sold nothing.\n"); |
61 | $who->reply ($npc, "I'm sorry, but you sold nothing.\n"); |
| 62 | return 0; |
62 | return 0; |
| … | |
… | |
| 73 | }; |
73 | }; |
| 74 | |
74 | |
| 75 | cf::register_script_function "reseller::pay_player" => sub { |
75 | cf::register_script_function "reseller::pay_player" => sub { |
| 76 | my ($who, $msg, $npc) = @_; |
76 | my ($who, $msg, $npc) = @_; |
| 77 | my $ext_re_sales = $npc->get_ob_key_value ('ext_reseller_sales'); |
77 | my $ext_re_sales = $npc->get_ob_key_value ('ext_reseller_sales'); |
| 78 | my $sells = $ext_re_sales && cf::from_json $ext_re_sales; |
78 | my $sells = $ext_re_sales && cf::decode_json $ext_re_sales; |
| 79 | my $hissells = $sells->{$who->name}; |
79 | my $hissells = $sells->{$who->name}; |
| 80 | |
80 | |
| 81 | unless (keys %{$hissells || {}}) { |
81 | unless (keys %{$hissells || {}}) { |
| 82 | $who->reply ($npc, "I'm sorry, but you sold nothing.\n"); |
82 | $who->reply ($npc, "I'm sorry, but you sold nothing.\n"); |
| 83 | return 0; |
83 | return 0; |
| … | |
… | |
| 91 | |
91 | |
| 92 | audit_log ($who, 'collects', "$sum silver"); |
92 | audit_log ($who, 'collects', "$sum silver"); |
| 93 | |
93 | |
| 94 | $sells->{$who->name} = {}; |
94 | $sells->{$who->name} = {}; |
| 95 | |
95 | |
| 96 | $npc->set_ob_key_value (ext_reseller_sales => cf::to_json $sells) |
96 | $npc->set_ob_key_value (ext_reseller_sales => cf::encode_json $sells) |
| 97 | if $sells; |
97 | if $sells; |
| 98 | |
98 | |
| 99 | 0 |
99 | 0 |
| 100 | }; |
100 | }; |
| 101 | |
101 | |
| … | |
… | |
| 110 | warn "Couldn't find shop keeper in " . $who->map->path . "\n"; |
110 | warn "Couldn't find shop keeper in " . $who->map->path . "\n"; |
| 111 | return cf::override; |
111 | return cf::override; |
| 112 | } |
112 | } |
| 113 | |
113 | |
| 114 | my $ext_re_sales = $obs[0]->get_ob_key_value ('ext_reseller_sales'); |
114 | my $ext_re_sales = $obs[0]->get_ob_key_value ('ext_reseller_sales'); |
| 115 | my $sells = $ext_re_sales && cf::from_json $ext_re_sales; |
115 | my $sells = $ext_re_sales && cf::decode_json $ext_re_sales; |
| 116 | |
116 | |
| 117 | my $unpaid_items = {}; |
117 | my $unpaid_items = {}; |
| 118 | |
118 | |
| 119 | for my $item (find_unpaid ($who)) { |
119 | for my $item (find_unpaid ($who)) { |
| 120 | if ($item->get_ob_key_value ('ext_reseller_seller') eq $who->name) { |
120 | if ($item->get_ob_key_value ('ext_reseller_seller') eq $who->name) { |
| … | |
… | |
| 155 | } |
155 | } |
| 156 | |
156 | |
| 157 | audit_log ($who, 'removed', (join ",", @seller_noted)) |
157 | audit_log ($who, 'removed', (join ",", @seller_noted)) |
| 158 | if @seller_noted; |
158 | if @seller_noted; |
| 159 | |
159 | |
| 160 | $obs[0]->set_ob_key_value (ext_reseller_sales => cf::to_json $sells) |
160 | $obs[0]->set_ob_key_value (ext_reseller_sales => cf::encode_json $sells) |
| 161 | if $sells; |
161 | if $sells; |
| 162 | |
162 | |
| 163 | cf::override; |
163 | cf::override; |
| 164 | }, |
164 | }, |
| 165 | ; |
165 | ; |
