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.15 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.22 by elmex, Tue Apr 27 17:08:09 2010 UTC

48 48
49 my @ring = $ingred->get_ring; 49 my @ring = $ingred->get_ring;
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->message ("You slap yourself, you forgot to put at least 2 jewels in!");
54 54
55 my $input_level = 0; 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);
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, $input_level)); 66 $pl->message ("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
80 $ingred->remove ('ammys'); 80 $ingred->remove ('ammys');
81 } 81 }
82 82
83 my $ch = $ring->get_chance_perc ($sk); 83 my $ch = $ring->get_chance_perc ($sk);
84 my $succ = 0; 84 my $succ = 0;
85 my $r = cf::random_roll (0, 100, $pl, cf::PREFER_HIGH); 85 my $r = cf::random_roll (0, 100, $pl, cf::PREFER_LOW);
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 $exp = $ring->projected_exp ($input_level); 91 $exp = $ring->projected_exp ($input_level);
92 92
93 $pl->change_exp ($exp, "jeweler", cf::SK_EXP_SKILL_ONLY); 93 $pl->change_exp ($exp, "jeweler");
94 $pl->message (
94 $pl->message ("You succeed and get $exp experience points."); 95 "You succeed and get " . int ($exp) . " experience points.");
95 $make_status = "succeeded"; 96 $make_status = "succeeded";
96 97
97 $ring->set_value ($value * 0.8); # 20% of the input values will vanish 98 $ring->set_value ($value);
98 99
99 } else { 100 } else {
100 $pl->message ("You fail!"); 101 $pl->message ("You fail!");
101 $ring->negate; 102 $ring->negate;
102 $make_status = "fail"; 103 $make_status = "fail";
149 if ($ringo->has_resist ($1)) { 150 if ($ringo->has_resist ($1)) {
150 $self->map->trigger ( 151 $self->map->trigger (
151 $cfg->{connection}, 152 $cfg->{connection},
152 $cfg->{state} 153 $cfg->{state}
153 ); 154 );
155 $obj->decrease (1);
154 cf::override; 156 cf::override;
155 } 157 }
156 } 158 }
157 } 159 }
158 } 160 }
193 unless ($Jeweler::CFG->{conversions}->{lc $1}) { 195 unless ($Jeweler::CFG->{conversions}->{lc $1}) {
194 $pl->message ("You don't know how to make '$1', is does such a thing even exist?"); 196 $pl->message ("You don't know how to make '$1', is does such a thing even exist?");
195 return 197 return
196 } 198 }
197 199
198 Jeweler::simple_converter ($player, $ingred, $chdl, $1); 200 Jeweler::simple_converter (
201 $player, $ingred, $chdl, $1,
202 cf::exp_to_level ($sk->stats->exp));
199 203
200 } elsif ($msg =~ m/^\s*merge\s*analy[sz]e\s*$/i) { 204 } elsif ($msg =~ m/^\s*merge\s*analy[sz]e\s*$/i) {
201 merge ($chdl, $sk, $pl, 1); 205 merge ($chdl, $sk, $pl, 1);
202 206
203 } elsif ($msg =~ m/^\s*merge\s*$/i) { 207 } elsif ($msg =~ m/^\s*merge\s*$/i) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines