--- deliantra/Deliantra-Client/DC/UI.pm	2006/06/07 07:00:30	1.298
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/06/07 07:17:37	1.299
@@ -3559,8 +3559,10 @@
 
 my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
 
-my @TOOLTIP_NAME = (align => 0, can_events => 1, can_hover => 1, tooltip =>
+my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
    "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
+my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
+   "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
 my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
    "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
 my @TOOLTIP_SP  = (align => 1, can_events => 1, can_hover => 1, tooltip =>
@@ -3575,9 +3577,10 @@
       $self->clear;
 
       $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
-      $self->add (2, 0, new CFClient::UI::Label text => "Lvl"  , @TOOLTIP_LVL);
-      $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
-      $self->add (4, 0, new CFClient::UI::Label text => "Dmg"  , @TOOLTIP_DMG);
+      $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
+      $self->add (3, 0, new CFClient::UI::Label text => "Lvl"  , @TOOLTIP_LVL);
+      $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
+      $self->add (5, 0, new CFClient::UI::Label text => "Dmg"  , @TOOLTIP_DMG);
 
       my $row = 0;
 
@@ -3607,11 +3610,16 @@
             1
          };
 
+         my $tooltip = "$spell->{message}$TOOLTIP_ALL";
+
+         #TODO: add path info to tooltip
+         #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
+
          $self->add (0, $row, new CFClient::UI::Face
             face       => $spell->{face},
             can_hover  => 1,
             can_events => 1,
-            tooltip    => $spell->{message},
+            tooltip    => $tooltip,
             on_button_down => $spell_cb,
          );
 
@@ -3620,13 +3628,14 @@
             text       => $spell->{name},
             can_hover  => 1,
             can_events => 1,
-            tooltip    => "$spell->{message}$TOOLTIP_ALL",
+            tooltip    => $tooltip,
             on_button_down => $spell_cb,
          );
 
-         $self->add (2, $row, new CFClient::UI::Label text => $spell->{level},                   @TOOLTIP_LVL);
-         $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
-         $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage},                  @TOOLTIP_DMG);
+         $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
+         $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
+         $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
+         $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
       }
    });
 }