--- deliantra/Deliantra-Client/bin/cfplus 2006/07/10 06:59:14 1.90
+++ deliantra/Deliantra-Client/bin/cfplus 2006/07/16 20:04:08 1.94
@@ -42,6 +42,7 @@
use CFClient::MapWidget;
$SIG{QUIT} = sub { Carp::cluck "QUIT" };
+$SIG{PIPE} = 'IGNORE';
$Event::DIED = sub {
# TODO: display dialog box or so
@@ -87,6 +88,7 @@
our $LOGIN_BUTTON;
our $QUIT_DIALOG;
our $HOST_ENTRY;
+our $FULLSCREEN_ENABLE;
our $PICKUP_ENABLE;
our $SERVER_INFO;
@@ -417,7 +419,7 @@
my $row = 1;
$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
- $table->add (1, $row++, new CFClient::UI::CheckBox
+ $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
state => $CFG->{fullscreen},
tooltip => "Bring the client into fullscreen mode.",
on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
@@ -690,30 +692,48 @@
font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
}
- $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
+ $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
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.)",
- holyw => "Holy Word (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.)",
- fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
- depl => "Depletion (some monsters and other effects can cause stats depletion)",
- magic => "Magic (resistance to magic spells like magic missile or similar)",
- drain => "Draining (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)",
- pois => "Poison (resistance to getting poisoned)",
- para => "Paralysation (this resistance affects the chance you get paralysed)",
- deat => "Death (resistance against death spells)",
- phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)",
- blind => "Blind (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)",
- tund => "Turn undead (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
- elec => "Electricity (resistance against electricity, spells like large lightning, small lightning, ...)",
- cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
- ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
+ slow => ["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.)"],
+ holyw => ["Holy Word",
+ "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
+ conf => ["Confusion",
+ "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
+ fire => ["Fire",
+ "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
+ depl => ["Depletion",
+ "Depletion (some monsters and other effects can cause stats depletion)"],
+ magic => ["Magic",
+ "Magic (resistance to magic spells like magic missile or similar)"],
+ drain => ["Draining",
+ "Draining (some monsters (e.g. vampires) and other effects can steal experience)"],
+ acid => ["Acid",
+ "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
+ pois => ["Poison",
+ "Poison (resistance to getting poisoned)"],
+ para => ["Paralysation",
+ "Paralysation (this resistance affects the chance you get paralysed)"],
+ deat => ["Death",
+ "Death (resistance against death spells)"],
+ phys => ["Physical",
+ "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
+ blind => ["Blind",
+ "Blind (blind resistance affects the chance of a successful blinding attack)"],
+ fear => ["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)"],
+ tund => ["Turn undead",
+ "Turn undead (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
+ elec => ["Electricity",
+ "Electricity (resistance against electricity, spells like large lightning, small lightning, ...)"],
+ cold => ["Cold",
+ "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
+ ghit => ["Ghost hit",
+ "Ghost hit (special attack used by ghosts and ghost-like beings)"],
);
for (qw/slow holyw conf fire depl magic
drain acid pois para deat phys
@@ -728,31 +748,40 @@
valign => 0,
can_events => 1,
can_hover => 1,
- tooltip => $resist_names{$_},
+ tooltip => $resist_names{$_}->[1],
);
$tbl2->add ($col + 1, $row, new CFClient::UI::Image
font => $FONT_FIXED,
can_hover => 1,
can_events => 1,
path => "ui/resist/resist_$_.png",
- tooltip => $resist_names{$_},
+ tooltip => $resist_names{$_}->[1],
+ );
+ $tbl2->add ($col + 2, $row, new CFClient::UI::Label
+ text => $resist_names{$_}->[0],
+ font => $FONT_FIXED,
+ can_hover => 1,
+ can_events => 1,
+ tooltip => $resist_names{$_}->[1],
);
$row++;
if ($row % 6 == 0) {
- $col += 2;
+ $col += 3;
$row = 0;
}
}
- $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
- $STATWIDS->{"_skill_tbl"} = $tbl3;
-
update_stats_window ({});
$vb
}
+sub skill_window {
+ my ($self) = @_;
+ $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1;
+}
+
sub formsep($) {
scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
}
@@ -1115,7 +1144,6 @@
name => "message_window",
title => "Messages",
border_bg => [1, 1, 1, 1],
- bg => [0, 0, 0, 0.75],
x => "max",
y => 0,
force_w => $::WIDTH * 0.4,
@@ -1353,8 +1381,12 @@
;
$ntb->add (
- "Stats & Skills" => $STATS_PAGE = stats_window,
- "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
+ "Stats" => $STATS_PAGE = stats_window,
+ "Shows statistics, where all your Stats and Resistances are shown."
+ );
+ $ntb->add (
+ "Skills" => $STATS_PAGE = skill_window,
+ "Shows all your Skills."
);
$ntb->add (
Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
@@ -1910,8 +1942,8 @@
CFClient::SDL_KEYDOWN => sub {
if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
# alt-enter
+ $FULLSCREEN_ENABLE->toggle;
video_shutdown;
- $CFG->{fullscreen} = !$CFG->{fullscreen};
video_init;
} else {
CFClient::UI::feed_sdl_key_down_event ($_[0]);