--- deliantra/server/ext/Jeweler.pm	2007/01/31 14:11:02	1.4
+++ deliantra/server/ext/Jeweler.pm	2010/04/27 17:08:09	1.32
@@ -10,8 +10,7 @@
 
 package Jeweler;
 
-use strict;
-use YAML;
+use common::sense;
 
 =over 4
 
@@ -26,13 +25,12 @@
 sub read_config {
    my ($filename) = @_;
 
-   unless (-e $filename) {
-      warn "$filename doesn't exists! no config for jeweler skill loaded!\n";
+   if (my $meta = $cf::RESOURCE{$filename}) {
+      $CFG = cf::decode_json $meta->{data};
+   } else {
+      warn "$filename doesn't exist! no config for jeweler skill loaded!\n";
       $CFG = {};
-      return
    }
-
-   $CFG = YAML::LoadFile $filename;
 }
 
 sub getcfg {
@@ -164,29 +162,32 @@
 }
 
 sub analyze {
-   my ($sk, $chdl, $pl) = @_;
+   my ($sk, $chdl, $pl, $input_level) = @_;
 
    my $hadunid = 0;
+   my $found   = 0;
    for ($chdl->grep_by_type (cf::RING, cf::AMULET)) {
       if (!$_->flag (cf::FLAG_IDENTIFIED) && $_->need_identify) {
          $hadunid = 1;
          next;
       }
+      $found = 1;
       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);
       }
    }
-   if ($hadunid) {
-      $pl->message ("You couldn't identify the other rings and not analyze them!");
-   }
+   $pl->message ("You couldn't identify the other rings and not analyze them!")
+      if $hadunid;
+   $pl->message ("You couldn't find anything in the bench to analyse!")
+      unless $found;
 }
 
 # this function converts metals/minerals into a raw ring (of adornment)
 sub simple_converter {
-   my ($pl, $ingred, $chdl, $conv) = @_;
+   my ($pl, $ingred, $chdl, $conv, $sk_lvl, $low_skill_cb) = @_;
 
    $conv = lc $conv;
    my $cnvs = $CFG->{conversions};
@@ -205,7 +206,7 @@
    }
 
    unless ($xp_gain > 0) {
-      warn "WARNING: xp gain isn't > 0 in convesion '$outarch'\n";
+      warn "WARNING: xp gain isn't > 0 in conversion '$outarch'\n";
       return;
    }
 
@@ -218,28 +219,34 @@
       warn "WARNING: source-arch-value-multiplier < 1 in conversion '$outarch', results in more valuable output!\n";
    }
 
-   my $archvalsum = $ingred->value ($ingr_grp, $srcarchname);
-   $ingred->remove ($ingr_grp, $srcarchname);
+   my $archvalsum  = $ingred->value ($ingr_grp, $srcarchname);
+   my $outarchval  = cf::arch::find ($outarch)->value;
+   my $nrof        = int $archvalsum / (($outarchval || 1000) * $outarchvalfact);
+   my $can_make_nr = int (($sk_lvl / 2) + 10);
 
-   my $outarchval = cf::arch::find ($outarch)->clone->value;
+   if ($nrof > $can_make_nr) {
+      $pl->ob->message ("Your jeweler level is too low to make $nrof rings, you can only make $can_make_nr at your current level.");
+      return;
+   }
 
-   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)
-      for (1..$nrof) {
+      # XXX: yes, I know what I'm doing here, I don't set nrof, but it didn't work somehow (pls. check sometimes)
+      $ingred->remove ($ingr_grp, $srcarchname);
+      for (1 .. $nrof) {
          $chdl->put (my $ob = cf::object::new $outarch);
-         $ob->set_animation (cf::rndm $ob->num_animations);
+         $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);
+      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_SKILL_ONLY);
       }
    } else {
-      $pl->ob->message ("You fail to make something, propably you used not enough source material?");
+      $pl->ob->message ("You fail to make something, probably you used not enough source material?");
    }
 }
 
@@ -281,7 +288,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];
@@ -330,6 +337,11 @@
    );
 
    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}}, $_;
@@ -351,7 +363,7 @@
    my ($self, $obj) = @_;
 
    return undef unless $self->{cauldron};
-   $obj->insert_ob_in_ob ($self->{cauldron});
+   $self->{cauldron}->insert ($obj);
 }
 
 =back
@@ -394,7 +406,7 @@
    my ($self, $group, $archname) = @_;
 
    my @objs = grep {
-      $_->arch->name eq $archname
+      $_->arch->archname eq $archname
    } @{$self->{ingredients}->{$group} || []};
 
    my $sum = 0;
@@ -421,7 +433,7 @@
 
    for (@{$ingred->{$group}}) {
       if (defined $archname) {
-         if ($_->arch->name eq $archname) {
+         if ($_->arch->archname eq $archname) {
             Jeweler::Util::remove ($_);
          } else {
             push @out, $_;
@@ -473,7 +485,7 @@
 sub improve_ring_by_plan {
    my ($self, $plan, $ring) = @_;
 
-   $ring = dclone ($ring);
+   $ring = dclone $ring;
 
    my $ingred = $self->{ingredients};
    my $impr = {};
@@ -567,27 +579,31 @@
 sub check_costs {
    my ($self, $costs, $do_remove) = @_;
 
-   my $costs = dclone ($costs);
+   my $costs = dclone $costs;
 
    for my $key (keys %$costs) {
       my @grepar;
       if ($key =~ m/^(resist_|spec_|stat_)/) { # check the special items
-         @grepar = @{Jeweler::getcfg (plans => $key) || []};
+         eval { @grepar = @{Jeweler::getcfg (plans => $key) || []} };
+         next if $@;
       } else { # check the gems
          @grepar = ('gems', undef, undef, $key);
       }
 
       if ($do_remove) {
          my $rem = $costs->{$key};
-         $self->do_grep (sub { if ($rem) { $rem = Jeweler::Util::remove ($_[0], $rem); } 1 }, @grepar);
+         $self->do_grep (sub {
+            if ($rem) { $rem = Jeweler::Util::remove ($_[0], $rem); }
+            1
+         }, @grepar);
          if ($rem > 0) {
-            warn "JEWELER BUG: removed ingredients $rem > 0 after removing!";
+            warn "JEWELER BUG: removed ingredients ($key) $rem > 0 after removing!";
          }
+
       } else {
          my $nr;
          $self->do_grep (sub { $nr += ($_[0]->nrof || 1); 0 }, @grepar);
          $costs->{$key} -= $nr;
-         warn "CHECKCOST $key <-> $nr -> $costs->{$key}\n";
       }
 
    }
@@ -626,8 +642,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
+      # 200 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) / 5;
+      # 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;
@@ -638,20 +701,45 @@
    } 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 / "platinacoin"->cf::arch::find->value)
+                    . " platinum)");
+      $pl->message ("level: $desc");
+   } else {
+      $pl->message ("level: impossible to make, due to impossible resistancy configuration");
+   }
 }
 
-
 sub get_chance_perc {
    my ($self, $sk) = @_;
    my $sklvl = cf::exp_to_level ($sk->stats->exp);
@@ -663,12 +751,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 {
@@ -694,6 +793,7 @@
          }
       }
    }
+   $self->{hash}{value} = 0;
 }
 
 sub to_string {
@@ -742,9 +842,13 @@
    $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;
+
+   $obj->{is_ring} = ($thing->type == cf::RING);
+
    $self->{hash} = $obj
 }
 
@@ -753,6 +857,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;
@@ -774,9 +880,13 @@
 
    $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) = @_;
 
@@ -810,8 +920,8 @@
 
    my $resists = $self->{hash}->{resist} || {};
 
