--- deliantra/server/ext/Jeweler.pm	2006/12/23 15:49:40	1.3
+++ deliantra/server/ext/Jeweler.pm	2007/07/31 09:40:15	1.18
@@ -119,6 +119,8 @@
    cf::ATNR_DISEASE => "DISEASE",
 );
 
+our %REV_RESMAP = map { $RESMAP{$_} => $_ } keys %RESMAP;
+
 our %LVL_DIFF_CHANCES = (
    +5 => 100,
    +4 => 95,
@@ -162,7 +164,7 @@
 }
 
 sub analyze {
-   my ($sk, $chdl, $pl) = @_;
+   my ($sk, $chdl, $pl, $input_level) = @_;
 
    my $hadunid = 0;
    for ($chdl->grep_by_type (cf::RING, cf::AMULET)) {
@@ -171,7 +173,7 @@
          next;
       }
       my $r = Jeweler::Object->new (object => $_);
-      my $msg = $r->analyze ($sk, $pl);
+      my $msg = $r->analyze ($sk, $pl, $input_level);
       $pl->message ($r->to_string . ": " . $msg);
       if ($pl->flag (cf::FLAG_WIZ)) {
          $r->wiz_analyze ($pl);
@@ -219,19 +221,26 @@
    my $archvalsum = $ingred->value ($ingr_grp, $srcarchname);
    $ingred->remove ($ingr_grp, $srcarchname);
 
-   my $outarchval = cf::arch::find ($outarch)->clone->value;
+   my $outarchval = cf::arch::find ($outarch)->value;
 
    my $nrof = int ($archvalsum / (($outarchval || 1000) * $outarchvalfact));
    if ($nrof) {
       # XXX: yes, i know what i'm doing here, i don't set nrof, but it didn't work somehow (pls. chek sometimes)
-      $chdl->put (cf::object::new $outarch) for 1..$nrof;
+      for (1..$nrof) {
+         $chdl->put (my $ob = cf::object::new $outarch);
+         $ob->set_animation (cf::rndm $ob->num_animations)
+            if ($ob->type == cf::RING);
+         $ob->flag (cf::FLAG_IDENTIFIED, 1);
+      }
 
       my $xp_sum = ($xp_gain * $nrof);
 
       if ($xp_sum) {
          $pl->ob->message ("You got $xp_sum xp by making $nrof ${outarch}s");
-         $pl->ob->change_exp ($xp_sum, "jeweler", cf::SK_EXP_ADD_SKILL);
+         $pl->ob->change_exp ($xp_sum, "jeweler", cf::SK_EXP_SKILL_ONLY);
       }
+   } else {
+      $pl->ob->message ("You fail to make something, probably you used not enough source material?");
    }
 }
 
@@ -273,7 +282,7 @@
    my @c =
       grep {
          $_->flag (cf::FLAG_IS_CAULDRON)
-            and $_->arch->name eq $arch_name
+            and $_->arch->archname eq $arch_name
       } @map_stack;
 
    $self->{cauldron} = $c[0];
@@ -322,9 +331,16 @@
    );
 
    for ($self->{cauldron}->inv) {
+      if (!$_->flag (cf::FLAG_IDENTIFIED) && $_->need_identify) {
+         die "unidentified";
+      } elsif ($_->flag (cf::FLAG_CURSED) || $_->flag (cf::FLAG_DAMNED)) {
+         die "cursed";
+      }
 
       if (my $k = $type_to_key{$_->type}) {
          push @{$ingreds->{$k}}, $_;
+      } else {
+         push @{$ingreds->{other}}, $_;
       }
    }
 
@@ -384,7 +400,7 @@
    my ($self, $group, $archname) = @_;
 
    my @objs = grep {
-      $_->arch->name eq $archname
+      $_->arch->archname eq $archname
    } @{$self->{ingredients}->{$group} || []};
 
    my $sum = 0;
@@ -411,7 +427,7 @@
 
    for (@{$ingred->{$group}}) {
       if (defined $archname) {
-         if ($_->arch->name eq $archname) {
+         if ($_->arch->archname eq $archname) {
             Jeweler::Util::remove ($_);
          } else {
             push @out, $_;
@@ -429,21 +445,17 @@
 
    my $ingred = $self->{ingredients};
 
-   for my $grp (keys %$ingred) {
-      for my $pot (@{$ingred->{$grp}}) {
-         for my $plan (keys %{$Jeweler::CFG->{plans}}) {
-            my $plg = $Jeweler::CFG->{plans}->{$plan};
-            my @plga = ();
-            unless (ref $plg eq 'ARRAY') {
-               push @plga, $plg;
-            } else {
-               @plga = @$plg;
-            }
-            next unless @plga > 0;
-            if (Jeweler::Util::grep_for_match ($pot, @plga)) {
-               return $plan;
-            }
-         }
+   for my $plan (keys %{$Jeweler::CFG->{plans}}) {
+      my $plg = $Jeweler::CFG->{plans}->{$plan};
+      my @plga = ();
+      unless (ref $plg eq 'ARRAY') {
+         push @plga, $plg;
+      } else {
+         @plga = @$plg;
+      }
+      next unless @plga > 0;
+      if (Jeweler::Util::grep_for_match ($ingred, @plga)) {
+         return $plan;
       }
    }
 }
@@ -456,6 +468,14 @@
    );
 }
 
+sub improve_max {
+   my ($stat, $impro) = @_;
+   if ($stat >= 0) {
+      $stat = $impro > $stat ? $impro : $stat;
+   }
+   $stat
+}
+
 sub improve_ring_by_plan {
    my ($self, $plan, $ring) = @_;
 
@@ -470,53 +490,84 @@
          or die "ingredients for plan '$plan' not defined!";
 
       my $cnt = 0;
-      for my $pot (@{$ingred->{potions}}) {
-         if (Jeweler::Util::grep_for_match ($pot, @$plingred)) {
-            $cnt += $pot->nrof;
-         }
+      if (my $pot = Jeweler::Util::grep_for_match ($ingred, @$plingred)) {
+         $cnt += $pot->nrof;
       }
 
       my $maxstat = Jeweler::getcfg (maximprovements => 'stats');
-      my $did_impr = 0;
       for my $x (1..$maxstat) {
-         my $y = Jeweler::Object::fx ($x, 'stat_potions');
+         my $y = Jeweler::Object::fx ($x, 'stat_items');
 
          if ($cnt <= $y->[0]) {
-            $ring->{hash}->{stat}->{$statname} += $x;
-            $did_impr = 1;
+            $ring->{hash}->{stat}->{$statname} =
+               improve_max $ring->{hash}->{stat}->{$statname}, $x;
             last;
          }
       }
 
-      # we want at least this improvement if we have a plan...
-      $ring->{hash}->{stat}->{$statname} += 1 unless $did_impr;
-
    } elsif ($plan =~ m/^spec_(\S+)$/) {
+      my $specname = $1;
+      my $plingred = Jeweler::getcfg (plans => $plan)
+         or die "ingredients for plan '$plan' not defined!";
+
+      my $cnt = 0;
+      if (my $pot = Jeweler::Util::grep_for_match ($ingred, @$plingred)) {
+         $cnt += $pot->nrof;
+      }
+
+      my $maxspec = Jeweler::getcfg (maximprovements => 'specials');
+      for my $x (1..$maxspec) {
+         my $y = Jeweler::Object::fx ($x, 'spec_items');
+
+         if ($cnt <= $y->[0]) {
+            $ring->{hash}->{spec}->{$specname} =
+               improve_max $ring->{hash}->{spec}->{$specname}, $x;
+            last;
+         }
+      }
+
    } elsif ($plan =~ m/^resist_(\S+)$/) {
+      my $resname = $1;
+      my $resnum  = $REV_RESMAP{$resname};
+      my $plingred = Jeweler::getcfg (plans => $plan)
+         or die "ingredients for plan '$plan' not defined!";
+
+      my $cnt = 0;
+      if (my $it = Jeweler::Util::grep_for_match ($ingred, @$plingred)) {
+         $cnt += $it->nrof;
+      }
+      my $resist_item_nr = 0;
+      $self->do_grep (sub { $resist_item_nr += ($_[0]->nrof || 1); 0 }, @$plingred);
+
+      my $maximprovname = (grep { $resnum eq $_ } @Jeweler::EFFECT_RESISTS)
+                             ? 'effect_resistances'
+                             : 'attack_resistances';
+
+      my $maxres = Jeweler::getcfg (maximprovements => $maximprovname);
+      $resist_item_nr = $maxres if ($resist_item_nr > $maxres);
+      $ring->{hash}->{resist}->{$resnum} =
+         improve_max $ring->{hash}->{resist}->{$resnum}, $resist_item_nr;
    }
 
    return $ring;
 }
 
 sub do_grep {
-   my ($self, $cb, @grepar) = @_;
+   my ($self, $cb, $cat, @grepar) = @_;
 
    my $ingred = $self->{ingredients};
 
-
-   for my $cat (keys %$ingred) {
-      my @rem;
-      for my $ing (@{$ingred->{$cat}}) {
-         if (Jeweler::Util::grep_for_match ($ing, @grepar)) {
-            unless ($cb->($ing)) {
-               push @rem, $ing;
-            }
-         } else {
+   my @rem;
+   for my $ing (@{$ingred->{$cat}}) {
+      if (Jeweler::Util::check_for_match ($ing, @grepar)) {
+         unless ($cb->($ing)) {
             push @rem, $ing;
          }
+      } else {
+         push @rem, $ing;
       }
-      @{$ingred->{$cat}} = @rem;
    }
+   @{$ingred->{$cat}} = @rem;
 }
 
 sub check_costs {
@@ -526,10 +577,11 @@
 
    for my $key (keys %$costs) {
       my @grepar;
-      if ($key =~ m/^stat_(\S+)$/) {
-         @grepar = @{Jeweler::getcfg (plans => $key) || []};
-      } else {
-         @grepar = (undef, undef, $key);
+      if ($key =~ m/^(resist_|spec_|stat_)/) { # check the special items
+         eval { @grepar = @{Jeweler::getcfg (plans => $key) || []} };
+         next if $@;
+      } else { # check the gems
+         @grepar = ('gems', undef, undef, $key);
       }
 
       if ($do_remove) {
@@ -540,9 +592,10 @@
          }
       } else {
          my $nr;
-         $self->do_grep (sub { $nr += $_[0]->nrof; 0 }, @grepar);
+         $self->do_grep (sub { $nr += ($_[0]->nrof || 1); 0 }, @grepar);
          $costs->{$key} -= $nr;
       }
+
    }
 
    return $costs;
@@ -579,8 +632,55 @@
    $self;
 }
 
+sub has_resist {
+   my ($self, $resistnam, $resistval) = @_;
+   my $resnum = $REV_RESMAP{uc $resistnam};
+   if (defined ($resistval)) {
+      return 1 if $self->{hash}->{resist}->{$resnum} == $resistval;
+   } else {
+      return 1 if $self->{hash}->{resist}->{$resnum};
+   }
+   return undef;
+}
+
+sub projected_exp {
+   my ($self, $input_level) = @_;
+
+   my $lvl = max ($self->power_to_level, 1);
+   my $exp =
+      (cf::level_to_min_exp ($lvl) - cf::level_to_min_exp ($lvl - 1))
+         / (10 + max ($lvl - 1, 0)); # 10 + level times making such a ring
+                                     # should get you to the rings level at least.
+
+   if (defined $input_level) {
+      my $subexp =
+         (cf::level_to_min_exp ($input_level)
+            - cf::level_to_min_exp ($input_level - 1))
+               / (10 + max ($input_level - 1, 0)); # see above for comment
+
+      $exp -= $subexp;
+      $exp = max ($exp, 0);
+
+   } else {
+      # the experience bonus here is to make level 1 rings give you at least
+      # 100 exp points when making them. This also makes leveling in the
+      # first few levels a bit easier. (probably until around level 5-6).
+      my $expbonus = cf::level_to_min_exp (2) / 10;
+      # this bonus should also only be given for _new_ rings and not for merged
+      # ones - to prevent infinite exp making.
+      $exp += $expbonus;
+   }
+
+   $exp
+}
+
 sub analyze {
-   my ($self, $sk, $pl) = @_;
+   my ($self, $sk, $pl, $input_level) = @_;
+   my $costs = $self->calc_costs;
+
+   unless (defined $costs) {
+      return "This ring has a resistancy above 99%, you can't make that.";
+   }
 
    my $sklvl = cf::exp_to_level ($sk->stats->exp);
    my $ringlvl = $self->power_to_level;
@@ -591,19 +691,40 @@
    } else {
       $tmpl = Jeweler::level_diff_to_str ($sklvl - $ringlvl);
    }
-   my $msg = sprintf "Projected success rate: %s", $tmpl;
+   my $msg = sprintf "Projected success rate: %s, you would get %d exp for this.", $tmpl, $self->projected_exp ($input_level);
    return $msg;
 }
 
+sub calc_value_from_cost {
+   my ($self, $costs) = @_;
+   my $emarch = cf::arch::find 'emerald';
+   my $saarch = cf::arch::find 'sapphire';
+   my $pearch = cf::arch::find 'pearl';
+   my $ruarch = cf::arch::find 'ruby';
+   my $diarch = cf::arch::find 'gem';
+   my $value  =   $emarch->value * $costs->{emerald}
+                + $saarch->value * $costs->{sapphire}
+                + $pearch->value * $costs->{pearl}
+                + $ruarch->value * $costs->{ruby}
+                + $diarch->value * $costs->{gem};
+
+   $value
+}
+
 sub wiz_analyze {
    my ($self, $pl) = @_;
    my $costs = $self->calc_costs;
-   my $desc  = "";
-   my $lvl   = $self->power_to_level (\$desc);
-   $pl->message ("costs: " . join (', ', map { "$_: " . sprintf "%.2f", $costs->{$_} } keys %$costs));
-   $pl->message ("level: " . $desc);
-}
+   if (defined $costs) {
+      my $desc  = "";
+      my $lvl   = $self->power_to_level (\$desc);
+      my $scosts = $self->calc_value_from_cost ($costs);
 
+      $pl->message ("costs: " . (join (', ', map { "$_: " . sprintf "%.2f", $costs->{$_} } keys %$costs)) . " (".($scosts / 5000)." royalties)");
+      $pl->message ("level: " . $desc);
+   } else {
+      $pl->message ("level: impossible to make, due to impossible resistancy configuration");
+   }
+}
 
 sub get_chance_perc {
    my ($self, $sk) = @_;
@@ -616,12 +737,23 @@
    my ($res, $cfg) = @_;
    my $or = $res;
    my $ar = $Jeweler::CFG->{functions}->{$cfg};
-   if (ref $ar->[0] eq 'ARRAY') {
+
+   if (ref $ar && ref $ar->[0] eq 'ARRAY') {
       $res = $res - 1;
+      return $ar->[max (min ($res, @$ar - 1), 0)];
+
    } else {
-      $res = ceil ($res / 5) - 1;
+      # +0.1 is for a jump to the next index when $res / 5 is exactly 1, 2, 3...
+      # old code:
+      #my $idx    = ceil (($res / 5) + 0.1) - 1;
+      #my $a      = $ar->[max (min ($idx, @$ar - 1), 0)];
+      #my $b      = $ar->[max (min ($idx + 1, @$ar - 1), 0)];
+      #my $diff   = $b - $a; # use the difference of the cost to the next cost
+      #my $o_cost = $a + ($diff / 5) * ($res % 5); # and do some linear interpolation
+      #return $o_cost;
+      return 0 if $res <= 0;
+      return ($ar / (1 - ($res * 0.01)) - $ar)
    }
-   $ar->[max (min ($res, @$ar - 1), 0)];
 }
 
 sub improve_by_ring {
@@ -647,6 +779,7 @@
          }
       }
    }
+   $self->{hash}{value} = 0;
 }
 
 sub to_string {
@@ -695,9 +828,11 @@
    $obj->{spec}{food}  = $stats->food;
 
    $obj->{name} = $thing->name;
-   $obj->{arch} = $thing->arch->name;
+   $obj->{arch} = $thing->arch->archname;
    $obj->{face} = $thing->face;
 
+   $obj->{value} = $thing->value;
+
    $self->{hash} = $obj
 }
 
@@ -706,6 +841,8 @@
 
    my $obj = cf::object::new $self->{hash}->{arch};
 
+   $obj->item_power (floor ($self->power_to_level / 3)); # there have to be strings attached!
+
    $obj->face ($self->{hash}{face});
 
    my $stats = $obj->stats;
@@ -727,9 +864,27 @@
 
    $obj->flag (cf::FLAG_IDENTIFIED, 1);
 
+   $obj->value ($self->{hash}{value});
+
    return $obj;
 }
 
+sub set_value { $_[0]->{hash}{value} = $_[1] }
+
+sub is_better_than {
+   my ($self, $other) = @_;
+
+   for my $type (qw/spec stat resist/) {
+      for my $stat (keys %{$self->{hash}->{$type}}) {
+         if ($self->{hash}->{$type}->{$stat} > $other->{hash}->{$type}->{$stat}) {
+            return 1;
+         }
+      }
+   }
+
+   return 0;
+}
+
 sub stat_level {
    my ($self) = @_;
    my $stats = $self->{hash}->{stat} || {};
@@ -851,7 +1006,7 @@
 
       next unless $sum > 0;
 
-      my $statfx = fx ($sum, 'stat_potions');
+      my $statfx = fx ($sum, 'stat_items');
       $cost->{"stat_$stat"} += $statfx->[0];
       split_diamonds ($cost, $statfx->[1], 'stat_' . $stat);
    }
@@ -867,7 +1022,7 @@
 
       next unless $sum > 0;
 
-      my $specfx = fx ($sum, 'spec_potions');
+      my $specfx = fx ($sum, 'spec_items');
       $cost->{"spec_$spec"} += $specfx->[0];
       split_diamonds ($cost, $specfx->[1], 'spec_' . $spec);
    }
