… | |
… | |
162 | $delta = 5 if $delta > 5; |
162 | $delta = 5 if $delta > 5; |
163 | return $LVL_DIFF_CHANCES{$delta} |
163 | return $LVL_DIFF_CHANCES{$delta} |
164 | } |
164 | } |
165 | |
165 | |
166 | sub analyze { |
166 | sub analyze { |
167 | my ($sk, $chdl, $pl) = @_; |
167 | my ($sk, $chdl, $pl, $input_level) = @_; |
168 | |
168 | |
169 | my $hadunid = 0; |
169 | my $hadunid = 0; |
170 | for ($chdl->grep_by_type (cf::RING, cf::AMULET)) { |
170 | for ($chdl->grep_by_type (cf::RING, cf::AMULET)) { |
171 | if (!$_->flag (cf::FLAG_IDENTIFIED) && $_->need_identify) { |
171 | if (!$_->flag (cf::FLAG_IDENTIFIED) && $_->need_identify) { |
172 | $hadunid = 1; |
172 | $hadunid = 1; |
173 | next; |
173 | next; |
174 | } |
174 | } |
175 | my $r = Jeweler::Object->new (object => $_); |
175 | my $r = Jeweler::Object->new (object => $_); |
176 | my $msg = $r->analyze ($sk, $pl); |
176 | my $msg = $r->analyze ($sk, $pl, $input_level); |
177 | $pl->message ($r->to_string . ": " . $msg); |
177 | $pl->message ($r->to_string . ": " . $msg); |
178 | if ($pl->flag (cf::FLAG_WIZ)) { |
178 | if ($pl->flag (cf::FLAG_WIZ)) { |
179 | $r->wiz_analyze ($pl); |
179 | $r->wiz_analyze ($pl); |
180 | } |
180 | } |
181 | } |
181 | } |
… | |
… | |
219 | } |
219 | } |
220 | |
220 | |
221 | my $archvalsum = $ingred->value ($ingr_grp, $srcarchname); |
221 | my $archvalsum = $ingred->value ($ingr_grp, $srcarchname); |
222 | $ingred->remove ($ingr_grp, $srcarchname); |
222 | $ingred->remove ($ingr_grp, $srcarchname); |
223 | |
223 | |
224 | my $outarchval = cf::arch::find ($outarch)->clone->value; |
224 | my $outarchval = cf::arch::find ($outarch)->value; |
225 | |
225 | |
226 | my $nrof = int ($archvalsum / (($outarchval || 1000) * $outarchvalfact)); |
226 | my $nrof = int ($archvalsum / (($outarchval || 1000) * $outarchvalfact)); |
227 | if ($nrof) { |
227 | 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) |
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 | for (1..$nrof) { |
229 | for (1..$nrof) { |
… | |
… | |
238 | if ($xp_sum) { |
238 | if ($xp_sum) { |
239 | $pl->ob->message ("You got $xp_sum xp by making $nrof ${outarch}s"); |
239 | $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); |
240 | $pl->ob->change_exp ($xp_sum, "jeweler", cf::SK_EXP_SKILL_ONLY); |
241 | } |
241 | } |
242 | } else { |
242 | } else { |
243 | $pl->ob->message ("You fail to make something, propably you used not enough source material?"); |
243 | $pl->ob->message ("You fail to make something, probably you used not enough source material?"); |
244 | } |
244 | } |
245 | } |
245 | } |
246 | |
246 | |
247 | |
247 | |
248 | package Jeweler::CauldronHandler; |
248 | package Jeweler::CauldronHandler; |
… | |
… | |
280 | my ($self, $arch_name, @map_stack) = @_; |
280 | my ($self, $arch_name, @map_stack) = @_; |
281 | |
281 | |
282 | my @c = |
282 | my @c = |
283 | grep { |
283 | grep { |
284 | $_->flag (cf::FLAG_IS_CAULDRON) |
284 | $_->flag (cf::FLAG_IS_CAULDRON) |
285 | and $_->arch->name eq $arch_name |
285 | and $_->arch->archname eq $arch_name |
286 | } @map_stack; |
286 | } @map_stack; |
287 | |
287 | |
288 | $self->{cauldron} = $c[0]; |
288 | $self->{cauldron} = $c[0]; |
289 | } |
289 | } |
290 | |
290 | |
… | |
… | |
398 | |
398 | |
399 | sub value { |
399 | sub value { |
400 | my ($self, $group, $archname) = @_; |
400 | my ($self, $group, $archname) = @_; |
401 | |
401 | |
402 | my @objs = grep { |
402 | my @objs = grep { |
403 | $_->arch->name eq $archname |
403 | $_->arch->archname eq $archname |
404 | } @{$self->{ingredients}->{$group} || []}; |
404 | } @{$self->{ingredients}->{$group} || []}; |
405 | |
405 | |
406 | my $sum = 0; |
406 | my $sum = 0; |
407 | for (@objs) { |
407 | for (@objs) { |
408 | $sum += ($_->nrof || 1) * $_->value; |
408 | $sum += ($_->nrof || 1) * $_->value; |
… | |
… | |
425 | |
425 | |
426 | my @out; |
426 | my @out; |
427 | |
427 | |
428 | for (@{$ingred->{$group}}) { |
428 | for (@{$ingred->{$group}}) { |
429 | if (defined $archname) { |
429 | if (defined $archname) { |
430 | if ($_->arch->name eq $archname) { |
430 | if ($_->arch->archname eq $archname) { |
431 | Jeweler::Util::remove ($_); |
431 | Jeweler::Util::remove ($_); |
432 | } else { |
432 | } else { |
433 | push @out, $_; |
433 | push @out, $_; |
434 | } |
434 | } |
435 | } else { |
435 | } else { |
… | |
… | |
576 | my $costs = dclone ($costs); |
576 | my $costs = dclone ($costs); |
577 | |
577 | |
578 | for my $key (keys %$costs) { |
578 | for my $key (keys %$costs) { |
579 | my @grepar; |
579 | my @grepar; |
580 | if ($key =~ m/^(resist_|spec_|stat_)/) { # check the special items |
580 | if ($key =~ m/^(resist_|spec_|stat_)/) { # check the special items |
581 | @grepar = @{Jeweler::getcfg (plans => $key) || []}; |
581 | eval { @grepar = @{Jeweler::getcfg (plans => $key) || []} }; |
|
|
582 | next if $@; |
582 | } else { # check the gems |
583 | } else { # check the gems |
583 | @grepar = ('gems', undef, undef, $key); |
584 | @grepar = ('gems', undef, undef, $key); |
584 | } |
585 | } |
585 | |
586 | |
586 | if ($do_remove) { |
587 | if ($do_remove) { |
… | |
… | |
640 | return 1 if $self->{hash}->{resist}->{$resnum}; |
641 | return 1 if $self->{hash}->{resist}->{$resnum}; |
641 | } |
642 | } |
642 | return undef; |
643 | return undef; |
643 | } |
644 | } |
644 | |
645 | |
|
|
646 | sub projected_exp { |
|
|
647 | my ($self, $input_level) = @_; |
|
|
648 | |
|
|
649 | my $lvl = max ($self->power_to_level, 1); |
|
|
650 | my $exp = |
|
|
651 | (cf::level_to_min_exp ($lvl) - cf::level_to_min_exp ($lvl - 1)) |
|
|
652 | / (10 + max ($lvl - 1, 0)); # 10 + level times making such a ring |
|
|
653 | # should get you to the rings level at least. |
|
|
654 | |
|
|
655 | if (defined $input_level) { |
|
|
656 | my $subexp = |
|
|
657 | (cf::level_to_min_exp ($input_level) |
|
|
658 | - cf::level_to_min_exp ($input_level - 1)) |
|
|
659 | / (10 + max ($input_level - 1, 0)); # see above for comment |
|
|
660 | |
|
|
661 | $exp -= $subexp; |
|
|
662 | $exp = max ($exp, 0); |
|
|
663 | |
|
|
664 | } else { |
|
|
665 | # the experience bonus here is to make level 1 rings give you at least |
|
|
666 | # 100 exp points when making them. This also makes leveling in the |
|
|
667 | # first few levels a bit easier. (probably until around level 5-6). |
|
|
668 | my $expbonus = cf::level_to_min_exp (2) / 10; |
|
|
669 | # this bonus should also only be given for _new_ rings and not for merged |
|
|
670 | # ones - to prevent infinite exp making. |
|
|
671 | $exp += $expbonus; |
|
|
672 | } |
|
|
673 | |
|
|
674 | $exp |
|
|
675 | } |
|
|
676 | |
645 | sub analyze { |
677 | sub analyze { |
646 | my ($self, $sk, $pl) = @_; |
678 | my ($self, $sk, $pl, $input_level) = @_; |
|
|
679 | my $costs = $self->calc_costs; |
|
|
680 | |
|
|
681 | unless (defined $costs) { |
|
|
682 | return "This ring has a resistancy above 99%, you can't make that."; |
|
|
683 | } |
647 | |
684 | |
648 | my $sklvl = cf::exp_to_level ($sk->stats->exp); |
685 | my $sklvl = cf::exp_to_level ($sk->stats->exp); |
649 | my $ringlvl = $self->power_to_level; |
686 | my $ringlvl = $self->power_to_level; |
650 | |
687 | |
651 | my $tmpl; |
688 | my $tmpl; |
652 | if ($pl->flag (cf::FLAG_WIZ)) { |
689 | if ($pl->flag (cf::FLAG_WIZ)) { |
653 | $tmpl = Jeweler::level_diff_to_chance_perc ($sklvl - $ringlvl); |
690 | $tmpl = Jeweler::level_diff_to_chance_perc ($sklvl - $ringlvl); |
654 | } else { |
691 | } else { |
655 | $tmpl = Jeweler::level_diff_to_str ($sklvl - $ringlvl); |
692 | $tmpl = Jeweler::level_diff_to_str ($sklvl - $ringlvl); |
656 | } |
693 | } |
657 | my $msg = sprintf "Projected success rate: %s", $tmpl; |
694 | my $msg = sprintf "Projected success rate: %s, you would get %d exp for this.", $tmpl, $self->projected_exp ($input_level); |
658 | return $msg; |
695 | return $msg; |
659 | } |
696 | } |
660 | |
697 | |
661 | sub wiz_analyze { |
698 | sub calc_value_from_cost { |
662 | my ($self, $pl) = @_; |
699 | my ($self, $costs) = @_; |
663 | my $costs = $self->calc_costs; |
|
|
664 | my $desc = ""; |
|
|
665 | my $lvl = $self->power_to_level (\$desc); |
|
|
666 | my $emarch = cf::arch::find 'emerald'; |
700 | my $emarch = cf::arch::find 'emerald'; |
667 | my $saarch = cf::arch::find 'sapphire'; |
701 | my $saarch = cf::arch::find 'sapphire'; |
668 | my $pearch = cf::arch::find 'pearl'; |
702 | my $pearch = cf::arch::find 'pearl'; |
669 | my $ruarch = cf::arch::find 'ruby'; |
703 | my $ruarch = cf::arch::find 'ruby'; |
670 | my $diarch = cf::arch::find 'gem'; |
704 | my $diarch = cf::arch::find 'gem'; |
671 | my $scosts = $emarch->clone->value * $costs->{emerald} |
705 | my $value = $emarch->value * $costs->{emerald} |
672 | + $saarch->clone->value * $costs->{sapphire} |
706 | + $saarch->value * $costs->{sapphire} |
673 | + $pearch->clone->value * $costs->{pearl} |
707 | + $pearch->value * $costs->{pearl} |
674 | + $ruarch->clone->value * $costs->{ruby} |
708 | + $ruarch->value * $costs->{ruby} |
675 | + $diarch->clone->value * $costs->{gem}; |
709 | + $diarch->value * $costs->{gem}; |
676 | |
710 | |
|
|
711 | $value |
|
|
712 | } |
|
|
713 | |
|
|
714 | sub wiz_analyze { |
|
|
715 | my ($self, $pl) = @_; |
|
|
716 | my $costs = $self->calc_costs; |
|
|
717 | if (defined $costs) { |
|
|
718 | my $desc = ""; |
|
|
719 | my $lvl = $self->power_to_level (\$desc); |
|
|
720 | my $scosts = $self->calc_value_from_cost ($costs); |
|
|
721 | |
677 | $pl->message ("costs: " . (join (', ', map { "$_: " . sprintf "%.2f", $costs->{$_} } keys %$costs)) . " (".($scosts / 5000)." royalties)"); |
722 | $pl->message ("costs: " . (join (', ', map { "$_: " . sprintf "%.2f", $costs->{$_} } keys %$costs)) . " (".($scosts / 5000)." royalties)"); |
678 | $pl->message ("level: " . $desc); |
723 | $pl->message ("level: " . $desc); |
|
|
724 | } else { |
|
|
725 | $pl->message ("level: impossible to make, due to impossible resistancy configuration"); |
|
|
726 | } |
679 | } |
727 | } |
680 | |
|
|
681 | |
728 | |
682 | sub get_chance_perc { |
729 | sub get_chance_perc { |
683 | my ($self, $sk) = @_; |
730 | my ($self, $sk) = @_; |
684 | my $sklvl = cf::exp_to_level ($sk->stats->exp); |
731 | my $sklvl = cf::exp_to_level ($sk->stats->exp); |
685 | my $ringlvl = $self->power_to_level; |
732 | my $ringlvl = $self->power_to_level; |
… | |
… | |
688 | |
735 | |
689 | sub fx { |
736 | sub fx { |
690 | my ($res, $cfg) = @_; |
737 | my ($res, $cfg) = @_; |
691 | my $or = $res; |
738 | my $or = $res; |
692 | my $ar = $Jeweler::CFG->{functions}->{$cfg}; |
739 | my $ar = $Jeweler::CFG->{functions}->{$cfg}; |
|
|
740 | |
693 | if (ref $ar->[0] eq 'ARRAY') { |
741 | if (ref $ar && ref $ar->[0] eq 'ARRAY') { |
694 | $res = $res - 1; |
742 | $res = $res - 1; |
|
|
743 | return $ar->[max (min ($res, @$ar - 1), 0)]; |
|
|
744 | |
695 | } else { |
745 | } else { |
696 | $res = ceil ($res / 5) - 1; |
746 | # +0.1 is for a jump to the next index when $res / 5 is exactly 1, 2, 3... |
697 | } |
747 | # old code: |
|
|
748 | #my $idx = ceil (($res / 5) + 0.1) - 1; |
698 | $ar->[max (min ($res, @$ar - 1), 0)]; |
749 | #my $a = $ar->[max (min ($idx, @$ar - 1), 0)]; |
|
|
750 | #my $b = $ar->[max (min ($idx + 1, @$ar - 1), 0)]; |
|
|
751 | #my $diff = $b - $a; # use the difference of the cost to the next cost |
|
|
752 | #my $o_cost = $a + ($diff / 5) * ($res % 5); # and do some linear interpolation |
|
|
753 | #return $o_cost; |
|
|
754 | return 0 if $res <= 0; |
|
|
755 | return ($ar / (1 - ($res * 0.01)) - $ar) |
|
|
756 | } |
699 | } |
757 | } |
700 | |
758 | |
701 | sub improve_by_ring { |
759 | sub improve_by_ring { |
702 | my ($self, @rings) = @_; |
760 | my ($self, @rings) = @_; |
703 | my $ring = $self; |
761 | my $ring = $self; |
… | |
… | |
719 | if ($self->{hash}->{$cat}->{$k} > 0) { |
777 | if ($self->{hash}->{$cat}->{$k} > 0) { |
720 | $self->{hash}->{$cat}->{$k} *= -1; |
778 | $self->{hash}->{$cat}->{$k} *= -1; |
721 | } |
779 | } |
722 | } |
780 | } |
723 | } |
781 | } |
|
|
782 | $self->{hash}{value} = 0; |
724 | } |
783 | } |
725 | |
784 | |
726 | sub to_string { |
785 | sub to_string { |
727 | my ($self) = @_; |
786 | my ($self) = @_; |
728 | my $r = $self->{hash}; |
787 | my $r = $self->{hash}; |
… | |
… | |
767 | $obj->{spec}{ac} = $stats->ac; |
826 | $obj->{spec}{ac} = $stats->ac; |
768 | $obj->{spec}{speed} = $stats->exp; |
827 | $obj->{spec}{speed} = $stats->exp; |
769 | $obj->{spec}{food} = $stats->food; |
828 | $obj->{spec}{food} = $stats->food; |
770 | |
829 | |
771 | $obj->{name} = $thing->name; |
830 | $obj->{name} = $thing->name; |
772 | $obj->{arch} = $thing->arch->name; |
831 | $obj->{arch} = $thing->arch->archname; |
773 | $obj->{face} = $thing->face; |
832 | $obj->{face} = $thing->face; |
|
|
833 | |
|
|
834 | $obj->{value} = $thing->value; |
774 | |
835 | |
775 | $self->{hash} = $obj |
836 | $self->{hash} = $obj |
776 | } |
837 | } |
777 | |
838 | |
778 | sub to_object { |
839 | sub to_object { |
779 | my ($self) = @_; |
840 | my ($self) = @_; |
780 | |
841 | |
781 | my $obj = cf::object::new $self->{hash}->{arch}; |
842 | my $obj = cf::object::new $self->{hash}->{arch}; |
782 | |
843 | |
783 | $obj->item_power ($self->power_to_level); # there have to be strings attached! |
844 | $obj->item_power (floor ($self->power_to_level / 3)); # there have to be strings attached! |
784 | |
845 | |
785 | $obj->face ($self->{hash}{face}); |
846 | $obj->face ($self->{hash}{face}); |
786 | |
847 | |
787 | my $stats = $obj->stats; |
848 | my $stats = $obj->stats; |
788 | |
849 | |
… | |
… | |
801 | $obj->resist ($_, $self->{hash}->{resist}->{$_}); |
862 | $obj->resist ($_, $self->{hash}->{resist}->{$_}); |
802 | } |
863 | } |
803 | |
864 | |
804 | $obj->flag (cf::FLAG_IDENTIFIED, 1); |
865 | $obj->flag (cf::FLAG_IDENTIFIED, 1); |
805 | |
866 | |
|
|
867 | $obj->value ($self->{hash}{value}); |
|
|
868 | |
806 | return $obj; |
869 | return $obj; |
807 | } |
870 | } |
|
|
871 | |
|
|
872 | sub set_value { $_[0]->{hash}{value} = $_[1] } |
808 | |
873 | |
809 | sub is_better_than { |
874 | sub is_better_than { |
810 | my ($self, $other) = @_; |
875 | my ($self, $other) = @_; |
811 | |
876 | |
812 | for my $type (qw/spec stat resist/) { |
877 | for my $type (qw/spec stat resist/) { |
… | |
… | |
974 | |
1039 | |
975 | my $res = $ring->{resist}->{$resnum}; |
1040 | my $res = $ring->{resist}->{$resnum}; |
976 | |
1041 | |
977 | next unless $res > 0; |
1042 | next unless $res > 0; |
978 | |
1043 | |
|
|
1044 | return undef if $res == 100; |
|
|
1045 | |
979 | $costs->{"resist_" . $Jeweler::RESMAP{$resnum}} += $res; |
1046 | $costs->{"resist_" . $Jeweler::RESMAP{$resnum}} += $res; |
980 | |
1047 | |
981 | my $diamonds; |
1048 | my $diamonds; |
982 | if (grep { $resnum eq $_ } @Jeweler::EFFECT_RESISTS) { |
1049 | if (grep { $resnum eq $_ } @Jeweler::EFFECT_RESISTS) { |
983 | $diamonds += fx ($res, 'effect_resist_diamonds'); |
1050 | $diamonds += fx ($res, 'effect_resist_diamonds_x'); |
984 | } else { |
1051 | } else { |
985 | $diamonds += fx ($res, 'attack_resist_diamonds'); |
1052 | $diamonds += fx ($res, 'attack_resist_diamonds_x'); |
986 | } |
1053 | } |
987 | |
1054 | |
988 | split_diamonds ($costs, $diamonds, 'resist_' . $Jeweler::RESMAP{$resnum}); |
1055 | split_diamonds ($costs, $diamonds, 'resist_' . $Jeweler::RESMAP{$resnum}); |
989 | } |
1056 | } |
990 | |
1057 | |
… | |
… | |
998 | my ($cost, $diamonds, $category) = @_; |
1065 | my ($cost, $diamonds, $category) = @_; |
999 | |
1066 | |
1000 | my $stat_split = Jeweler::getcfg (diamond_split => $category); |
1067 | my $stat_split = Jeweler::getcfg (diamond_split => $category); |
1001 | |
1068 | |
1002 | my $sum = sum (@$stat_split); |
1069 | my $sum = sum (@$stat_split); |
1003 | if ($sum < (1 - 0.0001)) { |
|
|
1004 | warn "JEWELER BUG: sum (@$stat_split) = $sum < 1 for $category!"; |
|
|
1005 | } |
|
|
1006 | |
1070 | |
1007 | my $emarch = cf::arch::find 'emerald'; |
1071 | my $emarch = cf::arch::find 'emerald'; |
1008 | my $saarch = cf::arch::find 'sapphire'; |
1072 | my $saarch = cf::arch::find 'sapphire'; |
1009 | my $pearch = cf::arch::find 'pearl'; |
1073 | my $pearch = cf::arch::find 'pearl'; |
1010 | my $ruarch = cf::arch::find 'ruby'; |
1074 | my $ruarch = cf::arch::find 'ruby'; |
1011 | my $diarch = cf::arch::find 'gem'; |
1075 | my $diarch = cf::arch::find 'gem'; |
1012 | |
1076 | |
1013 | my $sumvalue = $diarch->clone->value * $diamonds; |
1077 | my $sumvalue = $diarch->value * $diamonds; |
1014 | |
1078 | |
1015 | $cost->{emerald} += ceil $sumvalue * $stat_split->[0] / max 1, $emarch->clone->value; |
1079 | $cost->{emerald} += ceil $sumvalue * $stat_split->[0] / max 1, $emarch->value; |
1016 | $cost->{sapphire} += ceil $sumvalue * $stat_split->[1] / max 1, $saarch->clone->value; |
1080 | $cost->{sapphire} += ceil $sumvalue * $stat_split->[1] / max 1, $saarch->value; |
1017 | $cost->{pearl} += ceil $sumvalue * $stat_split->[2] / max 1, $pearch->clone->value; |
1081 | $cost->{pearl} += ceil $sumvalue * $stat_split->[2] / max 1, $pearch->value; |
1018 | $cost->{ruby} += ceil $sumvalue * $stat_split->[3] / max 1, $ruarch->clone->value; |
1082 | $cost->{ruby} += ceil $sumvalue * $stat_split->[3] / max 1, $ruarch->value; |
1019 | $cost->{gem} += ceil $sumvalue * $stat_split->[4] / max 1, $diarch->clone->value; |
1083 | $cost->{gem} += ceil $sumvalue * $stat_split->[4] / max 1, $diarch->value; |
1020 | } |
1084 | } |
1021 | |
1085 | |
1022 | package Jeweler::Util; |
1086 | package Jeweler::Util; |
1023 | |
1087 | |
1024 | use strict; |
1088 | use strict; |
… | |
… | |
1059 | |
1123 | |
1060 | sub check_for_match { |
1124 | sub check_for_match { |
1061 | my ($thing, @matchar) = @_; |
1125 | my ($thing, @matchar) = @_; |
1062 | |
1126 | |
1063 | my $i = 0; |
1127 | my $i = 0; |
|
|
1128 | my $check_cnts = 0; |
|
|
1129 | my $check_true = 0; |
1064 | for my $match (@matchar) { |
1130 | for my $match (@matchar) { |
|
|
1131 | if ($i % 3 == 0) { |
|
|
1132 | return 1 if $check_true && $check_cnts == $check_true; |
|
|
1133 | $check_cnts = 0; |
|
|
1134 | $check_true = 0; |
|
|
1135 | } |
|
|
1136 | |
1065 | if ($match =~ m/^\s*$/) { |
1137 | if ($match =~ m/^\s*$/) { |
1066 | $i++; |
1138 | $i++; |
1067 | next; |
1139 | next; |
1068 | } |
1140 | } |
1069 | |
1141 | |
|
|
1142 | $check_cnts++; |
1070 | if ($i % 3 == 0) { |
1143 | if ($i % 3 == 0) { |
1071 | $thing->name eq $match |
1144 | $thing->name eq $match |
1072 | and return 1; |
1145 | and $check_true++; |
1073 | } elsif ($i % 3 == 1) { |
1146 | } elsif ($i % 3 == 1) { |
1074 | $thing->title eq $match |
1147 | $thing->title eq $match |
1075 | and return 1; |
1148 | and $check_true++; |
1076 | } else { # $i % 3 == 2 |
1149 | } else { # $i % 3 == 2 |
1077 | $thing->arch->name eq $match |
1150 | $thing->arch->archname eq $match |
1078 | and return 1; |
1151 | and $check_true++; |
1079 | } |
1152 | } |
1080 | $i++; |
1153 | $i++; |
1081 | } |
1154 | } |
|
|
1155 | #d# warn "CHECK $check_true | $check_cnts | [".(join ',', @matchar).":".join (",", ($thing->name, $thing->title, $thing->arch->archname))."\n"; |
|
|
1156 | return 1 if $check_true && $check_cnts == $check_true; |
1082 | return 0; |
1157 | return 0; |
1083 | } |
1158 | } |
1084 | |
1159 | |
1085 | sub grep_for_match { |
1160 | sub grep_for_match { |
1086 | my ($ingred, $group, @matchar) = @_; |
1161 | my ($ingred, $group, @matchar) = @_; |
1087 | |
1162 | |
1088 | for my $thing (@{$ingred->{$group} || []}) { |
1163 | for my $thing (@{$ingred->{$group} || []}) { |
1089 | warn sprintf "DEB:(%s,%s,%s)<->%s\n", $thing->name, $thing->title, $thing->arch->name, "@matchar"; #d# |
1164 | #d# warn sprintf "DEB:(%s,%s,%s)<->%s\n", $thing->name, $thing->title, $thing->arch->archname, "@matchar"; #d# |
1090 | if (check_for_match ($thing, @matchar)) { |
1165 | if (check_for_match ($thing, @matchar)) { |
1091 | return $thing; |
1166 | return $thing; |
1092 | } |
1167 | } |
1093 | } |
1168 | } |
1094 | return undef; |
1169 | return undef; |