ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/jeweler.ext
(Generate patch)

Comparing deliantra/server/ext/jeweler.ext (file contents):
Revision 1.6 by elmex, Fri Feb 2 12:05:28 2007 UTC vs.
Revision 1.7 by elmex, Sun Feb 4 11:17:52 2007 UTC

… …
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
67sub make_ring { 75sub 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);
81 my $exp = (cf::level_to_min_exp ($lvl) - cf::level_to_min_exp ($lvl - 1)) / 100; 92 $exp = (cf::level_to_min_exp ($lvl) - cf::level_to_min_exp ($lvl - 1)) / 100;
82 93
83 if (defined $input_level) { 94 if (defined $input_level) {
84 my $subexp = 95 my $subexp =
85 (cf::level_to_min_exp ($input_level) 96 (cf::level_to_min_exp ($input_level)
86 - cf::level_to_min_exp ($input_level - 1)) 97 - cf::level_to_min_exp ($input_level - 1))
87 / 100; 98 / 100;
88 warn "INPUT: $lvl <-> $input_level ($exp <-> $subexp)\n";
89 $exp -= $subexp; 99 $exp -= $subexp;
90 $exp = max ($exp, 0); 100 $exp = max ($exp, 0);
91 } 101 }
92 102
93 $pl->change_exp ($exp, "jeweler", cf::SK_EXP_SKILL_ONLY); 103 $pl->change_exp ($exp, "jeweler", cf::SK_EXP_SKILL_ONLY);
94 $pl->message ("You succeed and get $exp experience."); 104 $pl->message ("You succeed and get $exp experience points.");
105 $make_status = "succeeded";
106
107 $ring->set_value ($value * 0.8); # 20% of the input values will vanish
108
95 } else { 109 } else {
96 $pl->message ("You fail!"); 110 $pl->message ("You fail!");
97 $ring->negate; 111 $ring->negate;
112 $make_status = "fail";
113 $exp = 0;
98 } 114 }
115
116 my $ring_ob = $ring->to_object;
117
118 { # some audit info calculation
119 my $sklvl = cf::exp_to_level ($sk->stats->exp);
120
121 my $make_info = sprintf
122 "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,
124 $ring->power_to_level, $exp, $make_status;
125
126 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 }
131
99 $chdl->put ($ring->to_object); 132 $chdl->put ($ring_ob);
100} 133}
101 134
102sub get_ingred { 135sub get_ingred {
103 my ($pl, $chdl) = @_; 136 my ($pl, $chdl) = @_;
104 my $ingred = eval { $chdl->extract_jeweler_ingredients }; 137 my $ingred = eval { $chdl->extract_jeweler_ingredients };
… …
202 return; 235 return;
203 236
204 } else { 237 } else {
205 my $ringo = Jeweler::Object->new (object => $ring[0]); 238 my $ringo = Jeweler::Object->new (object => $ring[0]);
206 my $iring = $ingred->improve_ring_by_plan ($plan, $ringo); 239 my $iring = $ingred->improve_ring_by_plan ($plan, $ringo);
207 my $c1 = $ringo->calc_costs; 240 my $c1 = $ringo->calc_costs;
208 my $c2 = $iring->calc_costs; 241 my $c2 = $iring->calc_costs;
242 my $value = $iring->calc_value_from_cost ($c2);
209 243
210 my %keys; 244 my %keys;
211 my %cdiff; 245 my %cdiff;
212 for (keys %$c1, keys %$c2) { $keys{$_} = 1 } 246 for (keys %$c1, keys %$c2) { $keys{$_} = 1 }
213 for (keys %keys) { $cdiff{$_} = $c2->{$_} - $c1->{$_}; warn "$_: $c2->{$_} | $c1->{$_}\n"; } 247 for (keys %keys) { $cdiff{$_} = $c2->{$_} - $c1->{$_}; }
214 248
215 unless ($iring->is_better_than ($ringo)) { 249 unless ($iring->is_better_than ($ringo)) {
216 $pl->message ("This plan doesn't improve anything, you find yourself puzzled about what you missed..."); 250 $pl->message ("This plan doesn't improve anything, you find yourself puzzled about what you missed...");
217 return; 251 return;
218 } 252 }
… …
231 } 265 }
232 } else { 266 } else {
233 if (!$pl->flag (cf::FLAG_WIZ)) { 267 if (!$pl->flag (cf::FLAG_WIZ)) {
234 $ingred->check_costs (\%cdiff, 1); 268 $ingred->check_costs (\%cdiff, 1);
235 } 269 }
236 make_ring ($chdl, $ingred, $iring, $sk, $pl); 270 make_ring ($chdl, $ingred, $iring, $value, $sk, $pl);
237 } 271 }
238 } 272 }
239 } else { 273 } else {
240 $pl->message ("You've got no idea what you are planning to do!"); 274 $pl->message ("You've got no idea what you are planning to do!");
241 } 275 }

Diff Legend

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