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

Comparing deliantra/server/ext/Jeweler.pm (file contents):
Revision 1.7 by elmex, Fri Feb 2 12:05:28 2007 UTC vs.
Revision 1.33 by root, Wed Apr 28 21:05:33 2010 UTC

… …
8 8
9=cut 9=cut
10 10
11package Jeweler; 11package Jeweler;
12 12
13use strict; 13use common::sense;
14use YAML;
15 14
16=over 4 15=over 4
17 16
18=item @RESISTS 17=item @RESISTS
19 18
… …
21 20
22=cut 21=cut
23 22
24our $CFG; 23our $CFG;
25 24
26sub read_config { 25sub load_config {
27 my ($filename) = @_; 26 0 < Coro::AIO::aio_load "$cf::DATADIR/jeweler", my $data
27 or die "$cf::DATADIR/jeweler: $!";
28 28
29 unless (-e $filename) { 29 $CFG = cf::decode_json $data;
30 warn "$filename doesn't exists! no config for jeweler skill loaded!\n";
31 $CFG = {};
32 return
33 }
34
35 $CFG = YAML::LoadFile $filename;
36} 30}
37 31
38sub getcfg { 32sub getcfg {
39 my ($sect, $key) = @_; 33 my ($sect, $key) = @_;
40 return $CFG->{$sect} unless defined $key; 34 return $CFG->{$sect} unless defined $key;
… …
162 $delta = 5 if $delta > 5; 156 $delta = 5 if $delta > 5;
163 return $LVL_DIFF_CHANCES{$delta} 157 return $LVL_DIFF_CHANCES{$delta}
164} 158}
165 159
166sub analyze { 160sub analyze {
167 my ($sk, $chdl, $pl) = @_; 161 my ($sk, $chdl, $pl, $input_level) = @_;
168 162
169 my $hadunid = 0; 163 my $hadunid = 0;
164 my $found = 0;
170 for ($chdl->grep_by_type (cf::RING, cf::AMULET)) { 165 for ($chdl->grep_by_type (cf::RING, cf::AMULET)) {
171 if (!$_->flag (cf::FLAG_IDENTIFIED) && $_->need_identify) { 166 if (!$_->flag (cf::FLAG_IDENTIFIED) && $_->need_identify) {
172 $hadunid = 1; 167 $hadunid = 1;
173 next; 168 next;
174 } 169 }
170 $found = 1;
175 my $r = Jeweler::Object->new (object => $_); 171 my $r = Jeweler::Object->new (object => $_);
176 my $msg = $r->analyze ($sk, $pl); 172 my $msg = $r->analyze ($sk, $pl, $input_level);
177 $pl->message ($r->to_string . ": " . $msg); 173 $pl->message ($r->to_string . ": " . $msg);
178 if ($pl->flag (cf::FLAG_WIZ)) { 174 if ($pl->flag (cf::FLAG_WIZ)) {
179 $r->wiz_analyze ($pl); 175 $r->wiz_analyze ($pl);
180 } 176 }
181 } 177 }
182 if ($hadunid) {
183 $pl->message ("You couldn't identify the other rings and not analyze them!"); 178 $pl->message ("You couldn't identify the other rings and not analyze them!")
184 } 179 if $hadunid;
180 $pl->message ("You couldn't find anything in the bench to analyse!")
181 unless $found;
185} 182}
186 183
187# this function converts metals/minerals into a raw ring (of adornment) 184# this function converts metals/minerals into a raw ring (of adornment)
188sub simple_converter { 185sub simple_converter {
189 my ($pl, $ingred, $chdl, $conv) = @_; 186 my ($pl, $ingred, $chdl, $conv, $sk_lvl, $low_skill_cb) = @_;
190 187
191 $conv = lc $conv; 188 $conv = lc $conv;
192 my $cnvs = $CFG->{conversions}; 189 my $cnvs = $CFG->{conversions};
193 190
194 return unless $cnvs->{$conv}; 191 return unless $cnvs->{$conv};
… …
203 warn "ERROR: Conversion for '$outarch' has only " . (@conv_cfg) . " arguments!"; 200 warn "ERROR: Conversion for '$outarch' has only " . (@conv_cfg) . " arguments!";
204 return; 201 return;
205 } 202 }
206 203
207 unless ($xp_gain > 0) { 204 unless ($xp_gain > 0) {
208 warn "WARNING: xp gain isn't > 0 in convesion '$outarch'\n"; 205 warn "WARNING: xp gain isn't > 0 in conversion '$outarch'\n";
209 return; 206 return;
210 } 207 }
211 208
212 unless ($outarchvalfact) { 209 unless ($outarchvalfact) {
213 warn "ERROR: source-arch-value-multiplier == 0 in conversion '$outarch'\n"; 210 warn "ERROR: source-arch-value-multiplier == 0 in conversion '$outarch'\n";
… …
216 213
217 unless ($outarchvalfact >= 1) { 214 unless ($outarchvalfact >= 1) {
218 warn "WARNING: source-arch-value-multiplier < 1 in conversion '$outarch', results in more valuable output!\n"; 215 warn "WARNING: source-arch-value-multiplier < 1 in conversion '$outarch', results in more valuable output!\n";
219 } 216 }
220 217
221 my $archvalsum = $ingred->value ($ingr_grp, $srcarchname); 218 my $archvalsum = $ingred->value ($ingr_grp, $srcarchname);
222 $ingred->remove ($ingr_grp, $srcarchname);
223
224 my $outarchval = cf::arch::find ($outarch)->clone->value; 219 my $outarchval = cf::arch::find ($outarch)->value;
225
226 my $nrof = int ($archvalsum / (($outarchval || 1000) * $outarchvalfact)); 220 my $nrof = int $archvalsum / (($outarchval || 1000) * $outarchvalfact);
221 my $can_make_nr = int (($sk_lvl / 2) + 10);
222
223 if ($nrof > $can_make_nr) {
224 $pl->ob->message ("Your jeweler level is too low to make $nrof rings, you can only make $can_make_nr at your current level.");
225 return;
226 }
227
227 if ($nrof) { 228 if ($nrof) {
228 # XXX: yes, i know what i'm doing here, i don't set nrof, but it didn't work somehow (pls. chek sometimes) 229 # XXX: yes, I know what I'm doing here, I don't set nrof, but it didn't work somehow (pls. check sometimes)
230 $ingred->remove ($ingr_grp, $srcarchname);
229 for (1..$nrof) { 231 for (1 .. $nrof) {
230 $chdl->put (my $ob = cf::object::new $outarch); 232 $chdl->put (my $ob = cf::object::new $outarch);
231 $ob->set_animation (cf::rndm $ob->num_animations); 233 $ob->set_animation (cf::rndm $ob->num_animations)
234 if ($ob->type == cf::RING);
232 $ob->flag (cf::FLAG_IDENTIFIED, 1); 235 $ob->flag (cf::FLAG_IDENTIFIED, 1);
233 } 236 }
234 237
235 my $xp_sum = ($xp_gain * $nrof); 238 my $xp_sum = $xp_gain * $nrof;
236 239
237 if ($xp_sum) { 240 if ($xp_sum) {
238 $pl->ob->message ("You got $xp_sum xp by making $nrof ${outarch}s"); 241 $pl->ob->message ("You got $xp_sum xp by making $nrof ${outarch}s");
239 $pl->ob->change_exp ($xp_sum, "jeweler", cf::SK_EXP_SKILL_ONLY); 242 $pl->ob->change_exp ($xp_sum, "jeweler", cf::SK_EXP_SKILL_ONLY);
240 } 243 }
241 } else { 244 } else {
242 $pl->ob->message ("You fail to make something, propably you used not enough source material?"); 245 $pl->ob->message ("You fail to make something, probably you used not enough source material?");
243 } 246 }
244} 247}
245 248
246 249
247package Jeweler::CauldronHandler; 250package Jeweler::CauldronHandler;
… …
279 my ($self, $arch_name, @map_stack) = @_; 282 my ($self, $arch_name, @map_stack) = @_;
280 283
281 my @c = 284 my @c =
282 grep { 285 grep {
283 $_->flag (cf::FLAG_IS_CAULDRON) 286 $_->flag (cf::FLAG_IS_CAULDRON)
284 and $_->arch->name eq $arch_name 287 and $_->arch->archname eq $arch_name
285 } @map_stack; 288 } @map_stack;
286 289
287 $self->{cauldron} = $c[0]; 290 $self->{cauldron} = $c[0];
288} 291}
289 292
… …
354 357
355sub put { 358sub put {
356 my ($self, $obj) = @_; 359 my ($self, $obj) = @_;
357 360
358 return undef unless $self->{cauldron}; 361 return undef unless $self->{cauldron};
359 $obj->insert_ob_in_ob ($self->{cauldron}); 362 $self->{cauldron}->insert ($obj);
360} 363}
361 364
362=back 365=back
363 366
364=cut 367=cut
… …
397 400
398sub value { 401sub value {
399 my ($self, $group, $archname) = @_; 402 my ($self, $group, $archname) = @_;
400 403
401 my @objs = grep { 404 my @objs = grep {
402 $_->arch->name eq $archname 405 $_->arch->archname eq $archname
403 } @{$self->{ingredients}->{$group} || []}; 406 } @{$self->{ingredients}->{$group} || []};
404 407
405 my $sum = 0; 408 my $sum = 0;
406 for (@objs) { 409 for (@objs) {
407 $sum += ($_->nrof || 1) * $_->value; 410 $sum += ($_->nrof || 1) * $_->value;
… …
424 427
425 my @out; 428 my @out;
426 429
427 for (@{$ingred->{$group}}) { 430 for (@{$ingred->{$group}}) {
428 if (defined $archname) { 431 if (defined $archname) {
429 if ($_->arch->name eq $archname) { 432 if ($_->arch->archname eq $archname) {
430 Jeweler::Util::remove ($_); 433 Jeweler::Util::remove ($_);
431 } else { 434 } else {
432 push @out, $_; 435 push @out, $_;
433 } 436 }
434 } else { 437 } else {
… …
476} 479}
477 480
478sub improve_ring_by_plan { 481sub improve_ring_by_plan {
479 my ($self, $plan, $ring) = @_; 482 my ($self, $plan, $ring) = @_;
480 483
481 $ring = dclone ($ring); 484 $ring = dclone $ring;
482 485
483 my $ingred = $self->{ingredients}; 486 my $ingred = $self->{ingredients};
484 my $impr = {}; 487 my $impr = {};
485 488
486 if ($plan =~ m/^stat_(\S+)$/) { 489 if ($plan =~ m/^stat_(\S+)$/) {
… …
570} 573}
571 574
572sub check_costs { 575sub check_costs {
573 my ($self, $costs, $do_remove) = @_; 576 my ($self, $costs, $do_remove) = @_;
574 577
575 my $costs = dclone ($costs); 578 my $costs = dclone $costs;
576 579
577 for my $key (keys %$costs) { 580 for my $key (keys %$costs) {
578 my @grepar; 581 my @grepar;
579 if ($key =~ m/^(resist_|spec_|stat_)/) { # check the special items 582 if ($key =~ m/^(resist_|spec_|stat_)/) { # check the special items
580 @grepar = @{Jeweler::getcfg (plans => $key) || []}; 583 eval { @grepar = @{Jeweler::getcfg (plans => $key) || []} };
584 next if $@;
581 } else { # check the gems 585 } else { # check the gems
582 @grepar = ('gems', undef, undef, $key); 586 @grepar = ('gems', undef, undef, $key);
583 } 587 }
584 588
585 if ($do_remove) { 589 if ($do_remove) {
586 my $rem = $costs->{$key}; 590 my $rem = $costs->{$key};
591 $self->do_grep (sub {
587 $self->do_grep (sub { if ($rem) { $rem = Jeweler::Util::remove ($_[0], $rem); } 1 }, @grepar); 592 if ($rem) { $rem = Jeweler::Util::remove ($_[0], $rem); }
593 1
594 }, @grepar);
588 if ($rem > 0) { 595 if ($rem > 0) {
589 warn "JEWELER BUG: removed ingredients $rem > 0 after removing!"; 596 warn "JEWELER BUG: removed ingredients ($key) $rem > 0 after removing!";
590 } 597 }
598
591 } else { 599 } else {
592 my $nr; 600 my $nr;
593 $self->do_grep (sub { $nr += ($_[0]->nrof || 1); 0 }, @grepar); 601 $self->do_grep (sub { $nr += ($_[0]->nrof || 1); 0 }, @grepar);
594 $costs->{$key} -= $nr; 602 $costs->{$key} -= $nr;
595 } 603 }
… …
639 return 1 if $self->{hash}->{resist}->{$resnum}; 647 return 1 if $self->{hash}->{resist}->{$resnum};
640 } 648 }
641 return undef; 649 return undef;
642} 650}
643 651
652sub projected_exp {
653 my ($self, $input_level) = @_;
654
655 my $lvl = max ($self->power_to_level, 1);
656 my $exp =
657 (cf::level_to_min_exp ($lvl) - cf::level_to_min_exp ($lvl - 1))
658 / (10 + max ($lvl - 1, 0)); # 10 + level times making such a ring
659 # should get you to the rings level at least.
660
661 if (defined $input_level) {
662 my $subexp =
663 (cf::level_to_min_exp ($input_level)
664 - cf::level_to_min_exp ($input_level - 1))
665 / (10 + max ($input_level - 1, 0)); # see above for comment
666
667 $exp -= $subexp;
668 $exp = max ($exp, 0);
669
670 } else {
671 # the experience bonus here is to make level 1 rings give you at least
672 # 200 exp points when making them. This also makes leveling in the
673 # first few levels a bit easier. (probably until around level 5-6).
674 my $expbonus = cf::level_to_min_exp (2) / 5;
675 # this bonus should also only be given for _new_ rings and not for merged
676 # ones - to prevent infinite exp making.
677 $exp += $expbonus;
678 }
679
680 $exp
681}
682
644sub analyze { 683sub analyze {
645 my ($self, $sk, $pl) = @_; 684 my ($self, $sk, $pl, $input_level) = @_;
685 my $costs = $self->calc_costs;
686
687 unless (defined $costs) {
688 return "This ring has a resistancy above 99%, you can't make that.";
689 }
646 690
647 my $sklvl = cf::exp_to_level ($sk->stats->exp); 691 my $sklvl = cf::exp_to_level ($sk->stats->exp);
648 my $ringlvl = $self->power_to_level; 692 my $ringlvl = $self->power_to_level;
649 693
650 my $tmpl; 694 my $tmpl;
651 if ($pl->flag (cf::FLAG_WIZ)) { 695 if ($pl->flag (cf::FLAG_WIZ)) {
652 $tmpl = Jeweler::level_diff_to_chance_perc ($sklvl - $ringlvl); 696 $tmpl = Jeweler::level_diff_to_chance_perc ($sklvl - $ringlvl);
653 } else { 697 } else {
654 $tmpl = Jeweler::level_diff_to_str ($sklvl - $ringlvl); 698 $tmpl = Jeweler::level_diff_to_str ($sklvl - $ringlvl);
655 } 699 }
656 my $msg = sprintf "Projected success rate: %s", $tmpl; 700 my $msg = sprintf "Projected success rate: %s, you would get %d exp for this.", $tmpl, $self->projected_exp ($input_level);
657 return $msg; 701 return $msg;
658} 702}
659 703
660sub wiz_analyze { 704sub calc_value_from_cost {
661 my ($self, $pl) = @_; 705 my ($self, $costs) = @_;
662 my $costs = $self->calc_costs;
663 my $desc = "";
664 my $lvl = $self->power_to_level (\$desc);
665 my $emarch = cf::arch::find 'emerald'; 706 my $emarch = cf::arch::find 'emerald';
666 my $saarch = cf::arch::find 'sapphire'; 707 my $saarch = cf::arch::find 'sapphire';
667 my $pearch = cf::arch::find 'pearl'; 708 my $pearch = cf::arch::find 'pearl';
668 my $ruarch = cf::arch::find 'ruby'; 709 my $ruarch = cf::arch::find 'ruby';
669 my $diarch = cf::arch::find 'gem'; 710 my $diarch = cf::arch::find 'gem';
670 my $scosts = $emarch->clone->value * $costs->{emerald} 711 my $value = $emarch->value * $costs->{emerald}
671 + $saarch->clone->value * $costs->{sapphire} 712 + $saarch->value * $costs->{sapphire}
672 + $pearch->clone->value * $costs->{pearl} 713 + $pearch->value * $costs->{pearl}
673 + $ruarch->clone->value * $costs->{ruby} 714 + $ruarch->value * $costs->{ruby}
674 + $diarch->clone->value * $costs->{gem}; 715 + $diarch->value * $costs->{gem};
675 716
676 $pl->message ("costs: " . (join (', ', map { "$_: " . sprintf "%.2f", $costs->{$_} } keys %$costs)) . " (".($scosts / 5000)." royalties)"); 717 $value
718}
719
720sub wiz_analyze {
721 my ($self, $pl) = @_;
722 my $costs = $self->calc_costs;
723 if (defined $costs) {
724 my $desc = "";
725 my $lvl = $self->power_to_level (\$desc);
726 my $scosts = $self->calc_value_from_cost ($costs);
727
728 $pl->message ("costs: "
729 . (join ', ', map { "$_: " . sprintf "%.2f", $costs->{$_} } keys %$costs)
730 . " ("
731 . ($scosts / "platinacoin"->cf::arch::find->value)
732 . " platinum)");
677 $pl->message ("level: " . $desc); 733 $pl->message ("level: $desc");
734 } else {
735 $pl->message ("level: impossible to make, due to impossible resistancy configuration");
736 }
678} 737}
679
680 738
681sub get_chance_perc { 739sub get_chance_perc {
682 my ($self, $sk) = @_; 740 my ($self, $sk) = @_;
683 my $sklvl = cf::exp_to_level ($sk->stats->exp); 741 my $sklvl = cf::exp_to_level ($sk->stats->exp);
684 my $ringlvl = $self->power_to_level; 742 my $ringlvl = $self->power_to_level;
… …
687 745
688sub fx { 746sub fx {
689 my ($res, $cfg) = @_; 747 my ($res, $cfg) = @_;
690 my $or = $res; 748 my $or = $res;
691 my $ar = $Jeweler::CFG->{functions}->{$cfg}; 749 my $ar = $Jeweler::CFG->{functions}->{$cfg};
750
692 if (ref $ar->[0] eq 'ARRAY') { 751 if (ref $ar && ref $ar->[0] eq 'ARRAY') {
693 $res = $res - 1; 752 $res = $res - 1;
753 return $ar->[max (min ($res, @$ar - 1), 0)];
754
694 } else { 755 } else {
695 $res = ceil ($res / 5) - 1; 756 # +0.1 is for a jump to the next index when $res / 5 is exactly 1, 2, 3...
696 } 757 # old code:
758 #my $idx = ceil (($res / 5) + 0.1) - 1;
697 $ar->[max (min ($res, @$ar - 1), 0)]; 759 #my $a = $ar->[max (min ($idx, @$ar - 1), 0)];
760 #my $b = $ar->[max (min ($idx + 1, @$ar - 1), 0)];
761 #my $diff = $b - $a; # use the difference of the cost to the next cost
762 #my $o_cost = $a + ($diff / 5) * ($res % 5); # and do some linear interpolation
763 #return $o_cost;
764 return 0 if $res <= 0;
765 return ($ar / (1 - ($res * 0.01)) - $ar)
766 }
698} 767}
699 768
700sub improve_by_ring { 769sub improve_by_ring {
701 my ($self, @rings) = @_; 770 my ($self, @rings) = @_;
702 my $ring = $self; 771 my $ring = $self;
… …
718 if ($self->{hash}->{$cat}->{$k} > 0) { 787 if ($self->{hash}->{$cat}->{$k} > 0) {
719 $self->{hash}->{$cat}->{$k} *= -1; 788 $self->{hash}->{$cat}->{$k} *= -1;
720 } 789 }
721 } 790 }
722 } 791 }
792 $self->{hash}{value} = 0;
723} 793}
724 794
725sub to_string { 795sub to_string {
726 my ($self) = @_; 796 my ($self) = @_;
727 my $r = $self->{hash}; 797 my $r = $self->{hash};
… …
766 $obj->{spec}{ac} = $stats->ac; 836 $obj->{spec}{ac} = $stats->ac;
767 $obj->{spec}{speed} = $stats->exp; 837 $obj->{spec}{speed} = $stats->exp;
768 $obj->{spec}{food} = $stats->food; 838 $obj->{spec}{food} = $stats->food;
769 839
770 $obj->{name} = $thing->name; 840 $obj->{name} = $thing->name;
771 $obj->{arch} = $thing->arch->name; 841 $obj->{arch} = $thing->arch->archname;
772 $obj->{face} = $thing->face; 842 $obj->{face} = $thing->face;
843
844 $obj->{value} = $thing->value;
845
846 $obj->{is_ring} = ($thing->type == cf::RING);
773 847
774 $self->{hash} = $obj 848 $self->{hash} = $obj
775} 849}
776 850
777sub to_object { 851sub to_object {
778 my ($self) = @_; 852 my ($self) = @_;
779 853
780 my $obj = cf::object::new $self->{hash}->{arch}; 854 my $obj = cf::object::new $self->{hash}->{arch};
781 855
782 $obj->item_power ($self->power_to_level); # there have to be strings attached! 856 $obj->item_power (floor ($self->power_to_level / 3)); # there have to be strings attached!
783 857
784 $obj->face ($self->{hash}{face}); 858 $obj->face ($self->{hash}{face});
785 859
786 my $stats = $obj->stats; 860 my $stats = $obj->stats;
787 861
… …
800 $obj->resist ($_, $self->{hash}->{resist}->{$_}); 874 $obj->resist ($_, $self->{hash}->{resist}->{$_});
801 } 875 }
802 876
803 $obj->flag (cf::FLAG_IDENTIFIED, 1); 877 $obj->flag (cf::FLAG_IDENTIFIED, 1);
804 878
879 $obj->value ($self->{hash}{value});
880
805 return $obj; 881 return $obj;
806} 882}
883
884sub set_value { $_[0]->{hash}{value} = $_[1] }
807 885
808sub is_better_than { 886sub is_better_than {
809 my ($self, $other) = @_; 887 my ($self, $other) = @_;
810 888
811 for my $type (qw/spec stat resist/) { 889 for my $type (qw/spec stat resist/) {
… …
836sub resist_level { 914sub resist_level {
837 my ($self) = @_; 915 my ($self) = @_;
838 916
839 my $resists = $self->{hash}->{resist} || {}; 917 my $resists = $self->{hash}->{resist} || {};
840 918
841 my $att_res_lvl = Jeweler::getcfg (maxlevels => 'resist_level'); 919 my $att_res_lvl = Jeweler::getcfg (maxlevels => 'resist_level');
842 my $efc_res_lvl = Jeweler::getcfg (maxlevels => 'effect_resist_level'); 920 my $efc_res_lvl = Jeweler::getcfg (maxlevels => 'effect_resist_level');
843 my $max_att_res = Jeweler::getcfg (maximprovements => 'attack_resistances'); 921 my $max_att_res = Jeweler::getcfg (maximprovements => 'attack_resistances');
844 my $max_efc_res = Jeweler::getcfg (maximprovements => 'effect_resistances'); 922 my $max_efc_res = Jeweler::getcfg (maximprovements => 'effect_resistances');
845 my $max_ovr_res = Jeweler::getcfg (maximprovements => 'resistances'); 923 my $max_ovr_res = Jeweler::getcfg (maximprovements => 'resistances');
846 924
847 my $ressum = 0; 925 my $ressum = 0;
… …
907sub power_to_level { 985sub power_to_level {
908 my ($self, $lvldescr) = @_; 986 my ($self, $lvldescr) = @_;
909 987
910 my $max_imprs = Jeweler::getcfg (maximprovements => 'improvements'); 988 my $max_imprs = Jeweler::getcfg (maximprovements => 'improvements');
911 my $max_impr_lvl = Jeweler::getcfg (maxlevels => 'improve_level'); 989 my $max_impr_lvl = Jeweler::getcfg (maxlevels => 'improve_level');
990 my $ring_offs = Jeweler::getcfg (maxlevels => 'ring_offset');
912 991
913 my ($stat_lvl, $stat_imprs) = $self->stat_level; 992 my ($stat_lvl, $stat_imprs) = $self->stat_level;
914 my ($resist_lvl, $res_imprs) = $self->resist_level; 993 my ($resist_lvl, $res_imprs) = $self->resist_level;
915 my ($spec_lvl, $spec_imprs) = $self->special_level; 994 my ($spec_lvl, $spec_imprs) = $self->special_level;
916 995
917 my $impr_sum = $stat_imprs + $res_imprs + $spec_imprs; 996 my $impr_sum = $stat_imprs + $res_imprs + $spec_imprs;
918 997
919 my $impr_lvl = ceil (($max_impr_lvl / ($max_imprs + 1)) * ($impr_sum - 1)); # 1 improvemnt bonus 998 my $impr_lvl =
999 ceil (($max_impr_lvl / ($max_imprs + 1))
1000 * ($impr_sum - 1)); # 1 improvemnt bonus
920 1001
921 my $levl = int max ($stat_lvl, $resist_lvl, $impr_lvl, $spec_lvl, 0); 1002 my $levl = int max ($stat_lvl, $resist_lvl, $impr_lvl, $spec_lvl, 0);
1003
1004 if ($self->{hash}->{is_ring}) {
1005 $levl += $ring_offs;
1006 }
1007
1008 $levl = min ($levl, cf::settings->max_level);
922 1009
923 if ($lvldescr) { 1010 if ($lvldescr) {
924 $$lvldescr = 1011 $$lvldescr =
925 sprintf "%3d: %s\n", $levl, 1012 sprintf "%3d: %s\n", $levl,
926 "stat: $stat_lvl, resist: $resist_lvl, improve: $impr_lvl, " 1013 "stat: $stat_lvl, resist: $resist_lvl, improve: $impr_lvl, "
… …
973 1060
974 my $res = $ring->{resist}->{$resnum}; 1061 my $res = $ring->{resist}->{$resnum};
975 1062
976 next unless $res > 0; 1063 next unless $res > 0;
977 1064
1065 return undef if $res == 100;
1066
978 $costs->{"resist_" . $Jeweler::RESMAP{$resnum}} += $res; 1067 $costs->{"resist_" . $Jeweler::RESMAP{$resnum}} += $res;
979 1068
980 my $diamonds; 1069 my $diamonds;
981 if (grep { $resnum eq $_ } @Jeweler::EFFECT_RESISTS) { 1070 if (grep { $resnum eq $_ } @Jeweler::EFFECT_RESISTS) {
982 $diamonds += fx ($res, 'effect_resist_diamonds'); 1071 $diamonds += fx ($res, 'effect_resist_diamonds_x');
983 } else { 1072 } else {
984 $diamonds += fx ($res, 'attack_resist_diamonds'); 1073 $diamonds += fx ($res, 'attack_resist_diamonds_x');
985 } 1074 }
986 1075
987 split_diamonds ($costs, $diamonds, 'resist_' . $Jeweler::RESMAP{$resnum}); 1076 split_diamonds ($costs, $diamonds, 'resist_' . $Jeweler::RESMAP{$resnum});
988 } 1077 }
989 1078
… …
997 my ($cost, $diamonds, $category) = @_; 1086 my ($cost, $diamonds, $category) = @_;
998 1087
999 my $stat_split = Jeweler::getcfg (diamond_split => $category); 1088 my $stat_split = Jeweler::getcfg (diamond_split => $category);
1000 1089
1001 my $sum = sum (@$stat_split); 1090 my $sum = sum (@$stat_split);
1002 if ($sum < (1 - 0.0001)) {
1003 warn "JEWELER BUG: sum (@$stat_split) = $sum < 1 for $category!";
1004 }
1005 1091
1006 my $emarch = cf::arch::find 'emerald'; 1092 my $emarch = cf::arch::find 'emerald';
1007 my $saarch = cf::arch::find 'sapphire'; 1093 my $saarch = cf::arch::find 'sapphire';
1008 my $pearch = cf::arch::find 'pearl'; 1094 my $pearch = cf::arch::find 'pearl';
1009 my $ruarch = cf::arch::find 'ruby'; 1095 my $ruarch = cf::arch::find 'ruby';
1010 my $diarch = cf::arch::find 'gem'; 1096 my $diarch = cf::arch::find 'gem';
1011 1097
1012 my $sumvalue = $diarch->clone->value * $diamonds; 1098 my $sumvalue = $diarch->value * $diamonds;
1013 1099
1014 $cost->{emerald} += ceil $sumvalue * $stat_split->[0] / max 1, $emarch->clone->value; 1100 $cost->{emerald} += ceil $sumvalue * $stat_split->[0] / max 1, $emarch->value;
1015 $cost->{sapphire} += ceil $sumvalue * $stat_split->[1] / max 1, $saarch->clone->value; 1101 $cost->{sapphire} += ceil $sumvalue * $stat_split->[1] / max 1, $saarch->value;
1016 $cost->{pearl} += ceil $sumvalue * $stat_split->[2] / max 1, $pearch->clone->value; 1102 $cost->{pearl} += ceil $sumvalue * $stat_split->[2] / max 1, $pearch->value;
1017 $cost->{ruby} += ceil $sumvalue * $stat_split->[3] / max 1, $ruarch->clone->value; 1103 $cost->{ruby} += ceil $sumvalue * $stat_split->[3] / max 1, $ruarch->value;
1018 $cost->{gem} += ceil $sumvalue * $stat_split->[4] / max 1, $diarch->clone->value; 1104 $cost->{gem} += ceil $sumvalue * $stat_split->[4] / max 1, $diarch->value;
1019} 1105}
1020 1106
1021package Jeweler::Util; 1107package Jeweler::Util;
1022 1108
1023use strict; 1109use strict;
… …
1029=over 4 1115=over 4
1030 1116
1031=item remove ($object[, $nrof]) 1117=item remove ($object[, $nrof])
1032 1118
1033Removes the C<$object>. If C<$nrof> is given, remove only C<$nrof> objects. 1119Removes the C<$object>. If C<$nrof> is given, remove only C<$nrof> objects.
1034The returnvalue is the number of 'single' objects that couldn't be removed. 1120The return value is the number of 'single' objects that couldn't be removed.
1035 1121
1036=cut 1122=cut
1037 1123
1038sub remove { 1124sub remove {
1039 my ($obj, $nrof) = @_; 1125 my ($obj, $nrof) = @_;
1126
1127 my $c = $obj->nrof || 1;
1128 my $r = $c > $nrof ? 0 : $nrof - $c;
1129 $obj->decrease (defined ($nrof) ? $nrof : ($obj->nrof || 1));
1040 1130
1041 my $cnt; 1131 $r
1042
1043 if (defined $nrof) {
1044 # TODO: Check tihis line:
1045 return 0 if ($nrof * 1) == 0; #XXX: ???
1046 $cnt = int (($obj->nrof || 1) - (1 * $nrof));
1047
1048 if ($cnt > 0) {
1049 $obj->nrof ($cnt);
1050 return 0;
1051 }
1052 }
1053
1054 remove ($_) for $obj->inv;
1055 $obj->destroy;
1056 return $cnt;
1057} 1132}
1058 1133
1059sub check_for_match { 1134sub check_for_match {
1060 my ($thing, @matchar) = @_; 1135 my ($thing, @matchar) = @_;
1061 1136
1062 my $i = 0; 1137 my $i = 0;
1138 my $check_cnts = 0;
1139 my $check_true = 0;
1063 for my $match (@matchar) { 1140 for my $match (@matchar) {
1141 if ($i % 3 == 0) {
1142 return 1 if $check_true && $check_cnts == $check_true;
1143 $check_cnts = 0;
1144 $check_true = 0;
1145 }
1146
1064 if ($match =~ m/^\s*$/) { 1147 if ($match =~ m/^\s*$/) {
1065 $i++; 1148 $i++;
1066 next; 1149 next;
1067 } 1150 }
1068 1151
1152 $check_cnts++;
1069 if ($i % 3 == 0) { 1153 if ($i % 3 == 0) {
1070 $thing->name eq $match 1154 $thing->name eq $match
1071 and return 1; 1155 and $check_true++;
1072 } elsif ($i % 3 == 1) { 1156 } elsif ($i % 3 == 1) {
1073 $thing->title eq $match 1157 $thing->title eq $match
1074 and return 1; 1158 and $check_true++;
1075 } else { # $i % 3 == 2 1159 } else { # $i % 3 == 2
1076 $thing->arch->name eq $match 1160 $thing->arch->archname eq $match
1077 and return 1; 1161 and $check_true++;
1078 } 1162 }
1079 $i++; 1163 $i++;
1080 } 1164 }
1165 #d# warn "CHECK $check_true | $check_cnts | [".(join ',', @matchar).":".join (",", ($thing->name, $thing->title, $thing->arch->archname))."\n";
1166 return 1 if $check_true && $check_cnts == $check_true;
1081 return 0; 1167 return 0;
1082} 1168}
1083 1169
1084sub grep_for_match { 1170sub grep_for_match {
1085 my ($ingred, $group, @matchar) = @_; 1171 my ($ingred, $group, @matchar) = @_;
1086 1172
1087 for my $thing (@{$ingred->{$group} || []}) { 1173 for my $thing (@{$ingred->{$group} || []}) {
1088 warn sprintf "DEB:(%s,%s,%s)<->%s\n", $thing->name, $thing->title, $thing->arch->name, "@matchar"; #d# 1174 #d# warn sprintf "DEB:(%s,%s,%s)<->%s\n", $thing->name, $thing->title, $thing->arch->archname, "@matchar"; #d#
1089 if (check_for_match ($thing, @matchar)) { 1175 if (check_for_match ($thing, @matchar)) {
1090 return $thing; 1176 return $thing;
1091 } 1177 }
1092 } 1178 }
1093 return undef; 1179 return undef;

Diff Legend

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