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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.178 by root, Sun Dec 28 15:28:47 2008 UTC vs.
Revision 1.206 by root, Fri Oct 23 03:08:35 2009 UTC

3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <cmath> 25#include <cmath>
92 * Return value: 1 if money was destroyed, 0 if not. 93 * Return value: 1 if money was destroyed, 0 if not.
93 */ 94 */
94static int 95static int
95apply_id_altar (object *money, object *altar, object *pl) 96apply_id_altar (object *money, object *altar, object *pl)
96{ 97{
97 dynbuf_text buf; 98 dynbuf_text &buf = msg_dynbuf; buf.clear ();
98 99
99 if (!pl || pl->type != PLAYER) 100 if (!pl || pl->type != PLAYER)
100 return 0; 101 return 0;
101 102
102 /* Check for MONEY type is a special hack - it prevents 'nothing needs 103 /* Check for MONEY type is a special hack - it prevents 'nothing needs
103 * identifying' from being printed out more than it needs to be. 104 * identifying' from being printed out more than it needs to be.
104 */ 105 */
105 if (!check_altar_sacrifice (altar, money) || money->type != MONEY) 106 if (!check_altar_sacrifice (altar, money, pl) || money->type != MONEY)
106 return 0; 107 return 0;
107 108
108 /* if the player has a marked item, identify that if it needs to be 109 /* if the player has a marked item, identify that if it needs to be
109 * identified. If it doesn't, then go through the player inventory. 110 * identified. If it doesn't, then go through the player inventory.
110 */ 111 */
111 if (object *marked = find_marked_object (pl)) 112 if (object *marked = find_marked_object (pl))
112 if (!QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked)) 113 if (!QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked))
113 { 114 {
114 if (operate_altar (altar, &money)) 115 if (operate_altar (altar, &money, pl))
115 { 116 {
116 identify (marked); 117 identify (marked);
117 118
118 buf.printf ("You have %s.\r", long_desc (marked, pl)); 119 buf.printf ("You have %s.\r", long_desc (marked, pl));
119 if (marked->msg) 120 if (marked->msg)
125 126
126 for (object *id = pl->inv; id; id = id->below) 127 for (object *id = pl->inv; id; id = id->below)
127 { 128 {
128 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id)) 129 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id))
129 { 130 {
130 if (operate_altar (altar, &money)) 131 if (operate_altar (altar, &money, pl))
131 { 132 {
132 identify (id); 133 identify (id);
133 134
134 buf.printf ("You have %s.\r", long_desc (id, pl)); 135 buf.printf ("You have %s.\r", long_desc (id, pl));
135 if (id->msg) 136 if (id->msg)
160 * matching item. 161 * matching item.
161 **/ 162 **/
162void 163void
163handle_apply_yield (object *tmp) 164handle_apply_yield (object *tmp)
164{ 165{
165 if (shstr yield = tmp->kv (shstr_on_use_yield)) 166 if (shstr_tmp yield = tmp->kv (shstr_on_use_yield))
166 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR); 167 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
167} 168}
168 169
169/** 170/**
170 * Handles applying a potion. 171 * Handles applying a potion.
315 */ 316 */
316 if (tmp->inv) 317 if (tmp->inv)
317 { 318 {
318 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 319 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
319 { 320 {
320 object *fball;
321
322 op->failmsg ("Yech! Your lungs are on fire!"); 321 op->failmsg ("Yech! Your lungs are on fire!");
323 322 create_exploding_ball_at (op, op->level);
324 /* Explodes a fireball centered at player */
325 fball = get_archetype (EXPLODING_FIREBALL);
326 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
327 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
328 fball->x = op->x;
329 fball->y = op->y;
330 insert_ob_in_map (fball, op->map, NULL, 0);
331 } 323 }
332 else 324 else
333 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 325 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
334 326
335 tmp->decrease (); 327 tmp->decrease ();
378 } 370 }
379 371
380 /* Only thing left are the stat potions */ 372 /* Only thing left are the stat potions */
381 if (op->type == PLAYER) 373 if (op->type == PLAYER)
382 { /* only for players */ 374 { /* only for players */
383 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0) 375 if ((QUERY_FLAG (tmp, FLAG_CURSED)
376 || QUERY_FLAG (tmp, FLAG_DAMNED))
377 && tmp->value != 0)
384 CLEAR_FLAG (tmp, FLAG_APPLIED); 378 CLEAR_FLAG (tmp, FLAG_APPLIED);
385 else 379 else
386 SET_FLAG (tmp, FLAG_APPLIED); 380 SET_FLAG (tmp, FLAG_APPLIED);
387 381
388 if (!change_abil (op, tmp)) 382 if (!change_abil (op, tmp))
403/**************************************************************************** 397/****************************************************************************
404 * Weapon improvement code follows 398 * Weapon improvement code follows
405 ****************************************************************************/ 399 ****************************************************************************/
406 400
407/** 401/**
402 * This function just checks whether who can handle equipping an item
403 * with item_power.
404 */
405
406bool
407check_item_power (object *who, int item_power)
408{
409 if (who->type == PLAYER
410 && item_power
411 && item_power + who->contr->item_power > settings.item_power_factor * who->level)
412 return false;
413 else
414 return true;
415}
416
417/**
408 * This returns the sum of nrof of item (arch name). 418 * This returns the sum of nrof of item (arch name).
409 */ 419 */
410static int 420static int
411check_item (object *op, const char *item) 421check_item (object *op, shstr_cmp item)
412{ 422{
413 int count = 0; 423 int count = 0;
414 424
415 if (!item) 425 if (!item)
416 return 0; 426 return 0;
417 427
418 for (op = op->below; op; op = op->below) 428 for (op = op->below; op; op = op->below)
419 {
420 if (strcmp (op->arch->archname, item) == 0) 429 if (op->arch->archname == item)
421 {
422 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 430 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
423 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 431 && /* Loophole bug? -FD- */ !QUERY_FLAG (op, FLAG_UNPAID))
424 {
425 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
426 count++;
427 else
428 count += op->nrof; 432 count += op->number_of ();
429 }
430 }
431 }
432 433
433 return count; 434 return count;
434} 435}
435 436
436/** 437/**
438 * op is typically the player, which is only 439 * op is typically the player, which is only
439 * really used to determine what space to look at. 440 * really used to determine what space to look at.
440 * Modified to only eat 'nrof' of objects. 441 * Modified to only eat 'nrof' of objects.
441 */ 442 */
442static void 443static void
443eat_item (object *op, const char *item, uint32 nrof) 444eat_item (object *op, shstr_cmp item, uint32 nrof)
444{ 445{
445 object *prev; 446 object *prev;
446 447
447 prev = op; 448 prev = op;
448 op = op->below; 449 op = op->below;
449 450
450 while (op) 451 while (op)
451 { 452 {
452 if (strcmp (op->arch->archname, item) == 0) 453 if (op->arch->archname == item)
453 { 454 {
454 if (op->nrof >= nrof) 455 if (op->nrof >= nrof)
455 { 456 {
456 op->decrease (nrof); 457 op->decrease (nrof);
457 return; 458 return;
466 } 467 }
467 468
468 prev = op; 469 prev = op;
469 op = op->below; 470 op = op->below;
470 } 471 }
471}
472
473/**
474 * This checks to see of the player (who) is sufficient level to use a weapon
475 * with improvs improvements (typically last_eat). We take an int here
476 * instead of the object so that the improvement code can pass along the
477 * increased value to see if the object is usuable.
478 * we return 1 (true) if the player can use the weapon.
479 */
480static int
481check_weapon_power (const object *who, int improvs)
482{
483/* Old code is below (commented out). Basically, since weapons are the only
484 * object players really have any control to improve, it's a bit harsh to
485 * require high level in some combat skill, so we just use overall level.
486 */
487#if 1
488 if (((who->level / 5) + 5) >= improvs)
489 return 1;
490 else
491 return 0;
492
493#else
494 int level = 0;
495
496 /* The skill system hands out wc and dam bonuses to fighters
497 * more generously than the old system (see fix_player). Thus
498 * we need to curtail the power of player enchanted weapons.
499 * I changed this to 1 improvement per "fighter" level/5 -b.t.
500 * Note: Nothing should break by allowing this ratio to be different or
501 * using normal level - it is just a matter of play balance.
502 */
503 if (who->type == PLAYER)
504 {
505 object *wc_obj = NULL;
506
507 for (wc_obj = who->inv; wc_obj; wc_obj = wc_obj->below)
508 if (wc_obj->type == SKILL && IS_COMBAT_SKILL (wc_obj->subtype) && wc_obj->level > level)
509 level = wc_obj->level;
510
511 if (!level)
512 {
513 LOG (llevError, "Error: Player: %s lacks wc experience object\n", who->name);
514 level = who->level;
515 }
516 }
517 else
518 level = who->level;
519
520 return (improvs <= ((level / 5) + 5));
521#endif
522} 472}
523 473
524/** 474/**
525 * Returns how many items of type improver->slaying there are under op. 475 * Returns how many items of type improver->slaying there are under op.
526 * Will display a message if none found, and 1 if improver->slaying is NULL. 476 * Will display a message if none found, and 1 if improver->slaying is NULL.
655 if (improver->stats.sp == IMPROVE_PREPARE) 605 if (improver->stats.sp == IMPROVE_PREPARE)
656 return prepare_weapon (op, improver, weapon); 606 return prepare_weapon (op, improver, weapon);
657 607
658 if (weapon->level == 0) 608 if (weapon->level == 0)
659 { 609 {
660 op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>"); 610 op->failmsg (
611 "This weapon has not been prepared."
612 " H<You first have to prepare a weapon with a prepare weapon scroll.>");
661 return 0; 613 return 0;
662 } 614 }
663 615
664 if (weapon->level == weapon->last_eat && weapon->item_power >= 100) 616 if (weapon->last_eat >= weapon->level // improvements used up
617 || weapon->item_power >= 100) // or item_power >= arbitrary limit of 100
665 { 618 {
666 op->failmsg ("This weapon cannot be improved any more."); 619 op->failmsg ("This weapon cannot be improved any more.");
667 return 0; 620 return 0;
668 } 621 }
669 622
670 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1)) 623 if (QUERY_FLAG (weapon, FLAG_APPLIED)
624 && !check_item_power (op, weapon->item_power + 1))
671 { 625 {
672 op->failmsg ("Improving the weapon will make it too " 626 op->failmsg ("Improving the weapon will make it too "
673 "powerful for you to use. Unready it if you " 627 "powerful for you to use. Unready it if you "
674 "really want to improve it."); 628 "really want to improve it.");
675 return 0; 629 return 0;
904 * Takes one type of items and makes another. 858 * Takes one type of items and makes another.
905 * converter is the object that is doing the conversion. 859 * converter is the object that is doing the conversion.
906 * item is the object that triggered the converter - if it is not 860 * item is the object that triggered the converter - if it is not
907 * what the converter wants, this will not do anything. 861 * what the converter wants, this will not do anything.
908 */ 862 */
909static int 863int
910convert_item (object *item, object *converter) 864convert_item (object *item, object *converter)
911{ 865{
912 sint64 nr, price_in; 866 sint64 nr, price_in;
913 867
914 if (item->flag [FLAG_UNPAID]) 868 if (item->flag [FLAG_UNPAID])
1054 } 1008 }
1055 1009
1056 // already applied == open on ground, or open in inv, or active in inv 1010 // already applied == open on ground, or open in inv, or active in inv
1057 if (sack->flag [FLAG_APPLIED]) 1011 if (sack->flag [FLAG_APPLIED])
1058 { 1012 {
1059 if (op->container == sack) 1013 if (op->container_ () == sack)
1060 { 1014 {
1061 // open on ground or inv, so close 1015 // open on ground or inv, so close
1062 op->close_container (); 1016 op->close_container ();
1063 return 1; 1017 return 1;
1064 } 1018 }
1107{ 1061{
1108 /* Only players can make sacrifices on spell casting altars. */ 1062 /* Only players can make sacrifices on spell casting altars. */
1109 if (altar->inv && (!originator || originator->type != PLAYER)) 1063 if (altar->inv && (!originator || originator->type != PLAYER))
1110 return 0; 1064 return 0;
1111 1065
1112 if (operate_altar (altar, &sacrifice)) 1066 if (operate_altar (altar, &sacrifice, originator))
1113 { 1067 {
1114 /* Simple check. Unfortunately, it means you can't cast magic bullet 1068 /* Simple check. Unfortunately, it means you can't cast magic bullet
1115 * with an altar. We call it a Potion - altars are stationary - it 1069 * with an altar. We call it a Potion - altars are stationary - it
1116 * is up to map designers to use them properly. 1070 * is up to map designers to use them properly.
1117 */ 1071 */
1126/* push_button (altar);*/ 1080/* push_button (altar);*/
1127 } 1081 }
1128 else 1082 else
1129 { 1083 {
1130 altar->value = 1; /* works only once */ 1084 altar->value = 1; /* works only once */
1131 push_button (altar); 1085 push_button (altar, originator);
1132 } 1086 }
1133 1087
1134 return !sacrifice; 1088 return !sacrifice;
1135 } 1089 }
1136 else 1090 else
1153 1107
1154 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1108 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1155 1109
1156 bool has_unpaid = false; 1110 bool has_unpaid = false;
1157 1111
1158 // quite inefficient to do this here twice, but the api doesn'T lend itself to 1112 // quite inefficient to do this here twice, but the api doesn't lend itself to
1159 // a quick and small change :( 1113 // a quick and small change :(
1160 for (object::depth_iterator item = op->begin (); item != op->end (); ++item) 1114 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1161 if (item->flag [FLAG_UNPAID]) 1115 if (item->flag [FLAG_UNPAID])
1162 { 1116 {
1163 has_unpaid = true; 1117 has_unpaid = true;
1263 * Handles applying a sign. 1217 * Handles applying a sign.
1264 */ 1218 */
1265static void 1219static void
1266apply_sign (object *op, object *sign, int autoapply) 1220apply_sign (object *op, object *sign, int autoapply)
1267{ 1221{
1222 if (!op->is_player())
1223 return;
1224
1268 if (sign->has_dialogue ()) 1225 if (sign->has_dialogue ())
1269 { 1226 {
1270 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name)); 1227 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1271 return; 1228 return;
1272 } 1229 }
1368 return; 1325 return;
1369 1326
1370 /* move_apply() is the most likely candidate for causing unwanted and 1327 /* move_apply() is the most likely candidate for causing unwanted and
1371 * possibly unlimited recursion. 1328 * possibly unlimited recursion.
1372 */ 1329 */
1373 /* The following was changed because it was causing perfeclty correct 1330 /* The following was changed because it was causing perfectly correct
1374 * maps to fail. 1) it's not an error to recurse: 1331 * maps to fail. 1) it's not an error to recurse:
1375 * rune detonates, summoning monster. monster lands on nearby rune. 1332 * rune detonates, summoning monster. monster lands on nearby rune.
1376 * nearby rune detonates. This sort of recursion is expected and 1333 * nearby rune detonates. This sort of recursion is expected and
1377 * proper. This code was causing needless crashes. 1334 * proper. This code was causing needless crashes.
1378 */ 1335 */
1385 1342
1386 recursion_depth++; 1343 recursion_depth++;
1387 if (trap->head) 1344 if (trap->head)
1388 trap = trap->head; 1345 trap = trap->head;
1389 1346
1390 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1347 if (!INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
1391 goto leave;
1392
1393 switch (trap->type) 1348 switch (trap->type)
1394 { 1349 {
1395 case PLAYERMOVER: 1350 case PLAYERMOVER:
1396 if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim)) 1351 if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim))
1352 {
1353 if (!trap->stats.maxsp)
1354 trap->stats.maxsp = 2;
1355
1356 /* Is this correct? From the docs, it doesn't look like it
1357 * should be divided by trap->speed
1358 */
1359 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed);
1360
1361 /* Just put in some sanity check. I think there is a bug in the
1362 * above with some objects have zero speed, and thus the player
1363 * getting permanently paralyzed.
1364 */
1365 if (victim->speed_left < -50.f)
1366 victim->speed_left = -50.f;
1367 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1368 }
1369 break;
1370
1371 case SPINNER:
1372 if (victim->direction)
1373 {
1374 victim->direction = absdir (victim->direction - trap->stats.sp);
1375 update_turn_face (victim);
1376 }
1377 break;
1378
1379 case DIRECTOR:
1380 if (victim->direction && !should_director_abort (trap, victim))
1381 {
1382 victim->direction = trap->stats.sp;
1383 update_turn_face (victim);
1384 }
1385 break;
1386
1387 case BUTTON:
1388 case PEDESTAL:
1389 case T_MATCH:
1390 update_button (trap, originator);
1391 break;
1392
1393 case ALTAR:
1394 /* sacrifice victim on trap */
1395 apply_altar (trap, victim, originator);
1396 break;
1397
1398 case THROWN_OBJ:
1399 if (trap->inv == NULL)
1400 break;
1401 /* fallthrough */
1402
1403 case ARROW:
1404 /* bad bug: monster throw a object, make a step forwards, step on object ,
1405 * trigger this here and get hit by own missile - and will be own enemy.
1406 * Victim then is his own enemy and will start to kill herself (this is
1407 * removed) but we have not synced victim and his missile. To avoid senseless
1408 * action, we avoid hits here
1409 */
1410 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
1411 hit_with_arrow (trap, victim);
1412 break;
1413
1414 case SPELL_EFFECT:
1415 apply_spell_effect (trap, victim);
1416 break;
1417
1418 case TRAPDOOR:
1397 { 1419 {
1420 int max, sound_was_played;
1421 object *ab, *ab_next;
1422
1398 if (!trap->stats.maxsp) 1423 if (!trap->value)
1399 trap->stats.maxsp = 2; 1424 {
1425 int tot;
1400 1426
1401 /* Is this correct? From the docs, it doesn't look like it 1427 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1402 * should be divided by trap->speed 1428 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1429 tot += ab->head_ ()->total_weight ();
1430
1431 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1432 break;
1433
1434 SET_ANIMATION (trap, trap->value);
1435 update_object (trap, UP_OBJ_FACE);
1436 }
1437
1438 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next)
1439 {
1440 /* need to set this up, since if we do transfer the object,
1441 * ab->above would be bogus
1403 */ 1442 */
1404 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed); 1443 ab_next = ab->above;
1405 1444
1406 /* Just put in some sanity check. I think there is a bug in the 1445 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1407 * above with some objects have zero speed, and thus the player 1446 {
1408 * getting permanently paralyzed. 1447 if (!sound_was_played)
1448 {
1449 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1450 sound_was_played = 1;
1451 }
1452
1453 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1454 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1455 }
1409 */ 1456 }
1410 if (victim->speed_left < -50.f) 1457 break;
1411 victim->speed_left = -50.f;
1412 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1413 } 1458 }
1414 goto leave;
1415 1459
1416 case SPINNER: 1460 case CONVERTER:
1417 if (victim->direction) 1461 if (convert_item (victim, trap) < 0)
1418 {
1419 victim->direction = absdir (victim->direction - trap->stats.sp);
1420 update_turn_face (victim);
1421 }
1422 goto leave;
1423
1424 case DIRECTOR:
1425 if (victim->direction && !should_director_abort (trap, victim))
1426 {
1427 victim->direction = trap->stats.sp;
1428 update_turn_face (victim);
1429 }
1430 goto leave;
1431
1432 case BUTTON:
1433 case PEDESTAL:
1434 update_button (trap);
1435 goto leave;
1436
1437 case ALTAR:
1438 /* sacrifice victim on trap */
1439 apply_altar (trap, victim, originator);
1440 goto leave;
1441
1442 case THROWN_OBJ:
1443 if (trap->inv == NULL)
1444 goto leave;
1445 /* fallthrough */
1446
1447 case ARROW:
1448 /* bad bug: monster throw a object, make a step forwards, step on object ,
1449 * trigger this here and get hit by own missile - and will be own enemy.
1450 * Victim then is his own enemy and will start to kill herself (this is
1451 * removed) but we have not synced victim and his missile. To avoid senseless
1452 * action, we avoid hits here
1453 */
1454 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
1455 hit_with_arrow (trap, victim);
1456 goto leave;
1457
1458 case SPELL_EFFECT:
1459 apply_spell_effect (trap, victim);
1460 goto leave;
1461
1462 case TRAPDOOR:
1463 {
1464 int max, sound_was_played;
1465 object *ab, *ab_next;
1466
1467 if (!trap->value)
1468 { 1462 {
1469 int tot; 1463 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1470 1464 archetype::get (shstr_burnout)->insert_at (trap, trap);
1471 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1472 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1473 tot += ab->head_ ()->total_weight ();
1474
1475 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1476 goto leave;
1477
1478 SET_ANIMATION (trap, trap->value);
1479 update_object (trap, UP_OBJ_FACE);
1480 } 1465 }
1481 1466
1482 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next) 1467 break;
1468
1469 case TRIGGER_BUTTON:
1470 case TRIGGER_PEDESTAL:
1471 case TRIGGER_ALTAR:
1472 check_trigger (trap, victim, originator);
1473 break;
1474
1475 case DEEP_SWAMP:
1476 walk_on_deep_swamp (trap, victim);
1477 break;
1478
1479 case CHECK_INV:
1480 check_inv (victim, trap);
1481 break;
1482
1483 case HOLE:
1484 move_apply_hole (trap, victim);
1485 break;
1486
1487 case EXIT:
1488 if (victim->type == PLAYER && EXIT_PATH (trap))
1483 { 1489 {
1484 /* need to set this up, since if we do transfer the object, 1490 /* Basically, don't show exits leading to random maps the
1485 * ab->above would be bogus 1491 * players output.
1486 */ 1492 */
1487 ab_next = ab->above; 1493 if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
1494 victim->statusmsg (trap->msg, NDI_NAVY);
1488 1495
1489 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1496 trap->play_sound (trap->sound);
1490 { 1497 victim->enter_exit (trap);
1491 if (!sound_was_played)
1492 {
1493 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1494 sound_was_played = 1;
1495 }
1496
1497 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1498 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1499 }
1500 } 1498 }
1501 goto leave; 1499 break;
1502 }
1503 1500
1504 case CONVERTER:
1505 if (convert_item (victim, trap) < 0)
1506 {
1507 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1508 archetype::get (shstr_burnout)->insert_at (trap, trap);
1509 }
1510
1511 goto leave;
1512
1513 case TRIGGER_BUTTON:
1514 case TRIGGER_PEDESTAL:
1515 case TRIGGER_ALTAR:
1516 check_trigger (trap, victim);
1517 goto leave;
1518
1519 case DEEP_SWAMP:
1520 walk_on_deep_swamp (trap, victim);
1521 goto leave;
1522
1523 case CHECK_INV:
1524 check_inv (victim, trap);
1525 goto leave;
1526
1527 case HOLE:
1528 move_apply_hole (trap, victim);
1529 goto leave;
1530
1531 case EXIT:
1532 if (victim->type == PLAYER && EXIT_PATH (trap))
1533 {
1534 /* Basically, don't show exits leading to random maps the
1535 * players output.
1536 */
1537 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1538 victim->statusmsg (trap->msg, NDI_NAVY);
1539
1540 trap->play_sound (trap->sound);
1541 victim->enter_exit (trap);
1542 }
1543 goto leave;
1544
1545 case ENCOUNTER: 1501 case ENCOUNTER:
1546 /* may be some leftovers on this */ 1502 /* may be some leftovers on this */
1547 goto leave; 1503 break;
1548 1504
1549 case SHOP_MAT: 1505 case SHOP_MAT:
1550 apply_shop_mat (trap, victim); 1506 apply_shop_mat (trap, victim);
1551 goto leave; 1507 break;
1552 1508
1553 /* Drop a certain amount of gold, and have one item identified */ 1509 /* Drop a certain amount of gold, and have one item identified */
1554 case IDENTIFY_ALTAR: 1510 case IDENTIFY_ALTAR:
1555 apply_id_altar (victim, trap, originator); 1511 apply_id_altar (victim, trap, originator);
1556 goto leave; 1512 break;
1557 1513
1558 case SIGN: 1514 case SIGN:
1559 if (victim->type != PLAYER && trap->stats.food > 0) 1515 if (victim->type != PLAYER && trap->stats.food > 0)
1560 goto leave; /* monsters musn't apply magic_mouths with counters */ 1516 break; /* monsters musn't apply magic_mouths with counters */
1561 1517
1562 apply_sign (victim, trap, 1); 1518 apply_sign (victim, trap, 1);
1563 goto leave; 1519 break;
1564 1520
1565 case CONTAINER: 1521 case CONTAINER:
1566 apply_container (victim, trap); 1522 apply_container (victim, trap);
1567 goto leave; 1523 break;
1568 1524
1569 case RUNE: 1525 case RUNE:
1570 case TRAP: 1526 case TRAP:
1571 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1527 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1572 spring_trap (trap, victim); 1528 spring_trap (trap, victim);
1573 goto leave; 1529 break;
1574 1530
1575 default: 1531 default:
1576 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1532 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1577 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type); 1533 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1578 goto leave; 1534 break;
1579 } 1535 }
1580 1536
1581leave:
1582 recursion_depth--; 1537 recursion_depth--;
1583} 1538}
1584 1539
1585/** 1540/**
1586 * Handles reading a regular (ie not containing a spell) book. 1541 * Handles reading a regular (ie not containing a spell) book.
1597 return; 1552 return;
1598 } 1553 }
1599 1554
1600 if (!tmp->msg) 1555 if (!tmp->msg)
1601 { 1556 {
1602 op->failmsg (format ("You open the %s and find it empty.", &tmp->name)); 1557 op->failmsg (format ("The %s contains nothing but meaningless gibberish. H<There is nothing interesting to read here.>", &tmp->name));
1603 return; 1558 return;
1604 } 1559 }
1605 1560
1606 /* need a literacy skill to read stuff! */ 1561 /* need a literacy skill to read stuff! */
1607 skill_ob = find_skill_by_name (op, tmp->skill); 1562 skill_ob = find_skill_by_name (op, tmp->skill);
1789 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1744 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1790 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!"); 1745 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1791 return; 1746 return;
1792 } 1747 }
1793 1748
1794 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1749 int learn_level = sqrtf (spell->level) * 1.5f;
1750 if (skop->level < learn_level)
1795 { 1751 {
1796 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill)); 1752 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>",
1753 &tmp->skill, learn_level));
1797 return; 1754 return;
1798 } 1755 }
1799 1756
1800 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name)); 1757 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1801 1758
2348 2305
2349 return 0; 2306 return 0;
2350} 2307}
2351 2308
2352/** 2309/**
2310 * This function will try to apply a lighter and in case no lighter
2311 * is specified it will try to find a lighter in the players inventory,
2312 * and inform him about this requirement.
2313 *
2314 * who - the player
2315 * op - the item we want to light
2316 * lighter - the lighter or 0 if a lighter has yet to be found
2317 */
2318static object *
2319auto_apply_lighter (object *who, object *op, object *lighter)
2320{
2321 if (lighter == 0)
2322 {
2323 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2324 {
2325 if (tmp->type == LIGHTER)
2326 {
2327 lighter = tmp;
2328 break;
2329 }
2330 }
2331
2332 if (!lighter)
2333 {
2334 who->failmsg (format (
2335 "You can't light up the %s with your bare hands! "
2336 "H<You need a lighter in your inventory, for example a flint and steel.>",
2337 &op->name));
2338 return 0;
2339 }
2340 }
2341
2342 // last_eat == 0 means the lighter is not being used up!
2343 if (lighter->last_eat && lighter->stats.food)
2344 {
2345 /* lighter gets used up */
2346 lighter = lighter->split ();
2347 lighter->stats.food--;
2348 who->insert (lighter);
2349 }
2350 else if (lighter->last_eat)
2351 {
2352 /* no charges left in lighter */
2353 who->failmsg (format (
2354 "You attempt to light the %s with a used up %s.",
2355 &op->name, &lighter->name));
2356 return 0;
2357 }
2358
2359 return lighter;
2360}
2361
2362/**
2363 * Designed primarily to light torches/lanterns/etc.
2364 * Also burns up burnable material too. First object in the inventory is
2365 * the selected object to "burn". -b.t.
2366 */
2367void
2368apply_lighter (object *who, object *lighter)
2369{
2370 object *item;
2371 int is_player_env = 0;
2372
2373 item = find_marked_object (who);
2374 if (item)
2375 {
2376 if (!auto_apply_lighter (who, item, lighter))
2377 return;
2378
2379 /* Perhaps we should split what we are trying to light on fire?
2380 * I can't see many times when you would want to light multiple
2381 * objects at once.
2382 */
2383
2384 save_throw_object (item, AT_FIRE, who);
2385
2386 if (item->destroyed ()
2387 || ((item->type == LAMP || item->type == TORCH)
2388 && item->glow_radius > 0))
2389 who->statusmsg (format (
2390 "You light the %s with the %s.",
2391 &item->name, &lighter->name));
2392 else
2393 who->failmsg (format (
2394 "You attempt to light the %s with the %s and fail.",
2395 &item->name, &lighter->name));
2396 }
2397 else
2398 who->failmsg ("You need to mark a lightable object.");
2399}
2400
2401/**
2402 * This function generates a cursed effect for cursed lamps and torches.
2403 */
2404void player_apply_lamp_cursed_effect (object *who, object *op)
2405{
2406 if (op->level)
2407 {
2408 who->failmsg (format (
2409 "The %s was cursed, it explodes in a big fireball!",
2410 &op->name));
2411 create_exploding_ball_at (who, op->level);
2412 }
2413 else
2414 {
2415 who->failmsg (format (
2416 "The %s was cursed, it crumbles to dust, at least it didn't explode.!",
2417 &op->name));
2418 }
2419
2420 op->destroy ();
2421}
2422
2423/**
2424 * Apply for players and lamps
2425 *
2426 * who - the player
2427 * op - the lamp
2428 */
2429void player_apply_lamp (object *who, object *op)
2430{
2431 bool switch_on = op->glow_radius ? false : true;
2432
2433 if (switch_on)
2434 {
2435 object *lighter = 0;
2436
2437 if (op->flag [FLAG_IS_LIGHTABLE]
2438 && !(lighter = auto_apply_lighter (who, op, 0)))
2439 return;
2440
2441 if (op->stats.food < 1)
2442 {
2443 if (op->type == LAMP)
2444 who->failmsg (format (
2445 "The %s is out of fuel! "
2446 "H<Lamps and similar items need fuel. They cannot be refilled.>",
2447 &op->name));
2448 else
2449 who->failmsg (format (
2450 "The %s is burnt out! "
2451 "H<Torches and similar items burn out and become worthless.>",
2452 &op->name));
2453 return;
2454 }
2455
2456 if (op->flag [FLAG_CURSED])
2457 {
2458 player_apply_lamp_cursed_effect (who, op);
2459 return;
2460 }
2461
2462 if (lighter)
2463 who->statusmsg (format (
2464 "You light up the %s with the %s.", &op->name, &lighter->name));
2465 else
2466 who->statusmsg (format ("You light up the %s.", &op->name));
2467 }
2468 else
2469 {
2470 if (op->flag [FLAG_CURSED])
2471 {
2472 player_apply_lamp_cursed_effect (who, op);
2473 return;
2474 }
2475
2476 if (op->type == TORCH)
2477 {
2478 if (!op->flag [FLAG_IS_LIGHTABLE])
2479 {
2480 who->statusmsg (format (
2481 "You put out the %s. "
2482 "H<The %s can't be used anymore, as it can't be lighted up again.>",
2483 &op->name, &op->name));
2484 }
2485 else
2486 who->statusmsg (format (
2487 "You put out the %s."
2488 "H<Torches wear out if you put them out.>",
2489 &op->name));
2490 }
2491 else
2492 who->statusmsg (format ("You turn off the %s.", &op->name));
2493 }
2494
2495 apply_lamp (op, switch_on);
2496}
2497
2498void get_animation_from_arch (object *op, arch_ptr a)
2499{
2500 op->animation_id = a->animation_id;
2501 op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE];
2502 op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE];
2503 op->anim_speed = a->anim_speed;
2504 op->last_anim = 0;
2505 op->state = 0;
2506 op->face = a->face;
2507
2508 if (NUM_ANIMATIONS(op) > 1)
2509 {
2510 SET_ANIMATION(op, 0);
2511 animate_object (op, op->direction);
2512 }
2513 else
2514 update_object (op, UP_OBJ_FACE);
2515}
2516
2517/**
2518 * Apply for LAMPs and TORCHes.
2519 *
2520 * op - the lamp
2521 * switch_on - a flag which says whether the lamp should be switched on or off
2522 */
2523void apply_lamp (object *op, bool switch_on)
2524{
2525 op->set_glow_radius (switch_on ? op->range : 0);
2526 op->set_speed (switch_on ? op->arch->speed : 0);
2527
2528 // torches wear out if you put them out
2529 if (op->type == TORCH && !switch_on)
2530 {
2531 if (op->flag [FLAG_IS_LIGHTABLE])
2532 {
2533 op->stats.food -= (double) op->arch->stats.food / 15;
2534 if (op->stats.food < 0)
2535 op->stats.food = 0;
2536 }
2537 else
2538 op->stats.food = 0;
2539 }
2540
2541 // lamps and torched get worthless when used up
2542 if (op->stats.food <= 0)
2543 op->value = 0;
2544
2545 // FIXME: This is a hack to make the more sane torches and lamps
2546 // still animated ;-/
2547 if (op->other_arch)
2548 get_animation_from_arch (op, switch_on ? op->other_arch : op->arch);
2549
2550 if (object *pl = op->visible_to ())
2551 esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op);
2552}
2553
2554/**
2353 * Main apply handler. 2555 * Main apply handler.
2354 * 2556 *
2355 * Checks for unpaid items before applying. 2557 * Checks for unpaid items before applying.
2356 * 2558 *
2357 * Return value: 2559 * Return value:
2358 * 0: player or monster can't apply objects of that type 2560 * 0: player or monster can't apply objects of that type
2359 * 1: has been applied, or there was an error applying the object 2561 * 1: has been applied, or there was an error applying the object
2360 * 2: objects of that type can't be applied if not in inventory 2562 * 2: objects of that type can't be applied if not in inventory
2361 * 2563 *
2362 * op is the object that is causing object to be applied, tmp is the object 2564 * who is the object that is causing object to be applied, op is the object
2363 * being applied. 2565 * being applied.
2364 * 2566 *
2365 * aflag is special (always apply/unapply) flags. Nothing is done with 2567 * aflag is special (always apply/unapply) flags. Nothing is done with
2366 * them in this function - they are passed to apply_special 2568 * them in this function - they are passed to apply_special
2367 */ 2569 */
2368int 2570int
2369manual_apply (object *op, object *tmp, int aflag) 2571manual_apply (object *who, object *op, int aflag)
2370{ 2572{
2371 tmp = tmp->head_ (); 2573 op = op->head_ ();
2372 2574
2373 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2575 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
2374 { 2576 {
2375 if (op->type == PLAYER) 2577 if (who->type == PLAYER)
2376 { 2578 {
2579 examine (who, op);
2377 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>"); 2580 //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
2378 return 1; 2581 return 1;
2379 } 2582 }
2380 else 2583 else
2381 return 0; /* monsters just skip unpaid items */ 2584 return 0; /* monsters just skip unpaid items */
2382 } 2585 }
2383 2586
2384 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2587 if (INVOKE_OBJECT (APPLY, op, ARG_OBJECT (who)))
2385 return RESULT_INT (0); 2588 return RESULT_INT (0);
2386 2589
2387 switch (tmp->type) 2590 switch (op->type)
2388 { 2591 {
2389 case CF_HANDLE: 2592 case T_HANDLE:
2390 op->play_sound (sound_find ("turn_handle")); 2593 who->play_sound (sound_find ("turn_handle"));
2391 op->statusmsg ("You turn the handle."); 2594 who->statusmsg ("You turn the handle.");
2392 tmp->value = tmp->value ? 0 : 1; 2595 op->value = op->value ? 0 : 1;
2393 SET_ANIMATION (tmp, tmp->value); 2596 SET_ANIMATION (op, op->value);
2394 update_object (tmp, UP_OBJ_FACE); 2597 update_object (op, UP_OBJ_FACE);
2395 push_button (tmp); 2598 push_button (op, who);
2396 return 1; 2599 return 1;
2397 2600
2398 case TRIGGER: 2601 case TRIGGER:
2399 if (check_trigger (tmp, op)) 2602 if (check_trigger (op, who, who))
2400 { 2603 {
2401 op->statusmsg ("You turn the handle."); 2604 who->statusmsg ("You turn the handle.");
2402 op->play_sound (sound_find ("turn_handle")); 2605 who->play_sound (sound_find ("turn_handle"));
2403 } 2606 }
2404 else 2607 else
2405 op->failmsg ("The handle doesn't move."); 2608 who->failmsg ("The handle doesn't move.");
2406 2609
2407 return 1; 2610 return 1;
2408 2611
2409 case EXIT: 2612 case EXIT:
2410 if (op->type != PLAYER) 2613 if (who->type != PLAYER)
2411 return 0; 2614 return 0;
2412 2615
2413 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2616 if (!EXIT_PATH (op) || !is_legal_2ways_exit (who, op))
2414 op->failmsg (format ("The %s is closed.", query_name (tmp))); 2617 who->failmsg (format ("The %s is closed. H<And will stay closed, until somebody fires up the map editor and adds it.>", query_name (op)));
2415 else 2618 else
2416 { 2619 {
2417 /* Don't display messages for random maps. */ 2620 /* Don't display messages for random maps. */
2418 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2621 if (op->msg && !EXIT_PATH (op).starts_with ("/!"))
2419 op->statusmsg (tmp->msg, NDI_NAVY); 2622 who->statusmsg (op->msg, NDI_NAVY);
2420 2623
2421 op->enter_exit (tmp); 2624 who->enter_exit (op);
2422 } 2625 }
2423 2626
2424 return 1; 2627 return 1;
2425 2628
2426 case INSCRIBABLE: 2629 case INSCRIBABLE:
2427 op->statusmsg (tmp->msg); 2630 who->statusmsg (op->msg);
2428 // maybe show a spell menu to chose from or something like that 2631 // maybe show a spell menu to chose from or something like that
2429 return 1; 2632 return 1;
2430 2633
2431 case SIGN: 2634 case SIGN:
2432 apply_sign (op, tmp, 0); 2635 apply_sign (who, op, 0);
2433 return 1; 2636 return 1;
2434 2637
2435 case BOOK: 2638 case BOOK:
2436 if (op->type == PLAYER) 2639 if (who->type == PLAYER)
2437 { 2640 {
2438 apply_book (op, tmp); 2641 apply_book (who, op);
2439 return 1; 2642 return 1;
2440 } 2643 }
2441 else 2644 else
2442 return 0; 2645 return 0;
2443 2646
2444 case SKILLSCROLL: 2647 case SKILLSCROLL:
2445 if (op->type == PLAYER) 2648 if (who->type == PLAYER)
2446 { 2649 {
2447 apply_skillscroll (op, tmp); 2650 apply_skillscroll (who, op);
2448 return 1; 2651 return 1;
2449 } 2652 }
2450 else 2653 else
2451 return 0; 2654 return 0;
2452 2655
2453 case SPELLBOOK: 2656 case SPELLBOOK:
2454 if (op->type == PLAYER) 2657 if (who->type == PLAYER)
2455 { 2658 {
2456 apply_spellbook (op, tmp); 2659 apply_spellbook (who, op);
2457 return 1; 2660 return 1;
2458 } 2661 }
2459 else 2662 else
2460 return 0; 2663 return 0;
2461 2664
2462 case SCROLL: 2665 case SCROLL:
2463 apply_scroll (op, tmp, 0); 2666 apply_scroll (who, op, 0);
2464 return 1; 2667 return 1;
2465 2668
2466 case POTION: 2669 case POTION:
2467 apply_potion (op, tmp); 2670 apply_potion (who, op);
2468 return 1; 2671 return 1;
2469 2672
2470 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2673 /* Eneq(@csd.uu.se): Handle apply on containers. */
2471 //TODO: remove, as it is unsed? 2674 //TODO: remove, as it is unsed?
2472 case CLOSE_CON: 2675 case CLOSE_CON:
2473 apply_container (op, tmp->env); 2676 apply_container (who, op->env);
2474 return 1; 2677 return 1;
2475 2678
2476 case CONTAINER: 2679 case CONTAINER:
2477 apply_container (op, tmp); 2680 apply_container (who, op);
2478 return 1; 2681 return 1;
2479 2682
2480 case TREASURE: 2683 case TREASURE:
2481 if (op->type == PLAYER) 2684 if (who->type == PLAYER)
2482 { 2685 {
2483 apply_treasure (op, tmp); 2686 apply_treasure (who, op);
2484 return 1; 2687 return 1;
2485 } 2688 }
2486 else 2689 else
2487 return 0; 2690 return 0;
2691
2692 case LAMP:
2693 case TORCH:
2694 player_apply_lamp (who, op);
2695 return 1;
2488 2696
2489 case WEAPON: 2697 case WEAPON:
2490 case ARMOUR: 2698 case ARMOUR:
2491 case BOOTS: 2699 case BOOTS:
2492 case GLOVES: 2700 case GLOVES:
2500 case WAND: 2708 case WAND:
2501 case ROD: 2709 case ROD:
2502 case HORN: 2710 case HORN:
2503 case SKILL: 2711 case SKILL:
2504 case BOW: 2712 case BOW:
2505 case LAMP:
2506 case BUILDER: 2713 case BUILDER:
2507 case SKILL_TOOL: 2714 case SKILL_TOOL:
2508 if (tmp->env != op) 2715 if (op->env != who)
2509 return 2; /* not in inventory */ 2716 return 2; /* not in inventory */
2510 2717
2511 apply_special (op, tmp, aflag); 2718 apply_special (who, op, aflag);
2512 return 1; 2719 return 1;
2513 2720
2514 case DRINK: 2721 case DRINK:
2515 case FOOD: 2722 case FOOD:
2516 case FLESH: 2723 case FLESH:
2517 apply_food (op, tmp); 2724 apply_food (who, op);
2518 return 1; 2725 return 1;
2519 2726
2520 case POISON: 2727 case POISON:
2521 apply_poison (op, tmp); 2728 apply_poison (who, op);
2522 return 1; 2729 return 1;
2523 2730
2524 case SAVEBED: 2731 case SAVEBED:
2525 return 1; 2732 return 1;
2526 2733
2527 case ARMOUR_IMPROVER: 2734 case ARMOUR_IMPROVER:
2528 if (op->type == PLAYER) 2735 if (who->type == PLAYER)
2529 { 2736 {
2530 apply_armour_improver (op, tmp); 2737 apply_armour_improver (who, op);
2531 return 1; 2738 return 1;
2532 } 2739 }
2533 else 2740 else
2534 return 0; 2741 return 0;
2535 2742
2536 case WEAPON_IMPROVER: 2743 case WEAPON_IMPROVER:
2537 check_improve_weapon (op, tmp); 2744 check_improve_weapon (who, op);
2538 return 1; 2745 return 1;
2539 2746
2540 case CLOCK: 2747 case CLOCK:
2541 if (op->type == PLAYER) 2748 if (who->type == PLAYER)
2542 { 2749 {
2543 char buf[MAX_BUF]; 2750 char buf[MAX_BUF];
2544 timeofday_t tod; 2751 timeofday_t tod;
2545 2752
2546 get_tod (&tod); 2753 get_tod (&tod);
2547 op->play_sound (sound_find ("sound_clock")); 2754 who->play_sound (sound_find ("sound_clock"));
2548 op->statusmsg (format ( 2755 who->statusmsg (format (
2549 "It is %d minute%s past %d o'clock %s", 2756 "It is %d minute%s past %d o'clock %s",
2550 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2757 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2551 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am") 2758 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2552 )); 2759 ));
2553 return 1; 2760 return 1;
2554 } 2761 }
2555 else 2762 else
2556 return 0; 2763 return 0;
2557 2764
2558 case MENU: 2765 case MENU:
2559 if (op->type == PLAYER) 2766 if (who->type == PLAYER)
2560 { 2767 {
2561 shop_listing (tmp, op); 2768 shop_listing (op, who);
2562 return 1; 2769 return 1;
2563 } 2770 }
2564 else 2771 else
2565 return 0; 2772 return 0;
2566 2773
2567 case POWER_CRYSTAL: 2774 case POWER_CRYSTAL:
2568 apply_power_crystal (op, tmp); /* see egoitem.c */ 2775 apply_power_crystal (who, op); /* see egoitem.c */
2569 return 1; 2776 return 1;
2570 2777
2571 case LIGHTER: /* for lighting torches/lanterns/etc */ 2778 case LIGHTER: /* for lighting torches/lanterns/etc */
2572 if (op->type == PLAYER) 2779 if (who->type == PLAYER)
2573 { 2780 {
2574 apply_lighter (op, tmp); 2781 apply_lighter (who, op);
2575 return 1; 2782 return 1;
2576 } 2783 }
2577 else 2784 else
2578 return 0; 2785 return 0;
2579 2786
2580 case ITEM_TRANSFORMER: 2787 case ITEM_TRANSFORMER:
2581 apply_item_transformer (op, tmp); 2788 apply_item_transformer (who, op);
2582 return 1; 2789 return 1;
2583 2790
2584 default: 2791 default:
2585 return 0; 2792 return 0;
2586 } 2793 }
2638 * we don't use a corrupt pointer for the next object, so we get the 2845 * we don't use a corrupt pointer for the next object, so we get the
2639 * next object in the stack before applying. This is can only be a 2846 * next object in the stack before applying. This is can only be a
2640 * problem if player_apply() has a bug in that it uses the object but does 2847 * problem if player_apply() has a bug in that it uses the object but does
2641 * not return a proper value. 2848 * not return a proper value.
2642 */ 2849 */
2643 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next) 2850 for (object *next, *tmp = pl->container_ () ? pl->container_ ()->inv : pl->below; tmp; tmp = next)
2644 { 2851 {
2645 next = tmp->below; 2852 next = tmp->below;
2646 2853
2647 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2854 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2648 floors++; 2855 floors++;
2737 case BRACERS: 2944 case BRACERS:
2738 case CLOAK: 2945 case CLOAK:
2739 who->statusmsg (format ("You unwear %s.", query_name (op))); 2946 who->statusmsg (format ("You unwear %s.", query_name (op)));
2740 change_abil (who, op); 2947 change_abil (who, op);
2741 break; 2948 break;
2742
2743 case LAMP:
2744 {
2745 who->statusmsg (format ("You turn off your %s.", &op->name));
2746
2747 object *tmp2 = arch_to_object (op->other_arch);
2748 tmp2->x = op->x;
2749 tmp2->y = op->y;
2750 tmp2->map = op->map;
2751 tmp2->below = op->below;
2752 tmp2->above = op->above;
2753 tmp2->stats.food = op->stats.food;
2754 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2755
2756 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2757 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2758
2759 op->destroy ();
2760 who->insert (tmp2);
2761 who->update_stats ();
2762
2763 if (who->contr)
2764 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2765 {
2766 who->failmsg ("Oops, it feels deadly cold!");
2767 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2768 }
2769 }
2770
2771 return 1; /* otherwise, an attempt to drop causes problems */
2772 2949
2773 case BOW: 2950 case BOW:
2774 case WAND: 2951 case WAND:
2775 case ROD: 2952 case ROD:
2776 case HORN: 2953 case HORN:
3184 * skill so that the dam and wc get updated 3361 * skill so that the dam and wc get updated
3185 */ 3362 */
3186 who->change_skill (skop); 3363 who->change_skill (skop);
3187 } 3364 }
3188 3365
3189 if (who->type == PLAYER 3366 if (!check_item_power (who, op->item_power))
3190 && op->item_power
3191 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3192 { 3367 {
3193 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER); 3368 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3194 return 1; 3369 return 1;
3195 } 3370 }
3196 3371
3204 return RESULT_INT (0); 3379 return RESULT_INT (0);
3205 3380
3206 switch (op->type) 3381 switch (op->type)
3207 { 3382 {
3208 case WEAPON: 3383 case WEAPON:
3209 if (!check_weapon_power (who, op->last_eat))
3210 {
3211 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3212
3213 if (tmp)
3214 insert_ob_in_ob (tmp, who);
3215
3216 return 1;
3217 }
3218
3219 //TODO: this obviously fails for players using a shorter prefix 3384 //TODO: this obviously fails for players using a shorter prefix
3220 // i.e. "R" can use Ragnarok's sword. 3385 // i.e. "R" can use Ragnarok's sword.
3221 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3386 if (op->level && !op->name.starts_with (who->name))
3222 { 3387 {
3223 /* if the weapon does not have the name as the character, can't use it. */ 3388 /* if the weapon does not have the name as the character, can't use it. */
3224 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3389 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3225 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>"); 3390 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3226 3391
3260 case AMULET: 3425 case AMULET:
3261 SET_FLAG (op, FLAG_APPLIED); 3426 SET_FLAG (op, FLAG_APPLIED);
3262 who->statusmsg (format ("You wear %s.", query_name (op))); 3427 who->statusmsg (format ("You wear %s.", query_name (op)));
3263 change_abil (who, op); 3428 change_abil (who, op);
3264 break; 3429 break;
3265
3266 case LAMP:
3267 if (op->stats.food < 1)
3268 {
3269 who->failmsg (format (
3270 "Your %s is out of fuel! "
3271 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3272 &op->name
3273 ));
3274 return 1;
3275 }
3276
3277 who->statusmsg (format ("You turn on your %s.", &op->name));
3278
3279 tmp2 = arch_to_object (op->other_arch);
3280 tmp2->stats.food = op->stats.food;
3281 SET_FLAG (tmp2, FLAG_APPLIED);
3282
3283 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3284 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3285
3286 who->insert (tmp2);
3287
3288 /* Remove the old lantern */
3289 op->destroy ();
3290
3291 /* insert the portion that was split off */
3292 if (tmp)
3293 who->insert (tmp);
3294
3295 who->update_stats ();
3296
3297 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3298 if (who->type == PLAYER)
3299 {
3300 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright (hrhrhr) idea to apply this cursed or damned item.>");
3301 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3302 }
3303
3304 return 0;
3305 3430
3306 case SKILL_TOOL: 3431 case SKILL_TOOL:
3307 // applying a skill tool also readies the skill 3432 // applying a skill tool also readies the skill
3308 SET_FLAG (op, FLAG_APPLIED); 3433 SET_FLAG (op, FLAG_APPLIED);
3309 3434
3389 } 3514 }
3390 3515
3391 break; 3516 break;
3392 3517
3393 case BOW: 3518 case BOW:
3394 if (!check_weapon_power (who, op->last_eat)) 3519 if (op->level && !op->name.starts_with (who->name))
3395 {
3396 who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3397
3398 if (tmp)
3399 insert_ob_in_ob (tmp, who);
3400
3401 return 1;
3402 }
3403
3404 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3405 { 3520 {
3406 who->failmsg ("The weapon does not recognize you as its owner. " 3521 who->failmsg ("The weapon does not recognize you as its owner. "
3407 "H<Its name indicates that it belongs to somebody else.>"); 3522 "H<Its name indicates that it belongs to somebody else.>");
3408 if (tmp) 3523 if (tmp)
3409 insert_ob_in_ob (tmp, who); 3524 insert_ob_in_ob (tmp, who);
3673 } 3788 }
3674 3789
3675 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 3790 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3676 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 3791 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3677 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3792 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3678 check_trigger (tmp, tmp->above); 3793 check_trigger (tmp, tmp->above, tmp->above);
3679} 3794}
3680 3795
3681/** 3796/**
3682 * Handles player eating food that temporarily changes status (resistances, stats). 3797 * Handles player eating food that temporarily changes status (resistances, stats).
3683 * This used to call cast_change_attr(), but 3798 * This used to call cast_change_attr(), but
3688eat_special_food (object *who, object *food) 3803eat_special_food (object *who, object *food)
3689{ 3804{
3690 object *force; 3805 object *force;
3691 int i, did_one = 0; 3806 int i, did_one = 0;
3692 3807
3693 force = get_archetype (FORCE_NAME); 3808 char buf[64];
3809 snprintf (buf, sizeof(buf), "sp_food_%s", &food->title);
3810 shstr key (buf);
3694 3811
3695 for (i = 0; i < NUM_STATS; i++)
3696 if (sint8 k = food->stats.stat (i))
3697 {
3698 force->stats.stat (i) = k;
3699 did_one = 1;
3700 }
3701
3702 /* check if we can protect the eater */
3703 for (i = 0; i < NROFATTACKS; i++)
3704 {
3705 if (food->resist[i] > 0)
3706 {
3707 force->resist[i] = food->resist[i] / 2;
3708 did_one = 1;
3709 }
3710 }
3711
3712 if (did_one)
3713 {
3714 force->set_speed (0.1);
3715 /* bigger morsel of food = longer effect time */ 3812 /* bigger morsel of food = longer effect time */
3716 force->duration = food->stats.food / 5; 3813 int duration = TIME2TICK (food->stats.food);
3717 SET_FLAG (force, FLAG_APPLIED); 3814
3718 change_abil (who, force); 3815 if (force = who->force_find (key))
3719 insert_ob_in_ob (force, who); 3816 {
3817 if (duration > abs (force->speed_left / force->speed))
3818 {
3819 new_draw_info_format (NDI_UNIQUE, 0, who, "More magical force spreads through you. H<The effect will last for about %.10g more seconds.>", TICK2TIME (duration));
3820 force->force_set_timer (duration);
3821 }
3822 else
3823 new_draw_info (NDI_UNIQUE, 0, who, "It had no additional effect.");
3824
3825 return;
3720 } 3826 }
3721 else 3827 else
3828 {
3829 force = who->force_add (key, duration);
3830 force->name = key;
3831
3832 /* check if the food affects a stat */
3833 for (i = 0; i < NUM_STATS; i++)
3834 if (sint8 k = food->stats.stat (i))
3835 {
3836 force->stats.stat (i) = k;
3837 did_one = 1;
3838 }
3839
3840 /* check if we can protect the eater */
3841 for (i = 0; i < NROFATTACKS; i++)
3842 {
3843 if (food->resist[i] > 0)
3844 {
3845 force->resist[i] = food->resist[i];
3846 did_one = 1;
3847 }
3848 }
3849
3850 if (did_one)
3851 {
3852 new_draw_info_format (NDI_UNIQUE, 0, who, "You are suffused with magical force. H<The effect will last for about %.10g seconds.>", TICK2TIME (duration));
3853
3854 /* make the force take effect and report effects to user */
3855 change_abil (who, force);
3856 }
3857 else
3722 force->destroy (); 3858 force->destroy ();
3859 }
3723 3860
3724 /* check for hp, sp change */ 3861 /* check for hp, sp change */
3725 if (food->stats.hp != 0) 3862 if (food->stats.hp != 0)
3726 { 3863 {
3727 if (QUERY_FLAG (food, FLAG_CURSED)) 3864 if (QUERY_FLAG (food, FLAG_CURSED))
3759 } 3896 }
3760 3897
3761 who->update_stats (); 3898 who->update_stats ();
3762} 3899}
3763 3900
3764/**
3765 * Designed primarily to light torches/lanterns/etc.
3766 * Also burns up burnable material too. First object in the inventory is
3767 * the selected object to "burn". -b.t.
3768 */
3769void
3770apply_lighter (object *who, object *lighter)
3771{
3772 object *item;
3773 int is_player_env = 0;
3774
3775 item = find_marked_object (who);
3776 if (item)
3777 {
3778 if (lighter->last_eat && lighter->stats.food)
3779 { /* lighter gets used up */
3780 object *oneLighter = lighter->split ();
3781 oneLighter->stats.food--;
3782 who->insert (oneLighter);
3783 }
3784 else if (lighter->last_eat)
3785 {
3786 /* no charges left in lighter */
3787 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3788 return;
3789 }
3790
3791 /* Perhaps we should split what we are trying to light on fire?
3792 * I can't see many times when you would want to light multiple
3793 * objects at once.
3794 */
3795
3796 if (who == item->in_player ())
3797 is_player_env = 1;
3798
3799 save_throw_object (item, AT_FIRE, who);
3800
3801 if (item->destroyed ())
3802 {
3803 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3804 /* Need to update the player so that the players glow radius
3805 * gets changed.
3806 */
3807 if (is_player_env)
3808 who->update_stats ();
3809 }
3810 else
3811 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3812 }
3813 else
3814 who->failmsg ("You need to mark a lightable object.");
3815}
3816 3901
3817/** 3902/**
3818 * op made some mistake with a scroll, this takes care of punishment. 3903 * op made some mistake with a scroll, this takes care of punishment.
3819 * scroll_failure()- hacked directly from spell_failure 3904 * scroll_failure()- hacked directly from spell_failure
3820 */ 3905 */
3920 } 4005 }
3921 4006
3922 /* insert the randomitems from the change's treasurelist into 4007 /* insert the randomitems from the change's treasurelist into
3923 * the player ref: player.c 4008 * the player ref: player.c
3924 */ 4009 */
3925 if (change->randomitems != NULL) 4010 if (change->randomitems)
3926 give_initial_items (pl, change->randomitems); 4011 give_initial_items (pl, change->randomitems);
3927 4012
3928 /* set up the face, for some races. */ 4013 /* set up the face, for some races. */
3929 4014
3930 /* first, look for the force object banning 4015 /* first, look for the force object banning
3931 * changing the face. Certain races never change face with class. 4016 * changing the face. Certain races never change face with class.
3932 */ 4017 */
3933 for (walk = pl->inv; walk != NULL; walk = walk->below) 4018 for (walk = pl->inv; walk; walk = walk->below)
3934 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 4019 if (walk->name == shstr_NOCLASSFACECHANGE)
3935 flag_change_face = 0; 4020 flag_change_face = 0;
3936 4021
3937 if (flag_change_face) 4022 if (flag_change_face)
3938 { 4023 {
3939 pl->face = change->face; 4024 pl->face = change->face;
3941 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE]; 4026 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3942 } 4027 }
3943 4028
3944 /* check the special case of can't use weapons */ 4029 /* check the special case of can't use weapons */
3945 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 4030 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3946 if (!strcmp (change->name, "monk")) 4031 if (change->name == shstr_monk)
3947 CLEAR_FLAG (pl, FLAG_USE_WEAPON); 4032 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
3948 4033
3949 break; 4034 break;
3950 } 4035 }
3951 } 4036 }
3988 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 4073 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
3989 return; 4074 return;
3990 } 4075 }
3991 4076
3992 /* check whether they are compatible or not */ 4077 /* check whether they are compatible or not */
3993 find = strstr (marked->slaying, transformer->arch->archname); 4078 find = strstr (&marked->slaying, transformer->arch->archname);
3994 if (!find || (*(find + strlen (transformer->arch->archname)) != ':')) 4079 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
3995 { 4080 {
3996 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 4081 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
3997 return; 4082 return;
3998 } 4083 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines