--- deliantra/Deliantra-Client/bin/cfplus 2006/06/21 12:59:23 1.77
+++ deliantra/Deliantra-Client/bin/cfplus 2006/07/23 17:03:44 1.101
@@ -38,9 +38,12 @@
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';
$Event::DIED = sub {
# TODO: display dialog box or so
@@ -86,15 +89,24 @@
our $LOGIN_BUTTON;
our $QUIT_DIALOG;
our $HOST_ENTRY;
+our $FULLSCREEN_ENABLE;
+our $PICKUP_ENABLE;
our $SERVER_INFO;
our $SETUP_DIALOG;
our $SETUP_NOTEBOOK;
our $SETUP_SERVER;
our $SETUP_KEYBOARD;
-our $SETUP_SPELLS;
-our $STATS_WINDOW;
+our $PL_NOTEBOOK;
+our $PL_WINDOW;
+
+our $INVENTORY_PAGE;
+our $STATS_PAGE;
+our $SKILL_PAGE;
+our $SPELL_PAGE;
+
+our $HELP_WINDOW;
our $MESSAGE_WINDOW;
our $FLOORBOX;
our $GAUGES;
@@ -111,7 +123,6 @@
our $STATUSBOX;
our $DEBUG_STATUS;
-our $INV_WINDOW;
our $INV;
our $INVR;
our $INV_RIGHT_HB;
@@ -122,7 +133,7 @@
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 {
@@ -181,7 +192,7 @@
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;
@@ -208,11 +219,11 @@
markup =>
"Character Creation: Race\n\n"
. "Look at the Messages window to see a description of this race "
- . "(or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen) "
. "and the center of the screen to see how this race looks like "
- . "(this is below this dialog window, you may need to click on the display area to make it visible).\n\n"
- . "You can look at another race, or accept this race (you will come back to this race eventually, "
- . "so you can take your time making this important choice."
+ . "(below this dialog window: you may need to move the dialog away and "
+ . "click into the display area to make it visible).\n\n"
+ . "You can look at another race, or accept this race (you will cycle back to "
+ . "this race eventually, so you can take your time making this important choice."
;
} elsif ($prompt =~ /roll new stats/) {
@@ -222,13 +233,13 @@
return;
}
- $STATS_WINDOW->show;
+ $STATS_PAGE->show;
$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;
@@ -244,6 +255,7 @@
# center: swap stats
my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
+ expand => 1,
value => $_,
options => [
[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
@@ -272,21 +284,42 @@
text => "Accept",
on_activate => sub {
$conn->send ("reply n");
- $STATS_WINDOW->hide;
+ $STATS_PAGE->hide;
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} $name",
+ 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 =>
"Character Creation: Stats\n\n"
- . "Look at the Stats window to see your basic stats "
- . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\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. "
- . "Race selection will influence those values later on."
+ . "Stats are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\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 shown below and continue.\n"
;
}
@@ -374,8 +407,8 @@
$LOGIN_BUTTON->set_text ("Login");
$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
$SETUP_DIALOG->show;
- $INV_WINDOW->hide;
- $SETUP_SPELLS->clear_spells;
+ $PL_WINDOW->hide;
+ $SPELL_PAGE->clear_spells;
return unless $CONN;
@@ -410,7 +443,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 }
@@ -470,18 +503,6 @@
on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
);
- $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
-
- $table->add (1, $row++, new CFClient::UI::Slider
- range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
- tooltip => "The font size used by the statistics window only. Changes are instant.",
- on_changed => sub {
- $CFG->{stat_fontsize} = $_[1];
- &set_stats_window_fontsize;
- 0
- }
- );
-
$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
$table->add (1, $row++, new CFClient::UI::Slider
range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
@@ -560,12 +581,6 @@
$vbox
}
-sub set_stats_window_fontsize {
- for (values %{$STATWIDS}) {
- $_->set_fontsize ($::CFG->{stat_fontsize});
- }
-}
-
sub set_gauge_window_fontsize {
for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
$_->set_fontsize ($::CFG->{gauge_fontsize});
@@ -654,14 +669,12 @@
}
sub stats_window {
- my $tgw = new CFClient::UI::FancyFrame
- y => $HEIGHT * (2/8),
- x => "max",
- title => "Stats",
- name => "stats_window",
- has_close_button => 1;
+ my $r = new CFClient::UI::ScrolledWindow (
+ expand => 1,
+ scroll_y => 1
+ );
+ $r->add (my $vb = new CFClient::UI::VBox);
- $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,
can_hover => 1, can_events => 1,
tooltip => "Your name and title. You can change your title by using the title command, if supported by the server.");
@@ -684,53 +697,73 @@
my $color2 = [1, 1, 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, 1, st_dex => "Dex", 30, "Dexterity, 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, 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, 4, st_wis => "Wis", 30, "Wisdom, 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, 6, st_cha => "Cha", 30, "Charisma, 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, 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, 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, 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, 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, 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."],
+ [0, 0, st_str => "Str", 30],
+ [0, 1, st_dex => "Dex", 30],
+ [0, 2, st_con => "Con", 30],
+ [0, 3, st_int => "Int", 30],
+ [0, 4, st_wis => "Wis", 30],
+ [0, 5, st_pow => "Pow", 30],
+ [0, 6, st_cha => "Cha", 30],
+
+ [2, 0, st_wc => "Wc", -120],
+ [2, 1, st_ac => "Ac", -120],
+ [2, 2, st_dam => "Dam", 120],
+ [2, 3, st_arm => "Arm", 120],
+ [2, 4, st_spd => "Spd", 10.54],
+ [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});
}
- $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)",
- 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
@@ -745,104 +778,53 @@
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,
- image => "ui/resist/resist_$_.png",
- tooltip => $resist_names{$_},
+ path => "ui/resist/resist_$_.png",
+ 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;
}
}
- &set_stats_window_fontsize;
- update_stats_window ({});
+ #update_stats_window ({});
- $tgw
+ $r
}
-sub formsep($) {
- scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
+sub skill_window {
+ my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
+ $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
+ $sw
}
-sub update_stats_window {
- my ($stats) = @_;
-
- # I love text protocols...
-
- my $hp = $stats->{+CS_STAT_HP} * 1;
- my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
- my $sp = $stats->{+CS_STAT_SP} * 1;
- my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
- my $fo = $stats->{+CS_STAT_FOOD} * 1;
- my $fo_m = 999;
- my $gr = $stats->{+CS_STAT_GRACE} * 1;
- my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
-
- $GAUGES->{hp} ->set_value ($hp, $hp_m);
- $GAUGES->{mana} ->set_value ($sp, $sp_m);
- $GAUGES->{food} ->set_value ($fo, $fo_m);
- $GAUGES->{grace} ->set_value ($gr, $gr_m);
- $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
- . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
- my $rng = $stats->{+CS_STAT_RANGE};
- $rng =~ s/^Range: //; # thank you so much dear server
- $GAUGES->{range} ->set_text ("Rng: " . $rng);
- my $title = $stats->{+CS_STAT_TITLE};
- $title =~ s/^Player: //;
- $STATWIDS->{title} ->set_text ("Title: " . $title);
-
- $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
- $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
- $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
- $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
- $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
- $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
- $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
- $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
- $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
- $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
- $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
- $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
- $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
-
- $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
-
- my %tbl = (
- phys => CS_STAT_RES_PHYS,
- magic => CS_STAT_RES_MAG,
- fire => CS_STAT_RES_FIRE,
- elec => CS_STAT_RES_ELEC,
- cold => CS_STAT_RES_COLD,
- conf => CS_STAT_RES_CONF,
- acid => CS_STAT_RES_ACID,
- drain => CS_STAT_RES_DRAIN,
- ghit => CS_STAT_RES_GHOSTHIT,
- pois => CS_STAT_RES_POISON,
- slow => CS_STAT_RES_SLOW,
- para => CS_STAT_RES_PARA,
- tund => CS_STAT_TURN_UNDEAD,
- fear => CS_STAT_RES_FEAR,
- depl => CS_STAT_RES_DEPLETE,
- deat => CS_STAT_RES_DEATH,
- holyw => CS_STAT_RES_HOLYWORD,
- blind => CS_STAT_RES_BLIND,
- );
-
- $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
- for keys %tbl;
+sub formsep($) {
+ scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
}
my $METASERVER_ATIME;
sub update_metaserver {
+ my ($metaserver_dialog) = @_;
+
+ $METASERVER = $metaserver_dialog
+ if defined $metaserver_dialog;
+
return if $METASERVER_ATIME > time;
$METASERVER_ATIME = time + 60;
@@ -940,6 +922,10 @@
}
sub metaserver_dialog {
+ my $vbox = new CFClient::UI::VBox;
+ my $table = new CFClient::UI::Table;
+ $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
+
my $dialog = new CFClient::UI::FancyFrame
title => "Server List",
name => 'metaserver_dialog',
@@ -947,17 +933,15 @@
y => 'center',
z => 3,
force_h => $::HEIGHT * 0.4,
- child => (my $vbox = new CFClient::UI::VBox),
+ child => $vbox,
+ has_close_button => 1,
+ table => $table,
on_visibility_change => sub {
- update_metaserver if $_[1];
+ update_metaserver ($_[0]) if $_[1];
0
},
;
- $dialog->{table} = new CFClient::UI::Table;
-
- $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
-
$dialog
}
@@ -982,8 +966,6 @@
}
);
- $METASERVER = metaserver_dialog;
-
$vbox->add (new CFClient::UI::Button
expand => 1,
text => "Server List",
@@ -1088,7 +1070,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,
@@ -1154,6 +1135,10 @@
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);
@@ -1177,6 +1162,7 @@
}
$QUIT_DIALOG->show;
+ $QUIT_DIALOG->grab_focus;
}
sub autopickup_setup {
@@ -1184,7 +1170,7 @@
for (
["General", 0, 0,
- ["Enable autopickup" => PICKUP_NEWMODE],
+ ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
["Inhibit autopickup" => PICKUP_INHIBIT],
["Stop before pickup" => PICKUP_STOP],
["Debug autopickup" => PICKUP_DEBUG],
@@ -1231,8 +1217,8 @@
my $mask = $_->[1];
$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
- $table->add ($x+1, $y, new CFClient::UI::CheckBox
- state => $CFG->{pickup} & $mask,
+ $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
+ state => $::CFG->{pickup} & $mask,
on_changed => sub {
my ($box, $value) = @_;
@@ -1247,20 +1233,24 @@
0
});
+
+ ${$_->[2]} = $checkbox if $_->[2];
}
}
$table->add (2, 18, new CFClient::UI::ValSlider
- range => [0, 0, 16, 1, 1],
+ range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
+ template => ">= 99",
to_value => sub { ">= " . 5 * $_[0] },
on_changed => sub {
my ($slider, $value) = @_;
- $::CFG->{pickup} &= ~0x7;
+ $::CFG->{pickup} &= ~0xF;
$::CFG->{pickup} |= int $value
if $value;
1;
});
+
$table->add (3, 18, new CFClient::UI::Button
text => "set",
on_activate => sub {
@@ -1272,36 +1262,104 @@
$table
}
-sub inventory_window {
- my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
- x => "center",
- y => "center",
- force_w => $WIDTH * 9/10,
- force_h => $HEIGHT * 9/10,
- title => "Inventory",
- has_close_button => 1,
- ;
-
- $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
+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 ($INV = new CFClient::UI::Inventory expand => 1);
+
+ $vb1->add (my $hb1 = new CFClient::UI::HBox);
+
+ use sort 'stable';
+
+ $hb1->add (new CFClient::UI::Combobox
+ value => undef,
+ options => [
+ [undef, "Type/Name"],
+ [
+ sub { sort {
+ $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
+ or $a->{type} <=> $b->{type}
+ } @_ },
+ "Weight/Type",
+ ],
+ [sub { } => "#TODO#"],
+ ],
+ on_changed => sub {
+ $INV->set_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);
$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
- $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
+ $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
+ $sw2->add ($INVR = new CFClient::UI::Inventory);
# XXX: Call after $INVR = ... because set_opencont sets the items
CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
- $invwin
+ $hb
+}
+
+sub toggle_player_page {
+ my ($widget) = @_;
+
+ if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
+ $PL_WINDOW->hide;
+ } else {
+ $PL_NOTEBOOK->set_current_page ($widget);
+ $PL_WINDOW->show;
+ }
}
-sub spell_setup {
- new CFClient::UI::SpellList
+sub player_window {
+ my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
+ x => "center",
+ y => "center",
+ force_w => $WIDTH * 9/10,
+ force_h => $HEIGHT * 9/10,
+ title => "Player",
+ name => "playerbook",
+ has_close_button => 1
+ ;
+
+ my $ntb =
+ $PL_NOTEBOOK =
+ new CFClient::UI::Notebook expand => 1, debug => 1;
+
+ $ntb->add (
+ "Statistics (F2)" => $STATS_PAGE = stats_window,
+ "Shows statistics, where all your Stats and Resistances are shown."
+ );
+ $ntb->add (
+ "Skills (F3)" => $SKILL_PAGE = skill_window,
+ "Shows all your Skills."
+ );
+
+ my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
+ $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
+ $ntb->add (
+ "Spellbook (F4)" => $spellsw,
+ "Displays all spells you have and lets you edit keyboard shortcuts for them."
+ );
+ $ntb->add (
+ "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
+ "Toggles the inventory window, where you can manage your loot (or treasures :). "
+ . "You can also hit the Tab-key to show/hide the Inventory."
+ );
+
+ $ntb->set_current_page ($INVENTORY_PAGE);
+
+ $plwin->add ($ntb);
+ $plwin
}
sub update_bindings {
@@ -1321,7 +1379,7 @@
next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
my $lbl = join "; ", @$cmds;
- my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
+ my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
$binding_list->add (my $hb = new CFClient::UI::HBox);
$hb->add (new CFClient::UI::Button
text => "delete",
@@ -1416,6 +1474,83 @@
$vb
}
+# just weirdness, pls. ignore
+sub load_html_page {
+ my ($viewer, $base) = @_;
+
+ $viewer->clear;
+
+ require LWP::Simple;
+ require HTML::Parser;
+ require URI;
+
+ my $page = LWP::Simple::get ($base)
+ or return;
+
+ my @s = { };
+ my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
+
+ my $parser = HTML::Parser->new (
+ text_h => [sub {
+ my ($text) = @_;
+ $text =~ s/\s+/ /g;
+ $s[-1]{text} .= CFClient::asxml $text;
+ }, "dtext"],
+ start_h => [sub {
+ my ($tag, $attr) = @_;
+ if ($passthrough{$tag}) {
+ $s[-1]{text} .= "<$tag>";
+ } elsif ($tag eq "h1") {
+ push @s, { text => "" };
+ } elsif ($tag eq "h2") {
+ push @s, { text => "" };
+ } elsif ($tag eq "h3") {
+ push @s, { text => "" };
+ } elsif ($tag eq "a") {
+ push @s, { text => "", url => $attr->{href} };
+ } elsif ($tag eq "p") {
+ push @s, { };
+ } elsif ($tag eq "img") {
+ eval {
+ push @{$s[-1]{obj}}, new CFClient::UI::Image
+ tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
+ $s[-1]{text} .= "\x{fffc}";
+ };
+ }
+ }, "tagname, attr"],
+ end_h => [sub {
+ my ($tag) = @_;
+ if ($passthrough{$tag}) {
+ $s[-1]{text} .= "";
+ } elsif ($tag =~ /^h\d$/) {
+ $s[-1]{text} .= "";
+ push @s, { };
+ } elsif ($tag eq "a") {
+ my $S = pop @s;
+ $s[-1]{text} .= "\x{fffc}";
+ push @{$s[-1]{obj}}, new CFClient::UI::Label
+ fg => [0.8, 0.8, 1],
+ markup => "$S->{text}",
+ fontsize => 0.8,
+ can_events => 1,
+ can_focus => 1,
+ on_button_up => sub {
+ load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
+ },
+ ;
+ }
+ }, "tagname"],
+ );
+
+ $parser->parse ($page);
+ $parser->eof;
+
+ $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
+ for @s;
+
+ $viewer->set_offset (0);
+}
+
sub help_window {
my $win = new CFClient::UI::FancyFrame
x => 'center',
@@ -1424,7 +1559,8 @@
name => 'doc_browser',
force_w => int $WIDTH * 7/8,
force_h => int $HEIGHT * 7/8,
- title => "Documentation";
+ title => "Help Browser",
+ has_close_button => 1;
$win->add (my $vbox = new CFClient::UI::VBox);
@@ -1437,24 +1573,41 @@
value => undef,
options => [
[intro => "Introduction"],
- [manual => "Manual"],
- [skill_help => "Skills"],
- [command_help => "Commands"],
+ [manual => "Main Manual"],
+ [skill_help => "Skill Reference"],
+ [command_help => "Command Reference"],
[dmcommand_help => "DM Commands"],
[COPYING => "License Terms"],
+ [test => "test (do not select)"], #d#TODO
],
on_changed => sub {
my ($self, $pod) = @_;
- my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
- doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
+ if ($pod eq "test") {#d#TODO
+ eval {
+ load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
+ };
+ warn "$@" if $@;
+ return;
+ }
+
+ my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
+ 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], ["Test\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
},
on_visibility_change => sub {
@@ -1511,7 +1664,7 @@
force_y => 0;
$DEBUG_STATUS->show;
- $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
+ $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
$STATUSBOX = new CFClient::UI::Statusbox;
$STATUSBOX->add ("Use Alt-Enter to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
@@ -1572,6 +1725,8 @@
has_close_button => 1,
;
+ $METASERVER = metaserver_dialog;
+
$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
@@ -1590,8 +1745,6 @@
. "want to record press Insert and you will be asked to press a key-combo. "
. "After pressing the combo the binding will be saved automatically and the "
. "binding editor closes");
- $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
- "Displays all spells you have and lets you edit keyboard shortcuts for them.");
$SETUP_NOTEBOOK->add (Debug => debug_setup,
"Some debuggin' options. Do not ask.");
@@ -1605,11 +1758,8 @@
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 => $STATS_WINDOW = stats_window,
- tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
- $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
- tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
- . "You can also hit the Tab-key to show/hide the Inventory.");
+ $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
+ tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
$BUTTONBAR->add (new CFClient::UI::Button
text => "Save Config",
@@ -1622,7 +1772,7 @@
},
);
- $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
+ $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
tooltip => "View Documentation");
$BUTTONBAR->add (new CFClient::UI::Button
@@ -1729,60 +1879,6 @@
$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;
}
@@ -1838,8 +1934,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]);
@@ -1865,7 +1961,7 @@
{
local $SIG{__DIE__} = sub {
return unless defined $^S && !$^S;
- Carp::confess $_[1];#d#TODO: remove when stable
+ Carp::confess $_[0];#d#TODO: remove when stable
CFClient::fatal $_[0];
};