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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.233 by root, Mon May 22 01:28:41 2006 UTC vs.
Revision 1.236 by root, Mon May 22 03:28:55 2006 UTC

          (my $hb = new CFClient::UI::HBox),
       ],
    );
    $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
-      tooltip => "Health points. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
+      tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
    $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
-      tooltip => "Spell points. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
+      tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
    $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
-      tooltip => "Grace points - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
+      tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
    $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
-      tooltip => "Food. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
+      tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
    $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
-      tooltip => "Experience points and overall level - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
+      tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
    $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
-      tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
+      tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
    $GAUGES = {
       exp => $exp, win => $win, range => $rng,
       food => $fg, mana => $mg, hp => $hg, grace => $gg
    };
 sub make_stats_window {
    my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
    $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
-   $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
+   $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.");
-   $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
+   $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
+      can_hover => 1, can_events => 1,
+      tooltip => "The map you are currently on (if supported by the server).");
    $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
    $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
    my $black = [0, 0, 0];
    for (
-      [0, 0, st_str => "Str", 30, "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack"],
+      [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, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"],
+      [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],
-      [0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"],
+      [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],
-      [0, 3, st_int => "Int", 30, "Intelligence, 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, "<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, 4, st_wis => "Wis", 30, "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],
+      [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, 5, st_pow => "Pow", 30, "Power, 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, "<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, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."],
+      [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
-      [2, 0, st_wc   => "Wc", -120, "Weapon Class, 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,   "<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, 1, st_ac   => "Ac", -120, "Armour Class, 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,   "<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, 2, st_dam  => "Dam", 120, "Damage, 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,   "<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, 3, st_arm  => "Arm", 120, "Armour, 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."],
+      [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."],
-      [2, 4, st_spd  => "Spd", 10.54, "Speed, 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, "<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, 5, st_wspd => "WSp", 10.54, "Weapon Speed, 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, "<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."],
    ) {
       my ($col, $row, $id, $label, $template, $tooltip) = @$_;
       $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);
    my $row = 0;
    my $col = 0;
    my %resist_names = (
-      slow  => "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
+      slow  => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
-      holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
+      holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
-      conf  => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
+      conf  => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",
-      fire  => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
+      fire  => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
-      depl  => "Depletion (some monsters and other effects can cause stats depletion)",
+      depl  => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",
-      magic => "Magic (resistance to magic spells like magic missile or similar)",
+      magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",
-      drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
+      drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
-      acid  => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
+      acid  => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
-      pois  => "Poison (resistance to getting poisoned)",
+      pois  => "<b>Poison</b> (resistance to getting poisoned)",
-      para  => "Paralysation (this resistance affects the chance you get paralysed)",
+      para  => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
-      deat  => "Death (resistance against death spells)",
+      deat  => "<b>Death</b> (resistance against death spells)",
-      phys  => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
+      phys  => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
-      blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
+      blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
-      fear  => "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
+      fear  => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
-      tund  => "Turn undead",
+      tund  => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
-      elec  => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
+      elec  => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
-      cold  => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
+      cold  => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
-      ghit  => "Ghost hit (special attack used by ghosts and ghost-like beings)",
+      ghit  => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",
    );
    for (qw/slow holyw conf fire depl magic
            drain acid pois para deat phys
            blind fear tund elec cold ghit/)
    {
 sub message_window {
    my $window = new CFClient::UI::FancyFrame
       title     => "Messages",
       border_bg => [1, 1, 1, 1],
-      bg        => [0, 0, 0, 0.5],
+      bg        => [0, 0, 0, 0.75],
       user_w    => int $::WIDTH  / 3,
       user_h    => int $::HEIGHT / 5,
       child     => (my $vbox = new CFClient::UI::VBox);
    $vbox->add ($LOGVIEW);
    $vbox->add (my $input = new CFClient::UI::Entry
+      tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
+               . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
+               . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
+               . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
       connect_focus_in => sub {
          my ($input, $prev_focus) = @_;
          delete $input->{refocus_map};
       )->show;
       CFClient::UI::FancyFrame->new (
          border_bg => [1, 1, 1, 192/255],
          bg        => [1, 1, 1, 0],
-         child     => ($MAPMAP = new CFClient::MapWidget::MapMap),
+         child     => ($MAPMAP = new CFClient::MapWidget::MapMap
+            tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
+         ),
       )->show;
       $MAPWIDGET = new CFClient::MapWidget;
       $MAPWIDGET->connect (activate_console => sub {
          my ($mapwidget, $preset) = @_;
       });
       $MAPWIDGET->show;
       $MAPWIDGET->focus_in;
       $LOGVIEW = new CFClient::UI::TextView
-         expand   => 1,
+         expand     => 1,
-         font     => $FONT_FIXED,
+         font       => $FONT_FIXED,
-         fontsize => $::CFG->{log_fontsize},
+         fontsize   => $::CFG->{log_fontsize},
+         can_hover  => 1,
+         can_events => 1,
+         tooltip    => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
       ;
       $BUTTONBAR = new CFClient::UI::HBox;
-      $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup",   other => client_setup);
+      $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup",   other => client_setup,
+         tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
-      $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup",   other => server_setup);
+      $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup",   other => server_setup,
+         tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
-      $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
+      $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
+         tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
       make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
-      $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
+      $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
+         tooltip => "Toggles the statistics window, where all your Stats and Resistances are beign displaye at all times.");
-      $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
+      $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
+         tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
-      $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
+      $BUTTONBAR->add (new CFClient::UI::Button
+         text             => "Save Config",
+         tooltip          => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
+         connect_activate => sub {
-         CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
+            CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
-         status "Configuration Saved";
+            status "Configuration Saved";
+         },
-      });
+      );
       $BUTTONBAR->show;
       $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
    my ($self) = @_;
    $self->send ("command output-sync $CFG->{output_sync}");
    $self->send ("command output-count $CFG->{output_count}");
+   my $parser = new Pod::POM;
+   my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
+   my %skill_tooltip;
+   for my $head2 ($pod->head2) {
+      $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
+   }
    for my $skill (values %{$self->{skill_info}}) {
-      $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'");
+      $MAPWIDGET->add_command ("ready_skill $skill",
-      $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'");
+                               (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
+                               . $skill_tooltip{$skill});
+      $MAPWIDGET->add_command ("use_skill $skill",
+                               (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
+                               . $skill_tooltip{$skill});
    }
 }
 sub conn::eof {
    $MAPWIDGET->clr_commands;
       Event::unloop -1;
    },
    CFClient::SDL_VIDEORESIZE => sub {
    },
    CFClient::SDL_VIDEOEXPOSE => sub {
-      $WANT_REFRESH++;
+      CFClient::UI::full_refresh;
    },
    CFClient::SDL_ACTIVEEVENT => sub {
 #      printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
    },
    CFClient::SDL_KEYDOWN => sub {

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.233 by root, Mon May 22 01:28:41 2006 UTC vs. Revision 1.236 by root, Mon May 22 03:28:55 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.233 by root, Mon May 22 01:28:41 2006 UTC vs.
Revision 1.236 by root, Mon May 22 03:28:55 2006 UTC