ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.116 by root, Sun Apr 29 03:44:36 2007 UTC vs.
Revision 1.180 by root, Tue Apr 15 14:06:36 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <pwd.h>
27#include <sproto.h> 25#include <sproto.h>
28#include <sounds.h> 26#include <sounds.h>
29#include <living.h> 27#include <living.h>
30#include <object.h> 28#include <object.h>
31#include <spells.h> 29#include <spells.h>
… …
158 op->x = -1; 156 op->x = -1;
159 op->y = -1; 157 op->y = -1;
160} 158}
161 159
162void 160void
163player::enter_map ()
164{
165 object *tmp = object::create ();
166
167 EXIT_PATH (tmp) = maplevel;
168 EXIT_X (tmp) = ob->x;
169 EXIT_Y (tmp) = ob->y;
170 ob->enter_exit (tmp);
171
172 tmp->destroy ();
173}
174
175void
176player::activate () 161player::activate ()
177{ 162{
178 if (active) 163 if (active)
179 return; 164 return;
180 165
… …
182 ob->remove (); 167 ob->remove ();
183 ob->map = 0; 168 ob->map = 0;
184 ob->activate_recursive (); 169 ob->activate_recursive ();
185 CLEAR_FLAG (ob, FLAG_FRIENDLY); 170 CLEAR_FLAG (ob, FLAG_FRIENDLY);
186 add_friendly_object (ob); 171 add_friendly_object (ob);
187 enter_map ();
188} 172}
189 173
190void 174void
191player::deactivate () 175player::deactivate ()
192{ 176{
… …
199 183
200 if (ob->map) 184 if (ob->map)
201 maplevel = ob->map->path; 185 maplevel = ob->map->path;
202 186
203 ob->remove (); 187 ob->remove ();
188 ob->enemy = 0; // sometimes keeps an extra refcount on itself
204 ob->map = 0; 189 ob->map = 0;
205 party = 0; 190 party = 0;
206 191
207 // for weird reasons, this is often "ob", keeping a circular reference 192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
208 ranges [range_skill] = 0;
209 193
210 players.erase (this); 194 players.erase (this);
211} 195}
212 196
213// connect the player with a specific client 197// connect the player with a specific client
214// also changed, rationalises, and fixes some incorrect settings 198// also changes, rationalises, and fixes some incorrect settings
215void 199void
216player::connect (client *ns) 200player::connect (client *ns)
217{ 201{
218 this->ns = ns; 202 this->ns = ns;
219 ns->pl = this; 203 ns->pl = this;
… …
223 ob->close_container (); //TODO: client-specific 207 ob->close_container (); //TODO: client-specific
224 208
225 ns->update_look = 0; 209 ns->update_look = 0;
226 ns->look_position = 0; 210 ns->look_position = 0;
227 211
228 clear_los (ob); 212 clear_los (this);
229 213
230 ns->reset_stats (); 214 ns->reset_stats ();
231 215
232 /* make sure he's a player -- needed because of class change. */ 216 /* make sure he's a player -- needed because of class change. */
233 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
234 ob->race = ob->arch->clone.race; 218 ob->race = ob->arch->race;
235
236 if (!legal_range (ob, shoottype))
237 shoottype = range_none;
238 219
239 ob->carrying = sum_weight (ob); 220 ob->carrying = sum_weight (ob);
240 link_player_skills (ob); 221 link_player_skills (ob);
241 222
242 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
243 224
244 assign (title, ob->arch->clone.name); 225 assign (title, ob->arch->object::name);
245 226
246 /* if it's a dragon player, set the correct title here */ 227 /* if it's a dragon player, set the correct title here */
247 if (is_dragon_pl (ob)) 228 if (is_dragon_pl (ob))
248 { 229 {
249 object *tmp, *abil = 0, *skin = 0; 230 object *tmp, *abil = 0, *skin = 0;
250 231
251 shstr_cmp dragon_ability_force ("dragon_ability_force");
252 shstr_cmp dragon_skin_force ("dragon_skin_force");
253
254 for (tmp = ob->inv; tmp; tmp = tmp->below) 232 for (tmp = ob->inv; tmp; tmp = tmp->below)
255 if (tmp->type == FORCE) 233 if (tmp->type == FORCE)
256 if (tmp->arch->name == dragon_ability_force) 234 if (tmp->arch->archname == shstr_dragon_ability_force)
257 abil = tmp; 235 abil = tmp;
258 else if (tmp->arch->name == dragon_skin_force) 236 else if (tmp->arch->archname == shstr_dragon_skin_force)
259 skin = tmp; 237 skin = tmp;
260 238
261 set_dragon_name (ob, abil, skin); 239 set_dragon_name (ob, abil, skin);
262 } 240 }
263 241
264 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
265 243
266 esrv_new_player (this, ob->weight + ob->carrying); 244 esrv_new_player (this, ob->weight + ob->carrying);
267 245
268 ob->update_stats (); 246 ob->update_stats ();
247
269 ns->floorbox_update (); 248 ns->floorbox_update ();
270
271 esrv_send_inventory (ob, ob); 249 esrv_send_inventory (ob, ob);
272 esrv_add_spells (this, 0); 250 esrv_add_spells (this, 0);
273 251
274 activate (); 252 activate ();
275 253
… …
282} 260}
283 261
284void 262void
285player::disconnect () 263player::disconnect ()
286{ 264{
265 if (ob)
266 {
267 ob->close_container (); //TODO: client-specific
268 ob->drop_unpaid_items ();
269 }
270
287 if (ns) 271 if (ns)
288 { 272 {
289 if (active) 273 if (active)
290 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 274 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
291 275
… …
294 ns->reset_stats (); 278 ns->reset_stats ();
295 ns->pl = 0; 279 ns->pl = 0;
296 ns = 0; 280 ns = 0;
297 } 281 }
298 282
299 if (ob) 283 observe = ob;
300 ob->close_container (); //TODO: client-specific
301 284
302 deactivate (); 285 deactivate ();
303} 286}
304 287
305// the need for this function can be explained 288// the need for this function can be explained
306// by load_object not returning the object 289// by load_object not returning the object
307void 290void
308player::set_object (object *op) 291player::set_object (object *op)
309{ 292{
310 ob = op; 293 ob = observe = op;
311 ob->contr = this; /* this aren't yet in archetype */ 294 ob->contr = this; /* this aren't yet in archetype */
312 295
313 ob->speed_left = 0.5;
314 ob->speed = 1.0; 296 ob->speed = 1.0f;
297 ob->speed_left = 0.5f;
298
315 ob->direction = 5; /* So player faces south */ 299 ob->direction = 5; /* So player faces south */
300
301 ob->flag [FLAG_READY_WEAPON] = false;
302 ob->flag [FLAG_READY_SKILL] = false;
303 ob->flag [FLAG_READY_BOW] = false;
304
305 for (object *op = ob->inv; op; op = op->below)
306 if (op->flag [FLAG_APPLIED])
307 switch (op->type)
308 {
309 case SKILL:
310 ob->flag [FLAG_APPLIED] = false;
311 break;
312
313 case WAND:
314 case ROD:
315 case HORN:
316 case BOW:
317 ranged_ob = op;
318 break;
319
320 case WEAPON:
321 combat_ob = op;
322 break;
323 }
324
325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
326 ob->deactivate (); // change_Weapon activates, fix this better
327}
328
329void
330player::set_observe (object *op)
331{
332 observe = op ? op : ob;
333 do_los = 1;
316} 334}
317 335
318player::player () 336player::player ()
319{ 337{
320 /* There are some elements we want initialised to non zero value - 338 /* There are some elements we want initialised to non zero value -
… …
325 unapply = unapply_nochoice; 343 unapply = unapply_nochoice;
326 344
327 savebed_map = first_map_path; /* Init. respawn position */ 345 savebed_map = first_map_path; /* Init. respawn position */
328 346
329 gen_sp_armour = 10; 347 gen_sp_armour = 10;
330 shoottype = range_none;
331 bowtype = bow_normal; 348 bowtype = bow_normal;
332 petmode = pet_normal; 349 petmode = pet_normal;
333 listening = 10; 350 listening = 10;
334 usekeys = containers; 351 usekeys = containers;
335 peaceful = 1; /* default peaceful */ 352 peaceful = 1; /* default peaceful */
336 do_los = 1; 353 do_los = 1;
354
355 weapon_sp = 1.0f;
356 weapon_sp_left = 0.5f;
337} 357}
338 358
339void 359void
340player::do_destroy () 360player::do_destroy ()
341{ 361{
… …
346 if (ob) 366 if (ob)
347 { 367 {
348 ob->destroy_inv (false); 368 ob->destroy_inv (false);
349 ob->destroy (); 369 ob->destroy ();
350 } 370 }
371
372 ob = observe = 0;
351} 373}
352 374
353player::~player () 375player::~player ()
354{ 376{
355 /* Clear item stack */ 377 /* Clear item stack */
… …
382 * Note: there MUST be at least one player archetype! 404 * Note: there MUST be at least one player archetype!
383 */ 405 */
384archetype * 406archetype *
385get_player_archetype (archetype *at) 407get_player_archetype (archetype *at)
386{ 408{
387 archetype *start = at; 409 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
388 410
389 for (;;) 411 for (;;)
390 { 412 {
391 if (at == NULL || at->next == NULL) 413 if (++i == archetypes.end ())
392 at = first_archetype; 414 i = archetypes.begin ();
393 else 415 else if (*i == at)
394 at = at->next; 416 cleanup ("not a single player archetype found");
395 417
396 if (at->clone.type == PLAYER) 418 if ((*i)->type == PLAYER)
397 return at; 419 return *i;
398
399 if (at == start)
400 {
401 LOG (llevError, "No Player archetypes\n");
402 exit (-1);
403 }
404 } 420 }
405} 421}
406 422
407object * 423object *
408get_nearest_player (object *mon) 424get_nearest_player (object *mon)
… …
412 unsigned lastdist; 428 unsigned lastdist;
413 rv_vector rv; 429 rv_vector rv;
414 430
415 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 431 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
416 { 432 {
417 /* We should not find free objects on this friendly list, but it
418 * does periodically happen. Given that, lets deal with it.
419 * While unlikely, it is possible the next object on the friendly
420 * list is also free, so encapsulate this in a while loop.
421 */
422 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
423 {
424 object *tmp = ol->ob;
425
426 /* Can't do much more other than log the fact, because the object
427 * itself will have been cleared.
428 */
429 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
430 tmp->debug_desc ());
431 ol = ol->next;
432 remove_friendly_object (tmp);
433 if (!ol)
434 return op;
435 }
436
437 /* Remove special check for player from this. First, it looks to cause
438 * some crashes (ol->ob->contr not set properly?), but secondly, a more
439 * complicated method of state checking would be needed in any case -
440 * as it was, a clever player could type quit, and the function would
441 * skip them over while waiting for confirmation. Remove
442 * on_same_map check, as can_detect_enemy also does this
443 */
444 if (!can_detect_enemy (mon, ol->ob, &rv)) 433 if (!can_detect_enemy (mon, ol->ob, &rv))
445 continue; 434 continue;
446 435
447 if (lastdist > rv.distance) 436 if (lastdist > rv.distance)
448 { 437 {
… …
645} 634}
646 635
647void 636void
648give_initial_items (object *pl, treasurelist * items) 637give_initial_items (object *pl, treasurelist * items)
649{ 638{
650 object *op, *next = NULL;
651
652 if (pl->randomitems != NULL) 639 if (pl->randomitems)
653 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 640 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
654 641
655 for (op = pl->inv; op; op = next) 642 for (object *next, *op = pl->inv; op; op = next)
656 { 643 {
657 next = op->below; 644 next = op->below;
658 645
659 /* Forces get applied per default, unless they have the 646 /* Forces get applied per default, unless they have the
660 * flag "neutral" set. Sorry but I can't think of a better way 647 * flag "neutral" set. Sorry but I can't think of a better way
… …
702 if (op->nrof > 1) 689 if (op->nrof > 1)
703 op->nrof = 1; 690 op->nrof = 1;
704 } 691 }
705 692
706 if (op->type == SPELLBOOK && op->inv) 693 if (op->type == SPELLBOOK && op->inv)
707 {
708 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 694 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
709 }
710 695
711 /* Give starting characters identified, uncursed, and undamned 696 /* Give starting characters identified, uncursed, and undamned
712 * items. Just don't identify gold or silver, or it won't be 697 * items. Just don't identify gold or silver, or it won't be
713 * merged properly. 698 * merged properly.
714 */ 699 */
… …
774} 759}
775 760
776void 761void
777object::roll_stats () 762object::roll_stats ()
778{ 763{
779 int statsort [7]; 764 int statsort [NUM_STATS];
780 765
781 for (;;) 766 for (;;)
782 { 767 {
783 int sum = 0; 768 int sum = 0;
784 for (int i = 7; i--; ) 769 for (int i = NUM_STATS; i--; )
785 sum += statsort [i] = roll_stat (); 770 sum += statsort [i] = roll_stat ();
786 771
787 if (sum >= 82 && sum <= 116) 772 if (sum >= 82 && sum <= 116)
788 break; 773 break;
789 } 774 }
790 775
791 // Sort the stats so that rerolling is easier... 776 // Sort the stats so that rerolling is easier...
792 std::sort (statsort, statsort + 7, std::greater<int>()); 777 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
793 778
779 for (int i = 0; i < NUM_STATS; ++i)
794 stats.Str = statsort[0]; 780 stats.stat (i) = statsort [i];
795 stats.Dex = statsort[1];
796 stats.Con = statsort[2];
797 stats.Int = statsort[3];
798 stats.Wis = statsort[4];
799 stats.Pow = statsort[5];
800 stats.Cha = statsort[6];
801 781
802 stats.exp = 0; 782 stats.exp = 0;
803 stats.ac = 0; 783 stats.ac = 0;
804 784
805 stats.hp = stats.maxhp; 785 stats.hp = stats.maxhp;
… …
817} 797}
818 798
819void 799void
820object::swap_stats (int a, int b) 800object::swap_stats (int a, int b)
821{ 801{
822 int tmp = get_attr_value (&contr->orig_stats, a); 802 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
823 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
824 set_attr_value (&contr->orig_stats, b, tmp);
825 803
804 for (int i = 0; i < NUM_STATS; ++i)
826 stats.Str = contr->orig_stats.Str; 805 stats.stat (i) = contr->orig_stats.stat (i);
827 stats.Dex = contr->orig_stats.Dex;
828 stats.Con = contr->orig_stats.Con;
829 stats.Int = contr->orig_stats.Int;
830 stats.Wis = contr->orig_stats.Wis;
831 stats.Pow = contr->orig_stats.Pow;
832 stats.Cha = contr->orig_stats.Cha;
833 806
834 //TODO: the following code looks so borked and should, at the very least, 807 //TODO: the following code looks so borked and should, at the very least,
835 // be merged with the similar code in roll_stats 808 // be merged with the similar code in roll_stats
836 stats.ac = 0; 809 stats.ac = 0;
837 810
… …
856static void 829static void
857start_info (object *op) 830start_info (object *op)
858{ 831{
859 char buf[MAX_BUF]; 832 char buf[MAX_BUF];
860 833
861 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 834 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
862 new_draw_info (NDI_UNIQUE, 0, op, buf); 835 new_draw_info (NDI_UNIQUE, 0, op, buf);
863 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
864 //new_draw_info (NDI_UNIQUE, 0, op, " ");
865} 836}
866 837
867/* This function takes the key that is passed, and does the 838/* This function takes the key that is passed, and does the
868 * appropriate action with it (change race, or other things). 839 * appropriate action with it (change race, or other things).
869 * The function name is for historical reasons - now we have 840 * The function name is for historical reasons - now we have
… …
910 if (*first_map_ext_path) 881 if (*first_map_ext_path)
911 { 882 {
912 object *tmp; 883 object *tmp;
913 char mapname[MAX_BUF]; 884 char mapname[MAX_BUF];
914 885
915 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name); 886 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
916 tmp = object::create (); 887 tmp = object::create ();
917 EXIT_PATH (tmp) = mapname; 888 EXIT_PATH (tmp) = mapname;
918 EXIT_X (tmp) = ob->x; 889 EXIT_X (tmp) = ob->x;
919 EXIT_Y (tmp) = ob->y; 890 EXIT_Y (tmp) = ob->y;
920 ob->enter_exit (tmp); /* we don't really care if it succeeded; 891 ob->enter_exit (tmp); /* we don't really care if it succeeded;
… …
939 int x = ob->x, y = ob->y; 910 int x = ob->x, y = ob->y;
940 911
941 ob->remove_statbonus (); 912 ob->remove_statbonus ();
942 ob->remove (); 913 ob->remove ();
943 ob->arch = get_player_archetype (ob->arch); 914 ob->arch = get_player_archetype (ob->arch);
944 ob->arch->clone.copy_to (ob); 915 ob->arch->copy_to (ob);
945 ob->instantiate (); 916 ob->instantiate ();
946 ob->stats = ob->contr->orig_stats; 917 ob->stats = ob->contr->orig_stats;
947 ob->name = ob->name_pl = name; 918 ob->name = ob->name_pl = name;
948 ob->x = x; 919 ob->x = x;
949 ob->y = y; 920 ob->y = y;
950 SET_ANIMATION (ob, 2); /* So player faces south */ 921 SET_ANIMATION (ob, 2); /* So player faces south */
951 insert_ob_in_map (ob, ob->map, ob, 0); 922 insert_ob_in_map (ob, ob->map, ob, 0);
952 assign (ob->contr->title, ob->arch->clone.name); 923 assign (ob->contr->title, ob->arch->object::name);
953 ob->add_statbonus (); 924 ob->add_statbonus ();
954 } 925 }
955 while (!allowed_class (ob)); 926 while (!allowed_class (ob));
956 927
957 update_object (ob, UP_OBJ_FACE); 928 update_object (ob, UP_OBJ_FACE);
… …
1014 /* Cornered, get rid of scared */ 985 /* Cornered, get rid of scared */
1015 CLEAR_FLAG (op, FLAG_SCARED); 986 CLEAR_FLAG (op, FLAG_SCARED);
1016 op->enemy = NULL; 987 op->enemy = NULL;
1017} 988}
1018 989
1019
1020/* check_pick sees if there is stuff to be picked up/picks up stuff. 990/* check_pick sees if there is stuff to be picked up/picks up stuff.
1021 * IT returns 1 if the player should keep on moving, 0 if he should 991 * It returns 1 if the player should keep on moving, 0 if he should
1022 * stop. 992 * stop.
1023 */ 993 */
1024int 994int
1025check_pick (object *op) 995check_pick (object *op)
1026{ 996{
… …
1033 if (op->move_type & MOVE_FLYING) 1003 if (op->move_type & MOVE_FLYING)
1034 return 1; 1004 return 1;
1035 1005
1036 next = op->below; 1006 next = op->below;
1037 1007
1008 int cnt = MAX_ITEM_PER_DROP;
1009#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1010
1038 /* loop while there are items on the floor that are not marked as 1011 /* loop while there are items on the floor that are not marked as
1039 * destroyed */ 1012 * destroyed */
1040 while (next && !next->destroyed ()) 1013 while (next && !next->destroyed ())
1041 { 1014 {
1042 tmp = next; 1015 tmp = next;
1043 next = tmp->below; 1016 next = tmp->below;
1044 1017
1018 if (cnt <= 0)
1019 {
1020 op->failmsg ("Couldn't pickup all items at once.");
1021 return 0;
1022 }
1023
1045 if (op->destroyed ()) 1024 if (op->destroyed ())
1046 return 0; 1025 return 0;
1047 1026
1048 if (!can_pick (op, tmp)) 1027 if (!can_pick (op, tmp))
1049 continue; 1028 continue;
1050 1029
1051 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1030 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1052 { 1031 {
1053 if (item_matched_string (op, tmp, op->contr->search_str)) 1032 if (item_matched_string (op, tmp, op->contr->search_str))
1054 pick_up (op, tmp); 1033 CHK_PICK_PICKUP;
1055 continue; 1034 continue;
1056 } 1035 }
1057 1036
1058 /* high not bit set? We're using the old autopickup model */ 1037 /* high not bit set? We're using the old autopickup model */
1059 if (!(op->contr->mode & PU_NEWMODE)) 1038 if (!(op->contr->mode & PU_NEWMODE))
… …
1061 switch (op->contr->mode) 1040 switch (op->contr->mode)
1062 { 1041 {
1063 case 0: 1042 case 0:
1064 return 1; /* don't pick up */ 1043 return 1; /* don't pick up */
1065 case 1: 1044 case 1:
1066 pick_up (op, tmp); 1045 CHK_PICK_PICKUP;
1067 return 1; 1046 return 1;
1068 case 2: 1047 case 2:
1069 pick_up (op, tmp); 1048 CHK_PICK_PICKUP;
1070 return 0; 1049 return 0;
1071 case 3: 1050 case 3:
1072 return 0; /* stop before pickup */ 1051 return 0; /* stop before pickup */
1073 case 4: 1052 case 4:
1074 pick_up (op, tmp); 1053 CHK_PICK_PICKUP;
1075 break; 1054 break;
1076 case 5: 1055 case 5:
1077 pick_up (op, tmp); 1056 CHK_PICK_PICKUP;
1078 stop = 1; 1057 stop = 1;
1079 break; 1058 break;
1080 case 6: 1059 case 6:
1081 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1060 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1082 pick_up (op, tmp); 1061 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1062 CHK_PICK_PICKUP;
1083 break; 1063 break;
1084 1064
1085 case 7: 1065 case 7:
1086 if (tmp->type == MONEY || tmp->type == GEM) 1066 if (tmp->type == MONEY || tmp->type == GEM)
1087 pick_up (op, tmp); 1067 CHK_PICK_PICKUP;
1088 break; 1068 break;
1089 1069
1090 default: 1070 default:
1091 /* use value density */ 1071 /* use value density */
1092 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1072 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1093 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1073 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1094 pick_up (op, tmp); 1074 CHK_PICK_PICKUP;
1095 } 1075 }
1096 } 1076 }
1097 else 1077 else
1098 { /* old model */ 1078 { /* old model */
1099 /* NEW pickup handling */ 1079 /* NEW pickup handling */
… …
1103 if (tmp->name != NULL) 1083 if (tmp->name != NULL)
1104 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1084 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1105 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1085 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106 else 1086 else
1107 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1087 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1108 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1088 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109 1089
1110 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1090 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1111 } 1091 }
1112 1092
1113 /* philosophy: 1093 /* philosophy:
… …
1154 /* all food and drink if desired */ 1134 /* all food and drink if desired */
1155 /* question: don't pick up known-poisonous stuff? */ 1135 /* question: don't pick up known-poisonous stuff? */
1156 if (op->contr->mode & PU_FOOD) 1136 if (op->contr->mode & PU_FOOD)
1157 if (tmp->type == FOOD) 1137 if (tmp->type == FOOD)
1158 { 1138 {
1159 pick_up (op, tmp); 1139 CHK_PICK_PICKUP;
1160 continue; 1140 continue;
1161 } 1141 }
1162 1142
1163 if (op->contr->mode & PU_DRINK) 1143 if (op->contr->mode & PU_DRINK)
1164 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1144 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1165 { 1145 {
1166 pick_up (op, tmp); 1146 CHK_PICK_PICKUP;
1167 continue; 1147 continue;
1168 } 1148 }
1169 1149
1170 if (op->contr->mode & PU_POTION) 1150 if (op->contr->mode & PU_POTION)
1171 if (tmp->type == POTION) 1151 if (tmp->type == POTION)
1172 { 1152 {
1173 pick_up (op, tmp); 1153 CHK_PICK_PICKUP;
1174 continue; 1154 continue;
1175 } 1155 }
1176 1156
1177 /* spellbooks, skillscrolls and normal books/scrolls */ 1157 /* spellbooks, skillscrolls and normal books/scrolls */
1178 if (op->contr->mode & PU_SPELLBOOK) 1158 if (op->contr->mode & PU_SPELLBOOK)
1179 if (tmp->type == SPELLBOOK) 1159 if (tmp->type == SPELLBOOK)
1180 { 1160 {
1181 pick_up (op, tmp); 1161 CHK_PICK_PICKUP;
1182 continue; 1162 continue;
1183 } 1163 }
1184 1164
1185 if (op->contr->mode & PU_SKILLSCROLL) 1165 if (op->contr->mode & PU_SKILLSCROLL)
1186 if (tmp->type == SKILLSCROLL) 1166 if (tmp->type == SKILLSCROLL)
1187 { 1167 {
1188 pick_up (op, tmp); 1168 CHK_PICK_PICKUP;
1189 continue; 1169 continue;
1190 } 1170 }
1191 1171
1192 if (op->contr->mode & PU_READABLES) 1172 if (op->contr->mode & PU_READABLES)
1193 if (tmp->type == BOOK || tmp->type == SCROLL) 1173 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1194 { 1174 {
1195 pick_up (op, tmp); 1175 CHK_PICK_PICKUP;
1196 continue; 1176 continue;
1197 } 1177 }
1198 1178
1199 /* wands/staves/rods/horns */ 1179 /* wands/staves/rods/horns */
1200 if (op->contr->mode & PU_MAGIC_DEVICE) 1180 if (op->contr->mode & PU_MAGIC_DEVICE)
1201 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1181 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1202 { 1182 {
1203 pick_up (op, tmp); 1183 CHK_PICK_PICKUP;
1204 continue; 1184 continue;
1205 } 1185 }
1206 1186
1207 /* pick up all magical items */ 1187 /* pick up all magical items */
1208 if (op->contr->mode & PU_MAGICAL) 1188 if (op->contr->mode & PU_MAGICAL)
1209 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1189 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1210 { 1190 {
1211 pick_up (op, tmp); 1191 CHK_PICK_PICKUP;
1212 continue; 1192 continue;
1213 } 1193 }
1214 1194
1215 if (op->contr->mode & PU_VALUABLES) 1195 if (op->contr->mode & PU_VALUABLES)
1216 { 1196 {
1217 if (tmp->type == MONEY || tmp->type == GEM) 1197 if (tmp->type == MONEY || tmp->type == GEM)
1218 { 1198 {
1219 pick_up (op, tmp); 1199 CHK_PICK_PICKUP;
1220 continue; 1200 continue;
1221 } 1201 }
1222 } 1202 }
1223 1203
1224 /* rings & amulets - talismans seems to be typed AMULET */ 1204 /* rings & amulets - talismans seems to be typed AMULET */
1225 if (op->contr->mode & PU_JEWELS) 1205 if (op->contr->mode & PU_JEWELS)
1226 if (tmp->type == RING || tmp->type == AMULET) 1206 if (tmp->type == RING || tmp->type == AMULET)
1227 { 1207 {
1228 pick_up (op, tmp); 1208 CHK_PICK_PICKUP;
1229 continue; 1209 continue;
1230 } 1210 }
1231 1211
1232 /* we don't forget dragon food */ 1212 /* we don't forget dragon food */
1233 if (op->contr->mode & PU_FLESH) 1213 if (op->contr->mode & PU_FLESH)
1234 if (tmp->type == FLESH) 1214 if (tmp->type == FLESH)
1235 { 1215 {
1236 pick_up (op, tmp); 1216 CHK_PICK_PICKUP;
1237 continue; 1217 continue;
1238 } 1218 }
1239 1219
1240 /* bows and arrows. Bows are good for selling! */ 1220 /* bows and arrows. Bows are good for selling! */
1241 if (op->contr->mode & PU_BOW) 1221 if (op->contr->mode & PU_BOW)
1242 if (tmp->type == BOW) 1222 if (tmp->type == BOW)
1243 { 1223 {
1244 pick_up (op, tmp); 1224 CHK_PICK_PICKUP;
1245 continue; 1225 continue;
1246 } 1226 }
1247 1227
1248 if (op->contr->mode & PU_ARROW) 1228 if (op->contr->mode & PU_ARROW)
1249 if (tmp->type == ARROW) 1229 if (tmp->type == ARROW)
1250 { 1230 {
1251 pick_up (op, tmp); 1231 CHK_PICK_PICKUP;
1252 continue; 1232 continue;
1253 } 1233 }
1254 1234
1255 /* all kinds of armor etc. */ 1235 /* all kinds of armor etc. */
1256 if (op->contr->mode & PU_ARMOUR) 1236 if (op->contr->mode & PU_ARMOUR)
1257 if (tmp->type == ARMOUR) 1237 if (tmp->type == ARMOUR)
1258 { 1238 {
1259 pick_up (op, tmp); 1239 CHK_PICK_PICKUP;
1260 continue; 1240 continue;
1261 } 1241 }
1262 1242
1263 if (op->contr->mode & PU_HELMET) 1243 if (op->contr->mode & PU_HELMET)
1264 if (tmp->type == HELMET) 1244 if (tmp->type == HELMET)
1265 { 1245 {
1266 pick_up (op, tmp); 1246 CHK_PICK_PICKUP;
1267 continue; 1247 continue;
1268 } 1248 }
1269 1249
1270 if (op->contr->mode & PU_SHIELD) 1250 if (op->contr->mode & PU_SHIELD)
1271 if (tmp->type == SHIELD) 1251 if (tmp->type == SHIELD)
1272 { 1252 {
1273 pick_up (op, tmp); 1253 CHK_PICK_PICKUP;
1274 continue; 1254 continue;
1275 } 1255 }
1276 1256
1277 if (op->contr->mode & PU_BOOTS) 1257 if (op->contr->mode & PU_BOOTS)
1278 if (tmp->type == BOOTS) 1258 if (tmp->type == BOOTS)
1279 { 1259 {
1280 pick_up (op, tmp); 1260 CHK_PICK_PICKUP;
1281 continue; 1261 continue;
1282 } 1262 }
1283 1263
1284 if (op->contr->mode & PU_GLOVES) 1264 if (op->contr->mode & PU_GLOVES)
1285 if (tmp->type == GLOVES) 1265 if (tmp->type == GLOVES)
1286 { 1266 {
1287 pick_up (op, tmp); 1267 CHK_PICK_PICKUP;
1288 continue; 1268 continue;
1289 } 1269 }
1290 1270
1291 if (op->contr->mode & PU_CLOAK) 1271 if (op->contr->mode & PU_CLOAK)
1292 if (tmp->type == CLOAK) 1272 if (tmp->type == CLOAK)
1293 { 1273 {
1294 pick_up (op, tmp); 1274 CHK_PICK_PICKUP;
1295 continue; 1275 continue;
1296 } 1276 }
1297 1277
1298 /* hoping to catch throwing daggers here */ 1278 /* hoping to catch throwing daggers here */
1299 if (op->contr->mode & PU_MISSILEWEAPON) 1279 if (op->contr->mode & PU_MISSILEWEAPON)
1300 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1280 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1301 { 1281 {
1302 pick_up (op, tmp); 1282 CHK_PICK_PICKUP;
1303 continue; 1283 continue;
1304 } 1284 }
1305 1285
1306 /* careful: chairs and tables are weapons! */ 1286 /* careful: chairs and tables are weapons! */
1307 if (op->contr->mode & PU_ALLWEAPON) 1287 if (op->contr->mode & PU_ALLWEAPON)
1308 { 1288 {
1309 if (tmp->type == WEAPON && tmp->name != NULL) 1289 if (tmp->type == WEAPON && tmp->name != NULL)
1310 { 1290 {
1311 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1291 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1312 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1292 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1313 { 1293 {
1314 pick_up (op, tmp); 1294 CHK_PICK_PICKUP;
1315 continue; 1295 continue;
1316 } 1296 }
1317 } 1297 }
1318 1298
1319 if (tmp->type == WEAPON && tmp->name == NULL) 1299 if (tmp->type == WEAPON && tmp->name == NULL)
1320 { 1300 {
1321 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1301 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1322 { 1302 {
1323 pick_up (op, tmp); 1303 CHK_PICK_PICKUP;
1324 continue; 1304 continue;
1325 } 1305 }
1326 } 1306 }
1327 } 1307 }
1328 1308
1329 /* misc stuff that's useful */ 1309 /* misc stuff that's useful */
1330 if (op->contr->mode & PU_KEY) 1310 if (op->contr->mode & PU_KEY)
1331 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1311 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1332 { 1312 {
1333 pick_up (op, tmp); 1313 CHK_PICK_PICKUP;
1334 continue; 1314 continue;
1335 } 1315 }
1336 1316
1337 /* any of the last 4 bits set means we use the ratio for value 1317 /* any of the last 4 bits set means we use the ratio for value
1338 * pickups */ 1318 * pickups */
… …
1343 /* >=7 is the old standard setting. Now we take the last 4 bits 1323 /* >=7 is the old standard setting. Now we take the last 4 bits
1344 * and multiply them by 5, giving 0..15*5== 5..75 */ 1324 * and multiply them by 5, giving 0..15*5== 5..75 */
1345 wvratio = (op->contr->mode & PU_RATIO) * 5; 1325 wvratio = (op->contr->mode & PU_RATIO) * 5;
1346 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1326 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1347 { 1327 {
1348 pick_up (op, tmp); 1328 CHK_PICK_PICKUP;
1349#if 0 1329#if 0
1350 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1330 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1351 if (tmp->name != NULL) 1331 if (tmp->name != NULL)
1352 { 1332 {
1353 fprintf (stderr, "%s", tmp->name); 1333 fprintf (stderr, "%s", tmp->name);
1354 } 1334 }
1355 else 1335 else
1356 fprintf (stderr, "%s", tmp->arch->name); 1336 fprintf (stderr, "%s", tmp->arch->archname);
1357 fprintf (stderr, ",%d] = ", tmp->type); 1337 fprintf (stderr, ",%d] = ", tmp->type);
1358 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1338 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1359#endif 1339#endif
1360 continue; 1340 continue;
1361 } 1341 }
… …
1372 * found object is returned. 1352 * found object is returned.
1373 */ 1353 */
1374object * 1354object *
1375find_arrow (object *op, const char *type) 1355find_arrow (object *op, const char *type)
1376{ 1356{
1377 object *tmp = 0;
1378
1379 for (op = op->inv; op; op = op->below) 1357 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1380 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1381 tmp = find_arrow (op, type);
1382 else if (op->type == ARROW && op->race == type) 1358 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1359 return splay (tmp);
1360
1361 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1362 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1363 if (object *arrow = find_arrow (tmp, type))
1364 {
1365 splay (tmp);
1383 return op; 1366 return arrow;
1367 }
1384 1368
1385 return tmp; 1369 return 0;
1386} 1370}
1387 1371
1388/* 1372/*
1389 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1373 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1390 * against the target. A full test is not performed, simply a basic test 1374 * against the target. A full test is not performed, simply a basic test
… …
1431 else 1415 else
1432 { 1416 {
1433 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1417 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1434 { 1418 {
1435 attacktype = 1 << attacknum; 1419 attacktype = 1 << attacknum;
1436 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1420 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1437 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1421 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1438 { 1422 {
1439 tmp = arrow; 1423 tmp = arrow;
1440 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1424 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1441 } 1425 }
1442 } 1426 }
1443 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1427 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1444 { 1428 {
1445 tmp = arrow; 1429 tmp = arrow;
… …
1464 * find_better_arrow to find a decent arrow to use. 1448 * find_better_arrow to find a decent arrow to use.
1465 * op = the shooter 1449 * op = the shooter
1466 * type = bow->race 1450 * type = bow->race
1467 * dir = fire direction 1451 * dir = fire direction
1468 */ 1452 */
1469
1470object * 1453object *
1471pick_arrow_target (object *op, const char *type, int dir) 1454pick_arrow_target (object *op, const char *type, int dir)
1472{ 1455{
1473 object *tmp = NULL; 1456 object *tmp = NULL;
1474 maptile *m; 1457 maptile *m;
… …
1539 */ 1522 */
1540int 1523int
1541fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1524fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1542{ 1525{
1543 object *left, *bow; 1526 object *left, *bow;
1544 int bowspeed, mflags; 1527 int mflags;
1545 maptile *m; 1528 maptile *m;
1546 1529
1547 if (!dir) 1530 if (!dir)
1548 { 1531 {
1549 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1532 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1550 return 0; 1533 return 0;
1551 } 1534 }
1552 1535
1553 if (op->type == PLAYER) 1536 if (op->contr)
1554 bow = op->contr->ranges[range_bow]; 1537 bow = op->current_weapon;
1555 else 1538 else
1556 { 1539 {
1557 for (bow = op->inv; bow; bow = bow->below) 1540 for (bow = op->inv; bow; bow = bow->below)
1558 /* Don't check for applied - monsters don't apply bows - in that way, they 1541 /* Don't check for applied - monsters don't apply bows - in that way, they
1559 * don't need to switch back and forth between bows and weapons. 1542 * don't need to switch back and forth between bows and weapons.
… …
1564 if (!bow) 1547 if (!bow)
1565 { 1548 {
1566 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1549 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1567 return 0; 1550 return 0;
1568 } 1551 }
1552
1553 // optimisation: move object to top so we will find it quickly again
1554 if (bow->below)
1555 {
1556 bow->remove ();
1557 op->insert (bow);
1558 }
1559
1569 } 1560 }
1570 1561
1571 if (!bow->race || !bow->skill) 1562 if (!bow->race || !bow->skill)
1572 { 1563 {
1573 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1564 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1574 return 0; 1565 return 0;
1575 } 1566 }
1576
1577 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1578
1579 /* penalize ROF for bestarrow */
1580 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1581 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1582
1583 if (bowspeed < 1)
1584 bowspeed = 1;
1585 1567
1586 if (arrow == NULL) 1568 if (arrow == NULL)
1587 { 1569 {
1588 if ((arrow = find_arrow (op, bow->race)) == NULL) 1570 if ((arrow = find_arrow (op, bow->race)) == NULL)
1589 { 1571 {
… …
1624 1606
1625 arrow->set_owner (op); 1607 arrow->set_owner (op);
1626 arrow->skill = bow->skill; 1608 arrow->skill = bow->skill;
1627 arrow->direction = dir; 1609 arrow->direction = dir;
1628 1610
1629 if (op->type == PLAYER)
1630 {
1631 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1632 op->update_stats ();
1633 }
1634
1635 SET_ANIMATION (arrow, arrow->direction);
1636
1637 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1611 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1638 arrow->stats.hp = arrow->stats.dam; 1612 arrow->stats.hp = arrow->stats.dam;
1639 arrow->stats.grace = arrow->attacktype; 1613 arrow->stats.grace = arrow->attacktype;
1640 1614
1641 if (arrow->slaying) 1615 if (arrow->slaying)
1642 arrow->spellarg = strdup (arrow->slaying); 1616 arrow->spellarg = strdup (arrow->slaying);
1643 1617
1644 arrow->stats.dam += op->stats.dam + arrow->magic; 1618#if 0
1619 if (player *pl = op->contr)
1620 {
1621 float speed = pl->weapon_sp;
1622
1623 /* penalize ROF for bestarrow */
1624 if (pl->bowtype == bow_bestarrow)
1625 speed *= .9f;
1626 else
1627 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1628
1629 op->speed_left += speed - op->speed;
1630 }
1631#endif
1632
1633 SET_ANIMATION (arrow, arrow->direction);
1645 1634
1646 /* update the speed */ 1635 /* update the speed */
1647 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1636 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1648 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; 1637 + bow->stats.dam / 7.f;
1649 1638
1650 arrow->set_speed (max (arrow->speed, 1.0)); 1639 arrow->set_speed (max (arrow->speed, 2.f));
1651 arrow->speed_left = 0; 1640 arrow->speed_left = 0;
1652 1641
1653 arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; 1642 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1654 1643
1655 if (op->type == PLAYER) 1644 if (op->type == PLAYER)
1656 { 1645 {
1657 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1646 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1658 arrow->stats.wc -= dex_bonus[op->stats.Dex]; 1647 wc -= dex_bonus[op->stats.Dex];
1659 1648
1660 if (!arrow->slaying) 1649 if (!arrow->slaying)
1661 arrow->slaying = op->slaying; 1650 arrow->slaying = op->slaying;
1651
1652 arrow->attacktype |= op->attacktype;
1662 } 1653 }
1663 else 1654 else
1664 { 1655 {
1665 arrow->level = op->level; 1656 arrow->level = op->level;
1666 arrow->stats.wc -= bow->magic; 1657 arrow->stats.wc -= bow->magic;
1667 1658
1668 if (!arrow->slaying) 1659 if (!arrow->slaying)
1669 arrow->slaying = bow->slaying; 1660 arrow->slaying = bow->slaying;
1670 }
1671 1661
1672 arrow->stats.wc -= arrow->level;
1673
1674 arrow->attacktype |= bow->attacktype; 1662 arrow->attacktype |= bow->attacktype;
1663 }
1675 1664
1665 wc -= arrow->level;
1666 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1667
1668 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1676 arrow->move_type = MOVE_FLY_LOW; 1669 arrow->move_type = MOVE_FLY_LOW;
1677 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1670 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1678 1671
1679 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1672 op->play_sound (sound_find ("fire_arrow"));
1680 m->insert (arrow, sx, sy, op); 1673 m->insert (arrow, sx, sy, op);
1681 1674
1682 if (!arrow->destroyed ()) 1675 if (!arrow->destroyed ())
1683 move_arrow (arrow); 1676 move_arrow (arrow);
1684 1677
… …
1705{ 1698{
1706 int ret = 0, wcmod = 0; 1699 int ret = 0, wcmod = 0;
1707 1700
1708 if (op->contr->bowtype == bow_bestarrow) 1701 if (op->contr->bowtype == bow_bestarrow)
1709 { 1702 {
1710 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1703 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1711 } 1704 }
1712 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1705 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1713 { 1706 {
1714 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1707 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1715 wcmod = -1; 1708 wcmod = -1;
… …
1725 else if (op->contr->bowtype == bow_spreadshot) 1718 else if (op->contr->bowtype == bow_spreadshot)
1726 { 1719 {
1727 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1720 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1728 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1721 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1729 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1722 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1730
1731 } 1723 }
1732 else 1724 else
1733 { 1725 {
1734 /* Simple case */ 1726 /* Simple case */
1735 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1727 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1736 } 1728 }
1729
1737 return ret; 1730 return ret;
1738} 1731}
1739
1740 1732
1741/* Fires a misc (wand/rod/horn) object in 'dir'. 1733/* Fires a misc (wand/rod/horn) object in 'dir'.
1742 * Broken apart from 'fire' to keep it more readable. 1734 * Broken apart from 'fire' to keep it more readable.
1743 */ 1735 */
1744void 1736void
1745fire_misc_object (object *op, int dir) 1737fire_misc_object (object *op, int dir)
1746{ 1738{
1747 object *item; 1739 object *item = op->contr->ranged_ob;
1748 1740
1749 if (!op->contr->ranges[range_misc]) 1741 if (!item)
1750 { 1742 {
1751 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1743 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1752 return; 1744 return;
1753 } 1745 }
1754 1746
1755 item = op->contr->ranges[range_misc];
1756 if (!item->inv) 1747 if (!item->inv)
1757 { 1748 {
1758 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1749 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1759 return; 1750 return;
1760 } 1751 }
1752
1753 if (!op->change_weapon (item))
1754 return;
1755
1761 if (item->type == WAND) 1756 if (item->type == WAND)
1762 { 1757 {
1763 if (item->stats.food <= 0) 1758 if (item->stats.food <= 0)
1764 { 1759 {
1765 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1760 op->contr->play_sound (sound_find ("wand_poof"));
1766 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1761 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1762
1767 return; 1763 return;
1768 } 1764 }
1769 } 1765 }
1770 else if (item->type == ROD || item->type == HORN) 1766 else if (item->type == ROD || item->type == HORN)
1771 { 1767 {
1772 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1768 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1773 { 1769 {
1774 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1770 op->contr->play_sound (sound_find ("wand_poof"));
1771
1775 if (item->type == ROD) 1772 if (item->type == ROD)
1776 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1773 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1777 else 1774 else
1778 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1775 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1776
1779 return; 1777 return;
1780 } 1778 }
1781 } 1779 }
1782 1780
1783 if (cast_spell (op, item, dir, item->inv, NULL)) 1781 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1790 object *tmp; 1788 object *tmp;
1791 1789
1792 if (item->arch) 1790 if (item->arch)
1793 { 1791 {
1794 CLEAR_FLAG (item, FLAG_ANIMATE); 1792 CLEAR_FLAG (item, FLAG_ANIMATE);
1795 item->face = item->arch->clone.face; 1793 item->face = item->arch->face;
1796 item->set_speed (0); 1794 item->set_speed (0);
1797 } 1795 }
1798 1796
1799 if ((tmp = item->in_player ())) 1797 if ((tmp = item->in_player ()))
1800 esrv_update_item (UPD_ANIM, tmp, item); 1798 esrv_update_item (UPD_ANIM, tmp, item);
… …
1805 } 1803 }
1806} 1804}
1807 1805
1808/* Received a fire command for the player - go and do it. 1806/* Received a fire command for the player - go and do it.
1809 */ 1807 */
1810void 1808bool
1811fire (object *op, int dir) 1809fire (object *op, int dir)
1812{ 1810{
1813 int spellcost = 0; 1811 int spellcost = 0;
1814 1812
1815 /* check for loss of invisiblity/hide */ 1813 /* check for loss of invisiblity/hide */
1816 if (action_makes_visible (op)) 1814 if (action_makes_visible (op))
1817 make_visible (op); 1815 make_visible (op);
1818 1816
1819 switch (op->contr->shoottype) 1817 player *pl = op->contr;
1818
1819 if (pl->golem)
1820 {
1821 control_golem (op->contr->golem, dir);
1822 return false;
1820 { 1823 }
1821 case range_none:
1822 return;
1823 1824
1824 case range_bow: 1825 object *ob = pl->ranged_ob;
1826
1827 if (!ob)
1828 return false;
1829
1830 if (!op->change_weapon (ob))
1831 return false;
1832
1833 if (op->speed_left > 0.f)
1834 --op->speed_left;
1835 else
1836 return false;
1837
1838 switch (ob->type)
1839 {
1840 case BOW:
1825 player_fire_bow (op, dir); 1841 player_fire_bow (op, dir);
1826 return; 1842 break;
1827 1843
1828 case range_magic: /* Casting spells */ 1844 case SPELL:
1829 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1845 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1830 return; 1846 break;
1831 1847
1832 case range_misc: 1848 case BUILDER:
1849 apply_map_builder (op, dir);
1850 break;
1851
1852 case SKILL:
1853 do_skill (op, op, ob, dir, 0);
1854 break;
1855
1856 default:
1833 fire_misc_object (op, dir); 1857 fire_misc_object (op, dir);
1834 return; 1858 break;
1835
1836 case range_golem: /* Control summoned monsters from scrolls */
1837 control_golem (op->contr->ranges[range_golem], dir);
1838 return;
1839
1840 case range_skill:
1841 if (!op->chosen_skill)
1842 {
1843 if (op->type == PLAYER)
1844 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1845
1846 return;
1847 }
1848
1849 do_skill (op, op, op->chosen_skill, dir, NULL);
1850 return;
1851 case range_builder:
1852 apply_map_builder (op, dir);
1853 return;
1854 default:
1855 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1856 return;
1857 } 1859 }
1860
1861 return true;
1858} 1862}
1859 1863
1860/* find_key 1864/* find_key
1861 * We try to find a key for the door as passed. If we find a key 1865 * We try to find a key for the door as passed. If we find a key
1862 * and successfully use it, we return the key, otherwise NULL 1866 * and successfully use it, we return the key, otherwise NULL
… …
1949 * 0 otherwise 1953 * 0 otherwise
1950 */ 1954 */
1951static int 1955static int
1952player_attack_door (object *op, object *door) 1956player_attack_door (object *op, object *door)
1953{ 1957{
1954 /* If its a door, try to find a use a key. If we do destroy the door, 1958 /* If its a door, try to find a key. If we do destroy the door,
1955 * might as well return immediately as there is nothing more to do - 1959 * might as well return immediately as there is nothing more to do -
1956 * otherwise, we fall through to the rest of the code. 1960 * otherwise, we fall through to the rest of the code.
1957 */ 1961 */
1958 object *key = find_key (op, op, door); 1962 object *key = find_key (op, op, door);
1959 1963
1960 /* IF we found a key, do some extra work */ 1964 /* If we found a key, do some extra work */
1961 if (key) 1965 if (key)
1962 { 1966 {
1963 object *container = key->env; 1967 object *container = key->env;
1964 1968
1965 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1966 if (action_makes_visible (op)) 1969 if (action_makes_visible (op))
1967 make_visible (op); 1970 make_visible (op);
1971
1968 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1972 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1969 spring_trap (door->inv, op); 1973 spring_trap (door->inv, op);
1970 1974
1971 if (door->type == DOOR) 1975 if (door->type == DOOR)
1972 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1976 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1973 else if (door->type == LOCKED_DOOR) 1977 else if (door->type == LOCKED_DOOR)
1974 { 1978 {
1975 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1979 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1976 remove_door2 (door); /* remove door without violence ;-) */ 1980 remove_door2 (door); /* remove door without violence ;-) */
1977 } 1981 }
1978 1982
1979 /* Do this after we print the message */ 1983 /* Do this after we print the message */
1980 decrease_ob (key); /* Use up one of the keys */ 1984 decrease_ob (key); /* Use up one of the keys */
… …
1985 return 1; /* Nothing more to do below */ 1989 return 1; /* Nothing more to do below */
1986 } 1990 }
1987 else if (door->type == LOCKED_DOOR) 1991 else if (door->type == LOCKED_DOOR)
1988 { 1992 {
1989 /* Might as well return now - no other way to open this */ 1993 /* Might as well return now - no other way to open this */
1990 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1994 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
1991 return 1; 1995 return 1;
1992 } 1996 }
1993 1997
1994 return 0; 1998 return 0;
1995} 1999}
… …
1998 * It should keep the code cleaner. 2002 * It should keep the code cleaner.
1999 * When this is called, the players direction has been updated 2003 * When this is called, the players direction has been updated
2000 * (taking into account confusion.) The player is also actually 2004 * (taking into account confusion.) The player is also actually
2001 * going to try and move (not fire weapons). 2005 * going to try and move (not fire weapons).
2002 */ 2006 */
2003void 2007bool
2004move_player_attack (object *op, int dir) 2008move_player_attack (object *op, int dir)
2005{ 2009{
2006 object *tmp, *mon;
2007 sint16 nx, ny;
2008 int on_battleground; 2010 int on_battleground;
2009 maptile *m;
2010 2011
2011 nx = freearr_x[dir] + op->x; 2012 sint16 nx = freearr_x[dir] + op->x;
2012 ny = freearr_y[dir] + op->y; 2013 sint16 ny = freearr_y[dir] + op->y;
2013 2014
2014 on_battleground = op_on_battleground (op, 0, 0); 2015 on_battleground = op_on_battleground (op, 0, 0);
2016
2017 if (out_of_map (op->map, nx, ny))
2018 return false;
2019
2020 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2021 {
2022 --op->speed_left;
2023 return true;
2024 }
2015 2025
2016 /* If braced, or can't move to the square, and it is not out of the 2026 /* If braced, or can't move to the square, and it is not out of the
2017 * map, attack it. Note order of if statement is important - don't 2027 * map, attack it. Note order of if statement is important - don't
2018 * want to be calling move_ob if braced, because move_ob will move the 2028 * want to be calling move_ob if braced, because move_ob will move the
2019 * player. This is a pretty nasty hack, because if we could 2029 * player. This is a pretty nasty hack, because if we could
2020 * move to some space, it then means that if we are braced, we should 2030 * move to some space, it then means that if we are braced, we should
2021 * do nothing at all. As it is, if we are braced, we go through 2031 * do nothing at all. As it is, if we are braced, we go through
2022 * quite a bit of processing. However, it probably is less than what 2032 * quite a bit of processing. However, it probably is less than what
2023 * move_ob uses. 2033 * move_ob uses.
2024 */ 2034 */
2025 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2026 {
2027 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2028 {
2029 m = op->map->xy_find (nx, ny); 2035 maptile *m = op->map->xy_find (nx, ny);
2030 if (!m)
2031 return; /* Don't think this should happen */
2032 }
2033 else
2034 m = op->map;
2035 2036
2036 if (!(tmp = m->at (nx, ny).bot))
2037 return;
2038
2039 mon = 0;
2040 /* Go through all the objects, and find ones of interest. Only stop if 2037 /* Go through all the objects, and find ones of interest. Only stop if
2041 * we find a monster - that is something we know we want to attack. 2038 * we find a monster - that is something we know we want to attack.
2042 * if its a door or barrel (can roll) see if there may be monsters 2039 * if its a door or barrel (can roll) see if there may be monsters
2043 * on the space 2040 * on the space
2044 */ 2041 */
2045 while (tmp) 2042 object *mon;
2046 { 2043 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2047 if (tmp == op) 2044 {
2048 { 2045 if ((mon->flag [FLAG_ALIVE]
2049 tmp = tmp->above; 2046 || mon->type == LOCKED_DOOR
2050 continue; 2047 || mon->flag [FLAG_CAN_ROLL])
2051 }
2052
2053 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2054 {
2055 mon = tmp; 2048 && mon != op)
2056 break; 2049 break;
2057 } 2050 }
2058 2051
2059 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2060 mon = tmp;
2061
2062 tmp = tmp->above;
2063 }
2064
2065 if (!mon) /* This happens anytime the player tries to move */ 2052 if (!mon) /* This happens anytime the player tries to move */
2066 return; /* into a wall */ 2053 return false; /* into a wall */
2067 2054
2068 if (mon->head)
2069 mon = mon->head; 2055 mon = mon->head_ ();
2070 2056
2071 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2057 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2058 if (op->contr->weapon_sp_left > 0.f)
2072 if (player_attack_door (op, mon)) 2059 if (player_attack_door (op, mon))
2060 {
2061 --op->contr->weapon_sp_left;
2073 return; 2062 return true;
2063 }
2074 2064
2075 /* The following deals with possibly attacking peaceful 2065 /* The following deals with possibly attacking peaceful
2076 * or frienddly creatures. Basically, all players are considered 2066 * or friendly creatures. Basically, all players are considered
2077 * unaggressive. If the moving player has peaceful set, then the 2067 * unaggressive. If the moving player has peaceful set, then the
2078 * object should be pushed instead of attacked. It is assumed that 2068 * object should be pushed instead of attacked. It is assumed that
2079 * if you are braced, you will not attack friends accidently, 2069 * if you are braced, you will not attack friends accidently,
2080 * and thus will not push them. 2070 * and thus will not push them.
2081 */ 2071 */
2082 2072
2083 /* If the creature is a pet, push it even if the player is not 2073 /* If the creature is a pet, push it even if the player is not
2084 * peaceful. Our assumption is the creature is a pet if the 2074 * peaceful. Our assumption is the creature is a pet if the
2085 * player owns it and it is either friendly or unagressive. 2075 * player owns it and it is either friendly or unagressive.
2086 */ 2076 */
2087 if ((op->type == PLAYER) 2077 if (op->type == PLAYER
2088#if COZY_SERVER
2089 &&
2090 ((mon->owner && mon->owner->contr 2078 && ((mon->owner && mon->owner->contr
2091 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2079 && same_party (mon->owner->contr->party, op->contr->party))
2092#else
2093 && mon->owner == op 2080 || mon->owner == op)
2094#endif
2095 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2081 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2096 { 2082 {
2097 /* If we're braced, we don't want to switch places with it */ 2083 /* If we're braced, we don't want to switch places with it */
2098 if (op->contr->braced) 2084 if (op->contr->braced)
2099 return; 2085 return false;
2100 2086
2101 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2087 if (op->speed_left > 0.f)
2088 {
2089 --op->speed_left;
2090
2091 op->play_sound (sound_find ("push_player"));
2102 (void) push_ob (mon, dir, op); 2092 push_ob (mon, dir, op);
2093
2103 if (op->contr->tmp_invis || op->hide) 2094 if (op->contr->tmp_invis || op->hide)
2104 make_visible (op); 2095 make_visible (op);
2105 2096
2106 return; 2097 return true;
2107 } 2098 }
2099 else
2100 return false;
2101 }
2108 2102
2109 /* in certain circumstances, you shouldn't attack friendly 2103 /* in certain circumstances, you shouldn't attack friendly
2110 * creatures. Note that if you are braced, you can't push 2104 * creatures. Note that if you are braced, you can't push
2111 * someone, but put it inside this loop so that you won't 2105 * someone, but put it inside this loop so that you won't
2112 * attack them either. 2106 * attack them either.
2113 */ 2107 */
2114 if ((mon->type == PLAYER || mon->enemy != op) && 2108 if ((mon->type == PLAYER || mon->enemy != op)
2115 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2109 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2116#ifdef PROHIBIT_PLAYERKILL
2117 (op->contr->peaceful 2110 && ((op->contr->peaceful
2118 || (mon->type == PLAYER 2111 || (mon->type == PLAYER && mon->contr->peaceful))
2119 && mon->contr->
2120 peaceful)) &&
2121#else
2122 op->contr->peaceful &&
2123#endif
2124 !on_battleground)) 2112 && !on_battleground))
2113 {
2114 if (op->speed_left > 0.f)
2125 { 2115 {
2116 --op->speed_left;
2117
2126 if (!op->contr->braced) 2118 if (!op->contr->braced)
2127 { 2119 {
2128 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2120 op->play_sound (sound_find ("push_player"));
2129 push_ob (mon, dir, op); 2121 push_ob (mon, dir, op);
2130 } 2122 }
2131 else 2123 else
2132 new_draw_info (0, 0, op, "You withhold your attack"); 2124 op->statusmsg ("You withhold your attack");
2133 2125
2134 if (op->contr->tmp_invis || op->hide) 2126 if (op->contr->tmp_invis || op->hide)
2135 make_visible (op); 2127 make_visible (op);
2136 }
2137 2128
2129 return true;
2130 }
2131 }
2138 /* If the object is a boulder or other rollable object, then 2132 /* If the object is a boulder or other rollable object, then
2139 * roll it if not braced. You can't roll it if you are braced. 2133 * roll it if not braced. You can't roll it if you are braced.
2140 */ 2134 */
2141 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2135 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2136 {
2137 if (op->speed_left > 0.f)
2142 { 2138 {
2139 --op->speed_left;
2140
2143 recursive_roll (mon, dir, op); 2141 recursive_roll (mon, dir, op);
2144 if (action_makes_visible (op)) 2142 if (action_makes_visible (op))
2145 make_visible (op); 2143 make_visible (op);
2146 }
2147 2144
2145 return true;
2146 }
2147 }
2148 /* Any generic living creature. Including things like doors. 2148 /* Any generic living creature. Including things like doors.
2149 * Way it works is like this: First, it must have some hit points 2149 * Way it works is like this: First, it must have some hit points
2150 * and be living. Then, it must be one of the following: 2150 * and be living. Then, it must be one of the following:
2151 * 1) Not a player, 2) A player, but of a different party. Note 2151 * 1) Not a player, 2) A player, but of a different party. Note
2152 * that party_number -1 is no party, so attacks can still happen. 2152 * that party_number -1 is no party, so attacks can still happen.
2153 */ 2153 */
2154 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2154 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2155 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2155 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2156 { 2156 {
2157 2157 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2158 /* If the player hasn't hit something this tick, and does
2159 * so, give them speed boost based on weapon speed. Doing
2160 * it here is better than process_players2, which basically
2161 * incurred a 1 tick offset.
2162 */
2163 if (!op->contr->has_hit)
2164 { 2158 {
2165 op->speed_left += op->speed / op->contr->weapon_sp; 2159 --op->contr->weapon_sp_left;
2166
2167 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2168 }
2169 2160
2170 skill_attack (mon, op, 0, 0, 0); 2161 skill_attack (mon, op, 0, 0, 0);
2171
2172 /* If attacking another player, that player gets automatic
2173 * hitback, and doesn't loose luck either.
2174 * Disable hitback on the battleground or if the target is
2175 * the wiz.
2176 */
2177 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2178 {
2179 short luck = mon->stats.luck;
2180
2181 mon->contr->has_hit = 1;
2182 skill_attack (op, mon, 0, 0, 0);
2183 mon->stats.luck = luck;
2184 }
2185 2162
2186 if (action_makes_visible (op)) 2163 if (action_makes_visible (op))
2187 make_visible (op); 2164 make_visible (op);
2188 }
2189 } /* if player should attack something */
2190}
2191 2165
2192int 2166 return true;
2167 }
2168 }
2169
2170 return false;
2171}
2172
2173bool
2193move_player (object *op, int dir) 2174move_player (object *op, int dir)
2194{ 2175{
2195 int pick; 2176 int pick;
2196 2177
2197 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2178 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
… …
2211 op->facing = dir; 2192 op->facing = dir;
2212 2193
2213 if (op->hide) 2194 if (op->hide)
2214 do_hidden_move (op); 2195 do_hidden_move (op);
2215 2196
2197 bool retval;
2198
2216 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2199 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2217 /*nop */ ; 2200 retval = RESULT_INT (0);
2218 else if (op->contr->fire_on) 2201 else if (op->contr->fire_on)
2219 fire (op, dir); 2202 retval = fire (op, dir);
2220 else 2203 else
2221 { 2204 {
2222 move_player_attack (op, dir); 2205 retval = move_player_attack (op, dir);
2223 pick = check_pick (op); 2206 pick = check_pick (op);
2224 } 2207 }
2225 2208
2226 /* Add special check for newcs players and fire on - this way, the 2209 /* Add special check for newcs players and fire on - this way, the
2227 * server can handle repeat firing. 2210 * server can handle repeat firing.
… …
2234 /* Update how the player looks. Use the facing, so direction may 2217 /* Update how the player looks. Use the facing, so direction may
2235 * get reset to zero. This allows for full animation capabilities 2218 * get reset to zero. This allows for full animation capabilities
2236 * for players. 2219 * for players.
2237 */ 2220 */
2238 animate_object (op, op->facing); 2221 animate_object (op, op->facing);
2239 return 0; 2222
2223 return retval;
2240} 2224}
2241 2225
2242/* This is similar to handle_player, below, but is only used by the 2226/* This is similar to handle_player, below, but is only used by the
2243 * new client/server stuff. 2227 * new client/server stuff.
2244 * This is sort of special, in that the new client/server actually uses 2228 * This is sort of special, in that the new client/server actually uses
2245 * the new speed values for commands. 2229 * the new speed values for commands.
2246 * 2230 *
2247 * Returns true if there are more actions we can do. 2231 * Returns true if there are more actions we can do. Should not do
2232 * many actions in a row, as that would be too unfair to other
2233 * players.
2248 */ 2234 */
2249int 2235bool
2250handle_newcs_player (object *op) 2236handle_newcs_player (object *op)
2251{ 2237{
2252 if (QUERY_FLAG (op, FLAG_SCARED)) 2238 if (QUERY_FLAG (op, FLAG_SCARED))
2253 { 2239 {
2254 flee_player (op); 2240 if (op->speed_left > 0.f)
2255 /* If player is still scared, that is his action for this tick */
2256 if (QUERY_FLAG (op, FLAG_SCARED))
2257 { 2241 {
2258 op->speed_left--; 2242 --op->speed_left;
2243 flee_player (op);
2244
2259 return 0; 2245 return true;
2260 } 2246 }
2247 else
2248 return false;
2261 } 2249 }
2262 2250
2263 /* call this here - we also will call this in do_ericserver, but 2251 /* call this here - we also will call this in do_ericserver, but
2264 * the players time has been increased when doericserver has been 2252 * the players time has been increased when doericserver has been
2265 * called, so we recheck it here. 2253 * called, so we recheck it here.
2266 */ 2254 */
2267 if (op->contr->ns->handle_command ()) 2255 if (op->contr->ns->handle_command ())
2268 return 1; 2256 return true;
2269 2257
2270 if (op->speed_left > 0)
2271 {
2272 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2258 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2273 {
2274 /* All move commands take 1 tick, at least for now */
2275 op->speed_left--;
2276
2277 /* Instead of all the stuff below, let move_player take care
2278 * of it. Also, some of the skill stuff is only put in
2279 * there, as well as the confusion stuff.
2280 */
2281 move_player (op, op->direction); 2259 return move_player (op, op->direction);
2282 2260
2283 return op->speed_left > 0;
2284 }
2285 }
2286
2287 return 0; 2261 return false;
2288} 2262}
2289 2263
2290int 2264int
2291save_life (object *op) 2265save_life (object *op)
2292{ 2266{
… …
2294 return 0; 2268 return 0;
2295 2269
2296 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2270 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2297 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2271 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2298 { 2272 {
2299 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2273 op->play_sound (sound_find ("ob_evaporate"));
2300 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2274 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2301 2275
2302 if (op->contr) 2276 if (op->contr)
2303 esrv_del_item (op->contr, tmp->count); 2277 esrv_del_item (op->contr, tmp->count);
2304 2278
… …
2324/* This goes throws the inventory and removes unpaid objects, and puts them 2298/* This goes throws the inventory and removes unpaid objects, and puts them
2325 * back in the map (location and map determined by values of env). This 2299 * back in the map (location and map determined by values of env). This
2326 * function will descend into containers. op is the object to start the search 2300 * function will descend into containers. op is the object to start the search
2327 * from. 2301 * from.
2328 */ 2302 */
2329void 2303static void
2330remove_unpaid_objects (object *op, object *env) 2304drop_unpaid_items (object *op, object *env)
2331{ 2305{
2332 while (op) 2306 while (op)
2333 { 2307 {
2334 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2308 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2335 2309
… …
2339 esrv_del_item (env->contr, op->count); 2313 esrv_del_item (env->contr, op->count);
2340 2314
2341 op->insert_at (env); 2315 op->insert_at (env);
2342 } 2316 }
2343 else if (op->inv) 2317 else if (op->inv)
2344 remove_unpaid_objects (op->inv, env); 2318 drop_unpaid_items (op->inv, env);
2345 2319
2346 op = next; 2320 op = next;
2347 } 2321 }
2322}
2323
2324void
2325object::drop_unpaid_items ()
2326{
2327 if (!flag [FLAG_REMOVED])
2328 ::drop_unpaid_items (inv, this);
2348} 2329}
2349 2330
2350/* 2331/*
2351 * Returns pointer a static string containing gravestone text 2332 * Returns pointer a static string containing gravestone text
2352 * Moved from apply.c to player.c - player.c is what 2333 * Moved from apply.c to player.c - player.c is what
… …
2447 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2428 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2448 else 2429 else
2449 { 2430 {
2450 gen_grace = op->stats.maxgrace; 2431 gen_grace = op->stats.maxgrace;
2451 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2432 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2452 }
2453
2454 /* Regenerate Spell Points */
2455 if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
2456 {
2457 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2458 if (op->stats.sp < op->stats.maxsp)
2459 {
2460 op->stats.sp++;
2461 /* dms do not consume food */
2462 if (!QUERY_FLAG (op, FLAG_WIZ))
2463 {
2464 op->stats.food--;
2465 if (op->contr->digestion < 0)
2466 op->stats.food += op->contr->digestion;
2467 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2468 op->stats.food = last_food;
2469 }
2470 }
2471
2472 if (max_sp > 1)
2473 {
2474 over_sp = (gen_sp + 10) / rate_sp;
2475 if (over_sp > 0)
2476 {
2477 if (op->stats.sp < op->stats.maxsp)
2478 {
2479 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2480
2481 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2482 op->stats.sp--;
2483
2484 if (op->stats.sp > op->stats.maxsp)
2485 op->stats.sp = op->stats.maxsp;
2486 }
2487 op->last_sp = 0;
2488 }
2489 else
2490 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2491 }
2492 else
2493 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2494 } 2433 }
2495 2434
2496 /* Regenerate Grace */ 2435 /* Regenerate Grace */
2497 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2436 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2498 if (--op->last_grace < 0) 2437 if (--op->last_grace < 0)
… …
2519 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2458 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2520 } 2459 }
2521 /* wearing stuff doesn't detract from grace generation. */ 2460 /* wearing stuff doesn't detract from grace generation. */
2522 } 2461 }
2523 2462
2463 if (op->stats.food > 0)
2464 {
2524 /* Regenerate Hit Points */ 2465 /* Regenerate Spell Points */
2525 if (--op->last_heal < 0) 2466 if (!op->contr->golem && --op->last_sp < 0)
2526 {
2527 if (op->stats.hp < op->stats.maxhp)
2528 { 2467 {
2529 op->stats.hp++; 2468 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2530 /* dms do not consume food */ 2469
2531 if (!QUERY_FLAG (op, FLAG_WIZ)) 2470 if (op->stats.sp < op->stats.maxsp)
2532 { 2471 {
2472 op->stats.sp++;
2473
2474 /* dms do not consume food */
2475 if (!QUERY_FLAG (op, FLAG_WIZ))
2476 {
2533 op->stats.food--; 2477 op->stats.food--;
2478
2534 if (op->contr->digestion < 0) 2479 if (op->contr->digestion < 0)
2535 op->stats.food += op->contr->digestion; 2480 op->stats.food += op->contr->digestion;
2536 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2481 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2537 op->stats.food = last_food; 2482 op->stats.food = last_food;
2483 }
2538 } 2484 }
2539 }
2540 2485
2541 if (max_hp > 1) 2486 if (max_sp > 1)
2542 {
2543 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2544 if (over_hp > 0)
2545 { 2487 {
2546 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2488 over_sp = (gen_sp + 10) / rate_sp;
2489 if (over_sp > 0)
2490 {
2491 if (op->stats.sp < op->stats.maxsp)
2492 {
2493 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2494
2495 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2496 op->stats.sp--;
2497
2498 if (op->stats.sp > op->stats.maxsp)
2499 op->stats.sp = op->stats.maxsp;
2500 }
2501
2547 op->last_heal = 0; 2502 op->last_sp = 0;
2503 }
2504 else
2505 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2548 } 2506 }
2549 else 2507 else
2508 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2509 }
2510
2511 /* Regenerate Hit Points */
2512 if (--op->last_heal < 0)
2513 {
2514 if (op->stats.hp < op->stats.maxhp)
2550 { 2515 {
2551 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2516 op->stats.hp++;
2517
2518 /* dms do not consume food */
2519 if (!QUERY_FLAG (op, FLAG_WIZ))
2520 {
2521 op->stats.food--;
2522
2523 if (op->contr->digestion < 0)
2524 op->stats.food += op->contr->digestion;
2525 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2526 op->stats.food = last_food;
2527 }
2552 } 2528 }
2529
2530 if (max_hp > 1)
2531 {
2532 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2533
2534 if (over_hp > 0)
2535 {
2536 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2537 op->last_heal = 0;
2538 }
2539 else
2540 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2553 } 2541 }
2554 else 2542 else
2555 {
2556 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2543 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2557 } 2544 }
2558 } 2545 }
2559 2546
2560 /* Digestion */ 2547 /* Digestion */
2561 if (--op->last_eat < 0) 2548 if (--op->last_eat < 0)
2562 { 2549 {
2563#ifdef COZY_SERVER 2550 int bonus = max (0, op->contr->digestion),
2564 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2551 penalty = max (0, -op->contr->digestion);
2565 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2566#else
2567 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2568#endif
2569 2552
2570 if (op->contr->gen_hp > 0)
2571 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2553 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2572 else
2573 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2574 2554
2575 /* dms do not consume food */ 2555 /* dms do not consume food */
2576 if (!QUERY_FLAG (op, FLAG_WIZ)) 2556 if (!QUERY_FLAG (op, FLAG_WIZ))
2577 op->stats.food--; 2557 op->stats.food--;
2578 } 2558 }
… …
2605 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2585 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2606 manual_apply (op, flesh, 0); 2586 manual_apply (op, flesh, 0);
2607 } 2587 }
2608 } 2588 }
2609 2589
2610 while (op->stats.food < 0 && op->stats.hp >= 0) 2590 if (op->stats.food < 0)
2611 op->stats.food++, op->stats.hp--; 2591 {
2592 op->stats.hp += op->stats.food;
2593 op->stats.food = 0;
2594 }
2612 2595
2613 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2596 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2614 kill_player (op); 2597 kill_player (op);
2615 } 2598 }
2616} 2599}
… …
2621 * file. 2604 * file.
2622 */ 2605 */
2623void 2606void
2624kill_player (object *op) 2607kill_player (object *op)
2625{ 2608{
2609 int x, y;
2626 char buf[MAX_BUF]; 2610 char buf[MAX_BUF];
2627 int x, y;
2628
2629 //int i;
2630 maptile *map; /* this is for resurrection */ 2611 maptile *map; /* this is for resurrection */
2631
2632 /* int z;
2633 int num_stats_lose;
2634 int lost_a_stat;
2635 int lose_this_stat;
2636 int this_stat; */
2637 int will_kill_again; 2612 int will_kill_again;
2638 archetype *at; 2613 archetype *at;
2639 object *tmp; 2614 object *tmp;
2640 2615
2641 if (save_life (op)) 2616 if (save_life (op))
2642 return; 2617 return;
2643
2644 2618
2645 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2619 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2646 * in cities ONLY!!! It is very important that this doesn't get abused. 2620 * in cities ONLY!!! It is very important that this doesn't get abused.
2647 * Look at op_on_battleground() for more info --AndreasV 2621 * Look at op_on_battleground() for more info --AndreasV
2648 */ 2622 */
… …
2664 { 2638 {
2665 tmp->destroy (); 2639 tmp->destroy ();
2666 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2640 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2667 } 2641 }
2668 2642
2669 cure_disease (op, 0); /* remove any disease */ 2643 cure_disease (op, 0, 0); /* remove any disease */
2670 op->stats.hp = op->stats.maxhp; 2644 op->stats.hp = op->stats.maxhp;
2671 if (op->stats.food <= 0) 2645 if (op->stats.food <= 0)
2672 op->stats.food = 999; 2646 op->stats.food = 999;
2673 2647
2674 /* create a bodypart-trophy to make the winner happy */ 2648 /* create a bodypart-trophy to make the winner happy */
2675 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2649 if (object *tmp = arch_to_object (archetype::find ("finger")))
2676 { 2650 {
2677 sprintf (buf, "%s's finger", &op->name); 2651 tmp->name = format ("%s's finger" , &op->name);
2678 tmp->name = buf; 2652 tmp->name_pl = format ("%s's fingers", &op->name);
2679 sprintf (buf, " This finger has been cut off %s\n" 2653 tmp->msg = format (
2680 " the %s, when he was defeated at\n level %d by %s.\n", 2654 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2681 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2655 &op->name, op->contr->title, (int) (op->level), op->contr->killer
2682 tmp->msg = buf; 2656 );
2683 tmp->value = 0, tmp->type = 0; 2657 tmp->value = 0, tmp->type = 0;
2684 tmp->materialname = "organics"; 2658 tmp->materialname = "organics";
2685 tmp->insert_at (op, tmp); 2659 tmp->insert_at (op, tmp);
2686 } 2660 }
2687 2661
… …
2694 INVOKE_PLAYER (DEATH, op->contr); 2668 INVOKE_PLAYER (DEATH, op->contr);
2695 2669
2696 command_kill_pets (op, 0); 2670 command_kill_pets (op, 0);
2697 2671
2698 if (op->stats.food < 0) 2672 if (op->stats.food < 0)
2699 {
2700 sprintf (buf, "%s starved to death.", &op->name);
2701 strcpy (op->contr->killer, "starvation"); 2673 strcpy (op->contr->killer, "starvation");
2702 }
2703 else
2704 sprintf (buf, "%s died.", &op->name);
2705 2674
2706 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2675 op->contr->play_sound (sound_find ("player_dies"));
2707 2676
2708 /* save the map location for corpse, gravestone */ 2677 /* save the map location for corpse, gravestone */
2709 x = op->x; 2678 x = op->x;
2710 y = op->y; 2679 y = op->y;
2711 map = op->map; 2680 map = op->map;
… …
2874 { 2843 {
2875 tmp->destroy (); 2844 tmp->destroy ();
2876 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2845 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2877 } 2846 }
2878 2847
2879 cure_disease (op, 0); /* remove any disease */ 2848 cure_disease (op, 0, 0); /* remove any disease */
2880 2849
2881 /*add_exp(op, (op->stats.exp * -0.20)); */ 2850 /*add_exp(op, (op->stats.exp * -0.20)); */
2882 apply_death_exp_penalty (op); 2851 apply_death_exp_penalty (op);
2883 if (op->stats.food < 100) 2852 if (op->stats.food < 100)
2884 op->stats.food = 900; 2853 op->stats.food = 900;
… …
2888 2857
2889 /* 2858 /*
2890 * Check to see if the player has any unpaid items. If so, remove them 2859 * Check to see if the player has any unpaid items. If so, remove them
2891 * and put them back in the map. 2860 * and put them back in the map.
2892 */ 2861 */
2893 remove_unpaid_objects (op->inv, op); 2862 op->drop_unpaid_items ();
2894 2863
2895 /****************************************/ 2864 /****************************************/
2896 /* */ 2865 /* */
2897 /* Move player to his current respawn- */ 2866 /* Move player to his current respawn- */
2898 /* position (usually last savebed) */ 2867 /* position (usually last savebed) */
… …
2918 object *force; 2887 object *force;
2919 int at; 2888 int at;
2920 2889
2921 force = get_archetype (FORCE_NAME); 2890 force = get_archetype (FORCE_NAME);
2922 /* 50 ticks should be enough time for the spell to abate */ 2891 /* 50 ticks should be enough time for the spell to abate */
2923 force->speed = 0.1; 2892 force->speed = 0.1f;
2924 force->speed_left = -5.0; 2893 force->speed_left = -5.f;
2925 SET_FLAG (force, FLAG_APPLIED); 2894 SET_FLAG (force, FLAG_APPLIED);
2926 for (at = 0; at < NROFATTACKS; at++) 2895 for (at = 0; at < NROFATTACKS; at++)
2927 if (will_kill_again & (1 << at)) 2896 if (will_kill_again & (1 << at))
2928 force->resist[at] = 100; 2897 force->resist[at] = 100;
2929 2898
… …
3038void 3007void
3039make_visible (object *op) 3008make_visible (object *op)
3040{ 3009{
3041 op->hide = 0; 3010 op->hide = 0;
3042 op->invisible = 0; 3011 op->invisible = 0;
3012
3043 if (op->type == PLAYER) 3013 if (op->type == PLAYER)
3044 { 3014 {
3045 op->contr->tmp_invis = 0; 3015 op->contr->tmp_invis = 0;
3046 op->contr->invis_race = 0; 3016 op->contr->invis_race = 0;
3047 } 3017 }
… …
3050} 3020}
3051 3021
3052int 3022int
3053is_true_undead (object *op) 3023is_true_undead (object *op)
3054{ 3024{
3055 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3025 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3056 return 1; 3026 return 1;
3057 3027
3058 return 0; 3028 return 0;
3059} 3029}
3060 3030
3061/* look at the surrounding terrain to determine 3031/* look at the surrounding terrain to determine
3062 * the hideability of this object. Positive levels 3032 * the hideability of this object. Positive levels
3063 * indicate greater hideability. 3033 * indicate greater hideability.
3064 */ 3034 */
3065
3066int 3035int
3067hideability (object *ob) 3036hideability (object *ob)
3068{ 3037{
3069 int i, level = 0, mflag; 3038 int i, level = 0, mflag;
3070 sint16 x, y; 3039 sint16 x, y;
… …
3104/* For Hidden creatures - a chance of becoming 'unhidden' 3073/* For Hidden creatures - a chance of becoming 'unhidden'
3105 * every time they move - as we subtract off 'invisibility' 3074 * every time they move - as we subtract off 'invisibility'
3106 * AND, for players, if they move into a ridiculously unhideable 3075 * AND, for players, if they move into a ridiculously unhideable
3107 * spot (surrounded by clear terrain in broad daylight). -b.t. 3076 * spot (surrounded by clear terrain in broad daylight). -b.t.
3108 */ 3077 */
3109
3110void 3078void
3111do_hidden_move (object *op) 3079do_hidden_move (object *op)
3112{ 3080{
3113 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3081 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3114 object *skop; 3082 object *skop;
… …
3196 * object op. This function works fine for monsters, 3164 * object op. This function works fine for monsters,
3197 * but we dont worry if the object isnt the top one in 3165 * but we dont worry if the object isnt the top one in
3198 * a pile (say a coin under a table would return "viewable" 3166 * a pile (say a coin under a table would return "viewable"
3199 * by this routine). Another question, should we be 3167 * by this routine). Another question, should we be
3200 * concerned with the direction the player is looking 3168 * concerned with the direction the player is looking
3201 * in? Realistically, most of use cant see stuff behind 3169 * in? Realistically, most of us can't see stuff behind
3202 * our backs...on the other hand, does the "facing" direction 3170 * our backs...on the other hand, does the "facing" direction
3203 * imply the way your head, or body is facing? Its possible 3171 * imply the way your head, or body is facing? It's possible
3204 * for them to differ. Sigh, this fctn could get a bit more complex. 3172 * for them to differ. Sigh, this fctn could get a bit more complex.
3205 * -b.t. 3173 * -b.t.
3206 * This function is now map tiling safe. 3174 * This function is now map tiling safe.
3207 */ 3175 */
3208
3209int 3176int
3210player_can_view (object *pl, object *op) 3177player_can_view (object *pl, object *op)
3211{ 3178{
3212 rv_vector rv; 3179 rv_vector rv;
3213 int dx, dy; 3180 int dx, dy;
… …
3225 3192
3226 get_rangevector (pl, op, &rv, 0x1); 3193 get_rangevector (pl, op, &rv, 0x1);
3227 3194
3228 /* starting with the 'head' part, lets loop 3195 /* starting with the 'head' part, lets loop
3229 * through the object and find if it has any 3196 * through the object and find if it has any
3230 * part that is in the los array but isnt on 3197 * part that is in the los array but isn't on
3231 * a blocked los square. 3198 * a blocked los square.
3232 * we use the archetype to figure out offsets. 3199 * we use the archetype to figure out offsets.
3233 */ 3200 */
3234 while (op) 3201 while (op)
3235 { 3202 {
3236 dx = rv.distance_x + op->arch->clone.x; 3203 dx = rv.distance_x + op->arch->x;
3237 dy = rv.distance_y + op->arch->clone.y; 3204 dy = rv.distance_y + op->arch->y;
3238 3205
3239 /* only the viewable area the player sees is updated by LOS 3206 /* only the viewable area the player sees is updated by LOS
3240 * code, so we need to restrict ourselves to that range of values 3207 * code, so we need to restrict ourselves to that range of values
3241 * for any meaningful values. 3208 * for any meaningful values.
3242 */ 3209 */
3243 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3210 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3244 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3211 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3245 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) 3212 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3246 return 1; 3213 return 1;
3214
3247 op = op->more; 3215 op = op->more;
3248 } 3216 }
3217
3249 return 0; 3218 return 0;
3250} 3219}
3251 3220
3252/* routine for both players and monsters. We call this when 3221/* routine for both players and monsters. We call this when
3253 * there is a possibility for our action distrubing our hiding 3222 * there is a possibility for our action distrubing our hiding
… …
3256 * return 0. 3225 * return 0.
3257 */ 3226 */
3258int 3227int
3259action_makes_visible (object *op) 3228action_makes_visible (object *op)
3260{ 3229{
3261
3262 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3230 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3263 { 3231 {
3264 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3232 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3265 return 0; 3233 return 0;
3266 3234
… …
3272 { 3240 {
3273 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3241 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3274 return 1; 3242 return 1;
3275 } 3243 }
3276 } 3244 }
3245
3277 return 0; 3246 return 0;
3278} 3247}
3279 3248
3280/* op_on_battleground - checks if the given object op (usually 3249/* op_on_battleground - checks if the given object op (usually
3281 * a player) is standing on a valid battleground-tile, 3250 * a player) is standing on a valid battleground-tile,
… …
3286 * Default is to do the same as before, so only people wanting to have different points need worry about this 3255 * Default is to do the same as before, so only people wanting to have different points need worry about this
3287 */ 3256 */
3288int 3257int
3289op_on_battleground (object *op, int *x, int *y) 3258op_on_battleground (object *op, int *x, int *y)
3290{ 3259{
3291 object *tmp;
3292
3293 /* A battleground-tile needs the following attributes to be valid: 3260 /* A battleground-tile needs the following attributes to be valid:
3294 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3261 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3295 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3262 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3296 * and the exit-coordinates sp/hp must both be > 0. 3263 * and the exit-coordinates sp/hp must both be > 0.
3297 * => The intention here is to prevent abuse of the battleground- 3264 * => The intention here is to prevent abuse of the battleground-
3298 * feature (like pickable or hidden battleground tiles). */ 3265 * feature (like pickable or hidden battleground tiles). */
3299 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3266 for (object *tmp = op->below; tmp; tmp = tmp->below)
3300 { 3267 {
3301 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3268 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3302 { 3269 {
3303 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3270 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3304 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3271 && tmp->type == BATTLEGROUND
3272 && tmp->name == shstr_battleground
3273 && EXIT_X (tmp) && EXIT_Y (tmp))
3305 { 3274 {
3306 /*before we assign the exit, check if this is a teambattle */ 3275 /* before we assign the exit, check if this is a teambattle */
3307 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3276 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3308 { 3277 {
3309 object *invtmp;
3310
3311 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3278 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3312 { 3279 {
3313 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3280 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3314 { 3281 {
3315 if (x != NULL && y != NULL) 3282 if (x && y)
3316 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3283 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3284
3317 return 1; 3285 return 1;
3318 } 3286 }
3319 } 3287 }
3320 } 3288 }
3289
3321 if (x != NULL && y != NULL) 3290 if (x && y)
3322 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3291 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3292
3323 return 1; 3293 return 1;
3324 } 3294 }
3325 } 3295 }
3326 } 3296 }
3297
3327 /* If we got here, did not find a battleground */ 3298 /* If we got here, did not find a battleground */
3328 return 0; 3299 return 0;
3329} 3300}
3330 3301
3331/* 3302/*
… …
3347 char buf[MAX_BUF]; /* tmp. string buffer */ 3318 char buf[MAX_BUF]; /* tmp. string buffer */
3348 int i = 0, j = 0; 3319 int i = 0, j = 0;
3349 3320
3350 /* get the appropriate treasurelist */ 3321 /* get the appropriate treasurelist */
3351 if (atnr == ATNR_FIRE) 3322 if (atnr == ATNR_FIRE)
3352 trlist = treasurelist::find ("dragon_ability_fire"); 3323 trlist = treasurelist::find (shstr_dragon_ability_fire);
3353 else if (atnr == ATNR_COLD) 3324 else if (atnr == ATNR_COLD)
3354 trlist = treasurelist::find ("dragon_ability_cold"); 3325 trlist = treasurelist::find (shstr_dragon_ability_cold);
3355 else if (atnr == ATNR_ELECTRICITY) 3326 else if (atnr == ATNR_ELECTRICITY)
3356 trlist = treasurelist::find ("dragon_ability_elec"); 3327 trlist = treasurelist::find (shstr_dragon_ability_elec);
3357 else if (atnr == ATNR_POISON) 3328 else if (atnr == ATNR_POISON)
3358 trlist = treasurelist::find ("dragon_ability_poison"); 3329 trlist = treasurelist::find (shstr_dragon_ability_poison);
3359 3330
3360 if (trlist == NULL || who->type != PLAYER) 3331 if (trlist == NULL || who->type != PLAYER)
3361 return; 3332 return;
3362 3333
3363 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3334 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3367 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3338 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3368 return; 3339 return;
3369 } 3340 }
3370 3341
3371 /* everything seems okay - now bring on the gift: */ 3342 /* everything seems okay - now bring on the gift: */
3372 item = &(tr->item->clone); 3343 item = tr->item;
3373 3344
3374 if (item->type == SPELL) 3345 if (item->type == SPELL)
3375 { 3346 {
3376 if (check_spell_known (who, item->name)) 3347 if (check_spell_known (who, item->name))
3377 return; 3348 return;
… …
3436 { 3407 {
3437 /* forces in the treasurelist can alter the player's stats */ 3408 /* forces in the treasurelist can alter the player's stats */
3438 object *skin; 3409 object *skin;
3439 3410
3440 /* first get the dragon skin force */ 3411 /* first get the dragon skin force */
3441 shstr_cmp dragon_skin_force ("dragon_skin_force");
3442 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3412 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3443 ; 3413 ;
3444 3414
3445 if (!skin) 3415 if (!skin)
3446 return; 3416 return;
3447 3417
… …
3495 * not readied. 3465 * not readied.
3496 */ 3466 */
3497void 3467void
3498player_unready_range_ob (player *pl, object *ob) 3468player_unready_range_ob (player *pl, object *ob)
3499{ 3469{
3500 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3470 if (pl->ob->current_weapon == ob)
3471 pl->ob->current_weapon = 0;
3472
3473 if (pl->combat_ob == ob)
3474 pl->combat_ob = 0;
3475
3501 if (pl->ranges[i] == ob) 3476 if (pl->ranged_ob == ob)
3502 {
3503 pl->ranges[i] = 0; 3477 pl->ranged_ob = 0;
3504 if (pl->shoottype == i)
3505 pl->shoottype = range_none;
3506 }
3507} 3478}
3508 3479
3509sint8 3480sint8
3510player::visibility_at (maptile *map, int x, int y) const 3481player::visibility_at (maptile *map, int x, int y) const
3511{ 3482{
… …
3522 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy)) 3493 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3523 return 0; 3494 return 0;
3524 3495
3525 return 100 - blocked_los [x][y]; 3496 return 100 - blocked_los [x][y];
3526} 3497}
3498
3499void
3500player::infobox (const char *title, const char *msg, int color)
3501{
3502 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3503}
3504
3505void
3506player::statusmsg (const char *msg, int color)
3507{
3508 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3509}
3510
3511void
3512player::failmsg (const char *msg, int color)
3513{
3514 play_sound (sound_find ("generic_failure"));
3515 statusmsg (msg, color);
3516}
3517

Diff Legend

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