[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.97 by elmex, Wed Jul 19 16:41:51 2006 UTC vs.
Revision 1.102 by root, Mon Jul 24 04:24:43 2006 UTC

 use CFClient;
 use CFClient::OpenGL ();
 use CFClient::Protocol;
 use CFClient::UI;
+use CFClient::Pod;
 use CFClient::BindingEditor;
 use CFClient::MapWidget;
 $SIG{QUIT} = sub { Carp::cluck "QUIT" };
 $SIG{PIPE} = 'IGNORE';
 our $BIND_UPD_CB;
 our $PICKUP_CFG;
 sub status {
-   $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
+   $STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
 }
 sub debug {
    $DEBUG_STATUS->set_text ($_[0]);
 }
          $MESSAGE_WINDOW->show;
          unshift @dialog, new CFClient::UI::Label
             max_w     => $::WIDTH * 0.4,
             ellipsise => 0,
-            markup    => "\nOr use your keyboard:\n";
+            markup    => "\nOr use your keyboard and the text entry below:\n";
          unshift @dialog, my $table = new CFClient::UI::Table;
          $table->add (0, 0, new CFClient::UI::Button
              text => "Next Race",
             max_w     => $::WIDTH * 0.4,
             ellipsise => 0,
             markup    =>
                "<big><b>Character Creation: Race</b></big>\n\n"
              . "Look at the <b>Messages</b> window to see a description of this race "
-             . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
              . "and the center of the screen to see how this race looks like "
-             . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
+             . "(<small>below this dialog window: you may need to move the dialog away and "
+             . "click into the display area to make it visible</small>).\n\n"
-             . "You can look at another race, or accept this race (you will come back to this race eventually, "
+             . "You can look at another race, or accept this race (you will cycle back to "
-             . "so you can take your time making this important choice."
+             . "this race eventually, so you can take your time making this important choice."
          ;
       } elsif ($prompt =~ /roll new stats/) {
          if (my $stat = delete $conn->{stat_change_with}) {
             $conn->send ("reply $stat");
          $MESSAGE_WINDOW->hide;
          unshift @dialog, new CFClient::UI::Label
             max_w     => $::WIDTH * 0.4,
             ellipsise => 0,
-            markup    => "\nOr use your keyboard:\n";
+            markup    => "\nOr use your keyboard and the text entry below:\n";
          unshift @dialog, my $table = new CFClient::UI::Table;
          # left: re-roll
          $table->add (0, 0, new CFClient::UI::Button
                0
             },
          );
          # center: swap stats
-         my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
+         my ($sw1, $sw2) = map +(new CFClient::UI::Selector
+               expand  => 1,
                value   => $_,
                options => [
                   [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
                   [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
                   [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
                destroy_query_dialog $conn;
                0
             },
          );
+         unshift @dialog, my $hbox = new CFClient::UI::HBox;
+         for (
+            [Str => CS_STAT_STR],
+            [Dex => CS_STAT_DEX],
+            [Con => CS_STAT_CON],
+            [Int => CS_STAT_INT],
+            [Wis => CS_STAT_WIS],
+            [Pow => CS_STAT_POW],
+            [Cha => CS_STAT_CHA],
+         ) {
+            my ($name, $id) = @$_;
+            $hbox->add (new CFClient::UI::Label
+               markup     => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
+               align      => 0,
+               expand     => 1,
+               can_events => 1,
+               can_hover  => 1,
+               tooltip    => $CFClient::STAT_TOOLTIP{$name},
+            );
+         }
          unshift @dialog, new CFClient::UI::Label
             max_w     => $::WIDTH * 0.4,
             ellipsise => 0,
             markup    =>
                "<big><b>Character Creation: Stats</b></big>\n\n"
-             . "Look at the <b>Stats</b> window to see your basic stats "
+             . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
-             . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
+             . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
+             . "They will be modified later by both the race and the class you choose.\n\n"
-             . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
+             . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
-             . "Race selection will influence those values later on."
          ;
       }
       push @dialog, my $entry = new CFClient::UI::Entry
          on_changed => sub {
    $table
 }
 sub stats_window {
-   my $r =
-      new CFClient::UI::ScrolledWindow (
+   my $r = new CFClient::UI::ScrolledWindow (
-         expand => 1,
+      expand => 1,
-         scroll_y => 1
+      scroll_y => 1
-      );
+   );
    $r->add (my $vb = new CFClient::UI::VBox);
    $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
       can_hover => 1, can_events => 1,
       tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
       tooltip => "The weight of the player including all inventory items.");
    $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
       can_hover => 1, can_events => 1,
       tooltip => "The weight limit: you cannot carry more than this.");
    $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
    $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
    my $color2 = [1, 1, 0];
    for (
-      [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"],
+      [0, 0, st_str => "Str", 30],
-      [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],
+      [0, 1, st_dex => "Dex", 30],
-      [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],
+      [0, 2, st_con => "Con", 30],
-      [0, 3, st_int => "Int", 30, "<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"],
+      [0, 3, st_int => "Int", 30],
-      [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],
+      [0, 4, st_wis => "Wis", 30],
-      [0, 5, st_pow => "Pow", 30, "<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"],
+      [0, 5, st_pow => "Pow", 30],
-      [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
+      [0, 6, st_cha => "Cha", 30],
-      [2, 0, st_wc   => "Wc", -120,   "<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."],
+      [2, 0, st_wc   => "Wc", -120],
-      [2, 1, st_ac   => "Ac", -120,   "<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."],
+      [2, 1, st_ac   => "Ac", -120],
-      [2, 2, st_dam  => "Dam", 120,   "<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."],
+      [2, 2, st_dam  => "Dam", 120],
-      [2, 3, st_arm  => "Arm", 120,   "<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."],
+      [2, 3, st_arm  => "Arm", 120],
-      [2, 4, st_spd  => "Spd", 10.54, "<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."],
+      [2, 4, st_spd  => "Spd", 10.54],
-      [2, 5, st_wspd => "WSp", 10.54, "<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."],
+      [2, 5, st_wspd => "WSp", 10.54],
    ) {
-      my ($col, $row, $id, $label, $template, $tooltip) = @$_;
+      my ($col, $row, $id, $label, $template) = @$_;
       $tbl->add ($col    , $row, $STATWIDS->{$id} = new CFClient::UI::Label
-         font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
+         font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
+         align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
       $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
-         font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
+         font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
+         align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
    }
    $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
    my $row = 0;
       $QUIT_DIALOG = new CFClient::UI::FancyFrame
          x     => "center",
          y     => "center",
          z     => 50,
          title => "Really Quit?",
+         on_key_down => sub {
+            my ($dialog, $ev) = @_;
+            $ev->{sym} == 27 and $dialog->hide;
+         }
       ;
       $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
       $vb->add (new CFClient::UI::Label
          on_activate => sub { exit },
       );
    }
    $QUIT_DIALOG->show;
+   $QUIT_DIALOG->grab_focus;
 }
 sub autopickup_setup {
    my $table = new CFClient::UI::Table;
       });
    $table
 }
+my %SORT_ORDER = (
+   type   => undef,
+   mtime  => sub { sort {
+                ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
+                   or $b->{mtime} <=> $a->{mtime}
+                   or $a->{type} <=> $b->{type}
+             } @_ },
+   weight => sub { sort {
+                $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
+                   or $a->{type} <=> $b->{type}
+             } @_ },
+);
 sub inventory_widget {
    my $hb = new CFClient::UI::HBox homogeneous => 1;
    $hb->add (my $vb1 = new CFClient::UI::VBox);
    $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
+   $vb1->add (my $hb1 = new CFClient::UI::HBox);
+   use sort 'stable';
+   $hb1->add (new CFClient::UI::Selector
+      value   => $::CFG->{inv_sort},
+      options => [
+         [type   => "Type/Name"],
+         [mtime  => "Recent/Normal/Locked"],
+         [weight => "Weight/Type"],
+      ],
+      on_changed => sub {
+         $::CFG->{inv_sort} = $_[1];
+         $INV->set_sort_order ($SORT_ORDER{$_[1]});
+      },
+   );
+   $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
+   #TODO# update to weigh/maxweight
+   $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
    $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
    $sw1->add ($INV = new CFClient::UI::Inventory);
    $hb->add (my $vb2 = new CFClient::UI::VBox);
    my $parser = HTML::Parser->new (
       text_h  => [sub {
          my ($text) = @_;
          $text =~ s/\s+/ /g;
-         $s[-1]{text} .= CFClient::UI::Label::escape $text;
+         $s[-1]{text} .= CFClient::asxml $text;
       }, "dtext"],
       start_h => [sub {
          my ($tag, $attr) = @_;
          if ($passthrough{$tag}) {
             $s[-1]{text} .= "<$tag>";
    $vbox->add (my $buttons = new CFClient::UI::HBox);
    $vbox->add (my $viewer  = new CFClient::UI::TextScroller
       expand => 1, fontsize => 0.8, padding_x => 4);
    $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
-   $buttons->add (my $combo = new CFClient::UI::Combobox
+   $buttons->add (my $combo = new CFClient::UI::Selector
       value   => undef,
       options => [
          [intro          => "Introduction"],
          [manual         => "Main Manual"],
          [skill_help     => "Skill Reference"],
             };
             warn "$@" if $@;
             return;
          }
-         my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
+         my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
-            doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
+            doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
+            #use Data::Dumper; warn Dumper $pom;#d#
          $viewer->clear;
 #         $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n           \x{fffc} \x{fffc}\n",
 #            (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
 #            (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
 #         ]);#d#
-         $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
+         $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
             for @$pom;
          $viewer->set_offset (0);
          0
    $WANT_REFRESH = 0;
    $CAN_REFRESH = 0;
    $LAST_REFRESH = $NOW;
-0 && do {
-   # some weird model-drawing code, just a joke right now
-   use CFClient::OpenGL;
-   $demo{t}{eye_auv}  ||= new_from_file CFClient::Texture "eye2.png" or die;
-   $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
-   $demo{r} ||= do {
-      my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
-      $mod->{v} = pack "f*", @{$mod->{v}};
-      $_ = [scalar @$_, pack "S!*", @$_]
-         for values %{$mod->{g}};
-      $mod
-   };
-   my $r = $demo{r} or die;
-   glDepthMask 1;
-   glClear GL_DEPTH_BUFFER_BIT;
-   glEnable GL_TEXTURE_2D;
-   glEnable GL_DEPTH_TEST;
-   glEnable GL_CULL_FACE;
-   glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
-   glMatrixMode GL_PROJECTION;
-   glLoadIdentity;
-   glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
-   #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
-   glMatrixMode GL_MODELVIEW;
-   glLoadIdentity;
-   glPushMatrix;
-   glTranslate 0, 0, -800;
-   glScale 1, -1, 1;
-   glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
-   glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
-   glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
-   glScale 50, 50, 50;
-   glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
-   while (my ($k, $v) = each %{$r->{g}}) {
-      glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
-      glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
-   }
-   glPopMatrix;
-   glShadeModel GL_FLAT;
-   glDisable GL_DEPTH_TEST;
-   glDisable GL_TEXTURE_2D;
-   glDepthMask 0;
-   $WANT_REFRESH++;
-};
    CFClient::SDL_GL_SwapBuffers;
 }
 my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
    $NOW = time;
       bgm_volume     => 0.25,
       face_prefetch  => 0,
       output_sync    => 1,
       output_count   => 1,
       pickup         => 0,
+      inv_sort       => "mtime",
       default        => "profile", # default profile
    );
    while (my ($k, $v) = each %DEF_CFG) {
       $CFG->{$k} = $v unless exists $CFG->{$k};

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.97 by elmex, Wed Jul 19 16:41:51 2006 UTC vs. Revision 1.102 by root, Mon Jul 24 04:24:43 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.97 by elmex, Wed Jul 19 16:41:51 2006 UTC vs.
Revision 1.102 by root, Mon Jul 24 04:24:43 2006 UTC