| … | |
… | |
| 14 | wis => 'wisdom', |
14 | wis => 'wisdom', |
| 15 | int => 'intelligence', |
15 | int => 'intelligence', |
| 16 | dex => 'dexterity', |
16 | dex => 'dexterity', |
| 17 | con => 'constitution', |
17 | con => 'constitution', |
| 18 | str => 'strength', |
18 | str => 'strength', |
|
|
19 | gem => 'diamond', |
| 19 | ); |
20 | ); |
| 20 | |
21 | |
| 21 | if ($ing =~ m/resist_(\S+)/) { |
22 | if ($ing =~ m/resist_(\S+)/) { |
| 22 | my $a = $aliases{lc $1} || $1; |
23 | my $a = $aliases{lc $1} || $1; |
| 23 | "something for '". lc ($a). "' resistance"; |
24 | "something for '". lc ($a). "' resistance"; |
| … | |
… | |
| 28 | |
29 | |
| 29 | } elsif ($ing =~ m/spec_(\S+)/) { |
30 | } elsif ($ing =~ m/spec_(\S+)/) { |
| 30 | my $a = $aliases{lc $1} || $1; |
31 | my $a = $aliases{lc $1} || $1; |
| 31 | "something for the ". lc ($a). "' special"; |
32 | "something for the ". lc ($a). "' special"; |
| 32 | |
33 | |
|
|
34 | } elsif ($aliases{$ing}) { |
|
|
35 | $aliases{$ing} |
|
|
36 | |
| 33 | } else { |
37 | } else { |
| 34 | $ing |
38 | $ing |
| 35 | } |
39 | } |
| 36 | } |
40 | } |
| 37 | |
41 | |
| … | |
… | |
| 47 | |
51 | |
| 48 | @rings >= 2 |
52 | @rings >= 2 |
| 49 | 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!"); |
| 50 | |
54 | |
| 51 | my $input_level; |
55 | my $input_level; |
|
|
56 | my $value; |
|
|
57 | for (@rings) { |
| 52 | $input_level = max ($_->power_to_level, $input_level) for @rings; |
58 | $input_level = max ($_->power_to_level, $input_level); |
|
|
59 | $value += $_->{hash}->{value}; |
|
|
60 | } |
| 53 | |
61 | |
| 54 | my $ring = shift @rings; |
62 | my $ring = shift @rings; |
| 55 | $ring->improve_by_ring (@rings); |
63 | $ring->improve_by_ring (@rings); |
| 56 | |
64 | |
| 57 | if ($do_analyze) { |
65 | if ($do_analyze) { |
| … | |
… | |
| 59 | $ring->wiz_analyze ($pl) |
67 | $ring->wiz_analyze ($pl) |
| 60 | if $pl->flag (cf::FLAG_WIZ); |
68 | if $pl->flag (cf::FLAG_WIZ); |
| 61 | return; |
69 | return; |
| 62 | } |
70 | } |
| 63 | |
71 | |
| 64 | make_ring ($chdl, $ingred, $ring, $sk, $pl, $input_level); |
72 | make_ring ($chdl, $ingred, $ring, $value, $sk, $pl, $input_level); |
| 65 | } |
73 | } |
| 66 | |
74 | |
| 67 | sub make_ring { |
75 | sub make_ring { |
| 68 | my ($chdl, $ingred, $ring, $sk, $pl, $input_level) = @_; |
76 | my ($chdl, $ingred, $ring, $value, $sk, $pl, $input_level) = @_; |
| 69 | |
77 | |
| 70 | if (!$pl->flag (cf::FLAG_WIZ)) { |
78 | if (!$pl->flag (cf::FLAG_WIZ)) { |
| 71 | $ingred->remove ('rings'); |
79 | $ingred->remove ('rings'); |
| 72 | $ingred->remove ('ammys'); |
80 | $ingred->remove ('ammys'); |
| 73 | } |
81 | } |
| 74 | |
82 | |
| 75 | my $ch = $ring->get_chance_perc ($sk); |
83 | my $ch = $ring->get_chance_perc ($sk); |
| 76 | my $succ = 0; |
84 | my $succ = 0; |
| 77 | my $r = cf::random_roll (0, 100, $pl, cf::PREFER_HIGH); |
85 | my $r = cf::random_roll (0, 100, $pl, cf::PREFER_HIGH); |
| 78 | |
86 | |
|
|
87 | my $make_status; |
|
|
88 | my $exp; |
|
|
89 | |
| 79 | if ($r <= $ch or $pl->flag (cf::FLAG_WIZ)) { |
90 | if ($r <= $ch or $pl->flag (cf::FLAG_WIZ)) { |
| 80 | my $lvl = max ($ring->power_to_level, 1); |
91 | my $lvl = max ($ring->power_to_level, 1); |
|
|
92 | $exp = |
| 81 | my $exp = (cf::level_to_min_exp ($lvl) - cf::level_to_min_exp ($lvl - 1)) / 100; |
93 | (cf::level_to_min_exp ($lvl) - cf::level_to_min_exp ($lvl - 1)) |
|
|
94 | / (10 + max ($lvl - 1, 0)); # 10 + level times making such a ring |
|
|
95 | # should get you to the rings level at least. |
| 82 | |
96 | |
| 83 | if (defined $input_level) { |
97 | if (defined $input_level) { |
| 84 | my $subexp = |
98 | my $subexp = |
| 85 | (cf::level_to_min_exp ($input_level) |
99 | (cf::level_to_min_exp ($input_level) |
| 86 | - cf::level_to_min_exp ($input_level - 1)) |
100 | - cf::level_to_min_exp ($input_level - 1)) |
| 87 | / 100; |
101 | / (10 + max ($input_level - 1, 0)); # see above for comment |
| 88 | warn "INPUT: $lvl <-> $input_level ($exp <-> $subexp)\n"; |
102 | |
| 89 | $exp -= $subexp; |
103 | $exp -= $subexp; |
| 90 | $exp = max ($exp, 0); |
104 | $exp = max ($exp, 0); |
|
|
105 | |
|
|
106 | } else { |
|
|
107 | # the experience bonus here is to make level 1 rings give you at least |
|
|
108 | # 100 exp points when making them. This also makes leveling in the |
|
|
109 | # first few levels a bit easier. (Propably until around level 5-6). |
|
|
110 | my $expbonus = cf::level_to_min_exp (2) / 10; |
|
|
111 | # this bonus should also only be given for _new_ rings and not for merged |
|
|
112 | # ones - to prevent infinite exp making. |
|
|
113 | $exp += $expbonus; |
| 91 | } |
114 | } |
| 92 | |
115 | |
| 93 | $pl->change_exp ($exp, "jeweler", cf::SK_EXP_SKILL_ONLY); |
116 | $pl->change_exp ($exp, "jeweler", cf::SK_EXP_SKILL_ONLY); |
| 94 | $pl->message ("You succeed and get $exp experience."); |
117 | $pl->message ("You succeed and get $exp experience points."); |
|
|
118 | $make_status = "succeeded"; |
|
|
119 | |
|
|
120 | $ring->set_value ($value * 0.8); # 20% of the input values will vanish |
|
|
121 | |
| 95 | } else { |
122 | } else { |
| 96 | $pl->message ("You fail!"); |
123 | $pl->message ("You fail!"); |
| 97 | $ring->negate; |
124 | $ring->negate; |
|
|
125 | $make_status = "fail"; |
|
|
126 | $exp = 0; |
| 98 | } |
127 | } |
|
|
128 | |
|
|
129 | my $ring_ob = $ring->to_object; |
|
|
130 | |
|
|
131 | { # some audit info calculation |
|
|
132 | my $sklvl = cf::exp_to_level ($sk->stats->exp); |
|
|
133 | |
|
|
134 | my $make_info = sprintf |
|
|
135 | "JEWELER AUDIT: '%s' made '%s' (%s) (sk lvl %d, ring lvl %d, got %d exp): %s", |
|
|
136 | $pl->name, $ring->to_string, $ring_ob->uuid, $sklvl, |
|
|
137 | $ring->power_to_level, $exp, $make_status; |
|
|
138 | |
|
|
139 | warn "$make_info\n" if $make_status eq 'succeeded'; |
|
|
140 | |
|
|
141 | $ring_ob->set_ob_key_value (ext_jeweler_made_by => $pl->name); |
|
|
142 | $ring_ob->set_ob_key_value (ext_jeweler_make_info => $make_info); |
|
|
143 | } |
|
|
144 | |
| 99 | $chdl->put ($ring->to_object); |
145 | $chdl->put ($ring_ob); |
| 100 | } |
146 | } |
| 101 | |
147 | |
| 102 | sub get_ingred { |
148 | sub get_ingred { |
| 103 | my ($pl, $chdl) = @_; |
149 | my ($pl, $chdl) = @_; |
| 104 | my $ingred = eval { $chdl->extract_jeweler_ingredients }; |
150 | my $ingred = eval { $chdl->extract_jeweler_ingredients }; |
| … | |
… | |
| 113 | return; |
159 | return; |
| 114 | } |
160 | } |
| 115 | $ingred; |
161 | $ingred; |
| 116 | } |
162 | } |
| 117 | |
163 | |
|
|
164 | cf::object::attachment check_ring_drop_on => |
|
|
165 | on_drop_on => sub { |
|
|
166 | my ($self, $obj, $who) = @_; |
|
|
167 | my $cfg = $self->{check_ring_drop_on}; |
|
|
168 | if ($obj->type == cf::RING |
|
|
169 | && !$obj->flag (cf::FLAG_CURSED) |
|
|
170 | && !$obj->flag (cf::FLAG_DAMNED) |
|
|
171 | ) { |
|
|
172 | my $ringo = Jeweler::Object->new (object => $obj); |
|
|
173 | for (grep { /^resist_/ } keys %$cfg) { |
|
|
174 | if (/^resist_(\S+)$/) { |
|
|
175 | if ($ringo->has_resist ($1)) { |
|
|
176 | $self->map->trigger ( |
|
|
177 | $cfg->{connection}, |
|
|
178 | $cfg->{state} |
|
|
179 | ); |
|
|
180 | cf::override; |
|
|
181 | } |
|
|
182 | } |
|
|
183 | } |
|
|
184 | } |
|
|
185 | }; |
|
|
186 | |
| 118 | cf::object->attach ( |
187 | cf::object->attach ( |
| 119 | type => cf::SKILL, |
188 | type => cf::SKILL, |
| 120 | subtype => cf::SK_JEWELER, |
189 | subtype => cf::SK_JEWELER, |
| 121 | on_use_skill => sub { |
190 | on_use_skill => sub { |
| 122 | my ($sk, $ob, $part, $dir, $msg) = @_; |
191 | my ($sk, $ob, $part, $dir, $msg) = @_; |
| … | |
… | |
| 179 | return; |
248 | return; |
| 180 | |
249 | |
| 181 | } else { |
250 | } else { |
| 182 | my $ringo = Jeweler::Object->new (object => $ring[0]); |
251 | my $ringo = Jeweler::Object->new (object => $ring[0]); |
| 183 | my $iring = $ingred->improve_ring_by_plan ($plan, $ringo); |
252 | my $iring = $ingred->improve_ring_by_plan ($plan, $ringo); |
| 184 | my $c1 = $ringo->calc_costs; |
253 | my $c1 = $ringo->calc_costs; |
| 185 | my $c2 = $iring->calc_costs; |
254 | my $c2 = $iring->calc_costs; |
|
|
255 | my $value = $iring->calc_value_from_cost ($c2); |
| 186 | |
256 | |
| 187 | my %keys; |
257 | my %keys; |
| 188 | my %cdiff; |
258 | my %cdiff; |
| 189 | for (keys %$c1, keys %$c2) { $keys{$_} = 1 } |
259 | for (keys %$c1, keys %$c2) { $keys{$_} = 1 } |
| 190 | for (keys %keys) { $cdiff{$_} = $c2->{$_} - $c1->{$_}; warn "$_: $c2->{$_} | $c1->{$_}\n"; } |
260 | for (keys %keys) { $cdiff{$_} = $c2->{$_} - $c1->{$_}; } |
| 191 | |
261 | |
| 192 | unless ($iring->is_better_than ($ringo)) { |
262 | unless ($iring->is_better_than ($ringo)) { |
| 193 | $pl->message ("This plan doesn't improve anything, you find yourself puzzled about what you missed..."); |
263 | $pl->message ("This plan doesn't improve anything, you find yourself puzzled about what you missed..."); |
| 194 | return; |
264 | return; |
| 195 | } |
265 | } |
| … | |
… | |
| 208 | } |
278 | } |
| 209 | } else { |
279 | } else { |
| 210 | if (!$pl->flag (cf::FLAG_WIZ)) { |
280 | if (!$pl->flag (cf::FLAG_WIZ)) { |
| 211 | $ingred->check_costs (\%cdiff, 1); |
281 | $ingred->check_costs (\%cdiff, 1); |
| 212 | } |
282 | } |
| 213 | make_ring ($chdl, $ingred, $iring, $sk, $pl); |
283 | make_ring ($chdl, $ingred, $iring, $value, $sk, $pl); |
| 214 | } |
284 | } |
| 215 | } |
285 | } |
| 216 | } else { |
286 | } else { |
| 217 | $pl->message ("You've got no idea what you are planning to do!"); |
287 | $pl->message ("You've got no idea what you are planning to do!"); |
| 218 | } |
288 | } |
| … | |
… | |
| 220 | }; |
290 | }; |
| 221 | $@ and warn "ERROR: $@\n"; |
291 | $@ and warn "ERROR: $@\n"; |
| 222 | } |
292 | } |
| 223 | ); |
293 | ); |
| 224 | |
294 | |
| 225 | Jeweler::read_config (cf::datadir . '/jeweler.yaml'); |
295 | Jeweler::read_config "$DATADIR/jeweler.yaml"; |
|
|
296 | |
