[ViewVC] Diff of: cvs/deliantra/server/ext/Jeweler.pm

Comparing deliantra/server/ext/Jeweler.pm (file contents):
Revision 1.18 by elmex, Tue Jul 31 09:40:15 2007 UTC vs.
Revision 1.29 by root, Mon Oct 12 14:00:58 2009 UTC

 =cut
 package Jeweler;
-use strict;
+use common::sense;
-use YAML;
 =over 4
 =item @RESISTS
 our $CFG;
 sub read_config {
    my ($filename) = @_;
-   unless (-e $filename) {
+   if (my $meta = $cf::RESOURCE{$filename}) {
+      $CFG = cf::decode_json $meta->{data};
+   } else {
-      warn "$filename doesn't exists! no config for jeweler skill loaded!\n";
+      warn "$filename doesn't exist! no config for jeweler skill loaded!\n";
       $CFG = {};
-      return
    }
-   $CFG = YAML::LoadFile $filename;
 }
 sub getcfg {
    my ($sect, $key) = @_;
    return $CFG->{$sect} unless defined $key;
 sub analyze {
    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, $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) = @_;
       warn "ERROR: Conversion for '$outarch' has only " . (@conv_cfg) . " arguments!";
       return;
    }
    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;
    }
    unless ($outarchvalfact) {
       warn "ERROR: source-arch-value-multiplier == 0 in conversion '$outarch'\n";
    my $archvalsum = $ingred->value ($ingr_grp, $srcarchname);
    $ingred->remove ($ingr_grp, $srcarchname);
    my $outarchval = cf::arch::find ($outarch)->value;
-   my $nrof = int ($archvalsum / (($outarchval || 1000) * $outarchvalfact));
+   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)
+      # XXX: yes, I know what I'm doing here, I don't set nrof, but it didn't work somehow (pls. check sometimes)
-      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);
+      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);
       }
 sub put {
    my ($self, $obj) = @_;
    return undef unless $self->{cauldron};
-   $obj->insert_ob_in_ob ($self->{cauldron});
+   $self->{cauldron}->insert ($obj);
 }
 =back
 =cut
 }
 sub improve_ring_by_plan {
    my ($self, $plan, $ring) = @_;
-   $ring = dclone ($ring);
+   $ring = dclone $ring;
    my $ingred = $self->{ingredients};
    my $impr = {};
    if ($plan =~ m/^stat_(\S+)$/) {
 }
 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
          eval { @grepar = @{Jeweler::getcfg (plans => $key) || []} };
          @grepar = ('gems', undef, undef, $key);
       }
       if ($do_remove) {
          my $rem = $costs->{$key};
+         $self->do_grep (sub {
-         $self->do_grep (sub { if ($rem) { $rem = Jeweler::Util::remove ($_[0], $rem); } 1 }, @grepar);
+            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;
       }
       $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
+      # 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) / 10;
+      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;
    }
    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 ("costs: "
+                    . (join ', ', map { "$_: " . sprintf "%.2f", $costs->{$_} } keys %$costs)
+                    . " ("
+                    . ($scosts / "platinacoin"->cf::arch::find->value)
+                    . " platinum)");
-      $pl->message ("level: " . $desc);
+      $pl->message ("level: $desc");
    } else {
       $pl->message ("level: impossible to make, due to impossible resistancy configuration");
    }
 }
    my ($cost, $diamonds, $category) = @_;
    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';
    my $pearch = cf::arch::find 'pearl';
    my $ruarch = cf::arch::find 'ruby';
 =over 4
 =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;
+   $r
-   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;
 }
 sub check_for_match {
    my ($thing, @matchar) = @_;

Diff Legend

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

Comparing deliantra/server/ext/Jeweler.pm (file contents): Revision 1.18 by elmex, Tue Jul 31 09:40:15 2007 UTC vs. Revision 1.29 by root, Mon Oct 12 14:00:58 2009 UTC

Diff Legend

Comparing deliantra/server/ext/Jeweler.pm (file contents):
Revision 1.18 by elmex, Tue Jul 31 09:40:15 2007 UTC vs.
Revision 1.29 by root, Mon Oct 12 14:00:58 2009 UTC