@@ -880,22 +1035,24 @@
 
    my $ring = $self->{hash};
 
-   for my $resnam (keys %{$ring->{resist} || {}}) {
+   for my $resnum (keys %{$ring->{resist} || {}}) {
 
-      my $res = $ring->{resist}->{$resnam};
+      my $res = $ring->{resist}->{$resnum};
 
       next unless $res > 0;
 
-      $costs->{"resist_" . $Jeweler::RESMAP{$resnam} . "_item"} += $res;
+      return undef if $res == 100;
+
+      $costs->{"resist_" . $Jeweler::RESMAP{$resnum}} += $res;
 
       my $diamonds;
-      if (grep { $resnam eq $_ } @Jeweler::EFFECT_RESISTS) {
-         $diamonds += fx ($res, 'effect_resist_diamonds');
+      if (grep { $resnum eq $_ } @Jeweler::EFFECT_RESISTS) {
+         $diamonds += fx ($res, 'effect_resist_diamonds_x');
       } else {
-         $diamonds += fx ($res, 'attack_resist_diamonds');
+         $diamonds += fx ($res, 'attack_resist_diamonds_x');
       }
 
-      split_diamonds ($costs, $diamonds, 'resist_' . $Jeweler::RESMAP{$resnam});
+      split_diamonds ($costs, $diamonds, 'resist_' . $Jeweler::RESMAP{$resnum});
    }
 
    $self->add_stat_costs ($costs);
@@ -920,13 +1077,13 @@
    my $ruarch = cf::arch::find 'ruby';
    my $diarch = cf::arch::find 'gem';
 
-   my $sumvalue = $diarch->clone->value * $diamonds;
+   my $sumvalue = $diarch->value * $diamonds;
 
-   $cost->{emerald}  += ceil $sumvalue * $stat_split->[0] / max 1, $emarch->clone->value;
-   $cost->{sapphire} += ceil $sumvalue * $stat_split->[1] / max 1, $saarch->clone->value;
-   $cost->{pearl}    += ceil $sumvalue * $stat_split->[2] / max 1, $pearch->clone->value;
-   $cost->{ruby}     += ceil $sumvalue * $stat_split->[3] / max 1, $ruarch->clone->value;
-   $cost->{gem}      += ceil $sumvalue * $stat_split->[4] / max 1, $diarch->clone->value;
+   $cost->{emerald}  += ceil $sumvalue * $stat_split->[0] / max 1, $emarch->value;
+   $cost->{sapphire} += ceil $sumvalue * $stat_split->[1] / max 1, $saarch->value;
+   $cost->{pearl}    += ceil $sumvalue * $stat_split->[2] / max 1, $pearch->value;
+   $cost->{ruby}     += ceil $sumvalue * $stat_split->[3] / max 1, $ruarch->value;
+   $cost->{gem}      += ceil $sumvalue * $stat_split->[4] / max 1, $diarch->value;
 }
 
 package Jeweler::Util;
@@ -952,7 +1109,8 @@
    my $cnt;
 
    if (defined $nrof) {
-      return 0 if ($nrof * 1) == 0;
+      # TODO: Check tihis line:
+      return 0 if ($nrof * 1) == 0; #XXX: ???
       $cnt = int (($obj->nrof || 1) - (1 * $nrof));
 
       if ($cnt > 0) {
@@ -966,31 +1124,54 @@
    return $cnt;
 }
 
-sub grep_for_match {
+sub check_for_match {
    my ($thing, @matchar) = @_;
 
    my $i = 0;
+   my $check_cnts = 0;
+   my $check_true = 0;
    for my $match (@matchar) {
+      if ($i % 3 == 0) {
+         return 1 if $check_true && $check_cnts == $check_true;
+         $check_cnts = 0;
+         $check_true = 0;
+      }
+
       if ($match =~ m/^\s*$/) {
          $i++;
          next;
       }
 
+      $check_cnts++;
       if ($i % 3 == 0) {
          $thing->name eq $match
-            and return 1;
+            and $check_true++;
       } elsif ($i % 3 == 1) {
          $thing->title eq $match
-            and return 1;
+            and $check_true++;
       } else { # $i % 3 == 2
-         $thing->arch->name eq $match
-            and return 1;
+         $thing->arch->archname eq $match
+            and $check_true++;
       }
       $i++;
    }
+   #d# warn "CHECK $check_true | $check_cnts | [".(join ',', @matchar).":".join (",", ($thing->name, $thing->title, $thing->arch->archname))."\n";
+   return 1 if $check_true && $check_cnts == $check_true;
    return 0;
 }
 
+sub grep_for_match {
+   my ($ingred, $group, @matchar) = @_;
+
+   for my $thing (@{$ingred->{$group} || []}) {
+   #d# warn sprintf "DEB:(%s,%s,%s)<->%s\n", $thing->name, $thing->title, $thing->arch->archname, "@matchar"; #d#
+      if (check_for_match ($thing, @matchar)) {
+         return $thing;
+      }
+   }
+   return undef;
+}
+
 =back
 
 1