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

Diff Legend

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