ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.81 by elmex, Wed Jun 28 09:42:40 2006 UTC vs.
Revision 1.85 by elmex, Sun Jul 2 19:32:56 2006 UTC

110 110
111our $ALT_ENTER_MESSAGE; 111our $ALT_ENTER_MESSAGE;
112our $STATUSBOX; 112our $STATUSBOX;
113our $DEBUG_STATUS; 113our $DEBUG_STATUS;
114 114
115our $INV_WINDOW;
116our $INV; 115our $INV;
117our $INVR; 116our $INVR;
118our $INV_RIGHT_HB; 117our $INV_RIGHT_HB;
118
119our $PL_NOTEBOOK;
120our $PL_WINDOW;
119 121
120our $BIND_EDITOR; 122our $BIND_EDITOR;
121our $BIND_UPD_CB; 123our $BIND_UPD_CB;
122 124
123our $PICKUP_CFG; 125our $PICKUP_CFG;
373 375
374sub stop_game { 376sub stop_game {
375 $LOGIN_BUTTON->set_text ("Login"); 377 $LOGIN_BUTTON->set_text ("Login");
376 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 378 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
377 $SETUP_DIALOG->show; 379 $SETUP_DIALOG->show;
378 $INV_WINDOW->hide; 380 $PL_WINDOW->hide;
379 $SETUP_SPELLS->clear_spells; 381 $SETUP_SPELLS->clear_spells;
380 382
381 return unless $CONN; 383 return unless $CONN;
382 384
383 status "connection closed"; 385 status "connection closed";
653 655
654 $table 656 $table
655} 657}
656 658
657sub stats_window { 659sub stats_window {
658 my $tgw = new CFClient::UI::FancyFrame 660 my $tgw =
659 y => $HEIGHT * (2/8), 661 new CFClient::UI::Window
660 x => "max", 662 child => my $vb = new CFClient::UI::VBox;
661 title => "Stats",
662 name => "stats_window",
663 has_close_button => 1;
664 663
665 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
666 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 664 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
667 can_hover => 1, can_events => 1, 665 can_hover => 1, can_events => 1,
668 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 666 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
669 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 667 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
670 can_hover => 1, can_events => 1, 668 can_hover => 1, can_events => 1,
694 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 692 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
695 693
696 [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."], 694 [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."],
697 [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."], 695 [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."],
698 [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."], 696 [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."],
699 [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."], 697 [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."],
700 [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."], 698 [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."],
701 [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."], 699 [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."],
702 ) { 700 ) {
703 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 701 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
704 702
723 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 721 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
724 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 722 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
725 pois => "<b>Poison</b> (resistance to getting poisoned)", 723 pois => "<b>Poison</b> (resistance to getting poisoned)",
726 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 724 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
727 deat => "<b>Death</b> (resistance against death spells)", 725 deat => "<b>Death</b> (resistance against death spells)",
728 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 726 phys => "<b>Physical</b> (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.)",
729 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 727 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
730 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)", 728 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)",
731 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 729 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
732 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 730 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
733 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 731 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
808 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 806 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
809 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 807 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
810 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 808 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
811 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 809 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
812 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 810 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
813 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 811 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 812 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
815 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 813 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
816 814
817 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 815 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
818 816
1236 ++$y; 1234 ++$y;
1237 1235
1238 my $mask = $_->[1]; 1236 my $mask = $_->[1];
1239 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1237 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1240 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1238 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1241 state => $CFG->{pickup} & $mask, 1239 state => $::CFG->{pickup} & $mask,
1242 on_changed => sub { 1240 on_changed => sub {
1243 my ($box, $value) = @_; 1241 my ($box, $value) = @_;
1244 1242
1245 if ($value) { 1243 if ($value) {
1246 $::CFG->{pickup} |= $mask; 1244 $::CFG->{pickup} |= $mask;
1255 }); 1253 });
1256 } 1254 }
1257 } 1255 }
1258 1256
1259 $table->add (2, 18, new CFClient::UI::ValSlider 1257 $table->add (2, 18, new CFClient::UI::ValSlider
1260 range => [0, 0, 16, 1, 1], 1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1259 template => ">= 99",
1261 to_value => sub { ">= " . 5 * $_[0] }, 1260 to_value => sub { ">= " . 5 * $_[0] },
1262 on_changed => sub { 1261 on_changed => sub {
1263 my ($slider, $value) = @_; 1262 my ($slider, $value) = @_;
1264 1263
1265 $::CFG->{pickup} &= ~0x7; 1264 $::CFG->{pickup} &= ~0xF;
1266 $::CFG->{pickup} |= int $value 1265 $::CFG->{pickup} |= int $value
1267 if $value; 1266 if $value;
1268 1; 1267 1;
1269 }); 1268 });
1269
1270 $table->add (3, 18, new CFClient::UI::Button 1270 $table->add (3, 18, new CFClient::UI::Button
1271 text => "set", 1271 text => "set",
1272 on_activate => sub { 1272 on_activate => sub {
1273 $::CONN->send_command ("pickup $::CFG->{pickup}") 1273 $::CONN->send_command ("pickup $::CFG->{pickup}")
1274 if defined $::CONN; 1274 if defined $::CONN;
1276 }); 1276 });
1277 1277
1278 $table 1278 $table
1279} 1279}
1280 1280
1281sub inventory_window { 1281sub inventory_widget {
1282 my $hb = new CFClient::UI::HBox homogeneous => 1;
1283
1284 $hb->add (my $vb1 = new CFClient::UI::VBox);
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1286 $vb1->add ($INV = new CFClient::UI::Inventory);
1287
1288 $hb->add (my $vb2 = new CFClient::UI::VBox);
1289
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1291
1292 $vb2->add ($INVR = new CFClient::UI::Inventory);
1293
1294 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296
1297 $hb
1298}
1299
1300sub player_window {
1282 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1301 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1283 x => "center", 1302 x => "center",
1284 y => "center", 1303 y => "center",
1285 force_w => $WIDTH * 9/10, 1304 force_w => $WIDTH * 9/10,
1286 force_h => $HEIGHT * 9/10, 1305 force_h => $HEIGHT * 9/10,
1287 title => "Inventory", 1306 title => "Player",
1288 name => "inventory_window",
1289 has_close_button => 1, 1307 has_close_button => 1
1290 ; 1308 ;
1291 1309
1292 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1310 my $ntb =
1311 $PL_NOTEBOOK =
1312 new CFClient::UI::Notebook
1313 expand => 1,
1314 debug => 1,
1315 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1316 ;
1317 $ntb->add (
1318 Inventory => inventory_widget,
1319 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1320 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1321 );
1293 1322
1294 $hb->add (my $vb1 = new CFClient::UI::VBox); 1323 $ntb->add (
1295 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1324 Stats => $STATS_WINDOW = stats_window,
1296 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1325 "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."
1326 );
1327 $ntb->add (
1328 Spells => $SETUP_SPELLS = new CFClient::UI::SpellList,
1329 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1330 );
1297 1331
1298 $hb->add (my $vb2 = new CFClient::UI::VBox); 1332 $plwin->add ($ntb);
1299 1333 $plwin
1300 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1301
1302 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1303
1304 # XXX: Call after $INVR = ... because set_opencont sets the items
1305 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1306
1307 $invwin
1308}
1309
1310sub spell_setup {
1311 new CFClient::UI::SpellList
1312} 1334}
1313 1335
1314sub update_bindings { 1336sub update_bindings {
1315 $BIND_UPD_CB->() if $BIND_UPD_CB; 1337 $BIND_UPD_CB->() if $BIND_UPD_CB;
1316} 1338}
1326 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1348 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1327 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1349 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1328 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1350 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1329 1351
1330 my $lbl = join "; ", @$cmds; 1352 my $lbl = join "; ", @$cmds;
1331 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1353 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1332 $binding_list->add (my $hb = new CFClient::UI::HBox); 1354 $binding_list->add (my $hb = new CFClient::UI::HBox);
1333 $hb->add (new CFClient::UI::Button 1355 $hb->add (new CFClient::UI::Button
1334 text => "delete", 1356 text => "delete",
1335 tooltip => "Deletes the binding", 1357 tooltip => "Deletes the binding",
1336 on_activate => sub { 1358 on_activate => sub {
1603 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1625 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1604 . "with nothing set and the recording started. After doing the actions you " 1626 . "with nothing set and the recording started. After doing the actions you "
1605 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1627 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1606 . "After pressing the combo the binding will be saved automatically and the " 1628 . "After pressing the combo the binding will be saved automatically and the "
1607 . "binding editor closes"); 1629 . "binding editor closes");
1608 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1609 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1610 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1630 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1611 "Some debuggin' options. Do not ask."); 1631 "Some debuggin' options. Do not ask.");
1612 1632
1613 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1633 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1614 1634
1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1638 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1619 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1639 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1620 1640
1621 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 1641 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
1622 1642
1623 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1624 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1625 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1643 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Player", other => player_window,
1626 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1644 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1627 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1628 1645
1629 $BUTTONBAR->add (new CFClient::UI::Button 1646 $BUTTONBAR->add (new CFClient::UI::Button
1630 text => "Save Config", 1647 text => "Save Config",
1631 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1648 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1632 on_activate => sub { 1649 on_activate => sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines