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.18 by elmex, Thu Nov 12 06:37:57 2009 UTC vs.
Revision 1.24 by root, Thu Apr 29 07:52:01 2010 UTC

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 (
95 "You succeed and get " . int ($exp) . " experience points."); 95 "You succeed and get " . int ($exp) . " experience points.");
96 $make_status = "succeeded"; 96 $make_status = "succeeded";
97 97
98 $ring->set_value ($value * 0.8); # 20% of the input values will vanish 98 $ring->set_value ($value);
99 99
100 } else { 100 } else {
101 $pl->message ("You fail!"); 101 $pl->message ("You fail!");
102 $ring->negate; 102 $ring->negate;
103 $make_status = "fail"; 103 $make_status = "fail";
112 my $make_info = sprintf 112 my $make_info = sprintf
113 "JEWELER AUDIT: '%s' made '%s' (%s) (sk lvl %d, ring lvl %d, got %d exp): %s", 113 "JEWELER AUDIT: '%s' made '%s' (%s) (sk lvl %d, ring lvl %d, got %d exp): %s",
114 $pl->name, $ring->to_string, $ring_ob->uuid, $sklvl, 114 $pl->name, $ring->to_string, $ring_ob->uuid, $sklvl,
115 $ring->power_to_level, $exp, $make_status; 115 $ring->power_to_level, $exp, $make_status;
116 116
117 cf::debug "$make_info\n"
117 warn "$make_info\n" if $make_status eq 'succeeded'; 118 if $make_status eq 'succeeded';
118 } 119 }
119 120
120 $chdl->put ($ring_ob); 121 $chdl->put ($ring_ob);
121} 122}
122 123
128 return 129 return
129 } elsif ($@ =~ /unidentified/) { 130 } elsif ($@ =~ /unidentified/) {
130 $pl->message ("There are unidentified items in the workbench, identify them before you do anything."). 131 $pl->message ("There are unidentified items in the workbench, identify them before you do anything.").
131 return 132 return
132 } elsif ($@) { 133 } elsif ($@) {
133 warn "error in jeweler ingredient extraction: $@"; 134 cf::error "error in jeweler ingredient extraction: $@";
134 return; 135 return;
135 } 136 }
136 $ingred; 137 $ingred;
137} 138}
138 139
195 unless ($Jeweler::CFG->{conversions}->{lc $1}) { 196 unless ($Jeweler::CFG->{conversions}->{lc $1}) {
196 $pl->message ("You don't know how to make '$1', is does such a thing even exist?"); 197 $pl->message ("You don't know how to make '$1', is does such a thing even exist?");
197 return 198 return
198 } 199 }
199 200
200 Jeweler::simple_converter ($player, $ingred, $chdl, $1); 201 Jeweler::simple_converter (
202 $player, $ingred, $chdl, $1,
203 cf::exp_to_level ($sk->stats->exp));
201 204
202 } elsif ($msg =~ m/^\s*merge\s*analy[sz]e\s*$/i) { 205 } elsif ($msg =~ m/^\s*merge\s*analy[sz]e\s*$/i) {
203 merge ($chdl, $sk, $pl, 1); 206 merge ($chdl, $sk, $pl, 1);
204 207
205 } elsif ($msg =~ m/^\s*merge\s*$/i) { 208 } elsif ($msg =~ m/^\s*merge\s*$/i) {
267 } else { 270 } else {
268 $pl->message ("You've got no idea what you are planning to do!"); 271 $pl->message ("You've got no idea what you are planning to do!");
269 } 272 }
270 } 273 }
271 }; 274 };
272 $@ and warn "ERROR: $@\n"; 275 $@ and cf::error "$@\n";
273 } 276 }
274); 277);
275 278
276Jeweler::read_config "res/jeweler.yaml"; 279Jeweler::load_config;
277 280

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines