[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC.pm

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.99 by elmex, Fri Jul 14 17:35:34 2006 UTC vs.
Revision 1.106 by root, Mon Jul 24 04:24:42 2006 UTC

 use BerkeleyDB;
 use Pod::POM ();
 use Scalar::Util ();
 use Storable (); # finally
-package CFClient::PodToPango;
+our %STAT_TOOLTIP = (
+   Str => "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack",
+   Dex => "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed",
+   Con => "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have",
+   Int => "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have",
+   Wis => "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have",
+   Pow => "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up",
+   Cha => "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops.",
-use base Pod::POM::View::Text;
+   Wc  => "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72.",
+   Ac  => "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases.",
+   Dam => "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack.",
+   Arm => "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance.",
+   Spd => "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed.",
+   WSp => "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed.",
+);
-our $VERSION = 1; # bump if resultant formatting changes
+=item guard { BLOCK }
-our $indent = 0;
+Returns an object that executes the given block as soon as it is destroyed.
-*view_seq_code   =
+=cut
-*view_seq_bold   = sub { "<b>$_[1]</b>" };
-*view_seq_italic = sub { "<i>$_[1]</i>" };
-*view_seq_space  =
-*view_seq_link   =
-*view_seq_index  = sub { CFClient::UI::Label::escape ($_[1]) };
-sub view_seq_text {
+sub guard(&) {
-   my $text = $_[1];
+   bless \(my $cb = $_[0]), "CFClient::Guard"
-   $text =~ s/\s+/ /g;
-   CFClient::UI::Label::escape ($text)
 }
-sub view_item {
+sub CFClient::Guard::DESTROY {
-   ("\t" x ($indent / 4))
+   ${$_[0]}->()
-   . $_[1]->title->present ($_[0])
-   . "\n\n"
-   . $_[1]->content->present ($_[0])
 }
-sub view_verbatim {
+sub asxml($) {
-   (join "",
+   local $_ = $_[0];
-       map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
-          split /\n/, CFClient::UI::Label::escape ($_[1]))
-   . "\n"
-}
-sub view_textblock {
+   s/&/&amp;/g;
-   ("\t" x ($indent / 2)) . "$_[1]\n\n"
+   s/>/&gt;/g;
-}
+   s/</&lt;/g;
-sub view_head1 {
+   $_
-   "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
-   . $_[1]->content->present ($_[0])
-};
-sub view_head2 {
-   "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
-   . $_[1]->content->present ($_[0])
-};
-sub view_head3 {
-   "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
-   . $_[1]->content->present ($_[0])
-};
-sub view_over {
-   local $indent = $indent + $_[1]->indent;
-   $_[1]->content->present ($_[0])
 }
 package CFClient::Database;
 our @ISA = BerkeleyDB::Btree::;
 #      -Filename => "database",
 #      -Subname  => $table,
       -Property => DB_CHKSUM,
       -Flags    => DB_CREATE | DB_UPGRADE,
          or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
-}
-my $pod_cache = db_table "pod_cache";
-sub load_pod($$$$) {
-   my ($path, $filtertype, $filterversion, $filtercb) = @_;
-   stat $path
-      or die "$path: $!";
-   my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
-   my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
-   return $pom if $chash eq $phash;
-   my $pod = do {
-      local $/;
-      open my $pod, "<:utf8", $_[0]
-         or die "$_[0]: $!";
-      <$pod>
-   };
-   #utf8::downgrade $pod;
-   $pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
-   $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
-   $pom
-}
-sub pod_to_pango($) {
-   my ($pom) = @_;
-   $pom->present ("CFClient::PodToPango")
-}
-sub pod_to_pango_list($) {
-   my ($pom) = @_;
-   [
-      map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
-         split /\n/, $pom->present ("CFClient::PodToPango")
-   ]
 }
 package CFClient::Layout;
 $CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
 }
 sub do_n_dialog {
    my ($cb) = @_;
-   my $w = new CFClient::UI::FancyFrame;
+   my $w = new CFClient::UI::FancyFrame
+      on_delete => sub { $_[0]->destroy; 1 },
+      has_close_button => 1,
+   ;
    $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
    $vb->add (new CFClient::UI::Label text => "Enter item count:");
    $vb->add (my $entry = new CFClient::UI::Entry
       text => $last_enter_count,
       on_activate => sub {
          my ($entry) = @_;
          $last_enter_count = $entry->get_text;
          $cb->($last_enter_count);
          $w->hide;
-         $w = undef;
+         $w->destroy;
+         0
-      }
+      },
+      on_escape => sub { $w->destroy; 1 },
    );
    $entry->grab_focus;
    $w->show;
 }
 sub update_widgets {
    my ($self) = @_;
       } elsif ($ev->{button} == 1) {
          $::CONN->send ("examine $self->{tag}");
       } elsif ($ev->{button} == 2) {
          $::CONN->send ("apply $self->{tag}");
       } elsif ($ev->{button} == 3) {
+         my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
+         if ($self->{container} == $::CONN->{open_container}) {
+            $move_prefix = "take";
+         }
          my @menu_items = (
             ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
             ["mark",    sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
             ["ignite/thaw",  # first try of an easier use of flint&steel
                sub {
                ? (
                   ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
                  )
                : (
                   ["lock",   sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
-                  ["drop",   sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
+                  ["$move_prefix all",   sub { $::CONN->send ("move $targ $self->{tag} 0") }],
-                  ["move n",
+                  ["$move_prefix &lt;n&gt;",
                      sub {
                         do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
                      }
                   ]
                )
                    . "Middle click - apply\n"
                    . "Shift-Middle click - lock/unlock\n"
                    . "Right click - further options"
                    . "</small>\n";
+   my $bg = $self->{flags} & F_CURSED ? [1  , 0  , 0, 0.5]
+          : $self->{flags} & F_MAGIC  ? [0.2, 0.2, 1, 0.5]
+          : undef;
    $self->{face_widget} ||= new CFClient::UI::Face
       can_events => 1,
       can_hover  => 1,
       anim       => $self->{anim},
       animspeed  => $self->{animspeed}, # TODO# must be set at creation time
       on_button_down => $button_cb,
    ;
+   $self->{face_widget}{bg}        = $bg;
    $self->{face_widget}{face}      = $self->{face};
    $self->{face_widget}{anim}      = $self->{anim};
    $self->{face_widget}{animspeed} = $self->{animspeed};
    $self->{face_widget}->set_tooltip (
       "<b>Face/Animation.</b>\n"
       ellipsise  => 2,
       align      => -1,
       on_button_down => $button_cb,
    ;
    my $desc = CFClient::Item::desc_string $self;
+   $self->{desc_widget}{bg} = $bg;
    $self->{desc_widget}->set_text ($desc);
    $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
    $self->{weight_widget} ||= new CFClient::UI::Label
       can_events => 1,
       can_hover  => 1,
       ellipsise  => 0,
       align      => 0,
       on_button_down => $button_cb,
    ;
+   $self->{weight_widget}{bg} = $bg;
    $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
    $self->{weight_widget}->set_tooltip (
       "<b>Weight</b>.\n"
     . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
     . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
     . "\n\n$tooltip_std"

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.99 by elmex, Fri Jul 14 17:35:34 2006 UTC vs. Revision 1.106 by root, Mon Jul 24 04:24:42 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.99 by elmex, Fri Jul 14 17:35:34 2006 UTC vs.
Revision 1.106 by root, Mon Jul 24 04:24:42 2006 UTC