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.10 by root, Wed Apr 18 17:32:06 2007 UTC vs.
Revision 1.20 by elmex, Fri Apr 9 18:29:19 2010 UTC

1#! perl 1#! perl
2 2
3use Data::Dumper; 3use strict;
4
4use Jeweler; 5use Jeweler;
5use List::Util qw/max min sum/; 6use List::Util qw/max min sum/;
6use strict;
7 7
8sub ingred_alias { 8sub ingred_alias {
9 my ($ing) = @_; 9 my ($ing) = @_;
10 10
11 my %aliases = ( 11 my %aliases = (
… …
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; 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->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 my $lvl = max ($ring->power_to_level, 1); 91 $exp = $ring->projected_exp ($input_level);
92 $exp =
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.
96
97 if (defined $input_level) {
98 my $subexp =
99 (cf::level_to_min_exp ($input_level)
100 - cf::level_to_min_exp ($input_level - 1))
101 / (10 + max ($input_level - 1, 0)); # see above for comment
102
103 $exp -= $subexp;
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;
114 }
115 92
116 $pl->change_exp ($exp, "jeweler", cf::SK_EXP_SKILL_ONLY); 93 $pl->change_exp ($exp, "jeweler", cf::SK_EXP_SKILL_ONLY);
94 $pl->message (
117 $pl->message ("You succeed and get $exp experience points."); 95 "You succeed and get " . int ($exp) . " experience points.");
118 $make_status = "succeeded"; 96 $make_status = "succeeded";
119 97
120 $ring->set_value ($value * 0.8); # 20% of the input values will vanish 98 $ring->set_value ($value * 0.8); # 20% of the input values will vanish
121 99
122 } else { 100 } else {
… …
135 "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",
136 $pl->name, $ring->to_string, $ring_ob->uuid, $sklvl, 114 $pl->name, $ring->to_string, $ring_ob->uuid, $sklvl,
137 $ring->power_to_level, $exp, $make_status; 115 $ring->power_to_level, $exp, $make_status;
138 116
139 warn "$make_info\n" if $make_status eq 'succeeded'; 117 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 } 118 }
144 119
145 $chdl->put ($ring_ob); 120 $chdl->put ($ring_ob);
146} 121}
147 122
… …
175 if ($ringo->has_resist ($1)) { 150 if ($ringo->has_resist ($1)) {
176 $self->map->trigger ( 151 $self->map->trigger (
177 $cfg->{connection}, 152 $cfg->{connection},
178 $cfg->{state} 153 $cfg->{state}
179 ); 154 );
155 $obj->decrease (1);
180 cf::override; 156 cf::override;
181 } 157 }
182 } 158 }
183 } 159 }
184 } 160 }
… …
219 unless ($Jeweler::CFG->{conversions}->{lc $1}) { 195 unless ($Jeweler::CFG->{conversions}->{lc $1}) {
220 $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?");
221 return 197 return
222 } 198 }
223 199
224 Jeweler::simple_converter ($player, $ingred, $chdl, $1); 200 Jeweler::simple_converter (
201 $player, $ingred, $chdl, $1,
202 cf::exp_to_level ($sk->stats->exp));
225 203
226 } elsif ($msg =~ m/^\s*merge\s*analy[sz]e\s*$/i) { 204 } elsif ($msg =~ m/^\s*merge\s*analy[sz]e\s*$/i) {
227 merge ($chdl, $sk, $pl, 1); 205 merge ($chdl, $sk, $pl, 1);
228 206
229 } elsif ($msg =~ m/^\s*merge\s*$/i) { 207 } elsif ($msg =~ m/^\s*merge\s*$/i) {
… …
235 my $plan = $ingred->get_plan; 213 my $plan = $ingred->get_plan;
236 214
237 if ($plan) { 215 if ($plan) {
238 my @ring = $ingred->get_ring; 216 my @ring = $ingred->get_ring;
239 217
218 if (!@ring) {
219 # actually the algorithm cant
220 $pl->message ("You slap yourself, you forgot the jewelery!");
221 return;
222
240 if ((@ring > 1) || ($ring[0]->nrof > 1)) { 223 } elsif ((@ring > 1) || (grep { $_->nrof > 1 } @ring)) {
241 # actually the algorithm cant handle more than one improvement at a time 224 # actually the algorithm cant handle more than one improvement at a time
242 $pl->message ("You can't manage to improve more than one thing at a time!"); 225 $pl->message ("You can't manage to improve more than one thing at a time!");
243 return; 226 return;
244
245 } elsif (@ring < 1) {
246 # actually the algorithm cant
247 $pl->message ("You slap yourself, you forgot the jewelery!");
248 return;
249
250 } else { 227 } else {
251 my $ringo = Jeweler::Object->new (object => $ring[0]); 228 my $ringo = Jeweler::Object->new (object => $ring[0]);
252 my $iring = $ingred->improve_ring_by_plan ($plan, $ringo); 229 my $iring = $ingred->improve_ring_by_plan ($plan, $ringo);
253 my $c1 = $ringo->calc_costs; 230 my $c1 = $ringo->calc_costs;
254 my $c2 = $iring->calc_costs; 231 my $c2 = $iring->calc_costs;
255 my $value = $iring->calc_value_from_cost ($c2); 232 my $value = $iring->calc_value_from_cost ($c2);
233
234 if ((not defined $c1) || (not defined $c2)) {
235 $pl->message ("The jewel has or will become a resistancy above 99%,\n"
236 ."that is completly impossible to make!");
237 return;
238 }
256 239
257 my %keys; 240 my %keys;
258 my %cdiff; 241 my %cdiff;
259 for (keys %$c1, keys %$c2) { $keys{$_} = 1 } 242 for (keys %$c1, keys %$c2) { $keys{$_} = 1 }
260 for (keys %keys) { $cdiff{$_} = $c2->{$_} - $c1->{$_}; } 243 for (keys %keys) { $cdiff{$_} = $c2->{$_} - $c1->{$_}; }
… …
290 }; 273 };
291 $@ and warn "ERROR: $@\n"; 274 $@ and warn "ERROR: $@\n";
292 } 275 }
293); 276);
294 277
295Jeweler::read_config "$DATADIR/jeweler.yaml"; 278Jeweler::read_config "res/jeweler.yaml";
296 279

Diff Legend

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