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.17 by elmex, Sat Jul 21 16:06:22 2007 UTC vs.
Revision 1.32 by elmex, Tue Apr 27 17:08:09 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
… …
24our $CFG; 23our $CFG;
25 24
26sub read_config { 25sub read_config {
27 my ($filename) = @_; 26 my ($filename) = @_;
28 27
29 unless (-e $filename) { 28 if (my $meta = $cf::RESOURCE{$filename}) {
29 $CFG = cf::decode_json $meta->{data};
30 } else {
30 warn "$filename doesn't exists! no config for jeweler skill loaded!\n"; 31 warn "$filename doesn't exist! no config for jeweler skill loaded!\n";
31 $CFG = {}; 32 $CFG = {};
32 return
33 } 33 }
34
35 $CFG = YAML::LoadFile $filename;
36} 34}
37 35
38sub getcfg { 36sub getcfg {
39 my ($sect, $key) = @_; 37 my ($sect, $key) = @_;
40 return $CFG->{$sect} unless defined $key; 38 return $CFG->{$sect} unless defined $key;
… …
162 $delta = 5 if $delta > 5; 160 $delta = 5 if $delta > 5;
163 return $LVL_DIFF_CHANCES{$delta} 161 return $LVL_DIFF_CHANCES{$delta}
164} 162}
165 163
166sub analyze { 164sub analyze {
167 my ($sk, $chdl, $pl) = @_; 165 my ($sk, $chdl, $pl, $input_level) = @_;
168 166
169 my $hadunid = 0; 167 my $hadunid = 0;
168 my $found = 0;
170 for ($chdl->grep_by_type (cf::RING, cf::AMULET)) { 169 for ($chdl->grep_by_type (cf::RING, cf::AMULET)) {
171 if (!$_->flag (cf::FLAG_IDENTIFIED) && $_->need_identify) { 170 if (!$_->flag (cf::FLAG_IDENTIFIED) && $_->need_identify) {
172 $hadunid = 1; 171 $hadunid = 1;
173 next; 172 next;
174 } 173 }
174 $found = 1;
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 }
182 if ($hadunid) {
183 $pl->message ("You couldn't identify the other rings and not analyze them!"); 182 $pl->message ("You couldn't identify the other rings and not analyze them!")
184 } 183 if $hadunid;
184 $pl->message ("You couldn't find anything in the bench to analyse!")
185 unless $found;
185} 186}
186 187
187# this function converts metals/minerals into a raw ring (of adornment) 188# this function converts metals/minerals into a raw ring (of adornment)
188sub simple_converter { 189sub simple_converter {
189 my ($pl, $ingred, $chdl, $conv) = @_; 190 my ($pl, $ingred, $chdl, $conv, $sk_lvl, $low_skill_cb) = @_;
190 191
191 $conv = lc $conv; 192 $conv = lc $conv;
192 my $cnvs = $CFG->{conversions}; 193 my $cnvs = $CFG->{conversions};
193 194
194 return unless $cnvs->{$conv}; 195 return unless $cnvs->{$conv};
… …
203 warn "ERROR: Conversion for '$outarch' has only " . (@conv_cfg) . " arguments!"; 204 warn "ERROR: Conversion for '$outarch' has only " . (@conv_cfg) . " arguments!";
204 return; 205 return;
205 } 206 }
206 207
207 unless ($xp_gain > 0) { 208 unless ($xp_gain > 0) {
208 warn "WARNING: xp gain isn't > 0 in convesion '$outarch'\n"; 209 warn "WARNING: xp gain isn't > 0 in conversion '$outarch'\n";
209 return; 210 return;
210 } 211 }
211 212
212 unless ($outarchvalfact) { 213 unless ($outarchvalfact) {
213 warn "ERROR: source-arch-value-multiplier == 0 in conversion '$outarch'\n"; 214 warn "ERROR: source-arch-value-multiplier == 0 in conversion '$outarch'\n";
… …
216 217
217 unless ($outarchvalfact >= 1) { 218 unless ($outarchvalfact >= 1) {
218 warn "WARNING: source-arch-value-multiplier < 1 in conversion '$outarch', results in more valuable output!\n"; 219 warn "WARNING: source-arch-value-multiplier < 1 in conversion '$outarch', results in more valuable output!\n";
219 } 220 }
220 221
221 my $archvalsum = $ingred->value ($ingr_grp, $srcarchname); 222 my $archvalsum = $ingred->value ($ingr_grp, $srcarchname);
222 $ingred->remove ($ingr_grp, $srcarchname);
223
224 my $outarchval = cf::arch::find ($outarch)->value; 223 my $outarchval = cf::arch::find ($outarch)->value;
225
226 my $nrof = int ($archvalsum / (($outarchval || 1000) * $outarchvalfact)); 224 my $nrof = int $archvalsum / (($outarchval || 1000) * $outarchvalfact);
225 my $can_make_nr = int (($sk_lvl / 2) + 10);
226
227 if ($nrof > $can_make_nr) {
228 $pl->ob->message ("Your jeweler level is too low to make $nrof rings, you can only make $can_make_nr at your current level.");
229 return;
230 }
231
227 if ($nrof) { 232 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) 233 # XXX: yes, I know what I'm doing here, I don't set nrof, but it didn't work somehow (pls. check sometimes)
234 $ingred->remove ($ingr_grp, $srcarchname);
229 for (1..$nrof) { 235 for (1 .. $nrof) {
230 $chdl->put (my $ob = cf::object::new $outarch); 236 $chdl->put (my $ob = cf::object::new $outarch);
231 $ob->set_animation (cf::rndm $ob->num_animations) 237 $ob->set_animation (cf::rndm $ob->num_animations)
232 if ($ob->type == cf::RING); 238 if ($ob->type == cf::RING);
233 $ob->flag (cf::FLAG_IDENTIFIED, 1); 239 $ob->flag (cf::FLAG_IDENTIFIED, 1);
234 } 240 }
235 241
236 my $xp_sum = ($xp_gain * $nrof); 242 my $xp_sum = $xp_gain * $nrof;
237 243
238 if ($xp_sum) { 244 if ($xp_sum) {
239 $pl->ob->message ("You got $xp_sum xp by making $nrof ${outarch}s"); 245 $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); 246 $pl->ob->change_exp ($xp_sum, "jeweler", cf::SK_EXP_SKILL_ONLY);
241 } 247 }
… …
355 361
356sub put { 362sub put {
357 my ($self, $obj) = @_; 363 my ($self, $obj) = @_;
358 364
359 return undef unless $self->{cauldron}; 365 return undef unless $self->{cauldron};
360 $obj->insert_ob_in_ob ($self->{cauldron}); 366 $self->{cauldron}->insert ($obj);
361} 367}
362 368
363=back 369=back
364 370
365=cut 371=cut
… …
477} 483}
478 484
479sub improve_ring_by_plan { 485sub improve_ring_by_plan {
480 my ($self, $plan, $ring) = @_; 486 my ($self, $plan, $ring) = @_;
481 487
482 $ring = dclone ($ring); 488 $ring = dclone $ring;
483 489
484 my $ingred = $self->{ingredients}; 490 my $ingred = $self->{ingredients};
485 my $impr = {}; 491 my $impr = {};
486 492
487 if ($plan =~ m/^stat_(\S+)$/) { 493 if ($plan =~ m/^stat_(\S+)$/) {
… …
571} 577}
572 578
573sub check_costs { 579sub check_costs {
574 my ($self, $costs, $do_remove) = @_; 580 my ($self, $costs, $do_remove) = @_;
575 581
576 my $costs = dclone ($costs); 582 my $costs = dclone $costs;
577 583
578 for my $key (keys %$costs) { 584 for my $key (keys %$costs) {
579 my @grepar; 585 my @grepar;
580 if ($key =~ m/^(resist_|spec_|stat_)/) { # check the special items 586 if ($key =~ m/^(resist_|spec_|stat_)/) { # check the special items
581 eval { @grepar = @{Jeweler::getcfg (plans => $key) || []} }; 587 eval { @grepar = @{Jeweler::getcfg (plans => $key) || []} };
… …
584 @grepar = ('gems', undef, undef, $key); 590 @grepar = ('gems', undef, undef, $key);
585 } 591 }
586 592
587 if ($do_remove) { 593 if ($do_remove) {
588 my $rem = $costs->{$key}; 594 my $rem = $costs->{$key};
595 $self->do_grep (sub {
589 $self->do_grep (sub { if ($rem) { $rem = Jeweler::Util::remove ($_[0], $rem); } 1 }, @grepar); 596 if ($rem) { $rem = Jeweler::Util::remove ($_[0], $rem); }
597 1
598 }, @grepar);
590 if ($rem > 0) { 599 if ($rem > 0) {
591 warn "JEWELER BUG: removed ingredients $rem > 0 after removing!"; 600 warn "JEWELER BUG: removed ingredients ($key) $rem > 0 after removing!";
592 } 601 }
602
593 } else { 603 } else {
594 my $nr; 604 my $nr;
595 $self->do_grep (sub { $nr += ($_[0]->nrof || 1); 0 }, @grepar); 605 $self->do_grep (sub { $nr += ($_[0]->nrof || 1); 0 }, @grepar);
596 $costs->{$key} -= $nr; 606 $costs->{$key} -= $nr;
597 } 607 }
… …
641 return 1 if $self->{hash}->{resist}->{$resnum}; 651 return 1 if $self->{hash}->{resist}->{$resnum};
642 } 652 }
643 return undef; 653 return undef;
644} 654}
645 655
656sub projected_exp {
657 my ($self, $input_level) = @_;
658
659 my $lvl = max ($self->power_to_level, 1);
660 my $exp =
661 (cf::level_to_min_exp ($lvl) - cf::level_to_min_exp ($lvl - 1))
662 / (10 + max ($lvl - 1, 0)); # 10 + level times making such a ring
663 # should get you to the rings level at least.
664
665 if (defined $input_level) {
666 my $subexp =
667 (cf::level_to_min_exp ($input_level)
668 - cf::level_to_min_exp ($input_level - 1))
669 / (10 + max ($input_level - 1, 0)); # see above for comment
670
671 $exp -= $subexp;
672 $exp = max ($exp, 0);
673
674 } else {
675 # the experience bonus here is to make level 1 rings give you at least
676 # 200 exp points when making them. This also makes leveling in the
677 # first few levels a bit easier. (probably until around level 5-6).
678 my $expbonus = cf::level_to_min_exp (2) / 5;
679 # this bonus should also only be given for _new_ rings and not for merged
680 # ones - to prevent infinite exp making.
681 $exp += $expbonus;
682 }
683
684 $exp
685}
686
646sub analyze { 687sub analyze {
647 my ($self, $sk, $pl) = @_; 688 my ($self, $sk, $pl, $input_level) = @_;
689 my $costs = $self->calc_costs;
690
691 unless (defined $costs) {
692 return "This ring has a resistancy above 99%, you can't make that.";
693 }
648 694
649 my $sklvl = cf::exp_to_level ($sk->stats->exp); 695 my $sklvl = cf::exp_to_level ($sk->stats->exp);
650 my $ringlvl = $self->power_to_level; 696 my $ringlvl = $self->power_to_level;
651 697
652 my $tmpl; 698 my $tmpl;
653 if ($pl->flag (cf::FLAG_WIZ)) { 699 if ($pl->flag (cf::FLAG_WIZ)) {
654 $tmpl = Jeweler::level_diff_to_chance_perc ($sklvl - $ringlvl); 700 $tmpl = Jeweler::level_diff_to_chance_perc ($sklvl - $ringlvl);
655 } else { 701 } else {
656 $tmpl = Jeweler::level_diff_to_str ($sklvl - $ringlvl); 702 $tmpl = Jeweler::level_diff_to_str ($sklvl - $ringlvl);
657 } 703 }
658 my $msg = sprintf "Projected success rate: %s", $tmpl; 704 my $msg = sprintf "Projected success rate: %s, you would get %d exp for this.", $tmpl, $self->projected_exp ($input_level);
659 return $msg; 705 return $msg;
660} 706}
661 707
662sub calc_value_from_cost { 708sub calc_value_from_cost {
663 my ($self, $costs) = @_; 709 my ($self, $costs) = @_;
… …
676} 722}
677 723
678sub wiz_analyze { 724sub wiz_analyze {
679 my ($self, $pl) = @_; 725 my ($self, $pl) = @_;
680 my $costs = $self->calc_costs; 726 my $costs = $self->calc_costs;
727 if (defined $costs) {
681 my $desc = ""; 728 my $desc = "";
682 my $lvl = $self->power_to_level (\$desc); 729 my $lvl = $self->power_to_level (\$desc);
683 my $scosts = $self->calc_value_from_cost ($costs); 730 my $scosts = $self->calc_value_from_cost ($costs);
684 731
685 $pl->message ("costs: " . (join (', ', map { "$_: " . sprintf "%.2f", $costs->{$_} } keys %$costs)) . " (".($scosts / 5000)." royalties)"); 732 $pl->message ("costs: "
733 . (join ', ', map { "$_: " . sprintf "%.2f", $costs->{$_} } keys %$costs)
734 . " ("
735 . ($scosts / "platinacoin"->cf::arch::find->value)
736 . " platinum)");
686 $pl->message ("level: " . $desc); 737 $pl->message ("level: $desc");
738 } else {
739 $pl->message ("level: impossible to make, due to impossible resistancy configuration");
740 }
687} 741}
688 742
689sub get_chance_perc { 743sub get_chance_perc {
690 my ($self, $sk) = @_; 744 my ($self, $sk) = @_;
691 my $sklvl = cf::exp_to_level ($sk->stats->exp); 745 my $sklvl = cf::exp_to_level ($sk->stats->exp);
… …
696sub fx { 750sub fx {
697 my ($res, $cfg) = @_; 751 my ($res, $cfg) = @_;
698 my $or = $res; 752 my $or = $res;
699 my $ar = $Jeweler::CFG->{functions}->{$cfg}; 753 my $ar = $Jeweler::CFG->{functions}->{$cfg};
700 754
701 if (ref $ar->[0] eq 'ARRAY') { 755 if (ref $ar && ref $ar->[0] eq 'ARRAY') {
702 $res = $res - 1; 756 $res = $res - 1;
703 return $ar->[max (min ($res, @$ar - 1), 0)]; 757 return $ar->[max (min ($res, @$ar - 1), 0)];
704 758
705 } else { 759 } else {
706 # +0.1 is for a jump to the next index when $res / 5 is exactly 1, 2, 3... 760 # +0.1 is for a jump to the next index when $res / 5 is exactly 1, 2, 3...
761 # old code:
707 my $idx = ceil (($res / 5) + 0.1) - 1; 762 #my $idx = ceil (($res / 5) + 0.1) - 1;
708 my $a = $ar->[max (min ($idx, @$ar - 1), 0)]; 763 #my $a = $ar->[max (min ($idx, @$ar - 1), 0)];
709 my $b = $ar->[max (min ($idx + 1, @$ar - 1), 0)]; 764 #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 765 #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 766 #my $o_cost = $a + ($diff / 5) * ($res % 5); # and do some linear interpolation
712 return $o_cost; 767 #return $o_cost;
768 return 0 if $res <= 0;
769 return ($ar / (1 - ($res * 0.01)) - $ar)
713 } 770 }
714} 771}
715 772
716sub improve_by_ring { 773sub improve_by_ring {
717 my ($self, @rings) = @_; 774 my ($self, @rings) = @_;
… …
788 $obj->{arch} = $thing->arch->archname; 845 $obj->{arch} = $thing->arch->archname;
789 $obj->{face} = $thing->face; 846 $obj->{face} = $thing->face;
790 847
791 $obj->{value} = $thing->value; 848 $obj->{value} = $thing->value;
792 849
850 $obj->{is_ring} = ($thing->type == cf::RING);
851
793 $self->{hash} = $obj 852 $self->{hash} = $obj
794} 853}
795 854
796sub to_object { 855sub to_object {
797 my ($self) = @_; 856 my ($self) = @_;
… …
859sub resist_level { 918sub resist_level {
860 my ($self) = @_; 919 my ($self) = @_;
861 920
862 my $resists = $self->{hash}->{resist} || {}; 921 my $resists = $self->{hash}->{resist} || {};
863 922
864 my $att_res_lvl = Jeweler::getcfg (maxlevels => 'resist_level'); 923 my $att_res_lvl = Jeweler::getcfg (maxlevels => 'resist_level');
865 my $efc_res_lvl = Jeweler::getcfg (maxlevels => 'effect_resist_level'); 924 my $efc_res_lvl = Jeweler::getcfg (maxlevels => 'effect_resist_level');
866 my $max_att_res = Jeweler::getcfg (maximprovements => 'attack_resistances'); 925 my $max_att_res = Jeweler::getcfg (maximprovements => 'attack_resistances');
867 my $max_efc_res = Jeweler::getcfg (maximprovements => 'effect_resistances'); 926 my $max_efc_res = Jeweler::getcfg (maximprovements => 'effect_resistances');
868 my $max_ovr_res = Jeweler::getcfg (maximprovements => 'resistances'); 927 my $max_ovr_res = Jeweler::getcfg (maximprovements => 'resistances');
869 928
870 my $ressum = 0; 929 my $ressum = 0;
… …
930sub power_to_level { 989sub power_to_level {
931 my ($self, $lvldescr) = @_; 990 my ($self, $lvldescr) = @_;
932 991
933 my $max_imprs = Jeweler::getcfg (maximprovements => 'improvements'); 992 my $max_imprs = Jeweler::getcfg (maximprovements => 'improvements');
934 my $max_impr_lvl = Jeweler::getcfg (maxlevels => 'improve_level'); 993 my $max_impr_lvl = Jeweler::getcfg (maxlevels => 'improve_level');
994 my $ring_offs = Jeweler::getcfg (maxlevels => 'ring_offset');
935 995
936 my ($stat_lvl, $stat_imprs) = $self->stat_level; 996 my ($stat_lvl, $stat_imprs) = $self->stat_level;
937 my ($resist_lvl, $res_imprs) = $self->resist_level; 997 my ($resist_lvl, $res_imprs) = $self->resist_level;
938 my ($spec_lvl, $spec_imprs) = $self->special_level; 998 my ($spec_lvl, $spec_imprs) = $self->special_level;
939 999
940 my $impr_sum = $stat_imprs + $res_imprs + $spec_imprs; 1000 my $impr_sum = $stat_imprs + $res_imprs + $spec_imprs;
941 1001
942 my $impr_lvl = ceil (($max_impr_lvl / ($max_imprs + 1)) * ($impr_sum - 1)); # 1 improvemnt bonus 1002 my $impr_lvl =
1003 ceil (($max_impr_lvl / ($max_imprs + 1))
1004 * ($impr_sum - 1)); # 1 improvemnt bonus
943 1005
944 my $levl = int max ($stat_lvl, $resist_lvl, $impr_lvl, $spec_lvl, 0); 1006 my $levl = int max ($stat_lvl, $resist_lvl, $impr_lvl, $spec_lvl, 0);
1007
1008 if ($self->{hash}->{is_ring}) {
1009 $levl += $ring_offs;
1010 }
1011
1012 $levl = min ($levl, cf::settings->max_level);
945 1013
946 if ($lvldescr) { 1014 if ($lvldescr) {
947 $$lvldescr = 1015 $$lvldescr =
948 sprintf "%3d: %s\n", $levl, 1016 sprintf "%3d: %s\n", $levl,
949 "stat: $stat_lvl, resist: $resist_lvl, improve: $impr_lvl, " 1017 "stat: $stat_lvl, resist: $resist_lvl, improve: $impr_lvl, "
… …
996 1064
997 my $res = $ring->{resist}->{$resnum}; 1065 my $res = $ring->{resist}->{$resnum};
998 1066
999 next unless $res > 0; 1067 next unless $res > 0;
1000 1068
1069 return undef if $res == 100;
1070
1001 $costs->{"resist_" . $Jeweler::RESMAP{$resnum}} += $res; 1071 $costs->{"resist_" . $Jeweler::RESMAP{$resnum}} += $res;
1002 1072
1003 my $diamonds; 1073 my $diamonds;
1004 if (grep { $resnum eq $_ } @Jeweler::EFFECT_RESISTS) { 1074 if (grep { $resnum eq $_ } @Jeweler::EFFECT_RESISTS) {
1005 $diamonds += fx ($res, 'effect_resist_diamonds'); 1075 $diamonds += fx ($res, 'effect_resist_diamonds_x');
1006 } else { 1076 } else {
1007 $diamonds += fx ($res, 'attack_resist_diamonds'); 1077 $diamonds += fx ($res, 'attack_resist_diamonds_x');
1008 } 1078 }
1009 1079
1010 split_diamonds ($costs, $diamonds, 'resist_' . $Jeweler::RESMAP{$resnum}); 1080 split_diamonds ($costs, $diamonds, 'resist_' . $Jeweler::RESMAP{$resnum});
1011 } 1081 }
1012 1082
… …
1020 my ($cost, $diamonds, $category) = @_; 1090 my ($cost, $diamonds, $category) = @_;
1021 1091
1022 my $stat_split = Jeweler::getcfg (diamond_split => $category); 1092 my $stat_split = Jeweler::getcfg (diamond_split => $category);
1023 1093
1024 my $sum = sum (@$stat_split); 1094 my $sum = sum (@$stat_split);
1025 if ($sum < (1 - 0.0001)) {
1026 warn "JEWELER BUG: sum (@$stat_split) = $sum < 1 for $category!";
1027 }
1028 1095
1029 my $emarch = cf::arch::find 'emerald'; 1096 my $emarch = cf::arch::find 'emerald';
1030 my $saarch = cf::arch::find 'sapphire'; 1097 my $saarch = cf::arch::find 'sapphire';
1031 my $pearch = cf::arch::find 'pearl'; 1098 my $pearch = cf::arch::find 'pearl';
1032 my $ruarch = cf::arch::find 'ruby'; 1099 my $ruarch = cf::arch::find 'ruby';
… …
1052=over 4 1119=over 4
1053 1120
1054=item remove ($object[, $nrof]) 1121=item remove ($object[, $nrof])
1055 1122
1056Removes the C<$object>. If C<$nrof> is given, remove only C<$nrof> objects. 1123Removes 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. 1124The return value is the number of 'single' objects that couldn't be removed.
1058 1125
1059=cut 1126=cut
1060 1127
1061sub remove { 1128sub remove {
1062 my ($obj, $nrof) = @_; 1129 my ($obj, $nrof) = @_;
1130
1131 my $c = $obj->nrof || 1;
1132 my $r = $c > $nrof ? 0 : $nrof - $c;
1133 $obj->decrease (defined ($nrof) ? $nrof : ($obj->nrof || 1));
1063 1134
1064 my $cnt; 1135 $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} 1136}
1081 1137
1082sub check_for_match { 1138sub check_for_match {
1083 my ($thing, @matchar) = @_; 1139 my ($thing, @matchar) = @_;
1084 1140

Diff Legend

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