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.59 by pippijn, Sat Jan 6 14:42:30 2007 UTC vs.
Revision 1.92 by root, Sat May 12 18:23:51 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23*/ 23 */
24
25#include <cmath>
24 26
25#include <global.h> 27#include <global.h>
26#include <living.h> 28#include <living.h>
27#include <spells.h> 29#include <spells.h>
28#include <skills.h> 30#include <skills.h>
… …
30 32
31#include <sproto.h> 33#include <sproto.h>
32 34
33/* Want this regardless of rplay. */ 35/* Want this regardless of rplay. */
34#include <sounds.h> 36#include <sounds.h>
35
36/* need math lib for double-precision and pow() in dragon_eat_flesh() */
37#include <math.h>
38 37
39/** 38/**
40 * Check if op should abort moving victim because of it's race or slaying. 39 * Check if op should abort moving victim because of it's race or slaying.
41 * Returns 1 if it should abort, returns 0 if it should continue. 40 * Returns 1 if it should abort, returns 0 if it should continue.
42 */ 41 */
… …
65 { 64 {
66 arch_flag = 1; 65 arch_flag = 1;
67 name_flag = 1; 66 name_flag = 1;
68 race_flag = 1; 67 race_flag = 1;
69 } 68 }
69
70 /* If the director has race set, only affect objects with a arch, 70 /* If the director has race set, only affect objects with a arch,
71 * name or race that matches. 71 * name or race that matches.
72 */ 72 */
73 if ((op->race) && 73 if ((op->race) &&
74 ((!(victim->arch && arch_flag && victim->arch->name) || strcmp (op->race, victim->arch->name))) && 74 ((!(victim->arch && arch_flag && victim->arch->name) || op->race != victim->arch->name)) &&
75 ((!(victim->name && name_flag) || strcmp (op->race, victim->name))) && 75 ((!(victim->name && name_flag) || op->race != victim->name)) &&
76 ((!(victim->race && race_flag) || strcmp (op->race, victim->race)))) 76 ((!(victim->race && race_flag) || op->race != victim->race)))
77 {
78 return 1; 77 return 1;
79 } 78
80 /* If the director has slaying set, only affect objects where none 79 /* If the director has slaying set, only affect objects where none
81 * of arch, name, or race match. 80 * of arch, name, or race match.
82 */ 81 */
83 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && !strcmp (op->slaying, victim->arch->name))) || 82 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && op->slaying == victim->arch->name))) ||
84 ((victim->name && name_flag && !strcmp (op->slaying, victim->name))) || 83 ((victim->name && name_flag && op->slaying == victim->name)) ||
85 ((victim->race && race_flag && !strcmp (op->slaying, victim->race))))) 84 ((victim->race && race_flag && op->slaying == victim->race)))
86 {
87 return 1; 85 return 1;
88 } 86
89 return 0; 87 return 0;
90} 88}
91 89
92/** 90/**
93 * This handles a player dropping money on an altar to identify stuff. 91 * This handles a player dropping money on an altar to identify stuff.
… …
234 depl = present_arch_in_ob (at, op); 232 depl = present_arch_in_ob (at, op);
235 233
236 if (depl) 234 if (depl)
237 { 235 {
238 for (i = 0; i < NUM_STATS; i++) 236 for (i = 0; i < NUM_STATS; i++)
239 if (get_attr_value (&depl->stats, i)) 237 if (depl->stats.stat (i))
240 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 238 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
241 239
242 depl->destroy (); 240 depl->destroy ();
243 op->update_stats (); 241 op->update_stats ();
244 } 242 }
… …
376 force->stats.food *= 10; 374 force->stats.food *= 10;
377 for (i = 0; i < NROFATTACKS; i++) 375 for (i = 0; i < NROFATTACKS; i++)
378 if (force->resist[i] > 0) 376 if (force->resist[i] > 0)
379 force->resist[i] = -force->resist[i]; /* prot => vuln */ 377 force->resist[i] = -force->resist[i]; /* prot => vuln */
380 } 378 }
379
381 force->speed_left = -1; 380 force->speed_left = -1;
382 force = insert_ob_in_ob (force, op); 381 force = insert_ob_in_ob (force, op);
383 CLEAR_FLAG (tmp, FLAG_APPLIED); 382 CLEAR_FLAG (tmp, FLAG_APPLIED);
384 SET_FLAG (force, FLAG_APPLIED); 383 SET_FLAG (force, FLAG_APPLIED);
385 change_abil (op, force); 384 change_abil (op, force);
… …
422 int count = 0; 421 int count = 0;
423 422
424 423
425 if (item == NULL) 424 if (item == NULL)
426 return 0; 425 return 0;
426
427 op = op->below; 427 op = op->below;
428 while (op != NULL) 428 while (op != NULL)
429 { 429 {
430 if (strcmp (op->arch->name, item) == 0) 430 if (strcmp (op->arch->name, item) == 0)
431 { 431 {
… …
436 count++; 436 count++;
437 else 437 else
438 count += op->nrof; 438 count += op->nrof;
439 } 439 }
440 } 440 }
441
441 op = op->below; 442 op = op->below;
442 } 443 }
444
443 return count; 445 return count;
444} 446}
445 447
446/** 448/**
447 * This removes 'nrof' of what item->slaying says to remove. 449 * This removes 'nrof' of what item->slaying says to remove.
… …
763{ 765{
764 object *otmp; 766 object *otmp;
765 767
766 if (op->type != PLAYER) 768 if (op->type != PLAYER)
767 return 0; 769 return 0;
770
768 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 771 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
769 { 772 {
770 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 773 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
771 return 0; 774 return 0;
772 } 775 }
776
773 otmp = find_marked_object (op); 777 otmp = find_marked_object (op);
774 if (!otmp) 778 if (!otmp)
775 { 779 {
776 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 780 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object.");
777 return 0; 781 return 0;
778 } 782 }
783
779 if (otmp->type != WEAPON && otmp->type != BOW) 784 if (otmp->type != WEAPON && otmp->type != BOW)
780 { 785 {
781 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow"); 786 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow");
782 return 0; 787 return 0;
783 } 788 }
789
784 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 790 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder.");
785 improve_weapon (op, tmp, otmp); 791 improve_weapon (op, tmp, otmp);
786 esrv_send_item (op, otmp); 792 esrv_send_item (op, otmp);
787 return 1; 793 return 1;
788} 794}
… …
1013 * Handle apply on containers. 1019 * Handle apply on containers.
1014 * By Eneq(@csd.uu.se). 1020 * By Eneq(@csd.uu.se).
1015 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 1021 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1016 * added the alchemical cauldron to the code -b.t. 1022 * added the alchemical cauldron to the code -b.t.
1017 */ 1023 */
1018
1019int 1024int
1020apply_container (object *op, object *sack) 1025apply_container (object *op, object *sack)
1021{ 1026{
1022 char buf[MAX_BUF]; 1027 if (op->type != PLAYER || !op->contr->ns)
1023 object *tmp;
1024
1025 if (op->type != PLAYER)
1026 return 0; /* This might change */ 1028 return 0; /* This might change */
1027 1029
1028 if (sack == NULL || sack->type != CONTAINER) 1030 if (!sack || sack->type != CONTAINER)
1029 { 1031 {
1030 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]"); 1032 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1031 return 0; 1033 return 0;
1032 } 1034 }
1033 1035
1034 op->contr->last_used = 0; 1036 op->contr->last_used = 0;
1035 1037
1036 if (sack->env != op) 1038 if (sack->env && sack->env != op)
1039 {
1040 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first.");
1041 return 1;
1037 { 1042 }
1038 if (sack->other_arch == NULL || sack->env != NULL) 1043
1044 // already applied == open on ground, or open in inv, or active in inv
1045 if (sack->flag [FLAG_APPLIED])
1046 {
1047 if (op->container == sack)
1039 { 1048 {
1040 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first."); 1049 // open on ground or inv, so close
1050 op->close_container ();
1041 return 1; 1051 return 1;
1042 } 1052 }
1043 1053 else if (!sack->env)
1044 /* It's on the ground, the problems begin */
1045 if (op->container != sack)
1046 {
1047 /* it's closed OR some player has opened it */
1048 if (QUERY_FLAG (sack, FLAG_APPLIED))
1049 { 1054 {
1050 for (tmp = GET_MAP_OB (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above); 1055 // active, but not ours: some other player has opened it
1051 if (tmp)
1052 {
1053 /* some other player have opened it */
1054 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack)); 1056 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1055 return 1; 1057 return 1;
1056 }
1057 }
1058 }
1059 if (QUERY_FLAG (sack, FLAG_APPLIED))
1060 { 1058 }
1061 if (op->container == NULL)
1062 {
1063 tmp = arch_to_object (sack->other_arch);
1064 /* not good, but insert_ob_in_ob() is too smart */
1065 CLEAR_FLAG (tmp, FLAG_REMOVED);
1066 tmp->x = tmp->y = 0;
1067 tmp->map = NULL;
1068 tmp->env = sack;
1069 if (sack->inv)
1070 sack->inv->above = tmp;
1071 tmp->below = sack->inv;
1072 tmp->above = NULL;
1073 sack->inv = tmp;
1074 sack->move_off = MOVE_ALL; /* trying force closing it */
1075 }
1076 else
1077 {
1078 sack->move_off = 0;
1079 tmp = sack->inv;
1080 1059
1081 if (tmp && tmp->type == CLOSE_CON) 1060 // fall through to opening it (active in inv)
1082 tmp->destroy ();
1083 }
1084 }
1085 }
1086
1087 if (QUERY_FLAG (sack, FLAG_APPLIED))
1088 { 1061 }
1062 else if (sack->env)
1063 {
1064 // it is in our env, so activate it, do not open yet
1089 if (op->container) 1065 op->close_container ();
1090 { 1066 sack->flag [FLAG_APPLIED] = 1;
1091 if (op->container != sack) 1067 esrv_update_item (UPD_FLAGS, op, sack);
1092 { 1068 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack));
1093 tmp = op->container; 1069 return 1;
1094 apply_container (op, tmp); 1070 }
1095 sprintf (buf, "You close %s and open ", query_name (tmp)); 1071
1096 op->container = sack; 1072 // it's locked?
1097 strcat (buf, query_name (sack)); 1073 if (sack->slaying)
1098 strcat (buf, "."); 1074 {
1099 } 1075 if (object *tmp = find_key (op, op, sack))
1100 else 1076 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1101 {
1102 CLEAR_FLAG (sack, FLAG_APPLIED);
1103 op->container = NULL;
1104 sprintf (buf, "You close %s.", query_name (sack));
1105 }
1106 }
1107 else 1077 else
1108 { 1078 {
1109 CLEAR_FLAG (sack, FLAG_APPLIED);
1110 sprintf (buf, "You open %s.", query_name (sack));
1111 SET_FLAG (sack, FLAG_APPLIED);
1112 op->container = sack;
1113 }
1114 }
1115 else
1116 { /* not applied */
1117 if (sack->slaying)
1118 { /* it's locked */
1119 tmp = find_key (op, op, sack);
1120 if (tmp)
1121 {
1122 sprintf (buf, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1123 SET_FLAG (sack, FLAG_APPLIED);
1124
1125 if (sack->env == NULL)
1126 { /* if it's on ground,open it also */
1127 new_draw_info (NDI_UNIQUE, 0, op, buf);
1128 apply_container (op, sack);
1129 return 1;
1130 }
1131 }
1132 else
1133 sprintf (buf, "You don't have the key to unlock %s.", query_name (sack)); 1079 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1134 }
1135 else
1136 {
1137 sprintf (buf, "You readied %s.", query_name (sack));
1138 SET_FLAG (sack, FLAG_APPLIED);
1139
1140 if (sack->env == NULL)
1141 { /* if it's on ground,open it also */
1142 new_draw_info (NDI_UNIQUE, 0, op, buf);
1143 apply_container (op, sack);
1144 return 1; 1080 return 1;
1145 } 1081 }
1146 }
1147 } 1082 }
1148 1083
1149 new_draw_info (NDI_UNIQUE, 0, op, buf); 1084 op->open_container (sack);
1150
1151 if (op->contr)
1152 op->contr->ns->floorbox_update ();
1153 1085
1154 return 1; 1086 return 1;
1155} 1087}
1156
1157/**
1158 * Eneq(@csd.uu.se): Handle apply on containers. This is for containers
1159 * the player has in their inventory, eg, sacks, luggages, etc.
1160 *
1161 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1162 * This version is for client/server mode.
1163 * op is the player, sack is the container the player is opening or closing.
1164 * return 1 if an object is apllied somehow or another, 0 if error/no apply
1165 *
1166 * Reminder - there are three states for any container - closed (non applied),
1167 * applied (not open, but objects that match get tossed into it), and open
1168 * (applied flag set, and op->container points to the open container)
1169 */
1170
1171int
1172esrv_apply_container (object *op, object *sack)
1173{
1174 object *tmp = op->container;
1175
1176 if (op->type != PLAYER)
1177 return 0; /* This might change */
1178
1179 if (sack == NULL || sack->type != CONTAINER)
1180 {
1181 LOG (llevError, "esrv_apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1182 return 0;
1183 }
1184
1185 /* If we have a currently open container, then it needs to be closed in all cases
1186 * if we are opening this one up. We then fall through if appropriate for
1187 * openening the new container.
1188 */
1189
1190 if (op->container && QUERY_FLAG (sack, FLAG_APPLIED))
1191 {
1192 if (op->container->env != op)
1193 { /* if container is on the ground */
1194 op->container->move_off = 0;
1195 }
1196
1197 if (INVOKE_OBJECT (CLOSE, tmp, ARG_OBJECT (op)))
1198 return 1;
1199
1200 new_draw_info_format (NDI_UNIQUE, 0, op, "You close %s.", query_name (op->container));
1201 CLEAR_FLAG (op->container, FLAG_APPLIED);
1202 op->container = NULL;
1203 esrv_update_item (UPD_FLAGS, op, tmp);
1204 if (tmp == sack)
1205 return 1;
1206 }
1207
1208
1209 /* If the player is trying to open it (which he must be doing if we got here),
1210 * and it is locked, check to see if player has the equipment to open it.
1211 */
1212
1213 if (sack->slaying)
1214 { /* it's locked */
1215 tmp = find_key (op, op, sack);
1216 if (tmp)
1217 {
1218 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1219 }
1220 else
1221 {
1222 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1223 return 0;
1224 }
1225 }
1226
1227 /* By the time we get here, we have made sure any other container has been closed and
1228 * if this is a locked container, the player they key to open it.
1229 */
1230
1231 /* There are really two cases - the sack is either on the ground, or the sack is
1232 * part of the players inventory. If on the ground, we assume that the player is
1233 * opening it, since if it was being closed, that would have been taken care of above.
1234 */
1235
1236
1237 if (sack->env != op)
1238 {
1239 /* Hypothetical case - the player is trying to open a sack that belong to someone
1240 * else. This normally should not happen, but a misbehaving client/player could
1241 * try to do it, so lets handle it gracefully.
1242 */
1243 if (sack->env)
1244 {
1245 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't open %s", query_name (sack));
1246 return 0;
1247 }
1248 /* set these so when the player walks off, we can unapply the sack */
1249 sack->move_off = MOVE_ALL; /* trying force closing it */
1250
1251 CLEAR_FLAG (sack, FLAG_APPLIED);
1252 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1253 SET_FLAG (sack, FLAG_APPLIED);
1254 op->container = sack;
1255 esrv_update_item (UPD_FLAGS, op, sack);
1256 esrv_send_inventory (op, sack);
1257
1258 }
1259 else
1260 { /* sack is in players inventory */
1261 if (QUERY_FLAG (sack, FLAG_APPLIED))
1262 { /* readied sack becoming open */
1263 CLEAR_FLAG (sack, FLAG_APPLIED);
1264 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1265 SET_FLAG (sack, FLAG_APPLIED);
1266 op->container = sack;
1267 esrv_update_item (UPD_FLAGS, op, sack);
1268 esrv_send_inventory (op, sack);
1269 }
1270 else
1271 {
1272 CLEAR_FLAG (sack, FLAG_APPLIED);
1273 new_draw_info_format (NDI_UNIQUE, 0, op, "You readied %s.", query_name (sack));
1274 SET_FLAG (sack, FLAG_APPLIED);
1275 esrv_update_item (UPD_FLAGS, op, sack);
1276 }
1277 }
1278 return 1;
1279}
1280
1281 1088
1282/** 1089/**
1283 * Handles dropping things on altar. 1090 * Handles dropping things on altar.
1284 * Returns true if sacrifice was accepted. 1091 * Returns true if sacrifice was accepted.
1285 */ 1092 */
… …
1628 1435
1629 1436
1630 case CONVERTER: 1437 case CONVERTER:
1631 if (convert_item (victim, trap) < 0) 1438 if (convert_item (victim, trap) < 0)
1632 { 1439 {
1633 object *op;
1634
1635 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1440 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1636 1441 get_archetype ("burnout")->insert_at (trap, trap);
1637 op = get_archetype ("burnout");
1638 if (op != NULL)
1639 {
1640 op->x = trap->x;
1641 op->y = trap->y;
1642 insert_ob_in_map (op, trap->map, trap, 0);
1643 } 1442 }
1644 } 1443
1645 goto leave; 1444 goto leave;
1646 1445
1647 case TRIGGER_BUTTON: 1446 case TRIGGER_BUTTON:
1648 case TRIGGER_PEDESTAL: 1447 case TRIGGER_PEDESTAL:
1649 case TRIGGER_ALTAR: 1448 case TRIGGER_ALTAR:
… …
1706 1505
1707 apply_sign (victim, trap, 1); 1506 apply_sign (victim, trap, 1);
1708 goto leave; 1507 goto leave;
1709 1508
1710 case CONTAINER: 1509 case CONTAINER:
1711 if (victim->type == PLAYER)
1712 (void) esrv_apply_container (victim, trap);
1713 else
1714 (void) apply_container (victim, trap); 1510 apply_container (victim, trap);
1715 goto leave; 1511 goto leave;
1716 1512
1717 case RUNE: 1513 case RUNE:
1718 case TRAP: 1514 case TRAP:
1719 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1515 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
… …
1779 1575
1780 readable_message_type *msgType = get_readable_message_type (tmp); 1576 readable_message_type *msgType = get_readable_message_type (tmp);
1781 1577
1782 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1578 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1783 msgType->message_type, msgType->message_subtype, 1579 msgType->message_type, msgType->message_subtype,
1784 "You open the %s and start reading.\n%s", "%s\n%s", long_desc (tmp, op), &tmp->msg); 1580 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1581 long_desc (tmp, op), &tmp->msg);
1785 1582
1786 /* gain xp from reading */ 1583 /* gain xp from reading */
1787 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1584 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1788 { /* only if not read before */ 1585 { /* only if not read before */
1789 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1586 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1945 return; 1742 return;
1946 } 1743 }
1947 1744
1948 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1745 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1949 { 1746 {
1950 new_draw_info (NDI_UNIQUE, 0, op, "It is too hard to read at your level: You are unable to decipher the strange symbols."); 1747 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]");
1951 return; 1748 return;
1952 } 1749 }
1953 1750
1954 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1751 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1955 1752
… …
1978 { 1775 {
1979 spell_skill = find_skill_by_name (op, spell->skill); 1776 spell_skill = find_skill_by_name (op, spell->skill);
1980 1777
1981 if (!spell_skill) 1778 if (!spell_skill)
1982 { 1779 {
1983 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1780 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill);
1984 return; 1781 return;
1985 } 1782 }
1986 1783
1987 if (spell_skill->level < spell->level) 1784 if (spell_skill->level < spell->level)
1988 { 1785 {
… …
2022 else 1819 else
2023 { 1820 {
2024 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1821 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
2025 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1822 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n");
2026 } 1823 }
1824
2027 decrease_ob (tmp); 1825 decrease_ob (tmp);
2028} 1826}
2029 1827
2030/** 1828/**
2031 * Handles applying a spell scroll. 1829 * Handles applying a spell scroll.
… …
2227 if (meal->type != FLESH || !is_dragon_pl (op)) 2025 if (meal->type != FLESH || !is_dragon_pl (op))
2228 return 0; 2026 return 0;
2229 2027
2230 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2028 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2231 from the player's inventory */ 2029 from the player's inventory */
2030 shstr_cmp dragon_ability_force ("dragon_ability_force");
2031 shstr_cmp dragon_skin_force ("dragon_skin_force");
2032
2232 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2033 for (tmp = op->inv; tmp; tmp = tmp->below)
2233 {
2234 if (tmp->type == FORCE) 2034 if (tmp->type == FORCE)
2235 {
2236 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0) 2035 if (tmp->arch->name == dragon_skin_force)
2237 skin = tmp; 2036 skin = tmp;
2238 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2037 else if (tmp->arch->name == dragon_ability_force)
2239 abil = tmp; 2038 abil = tmp;
2240 }
2241 }
2242 2039
2243 /* if either skin or ability are missing, this is an old player 2040 /* if either skin or ability are missing, this is an old player
2244 which is not to be considered a dragon -> bail out */ 2041 which is not to be considered a dragon -> bail out */
2245 if (skin == NULL || abil == NULL) 2042 if (skin == NULL || abil == NULL)
2246 return 0; 2043 return 0;
… …
2287 /* doubled chance for resistance of ability-focus */ 2084 /* doubled chance for resistance of ability-focus */
2288 if (i == abil->stats.exp) 2085 if (i == abil->stats.exp)
2289 chance = MIN (100., chance * 2.); 2086 chance = MIN (100., chance * 2.);
2290 2087
2291 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2088 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2292 if (RANDOM () % 10000 < (int) (chance * 100)) 2089 if (rndm (10000) < (unsigned int) (chance * 100))
2293 { 2090 {
2294 atnr_winner[winners] = i; 2091 atnr_winner[winners] = i;
2295 winners++; 2092 winners++;
2296 } 2093 }
2297 2094
… …
2456 continue; /*Not a valid exit */ 2253 continue; /*Not a valid exit */
2457 2254
2458 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2255 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2459 continue; /*Not in the same place */ 2256 continue; /*Not in the same place */
2460 2257
2461 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2258 if (exit->map->path != EXIT_PATH (tmp))
2462 continue; /*Not in the same map */ 2259 continue; /*Not in the same map */
2463 2260
2464 /* From here we have found the exit is valid. However we do 2261 /* From here we have found the exit is valid. However we do
2465 * here the check of the exit owner. It is important for the 2262 * here the check of the exit owner. It is important for the
2466 * town portals to prevent strangers from visiting your appartments 2263 * town portals to prevent strangers from visiting your appartments
… …
2498 } 2295 }
2499 } 2296 }
2500 2297
2501 return 0; 2298 return 0;
2502} 2299}
2503
2504 2300
2505/** 2301/**
2506 * Main apply handler. 2302 * Main apply handler.
2507 * 2303 *
2508 * Checks for unpaid items before applying. 2304 * Checks for unpaid items before applying.
… …
2516 * being applied. 2312 * being applied.
2517 * 2313 *
2518 * aflag is special (always apply/unapply) flags. Nothing is done with 2314 * aflag is special (always apply/unapply) flags. Nothing is done with
2519 * them in this function - they are passed to apply_special 2315 * them in this function - they are passed to apply_special
2520 */ 2316 */
2521
2522int 2317int
2523manual_apply (object *op, object *tmp, int aflag) 2318manual_apply (object *op, object *tmp, int aflag)
2524{ 2319{
2525 if (tmp->head) 2320 if (tmp->head)
2526 tmp = tmp->head; 2321 tmp = tmp->head;
… …
2564 case EXIT: 2359 case EXIT:
2565 if (op->type != PLAYER) 2360 if (op->type != PLAYER)
2566 return 0; 2361 return 0;
2567 2362
2568 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2363 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2569 {
2570 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2364 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2571 }
2572 else 2365 else
2573 { 2366 {
2574 /* Don't display messages for random maps. */ 2367 /* Don't display messages for random maps. */
2575 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2368 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2576 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2369 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2577 2370
2578 op->enter_exit (tmp); 2371 op->enter_exit (tmp);
2579 } 2372 }
2373
2580 return 1; 2374 return 1;
2581 2375
2582 case SIGN: 2376 case SIGN:
2583 apply_sign (op, tmp, 0); 2377 apply_sign (op, tmp, 0);
2584 return 1; 2378 return 1;
… …
2588 { 2382 {
2589 apply_book (op, tmp); 2383 apply_book (op, tmp);
2590 return 1; 2384 return 1;
2591 } 2385 }
2592 else 2386 else
2593 {
2594 return 0; 2387 return 0;
2595 }
2596 2388
2597 case SKILLSCROLL: 2389 case SKILLSCROLL:
2598 if (op->type == PLAYER) 2390 if (op->type == PLAYER)
2599 { 2391 {
2600 apply_skillscroll (op, tmp); 2392 apply_skillscroll (op, tmp);
2601 return 1; 2393 return 1;
2602 } 2394 }
2395 else
2603 return 0; 2396 return 0;
2604 2397
2605 case SPELLBOOK: 2398 case SPELLBOOK:
2606 if (op->type == PLAYER) 2399 if (op->type == PLAYER)
2607 { 2400 {
2608 apply_spellbook (op, tmp); 2401 apply_spellbook (op, tmp);
2609 return 1; 2402 return 1;
2610 } 2403 }
2404 else
2611 return 0; 2405 return 0;
2612 2406
2613 case SCROLL: 2407 case SCROLL:
2614 apply_scroll (op, tmp, 0); 2408 apply_scroll (op, tmp, 0);
2615 return 1; 2409 return 1;
2616 2410
2617 case POTION: 2411 case POTION:
2618 (void) apply_potion (op, tmp); 2412 apply_potion (op, tmp);
2619 return 1; 2413 return 1;
2620 2414
2621 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2415 /* Eneq(@csd.uu.se): Handle apply on containers. */
2416 //TODO: remove, as it is unsed?
2622 case CLOSE_CON: 2417 case CLOSE_CON:
2623 if (op->type == PLAYER)
2624 (void) esrv_apply_container (op, tmp->env);
2625 else
2626 (void) apply_container (op, tmp->env); 2418 apply_container (op, tmp->env);
2627 return 1; 2419 return 1;
2628 2420
2629 case CONTAINER: 2421 case CONTAINER:
2630 if (op->type == PLAYER)
2631 (void) esrv_apply_container (op, tmp);
2632 else
2633 (void) apply_container (op, tmp); 2422 apply_container (op, tmp);
2634 return 1; 2423 return 1;
2635 2424
2636 case TREASURE: 2425 case TREASURE:
2637 if (op->type == PLAYER) 2426 if (op->type == PLAYER)
2638 { 2427 {
2639 apply_treasure (op, tmp); 2428 apply_treasure (op, tmp);
2640 return 1; 2429 return 1;
2641 } 2430 }
2642 else 2431 else
2643 {
2644 return 0; 2432 return 0;
2645 }
2646 2433
2647 case WEAPON: 2434 case WEAPON:
2648 case ARMOUR: 2435 case ARMOUR:
2649 case BOOTS: 2436 case BOOTS:
2650 case GLOVES: 2437 case GLOVES:
… …
2663 case LAMP: 2450 case LAMP:
2664 case BUILDER: 2451 case BUILDER:
2665 case SKILL_TOOL: 2452 case SKILL_TOOL:
2666 if (tmp->env != op) 2453 if (tmp->env != op)
2667 return 2; /* not in inventory */ 2454 return 2; /* not in inventory */
2455
2668 (void) apply_special (op, tmp, aflag); 2456 apply_special (op, tmp, aflag);
2669 return 1; 2457 return 1;
2670 2458
2671 case DRINK: 2459 case DRINK:
2672 case FOOD: 2460 case FOOD:
2673 case FLESH: 2461 case FLESH:
… …
2689 } 2477 }
2690 else 2478 else
2691 return 0; 2479 return 0;
2692 2480
2693 case WEAPON_IMPROVER: 2481 case WEAPON_IMPROVER:
2694 (void) check_improve_weapon (op, tmp); 2482 check_improve_weapon (op, tmp);
2695 return 1; 2483 return 1;
2696 2484
2697 case CLOCK: 2485 case CLOCK:
2698 if (op->type == PLAYER) 2486 if (op->type == PLAYER)
2699 { 2487 {
… …
2707 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2495 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0);
2708 new_draw_info (NDI_UNIQUE, 0, op, buf); 2496 new_draw_info (NDI_UNIQUE, 0, op, buf);
2709 return 1; 2497 return 1;
2710 } 2498 }
2711 else 2499 else
2712 {
2713 return 0; 2500 return 0;
2714 }
2715 2501
2716 case MENU: 2502 case MENU:
2717 if (op->type == PLAYER) 2503 if (op->type == PLAYER)
2718 { 2504 {
2719 shop_listing (op); 2505 shop_listing (tmp, op);
2720 return 1; 2506 return 1;
2721 } 2507 }
2722 else 2508 else
2723 {
2724 return 0; 2509 return 0;
2725 }
2726 2510
2727 case POWER_CRYSTAL: 2511 case POWER_CRYSTAL:
2728 apply_power_crystal (op, tmp); /* see egoitem.c */ 2512 apply_power_crystal (op, tmp); /* see egoitem.c */
2729 return 1; 2513 return 1;
2730 2514
… …
2733 { 2517 {
2734 apply_lighter (op, tmp); 2518 apply_lighter (op, tmp);
2735 return 1; 2519 return 1;
2736 } 2520 }
2737 else 2521 else
2738 {
2739 return 0; 2522 return 0;
2740 }
2741 2523
2742 case ITEM_TRANSFORMER: 2524 case ITEM_TRANSFORMER:
2743 apply_item_transformer (op, tmp); 2525 apply_item_transformer (op, tmp);
2744 return 1; 2526 return 1;
2745 2527
… …
2798/** 2580/**
2799 * player_apply_below attempts to apply the object 'below' the player. 2581 * player_apply_below attempts to apply the object 'below' the player.
2800 * If the player has an open container, we use that for below, otherwise 2582 * If the player has an open container, we use that for below, otherwise
2801 * we use the ground. 2583 * we use the ground.
2802 */ 2584 */
2803
2804void 2585void
2805player_apply_below (object *pl) 2586player_apply_below (object *pl)
2806{ 2587{
2807 object *tmp, *next;
2808 int floors; 2588 int floors = 0;
2809 2589
2810 /* If using a container, set the starting item to be the top 2590 /* If using a container, set the starting item to be the top
2811 * item in the container. Otherwise, use the map. 2591 * item in the container. Otherwise, use the map.
2812 */
2813 tmp = (pl->container != NULL) ? pl->container->inv : pl->below;
2814
2815 /* This is perhaps more complicated. However, I want to make sure that 2592 * This is perhaps more complicated. However, I want to make sure that
2816 * we don't use a corrupt pointer for the next object, so we get the 2593 * we don't use a corrupt pointer for the next object, so we get the
2817 * next object in the stack before applying. This is can only be a 2594 * next object in the stack before applying. This is can only be a
2818 * problem if player_apply() has a bug in that it uses the object but does 2595 * problem if player_apply() has a bug in that it uses the object but does
2819 * not return a proper value. 2596 * not return a proper value.
2820 */ 2597 */
2821 for (floors = 0; tmp != NULL; tmp = next) 2598 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2822 { 2599 {
2823 next = tmp->below; 2600 next = tmp->below;
2601
2824 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2602 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2825 floors++; 2603 floors++;
2826 else if (floors > 0) 2604 else if (floors > 0)
2827 return; /* process only floor objects after first floor object */ 2605 return; /* process only floor objects after first floor object */
2828 2606
… …
2848 * to keep the size of apply_special to a more managable size. 2626 * to keep the size of apply_special to a more managable size.
2849 */ 2627 */
2850static int 2628static int
2851unapply_special (object *who, object *op, int aflags) 2629unapply_special (object *who, object *op, int aflags)
2852{ 2630{
2853 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 2631 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2632 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2854 return RESULT_INT (0); 2633 return RESULT_INT (0);
2855 2634
2856 object *tmp2; 2635 object *tmp2;
2857 2636
2858 CLEAR_FLAG (op, FLAG_APPLIED); 2637 CLEAR_FLAG (op, FLAG_APPLIED);
2638
2859 switch (op->type) 2639 switch (op->type)
2860 { 2640 {
2861 case WEAPON: 2641 case WEAPON:
2862 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2642 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2863 2643
2864 (void) change_abil (who, op); 2644 change_abil (who, op);
2865 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2866 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2645 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2646
2647 if (who->contr)
2648 {
2649 if (who->contr->combat_ob == op)
2650 who->contr->combat_ob = 0;
2651
2652 if (who->current_weapon == op)
2653 who->current_weapon = 0;
2654 }
2655
2867 clear_skill (who); 2656 clear_skill (who);
2868 break; 2657 break;
2869 2658
2870 case SKILL: /* allows objects to impart skills */ 2659 case SKILL: /* allows objects to impart skills */
2871 case SKILL_TOOL: 2660 case SKILL_TOOL:
2872 if (op != who->chosen_skill) 2661 if (op != who->chosen_skill)
2873 {
2874 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 2662 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2663
2664 if (who->contr)
2875 } 2665 {
2876 if (who->type == PLAYER)
2877 {
2878 if (who->contr->shoottype == range_skill)
2879 who->contr->shoottype = range_none;
2880 if (!op->invisible) 2666 if (!op->invisible)
2881 {
2882 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2667 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2883 }
2884 else 2668 else
2885 {
2886 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2669 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2887 } 2670 }
2888 } 2671
2889 (void) change_abil (who, op); 2672 change_abil (who, op);
2890 who->chosen_skill = NULL; 2673 who->chosen_skill = 0;
2891 CLEAR_FLAG (who, FLAG_READY_SKILL); 2674 CLEAR_FLAG (who, FLAG_READY_SKILL);
2892 break; 2675 break;
2893 2676
2894 case ARMOUR: 2677 case ARMOUR:
2895 case HELMET: 2678 case HELMET:
… …
2900 case AMULET: 2683 case AMULET:
2901 case GIRDLE: 2684 case GIRDLE:
2902 case BRACERS: 2685 case BRACERS:
2903 case CLOAK: 2686 case CLOAK:
2904 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2687 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2905 (void) change_abil (who, op); 2688 change_abil (who, op);
2906 break; 2689 break;
2690
2907 case LAMP: 2691 case LAMP:
2908 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2692 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2909 tmp2 = arch_to_object (op->other_arch); 2693 tmp2 = arch_to_object (op->other_arch);
2910 tmp2->x = op->x; 2694 tmp2->x = op->x;
2911 tmp2->y = op->y; 2695 tmp2->y = op->y;
… …
2916 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2700 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2917 2701
2918 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2702 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2919 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2703 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2920 2704
2921 if (who->type == PLAYER) 2705 if (who->contr)
2922 esrv_del_item (who->contr, op->count); 2706 esrv_del_item (who->contr, op->count);
2923 2707
2924 op->destroy (); 2708 op->destroy ();
2925 insert_ob_in_ob (tmp2, who); 2709 insert_ob_in_ob (tmp2, who);
2926 who->update_stats (); 2710 who->update_stats ();
2711
2927 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2712 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2928 { 2713 {
2929 if (who->type == PLAYER) 2714 if (who->contr)
2930 { 2715 {
2931 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2716 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2932 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2717 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2933 } 2718 }
2934 } 2719 }
2935 if (who->type == PLAYER) 2720
2721 if (who->contr)
2936 esrv_send_item (who, tmp2); 2722 esrv_send_item (who, tmp2);
2723
2937 return 1; /* otherwise, an attempt to drop causes problems */ 2724 return 1; /* otherwise, an attempt to drop causes problems */
2938 break; 2725
2939 case BOW: 2726 case BOW:
2940 case WAND: 2727 case WAND:
2941 case ROD: 2728 case ROD:
2942 case HORN: 2729 case HORN:
2943 clear_skill (who); 2730 clear_skill (who);
2731
2732 if (who->contr)
2733 {
2944 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2734 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2945 if (who->type == PLAYER) 2735
2946 { 2736 if (who->contr->ranged_ob == op)
2947 who->contr->shoottype = range_none; 2737 who->contr->ranged_ob = 0;
2738
2739 if (who->current_weapon == op)
2740 who->current_weapon = 0;
2948 } 2741 }
2949 else 2742 else
2950 { 2743 {
2951 if (op->type == BOW) 2744 if (op->type == BOW)
2952 CLEAR_FLAG (who, FLAG_READY_BOW); 2745 CLEAR_FLAG (who, FLAG_READY_BOW);
2953 else 2746 else
2954 CLEAR_FLAG (who, FLAG_READY_RANGE); 2747 CLEAR_FLAG (who, FLAG_READY_RANGE);
2955 } 2748 }
2749
2956 break; 2750 break;
2957 2751
2958 case BUILDER: 2752 case BUILDER:
2753 if (who->contr)
2754 {
2959 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2755 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2960 who->contr->shoottype = range_none; 2756
2961 who->contr->ranges[range_builder] = NULL; 2757 if (who->contr->ranged_ob == op)
2758 who->contr->ranged_ob = 0;
2759 }
2962 break; 2760 break;
2963 2761
2964 default: 2762 default:
2965 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2763 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
2966 break; 2764 break;
… …
2968 2766
2969 who->update_stats (); 2767 who->update_stats ();
2970 2768
2971 if (!(aflags & AP_NO_MERGE)) 2769 if (!(aflags & AP_NO_MERGE))
2972 { 2770 {
2973 object *tmp;
2974
2975 tmp = merge_ob (op, NULL); 2771 object *tmp = merge_ob (op, 0);
2976 if (who->type == PLAYER) 2772
2773 if (who->contr)
2977 { 2774 {
2978 if (tmp) 2775 if (tmp)
2979 { /* it was merged */ 2776 { /* it was merged */
2980 esrv_del_item (who->contr, op->count); 2777 esrv_del_item (who->contr, op->count);
2981 op = tmp; 2778 op = tmp;
2982 } 2779 }
2983 2780
2984 esrv_send_item (who, op); 2781 esrv_send_item (who, op);
2985 } 2782 }
2986 } 2783 }
2784
2987 return 0; 2785 return 0;
2988} 2786}
2989 2787
2990/** 2788/**
2991 * Returns the object that is using location 'loc'. 2789 * Returns the object that is using location 'loc'.
… …
2999 * loc is the index into the array we are looking for a match. 2797 * loc is the index into the array we are looking for a match.
3000 * don't return invisible objects unless they are skill objects 2798 * don't return invisible objects unless they are skill objects
3001 * invisible other objects that use 2799 * invisible other objects that use
3002 * up body locations can be used as restrictions. 2800 * up body locations can be used as restrictions.
3003 */ 2801 */
3004object * 2802static object *
3005get_item_from_body_location (object *start, int loc) 2803get_item_from_body_location (int loc, object *start)
3006{ 2804{
3007 object *tmp;
3008
3009 if (!start) 2805 if (start)
3010 return NULL;
3011
3012 for (tmp = start; tmp; tmp = tmp->below) 2806 for (object *tmp = start; tmp; tmp = tmp->below)
3013 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2807 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->slot[loc].info && (!tmp->invisible || tmp->type == SKILL))
3014 return tmp; 2808 return tmp;
3015 2809
3016 return NULL; 2810 return 0;
3017} 2811}
3018
3019
3020 2812
3021/** 2813/**
3022 * 'op' wants to apply an object, but can't because of other equipment. 2814 * 'op' wants to apply an object, but can't because of other equipment.
3023 * This should only be called when it is known 2815 * This should only be called when it is known
3024 * that there are objects to unapply. This makes pretty heavy 2816 * that there are objects to unapply. This makes pretty heavy
… …
3030 * another function that does just that. 2822 * another function that does just that.
3031 */ 2823 */
3032int 2824int
3033unapply_for_ob (object *who, object *op, int aflags) 2825unapply_for_ob (object *who, object *op, int aflags)
3034{ 2826{
3035 int i; 2827 if (op->is_range ())
3036 object *tmp = NULL, *last;
3037
3038 /* If we are applying a shield or weapon, unapply any equipped shield
3039 * or weapons first - only allowed to use one weapon/shield at a time.
3040 */
3041 if (op->type == WEAPON || op->type == SHIELD)
3042 {
3043 for (tmp = who->inv; tmp; tmp = tmp->below) 2828 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3044 {
3045 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2829 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
3046 {
3047 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2830 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
3048 { 2831 {
3049 if (aflags & AP_PRINT) 2832 if (aflags & AP_PRINT)
3050 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2833 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
3051 else 2834 else
3052 unapply_special (who, tmp, aflags); 2835 unapply_special (who, tmp, aflags);
3053 } 2836 }
3054 else 2837 else
3055 { 2838 {
3056 /* In this case, we want to try and remove a cursed item. 2839 /* In this case, we want to try and remove a cursed item.
3057 * While we know it won't work, we want unapply_special to 2840 * While we know it won't work, we want unapply_special to
3058 * at least generate the message. 2841 * at least generate the message.
3059 */ 2842 */
3060 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2843 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp));
3061 return 1; 2844 return 1;
3062 }
3063
3064 } 2845 }
3065 }
3066 }
3067 2846
3068 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2847 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3069 { 2848 {
3070 /* this used up a slot that we need to free */ 2849 /* this used up a slot that we need to free */
3071 if (op->body_info[i]) 2850 if (op->slot[i].info)
3072 { 2851 {
3073 last = who->inv; 2852 object *last = who->inv;
3074 2853
3075 /* We do a while loop - may need to remove several items in order 2854 /* We do a while loop - may need to remove several items in order
3076 * to free up enough slots. 2855 * to free up enough slots.
3077 */ 2856 */
3078 while ((who->body_used[i] + op->body_info[i]) < 0) 2857 while ((who->slot[i].used + op->slot[i].info) < 0)
3079 { 2858 {
3080 tmp = get_item_from_body_location (last, i); 2859 object *tmp = get_item_from_body_location (i, last);
2860
3081 if (!tmp) 2861 if (!tmp)
3082 { 2862 {
3083#if 0 2863#if 0
3084 /* Not a bug - we'll get this if the player has cursed items 2864 /* Not a bug - we'll get this if the player has cursed items
3085 * equipped. 2865 * equipped.
3086 */ 2866 */
3087 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2867 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
3088#endif 2868#endif
3089 return 1; 2869 return 1;
3090 } 2870 }
2871
3091 /* If we are just printing, we don't care about cursed status */ 2872 /* If we are just printing, we don't care about cursed status */
3092 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2873 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
3093 { 2874 {
3094 if (aflags & AP_PRINT) 2875 if (aflags & AP_PRINT)
3095 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2876 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
… …
3103 * so it may not be critical (eg, putting on a ring and you have 2884 * so it may not be critical (eg, putting on a ring and you have
3104 * one cursed ring.) 2885 * one cursed ring.)
3105 */ 2886 */
3106 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2887 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp));
3107 } 2888 }
2889
3108 last = tmp->below; 2890 last = tmp->below;
3109 } 2891 }
3110 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2892 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
3111 * return in the !tmp would have kicked in. 2893 * return in the !tmp would have kicked in.
3112 */ 2894 */
3113 } /* if op is using this body location */ 2895 } /* if op is using this body location */
3114 } /* for body lcoations */ 2896 } /* for body lcoations */
2897
3115 return 0; 2898 return 0;
3116} 2899}
3117 2900
3118/** 2901/**
3119 * Checks to see if 'who' can apply object 'op'. 2902 * Checks to see if 'who' can apply object 'op'.
3120 * Returns 0 if apply can be done without anything special. 2903 * Returns 0 if apply can be done without anything special.
3121 * Otherwise returns a bitmask - potentially several of these may be 2904 * Otherwise returns a bitmask - potentially several of these may be
3122 * set, but largely depends on circumstance - in the future, processing 2905 * set, but largely depends on circumstance - in the future, processing
3123 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2906 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
3124 * is set, do we really are what the other flags may be?) 2907 * is set, do we really are what the other flags may be?)
3125 * 2908 *
3126 * See include/define.h for detailed description of the meaning of 2909 * See include/define.h for detailed description of the meaning of
3127 * these return values. 2910 * these return values.
3128 */ 2911 */
… …
3130can_apply_object (object *who, object *op) 2913can_apply_object (object *who, object *op)
3131{ 2914{
3132 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2915 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
3133 return RESULT_INT (0); 2916 return RESULT_INT (0);
3134 2917
3135 int i, retval = 0; 2918 int retval = 0;
3136 object *tmp = NULL, *ws = NULL; 2919 object *tmp = 0, *ws = 0;
3137 2920
3138 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2921 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3139 * 2 weapons, but we don't want to let them do that. So if they are
3140 * trying to equip a weapon or shield, see if they already have one
3141 * in place and store that way.
3142 */
3143 if (op->type == WEAPON || op->type == SHIELD)
3144 { 2922 {
3145 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2923 if (op->slot[i].info)
3146 { 2924 {
3147 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2925 /* Item uses more slots than we have */
2926 if (abs (op->slot[i].info) > who->slot[i].info)
3148 { 2927 {
3149 retval = CAN_APPLY_UNAPPLY;
3150 ws = tmp;
3151 }
3152 }
3153 }
3154
3155
3156 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
3157 {
3158 if (op->body_info[i])
3159 {
3160 /* Item uses more slots than we have */
3161 if (FABS (op->body_info[i]) > who->body_info[i])
3162 {
3163 /* Could return now for efficiently - rest of info below isn' 2928 /* Could return now for efficiency - rest of info below isn't
3164 * really needed. 2929 * really needed.
3165 */ 2930 */
3166 retval |= CAN_APPLY_NEVER; 2931 retval |= CAN_APPLY_NEVER;
3167 } 2932 }
3168 else if ((who->body_used[i] + op->body_info[i]) < 0) 2933 else if ((who->slot[i].used + op->slot[i].info) < 0)
3169 { 2934 {
3170 /* in this case, equipping this would use more free spots than 2935 /* in this case, equipping this would use more free spots than
3171 * we have. 2936 * we have.
3172 */ 2937 */
3173 object *tmp1;
3174
3175 2938
3176 /* if we have an applied weapon/shield, and unapply it would free 2939 /* if we have an applied weapon/shield, and unapply it would free
3177 * enough slots to equip the new item, then just set this can 2940 * enough slots to equip the new item, then just set "can
3178 * continue. We don't care about the logic below - if you have 2941 * apply unapply". We don't care about the logic below - if you have a
3179 * shield equipped and try to equip another shield, there is only 2942 * shield equipped and try to equip another shield, there is only
3180 * one choice. However, the check for the number of body locations 2943 * one choice. However, the check for the number of body locations
3181 * does take into the account cases where what is being applied 2944 * does take into the account cases where what is being applied
3182 * may be two handed for example. 2945 * may be two handed for example.
3183 */ 2946 */
3184 if (ws) 2947 if (ws)
3185 { 2948 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
3186 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0)
3187 { 2949 {
3188 retval |= CAN_APPLY_UNAPPLY; 2950 retval |= CAN_APPLY_UNAPPLY;
3189 continue; 2951 continue;
3190 } 2952 }
3191 }
3192 2953
3193 tmp1 = get_item_from_body_location (who->inv, i); 2954 object *tmp1 = get_item_from_body_location (i, who->inv);
3194 if (!tmp1) 2955 if (!tmp1)
3195 { 2956 {
3196#if 0 2957#if 0
3197 /* This is sort of an error, but happens a lot when old players 2958 /* This is sort of an error, but happens a lot when old players
3198 * join in with more stuff equipped than they are now allowed. 2959 * join in with more stuff equipped than they are now allowed.
… …
3209 */ 2970 */
3210 retval |= CAN_APPLY_UNAPPLY; 2971 retval |= CAN_APPLY_UNAPPLY;
3211 if (!tmp) 2972 if (!tmp)
3212 tmp = tmp1; 2973 tmp = tmp1;
3213 else if (tmp != tmp1) 2974 else if (tmp != tmp1)
3214 {
3215 retval |= CAN_APPLY_UNAPPLY_MULT; 2975 retval |= CAN_APPLY_UNAPPLY_MULT;
3216 } 2976
3217 /* This object isn't using up all the slots, so there must 2977 /* This object isn't using up all the slots, so there must
3218 * be another. If so, and it the new item doesn't need all 2978 * be another. If so, and it the new item doesn't need all
3219 * the slots, the player then has a choice. 2979 * the slots, the player then has a choice.
3220 */ 2980 */
3221 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 2981 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
2982 && abs (op->slot[i].info) < who->slot[i].info)
3222 retval |= CAN_APPLY_UNAPPLY_CHOICE; 2983 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3223 2984
3224 /* Does unequippint 'tmp1' free up enough slots for this to be 2985 /* Does unequippint 'tmp1' free up enough slots for this to be
3225 * equipped? If not, there must be something else to unapply. 2986 * equipped? If not, there must be something else to unapply.
3226 */ 2987 */
3227 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 2988 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3228 retval |= CAN_APPLY_UNAPPLY_MULT; 2989 retval |= CAN_APPLY_UNAPPLY_MULT;
3229
3230 } 2990 }
3231 } /* if not enough free slots */ 2991 } /* if not enough free slots */
3232 } /* if this object uses location i */ 2992 } /* if this object uses location i */
3233 } /* for i -> num_body_locations loop */ 2993 } /* for i -> num_body_locations loop */
3234 2994
… …
3239 * and weapons all use the same slot. Similar for horn/rod/wand - they 2999 * and weapons all use the same slot. Similar for horn/rod/wand - they
3240 * all use the same location. 3000 * all use the same location.
3241 */ 3001 */
3242 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3002 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3243 retval |= CAN_APPLY_RESTRICTION; 3003 retval |= CAN_APPLY_RESTRICTION;
3004
3244 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3005 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3245 retval |= CAN_APPLY_RESTRICTION; 3006 retval |= CAN_APPLY_RESTRICTION;
3246 3007
3247
3248 if (who->type != PLAYER) 3008 if (who->type != PLAYER)
3249 { 3009 {
3250 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3010 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3251 retval |= CAN_APPLY_RESTRICTION; 3011 retval |= CAN_APPLY_RESTRICTION;
3012
3252 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3013 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3253 retval |= CAN_APPLY_RESTRICTION; 3014 retval |= CAN_APPLY_RESTRICTION;
3015
3254 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3016 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3255 retval |= CAN_APPLY_RESTRICTION; 3017 retval |= CAN_APPLY_RESTRICTION;
3018
3256 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3019 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3257 retval |= CAN_APPLY_RESTRICTION; 3020 retval |= CAN_APPLY_RESTRICTION;
3258 } 3021 }
3022
3259 return retval; 3023 return retval;
3260} 3024}
3261
3262
3263 3025
3264/** 3026/**
3265 * who is the object using the object. It can be a monster. 3027 * who is the object using the object. It can be a monster.
3266 * op is the object they are using. op is an equipment type item, 3028 * op is the object they are using. op is an equipment type item,
3267 * eg, one which you put on and keep on for a while, and not something 3029 * eg, one which you put on and keep on for a while, and not something
… …
3286int 3048int
3287apply_special (object *who, object *op, int aflags) 3049apply_special (object *who, object *op, int aflags)
3288{ 3050{
3289 int basic_flag = aflags & AP_BASIC_FLAGS; 3051 int basic_flag = aflags & AP_BASIC_FLAGS;
3290 object *tmp, *tmp2, *skop = NULL; 3052 object *tmp, *tmp2, *skop = NULL;
3291 int i;
3292 3053
3293 if (who == NULL) 3054 if (who == NULL)
3294 { 3055 {
3295 LOG (llevError, "apply_special() from object without environment.\n"); 3056 LOG (llevError, "apply_special() from object without environment.\n");
3296 return 1; 3057 return 1;
… …
3306 if (basic_flag == AP_APPLY) 3067 if (basic_flag == AP_APPLY)
3307 return 0; 3068 return 0;
3308 3069
3309 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3070 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3310 { 3071 {
3311 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3072 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove %s.", query_name (op));
3312 return 1; 3073 return 1;
3313 } 3074 }
3075
3314 return unapply_special (who, op, aflags); 3076 return unapply_special (who, op, aflags);
3315 } 3077 }
3316 3078
3317 if (basic_flag == AP_UNAPPLY) 3079 if (basic_flag == AP_UNAPPLY)
3318 return 0; 3080 return 0;
3319 3081
3320 i = can_apply_object (who, op); 3082 // if the item is combat/ranged, wield the relevant slot first
3083 // to resolve conflicts.
3084 if (player *pl = who->contr)
3085 switch (op->type)
3086 {
3087 case WEAPON:
3088 who->change_weapon (pl->combat_ob);
3089 break;
3090
3091 case BOW:
3092 case ROD:
3093 case WAND:
3094 case HORN:
3095 case SKILL_TOOL:
3096 who->change_weapon (pl->ranged_ob);
3097 break;
3098
3099 case SKILL:
3100 if (IS_COMBAT_SKILL (op->subtype))
3101 who->change_weapon (pl->combat_ob);
3102 else if (IS_RANGED_SKILL (op->subtype))
3103 who->change_weapon (pl->ranged_ob);
3104 break;
3105 }
3321 3106
3322 /* Can't just apply this object. Lets see what not and what to do */ 3107 /* Can't just apply this object. Lets see what not and what to do */
3323 if (i) 3108 if (int i = can_apply_object (who, op))
3324 { 3109 {
3325 if (i & CAN_APPLY_NEVER) 3110 if (i & CAN_APPLY_NEVER)
3326 { 3111 {
3327 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3112 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op));
3328 return 1; 3113 return 1;
… …
3330 else if (i & CAN_APPLY_RESTRICTION) 3115 else if (i & CAN_APPLY_RESTRICTION)
3331 { 3116 {
3332 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3117 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op));
3333 return 1; 3118 return 1;
3334 } 3119 }
3120
3335 if (who->type != PLAYER) 3121 if (who->type != PLAYER)
3336 { 3122 {
3337 /* Some error, so don't try to equip something more */ 3123 /* Some error, so don't try to equip something more */
3338 if (unapply_for_ob (who, op, aflags)) 3124 if (unapply_for_ob (who, op, aflags))
3339 return 1; 3125 return 1;
… …
3345 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:"); 3131 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
3346 unapply_for_ob (who, op, AP_PRINT); 3132 unapply_for_ob (who, op, AP_PRINT);
3347 return 1; 3133 return 1;
3348 } 3134 }
3349 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3135 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3350 {
3351 i = unapply_for_ob (who, op, aflags); 3136 if (unapply_for_ob (who, op, aflags))
3352 if (i)
3353 return 1; 3137 return 1;
3354 }
3355 } 3138 }
3356 } 3139 }
3357 3140
3358 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3141 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3359 { 3142 {
3360 skop = find_skill_by_name (who, op->skill); 3143 skop = find_skill_by_name (who, op->skill);
3144
3361 if (!skop) 3145 if (!skop)
3362 { 3146 {
3363 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3147 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3364 return 1; 3148 return 1;
3365 } 3149 }
3366 else 3150 else
3367 {
3368 /* While experience will be credited properly, we want to change the 3151 /* While experience will be credited properly, we want to change the
3369 * skill so that the dam and wc get updated 3152 * skill so that the dam and wc get updated
3370 */ 3153 */
3371 change_skill (who, skop, 0); 3154 change_skill (who, skop, 0);
3372 }
3373 }
3374
3375 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3376 { 3155 }
3377 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3156
3157 if (who->type == PLAYER
3158 && op->item_power
3159 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3160 {
3161 new_draw_info (NDI_UNIQUE, 0, who,
3162 "Equipping that combined with other items would consume your soul! "
3163 "[use the skills command to check your available item power]");
3378 return 1; 3164 return 1;
3379 } 3165 }
3380
3381 3166
3382 /* Ok. We are now at the state where we can apply the new object. 3167 /* Ok. We are now at the state where we can apply the new object.
3383 * Note that we don't have the checks for can_use_... 3168 * Note that we don't have the checks for can_use_...
3384 * below - that is already taken care of by can_apply_object. 3169 * below - that is already taken care of by can_apply_object.
3385 */ 3170 */
3386
3387
3388 if (op->nrof > 1) 3171 if (op->nrof > 1)
3389 tmp = get_split_ob (op, op->nrof - 1); 3172 tmp = get_split_ob (op, op->nrof - 1);
3390 else 3173 else
3391 tmp = NULL; 3174 tmp = 0;
3392 3175
3393 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3176 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3394 return RESULT_INT (0); 3177 return RESULT_INT (0);
3395 3178
3396 switch (op->type) 3179 switch (op->type)
3397 { 3180 {
3398 case WEAPON: 3181 case WEAPON:
3399 if (!check_weapon_power (who, op->last_eat)) 3182 if (!check_weapon_power (who, op->last_eat))
3400 { 3183 {
3401 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3184 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use.\n"
3402 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3185 "It would consume your soul!.");
3186
3403 if (tmp != NULL) 3187 if (tmp)
3404 (void) insert_ob_in_ob (tmp, who); 3188 insert_ob_in_ob (tmp, who);
3189
3405 return 1; 3190 return 1;
3406 } 3191 }
3192
3193 //TODO: this obviously fails for players using a shorter prefix
3194 // i.e. "R" can use Ragnarok's sword.
3407 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3195 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3408 { 3196 {
3409 /* if the weapon does not have the name as the character, can't use it. */ 3197 /* if the weapon does not have the name as the character, can't use it. */
3410 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3198 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3411 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3199 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3200
3412 if (tmp != NULL) 3201 if (tmp)
3413 (void) insert_ob_in_ob (tmp, who); 3202 insert_ob_in_ob (tmp, who);
3203
3414 return 1; 3204 return 1;
3415 } 3205 }
3206
3207 if (!skop)
3208 {
3209 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3210 return 1;
3211 }
3212
3416 SET_FLAG (op, FLAG_APPLIED); 3213 SET_FLAG (op, FLAG_APPLIED);
3417
3418 if (skop)
3419 change_skill (who, skop, 1); 3214 change_skill (who, skop, 1);
3215
3216 if (who->contr)
3217 who->change_weapon (who->contr->combat_ob = op);
3218
3420 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3219 if (!QUERY_FLAG (who, FLAG_READY_WEAPON))
3421 SET_FLAG (who, FLAG_READY_WEAPON); 3220 SET_FLAG (who, FLAG_READY_WEAPON);
3422 3221
3423 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3222 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3424 3223
3425 (void) change_abil (who, op); 3224 change_abil (who, op);
3426 break; 3225 break;
3427 3226
3428 case ARMOUR: 3227 case ARMOUR:
3429 case HELMET: 3228 case HELMET:
3430 case SHIELD: 3229 case SHIELD:
… …
3435 case CLOAK: 3234 case CLOAK:
3436 case RING: 3235 case RING:
3437 case AMULET: 3236 case AMULET:
3438 SET_FLAG (op, FLAG_APPLIED); 3237 SET_FLAG (op, FLAG_APPLIED);
3439 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3238 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
3440 (void) change_abil (who, op); 3239 change_abil (who, op);
3441 break; 3240 break;
3241
3442 case LAMP: 3242 case LAMP:
3443 if (op->stats.food < 1) 3243 if (op->stats.food < 1)
3444 { 3244 {
3445 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3245 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name);
3446 return 1; 3246 return 1;
3447 } 3247 }
3248
3448 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3249 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3449 tmp2 = arch_to_object (op->other_arch); 3250 tmp2 = arch_to_object (op->other_arch);
3450 tmp2->stats.food = op->stats.food; 3251 tmp2->stats.food = op->stats.food;
3451 SET_FLAG (tmp2, FLAG_APPLIED); 3252 SET_FLAG (tmp2, FLAG_APPLIED);
3253
3452 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3254 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3453 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3255 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3256
3454 insert_ob_in_ob (tmp2, who); 3257 insert_ob_in_ob (tmp2, who);
3455 3258
3456 /* Remove the old lantern */ 3259 /* Remove the old lantern */
3457 if (who->type == PLAYER) 3260 if (who->type == PLAYER)
3458 esrv_del_item (who->contr, op->count); 3261 esrv_del_item (who->contr, op->count);
3459 3262
3460 op->destroy (); 3263 op->destroy ();
3461 3264
3462 /* insert the portion that was split off */ 3265 /* insert the portion that was split off */
3463 if (tmp != NULL) 3266 if (tmp)
3464 { 3267 {
3465 (void) insert_ob_in_ob (tmp, who); 3268 insert_ob_in_ob (tmp, who);
3466 if (who->type == PLAYER) 3269 if (who->type == PLAYER)
3467 esrv_send_item (who, tmp); 3270 esrv_send_item (who, tmp);
3468 } 3271 }
3272
3469 who->update_stats (); 3273 who->update_stats ();
3274
3470 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3275 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3471 {
3472 if (who->type == PLAYER) 3276 if (who->type == PLAYER)
3473 { 3277 {
3474 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3278 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3475 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3279 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3476 } 3280 }
3477 } 3281
3478 if (who->type == PLAYER) 3282 if (who->type == PLAYER)
3479 esrv_send_item (who, tmp2); 3283 esrv_send_item (who, tmp2);
3284
3480 return 0; 3285 return 0;
3481 break;
3482 3286
3483 /* this part is needed for skill-tools */ 3287 /* this part is needed for skill-tools */
3484 case SKILL: 3288 case SKILL:
3485 case SKILL_TOOL: 3289 case SKILL_TOOL:
3486 if (who->chosen_skill) 3290 if (who->chosen_skill)
3487 { 3291 {
3488 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3292 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3489 return 1; 3293 return 1;
3490 } 3294 }
3491 if (who->type == PLAYER) 3295
3296 if (player *pl = who->contr)
3297 {
3298 if (IS_COMBAT_SKILL (op->subtype))
3492 { 3299 {
3493 who->contr->shoottype = range_skill; 3300 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3494 who->contr->ranges[range_skill] = op; 3301 {
3302 for (object *item = who->inv; item; item = item->below)
3303 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3304 {
3305 who->change_weapon (pl->combat_ob = item);
3306 goto found_weapon;
3307 }
3308
3309 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a melee weapon before readying this skill");
3310 return 1;
3311
3312 found_weapon:;
3313 }
3314 else
3315 who->change_weapon (pl->combat_ob = op);
3316 }
3317 else if (IS_RANGED_SKILL (op->subtype))
3318 {
3319 if (skill_flags [op->subtype] & SF_NEED_BOW)
3320 {
3321 for (object *item = who->inv; item; item = item->below)
3322 if (item->type == BOW && item->flag [FLAG_APPLIED])
3323 {
3324 who->change_weapon (pl->ranged_ob = item);
3325 goto found_bow;
3326 }
3327
3328 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill");
3329 return 1;
3330
3331 found_bow:;
3332 }
3333 else if (skill_flags [op->subtype] & SF_NEED_ITEM)
3334 {
3335 for (object *item = who->inv; item; item = item->below)
3336 if (item->flag [FLAG_APPLIED]
3337 && (item->type == WAND || item->type == ROD || item->type == HORN))
3338 {
3339 who->change_weapon (pl->ranged_ob = item);
3340 goto found_item;
3341 }
3342
3343 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a magic item before readying this skill");
3344 return 1;
3345
3346 found_item:;
3347 }
3348 else
3349 who->change_weapon (pl->ranged_ob = op);
3350 }
3351
3495 if (!op->invisible) 3352 if (!op->invisible)
3496 { 3353 {
3497 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3354 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3498 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3355 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3499 } 3356 }
3500 else 3357 else
3501 {
3502 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3358 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3503 } 3359 }
3504 } 3360
3505 SET_FLAG (op, FLAG_APPLIED); 3361 SET_FLAG (op, FLAG_APPLIED);
3506 (void) change_abil (who, op); 3362 change_abil (who, op);
3507 who->chosen_skill = op; 3363 who->chosen_skill = op;
3508 SET_FLAG (who, FLAG_READY_SKILL); 3364 SET_FLAG (who, FLAG_READY_SKILL);
3509 break; 3365 break;
3510 3366
3511 case BOW: 3367 case BOW:
3512 if (!check_weapon_power (who, op->last_eat)) 3368 if (!check_weapon_power (who, op->last_eat))
3513 { 3369 {
3514 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3370 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use.");
3515 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3371 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3372
3516 if (tmp != NULL) 3373 if (tmp)
3517 (void) insert_ob_in_ob (tmp, who); 3374 insert_ob_in_ob (tmp, who);
3375
3518 return 1; 3376 return 1;
3519 } 3377 }
3378
3520 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3379 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3521 { 3380 {
3522 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3381 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3523 if (tmp != NULL) 3382 if (tmp)
3524 (void) insert_ob_in_ob (tmp, who); 3383 insert_ob_in_ob (tmp, who);
3384
3525 return 1; 3385 return 1;
3526 } 3386 }
3387
3527 /*FALLTHROUGH*/ case WAND: 3388 /*FALLTHROUGH*/
3389 case WAND:
3528 case ROD: 3390 case ROD:
3529 case HORN: 3391 case HORN:
3530 /* check for skill, alter player status */ 3392 /* check for skill, alter player status */
3393
3394 if (!skop)
3395 {
3396 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3397 return 1;
3398 }
3399
3531 SET_FLAG (op, FLAG_APPLIED); 3400 SET_FLAG (op, FLAG_APPLIED);
3532 if (skop)
3533 change_skill (who, skop, 0); 3401 change_skill (who, skop, 0);
3402
3403 if (who->contr)
3404 {
3405 who->contr->ranged_ob = op;
3406
3534 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3407 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3535 3408
3536 if (who->type == PLAYER)
3537 {
3538 if (op->type == BOW) 3409 if (op->type == BOW)
3539 { 3410 {
3411 who->current_weapon = op;
3540 (void) change_abil (who, op); 3412 change_abil (who, op);
3541 new_draw_info_format (NDI_UNIQUE, 0, who, 3413 new_draw_info_format (NDI_UNIQUE, 0, who,
3542 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3414 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3543 who->contr->shoottype = range_bow;
3544 }
3545 else
3546 {
3547 who->contr->shoottype = range_misc;
3548 } 3415 }
3549 } 3416 }
3550 else 3417 else
3551 { 3418 {
3552 if (op->type == BOW) 3419 if (op->type == BOW)
3553 SET_FLAG (who, FLAG_READY_BOW); 3420 SET_FLAG (who, FLAG_READY_BOW);
3554 else 3421 else
3555 SET_FLAG (who, FLAG_READY_RANGE); 3422 SET_FLAG (who, FLAG_READY_RANGE);
3556 } 3423 }
3424
3557 break; 3425 break;
3558 3426
3559 case BUILDER: 3427 case BUILDER:
3560 if (who->contr->ranges[range_builder]) 3428 if (who->type == PLAYER)
3429 {
3430 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3561 unapply_special (who, who->contr->ranges[range_builder], 0); 3431 unapply_special (who, who->contr->ranged_ob, 0);
3562 who->contr->shoottype = range_builder; 3432
3563 who->contr->ranges[range_builder] = op;
3564 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3433 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3434
3435 who->contr->ranged_ob = op;
3436 }
3565 break; 3437 break;
3566 3438
3567 default: 3439 default:
3568 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3440 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3569 } /* end of switch op->type */ 3441 } /* end of switch op->type */
3570 3442
3571 SET_FLAG (op, FLAG_APPLIED); 3443 SET_FLAG (op, FLAG_APPLIED);
3572 3444
3573 if (tmp != NULL) 3445 if (tmp)
3574 tmp = insert_ob_in_ob (tmp, who); 3446 tmp = insert_ob_in_ob (tmp, who);
3575 3447
3576 who->update_stats (); 3448 who->update_stats ();
3577 3449
3578 /* We exclude spell casting objects. The fire code will set the 3450 /* We exclude spell casting objects. The fire code will set the
… …
3588 { 3460 {
3589 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3461 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3590 SET_FLAG (op, FLAG_KNOWN_CURSED); 3462 SET_FLAG (op, FLAG_KNOWN_CURSED);
3591 } 3463 }
3592 } 3464 }
3465
3593 if (who->type == PLAYER) 3466 if (who->type == PLAYER)
3594 { 3467 {
3595 /* if multiple objects were applied, update both slots */ 3468 /* if multiple objects were applied, update both slots */
3596 if (tmp) 3469 if (tmp)
3597 esrv_send_item (who, tmp); 3470 esrv_send_item (who, tmp);
3471
3598 esrv_send_item (who, op); 3472 esrv_send_item (who, op);
3599 } 3473 }
3474
3600 return 0; 3475 return 0;
3601} 3476}
3602
3603 3477
3604int 3478int
3605monster_apply_special (object *who, object *op, int aflags) 3479monster_apply_special (object *who, object *op, int aflags)
3606{ 3480{
3607 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3481 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
… …
3651 3525
3652 case TREASURE: 3526 case TREASURE:
3653 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3527 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3654 return 0; 3528 return 0;
3655 3529
3656 while ((op->stats.hp--) > 0) 3530 while (op->stats.hp-- > 0)
3657 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3531 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0,
3658 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); 3532 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3659 3533
3660 /* If we generated an object and put it in this object inventory, 3534 /* If we generated an object and put it in this object inventory,
3661 * move it to the parent object as the current object is about 3535 * move it to the parent object as the current object is about
… …
3678 } 3552 }
3679 return tmp ? 1 : 0; 3553 return tmp ? 1 : 0;
3680} 3554}
3681 3555
3682/** 3556/**
3683 * fix_auto_apply goes through the entire map (only the first time 3557 * fix_auto_apply goes through the entire map every time a map
3684 * when an original map is loaded) and performs special actions for 3558 * is loaded or swapped in and performs special actions for
3685 * certain objects (most initialization of chests and creation of 3559 * certain objects (most initialization of chests and creation of
3686 * treasures and stuff). Calls auto_apply if appropriate. 3560 * treasures and stuff). Calls auto_apply if appropriate.
3687 */ 3561 */
3688void 3562void
3689maptile::fix_auto_apply () 3563maptile::fix_auto_apply ()
… …
3767 { 3641 {
3768 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0); 3642 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3769 tmp->randomitems = NULL; 3643 tmp->randomitems = NULL;
3770 } 3644 }
3771 3645
3646 // close all containers
3647 else if (tmp->type == CONTAINER)
3648 tmp->flag [FLAG_APPLIED] = 0;
3649
3772 tmp = above; 3650 tmp = above;
3773 } 3651 }
3774 3652
3775 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 3653 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3776 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 3654 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
… …
3782 * Handles player eating food that temporarily changes status (resistances, stats). 3660 * Handles player eating food that temporarily changes status (resistances, stats).
3783 * This used to call cast_change_attr(), but 3661 * This used to call cast_change_attr(), but
3784 * that doesn't work with the new spell code. Since we know what 3662 * that doesn't work with the new spell code. Since we know what
3785 * the food changes, just grab a force and use that instead. 3663 * the food changes, just grab a force and use that instead.
3786 */ 3664 */
3787
3788void 3665void
3789eat_special_food (object *who, object *food) 3666eat_special_food (object *who, object *food)
3790{ 3667{
3791 object *force; 3668 object *force;
3792 int i, did_one = 0; 3669 int i, did_one = 0;
3793 sint8 k;
3794 3670
3795 force = get_archetype (FORCE_NAME); 3671 force = get_archetype (FORCE_NAME);
3796 3672
3797 for (i = 0; i < NUM_STATS; i++) 3673 for (i = 0; i < NUM_STATS; i++)
3798 { 3674 if (sint8 k = food->stats.stat (i))
3799 k = get_attr_value (&food->stats, i);
3800 if (k)
3801 { 3675 {
3802 set_attr_value (&force->stats, i, k); 3676 force->stats.stat (i) = k;
3803 did_one = 1; 3677 did_one = 1;
3804 } 3678 }
3805 }
3806 3679
3807 /* check if we can protect the eater */ 3680 /* check if we can protect the eater */
3808 for (i = 0; i < NROFATTACKS; i++) 3681 for (i = 0; i < NROFATTACKS; i++)
3809 { 3682 {
3810 if (food->resist[i] > 0) 3683 if (food->resist[i] > 0)
… …
3829 /* check for hp, sp change */ 3702 /* check for hp, sp change */
3830 if (food->stats.hp != 0) 3703 if (food->stats.hp != 0)
3831 { 3704 {
3832 if (QUERY_FLAG (food, FLAG_CURSED)) 3705 if (QUERY_FLAG (food, FLAG_CURSED))
3833 { 3706 {
3834 strcpy (who->contr->killer, food->name); 3707 assign (who->contr->killer, food->name);
3835 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3708 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3836 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3709 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
3837 } 3710 }
3838 else 3711 else
3839 { 3712 {
… …
3971 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3844 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
3972 blind_player (op, op, power); 3845 blind_player (op, op, power);
3973 } 3846 }
3974 else if (failure <= -80) 3847 else if (failure <= -80)
3975 { /* blast the immediate area */ 3848 { /* blast the immediate area */
3976 object *tmp;
3977
3978 tmp = get_archetype (LOOSE_MANA); 3849 object *tmp = get_archetype (LOOSE_MANA);
3979 cast_magic_storm (op, tmp, power); 3850 cast_magic_storm (op, tmp, power);
3980 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3851 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!");
3981 tmp->destroy (); 3852 tmp->destroy ();
3982 } 3853 }
3983 } 3854 }
3984} 3855}
3985 3856
… …
4005 */ 3876 */
4006 int i, j; 3877 int i, j;
4007 3878
4008 for (i = 0; i < NUM_STATS; i++) 3879 for (i = 0; i < NUM_STATS; i++)
4009 { 3880 {
4010 sint8 stat = get_attr_value (stats, i);
4011 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 3881 int race_bonus = pl->arch->clone.stats.stat (i);
3882 sint8 stat = stats->stat (i) + ns->stat (i);
4012 3883
4013 stat += get_attr_value (ns, i);
4014 if (stat > 20 + race_bonus) 3884 if (stat > 20 + race_bonus)
4015 { 3885 {
4016 excess_stat++; 3886 excess_stat++;
4017 stat = 20 + race_bonus; 3887 stat = 20 + race_bonus;
4018 } 3888 }
4019 set_attr_value (stats, i, stat); 3889
3890 stats->stat (i) = stat;
4020 } 3891 }
4021 3892
4022 for (j = 0; excess_stat > 0 && j < 100; j++) 3893 for (j = 0; excess_stat > 0 && j < 100; j++)
4023 { /* try 100 times to assign excess stats */ 3894 { /* try 100 times to assign excess stats */
4024 int i = rndm (0, 6); 3895 int i = rndm (0, 6);
4025 int stat = get_attr_value (stats, i);
4026 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i);
4027 3896
4028 if (i == CHA) 3897 if (i == CHA)
4029 continue; /* exclude cha from this */ 3898 continue; /* exclude cha from this */
3899
3900 int stat = stats->stat (i);
3901 int race_bonus = pl->arch->clone.stats.stat (i);
4030 if (stat < 20 + race_bonus) 3902 if (stat < 20 + race_bonus)
4031 { 3903 {
4032 change_attr_value (stats, i, 1); 3904 change_attr_value (stats, i, 1);
4033 excess_stat--; 3905 excess_stat--;
4034 } 3906 }
… …
4037 /* insert the randomitems from the change's treasurelist into 3909 /* insert the randomitems from the change's treasurelist into
4038 * the player ref: player.c 3910 * the player ref: player.c
4039 */ 3911 */
4040 if (change->randomitems != NULL) 3912 if (change->randomitems != NULL)
4041 give_initial_items (pl, change->randomitems); 3913 give_initial_items (pl, change->randomitems);
4042
4043 3914
4044 /* set up the face, for some races. */ 3915 /* set up the face, for some races. */
4045 3916
4046 /* first, look for the force object banning 3917 /* first, look for the force object banning
4047 * changing the face. Certain races never change face with class. 3918 * changing the face. Certain races never change face with class.

Diff Legend

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