… | |
… | |
50 | my @rings = map { Jeweler::Object->new (object => $_) } @ring; |
50 | my @rings = map { Jeweler::Object->new (object => $_) } @ring; |
51 | |
51 | |
52 | @rings >= 2 |
52 | @rings >= 2 |
53 | or return $pl->reply (undef, "You slap yourself, you forgot to put at least 2 jewels in!"); |
53 | or return $pl->reply (undef, "You slap yourself, you forgot to put at least 2 jewels in!"); |
54 | |
54 | |
55 | my $input_level; |
55 | my $input_level = 0; |
56 | my $value; |
56 | my $value; |
57 | for (@rings) { |
57 | for (@rings) { |
58 | $input_level = max ($_->power_to_level, $input_level); |
58 | $input_level = max ($_->power_to_level, $input_level); |
59 | $value += $_->{hash}->{value}; |
59 | $value += $_->{hash}->{value}; |
60 | } |
60 | } |
61 | |
61 | |
62 | my $ring = shift @rings; |
62 | my $ring = shift @rings; |
63 | $ring->improve_by_ring (@rings); |
63 | $ring->improve_by_ring (@rings); |
64 | |
64 | |
65 | if ($do_analyze) { |
65 | if ($do_analyze) { |
66 | $pl->reply (undef, "You want to make a " . $ring->to_string . ": " . $ring->analyze ($sk, $pl)); |
66 | $pl->reply (undef, "You want to make a " . $ring->to_string . ": " . $ring->analyze ($sk, $pl, $input_level)); |
67 | $ring->wiz_analyze ($pl) |
67 | $ring->wiz_analyze ($pl) |
68 | if $pl->flag (cf::FLAG_WIZ); |
68 | if $pl->flag (cf::FLAG_WIZ); |
69 | return; |
69 | return; |
70 | } |
70 | } |
71 | |
71 | |
… | |
… | |
86 | |
86 | |
87 | my $make_status; |
87 | my $make_status; |
88 | my $exp; |
88 | my $exp; |
89 | |
89 | |
90 | if ($r <= $ch or $pl->flag (cf::FLAG_WIZ)) { |
90 | if ($r <= $ch or $pl->flag (cf::FLAG_WIZ)) { |
91 | my $lvl = max ($ring->power_to_level, 1); |
91 | $exp = $ring->projected_exp ($input_level); |
92 | $exp = (cf::level_to_min_exp ($lvl) - cf::level_to_min_exp ($lvl - 1)) / 100; |
|
|
93 | |
|
|
94 | if (defined $input_level) { |
|
|
95 | my $subexp = |
|
|
96 | (cf::level_to_min_exp ($input_level) |
|
|
97 | - cf::level_to_min_exp ($input_level - 1)) |
|
|
98 | / 100; |
|
|
99 | $exp -= $subexp; |
|
|
100 | $exp = max ($exp, 0); |
|
|
101 | } |
|
|
102 | |
92 | |
103 | $pl->change_exp ($exp, "jeweler", cf::SK_EXP_SKILL_ONLY); |
93 | $pl->change_exp ($exp, "jeweler", cf::SK_EXP_SKILL_ONLY); |
104 | $pl->message ("You succeed and get $exp experience points."); |
94 | $pl->message ("You succeed and get $exp experience points."); |
105 | $make_status = "succeeded"; |
95 | $make_status = "succeeded"; |
106 | |
96 | |
… | |
… | |
122 | "JEWELER AUDIT: '%s' made '%s' (%s) (sk lvl %d, ring lvl %d, got %d exp): %s", |
112 | "JEWELER AUDIT: '%s' made '%s' (%s) (sk lvl %d, ring lvl %d, got %d exp): %s", |
123 | $pl->name, $ring->to_string, $ring_ob->uuid, $sklvl, |
113 | $pl->name, $ring->to_string, $ring_ob->uuid, $sklvl, |
124 | $ring->power_to_level, $exp, $make_status; |
114 | $ring->power_to_level, $exp, $make_status; |
125 | |
115 | |
126 | warn "$make_info\n" if $make_status eq 'succeeded'; |
116 | warn "$make_info\n" if $make_status eq 'succeeded'; |
127 | |
|
|
128 | $ring_ob->set_ob_key_value (ext_jeweler_made_by => $pl->name); |
|
|
129 | $ring_ob->set_ob_key_value (ext_jeweler_make_info => $make_info); |
|
|
130 | } |
117 | } |
131 | |
118 | |
132 | $chdl->put ($ring_ob); |
119 | $chdl->put ($ring_ob); |
133 | } |
120 | } |
134 | |
121 | |
… | |
… | |
239 | my $iring = $ingred->improve_ring_by_plan ($plan, $ringo); |
226 | my $iring = $ingred->improve_ring_by_plan ($plan, $ringo); |
240 | my $c1 = $ringo->calc_costs; |
227 | my $c1 = $ringo->calc_costs; |
241 | my $c2 = $iring->calc_costs; |
228 | my $c2 = $iring->calc_costs; |
242 | my $value = $iring->calc_value_from_cost ($c2); |
229 | my $value = $iring->calc_value_from_cost ($c2); |
243 | |
230 | |
|
|
231 | if ((not defined $c1) || (not defined $c2)) { |
|
|
232 | $pl->message ("The jewel has or will become a resistancy above 99%,\n" |
|
|
233 | ."that is completly impossible to make!"); |
|
|
234 | return; |
|
|
235 | } |
|
|
236 | |
244 | my %keys; |
237 | my %keys; |
245 | my %cdiff; |
238 | my %cdiff; |
246 | for (keys %$c1, keys %$c2) { $keys{$_} = 1 } |
239 | for (keys %$c1, keys %$c2) { $keys{$_} = 1 } |
247 | for (keys %keys) { $cdiff{$_} = $c2->{$_} - $c1->{$_}; } |
240 | for (keys %keys) { $cdiff{$_} = $c2->{$_} - $c1->{$_}; } |
248 | |
241 | |
… | |
… | |
277 | }; |
270 | }; |
278 | $@ and warn "ERROR: $@\n"; |
271 | $@ and warn "ERROR: $@\n"; |
279 | } |
272 | } |
280 | ); |
273 | ); |
281 | |
274 | |
282 | Jeweler::read_config (cf::datadir . '/jeweler.yaml'); |
275 | Jeweler::read_config "$DATADIR/jeweler.yaml"; |
|
|
276 | |