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.76 by root, Mon Apr 30 04:25:30 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
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 24
25#include <global.h> 25#include <global.h>
26#include <living.h> 26#include <living.h>
27#include <spells.h> 27#include <spells.h>
28#include <skills.h> 28#include <skills.h>
… …
65 { 65 {
66 arch_flag = 1; 66 arch_flag = 1;
67 name_flag = 1; 67 name_flag = 1;
68 race_flag = 1; 68 race_flag = 1;
69 } 69 }
70
70 /* If the director has race set, only affect objects with a arch, 71 /* If the director has race set, only affect objects with a arch,
71 * name or race that matches. 72 * name or race that matches.
72 */ 73 */
73 if ((op->race) && 74 if ((op->race) &&
74 ((!(victim->arch && arch_flag && victim->arch->name) || strcmp (op->race, victim->arch->name))) && 75 ((!(victim->arch && arch_flag && victim->arch->name) || op->race != victim->arch->name)) &&
75 ((!(victim->name && name_flag) || strcmp (op->race, victim->name))) && 76 ((!(victim->name && name_flag) || op->race != victim->name)) &&
76 ((!(victim->race && race_flag) || strcmp (op->race, victim->race)))) 77 ((!(victim->race && race_flag) || op->race != victim->race)))
77 {
78 return 1; 78 return 1;
79 } 79
80 /* If the director has slaying set, only affect objects where none 80 /* If the director has slaying set, only affect objects where none
81 * of arch, name, or race match. 81 * of arch, name, or race match.
82 */ 82 */
83 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && !strcmp (op->slaying, victim->arch->name))) || 83 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))) || 84 ((victim->name && name_flag && op->slaying == victim->name)) ||
85 ((victim->race && race_flag && !strcmp (op->slaying, victim->race))))) 85 ((victim->race && race_flag && op->slaying == victim->race)))
86 {
87 return 1; 86 return 1;
88 } 87
89 return 0; 88 return 0;
90} 89}
91 90
92/** 91/**
93 * This handles a player dropping money on an altar to identify stuff. 92 * This handles a player dropping money on an altar to identify stuff.
… …
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.
… …
1013 * Handle apply on containers. 1015 * Handle apply on containers.
1014 * By Eneq(@csd.uu.se). 1016 * By Eneq(@csd.uu.se).
1015 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 1017 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1016 * added the alchemical cauldron to the code -b.t. 1018 * added the alchemical cauldron to the code -b.t.
1017 */ 1019 */
1018
1019int 1020int
1020apply_container (object *op, object *sack) 1021apply_container (object *op, object *sack)
1021{ 1022{
1022 char buf[MAX_BUF]; 1023 if (op->type != PLAYER || !op->contr->ns)
1023 object *tmp;
1024
1025 if (op->type != PLAYER)
1026 return 0; /* This might change */ 1024 return 0; /* This might change */
1027 1025
1028 if (sack == NULL || sack->type != CONTAINER) 1026 if (!sack || sack->type != CONTAINER)
1029 { 1027 {
1030 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]"); 1028 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1031 return 0; 1029 return 0;
1032 } 1030 }
1033 1031
1034 op->contr->last_used = 0; 1032 op->contr->last_used = 0;
1035 1033
1036 if (sack->env != op) 1034 if (sack->env && sack->env != op)
1035 {
1036 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first.");
1037 return 1;
1037 { 1038 }
1038 if (sack->other_arch == NULL || sack->env != NULL) 1039
1040 // already applied == open on ground, or open in inv, or active in inv
1041 if (sack->flag [FLAG_APPLIED])
1042 {
1043 if (op->container == sack)
1039 { 1044 {
1040 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first."); 1045 // open on ground or inv, so close
1046 op->close_container ();
1041 return 1; 1047 return 1;
1042 } 1048 }
1043 1049 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 { 1050 {
1050 for (tmp = GET_MAP_OB (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above); 1051 // 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)); 1052 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1055 return 1; 1053 return 1;
1056 }
1057 }
1058 }
1059 if (QUERY_FLAG (sack, FLAG_APPLIED))
1060 { 1054 }
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 1055
1081 if (tmp && tmp->type == CLOSE_CON) 1056 // fall through to opening it (active in inv)
1082 tmp->destroy ();
1083 }
1084 }
1085 }
1086
1087 if (QUERY_FLAG (sack, FLAG_APPLIED))
1088 { 1057 }
1058 else if (sack->env)
1059 {
1060 // it is in our env, so activate it, do not open yet
1089 if (op->container) 1061 op->close_container ();
1090 { 1062 sack->flag [FLAG_APPLIED] = 1;
1091 if (op->container != sack) 1063 esrv_update_item (UPD_FLAGS, op, sack);
1092 { 1064 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack));
1093 tmp = op->container; 1065 return 1;
1094 apply_container (op, tmp); 1066 }
1095 sprintf (buf, "You close %s and open ", query_name (tmp)); 1067
1096 op->container = sack; 1068 // it's locked?
1097 strcat (buf, query_name (sack)); 1069 if (sack->slaying)
1098 strcat (buf, "."); 1070 {
1099 } 1071 if (object *tmp = find_key (op, op, sack))
1100 else 1072 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 1073 else
1108 { 1074 {
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)); 1075 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; 1076 return 1;
1145 } 1077 }
1146 }
1147 } 1078 }
1148 1079
1149 new_draw_info (NDI_UNIQUE, 0, op, buf); 1080 op->open_container (sack);
1150
1151 if (op->contr)
1152 op->contr->ns->floorbox_update ();
1153 1081
1154 return 1; 1082 return 1;
1155} 1083}
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 1084
1282/** 1085/**
1283 * Handles dropping things on altar. 1086 * Handles dropping things on altar.
1284 * Returns true if sacrifice was accepted. 1087 * Returns true if sacrifice was accepted.
1285 */ 1088 */
… …
1628 1431
1629 1432
1630 case CONVERTER: 1433 case CONVERTER:
1631 if (convert_item (victim, trap) < 0) 1434 if (convert_item (victim, trap) < 0)
1632 { 1435 {
1633 object *op;
1634
1635 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1436 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1636 1437 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 } 1438 }
1644 } 1439
1645 goto leave; 1440 goto leave;
1646 1441
1647 case TRIGGER_BUTTON: 1442 case TRIGGER_BUTTON:
1648 case TRIGGER_PEDESTAL: 1443 case TRIGGER_PEDESTAL:
1649 case TRIGGER_ALTAR: 1444 case TRIGGER_ALTAR:
… …
1706 1501
1707 apply_sign (victim, trap, 1); 1502 apply_sign (victim, trap, 1);
1708 goto leave; 1503 goto leave;
1709 1504
1710 case CONTAINER: 1505 case CONTAINER:
1711 if (victim->type == PLAYER)
1712 (void) esrv_apply_container (victim, trap);
1713 else
1714 (void) apply_container (victim, trap); 1506 apply_container (victim, trap);
1715 goto leave; 1507 goto leave;
1716 1508
1717 case RUNE: 1509 case RUNE:
1718 case TRAP: 1510 case TRAP:
1719 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1511 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
… …
1779 1571
1780 readable_message_type *msgType = get_readable_message_type (tmp); 1572 readable_message_type *msgType = get_readable_message_type (tmp);
1781 1573
1782 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1574 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1783 msgType->message_type, msgType->message_subtype, 1575 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); 1576 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1577 long_desc (tmp, op), &tmp->msg);
1785 1578
1786 /* gain xp from reading */ 1579 /* gain xp from reading */
1787 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1580 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1788 { /* only if not read before */ 1581 { /* only if not read before */
1789 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1582 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1945 return; 1738 return;
1946 } 1739 }
1947 1740
1948 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1741 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1949 { 1742 {
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."); 1743 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]");
1951 return; 1744 return;
1952 } 1745 }
1953 1746
1954 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1747 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1955 1748
… …
1978 { 1771 {
1979 spell_skill = find_skill_by_name (op, spell->skill); 1772 spell_skill = find_skill_by_name (op, spell->skill);
1980 1773
1981 if (!spell_skill) 1774 if (!spell_skill)
1982 { 1775 {
1983 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1776 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill);
1984 return; 1777 return;
1985 } 1778 }
1986 1779
1987 if (spell_skill->level < spell->level) 1780 if (spell_skill->level < spell->level)
1988 { 1781 {
… …
2022 else 1815 else
2023 { 1816 {
2024 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1817 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"); 1818 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n");
2026 } 1819 }
1820
2027 decrease_ob (tmp); 1821 decrease_ob (tmp);
2028} 1822}
2029 1823
2030/** 1824/**
2031 * Handles applying a spell scroll. 1825 * Handles applying a spell scroll.
… …
2227 if (meal->type != FLESH || !is_dragon_pl (op)) 2021 if (meal->type != FLESH || !is_dragon_pl (op))
2228 return 0; 2022 return 0;
2229 2023
2230 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2024 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2231 from the player's inventory */ 2025 from the player's inventory */
2026 shstr_cmp dragon_ability_force ("dragon_ability_force");
2027 shstr_cmp dragon_skin_force ("dragon_skin_force");
2028
2232 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2029 for (tmp = op->inv; tmp; tmp = tmp->below)
2233 {
2234 if (tmp->type == FORCE) 2030 if (tmp->type == FORCE)
2235 {
2236 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0) 2031 if (tmp->arch->name == dragon_skin_force)
2237 skin = tmp; 2032 skin = tmp;
2238 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2033 else if (tmp->arch->name == dragon_ability_force)
2239 abil = tmp; 2034 abil = tmp;
2240 }
2241 }
2242 2035
2243 /* if either skin or ability are missing, this is an old player 2036 /* if either skin or ability are missing, this is an old player
2244 which is not to be considered a dragon -> bail out */ 2037 which is not to be considered a dragon -> bail out */
2245 if (skin == NULL || abil == NULL) 2038 if (skin == NULL || abil == NULL)
2246 return 0; 2039 return 0;
… …
2287 /* doubled chance for resistance of ability-focus */ 2080 /* doubled chance for resistance of ability-focus */
2288 if (i == abil->stats.exp) 2081 if (i == abil->stats.exp)
2289 chance = MIN (100., chance * 2.); 2082 chance = MIN (100., chance * 2.);
2290 2083
2291 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2084 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2292 if (RANDOM () % 10000 < (int) (chance * 100)) 2085 if (rndm (10000) < (unsigned int) (chance * 100))
2293 { 2086 {
2294 atnr_winner[winners] = i; 2087 atnr_winner[winners] = i;
2295 winners++; 2088 winners++;
2296 } 2089 }
2297 2090
… …
2456 continue; /*Not a valid exit */ 2249 continue; /*Not a valid exit */
2457 2250
2458 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2251 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2459 continue; /*Not in the same place */ 2252 continue; /*Not in the same place */
2460 2253
2461 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2254 if (exit->map->path != EXIT_PATH (tmp))
2462 continue; /*Not in the same map */ 2255 continue; /*Not in the same map */
2463 2256
2464 /* From here we have found the exit is valid. However we do 2257 /* 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 2258 * here the check of the exit owner. It is important for the
2466 * town portals to prevent strangers from visiting your appartments 2259 * town portals to prevent strangers from visiting your appartments
… …
2617 case POTION: 2410 case POTION:
2618 (void) apply_potion (op, tmp); 2411 (void) apply_potion (op, tmp);
2619 return 1; 2412 return 1;
2620 2413
2621 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2414 /* Eneq(@csd.uu.se): Handle apply on containers. */
2415 //TODO: remove, as it is unsed?
2622 case CLOSE_CON: 2416 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); 2417 apply_container (op, tmp->env);
2627 return 1; 2418 return 1;
2628 2419
2629 case CONTAINER: 2420 case CONTAINER:
2630 if (op->type == PLAYER)
2631 (void) esrv_apply_container (op, tmp);
2632 else
2633 (void) apply_container (op, tmp); 2421 apply_container (op, tmp);
2634 return 1; 2422 return 1;
2635 2423
2636 case TREASURE: 2424 case TREASURE:
2637 if (op->type == PLAYER) 2425 if (op->type == PLAYER)
2638 { 2426 {
2639 apply_treasure (op, tmp); 2427 apply_treasure (op, tmp);
2640 return 1; 2428 return 1;
2641 } 2429 }
2642 else 2430 else
2643 {
2644 return 0; 2431 return 0;
2645 }
2646 2432
2647 case WEAPON: 2433 case WEAPON:
2648 case ARMOUR: 2434 case ARMOUR:
2649 case BOOTS: 2435 case BOOTS:
2650 case GLOVES: 2436 case GLOVES:
… …
2714 } 2500 }
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 { 2509 {
2724 return 0; 2510 return 0;
… …
2802 */ 2588 */
2803 2589
2804void 2590void
2805player_apply_below (object *pl) 2591player_apply_below (object *pl)
2806{ 2592{
2807 object *tmp, *next;
2808 int floors; 2593 int floors = 0;
2809 2594
2810 /* If using a container, set the starting item to be the top 2595 /* If using a container, set the starting item to be the top
2811 * item in the container. Otherwise, use the map. 2596 * 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 2597 * 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 2598 * 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 2599 * 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 2600 * problem if player_apply() has a bug in that it uses the object but does
2819 * not return a proper value. 2601 * not return a proper value.
2820 */ 2602 */
2821 for (floors = 0; tmp != NULL; tmp = next) 2603 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2822 { 2604 {
2823 next = tmp->below; 2605 next = tmp->below;
2606
2824 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2607 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2825 floors++; 2608 floors++;
2826 else if (floors > 0) 2609 else if (floors > 0)
2827 return; /* process only floor objects after first floor object */ 2610 return; /* process only floor objects after first floor object */
2828 2611
… …
2854 return RESULT_INT (0); 2637 return RESULT_INT (0);
2855 2638
2856 object *tmp2; 2639 object *tmp2;
2857 2640
2858 CLEAR_FLAG (op, FLAG_APPLIED); 2641 CLEAR_FLAG (op, FLAG_APPLIED);
2642
2859 switch (op->type) 2643 switch (op->type)
2860 { 2644 {
2861 case WEAPON: 2645 case WEAPON:
2862 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2646 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2863 2647
… …
2868 break; 2652 break;
2869 2653
2870 case SKILL: /* allows objects to impart skills */ 2654 case SKILL: /* allows objects to impart skills */
2871 case SKILL_TOOL: 2655 case SKILL_TOOL:
2872 if (op != who->chosen_skill) 2656 if (op != who->chosen_skill)
2873 {
2874 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 2657 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2875 } 2658
2876 if (who->type == PLAYER) 2659 if (who->type == PLAYER)
2877 { 2660 {
2878 if (who->contr->shoottype == range_skill) 2661 if (who->contr->ranged_ob == op)
2879 who->contr->shoottype = range_none; 2662 {
2663 who->contr->ranged_skill = 0;
2664 who->contr->ranged_ob = 0;
2665 }
2666
2880 if (!op->invisible) 2667 if (!op->invisible)
2881 {
2882 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2668 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2883 }
2884 else 2669 else
2885 {
2886 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2670 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2887 } 2671 }
2888 } 2672
2889 (void) change_abil (who, op); 2673 change_abil (who, op);
2890 who->chosen_skill = NULL; 2674 who->chosen_skill = 0;
2891 CLEAR_FLAG (who, FLAG_READY_SKILL); 2675 CLEAR_FLAG (who, FLAG_READY_SKILL);
2892 break; 2676 break;
2893 2677
2894 case ARMOUR: 2678 case ARMOUR:
2895 case HELMET: 2679 case HELMET:
… …
2934 } 2718 }
2935 if (who->type == PLAYER) 2719 if (who->type == PLAYER)
2936 esrv_send_item (who, tmp2); 2720 esrv_send_item (who, tmp2);
2937 return 1; /* otherwise, an attempt to drop causes problems */ 2721 return 1; /* otherwise, an attempt to drop causes problems */
2938 break; 2722 break;
2723
2939 case BOW: 2724 case BOW:
2940 case WAND: 2725 case WAND:
2941 case ROD: 2726 case ROD:
2942 case HORN: 2727 case HORN:
2943 clear_skill (who); 2728 clear_skill (who);
2944 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2945 if (who->type == PLAYER) 2729 if (who->type == PLAYER)
2946 { 2730 {
2947 who->contr->shoottype = range_none; 2731 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2732
2733 who->contr->ranged_skill = 0;
2734 who->contr->ranged_ob = 0;
2948 } 2735 }
2949 else 2736 else
2950 { 2737 {
2951 if (op->type == BOW) 2738 if (op->type == BOW)
2952 CLEAR_FLAG (who, FLAG_READY_BOW); 2739 CLEAR_FLAG (who, FLAG_READY_BOW);
2953 else 2740 else
2954 CLEAR_FLAG (who, FLAG_READY_RANGE); 2741 CLEAR_FLAG (who, FLAG_READY_RANGE);
2955 } 2742 }
2743
2956 break; 2744 break;
2957 2745
2958 case BUILDER: 2746 case BUILDER:
2747 if (who->type == PLAYER)
2748 {
2959 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2749 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2960 who->contr->shoottype = range_none; 2750
2961 who->contr->ranges[range_builder] = NULL; 2751 who->contr->ranged_skill = 0;
2752 who->contr->ranged_ob = 0;
2753 }
2962 break; 2754 break;
2963 2755
2964 default: 2756 default:
2965 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2757 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
2966 break; 2758 break;
… …
3150 ws = tmp; 2942 ws = tmp;
3151 } 2943 }
3152 } 2944 }
3153 } 2945 }
3154 2946
3155
3156 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2947 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
3157 { 2948 {
3158 if (op->body_info[i]) 2949 if (op->body_info[i])
3159 { 2950 {
3160 /* Item uses more slots than we have */ 2951 /* Item uses more slots than we have */
… …
3239 * and weapons all use the same slot. Similar for horn/rod/wand - they 3030 * and weapons all use the same slot. Similar for horn/rod/wand - they
3240 * all use the same location. 3031 * all use the same location.
3241 */ 3032 */
3242 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3033 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3243 retval |= CAN_APPLY_RESTRICTION; 3034 retval |= CAN_APPLY_RESTRICTION;
3035
3244 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3036 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3245 retval |= CAN_APPLY_RESTRICTION; 3037 retval |= CAN_APPLY_RESTRICTION;
3246
3247 3038
3248 if (who->type != PLAYER) 3039 if (who->type != PLAYER)
3249 { 3040 {
3250 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3041 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3251 retval |= CAN_APPLY_RESTRICTION; 3042 retval |= CAN_APPLY_RESTRICTION;
… …
3254 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3045 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3255 retval |= CAN_APPLY_RESTRICTION; 3046 retval |= CAN_APPLY_RESTRICTION;
3256 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3047 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3257 retval |= CAN_APPLY_RESTRICTION; 3048 retval |= CAN_APPLY_RESTRICTION;
3258 } 3049 }
3050
3259 return retval; 3051 return retval;
3260} 3052}
3261
3262
3263 3053
3264/** 3054/**
3265 * who is the object using the object. It can be a monster. 3055 * 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, 3056 * 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 3057 * eg, one which you put on and keep on for a while, and not something
… …
3362 { 3152 {
3363 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3153 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3364 return 1; 3154 return 1;
3365 } 3155 }
3366 else 3156 else
3367 {
3368 /* While experience will be credited properly, we want to change the 3157 /* While experience will be credited properly, we want to change the
3369 * skill so that the dam and wc get updated 3158 * skill so that the dam and wc get updated
3370 */ 3159 */
3371 change_skill (who, skop, 0); 3160 change_skill (who, skop, 0);
3372 }
3373 } 3161 }
3374 3162
3375 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level)) 3163 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3376 { 3164 {
3377 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3165 new_draw_info (NDI_UNIQUE, 0, who,
3166 "Equipping that combined with other items would consume your soul! "
3167 "[use the skills command to check your available item power]");
3378 return 1; 3168 return 1;
3379 } 3169 }
3380 3170
3381 3171
3382 /* Ok. We are now at the state where we can apply the new object. 3172 /* 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_... 3173 * Note that we don't have the checks for can_use_...
3384 * below - that is already taken care of by can_apply_object. 3174 * below - that is already taken care of by can_apply_object.
3385 */ 3175 */
3386
3387 3176
3388 if (op->nrof > 1) 3177 if (op->nrof > 1)
3389 tmp = get_split_ob (op, op->nrof - 1); 3178 tmp = get_split_ob (op, op->nrof - 1);
3390 else 3179 else
3391 tmp = NULL; 3180 tmp = NULL;
… …
3402 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3191 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3403 if (tmp != NULL) 3192 if (tmp != NULL)
3404 (void) insert_ob_in_ob (tmp, who); 3193 (void) insert_ob_in_ob (tmp, who);
3405 return 1; 3194 return 1;
3406 } 3195 }
3196
3197 //TODO: this obviously fails for players using a shiorter prefix
3198 // i.e. "R" can use Ragnarok's swors.
3407 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3199 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3408 { 3200 {
3409 /* if the weapon does not have the name as the character, can't use it. */ 3201 /* 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) */ 3202 /* (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."); 3203 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3204
3412 if (tmp != NULL) 3205 if (tmp)
3413 (void) insert_ob_in_ob (tmp, who); 3206 insert_ob_in_ob (tmp, who);
3207
3414 return 1; 3208 return 1;
3415 } 3209 }
3210
3416 SET_FLAG (op, FLAG_APPLIED); 3211 SET_FLAG (op, FLAG_APPLIED);
3417 3212
3418 if (skop) 3213 if (skop)
3419 change_skill (who, skop, 1); 3214 change_skill (who, skop, 1);
3215
3420 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3216 if (!QUERY_FLAG (who, FLAG_READY_WEAPON))
3421 SET_FLAG (who, FLAG_READY_WEAPON); 3217 SET_FLAG (who, FLAG_READY_WEAPON);
3422 3218
3423 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3219 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3424 3220
3425 (void) change_abil (who, op); 3221 change_abil (who, op);
3426 break; 3222 break;
3427 3223
3428 case ARMOUR: 3224 case ARMOUR:
3429 case HELMET: 3225 case HELMET:
3430 case SHIELD: 3226 case SHIELD:
… …
3435 case CLOAK: 3231 case CLOAK:
3436 case RING: 3232 case RING:
3437 case AMULET: 3233 case AMULET:
3438 SET_FLAG (op, FLAG_APPLIED); 3234 SET_FLAG (op, FLAG_APPLIED);
3439 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3235 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
3440 (void) change_abil (who, op); 3236 change_abil (who, op);
3441 break; 3237 break;
3238
3442 case LAMP: 3239 case LAMP:
3443 if (op->stats.food < 1) 3240 if (op->stats.food < 1)
3444 { 3241 {
3445 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3242 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name);
3446 return 1; 3243 return 1;
3447 } 3244 }
3245
3448 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3246 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3449 tmp2 = arch_to_object (op->other_arch); 3247 tmp2 = arch_to_object (op->other_arch);
3450 tmp2->stats.food = op->stats.food; 3248 tmp2->stats.food = op->stats.food;
3451 SET_FLAG (tmp2, FLAG_APPLIED); 3249 SET_FLAG (tmp2, FLAG_APPLIED);
3250
3452 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3251 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3453 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3252 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3253
3454 insert_ob_in_ob (tmp2, who); 3254 insert_ob_in_ob (tmp2, who);
3455 3255
3456 /* Remove the old lantern */ 3256 /* Remove the old lantern */
3457 if (who->type == PLAYER) 3257 if (who->type == PLAYER)
3458 esrv_del_item (who->contr, op->count); 3258 esrv_del_item (who->contr, op->count);
3459 3259
3460 op->destroy (); 3260 op->destroy ();
3461 3261
3462 /* insert the portion that was split off */ 3262 /* insert the portion that was split off */
3463 if (tmp != NULL) 3263 if (tmp)
3464 { 3264 {
3465 (void) insert_ob_in_ob (tmp, who); 3265 insert_ob_in_ob (tmp, who);
3466 if (who->type == PLAYER) 3266 if (who->type == PLAYER)
3467 esrv_send_item (who, tmp); 3267 esrv_send_item (who, tmp);
3468 } 3268 }
3269
3469 who->update_stats (); 3270 who->update_stats ();
3271
3470 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3272 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3471 { 3273 {
3472 if (who->type == PLAYER) 3274 if (who->type == PLAYER)
3473 { 3275 {
3474 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3276 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3475 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3277 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3476 } 3278 }
3477 } 3279 }
3280
3478 if (who->type == PLAYER) 3281 if (who->type == PLAYER)
3479 esrv_send_item (who, tmp2); 3282 esrv_send_item (who, tmp2);
3283
3480 return 0; 3284 return 0;
3481 break;
3482 3285
3483 /* this part is needed for skill-tools */ 3286 /* this part is needed for skill-tools */
3484 case SKILL: 3287 case SKILL:
3485 case SKILL_TOOL: 3288 case SKILL_TOOL:
3486 if (who->chosen_skill) 3289 if (who->chosen_skill)
3487 { 3290 {
3488 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3291 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3489 return 1; 3292 return 1;
3490 } 3293 }
3294
3491 if (who->type == PLAYER) 3295 if (who->type == PLAYER)
3492 { 3296 {
3493 who->contr->shoottype = range_skill;
3494 who->contr->ranges[range_skill] = op; 3297 who->contr->ranged_skill = who;
3298 who->contr->ranged_ob = op;
3299
3495 if (!op->invisible) 3300 if (!op->invisible)
3496 { 3301 {
3497 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3302 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); 3303 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3499 } 3304 }
3500 else 3305 else
3501 {
3502 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3306 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3503 } 3307 }
3504 } 3308
3505 SET_FLAG (op, FLAG_APPLIED); 3309 SET_FLAG (op, FLAG_APPLIED);
3506 (void) change_abil (who, op); 3310 change_abil (who, op);
3507 who->chosen_skill = op; 3311 who->chosen_skill = op;
3508 SET_FLAG (who, FLAG_READY_SKILL); 3312 SET_FLAG (who, FLAG_READY_SKILL);
3509 break; 3313 break;
3510 3314
3511 case BOW: 3315 case BOW:
3512 if (!check_weapon_power (who, op->last_eat)) 3316 if (!check_weapon_power (who, op->last_eat))
3513 { 3317 {
3514 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3318 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use.");
3515 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3319 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3320
3516 if (tmp != NULL) 3321 if (tmp)
3517 (void) insert_ob_in_ob (tmp, who); 3322 insert_ob_in_ob (tmp, who);
3323
3518 return 1; 3324 return 1;
3519 } 3325 }
3326
3520 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3327 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3521 { 3328 {
3522 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3329 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3523 if (tmp != NULL) 3330 if (tmp != NULL)
3524 (void) insert_ob_in_ob (tmp, who); 3331 insert_ob_in_ob (tmp, who);
3332
3525 return 1; 3333 return 1;
3526 } 3334 }
3335
3527 /*FALLTHROUGH*/ case WAND: 3336 /*FALLTHROUGH*/
3337 case WAND:
3528 case ROD: 3338 case ROD:
3529 case HORN: 3339 case HORN:
3530 /* check for skill, alter player status */ 3340 /* check for skill, alter player status */
3531 SET_FLAG (op, FLAG_APPLIED); 3341 SET_FLAG (op, FLAG_APPLIED);
3532 if (skop) 3342 if (skop)
3533 change_skill (who, skop, 0); 3343 change_skill (who, skop, 0);
3534 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3535 3344
3536 if (who->type == PLAYER) 3345 if (who->type == PLAYER)
3537 { 3346 {
3347 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3348
3538 if (op->type == BOW) 3349 if (op->type == BOW)
3539 { 3350 {
3540 (void) change_abil (who, op); 3351 change_abil (who, op);
3541 new_draw_info_format (NDI_UNIQUE, 0, who, 3352 new_draw_info_format (NDI_UNIQUE, 0, who,
3542 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3353 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3543 who->contr->shoottype = range_bow;
3544 } 3354 }
3545 else 3355
3546 { 3356 who->contr->ranged_skill = find_skill_by_name (who, op->skill);//TODO
3547 who->contr->shoottype = range_misc; 3357 who->contr->ranged_ob = op;
3548 }
3549 } 3358 }
3550 else 3359 else
3551 { 3360 {
3552 if (op->type == BOW) 3361 if (op->type == BOW)
3553 SET_FLAG (who, FLAG_READY_BOW); 3362 SET_FLAG (who, FLAG_READY_BOW);
3554 else 3363 else
3555 SET_FLAG (who, FLAG_READY_RANGE); 3364 SET_FLAG (who, FLAG_READY_RANGE);
3556 } 3365 }
3366
3557 break; 3367 break;
3558 3368
3559 case BUILDER: 3369 case BUILDER:
3560 if (who->contr->ranges[range_builder]) 3370 if (who->type == PLAYER)
3371 {
3372 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3561 unapply_special (who, who->contr->ranges[range_builder], 0); 3373 unapply_special (who, who->contr->ranged_ob, 0);
3562 who->contr->shoottype = range_builder; 3374
3563 who->contr->ranges[range_builder] = op;
3564 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3375 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3376
3377 who->contr->ranged_skill = who;
3378 who->contr->ranged_ob = op;
3379 }
3565 break; 3380 break;
3566 3381
3567 default: 3382 default:
3568 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3383 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3569 } /* end of switch op->type */ 3384 } /* end of switch op->type */
… …
3588 { 3403 {
3589 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3404 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3590 SET_FLAG (op, FLAG_KNOWN_CURSED); 3405 SET_FLAG (op, FLAG_KNOWN_CURSED);
3591 } 3406 }
3592 } 3407 }
3408
3593 if (who->type == PLAYER) 3409 if (who->type == PLAYER)
3594 { 3410 {
3595 /* if multiple objects were applied, update both slots */ 3411 /* if multiple objects were applied, update both slots */
3596 if (tmp) 3412 if (tmp)
3597 esrv_send_item (who, tmp); 3413 esrv_send_item (who, tmp);
3414
3598 esrv_send_item (who, op); 3415 esrv_send_item (who, op);
3599 } 3416 }
3417
3600 return 0; 3418 return 0;
3601} 3419}
3602
3603 3420
3604int 3421int
3605monster_apply_special (object *who, object *op, int aflags) 3422monster_apply_special (object *who, object *op, int aflags)
3606{ 3423{
3607 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3424 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
… …
3651 3468
3652 case TREASURE: 3469 case TREASURE:
3653 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3470 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3654 return 0; 3471 return 0;
3655 3472
3656 while ((op->stats.hp--) > 0) 3473 while (op->stats.hp-- > 0)
3657 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3474 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); 3475 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3659 3476
3660 /* If we generated an object and put it in this object inventory, 3477 /* 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 3478 * move it to the parent object as the current object is about
… …
3678 } 3495 }
3679 return tmp ? 1 : 0; 3496 return tmp ? 1 : 0;
3680} 3497}
3681 3498
3682/** 3499/**
3683 * fix_auto_apply goes through the entire map (only the first time 3500 * fix_auto_apply goes through the entire map every time a map
3684 * when an original map is loaded) and performs special actions for 3501 * is loaded or swapped in and performs special actions for
3685 * certain objects (most initialization of chests and creation of 3502 * certain objects (most initialization of chests and creation of
3686 * treasures and stuff). Calls auto_apply if appropriate. 3503 * treasures and stuff). Calls auto_apply if appropriate.
3687 */ 3504 */
3688void 3505void
3689maptile::fix_auto_apply () 3506maptile::fix_auto_apply ()
… …
3766 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ()) 3583 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3767 { 3584 {
3768 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0); 3585 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3769 tmp->randomitems = NULL; 3586 tmp->randomitems = NULL;
3770 } 3587 }
3588 // close all containers
3589 else if (tmp->type == CONTAINER)
3590 tmp->flag [FLAG_APPLIED] = 0;
3771 3591
3772 tmp = above; 3592 tmp = above;
3773 } 3593 }
3774 3594
3775 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 3595 for (mapspace *ms = spaces + size (); ms-- > spaces; )
… …
3829 /* check for hp, sp change */ 3649 /* check for hp, sp change */
3830 if (food->stats.hp != 0) 3650 if (food->stats.hp != 0)
3831 { 3651 {
3832 if (QUERY_FLAG (food, FLAG_CURSED)) 3652 if (QUERY_FLAG (food, FLAG_CURSED))
3833 { 3653 {
3834 strcpy (who->contr->killer, food->name); 3654 assign (who->contr->killer, food->name);
3835 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3655 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3836 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3656 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
3837 } 3657 }
3838 else 3658 else
3839 { 3659 {

Diff Legend

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