-   my $att_res_lvl = Jeweler::getcfg (maxlevels => 'resist_level');
-   my $efc_res_lvl = Jeweler::getcfg (maxlevels => 'effect_resist_level');
+   my $att_res_lvl = Jeweler::getcfg (maxlevels       => 'resist_level');
+   my $efc_res_lvl = Jeweler::getcfg (maxlevels       => 'effect_resist_level');
    my $max_att_res = Jeweler::getcfg (maximprovements => 'attack_resistances');
    my $max_efc_res = Jeweler::getcfg (maximprovements => 'effect_resistances');
    my $max_ovr_res = Jeweler::getcfg (maximprovements => 'resistances');
@@ -881,6 +991,7 @@
 
    my $max_imprs    = Jeweler::getcfg (maximprovements => 'improvements');
    my $max_impr_lvl = Jeweler::getcfg (maxlevels       => 'improve_level');
+   my $ring_offs    = Jeweler::getcfg (maxlevels       => 'ring_offset');
 
    my ($stat_lvl,   $stat_imprs) = $self->stat_level;
    my ($resist_lvl, $res_imprs)  = $self->resist_level;
@@ -888,10 +999,18 @@
 
    my $impr_sum = $stat_imprs + $res_imprs + $spec_imprs;
 
-   my $impr_lvl = ceil (($max_impr_lvl / ($max_imprs + 1)) * ($impr_sum - 1)); # 1 improvemnt bonus
+   my $impr_lvl =
+      ceil (($max_impr_lvl / ($max_imprs + 1))
+      * ($impr_sum - 1)); # 1 improvemnt bonus
 
    my $levl = int max ($stat_lvl, $resist_lvl, $impr_lvl, $spec_lvl, 0);
 
+   if ($self->{hash}->{is_ring}) {
+      $levl += $ring_offs;
+   }
+
+   $levl = min ($levl, cf::settings->max_level);
+
    if ($lvldescr) {
       $$lvldescr =
          sprintf "%3d: %s\n", $levl,
@@ -947,13 +1066,15 @@
 
       next unless $res > 0;
 
+      return undef if $res == 100;
+
       $costs->{"resist_" . $Jeweler::RESMAP{$resnum}} += $res;
 
       my $diamonds;
       if (grep { $resnum eq $_ } @Jeweler::EFFECT_RESISTS) {
-         $diamonds += fx ($res, 'effect_resist_diamonds');
+         $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{$resnum});
@@ -971,9 +1092,6 @@
    my $stat_split = Jeweler::getcfg (diamond_split => $category);
 
    my $sum = sum (@$stat_split);
-   if ($sum < (1 - 0.0001)) {
-      warn "JEWELER BUG: sum (@$stat_split) = $sum < 1 for $category!";
-   }
 
    my $emarch = cf::arch::find 'emerald';
    my $saarch = cf::arch::find 'sapphire';
@@ -981,13 +1099,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;
@@ -1003,53 +1121,53 @@
 =item remove ($object[, $nrof])
 
 Removes the C<$object>. If C<$nrof> is given, remove only C<$nrof> objects.
-The returnvalue is the number of 'single' objects that couldn't be removed.
+The return value is the number of 'single' objects that couldn't be removed.
 
 =cut
 
 sub remove {
    my ($obj, $nrof) = @_;
+ 
+   my $c = $obj->nrof || 1;
+   my $r = $c > $nrof ? 0 : $nrof - $c;
+   $obj->decrease (defined ($nrof) ? $nrof : ($obj->nrof || 1));
 
-   my $cnt;
-
-   if (defined $nrof) {
-      # TODO: Check tihis line:
-      return 0 if ($nrof * 1) == 0; #XXX: ???
-      $cnt = int (($obj->nrof || 1) - (1 * $nrof));
-
-      if ($cnt > 0) {
-         $obj->nrof ($cnt);
-         return 0;
-      }
-   }
-
-   remove ($_) for $obj->inv;
-   $obj->destroy;
-   return $cnt;
+   $r
 }
 
 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;
 }
 
@@ -1057,7 +1175,7 @@
    my ($ingred, $group, @matchar) = @_;
 
    for my $thing (@{$ingred->{$group} || []}) {
-   warn sprintf "DEB:(%s,%s,%s)<->%s\n", $thing->name, $thing->title, $thing->arch->name, "@matchar"; #d#
+   #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;
       }