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.31 by root, Sun Dec 3 20:26:35 2006 UTC vs.
Revision 1.209 by root, Fri Nov 6 12:49:19 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 23 */
24
25#include <cmath>
23 26
24#include <global.h> 27#include <global.h>
25#include <living.h> 28#include <living.h>
26#include <spells.h> 29#include <spells.h>
27#include <skills.h> 30#include <skills.h>
28#include <tod.h> 31#include <tod.h>
29 32
30#ifndef __CEXTRACT__
31# include <sproto.h> 33#include <sproto.h>
32#endif
33 34
34/* Want this regardless of rplay. */ 35/* Want this regardless of rplay. */
35#include <sounds.h> 36#include <sounds.h>
36
37/* need math lib for double-precision and pow() in dragon_eat_flesh() */
38#include <math.h>
39 37
40/** 38/**
41 * 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.
42 * 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.
43 */ 41 */
… …
56 * subtype 5: arch or race 54 * subtype 5: arch or race
57 * subtype 7: all three 55 * subtype 7: all three
58 */ 56 */
59 if (op->subtype) 57 if (op->subtype)
60 { 58 {
61 arch_flag = (op->subtype & 1); 59 arch_flag = op->subtype & 1;
62 name_flag = (op->subtype & 2); 60 name_flag = op->subtype & 2;
63 race_flag = (op->subtype & 4); 61 race_flag = op->subtype & 4;
64 } 62 }
65 else 63 else
66 { 64 {
67 arch_flag = 1; 65 arch_flag = 1;
68 name_flag = 1; 66 name_flag = 1;
69 race_flag = 1; 67 race_flag = 1;
70 } 68 }
69
71 /* 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,
72 * name or race that matches. 71 * name or race that matches.
73 */ 72 */
74 if ((op->race) && 73 if ((op->race) &&
75 ((!(victim->arch && arch_flag && victim->arch->name) || strcmp (op->race, victim->arch->name))) && 74 ((!(victim->arch && arch_flag && victim->arch->archname) || op->race != victim->arch->archname)) &&
76 ((!(victim->name && name_flag) || strcmp (op->race, victim->name))) && 75 ((!(victim->name && name_flag) || op->race != victim->name)) &&
77 ((!(victim->race && race_flag) || strcmp (op->race, victim->race)))) 76 ((!(victim->race && race_flag) || op->race != victim->race)))
78 {
79 return 1; 77 return 1;
80 } 78
81 /* If the director has slaying set, only affect objects where none 79 /* If the director has slaying set, only affect objects where none
82 * of arch, name, or race match. 80 * of arch, name, or race match.
83 */ 81 */
84 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->archname && op->slaying == victim->arch->archname))) ||
85 ((victim->name && name_flag && !strcmp (op->slaying, victim->name))) || 83 ((victim->name && name_flag && op->slaying == victim->name)) ||
86 ((victim->race && race_flag && !strcmp (op->slaying, victim->race))))) 84 ((victim->race && race_flag && op->slaying == victim->race)))
87 {
88 return 1; 85 return 1;
89 } 86
90 return 0; 87 return 0;
91} 88}
92 89
93/** 90/**
94 * 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.
… …
96 * Return value: 1 if money was destroyed, 0 if not. 93 * Return value: 1 if money was destroyed, 0 if not.
97 */ 94 */
98static int 95static int
99apply_id_altar (object *money, object *altar, object *pl) 96apply_id_altar (object *money, object *altar, object *pl)
100{ 97{
101 object *id, *marked; 98 dynbuf_text &buf = msg_dynbuf; buf.clear ();
102 int success = 0;
103 99
104 if (pl == NULL || pl->type != PLAYER) 100 if (!pl || pl->type != PLAYER)
105 return 0; 101 return 0;
106 102
107 /* Check for MONEY type is a special hack - it prevents 'nothing needs 103 /* Check for MONEY type is a special hack - it prevents 'nothing needs
108 * identifying' from being printed out more than it needs to be. 104 * identifying' from being printed out more than it needs to be.
109 */ 105 */
110 if (!check_altar_sacrifice (altar, money) || money->type != MONEY) 106 if (!check_altar_sacrifice (altar, money, pl) || money->type != MONEY)
111 return 0; 107 return 0;
112 108
113 marked = find_marked_object (pl);
114 /* if the player has a marked item, identify that if it needs to be 109 /* if the player has a marked item, identify that if it needs to be
115 * identified. IF it doesn't, then go through the player inventory. 110 * identified. If it doesn't, then go through the player inventory.
116 */ 111 */
112 if (object *marked = find_marked_object (pl))
117 if (marked && !QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked)) 113 if (!QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked))
118 { 114 {
119 if (operate_altar (altar, &money)) 115 if (operate_altar (altar, &money, pl))
120 { 116 {
121 identify (marked); 117 identify (marked);
122 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (marked, pl)); 118
119 buf.printf ("You have %s.\r", long_desc (marked, pl));
123 if (marked->msg) 120 if (marked->msg)
124 { 121 buf << "The item has a story:\r" << marked->msg << "\n\n";
125 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 122
126 new_draw_info (NDI_UNIQUE, 0, pl, marked->msg); 123 return !money;
127 } 124 }
128 return money == NULL;
129 } 125 }
130 }
131 126
132 for (id = pl->inv; id; id = id->below) 127 for (object *id = pl->inv; id; id = id->below)
133 { 128 {
134 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id)) 129 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id))
135 { 130 {
136 if (operate_altar (altar, &money)) 131 if (operate_altar (altar, &money, pl))
137 { 132 {
138 identify (id); 133 identify (id);
139 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (id, pl)); 134
135 buf.printf ("You have %s.\r", long_desc (id, pl));
140 if (id->msg) 136 if (id->msg)
141 { 137 buf << "The item has a story:\r" << id->msg << "\n\n";
142 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 138
143 new_draw_info (NDI_UNIQUE, 0, pl, id->msg);
144 }
145 success = 1;
146 /* If no more money, might as well quit now */ 139 /* If no more money, might as well quit now */
147 if (money == NULL || !check_altar_sacrifice (altar, money)) 140 if (!money || !check_altar_sacrifice (altar, money))
148 break; 141 break;
149 } 142 }
150 else 143 else
151 { 144 {
152 LOG (llevError, "check_id_altar: Couldn't do sacrifice when we should have been able to\n"); 145 LOG (llevError, "check_id_altar: Couldn't do sacrifice when we should have been able to\n");
153 break; 146 break;
154 } 147 }
155 } 148 }
156 } 149 }
157 if (!success) 150
158 new_draw_info (NDI_UNIQUE, 0, pl, "You have nothing that needs identifying"); 151 if (buf.empty ())
152 pl->failmsg ("You have nothing that needs identifying");
153 else
154 pl->contr->infobox (MSG_CHANNEL ("identify"), buf);
155
159 return money == NULL; 156 return !money;
160} 157}
161 158
162/** 159/**
163 * This checks whether the object has a "on_use_yield" field, and if so generated and drops 160 * This checks whether the object has a "on_use_yield" field, and if so generated and drops
164 * matching item. 161 * matching item.
165 **/ 162 **/
166static void 163void
167handle_apply_yield (object *tmp) 164handle_apply_yield (object *tmp)
168{ 165{
169 const char *yield; 166 if (shstr_tmp yield = tmp->kv (shstr_on_use_yield))
170 167 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
171 yield = get_ob_key_value (tmp, "on_use_yield");
172 if (yield != NULL)
173 {
174 object *drop = get_archetype (yield);
175
176 if (tmp->env)
177 {
178 drop = insert_ob_in_ob (drop, tmp->env);
179 if (tmp->env->type == PLAYER)
180 esrv_send_item (tmp->env, drop);
181 }
182 else
183 {
184 drop->x = tmp->x;
185 drop->y = tmp->y;
186 insert_ob_in_map (drop, tmp->map, tmp, INS_BELOW_ORIGINATOR);
187 }
188 }
189} 168}
190 169
191/** 170/**
192 * Handles applying a potion. 171 * Handles applying a potion.
193 */ 172 */
… …
195apply_potion (object *op, object *tmp) 174apply_potion (object *op, object *tmp)
196{ 175{
197 int got_one = 0, i; 176 int got_one = 0, i;
198 object *force = 0, *floor = 0; 177 object *force = 0, *floor = 0;
199 178
200 floor = get_map_ob (op->map, op->x, op->y); 179 floor = GET_MAP_OB (op->map, op->x, op->y);
201 180
202 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 181 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
203 { 182 {
204 if (op->type == PLAYER)
205 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!"); 183 op->failmsg ("Gods prevent you from using this here, it's sacred ground!");
184
206 CLEAR_FLAG (tmp, FLAG_APPLIED); 185 CLEAR_FLAG (tmp, FLAG_APPLIED);
207 return 0; 186 return 0;
208 } 187 }
209 188
210 if (op->type == PLAYER) 189 if (op->type == PLAYER)
211 {
212 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 190 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
213 identify (tmp); 191 identify (tmp);
214 }
215 192
216 handle_apply_yield (tmp); 193 handle_apply_yield (tmp);
217 194
218 /* Potion of restoration - only for players */ 195 /* Potion of restoration - only for players */
219 if (op->type == PLAYER && (tmp->attacktype & AT_DEPLETE)) 196 if (op->type == PLAYER && (tmp->attacktype & AT_DEPLETE))
… …
221 object *depl; 198 object *depl;
222 archetype *at; 199 archetype *at;
223 200
224 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 201 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
225 { 202 {
226 drain_stat (op); 203 op->drain_stat ();
227 fix_player (op); 204 op->update_stats ();
228 decrease_ob (tmp); 205 tmp->decrease ();
229 return 1; 206 return 1;
230 } 207 }
208
231 if ((at = archetype::find (ARCH_DEPLETION)) == NULL) 209 if (!(at = archetype::find (ARCH_DEPLETION)))
232 { 210 {
233 LOG (llevError, "Could not find archetype depletion\n"); 211 LOG (llevError, "Could not find archetype depletion\n");
234 return 0; 212 return 0;
235 } 213 }
214
236 depl = present_arch_in_ob (at, op); 215 depl = present_arch_in_ob (at, op);
216
237 if (depl != NULL) 217 if (depl)
238 { 218 {
239 for (i = 0; i < NUM_STATS; i++) 219 for (i = 0; i < NUM_STATS; i++)
240 if (get_attr_value (&depl->stats, i)) 220 if (depl->stats.stat (i))
241 { 221 op->statusmsg (restore_msg[i]);
242 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 222
243 } 223 depl->destroy ();
244 remove_ob (depl); 224 op->update_stats ();
245 free_object (depl);
246 fix_player (op);
247 } 225 }
248 else 226 else
249 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 227 op->statusmsg ("Your potion had no effect.");
250 228
251 decrease_ob (tmp); 229 tmp->decrease ();
252 return 1; 230 return 1;
253 } 231 }
254 232
255 /* improvement potion - only for players */ 233 /* improvement potion - only for players */
256 if (op->type == PLAYER && tmp->attacktype & AT_GODPOWER) 234 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
257 { 235 {
258
259 for (i = 1; i < MIN (11, op->level); i++) 236 for (i = 1; i < MIN (11, op->level); i++)
260 { 237 {
261 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 238 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
262 { 239 {
263 if (op->contr->levhp[i] != 1) 240 if (op->contr->levhp[i] != 1)
264 { 241 {
265 op->contr->levhp[i] = 1; 242 op->contr->levhp[i] = 1;
266 break; 243 break;
267 } 244 }
245
268 if (op->contr->levsp[i] != 1) 246 if (op->contr->levsp[i] != 1)
269 { 247 {
270 op->contr->levsp[i] = 1; 248 op->contr->levsp[i] = 1;
271 break; 249 break;
272 } 250 }
251
273 if (op->contr->levgrace[i] != 1) 252 if (op->contr->levgrace[i] != 1)
274 { 253 {
275 op->contr->levgrace[i] = 1; 254 op->contr->levgrace[i] = 1;
276 break; 255 break;
277 } 256 }
… …
281 if (op->contr->levhp[i] < 9) 260 if (op->contr->levhp[i] < 9)
282 { 261 {
283 op->contr->levhp[i] = 9; 262 op->contr->levhp[i] = 9;
284 break; 263 break;
285 } 264 }
265
286 if (op->contr->levsp[i] < 6) 266 if (op->contr->levsp[i] < 6)
287 { 267 {
288 op->contr->levsp[i] = 6; 268 op->contr->levsp[i] = 6;
289 break; 269 break;
290 } 270 }
271
291 if (op->contr->levgrace[i] < 3) 272 if (op->contr->levgrace[i] < 3)
292 { 273 {
293 op->contr->levgrace[i] = 3; 274 op->contr->levgrace[i] = 3;
294 break; 275 break;
295 } 276 }
296 } 277 }
297 } 278 }
279
298 /* Just makes checking easier */ 280 /* Just makes checking easier */
299 if (i < MIN (11, op->level)) 281 if (i < MIN (11, op->level))
300 got_one = 1; 282 got_one = 1;
283
301 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 284 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
302 { 285 {
303 if (got_one) 286 if (got_one)
304 { 287 {
305 fix_player (op); 288 op->update_stats ();
306 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you"); 289 op->statusmsg ("The Gods smile upon you and remake you "
307 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image."); 290 "a little more in their image. "
308 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect."); 291 "You feel a little more perfect.", NDI_GREEN);
309 } 292 }
310 else 293 else
311 new_draw_info (NDI_UNIQUE, 0, op, "The potion had no effect - you are already perfect"); 294 op->statusmsg ("The potion had no effect - you are already perfect.");
312 } 295 }
313 else 296 else
314 { /* cursed potion */ 297 { /* cursed potion */
315 if (got_one) 298 if (got_one)
316 { 299 {
317 fix_player (op); 300 op->update_stats ();
318 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you."); 301 op->failmsg ("The Gods are angry and punish you.");
319 } 302 }
320 else 303 else
321 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic."); 304 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE);
322 } 305 }
306
323 decrease_ob (tmp); 307 tmp->decrease ();
324 return 1; 308 return 1;
325 } 309 }
326 310
327 311
328 /* A potion that casts a spell. Healing, restore spellpoint (power potion) 312 /* A potion that casts a spell. Healing, restore spellpoint (power potion)
… …
332 */ 316 */
333 if (tmp->inv) 317 if (tmp->inv)
334 { 318 {
335 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 319 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
336 { 320 {
337 object *fball; 321 op->failmsg ("Yech! Your lungs are on fire!");
338 322 create_exploding_ball_at (op, op->level);
339 new_draw_info (NDI_UNIQUE, 0, op, "Yech! Your lungs are on fire!");
340 /* Explodes a fireball centered at player */
341 fball = get_archetype (EXPLODING_FIREBALL);
342 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
343 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
344 fball->x = op->x;
345 fball->y = op->y;
346 insert_ob_in_map (fball, op->map, NULL, 0);
347 } 323 }
348 else 324 else
349 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 325 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
350 326
351 decrease_ob (tmp); 327 tmp->decrease ();
328
352 /* if youre dead, no point in doing this... */ 329 /* if youre dead, no point in doing this... */
353 if (!QUERY_FLAG (op, FLAG_REMOVED)) 330 if (!QUERY_FLAG (op, FLAG_REMOVED))
354 fix_player (op); 331 op->update_stats ();
332
355 return 1; 333 return 1;
356 } 334 }
357 335
358 /* Deal with protection potions */ 336 /* Deal with protection potions */
359 force = NULL; 337 force = NULL;
… …
361 { 339 {
362 if (tmp->resist[i]) 340 if (tmp->resist[i])
363 { 341 {
364 if (!force) 342 if (!force)
365 force = get_archetype (FORCE_NAME); 343 force = get_archetype (FORCE_NAME);
344
366 memcpy (force->resist, tmp->resist, sizeof (tmp->resist)); 345 memcpy (force->resist, tmp->resist, sizeof (tmp->resist));
367 force->type = POTION_EFFECT; 346 force->type = POTION_EFFECT;
368 break; /* Only need to find one protection since we copy entire batch */ 347 break; /* Only need to find one protection since we copy entire batch */
369 } 348 }
370 } 349 }
350
371 /* This is a protection potion */ 351 /* This is a protection potion */
372 if (force) 352 if (force)
373 { 353 {
374 /* cursed items last longer */ 354 /* cursed items last longer */
375 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 355 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
… …
377 force->stats.food *= 10; 357 force->stats.food *= 10;
378 for (i = 0; i < NROFATTACKS; i++) 358 for (i = 0; i < NROFATTACKS; i++)
379 if (force->resist[i] > 0) 359 if (force->resist[i] > 0)
380 force->resist[i] = -force->resist[i]; /* prot => vuln */ 360 force->resist[i] = -force->resist[i]; /* prot => vuln */
381 } 361 }
362
382 force->speed_left = -1; 363 force->speed_left = -1;
383 force = insert_ob_in_ob (force, op); 364 force = insert_ob_in_ob (force, op);
384 CLEAR_FLAG (tmp, FLAG_APPLIED); 365 CLEAR_FLAG (tmp, FLAG_APPLIED);
385 SET_FLAG (force, FLAG_APPLIED); 366 SET_FLAG (force, FLAG_APPLIED);
386 change_abil (op, force); 367 change_abil (op, force);
387 decrease_ob (tmp); 368 tmp->decrease ();
388 return 1; 369 return 1;
389 } 370 }
390 371
391 /* Only thing left are the stat potions */ 372 /* Only thing left are the stat potions */
392 if (op->type == PLAYER) 373 if (op->type == PLAYER)
393 { /* only for players */ 374 { /* only for players */
394 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0) 375 if ((QUERY_FLAG (tmp, FLAG_CURSED)
376 || QUERY_FLAG (tmp, FLAG_DAMNED))
377 && tmp->value != 0)
395 CLEAR_FLAG (tmp, FLAG_APPLIED); 378 CLEAR_FLAG (tmp, FLAG_APPLIED);
396 else 379 else
397 SET_FLAG (tmp, FLAG_APPLIED); 380 SET_FLAG (tmp, FLAG_APPLIED);
381
398 if (!change_abil (op, tmp)) 382 if (!change_abil (op, tmp))
399 new_draw_info (NDI_UNIQUE, 0, op, "Nothing happened."); 383 op->statusmsg ("Nothing happened.");
400 } 384 }
401 385
402 /* CLEAR_FLAG is so that if the character has other potions 386 /* CLEAR_FLAG is so that if the character has other potions
403 * that were grouped with the one consumed, his 387 * that were grouped with the one consumed, his
404 * stat will not be raised by them. fix_player just clears 388 * stat will not be raised by them. fix_player just clears
405 * up all the stats. 389 * up all the stats.
406 */ 390 */
407 CLEAR_FLAG (tmp, FLAG_APPLIED); 391 CLEAR_FLAG (tmp, FLAG_APPLIED);
408 fix_player (op); 392 op->update_stats ();
409 decrease_ob (tmp); 393 tmp->decrease ();
410 return 1; 394 return 1;
411} 395}
412 396
413/**************************************************************************** 397/****************************************************************************
414 * Weapon improvement code follows 398 * Weapon improvement code follows
415 ****************************************************************************/ 399 ****************************************************************************/
416 400
417/** 401/**
402 * This function just checks whether who can handle equipping an item
403 * with item_power.
404 */
405static bool
406check_item_power (object *who, int item_power)
407{
408 if (who->type == PLAYER
409 && item_power
410 && item_power + who->contr->item_power > settings.item_power_factor * who->level)
411 return false;
412 else
413 return true;
414}
415
416/**
418 * This returns the sum of nrof of item (arch name). 417 * This returns the sum of nrof of item (arch name).
419 */ 418 */
420static int 419static int
421check_item (object *op, const char *item) 420check_item (object *op, shstr_cmp item)
422{ 421{
423 int count = 0; 422 int count = 0;
424 423
425 424 if (!item)
426 if (item == NULL)
427 return 0; 425 return 0;
428 op = op->below; 426
429 while (op != NULL) 427 for (op = op->below; op; op = op->below)
430 { 428 if (op->arch->archname == item)
431 if (strcmp (op->arch->name, item) == 0)
432 {
433 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 429 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
434 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 430 && /* Loophole bug? -FD- */ !QUERY_FLAG (op, FLAG_UNPAID))
435 {
436 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
437 count++;
438 else
439 count += op->nrof; 431 count += op->number_of ();
440 } 432
441 }
442 op = op->below;
443 }
444 return count; 433 return count;
445} 434}
446 435
447/** 436/**
448 * This removes 'nrof' of what item->slaying says to remove. 437 * This removes 'nrof' of what item->slaying says to remove.
449 * op is typically the player, which is only 438 * op is typically the player, which is only
450 * really used to determine what space to look at. 439 * really used to determine what space to look at.
451 * Modified to only eat 'nrof' of objects. 440 * Modified to only eat 'nrof' of objects.
452 */ 441 */
453static void 442static void
454eat_item (object *op, const char *item, uint32 nrof) 443eat_item (object *op, shstr_cmp item, uint32 nrof)
455{ 444{
456 object *prev; 445 object *prev;
457 446
458 prev = op; 447 prev = op;
459 op = op->below; 448 op = op->below;
460 449
461 while (op != NULL) 450 while (op)
462 { 451 {
463 if (strcmp (op->arch->name, item) == 0) 452 if (op->arch->archname == item)
464 { 453 {
465 if (op->nrof >= nrof) 454 if (op->nrof >= nrof)
466 { 455 {
467 decrease_ob_nr (op, nrof); 456 op->decrease (nrof);
468 return; 457 return;
469 } 458 }
470 else 459 else
471 { 460 {
472 decrease_ob_nr (op, op->nrof); 461 op->decrease (nrof);
473 nrof -= op->nrof; 462 nrof -= op->nrof;
474 } 463 }
464
475 op = prev; 465 op = prev;
476 } 466 }
467
477 prev = op; 468 prev = op;
478 op = op->below; 469 op = op->below;
479 } 470 }
480} 471}
481 472
482/** 473/**
483 * This checks to see of the player (who) is sufficient level to use a weapon
484 * with improvs improvements (typically last_eat). We take an int here
485 * instead of the object so that the improvement code can pass along the
486 * increased value to see if the object is usuable.
487 * we return 1 (true) if the player can use the weapon.
488 */
489static int
490check_weapon_power (const object *who, int improvs)
491{
492
493/* Old code is below (commented out). Basically, since weapons are the only
494 * object players really have any control to improve, it's a bit harsh to
495 * require high level in some combat skill, so we just use overall level.
496 */
497#if 1
498 if (((who->level / 5) + 5) >= improvs)
499 return 1;
500 else
501 return 0;
502
503#else
504 int level = 0;
505
506 /* The skill system hands out wc and dam bonuses to fighters
507 * more generously than the old system (see fix_player). Thus
508 * we need to curtail the power of player enchanted weapons.
509 * I changed this to 1 improvement per "fighter" level/5 -b.t.
510 * Note: Nothing should break by allowing this ratio to be different or
511 * using normal level - it is just a matter of play balance.
512 */
513 if (who->type == PLAYER)
514 {
515 object *wc_obj = NULL;
516
517 for (wc_obj = who->inv; wc_obj; wc_obj = wc_obj->below)
518 if (wc_obj->type == SKILL && IS_COMBAT_SKILL (wc_obj->subtype) && wc_obj->level > level)
519 level = wc_obj->level;
520
521 if (!level)
522 {
523 LOG (llevError, "Error: Player: %s lacks wc experience object\n", who->name);
524 level = who->level;
525 }
526 }
527 else
528 level = who->level;
529
530 return (improvs <= ((level / 5) + 5));
531#endif
532}
533
534/**
535 * Returns how many items of type improver->slaying there are under op. 474 * Returns how many items of type improver->slaying there are under op.
536 * Will display a message if none found, and 1 if improver->slaying is NULL. 475 * Will display a message if none found, and 1 if improver->slaying is NULL.
537 */ 476 */
538static int 477static int
539check_sacrifice (object *op, const object *improver) 478check_sacrifice (object *op, const object *improver)
540{ 479{
541 int count = 0; 480 int count = 0;
542 481
543 if (improver->slaying != NULL) 482 if (improver->slaying)
544 { 483 {
545 count = check_item (op, improver->slaying); 484 count = check_item (op, improver->slaying);
546 if (count < 1) 485 if (count < 1)
547 { 486 {
548 char buf[200];
549
550 sprintf (buf, "The gods want more %ss", &improver->slaying); 487 op->failmsg (format ("The gods want more %ss", &improver->slaying));
551 new_draw_info (NDI_UNIQUE, 0, op, buf);
552 return 0; 488 return 0;
553 } 489 }
554 } 490 }
555 else 491 else
556 count = 1; 492 count = 1;
… …
559} 495}
560 496
561/** 497/**
562 * Actually improves the weapon, and tells user. 498 * Actually improves the weapon, and tells user.
563 */ 499 */
564int 500static int
565improve_weapon_stat (object *op, object *improver, object *weapon, signed char *stat, int sacrifice_count, const char *statname) 501improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
566{ 502{
567
568 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
569 *stat += sacrifice_count; 503 stat += sacrifice_count;
570 weapon->last_eat++; 504 weapon->last_eat++;
571 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count); 505 improver->decrease ();
572 decrease_ob (improver);
573 506
574 /* So it updates the players stats and the window */ 507 /* So it updates the players stats and the window */
575 fix_player (op); 508 op->update_stats ();
509
510 op->statusmsg (format (
511 "Your sacrifice was accepted.\n"
512 "Weapon's bonus to %s improved by %d.",
513 statname, sacrifice_count
514 ));
515
576 return 1; 516 return 1;
577} 517}
578 518
579/* Types of improvements, hidden in the sp field. */ 519/* Types of improvements, hidden in the sp field. */
580#define IMPROVE_PREPARE 1 520#define IMPROVE_PREPARE 1
581#define IMPROVE_DAMAGE 2 521#define IMPROVE_DAMAGE 2
582#define IMPROVE_WEIGHT 3 522#define IMPROVE_WEIGHT 3
583#define IMPROVE_ENCHANT 4 523#define IMPROVE_ENCHANT 4
584#define IMPROVE_STR 5 524#define IMPROVE_STR 5
585#define IMPROVE_DEX 6 525#define IMPROVE_DEX 6
586#define IMPROVE_CON 7 526#define IMPROVE_CON 7
587#define IMPROVE_WIS 8 527#define IMPROVE_WIS 8
588#define IMPROVE_CHA 9 528#define IMPROVE_CHA 9
589#define IMPROVE_INT 10 529#define IMPROVE_INT 10
590#define IMPROVE_POW 11 530#define IMPROVE_POW 11
591
592 531
593/** 532/**
594 * This does the prepare weapon scroll. 533 * This does the prepare weapon scroll.
595 * Checks for sacrifice, and so on. 534 * Checks for sacrifice, and so on.
596 */ 535 */
597
598int 536int
599prepare_weapon (object *op, object *improver, object *weapon) 537prepare_weapon (object *op, object *improver, object *weapon)
600{ 538{
601 int sacrifice_count, i; 539 int sacrifice_count, i;
602 char buf[MAX_BUF]; 540 char buf[MAX_BUF];
603 541
604 if (weapon->level != 0) 542 if (weapon->level != 0)
605 { 543 {
606 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared."); 544 op->failmsg ("Weapon is already prepared!");
607 return 0; 545 return 0;
608 } 546 }
547
609 for (i = 0; i < NROFATTACKS; i++) 548 for (i = 0; i < NROFATTACKS; i++)
610 if (weapon->resist[i]) 549 if (weapon->resist[i])
611 break; 550 break;
612 551
613 /* If we break out, i will be less than nrofattacks, preventing 552 /* If we break out, i will be less than nrofattacks, preventing
… …
616 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 555 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
617 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 556 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
618 weapon->stats.exp || /* speed */ 557 weapon->stats.exp || /* speed */
619 weapon->stats.ac) /* AC - only taifu's I think */ 558 weapon->stats.ac) /* AC - only taifu's I think */
620 { 559 {
621 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons."); 560 op->failmsg ("You cannot prepare magic weapons. "
561 "H<A weapon is considered magical if it changes regeneration, "
562 "speed or ac, or has other protections.>");
622 return 0; 563 return 0;
623 } 564 }
565
624 sacrifice_count = check_sacrifice (op, improver); 566 sacrifice_count = check_sacrifice (op, improver);
625 if (sacrifice_count <= 0) 567 if (sacrifice_count <= 0)
626 return 0; 568 return 0;
569
627 weapon->level = isqrt (sacrifice_count); 570 weapon->level = isqrt (sacrifice_count);
628 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
629 eat_item (op, improver->slaying, sacrifice_count); 571 eat_item (op, improver->slaying, sacrifice_count);
630 572
631 new_draw_info_format (NDI_UNIQUE, 0, op, "Your *%s may be improved %d times.", &weapon->name, weapon->level); 573 op->statusmsg (format (
574 "Your sacrifice was accepted."
575 "Your *%s may be improved %d times.",
576 &weapon->name, weapon->level
577 ));
632 578
633 sprintf (buf, "%s's %s", &op->name, &weapon->name); 579 sprintf (buf, "%s's %s", &op->name, &weapon->name);
634 weapon->name = weapon->name_pl = buf; 580 weapon->name = weapon->name_pl = buf;
635 weapon->nrof = 0; /* prevents preparing n weapons in the same 581 weapon->nrof = 0; /* prevents preparing n weapons in the same
636 slot at once! */ 582 slot at once! */
637 decrease_ob (improver); 583 improver->decrease ();
638 weapon->last_eat = 0; 584 weapon->last_eat = 0;
639 return 1; 585 return 1;
640} 586}
641
642 587
643/** 588/**
644 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 589 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
645 * This is the new improve weapon code. 590 * This is the new improve weapon code.
646 * Returns 0 if it was not able to work for some reason. 591 * Returns 0 if it was not able to work for some reason.
… …
655improve_weapon (object *op, object *improver, object *weapon) 600improve_weapon (object *op, object *improver, object *weapon)
656{ 601{
657 int sacrifice_count, sacrifice_needed = 0; 602 int sacrifice_count, sacrifice_needed = 0;
658 603
659 if (improver->stats.sp == IMPROVE_PREPARE) 604 if (improver->stats.sp == IMPROVE_PREPARE)
660 {
661 return prepare_weapon (op, improver, weapon); 605 return prepare_weapon (op, improver, weapon);
662 } 606
663 if (weapon->level == 0) 607 if (weapon->level == 0)
664 { 608 {
665 new_draw_info (NDI_UNIQUE, 0, op, "This weapon has not been prepared."); 609 op->failmsg (
610 "This weapon has not been prepared."
611 " H<You first have to prepare a weapon with a prepare weapon scroll.>");
666 return 0; 612 return 0;
667 } 613 }
668 if (weapon->level == weapon->last_eat && weapon->item_power >= 100) 614
615 if (weapon->last_eat >= weapon->level // improvements used up
616 || weapon->item_power >= 100) // or item_power >= arbitrary limit of 100
669 { 617 {
670 new_draw_info (NDI_UNIQUE, 0, op, "This weapon cannot be improved any more."); 618 op->failmsg ("This weapon cannot be improved any more.");
671 return 0; 619 return 0;
672 } 620 }
673 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1)) 621
622 if (QUERY_FLAG (weapon, FLAG_APPLIED)
623 && !check_item_power (op, weapon->item_power + 1))
674 { 624 {
675 new_draw_info (NDI_UNIQUE, 0, op, "Improving the weapon will make it too"); 625 op->failmsg ("Improving the weapon will make it too "
676 new_draw_info (NDI_UNIQUE, 0, op, "powerful for you to use. Unready it if you"); 626 "powerful for you to use. Unready it if you "
677 new_draw_info (NDI_UNIQUE, 0, op, "really want to improve it."); 627 "really want to improve it.");
678 return 0; 628 return 0;
679 } 629 }
630
680 /* This just increases damage by 5 points, no matter what. No sacrifice 631 /* This just increases damage by 5 points, no matter what. No sacrifice
681 * is needed. Since stats.dam is now a 16 bit value and not 8 bit, 632 * is needed. Since stats.dam is now a 16 bit value and not 8 bit,
682 * don't put any maximum value on damage - the limit is how much the 633 * don't put any maximum value on damage - the limit is how much the
683 * weapon can be improved. 634 * weapon can be improved.
684 */ 635 */
685 if (improver->stats.sp == IMPROVE_DAMAGE) 636 if (improver->stats.sp == IMPROVE_DAMAGE)
686 { 637 {
687 weapon->stats.dam += 5; 638 weapon->stats.dam += 5;
688 weapon->weight += 5000; /* 5 KG's */ 639 weapon->weight += 5000; /* 5 KG's */
689 new_draw_info_format (NDI_UNIQUE, 0, op, "Damage has been increased by 5 to %d", weapon->stats.dam); 640 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
690 weapon->last_eat++; 641 weapon->last_eat++;
691 642
692 weapon->item_power++; 643 weapon->item_power++;
693 decrease_ob (improver); 644 improver->decrease ();
694 return 1; 645 return 1;
695 } 646 }
647
696 if (improver->stats.sp == IMPROVE_WEIGHT) 648 if (improver->stats.sp == IMPROVE_WEIGHT)
697 { 649 {
698 /* Reduce weight by 20% */ 650 /* Reduce weight by 20% */
699 weapon->weight = (weapon->weight * 8) / 10; 651 weapon->weight = (weapon->weight * 8) / 10;
700 if (weapon->weight < 1) 652 if (weapon->weight < 1)
701 weapon->weight = 1; 653 weapon->weight = 1;
654
702 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon weight reduced to %6.1f kg", (float) weapon->weight / 1000.0); 655 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
703 weapon->last_eat++; 656 weapon->last_eat++;
704 weapon->item_power++; 657 weapon->item_power++;
705 decrease_ob (improver); 658 improver->decrease ();
706 return 1; 659 return 1;
707 } 660 }
661
708 if (improver->stats.sp == IMPROVE_ENCHANT) 662 if (improver->stats.sp == IMPROVE_ENCHANT)
709 { 663 {
710 weapon->magic++; 664 weapon->magic++;
711 weapon->last_eat++; 665 weapon->last_eat++;
712 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon magic increased to %d", weapon->magic); 666 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
713 decrease_ob (improver); 667 improver->decrease ();
714 weapon->item_power++; 668 weapon->item_power++;
715 return 1; 669 return 1;
716 } 670 }
717 671
718 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 672 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
723 sacrifice_needed *= 2; 677 sacrifice_needed *= 2;
724 678
725 sacrifice_count = check_sacrifice (op, improver); 679 sacrifice_count = check_sacrifice (op, improver);
726 if (sacrifice_count < sacrifice_needed) 680 if (sacrifice_count < sacrifice_needed)
727 { 681 {
728 new_draw_info_format (NDI_UNIQUE, 0, op, "You need at least %d %s", sacrifice_needed, &improver->slaying); 682 op->failmsg (format ("You need at least %d %s.", sacrifice_needed, &improver->slaying));
729 return 0; 683 return 0;
730 } 684 }
685
731 eat_item (op, improver->slaying, sacrifice_needed); 686 eat_item (op, improver->slaying, sacrifice_needed);
732 weapon->item_power++; 687 weapon->item_power++;
733 688
734 switch (improver->stats.sp) 689 switch (improver->stats.sp)
735 { 690 {
736 case IMPROVE_STR:
737 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Str), 1, "strength"); 691 case IMPROVE_STR: return improve_weapon_stat (op, improver, weapon, weapon->stats.Str, 1, "strength");
738 case IMPROVE_DEX:
739 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Dex), 1, "dexterity"); 692 case IMPROVE_DEX: return improve_weapon_stat (op, improver, weapon, weapon->stats.Dex, 1, "dexterity");
740 case IMPROVE_CON:
741 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Con), 1, "constitution"); 693 case IMPROVE_CON: return improve_weapon_stat (op, improver, weapon, weapon->stats.Con, 1, "constitution");
742 case IMPROVE_WIS:
743 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Wis), 1, "wisdom"); 694 case IMPROVE_WIS: return improve_weapon_stat (op, improver, weapon, weapon->stats.Wis, 1, "wisdom");
744 case IMPROVE_CHA:
745 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Cha), 1, "charisma"); 695 case IMPROVE_CHA: return improve_weapon_stat (op, improver, weapon, weapon->stats.Cha, 1, "charisma");
746 case IMPROVE_INT:
747 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Int), 1, "intelligence"); 696 case IMPROVE_INT: return improve_weapon_stat (op, improver, weapon, weapon->stats.Int, 1, "intelligence");
748 case IMPROVE_POW:
749 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Pow), 1, "power"); 697 case IMPROVE_POW: return improve_weapon_stat (op, improver, weapon, weapon->stats.Pow, 1, "power");
750 default: 698 default:
751 new_draw_info (NDI_UNIQUE, 0, op, "Unknown improvement type."); 699 op->failmsg ("Unknown improvement type.");
752 } 700 }
701
753 LOG (llevError, "improve_weapon: Got to end of function\n"); 702 LOG (llevError, "improve_weapon: Got to end of function\n");
754 return 0; 703 return 0;
755} 704}
756 705
757/** 706/**
758 * Handles the applying of improve/prepare/enchant weapon scroll. 707 * Handles the applying of improve/prepare/enchant weapon scroll.
759 * Checks a few things (not on a non-magic square, marked weapon, ...), 708 * Checks a few things (not on a non-magic square, marked weapon, ...),
760 * then calls improve_weapon to do the dirty work. 709 * then calls improve_weapon to do the dirty work.
761 */ 710 */
762int 711static int
763check_improve_weapon (object *op, object *tmp) 712check_improve_weapon (object *op, object *tmp)
764{ 713{
765 object *otmp; 714 object *otmp;
766 715
767 if (op->type != PLAYER) 716 if (op->type != PLAYER)
768 return 0; 717 return 0;
718
769 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 719 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
770 { 720 {
771 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 721 op->failmsg ("Something blocks the magic of the scroll!");
772 return 0; 722 return 0;
773 } 723 }
724
774 otmp = find_marked_object (op); 725 otmp = find_marked_object (op);
726
775 if (!otmp) 727 if (!otmp)
776 { 728 {
777 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 729 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
778 return 0; 730 return 0;
779 } 731 }
732
780 if (otmp->type != WEAPON && otmp->type != BOW) 733 if (otmp->type != WEAPON && otmp->type != BOW)
781 { 734 {
782 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow"); 735 op->failmsg ("Marked item is not a weapon or bow!");
783 return 0; 736 return 0;
784 } 737 }
785 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 738
739 op->statusmsg ("Applied weapon builder.");
740
786 improve_weapon (op, tmp, otmp); 741 improve_weapon (op, tmp, otmp);
787 esrv_send_item (op, otmp); 742 esrv_send_item (op, otmp);
788 return 1; 743 return 1;
789} 744}
790 745
… …
815{ 770{
816 object *tmp; 771 object *tmp;
817 772
818 if (armour->magic >= settings.armor_max_enchant) 773 if (armour->magic >= settings.armor_max_enchant)
819 { 774 {
820 new_draw_info (NDI_UNIQUE, 0, op, "This armour can not be enchanted any further."); 775 op->failmsg ("This armour can not be enchanted any further!");
821 return 0; 776 return 0;
822 } 777 }
778
823 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 779 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
824 * etc), so take the easy way out and don't worry about it. 780 * etc), so take the easy way out and don't worry about it.
825 * Note - maybe add scrolls which make the random artifact versions (eg, armour 781 * Note - maybe add scrolls which make the random artifact versions (eg, armour
826 * of gnarg and what not?) 782 * of gnarg and what not?)
827 */ 783 */
828 if (armour->title) 784 if (armour->title)
829 { 785 {
830 new_draw_info (NDI_UNIQUE, 0, op, "This armour will not accept further enchantment."); 786 op->failmsg ("This armour will not accept further enchantment.");
831 return 0; 787 return 0;
832 } 788 }
833 789
834 /* Split objects if needed. Can't insert tmp until the 790 /* Split objects if needed. Can't insert tmp until the
835 * end of this function - otherwise it will just re-merge. 791 * end of this function - otherwise it will just re-merge.
836 */ 792 */
837 if (armour->nrof > 1) 793 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
838 tmp = get_split_ob (armour, armour->nrof - 1);
839 else
840 tmp = NULL;
841 794
842 armour->magic++; 795 armour->magic++;
843 796
844 if (!settings.armor_speed_linear) 797 if (!settings.armor_speed_linear)
845 { 798 {
… …
850 { 803 {
851 base = base - (base * settings.armor_speed_improvement) / 100; 804 base = base - (base * settings.armor_speed_improvement) / 100;
852 pow++; 805 pow++;
853 } 806 }
854 807
855 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * base) / 100; 808 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * base) / 100;
856 } 809 }
857 else 810 else
858 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * (100 + armour->magic * settings.armor_speed_improvement)) / 100; 811 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * (100 + armour->magic * settings.armor_speed_improvement)) / 100;
859 812
860 if (!settings.armor_weight_linear) 813 if (!settings.armor_weight_linear)
861 { 814 {
862 int base = 100; 815 int base = 100;
863 int pow = 0; 816 int pow = 0;
… …
866 { 819 {
867 base = base - (base * settings.armor_weight_reduction) / 100; 820 base = base - (base * settings.armor_weight_reduction) / 100;
868 pow++; 821 pow++;
869 } 822 }
870 823
871 armour->weight = (armour->arch->clone.weight * base) / 100; 824 armour->weight = (armour->arch->weight * base) / 100;
872 } 825 }
873 else 826 else
874 armour->weight = (armour->arch->clone.weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100; 827 armour->weight = (armour->arch->weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100;
875 828
876 if (armour->weight <= 0) 829 if (armour->weight <= 0)
877 { 830 {
878 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n."); 831 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");
879 armour->weight = 1; 832 armour->weight = 1;
880 } 833 }
881 834
882 armour->item_power = get_power_from_ench (armour->arch->clone.item_power + armour->magic); 835 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
883 836
884 if (op->type == PLAYER) 837 if (op->type == PLAYER)
885 { 838 {
886 esrv_send_item (op, armour); 839 esrv_send_item (op, armour);
840
887 if (QUERY_FLAG (armour, FLAG_APPLIED)) 841 if (QUERY_FLAG (armour, FLAG_APPLIED))
888 fix_player (op); 842 op->update_stats ();
889 } 843 }
890 decrease_ob (improver); 844
845 improver->decrease ();
846
891 if (tmp) 847 if (tmp)
892 { 848 op->insert (tmp);
893 insert_ob_in_ob (tmp, op); 849
894 esrv_send_item (op, tmp);
895 }
896 return 1; 850 return 1;
897} 851}
898
899 852
900/* 853/*
901 * convert_item() returns 1 if anything was converted, 0 if the item was not 854 * convert_item() returns 1 if anything was converted, 0 if the item was not
902 * what the converter wants, -1 if the converter is broken. 855 * what the converter wants, -1 if the converter is broken.
903 */ 856 *
904#define CONV_FROM(xyz) xyz->slaying
905#define CONV_TO(xyz) xyz->other_arch
906#define CONV_NR(xyz) xyz->stats.sp
907#define CONV_NEED(xyz) xyz->stats.food
908
909/* Takes one items and makes another. 857 * Takes one type of items and makes another.
910 * converter is the object that is doing the conversion. 858 * converter is the object that is doing the conversion.
911 * item is the object that triggered the converter - if it is not 859 * item is the object that triggered the converter - if it is not
912 * what the converter wants, this will not do anything. 860 * what the converter wants, this will not do anything.
913 */ 861 */
914int 862int
915convert_item (object *item, object *converter) 863convert_item (object *item, object *converter)
916{ 864{
917 int nr = 0;
918 uint32 price_in; 865 sint64 nr, price_in;
866
867 if (item->flag [FLAG_UNPAID])
868 return 0;
869
870 shstr conv_from = converter->slaying;
871 archetype *conv_to = converter->other_arch;
872 sint64 need = converter->stats.food;
873 sint64 give = converter->stats.sp;
919 874
920 /* We make some assumptions - we assume if it takes money as it type, 875 /* We make some assumptions - we assume if it takes money as it type,
921 * it wants some amount. We don't make change (ie, if something costs 876 * it wants some amount. We don't make change (ie, if something costs
922 * 3 gp and player drops a platinum, tough luck) 877 * 3 gp and player drops a platinum, tough luck)
923 */ 878 */
924 if (!strcmp (CONV_FROM (converter), "money")) 879 if (conv_from == shstr_money)
925 { 880 {
926 int cost;
927
928 if (item->type != MONEY) 881 if (item->type != MONEY)
929 return 0; 882 return 0;
930 883
931 nr = (item->nrof * item->value) / CONV_NEED (converter); 884 nr = sint64 (item->nrof) * item->value / need;
932 if (!nr) 885 if (!nr)
933 return 0; 886 return 0;
934 cost = nr * CONV_NEED (converter) / item->value; 887
935 /* take into account rounding errors */ 888 converter->play_sound (sound_find ("shop_buy"));
936 if (nr * CONV_NEED (converter) % item->value) 889
937 cost++; 890 sint64 cost = (nr * need + item->value - 1) / item->value;
938 decrease_ob_nr (item, cost); 891
892 item->decrease (cost);
939 893
940 price_in = cost * item->value; 894 price_in = cost * item->value;
941 } 895 }
942 else 896 else
943 { 897 {
944 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name || 898 if (item->type == PLAYER
945 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 899 || conv_from != item->arch->archname
900 || (need && need > (uint16) item->nrof))
946 return 0; 901 return 0;
947 902
948 if (CONV_NEED (converter)) 903 converter->play_sound (sound_find ("convert_item"));
904
905 if (need)
949 { 906 {
950 nr = item->nrof / CONV_NEED (converter); 907 nr = sint64 (item->nrof) / need;
951 decrease_ob_nr (item, nr * CONV_NEED (converter)); 908 item->decrease (nr * need);
952 price_in = nr * CONV_NEED (converter) * item->value; 909 price_in = nr * need * item->value;
953 } 910 }
954 else 911 else
955 { 912 {
956 price_in = item->value; 913 price_in = item->value;
957 remove_ob (item); 914 item->destroy ();
958 free_object (item);
959 } 915 }
960 } 916 }
961 917
962 if (converter->inv != NULL) 918 if (converter->inv)
963 { 919 {
964 object *ob; 920 object *ob;
965 int i; 921 int i;
966 object *ob_to_copy; 922 object *ob_to_copy;
967 923
968 /* select random object from inventory to copy */ 924 /* select random object from inventory to copy */
969 ob_to_copy = converter->inv; 925 ob_to_copy = converter->inv;
970 for (ob = converter->inv->below, i = 1; ob != NULL; ob = ob->below, i++) 926 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
971 {
972 if (rndm (0, i) == 0) 927 if (rndm (0, i) == 0)
973 {
974 ob_to_copy = ob; 928 ob_to_copy = ob;
975 } 929
976 } 930 item = ob_to_copy->deep_clone ();
977 item = object_create_clone (ob_to_copy);
978 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 931 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
979 unflag_inv (item, FLAG_IS_A_TEMPLATE); 932 unflag_inv (item, FLAG_IS_A_TEMPLATE);
980 } 933 }
981 else 934 else
982 { 935 {
983 if (converter->other_arch == NULL) 936 if (!conv_to)
984 { 937 {
985 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 938 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
986 &converter->name, converter->map->path, converter->x, converter->y); 939 &converter->name, &converter->map->path, converter->x, converter->y);
987 return -1; 940 return -1;
988 } 941 }
989 942
990 item = object_create_arch (converter->other_arch); 943 item = object_create_arch (conv_to);
991 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 944 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
992 } 945 }
993 946
994 if (CONV_NR (converter)) 947 if (give)
995 item->nrof = CONV_NR (converter); 948 item->nrof = give;
949
996 if (nr) 950 if (nr)
997 item->nrof *= nr; 951 item->nrof *= nr;
998 if (is_in_shop (converter)) 952
953 if (converter->flag [FLAG_PRECIOUS])
999 SET_FLAG (item, FLAG_UNPAID); 954 SET_FLAG (item, FLAG_UNPAID);
955
956 if (is_in_shop (converter))
957 {
958 // converters on shop floors don't work anymore, bug lets check for it
959 // and report in case someone still does it.
960 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
961 converter->debug_desc ());
962 SET_FLAG (item, FLAG_UNPAID);
963 }
1000 else if (price_in < item->nrof * item->value) 964 else if (price_in < sint64 (item->nrof) * item->value)
1001 { 965 {
1002 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 966 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1003 &converter->name, converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 967 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1004
1005 /** 968 /**
1006 * elmex: we are going to let the game continue, as the mapcreator 969 * elmex: we are going to let the game continue, as the mapcreator
1007 * propably had something in mind when doing this 970 * hopefully had something in mind when doing this.
1008 */ 971 */
1009 } 972 }
973
974 // elmex: only identify if we need to, for example so that generated money doesn't
975 // get an 'identified' flag so easily.
976 if (need_identify (item))
977 identify (item);
978
1010 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 979 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1011 return 1; 980 return 1;
1012} 981}
1013 982
1014/** 983/**
1015 * Handle apply on containers. 984 * Handle apply on containers.
1016 * By Eneq(@csd.uu.se). 985 * By Eneq(@csd.uu.se).
1017 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 986 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1018 * added the alchemical cauldron to the code -b.t. 987 * added the alchemical cauldron to the code -b.t.
1019 */ 988 */
1020 989static int
1021int
1022apply_container (object *op, object *sack) 990apply_container (object *op, object *sack)
1023{ 991{
1024 char buf[MAX_BUF]; 992 if (op->type != PLAYER || !op->contr->ns)
1025 object *tmp;
1026
1027 if (op->type != PLAYER)
1028 return 0; /* This might change */ 993 return 0; /* This might change */
1029 994
1030 if (sack == NULL || sack->type != CONTAINER) 995 if (!sack || sack->type != CONTAINER)
1031 { 996 {
1032 LOG (llevError, "apply_container: %s is not container!\n", &sack->name); 997 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1033 return 0; 998 return 0;
1034 } 999 }
1035 op->contr->last_used = NULL; 1000
1036 op->contr->last_used_id = 0; 1001 op->contr->last_used = 0;
1037 1002
1038 if (sack->env != op) 1003 if (sack->env && sack->env != op)
1004 {
1005 op->failmsg ("You must put it onto the floor or into your inventory first.");
1006 return 1;
1039 { 1007 }
1040 if (sack->other_arch == NULL || sack->env != NULL) 1008
1009 // already applied == open on ground, or open in inv, or active in inv
1010 if (sack->flag [FLAG_APPLIED])
1011 {
1012 if (op->container_ () == sack)
1041 { 1013 {
1042 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first."); 1014 // open on ground or inv, so close
1015 op->close_container ();
1043 return 1; 1016 return 1;
1044 } 1017 }
1045 /* It's on the ground, the problems begin */ 1018 else if (!sack->env)
1046 if (op->container != sack)
1047 {
1048 /* it's closed OR some player has opened it */
1049 if (QUERY_FLAG (sack, FLAG_APPLIED))
1050 {
1051 for (tmp = get_map_ob (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above);
1052 if (tmp)
1053 {
1054 /* some other player have opened it */
1055 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1056 return 1;
1057 }
1058 }
1059 } 1019 {
1060 if (QUERY_FLAG (sack, FLAG_APPLIED)) 1020 // active, but not ours: some other player has opened it
1021 op->failmsg (format ("Somebody else is using the %s already.", query_name (sack)));
1022 return 1;
1061 { 1023 }
1062 if (op->container == NULL)
1063 {
1064 tmp = arch_to_object (sack->other_arch);
1065 /* not good, but insert_ob_in_ob() is too smart */
1066 CLEAR_FLAG (tmp, FLAG_REMOVED);
1067 tmp->x = tmp->y = 0;
1068 tmp->map = NULL;
1069 tmp->env = sack;
1070 if (sack->inv)
1071 sack->inv->above = tmp;
1072 tmp->below = sack->inv;
1073 tmp->above = NULL;
1074 sack->inv = tmp;
1075 sack->move_off = MOVE_ALL; /* trying force closing it */
1076 }
1077 else
1078 {
1079 sack->move_off = 0;
1080 tmp = sack->inv;
1081 if (tmp && tmp->type == CLOSE_CON)
1082 {
1083 remove_ob (tmp);
1084 free_object (tmp);
1085 }
1086 }
1087 }
1088 }
1089 1024
1090 if (QUERY_FLAG (sack, FLAG_APPLIED)) 1025 // fall through to opening it (active in inv)
1091 { 1026 }
1027 else if (sack->env)
1028 {
1029 // it is in our env, so activate it, do not open yet
1092 if (op->container) 1030 op->close_container ();
1093 { 1031 sack->flag [FLAG_APPLIED] = 1;
1094 if (op->container != sack) 1032 esrv_update_item (UPD_FLAGS, op, sack);
1095 { 1033 op->statusmsg (format ("You ready %s.", query_name (sack)));
1096 tmp = op->container; 1034 return 1;
1097 apply_container (op, tmp); 1035 }
1098 sprintf (buf, "You close %s and open ", query_name (tmp)); 1036
1099 op->container = sack; 1037 // it's locked?
1100 strcat (buf, query_name (sack)); 1038 if (sack->slaying)
1101 strcat (buf, "."); 1039 {
1102 } 1040 if (object *tmp = find_key (op, op, sack))
1103 else 1041 op->statusmsg (format ("You unlock %s with %s.", query_name (sack), query_name (tmp)));
1104 {
1105 CLEAR_FLAG (sack, FLAG_APPLIED);
1106 op->container = NULL;
1107 sprintf (buf, "You close %s.", query_name (sack));
1108 }
1109 }
1110 else 1042 else
1111 { 1043 {
1112 CLEAR_FLAG (sack, FLAG_APPLIED);
1113 sprintf (buf, "You open %s.", query_name (sack));
1114 SET_FLAG (sack, FLAG_APPLIED);
1115 op->container = sack;
1116 }
1117 }
1118 else
1119 { /* not applied */
1120 if (sack->slaying)
1121 { /* it's locked */
1122 tmp = find_key (op, op, sack);
1123 if (tmp)
1124 {
1125 sprintf (buf, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1126 SET_FLAG (sack, FLAG_APPLIED);
1127 if (sack->env == NULL)
1128 { /* if it's on ground,open it also */
1129 new_draw_info (NDI_UNIQUE, 0, op, buf);
1130 apply_container (op, sack);
1131 return 1;
1132 }
1133 }
1134 else
1135 {
1136 sprintf (buf, "You don't have the key to unlock %s.", query_name (sack)); 1044 op->statusmsg (format ("You don't have the key to unlock %s.", query_name (sack)));
1137 }
1138 }
1139 else
1140 {
1141 sprintf (buf, "You readied %s.", query_name (sack));
1142 SET_FLAG (sack, FLAG_APPLIED);
1143 if (sack->env == NULL)
1144 { /* if it's on ground,open it also */
1145 new_draw_info (NDI_UNIQUE, 0, op, buf);
1146 apply_container (op, sack);
1147 return 1; 1045 return 1;
1148 } 1046 }
1149 }
1150 } 1047 }
1151 new_draw_info (NDI_UNIQUE, 0, op, buf); 1048
1152 if (op->contr) 1049 op->open_container (sack);
1153 op->contr->socket.update_look = 1; 1050
1154 return 1; 1051 return 1;
1155} 1052}
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->name);
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 1053
1282/** 1054/**
1283 * Handles dropping things on altar. 1055 * Handles dropping things on altar.
1284 * Returns true if sacrifice was accepted. 1056 * Returns true if sacrifice was accepted.
1285 */ 1057 */
… …
1288{ 1060{
1289 /* Only players can make sacrifices on spell casting altars. */ 1061 /* Only players can make sacrifices on spell casting altars. */
1290 if (altar->inv && (!originator || originator->type != PLAYER)) 1062 if (altar->inv && (!originator || originator->type != PLAYER))
1291 return 0; 1063 return 0;
1292 1064
1293 if (operate_altar (altar, &sacrifice)) 1065 if (operate_altar (altar, &sacrifice, originator))
1294 { 1066 {
1295 /* Simple check. Unfortunately, it means you can't cast magic bullet 1067 /* Simple check. Unfortunately, it means you can't cast magic bullet
1296 * with an altar. We call it a Potion - altars are stationary - it 1068 * with an altar. We call it a Potion - altars are stationary - it
1297 * is up to map designers to use them properly. 1069 * is up to map designers to use them properly.
1298 */ 1070 */
1299 if (altar->inv && altar->inv->type == SPELL) 1071 if (altar->inv && altar->inv->type == SPELL)
1300 { 1072 {
1301 new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.", &altar->inv->name); 1073 originator->statusmsg (format ("The altar casts %s.", &altar->inv->name));
1302 cast_spell (originator, altar, 0, altar->inv, NULL); 1074 cast_spell (originator, altar, 0, altar->inv, NULL);
1303 /* If it is connected, push the button. Fixes some problems with 1075 /* If it is connected, push the button. Fixes some problems with
1304 * old maps. 1076 * old maps.
1305 */ 1077 */
1306 1078
1307/* push_button (altar);*/ 1079/* push_button (altar);*/
1308 } 1080 }
1309 else 1081 else
1310 { 1082 {
1311 altar->value = 1; /* works only once */ 1083 altar->value = 1; /* works only once */
1312 push_button (altar); 1084 push_button (altar, originator);
1313 } 1085 }
1314 1086
1315 return !sacrifice; 1087 return !sacrifice;
1316 } 1088 }
1317 else 1089 else
… …
1332 double opinion; 1104 double opinion;
1333 object *tmp, *next; 1105 object *tmp, *next;
1334 1106
1335 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1107 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1336 1108
1337 if (op->type != PLAYER) 1109 bool has_unpaid = false;
1110
1111 // quite inefficient to do this here twice, but the api doesn't lend itself to
1112 // a quick and small change :(
1113 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1114 if (item->flag [FLAG_UNPAID])
1115 {
1116 has_unpaid = true;
1117 break;
1118 }
1119
1120 if (!op->is_player ())
1338 { 1121 {
1339 /* Remove all the unpaid objects that may be carried here. 1122 /* Remove all the unpaid objects that may be carried here.
1340 * This could be pets or monsters that are somehow in 1123 * This could be pets or monsters that are somehow in
1341 * the shop. 1124 * the shop.
1342 */ 1125 */
… …
1346 1129
1347 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1130 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1348 { 1131 {
1349 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1132 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1350 1133
1351 remove_ob (tmp);
1352
1353 if (i == -1) 1134 if (i >= 0)
1354 i = 0; 1135 tmp->move (i);
1355
1356 tmp->map = op->map;
1357 tmp->x = op->x + freearr_x[i];
1358 tmp->y = op->y + freearr_y[i];
1359 insert_ob_in_map (tmp, op->map, op, 0);
1360 } 1136 }
1361 } 1137 }
1362 1138
1363 /* Don't teleport things like spell effects */ 1139 /* Don't teleport things like spell effects */
1364 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1140 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1367 /* unpaid objects, or non living objects, can't transfer by 1143 /* unpaid objects, or non living objects, can't transfer by
1368 * shop mats. Instead, put it on a nearby space. 1144 * shop mats. Instead, put it on a nearby space.
1369 */ 1145 */
1370 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE)) 1146 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE))
1371 { 1147 {
1372
1373 /* Somebody dropped an unpaid item, just move to an adjacent place. */ 1148 /* Somebody dropped an unpaid item, just move to an adjacent place. */
1374 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1149 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1375 1150
1376 if (i != -1) 1151 if (i != -1)
1377 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1152 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1378 1153
1379 return 0; 1154 return 0;
1380 } 1155 }
1156
1381 /* Removed code that checked for multipart objects - it appears that 1157 /* Removed code that checked for multipart objects - it appears that
1382 * the teleport function should be able to handle this just fine. 1158 * the teleport function should be able to handle this just fine.
1383 */ 1159 */
1384 rv = teleport (shop_mat, SHOP_MAT, op); 1160 rv = teleport (shop_mat, SHOP_MAT, op);
1385 } 1161 }
1386 else if (can_pay (op) && get_payment (op)) 1162 else if (can_pay (op) && get_payment (op))
1387 { 1163 {
1388 /* this is only used for players */ 1164 /* this is only used for players */
1389 rv = teleport (shop_mat, SHOP_MAT, op); 1165 rv = teleport (shop_mat, SHOP_MAT, op);
1390 1166
1167 if (has_unpaid)
1168 op->contr->play_sound (sound_find ("shop_buy"));
1169 else if (is_in_shop (op))
1170 op->contr->play_sound (sound_find ("shop_enter"));
1171 else
1172 op->contr->play_sound (sound_find ("shop_leave"));
1173
1391 if (shop_mat->msg) 1174 if (shop_mat->msg)
1392 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg); 1175 op->statusmsg (shop_mat->msg);
1393 /* This check below is a bit simplistic - generally it should be correct, 1176 /* This check below is a bit simplistic - generally it should be correct,
1394 * but there is never a guarantee that the bottom space on the map is 1177 * but there is never a guarantee that the bottom space on the map is
1395 * actually the shop floor. 1178 * actually the shop floor.
1396 */ 1179 */
1397 else if (!rv && !is_in_shop (op)) 1180 else if (!rv && !is_in_shop (op))
1398 { 1181 {
1399 opinion = shopkeeper_approval (op->map, op); 1182 opinion = shopkeeper_approval (op->map, op);
1400 1183
1401 if (opinion > 0.9) 1184 op->statusmsg (
1402 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper gives you a friendly wave."); 1185 opinion >= 0.90 ? "The shopkeeper gives you a friendly wave."
1403 else if (opinion > 0.75) 1186 : opinion >= 0.75 ? "The shopkeeper waves to you."
1404 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper waves to you."); 1187 : opinion >= 0.50 ? "The shopkeeper ignores you."
1405 else if (opinion > 0.5) 1188 : "The shopkeeper glares at you with contempt."
1406 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper ignores you.");
1407 else 1189 );
1408 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper glares at you with contempt.");
1409 } 1190 }
1410 } 1191 }
1411 else 1192 else
1412 { 1193 {
1413 /* if we get here, a player tried to leave a shop but was not able 1194 /* if we get here, a player tried to leave a shop but was not able
1414 * to afford the items he has. We try to move the player so that 1195 * to afford the items he has. We try to move the player so that
1415 * they are not on the mat anymore 1196 * they are not on the mat anymore
1416 */ 1197 */
1417 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1198 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1418 1199
1419 if (i == -1) 1200 if (i == -1)
1420 {
1421 LOG (llevError, "Internal shop-mat problem.\n"); 1201 LOG (llevError, "Internal shop-mat problem.\n");
1422 }
1423 else 1202 else
1424 { 1203 {
1425 remove_ob (op); 1204 op->remove ();
1426 op->x += freearr_x[i]; 1205 op->x += freearr_x[i];
1427 op->y += freearr_y[i]; 1206 op->y += freearr_y[i];
1428 rv = insert_ob_in_map (op, op->map, shop_mat, 0) == NULL; 1207 rv = insert_ob_in_map (op, op->map, shop_mat, 0) == NULL;
1429 } 1208 }
1430 } 1209 }
… …
1437 * Handles applying a sign. 1216 * Handles applying a sign.
1438 */ 1217 */
1439static void 1218static void
1440apply_sign (object *op, object *sign, int autoapply) 1219apply_sign (object *op, object *sign, int autoapply)
1441{ 1220{
1442 readable_message_type *msgType; 1221 if (!op->is_player())
1443 char newbuf[HUGE_BUF]; 1222 return;
1444 1223
1445 if (sign->msg == NULL) 1224 if (sign->has_dialogue ())
1446 { 1225 {
1447 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1226 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1448 return; 1227 return;
1449 } 1228 }
1450 1229
1230 if (!sign->msg)
1231 {
1232 op->contr->infobox (MSG_CHANNEL ("examine"),
1233 format ("T<%s>\n\n Nothing %sis written on it.",
1234 &sign->name,
1235 sign->name == sign->arch->name ? "" : "else "));
1236 return;
1237 }
1238
1451 if (sign->stats.food) 1239 if (sign->stats.food)
1452 { 1240 {
1453 if (sign->last_eat >= sign->stats.food) 1241 if (sign->last_eat >= sign->stats.food)
1454 { 1242 {
1455 if (!sign->move_on) 1243 if (!sign->move_on)
1456 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore."); 1244 op->failmsg ("You cannot read it anymore.");
1245
1457 return; 1246 return;
1458 } 1247 }
1459 1248
1460 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1249 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1461 sign->last_eat++; 1250 sign->last_eat++;
… …
1466 * move_on is zero, it needs to be manually applied (doesn't talk 1255 * move_on is zero, it needs to be manually applied (doesn't talk
1467 * to us). 1256 * to us).
1468 */ 1257 */
1469 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on) 1258 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1470 { 1259 {
1471 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1260 op->failmsg ("You are unable to read while blind!");
1472 return; 1261 return;
1473 } 1262 }
1474 msgType = get_readable_message_type (sign); 1263
1475 snprintf (newbuf, sizeof (newbuf), "%hhu %s", autoapply ? 1 : 0, &sign->msg); 1264 if (op->contr)
1476 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg); 1265 if (client *ns = op->contr->ns)
1266 {
1267 if (sign->sound)
1268 ns->play_sound (sign->sound);
1269 else if (autoapply)
1270 ns->play_sound (sound_find ("msg_voice"));
1271
1272 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1273 }
1274}
1275
1276static void
1277move_apply_hole (object *trap, object *victim)
1278{
1279 /* Hole not open? */
1280 if (trap->stats.wc > 0)
1281 return;
1282
1283 /* Is this a multipart monster and not the head? If so, return.
1284 * Processing will happen if the head runs into the pit
1285 */
1286 if (victim->head)
1287 return;
1288
1289 // now find all possible locations and randomly pick one
1290 int dir = find_free_spot (victim, trap->map, EXIT_X (trap), EXIT_Y (trap), 0,
1291 trap->range >= 3 ? SIZEOFFREE3 + 1
1292 : trap->range >= 2 ? SIZEOFFREE2 + 1
1293 : trap->range >= 1 ? SIZEOFFREE1 + 1
1294 : SIZEOFFREE0 + 1);
1295
1296 if (dir < 0)
1297 return;
1298
1299 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1300 victim->statusmsg ("You fall through the hole!", NDI_RED);
1301
1302 transfer_ob (victim,
1303 EXIT_X (trap) + freearr_x[dir],
1304 EXIT_Y (trap) + freearr_y[dir],
1305 0, victim);
1477} 1306}
1478 1307
1479/** 1308/**
1480 * 'victim' moves onto 'trap' 1309 * 'victim' moves onto 'trap'
1481 * 'victim' leaves 'trap' 1310 * 'victim' leaves 'trap'
… …
1495 return; 1324 return;
1496 1325
1497 /* move_apply() is the most likely candidate for causing unwanted and 1326 /* move_apply() is the most likely candidate for causing unwanted and
1498 * possibly unlimited recursion. 1327 * possibly unlimited recursion.
1499 */ 1328 */
1500 /* The following was changed because it was causing perfeclty correct 1329 /* The following was changed because it was causing perfectly correct
1501 * maps to fail. 1) it's not an error to recurse: 1330 * maps to fail. 1) it's not an error to recurse:
1502 * rune detonates, summoning monster. monster lands on nearby rune. 1331 * rune detonates, summoning monster. monster lands on nearby rune.
1503 * nearby rune detonates. This sort of recursion is expected and 1332 * nearby rune detonates. This sort of recursion is expected and
1504 * proper. This code was causing needless crashes. 1333 * proper. This code was causing needless crashes.
1505 */ 1334 */
1506 if (recursion_depth >= 500) 1335 if (recursion_depth >= 500)
1507 { 1336 {
1508 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1337 LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1509 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->name, &trap->name, &victim->arch->name, &victim->name); 1338 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
1510 return; 1339 return;
1511 } 1340 }
1341
1512 recursion_depth++; 1342 recursion_depth++;
1513 if (trap->head) 1343 if (trap->head)
1514 trap = trap->head; 1344 trap = trap->head;
1515 1345
1516 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1346 if (!INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
1517 goto leave;
1518
1519 switch (trap->type) 1347 switch (trap->type)
1520 { 1348 {
1521 case PLAYERMOVER: 1349 case PLAYERMOVER:
1522 if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim)) 1350 if (trap->attacktype && (trap->level || victim->type != PLAYER) && !should_director_abort (trap, victim))
1351 {
1352 if (!trap->stats.maxsp)
1353 trap->stats.maxsp = 2;
1354
1355 /* Is this correct? From the docs, it doesn't look like it
1356 * should be divided by trap->speed
1357 */
1358 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed);
1359
1360 /* Just put in some sanity check. I think there is a bug in the
1361 * above with some objects have zero speed, and thus the player
1362 * getting permanently paralyzed.
1363 */
1364 if (victim->speed_left < -50.f)
1365 victim->speed_left = -50.f;
1366 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1367 }
1368 break;
1369
1370 case SPINNER:
1371 if (victim->direction)
1372 {
1373 victim->direction = absdir (victim->direction - trap->stats.sp);
1374 update_turn_face (victim);
1375 }
1376 break;
1377
1378 case DIRECTOR:
1379 if (victim->direction && !should_director_abort (trap, victim))
1380 {
1381 victim->direction = trap->stats.sp;
1382 update_turn_face (victim);
1383 }
1384 break;
1385
1386 case BUTTON:
1387 case PEDESTAL:
1388 case T_MATCH:
1389 update_button (trap, originator);
1390 break;
1391
1392 case ALTAR:
1393 /* sacrifice victim on trap */
1394 apply_altar (trap, victim, originator);
1395 break;
1396
1397 case THROWN_OBJ:
1398 if (trap->inv == NULL)
1399 break;
1400 /* fallthrough */
1401
1402 case ARROW:
1403 /* bad bug: monster throw a object, make a step forwards, step on object ,
1404 * trigger this here and get hit by own missile - and will be own enemy.
1405 * Victim then is his own enemy and will start to kill herself (this is
1406 * removed) but we have not synced victim and his missile. To avoid senseless
1407 * action, we avoid hits here
1408 */
1409 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
1410 hit_with_arrow (trap, victim);
1411 break;
1412
1413 case SPELL_EFFECT:
1414 apply_spell_effect (trap, victim);
1415 break;
1416
1417 case TRAPDOOR:
1523 { 1418 {
1419 int max, sound_was_played;
1420 object *ab, *ab_next;
1421
1524 if (!trap->stats.maxsp) 1422 if (!trap->value)
1525 trap->stats.maxsp = 2; 1423 {
1424 int tot;
1526 1425
1527 /* Is this correct? From the docs, it doesn't look like it 1426 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1528 * should be divided by trap->speed 1427 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1428 tot += ab->head_ ()->total_weight ();
1429
1430 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1431 break;
1432
1433 SET_ANIMATION (trap, trap->value);
1434 update_object (trap, UP_OBJ_FACE);
1435 }
1436
1437 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next)
1438 {
1439 /* need to set this up, since if we do transfer the object,
1440 * ab->above would be bogus
1529 */ 1441 */
1530 victim->speed_left = -FABS (trap->stats.maxsp * victim->speed / trap->speed); 1442 ab_next = ab->above;
1531 1443
1532 /* Just put in some sanity check. I think there is a bug in the 1444 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1533 * above with some objects have zero speed, and thus the player 1445 {
1534 * getting permanently paralyzed. 1446 if (!sound_was_played)
1447 {
1448 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1449 sound_was_played = 1;
1450 }
1451
1452 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1453 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1454 }
1535 */ 1455 }
1536 if (victim->speed_left < -50.0) 1456 break;
1537 victim->speed_left = -50.0;
1538 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1539 } 1457 }
1540 goto leave;
1541 1458
1542 case SPINNER: 1459 case CONVERTER:
1543 if (victim->direction) 1460 if (convert_item (victim, trap) < 0)
1544 {
1545 victim->direction = absdir (victim->direction - trap->stats.sp);
1546 update_turn_face (victim);
1547 }
1548 goto leave;
1549
1550 case DIRECTOR:
1551 if (victim->direction && !should_director_abort (trap, victim))
1552 {
1553 victim->direction = trap->stats.sp;
1554 update_turn_face (victim);
1555 }
1556 goto leave;
1557
1558 case BUTTON:
1559 case PEDESTAL:
1560 update_button (trap);
1561 goto leave;
1562
1563 case ALTAR:
1564 /* sacrifice victim on trap */
1565 apply_altar (trap, victim, originator);
1566 goto leave;
1567
1568 case THROWN_OBJ:
1569 if (trap->inv == NULL)
1570 goto leave;
1571 /* fallthrough */
1572
1573 case ARROW:
1574 /* bad bug: monster throw a object, make a step forwards, step on object ,
1575 * trigger this here and get hit by own missile - and will be own enemy.
1576 * Victim then is his own enemy and will start to kill herself (this is
1577 * removed) but we have not synced victim and his missile. To avoid senseless
1578 * action, we avoid hits here
1579 */
1580 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
1581 hit_with_arrow (trap, victim);
1582 goto leave;
1583
1584 case SPELL_EFFECT:
1585 apply_spell_effect (trap, victim);
1586 goto leave;
1587
1588 case TRAPDOOR:
1589 {
1590 int max, sound_was_played;
1591 object *ab, *ab_next;
1592
1593 if (!trap->value)
1594 { 1461 {
1595 int tot; 1462 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1596 1463 archetype::get (shstr_burnout)->insert_at (trap, trap);
1597 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above)
1598 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1599 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying;
1600
1601 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1602 goto leave;
1603
1604 SET_ANIMATION (trap, trap->value);
1605 update_object (trap, UP_OBJ_FACE);
1606 } 1464 }
1607 1465
1608 for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next) 1466 break;
1467
1468 case TRIGGER_BUTTON:
1469 case TRIGGER_PEDESTAL:
1470 case TRIGGER_ALTAR:
1471 check_trigger (trap, victim, originator);
1472 break;
1473
1474 case DEEP_SWAMP:
1475 walk_on_deep_swamp (trap, victim);
1476 break;
1477
1478 case CHECK_INV:
1479 check_inv (victim, trap);
1480 break;
1481
1482 case HOLE:
1483 move_apply_hole (trap, victim);
1484 break;
1485
1486 case EXIT:
1487 if (victim->type == PLAYER && EXIT_PATH (trap))
1609 { 1488 {
1610 /* need to set this up, since if we do transfer the object, 1489 /* Basically, don't show exits leading to random maps the
1611 * ab->above would be bogus 1490 * players output.
1612 */ 1491 */
1613 ab_next = ab->above; 1492 if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
1493 victim->statusmsg (trap->msg, NDI_NAVY);
1614 1494
1615 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1495 trap->play_sound (trap->sound);
1616 { 1496 victim->enter_exit (trap);
1617 if (!sound_was_played)
1618 {
1619 play_sound_map (trap->map, trap->x, trap->y, SOUND_FALL_HOLE);
1620 sound_was_played = 1;
1621 }
1622 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!");
1623 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab);
1624 }
1625 } 1497 }
1626 goto leave; 1498 break;
1627 }
1628 1499
1629
1630 case CONVERTER:
1631 if (convert_item (victim, trap) < 0)
1632 {
1633 object *op;
1634
1635 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1636
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 }
1644 }
1645 goto leave;
1646
1647 case TRIGGER_BUTTON:
1648 case TRIGGER_PEDESTAL:
1649 case TRIGGER_ALTAR:
1650 check_trigger (trap, victim);
1651 goto leave;
1652
1653 case DEEP_SWAMP:
1654 walk_on_deep_swamp (trap, victim);
1655 goto leave;
1656
1657 case CHECK_INV:
1658 check_inv (victim, trap);
1659 goto leave;
1660
1661 case HOLE:
1662 /* Hole not open? */
1663 if (trap->stats.wc > 0)
1664 goto leave;
1665
1666 /* Is this a multipart monster and not the head? If so, return.
1667 * Processing will happen if the head runs into the pit
1668 */
1669 if (victim->head)
1670 goto leave;
1671
1672 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE);
1673 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n");
1674 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1675 goto leave;
1676
1677 case EXIT:
1678 if (victim->type == PLAYER && EXIT_PATH (trap))
1679 {
1680 /* Basically, don't show exits leading to random maps the
1681 * players output.
1682 */
1683 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2) && strncmp (EXIT_PATH (trap), "/random/", 8))
1684 new_draw_info (NDI_NAVY, 0, victim, trap->msg);
1685 enter_exit (victim, trap);
1686 }
1687 goto leave;
1688
1689 case ENCOUNTER: 1500 case ENCOUNTER:
1690 /* may be some leftovers on this */ 1501 /* may be some leftovers on this */
1691 goto leave; 1502 break;
1692 1503
1693 case SHOP_MAT: 1504 case SHOP_MAT:
1694 apply_shop_mat (trap, victim); 1505 apply_shop_mat (trap, victim);
1695 goto leave; 1506 break;
1696 1507
1697 /* Drop a certain amount of gold, and have one item identified */ 1508 /* Drop a certain amount of gold, and have one item identified */
1698 case IDENTIFY_ALTAR: 1509 case IDENTIFY_ALTAR:
1699 apply_id_altar (victim, trap, originator); 1510 apply_id_altar (victim, trap, originator);
1700 goto leave; 1511 break;
1701 1512
1702 case SIGN: 1513 case SIGN:
1703 if (victim->type != PLAYER && trap->stats.food > 0) 1514 if (victim->type != PLAYER && trap->stats.food > 0)
1704 goto leave; /* monsters musn't apply magic_mouths with counters */ 1515 break; /* monsters musn't apply magic_mouths with counters */
1705 1516
1706 apply_sign (victim, trap, 1); 1517 apply_sign (victim, trap, 1);
1707 goto leave; 1518 break;
1708 1519
1709 case CONTAINER: 1520 case CONTAINER:
1710 if (victim->type == PLAYER)
1711 (void) esrv_apply_container (victim, trap);
1712 else
1713 (void) apply_container (victim, trap); 1521 apply_container (victim, trap);
1714 goto leave; 1522 break;
1715 1523
1716 case RUNE: 1524 case RUNE:
1717 case TRAP: 1525 case TRAP:
1718 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1526 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1719 {
1720 spring_trap (trap, victim); 1527 spring_trap (trap, victim);
1721 } 1528 break;
1722 goto leave;
1723 1529
1724 default: 1530 default:
1725 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1531 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1726 "handled in move_apply()\n", &trap->name, &trap->arch->name, trap->type); 1532 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1727 goto leave; 1533 break;
1728 } 1534 }
1729 1535
1730leave:
1731 recursion_depth--; 1536 recursion_depth--;
1732} 1537}
1733 1538
1734/** 1539/**
1735 * Handles reading a regular (ie not containing a spell) book. 1540 * Handles reading a regular (ie not containing a spell) book.
… …
1740 int lev_diff; 1545 int lev_diff;
1741 object *skill_ob; 1546 object *skill_ob;
1742 1547
1743 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1548 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1744 { 1549 {
1745 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1550 op->failmsg ("You are unable to read while blind!");
1746 return; 1551 return;
1747 } 1552 }
1553
1748 if (tmp->msg == NULL) 1554 if (!tmp->msg)
1749 { 1555 {
1750 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name); 1556 op->failmsg (format ("The %s contains nothing but meaningless gibberish. H<There is nothing interesting to read here.>", &tmp->name));
1751 return; 1557 return;
1752 } 1558 }
1753 1559
1754 /* need a literacy skill to read stuff! */ 1560 /* need a literacy skill to read stuff! */
1755 skill_ob = find_skill_by_name (op, tmp->skill); 1561 skill_ob = find_skill_by_name (op, tmp->skill);
1756 if (!skill_ob) 1562 if (!skill_ob)
1757 { 1563 {
1758 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1564 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill to read this.>", &tmp->skill));
1759 return; 1565 return;
1760 } 1566 }
1567
1761 lev_diff = tmp->level - (skill_ob->level + 5); 1568 lev_diff = tmp->level - (skill_ob->level + 5);
1762 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1569 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1763 { 1570 {
1764 if (lev_diff < 2) 1571 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1765 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension."); 1572 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1766 else if (lev_diff < 3) 1573 : lev_diff < 5 ? "This book is beyond your comprehension."
1767 new_draw_info (NDI_UNIQUE, 0, op, "This book is slightly beyond your comprehension."); 1574 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1768 else if (lev_diff < 5) 1575 : lev_diff < 15 ? "This book is way beyond your comprehension."
1769 new_draw_info (NDI_UNIQUE, 0, op, "This book is beyond your comprehension."); 1576 : "This book is totally beyond your comprehension.");
1770 else if (lev_diff < 8)
1771 new_draw_info (NDI_UNIQUE, 0, op, "This book is quite a bit beyond your comprehension.");
1772 else if (lev_diff < 15)
1773 new_draw_info (NDI_UNIQUE, 0, op, "This book is way beyond your comprehension.");
1774 else
1775 new_draw_info (NDI_UNIQUE, 0, op, "This book is totally beyond your comprehension.");
1776 return; 1577 return;
1777 } 1578 }
1778 1579
1779 readable_message_type *msgType = get_readable_message_type (tmp); 1580 readable_message_type *msgType = get_readable_message_type (tmp);
1780 1581
1781 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1582 if (player *pl = op->contr)
1782 msgType->message_type, msgType->message_subtype, 1583 if (client *ns = pl->ns)
1783 "You open the %s and start reading.\n%s", "%s\n%s", long_desc (tmp, op), &tmp->msg); 1584 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1784 1585
1785 /* gain xp from reading */ 1586 /* gain xp from reading */
1786 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1587 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1787 { /* only if not read before */ 1588 { /* only if not read before */
1788 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1589 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
1789 1590
1790 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1591 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1791 { 1592 {
1792 /*exp_gain *= 2; because they just identified it too */ 1593 /*exp_gain *= 2; because they just identified it too */
1793 SET_FLAG (tmp, FLAG_IDENTIFIED); 1594 SET_FLAG (tmp, FLAG_IDENTIFIED);
1794 /* If in a container, update how it looks */ 1595
1795 if (tmp->env) 1596 if (object *pl = tmp->visible_to ())
1796 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1597 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1797 else
1798 op->contr->socket.update_look = 1;
1799 } 1598 }
1599
1800 change_exp (op, exp_gain, skill_ob->skill, 0); 1600 change_exp (op, exp_gain, skill_ob->skill, 0);
1801 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1601 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1802 } 1602 }
1803} 1603}
1804 1604
1805/** 1605/**
1606 * op made some mistake with a scroll, this takes care of punishment.
1607 * scroll_failure()- hacked directly from spell_failure
1608 */
1609static void
1610scroll_failure (object *op, int failure, int power)
1611{
1612 if (abs (failure / 4) > power)
1613 power = abs (failure / 4); /* set minimum effect */
1614
1615 if (failure <= -1 && failure > -15)
1616 { /* wonder */
1617 object *tmp;
1618
1619 op->failmsg ("Your spell warps!");
1620 tmp = get_archetype (SPELL_WONDER);
1621 cast_wonder (op, op, 0, tmp);
1622 tmp->destroy ();
1623 }
1624 else if (failure <= -15 && failure > -35)
1625 { /* drain mana */
1626 op->failmsg ("Your mana is drained!");
1627 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
1628 if (op->stats.sp < 0)
1629 op->stats.sp = 0;
1630 }
1631 else if (settings.spell_failure_effects == TRUE)
1632 {
1633 if (failure <= -35 && failure > -60)
1634 { /* confusion */
1635 op->failmsg ("The magic recoils on you!");
1636 confuse_player (op, op, power);
1637 }
1638 else if (failure <= -60 && failure > -70)
1639 { /* paralysis */
1640 op->failmsg ("The magic recoils and paralyzes you!");
1641 paralyze_player (op, op, power);
1642 }
1643 else if (failure <= -70 && failure > -80)
1644 { /* blind */
1645 op->failmsg ("The magic recoils on you!");
1646 blind_player (op, op, power);
1647 }
1648 else if (failure <= -80)
1649 { /* blast the immediate area */
1650 object *tmp = get_archetype (LOOSE_MANA);
1651 cast_magic_storm (op, tmp, power);
1652 op->failmsg ("You unleash uncontrolled mana!");
1653 tmp->destroy ();
1654 }
1655 }
1656}
1657
1658/**
1806 * Handles the applying of a skill scroll, calling learn_skill straight. 1659 * Handles the applying of a skill scroll, calling learn_skill straight.
1807 * op is the person learning the skill, tmp is the skill scroll object 1660 * op is the person learning the skill, tmp is the skill scroll object
1808 */ 1661 */
1809static void 1662static void
1810apply_skillscroll (object *op, object *tmp) 1663apply_skillscroll (object *op, object *tmp)
1811{ 1664{
1812 switch ((int) learn_skill (op, tmp)) 1665 switch (learn_skill (op, tmp))
1813 { 1666 {
1814 case 0: 1667 case 0:
1815 new_draw_info (NDI_UNIQUE, 0, op, "You already possess the knowledge "); 1668 op->play_sound (sound_find ("generic_fail"));
1816 new_draw_info_format (NDI_UNIQUE, 0, op, "held within the %s.\n", query_name (tmp)); 1669 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1817 return; 1670 break;
1818 1671
1819 case 1: 1672 case 1:
1820 new_draw_info_format (NDI_UNIQUE, 0, op, "You succeed in learning %s", &tmp->skill);
1821 decrease_ob (tmp); 1673 tmp->decrease ();
1674 op->play_sound (sound_find ("skill_learn"));
1675 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1822 return; 1676 break;
1823 1677
1824 default: 1678 default:
1679 tmp->decrease ();
1680 op->play_sound (sound_find ("generic_fail"));
1825 new_draw_info_format (NDI_UNIQUE, 0, op, "You fail to learn the knowledge of the %s.\n", query_name (tmp)); 1681 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1826 decrease_ob (tmp);
1827 return; 1682 break;
1828 } 1683 }
1829} 1684}
1830 1685
1831/** 1686/**
1832 * Actually makes op learn spell. 1687 * Actually makes op learn spell.
… …
1852 return; 1707 return;
1853 } 1708 }
1854 return; 1709 return;
1855 } 1710 }
1856 1711
1857 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1712 op->contr->play_sound (sound_find ("learn_spell"));
1858 tmp = get_object (); 1713
1859 copy_object (spell, tmp); 1714 tmp = spell->clone ();
1860 insert_ob_in_ob (tmp, op); 1715 insert_ob_in_ob (tmp, op);
1861 1716
1862 if (special_prayer) 1717 if (special_prayer)
1863 {
1864 SET_FLAG (tmp, FLAG_STARTEQUIP); 1718 SET_FLAG (tmp, FLAG_STARTEQUIP);
1865 }
1866 1719
1867 esrv_add_spells (op->contr, tmp); 1720 esrv_add_spells (op->contr, tmp);
1868} 1721}
1869 1722
1870/** 1723/**
… …
1884 { 1737 {
1885 LOG (llevError, "BUG: do_forget_spell(): spell not known\n"); 1738 LOG (llevError, "BUG: do_forget_spell(): spell not known\n");
1886 return; 1739 return;
1887 } 1740 }
1888 1741
1889 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", spell); 1742 op->failmsg (format ("You lose knowledge of %s.", spell));
1890 player_unready_range_ob (op->contr, spob); 1743 player_unready_range_ob (op->contr, spob);
1891 esrv_remove_spell (op->contr, spob); 1744 esrv_remove_spell (op->contr, spob);
1892 remove_ob (spob); 1745 spob->destroy ();
1893 free_object (spob);
1894} 1746}
1895 1747
1896/** 1748/**
1897 * Handles player applying a spellbook. 1749 * Handles player applying a spellbook.
1898 * Checks whether player has knowledge of required skill, doesn't already know the spell, 1750 * Checks whether player has knowledge of required skill, doesn't already know the spell,
… …
1903{ 1755{
1904 object *skop, *spell, *spell_skill; 1756 object *skop, *spell, *spell_skill;
1905 1757
1906 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1758 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1907 { 1759 {
1908 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1760 op->failmsg ("You are unable to read while blind.");
1909 return; 1761 return;
1910 } 1762 }
1911 1763
1912 /* artifact_spellbooks have 'slaying' field point to a spell name, 1764 /* artifact_spellbooks have 'slaying' field point to a spell name,
1913 * instead of having their spell stored in stats.sp. These are 1765 * instead of having their spell stored in stats.sp. These are
1914 * legacy spellbooks 1766 * legacy spellbooks
1915 */ 1767 */
1916
1917 if (tmp->slaying != NULL) 1768 if (tmp->slaying)
1918 { 1769 {
1919 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1770 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1920 if (!spell) 1771 if (!spell)
1921 { 1772 {
1922 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying); 1773 op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying));
1923 return; 1774 return;
1924 } 1775 }
1925 else 1776 else
1926 insert_ob_in_ob (spell, tmp); 1777 insert_ob_in_ob (spell, tmp);
1778
1927 tmp->slaying = NULL; 1779 tmp->slaying = 0;
1928 } 1780 }
1929 1781
1930 skop = find_skill_by_name (op, tmp->skill); 1782 skop = find_skill_by_name (op, tmp->skill);
1931 1783
1932 /* need a literacy skill to learn spells. Also, having a literacy level 1784 /* need a literacy skill to learn spells. Also, having a literacy level
1933 * lower than the spell will make learning the spell more difficult */ 1785 * lower than the spell will make learning the spell more difficult */
1934 if (!skop) 1786 if (!skop)
1935 { 1787 {
1936 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails."); 1788 op->failmsg (format ("You can't read! Your attempt fails. H<You lack the %s skill.>", &tmp->skill));
1937 return; 1789 return;
1938 } 1790 }
1939 1791
1940 spell = tmp->inv; 1792 spell = tmp->inv;
1793
1941 if (!spell) 1794 if (!spell)
1942 { 1795 {
1943 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1796 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1944 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense."); 1797 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1945 return; 1798 return;
1946 } 1799 }
1947 1800
1948 if (spell->level > (skop->level + 10)) 1801 int learn_level = sqrtf (spell->level) * 1.5f;
1802 if (skop->level < learn_level)
1949 { 1803 {
1950 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1804 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>",
1805 &tmp->skill, learn_level));
1951 return; 1806 return;
1952 } 1807 }
1953 1808
1954 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1809 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1955 1810
1956 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1811 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1957 {
1958 identify (tmp); 1812 identify (tmp);
1959 if (tmp->env)
1960 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1961 else
1962 op->contr->socket.update_look = 1;
1963 }
1964 1813
1965 /* I removed the check for special_prayer_mark here - it didn't make 1814 /* I removed the check for special_prayer_mark here - it didn't make
1966 * a lot of sense - special prayers are not found in spellbooks, and 1815 * a lot of sense - special prayers are not found in spellbooks, and
1967 * if the player doesn't know the spell, doesn't make a lot of sense that 1816 * if the player doesn't know the spell, doesn't make a lot of sense that
1968 * they would have a special prayer mark. 1817 * they would have a special prayer mark.
1969 */ 1818 */
1970 if (check_spell_known (op, spell->name)) 1819 if (check_spell_known (op, spell->name))
1971 { 1820 {
1972 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n"); 1821 op->statusmsg ("You already know that spell. H<It makes no sense to learn spells twice, and would only waste the spellbook.>\n");
1973 return; 1822 return;
1974 } 1823 }
1975 1824
1976 if (spell->skill) 1825 if (spell->skill)
1977 { 1826 {
1978 spell_skill = find_skill_by_name (op, spell->skill); 1827 spell_skill = find_skill_by_name (op, spell->skill);
1979 1828
1980 if (!spell_skill) 1829 if (!spell_skill)
1981 { 1830 {
1982 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1831 op->failmsg (format ("You lack the skill %s to use this spell.", &spell->skill));
1983 return; 1832 return;
1984 } 1833 }
1985 1834
1986 if (spell_skill->level < spell->level) 1835 if (spell_skill->level < spell->level)
1987 { 1836 {
1988 new_draw_info_format (NDI_UNIQUE, 0, op, "You need to be level %d in %s to learn this spell.", spell->level, &spell->skill); 1837 op->failmsg (format ("You need to be level %d in %s to learn this spell.", spell->level, &spell->skill));
1989 return; 1838 return;
1990 } 1839 }
1991 } 1840 }
1992 1841
1993 /* Logic as follows 1842 /* Logic as follows
… …
2002 * Overall, chances are the same but a player will find having a high 1851 * Overall, chances are the same but a player will find having a high
2003 * literacy rate very useful! -b.t. 1852 * literacy rate very useful! -b.t.
2004 */ 1853 */
2005 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1854 if (QUERY_FLAG (op, FLAG_CONFUSED))
2006 { 1855 {
2007 new_draw_info (NDI_UNIQUE, 0, op, "In your confused state you flub the wording of the text!"); 1856 op->failmsg ("In your confused state you flub the wording of the text!");
2008 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace)); 1857 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace));
2009 } 1858 }
2010 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || 1859 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
2011 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) 1860 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
2012 { 1861 {
2013 1862 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN);
2014 new_draw_info (NDI_UNIQUE, 0, op, "You succeed in learning the spell!");
2015 do_learn_spell (op, spell, 0); 1863 do_learn_spell (op, spell, 0);
2016 1864
2017 /* xp gain to literacy for spell learning */ 1865 /* xp gain to literacy for spell learning */
2018 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 1866 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))
2019 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0); 1867 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
2020 } 1868 }
2021 else 1869 else
2022 { 1870 {
2023 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1871 op->contr->play_sound (sound_find ("fumble_spell"));
2024 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1872 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
2025 } 1873 }
2026 decrease_ob (tmp); 1874
1875 tmp->decrease ();
2027} 1876}
2028 1877
2029/** 1878/**
2030 * Handles applying a spell scroll. 1879 * Handles applying a spell scroll.
2031 */ 1880 */
… …
2034{ 1883{
2035 object *skop; 1884 object *skop;
2036 1885
2037 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1886 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
2038 { 1887 {
2039 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1888 op->failmsg ("You are unable to read while blind.");
2040 return; 1889 return;
2041 } 1890 }
2042 1891
2043 if (!tmp->inv || tmp->inv->type != SPELL) 1892 if (!tmp->inv || tmp->inv->type != SPELL)
2044 { 1893 {
2045 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!"); 1894 op->failmsg ("The scroll just doesn't make sense! H<...and never will make sense.>");
2046 return; 1895 return;
2047 } 1896 }
2048 1897
2049 if (op->type == PLAYER) 1898 if (op->type == PLAYER)
2050 { 1899 {
… …
2056 */ 1905 */
2057 skop = find_skill_by_name (op, skill_names[SK_LITERACY]); 1906 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
2058 1907
2059 if (!skop) 1908 if (!skop)
2060 { 1909 {
2061 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1910 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill.>", &skill_names[SK_LITERACY]));
2062 return; 1911 return;
2063 } 1912 }
2064 1913
2065 if ((exp_gain = calc_skill_exp (op, tmp, skop))) 1914 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
2066 change_exp (op, exp_gain, skop->skill, 0); 1915 change_exp (op, exp_gain, skop->skill, 0);
2067 } 1916 }
2068 1917
2069 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1918 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
2070 identify (tmp); 1919 identify (tmp);
2071 1920
2072 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name); 1921 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
2073
2074 1922
2075 cast_spell (op, tmp, dir, tmp->inv, NULL); 1923 cast_spell (op, tmp, dir, tmp->inv, NULL);
2076 decrease_ob (tmp); 1924 tmp->decrease ();
2077} 1925}
2078 1926
2079/** 1927/**
2080 * Applies a treasure object - by default, chest. op 1928 * Applies a treasure object - by default, chest. op
2081 * is the person doing the applying, tmp is the treasure 1929 * is the person doing the applying, tmp is the treasure
2082 * chest. 1930 * chest.
2083 */ 1931 */
2084static void 1932static void
2085apply_treasure (object *op, object *tmp) 1933apply_treasure (object *op, object *tmp)
2086{ 1934{
2087 object *treas;
2088
2089
2090 /* Nice side effect of new treasure creation method is that the treasure 1935 /* Nice side effect of this treasure creation method is that the treasure
2091 * for the chest is done when the chest is created, and put into the chest 1936 * for the chest is done when the chest is created, and put into the chest
2092 * inventory. So that when the chest burns up, the items still exist. Also 1937 * inventory. So that when the chest burns up, the items still exist. Also
2093 * prevents people fromt moving chests to more difficult maps to get better 1938 * prevents people from moving chests to more difficult maps to get better
2094 * treasure 1939 * treasure
2095 */ 1940 */
2096
2097 treas = tmp->inv; 1941 object *treas = tmp->inv;
2098 if (treas == NULL) 1942
1943 if (!treas)
2099 { 1944 {
2100 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty."); 1945 op->statusmsg ("The chest was empty.");
2101 decrease_ob (tmp); 1946 tmp->decrease ();
2102 return; 1947 return;
2103 } 1948 }
1949
2104 while (tmp->inv) 1950 while (tmp->inv)
2105 { 1951 {
2106 treas = tmp->inv; 1952 treas = tmp->inv;
2107 1953 treas->remove ();
2108 remove_ob (treas);
2109 new_draw_info_format (NDI_UNIQUE, 0, op, "You find %s in the chest.", query_name (treas));
2110 1954
2111 treas->x = op->x; 1955 treas->x = op->x;
2112 treas->y = op->y; 1956 treas->y = op->y;
2113 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR); 1957 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR);
2114 1958
2115 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE)) 1959 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE))
2116 spring_trap (treas, op); 1960 spring_trap (treas, op);
1961
2117 /* If either player or container was destroyed, no need to do 1962 /* If either player or container was destroyed, no need to do
2118 * further processing. I think this should be enclused with 1963 * further processing. I think this should be enclused with
2119 * spring trap above, as I don't think there is otherwise 1964 * spring trap above, as I don't think there is otherwise
2120 * any way for the treasure chest or player to get killed 1965 * any way for the treasure chest or player to get killed.
2121 */ 1966 */
2122 if (op->destroyed () || tmp->destroyed ()) 1967 if (op->destroyed () || tmp->destroyed ())
2123 break; 1968 break;
2124 } 1969 }
2125 1970
2126 if (!tmp->destroyed () && tmp->inv == NULL) 1971 if (!tmp->destroyed () && !tmp->inv)
2127 decrease_ob (tmp); 1972 tmp->decrease (true);
2128
2129}
2130
2131/**
2132 * op eats food.
2133 * If player, takes care of messages and dragon special food.
2134 */
2135static void
2136apply_food (object *op, object *tmp)
2137{
2138 int capacity_remaining;
2139
2140 if (op->type != PLAYER)
2141 op->stats.hp = op->stats.maxhp;
2142 else
2143 {
2144 /* check if this is a dragon (player), eating some flesh */
2145 if (tmp->type == FLESH && is_dragon_pl (op) && dragon_eat_flesh (op, tmp))
2146 ;
2147 else
2148 {
2149 /* usual case - no dragon meal: */
2150 if (op->stats.food + tmp->stats.food > 999)
2151 {
2152 if (tmp->type == FOOD || tmp->type == FLESH)
2153 new_draw_info (NDI_UNIQUE, 0, op, "You feel full, but what a waste of food!");
2154 else
2155 new_draw_info (NDI_UNIQUE, 0, op, "Most of the drink goes down your face not your throat!");
2156 }
2157
2158 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2159 {
2160 char buf[MAX_BUF];
2161
2162 if (!is_dragon_pl (op))
2163 {
2164 /* eating message for normal players */
2165 if (tmp->type == DRINK)
2166 sprintf (buf, "Ahhh...that %s tasted good.", &tmp->name);
2167 else
2168 sprintf (buf, "The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
2169 }
2170 else
2171 {
2172 /* eating message for dragon players */
2173 sprintf (buf, "The %s tasted terrible!", &tmp->name);
2174 }
2175
2176 new_draw_info (NDI_UNIQUE, 0, op, buf);
2177 capacity_remaining = 999 - op->stats.food;
2178 op->stats.food += tmp->stats.food;
2179 if (capacity_remaining < tmp->stats.food)
2180 op->stats.hp += capacity_remaining / 50;
2181 else
2182 op->stats.hp += tmp->stats.food / 50;
2183 if (op->stats.hp > op->stats.maxhp)
2184 op->stats.hp = op->stats.maxhp;
2185 if (op->stats.food > 999)
2186 op->stats.food = 999;
2187 }
2188
2189 /* special food hack -b.t. */
2190 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2191 eat_special_food (op, tmp);
2192 }
2193 }
2194 handle_apply_yield (tmp);
2195 decrease_ob (tmp);
2196} 1973}
2197 1974
2198/** 1975/**
2199 * A dragon is eating some flesh. If the flesh contains resistances, 1976 * A dragon is eating some flesh. If the flesh contains resistances,
2200 * there is a chance for the dragon's skin to get improved. 1977 * there is a chance for the dragon's skin to get improved.
… …
2203 * object *op the object (dragon player) eating the flesh 1980 * object *op the object (dragon player) eating the flesh
2204 * object *meal the flesh item, getting chewed in dragon's mouth 1981 * object *meal the flesh item, getting chewed in dragon's mouth
2205 * return: 1982 * return:
2206 * int 1 if eating successful, 0 if it doesn't work 1983 * int 1 if eating successful, 0 if it doesn't work
2207 */ 1984 */
2208int 1985static int
2209dragon_eat_flesh (object *op, object *meal) 1986dragon_eat_flesh (object *op, object *meal)
2210{ 1987{
2211 object *skin = NULL; /* pointer to dragon skin force */ 1988 object *skin = NULL; /* pointer to dragon skin force */
2212 object *abil = NULL; /* pointer to dragon ability force */ 1989 object *abil = NULL; /* pointer to dragon ability force */
2213 object *tmp = NULL; /* tmp. object */ 1990 object *tmp = NULL; /* tmp. object */
2214 1991
2215 char buf[MAX_BUF]; /* tmp. string buffer */
2216 double chance; /* improvement-chance of one resistance type */ 1992 double chance; /* improvement-chance of one resistance type */
2217 double totalchance = 1; /* total chance of gaining one resistance */ 1993 double totalchance = 1; /* total chance of gaining one resistance */
2218 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */ 1994 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */
2219 double mbonus = 0; /* monster bonus */ 1995 double mbonus = 0; /* monster bonus */
2220 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */ 1996 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */
… …
2225 if (meal->type != FLESH || !is_dragon_pl (op)) 2001 if (meal->type != FLESH || !is_dragon_pl (op))
2226 return 0; 2002 return 0;
2227 2003
2228 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2004 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2229 from the player's inventory */ 2005 from the player's inventory */
2230 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2006 for (tmp = op->inv; tmp; tmp = tmp->below)
2231 {
2232 if (tmp->type == FORCE) 2007 if (tmp->type == FORCE)
2233 { 2008 if (tmp->arch->archname == shstr_dragon_skin_force)
2234 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0)
2235 skin = tmp; 2009 skin = tmp;
2236 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2010 else if (tmp->arch->archname == shstr_dragon_ability_force)
2237 abil = tmp; 2011 abil = tmp;
2238 }
2239 }
2240 2012
2241 /* if either skin or ability are missing, this is an old player 2013 /* if either skin or ability are missing, this is an old player
2242 which is not to be considered a dragon -> bail out */ 2014 which is not to be considered a dragon -> bail out */
2243 if (skin == NULL || abil == NULL) 2015 if (skin == NULL || abil == NULL)
2244 return 0; 2016 return 0;
… …
2246 /* now start by filling stomache and health, according to food-value */ 2018 /* now start by filling stomache and health, according to food-value */
2247 if ((999 - op->stats.food) < meal->stats.food) 2019 if ((999 - op->stats.food) < meal->stats.food)
2248 op->stats.hp += (999 - op->stats.food) / 50; 2020 op->stats.hp += (999 - op->stats.food) / 50;
2249 else 2021 else
2250 op->stats.hp += meal->stats.food / 50; 2022 op->stats.hp += meal->stats.food / 50;
2023
2251 if (op->stats.hp > op->stats.maxhp) 2024 if (op->stats.hp > op->stats.maxhp)
2252 op->stats.hp = op->stats.maxhp; 2025 op->stats.hp = op->stats.maxhp;
2253 2026
2254 op->stats.food = MIN (999, op->stats.food + meal->stats.food); 2027 op->stats.food = MIN (999, op->stats.food + meal->stats.food);
2255 2028
… …
2285 /* doubled chance for resistance of ability-focus */ 2058 /* doubled chance for resistance of ability-focus */
2286 if (i == abil->stats.exp) 2059 if (i == abil->stats.exp)
2287 chance = MIN (100., chance * 2.); 2060 chance = MIN (100., chance * 2.);
2288 2061
2289 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2062 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2290 if (RANDOM () % 10000 < (int) (chance * 100)) 2063 if (rndm (10000) < (unsigned int) (chance * 100))
2291 { 2064 {
2292 atnr_winner[winners] = i; 2065 atnr_winner[winners] = i;
2293 winners++; 2066 winners++;
2294 } 2067 }
2295 2068
… …
2300 } 2073 }
2301 } 2074 }
2302 2075
2303 /* inverse totalchance as until now we have the failure-chance */ 2076 /* inverse totalchance as until now we have the failure-chance */
2304 totalchance = 100 - totalchance * 100; 2077 totalchance = 100 - totalchance * 100;
2078
2305 /* print message according to totalchance */ 2079 /* print message according to totalchance */
2080 const char *buf;
2306 if (totalchance > 50.) 2081 if (totalchance > 50.)
2307 sprintf (buf, "Hmm! The %s tasted delicious!", &meal->name); 2082 buf = format ("Hmm! The %s tasted delicious!", &meal->name);
2308 else if (totalchance > 10.) 2083 else if (totalchance > 10.)
2309 sprintf (buf, "The %s tasted very good.", &meal->name); 2084 buf = format ("The %s tasted very good.", &meal->name);
2310 else if (totalchance > 1.) 2085 else if (totalchance > 1.)
2311 sprintf (buf, "The %s tasted good.", &meal->name); 2086 buf = format ("The %s tasted good.", &meal->name);
2312 else if (totalchance > 0.1) 2087 else if (totalchance > 0.1)
2313 sprintf (buf, "The %s tasted bland.", &meal->name); 2088 buf = format ("The %s tasted bland.", &meal->name);
2314 else if (totalchance >= 0.01) 2089 else if (totalchance >= 0.01)
2315 sprintf (buf, "The %s had a boring taste.", &meal->name); 2090 buf = format ("The %s had a boring taste.", &meal->name);
2316 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat)) 2091 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat))
2317 sprintf (buf, "The %s tasted strange.", &meal->name); 2092 buf = format ("The %s tasted strange.", &meal->name);
2318 else 2093 else
2319 sprintf (buf, "The %s had no taste.", &meal->name); 2094 buf = format ("The %s had no taste.", &meal->name);
2320 new_draw_info (NDI_UNIQUE, 0, op, buf); 2095
2096 op->statusmsg (buf);
2321 2097
2322 /* now choose a winner if we have any */ 2098 /* now choose a winner if we have any */
2323 i = -1; 2099 i = -1;
2324 if (winners > 0) 2100 if (winners > 0)
2325 i = atnr_winner[RANDOM () % winners]; 2101 i = atnr_winner [rndm (winners)];
2326 2102
2327 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2103 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2328 { 2104 {
2329 /* resistance increased! */ 2105 /* resistance increased! */
2330 skin->resist[i]++; 2106 skin->resist[i]++;
2331 fix_player (op); 2107 op->update_stats ();
2332 2108
2333 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2109 op->statusmsg (format ("Your skin is now more resistant to %s!", change_resist_msg[i]));
2334 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2335 } 2110 }
2336 2111
2337 /* if this flesh contains a new ability focus, we mark it 2112 /* if this flesh contains a new ability focus, we mark it
2338 into the ability_force and it will take effect on next level */ 2113 into the ability_force and it will take effect on next level */
2339 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat) 2114 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat)
2340 { 2115 {
2341 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */ 2116 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */
2342 2117
2343 if (meal->last_eat != abil->stats.exp) 2118 if (meal->last_eat != abil->stats.exp)
2119 op->statusmsg (format (
2120 "Your metabolism prepares to focus on %s!\n"
2121 "The change will happen at level %d.",
2122 change_resist_msg[meal->last_eat],
2123 abil->level + 1
2344 { 2124 ));
2345 sprintf (buf, "Your metabolism prepares to focus on %s!", change_resist_msg[meal->last_eat]);
2346 new_draw_info (NDI_UNIQUE, 0, op, buf);
2347 sprintf (buf, "The change will happen at level %d", abil->level + 1);
2348 new_draw_info (NDI_UNIQUE, 0, op, buf);
2349 }
2350 else 2125 else
2351 { 2126 {
2352 sprintf (buf, "Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]); 2127 op->statusmsg (format ("Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]));
2353 new_draw_info (NDI_UNIQUE, 0, op, buf);
2354 abil->last_eat = 0; 2128 abil->last_eat = 0;
2355 } 2129 }
2356 } 2130 }
2131
2357 return 1; 2132 return 1;
2358} 2133}
2359 2134
2135/**
2136 * op eats food.
2137 * If player, takes care of messages and dragon special food.
2138 */
2360static void 2139static void
2361apply_savebed (object *pl) 2140apply_food (object *op, object *tmp)
2362{ 2141{
2363#ifndef COZY_SERVER 2142 int capacity_remaining;
2364 if (!pl->contr->name_changed || !pl->stats.exp) 2143
2365 { 2144 if (op->type != PLAYER)
2366 new_draw_info (NDI_UNIQUE, 0, pl, "You don't deserve to save your character yet."); 2145 op->stats.hp = op->stats.maxhp;
2367 return; 2146 else
2368 } 2147 {
2369#endif 2148 /* check if this is a dragon (player), eating some flesh */
2370 INVOKE_PLAYER (LOGOUT, pl->contr); 2149 if (tmp->type == FLESH && is_dragon_pl (op) && dragon_eat_flesh (op, tmp))
2371 /* Need to call terminate_all_pets() before we remove the player ob */ 2150 ;
2372 terminate_all_pets (pl); 2151 else
2373 remove_ob (pl); 2152 {
2374 pl->direction = 0; 2153 /* usual case - no dragon meal: */
2375 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl, "%s leaves the game.", &pl->name); 2154 if (op->stats.food + tmp->stats.food > 999)
2155 {
2156 if (tmp->type == FOOD || tmp->type == FLESH)
2157 op->failmsg ("You feel full, but what a waste of food!");
2158 else
2159 op->statusmsg ("Most of the drink goes down your face not your throat!");
2160 }
2376 2161
2377 /* update respawn position */ 2162 tmp->play_sound (
2378 strcpy (pl->contr->savebed_map, pl->map->path); 2163 tmp->sound
2379 pl->contr->bed_x = pl->x; 2164 ? tmp->sound
2380 pl->contr->bed_y = pl->y; 2165 : tmp->type == DRINK
2166 ? sound_find ("eat_drink")
2167 : sound_find ("eat_food")
2168 );
2381 2169
2382 strcpy (pl->contr->killer, "left"); 2170 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2383 check_score (pl); /* Always check score */ 2171 {
2384 (void) save_player (pl, 0); 2172 const char *buf;
2385 pl->map->players--; 2173
2386#if MAP_MAXTIMEOUT 2174 if (!is_dragon_pl (op))
2387 MAP_SWAP_TIME (pl->map) = MAP_TIMEOUT (pl->map); 2175 {
2388#endif 2176 /* eating message for normal players */
2389 play_again (pl); 2177 if (tmp->type == DRINK)
2390 pl->speed = 0; 2178 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
2391 update_ob_speed (pl); 2179 else
2180 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
2181 }
2182 else
2183 /* eating message for dragon players */
2184 buf = format ("The %s tasted terrible!", &tmp->name);
2185
2186 op->statusmsg (buf);
2187
2188 capacity_remaining = 999 - op->stats.food;
2189 op->stats.food += tmp->stats.food;
2190 if (capacity_remaining < tmp->stats.food)
2191 op->stats.hp += capacity_remaining / 50;
2192 else
2193 op->stats.hp += tmp->stats.food / 50;
2194
2195 if (op->stats.hp > op->stats.maxhp)
2196 op->stats.hp = op->stats.maxhp;
2197 if (op->stats.food > 999)
2198 op->stats.food = 999;
2199 }
2200
2201 /* special food hack -b.t. */
2202 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2203 eat_special_food (op, tmp);
2204 }
2205 }
2206
2207 handle_apply_yield (tmp);
2208 tmp->decrease ();
2392} 2209}
2393 2210
2394/** 2211/**
2395 * Handles applying an improve armor scroll. 2212 * Handles applying an improve armor scroll.
2396 * Does some sanity checks, then calls improve_armour. 2213 * Does some sanity checks, then calls improve_armour.
… …
2398static void 2215static void
2399apply_armour_improver (object *op, object *tmp) 2216apply_armour_improver (object *op, object *tmp)
2400{ 2217{
2401 object *armor; 2218 object *armor;
2402 2219
2403 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2220 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2404 { 2221 {
2405 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2222 op->failmsg ("Something blocks the magic of the scroll. H<This area prevents magic effects.>");
2406 return; 2223 return;
2407 } 2224 }
2225
2408 armor = find_marked_object (op); 2226 armor = find_marked_object (op);
2227
2409 if (!armor) 2228 if (!armor)
2410 { 2229 {
2411 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2230 op->failmsg ("You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
2412 return; 2231 return;
2413 } 2232 }
2233
2414 if (armor->type != ARMOUR 2234 if (armor->type != ARMOUR
2415 && armor->type != CLOAK 2235 && armor->type != CLOAK
2416 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2236 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2417 { 2237 {
2418 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2238 op->failmsg ("Your marked item is not armour!\n");
2419 return; 2239 return;
2420 } 2240 }
2421 2241
2422 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2242 op->statusmsg ("Applying armour enchantment.");
2423 improve_armour (op, tmp, armor); 2243 improve_armour (op, tmp, armor);
2424} 2244}
2425 2245
2426 2246void
2427extern void
2428apply_poison (object *op, object *tmp) 2247apply_poison (object *op, object *tmp)
2429{ 2248{
2249 // need to do it now when it is still on the map
2250 handle_apply_yield (tmp);
2251
2252 object *poison = tmp->split (1);
2253
2430 if (op->type == PLAYER) 2254 if (op->type == PLAYER)
2431 { 2255 {
2432 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0); 2256 op->contr->play_sound (sound_find ("drink_poison"));
2433 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!"); 2257 op->failmsg ("Yech! That tasted poisonous!");
2434 strcpy (op->contr->killer, "poisonous booze"); 2258 op->contr->killer = poison;
2435 } 2259 }
2260
2436 if (tmp->stats.hp > 0) 2261 if (poison->stats.hp > 0)
2437 { 2262 {
2438 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2263 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp);
2439 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2264 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2440 } 2265 }
2266
2441 op->stats.food -= op->stats.food / 4; 2267 op->stats.food -= op->stats.food / 4;
2442 handle_apply_yield (tmp); 2268 poison->destroy ();
2443 decrease_ob (tmp);
2444} 2269}
2445 2270
2446/** 2271/**
2447 * This fonction return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2272 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2448 * A valid 2 way exit means: 2273 * A valid 2 way exit means:
2449 * -You can come back (there is another exit at the other side) 2274 * -You can come back (there is another exit at the other side)
2450 * -You are 2275 * -You are
2451 * ° the owner of the exit 2276 * ° the owner of the exit
2452 * ° or in the same party as the owner 2277 * ° or in the same party as the owner
2453 * 2278 *
2454 * Note: a owner in a 2 way exit is saved as the owner's name 2279 * Note: a owner in a 2 way exit is saved as the owner's name
2455 * in the field exit->name cause the field exit->owner doesn't 2280 * in the field exit->name cause the field exit->owner doesn't
2456 * survive in the swapping (in fact the whole exit doesn't survive). 2281 * survive in the swapping (in fact the whole exit doesn't survive).
2457 */ 2282 */
2458int 2283int
2459is_legal_2ways_exit (object *op, object *exit) 2284is_legal_2ways_exit (object *op, object *exit)
2460{ 2285{
2461 object *tmp;
2462 object *exit_owner;
2463 player *pp;
2464 maptile *exitmap;
2465
2466 if (exit->stats.exp != 1) 2286 if (exit->stats.exp != 1)
2467 return 1; /*This is not a 2 way, so it is legal */ 2287 return 1; /*This is not a 2 way, so it is legal */
2288
2289#if 0 //TODO
2468 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2290 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2469 return 0; /* This is a reset town portal */ 2291 return 0; /* This is a reset town portal */
2470 /* To know if an exit has a correspondant, we look at 2292#endif
2471 * all the exits in destination and try to find one with same path as 2293
2472 * the current exit's position */ 2294 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2473 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir))) 2295
2474 exitmap = ready_map_name (EXIT_PATH (exit), MAP_PLAYER_UNIQUE); 2296 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2475 else 2297
2476 exitmap = ready_map_name (EXIT_PATH (exit), 0);
2477 if (exitmap) 2298 if (exitmap)
2478 { 2299 {
2300 exitmap->load_sync ();
2301
2479 tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit)); 2302 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2303
2480 if (!tmp) 2304 if (!tmp)
2481 return 0; 2305 return 0;
2482 for ((tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above) 2306
2307 for (; tmp; tmp = tmp->above)
2483 { 2308 {
2484 if (tmp->type != EXIT) 2309 if (tmp->type != EXIT)
2485 continue; /*Not an exit */ 2310 continue; /*Not an exit */
2311
2486 if (!EXIT_PATH (tmp)) 2312 if (!EXIT_PATH (tmp))
2487 continue; /*Not a valid exit */ 2313 continue; /*Not a valid exit */
2314
2488 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2315 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2489 continue; /*Not in the same place */ 2316 continue; /*Not in the same place */
2317
2490 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2318 if (exit->map->path != EXIT_PATH (tmp))
2491 continue; /*Not in the same map */ 2319 continue; /*Not in the same map */
2492 2320
2493 /* From here we have found the exit is valid. However we do 2321 /* From here we have found the exit is valid. However we do
2494 * here the check of the exit owner. It is important for the 2322 * here the check of the exit owner. It is important for the
2495 * town portals to prevent strangers from visiting your appartments 2323 * town portals to prevent strangers from visiting your appartments
2496 */ 2324 */
2497 if (!exit->race) 2325 if (!exit->race)
2498 return 1; /*No owner, free for all! */ 2326 return 1; /*No owner, free for all! */
2327
2499 exit_owner = NULL; 2328 object *exit_owner = 0;
2500 for (pp = first_player; pp; pp = pp->next) 2329
2330 for_all_players (pp)
2501 { 2331 {
2502 if (!pp->ob) 2332 if (!pp->ob)
2503 continue; 2333 continue;
2334
2504 if (pp->ob->name != exit->race) 2335 if (pp->ob->name != exit->race)
2505 continue; 2336 continue;
2337
2506 exit_owner = pp->ob; /*We found a player which correspond to the player name */ 2338 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2507 break; 2339 break;
2508 } 2340 }
2341
2509 if (!exit_owner) 2342 if (!exit_owner)
2510 return 0; /* No more owner */ 2343 return 0; /* No more owner */
2344
2511 if (exit_owner->contr == op->contr) 2345 if (exit_owner->contr == op->contr)
2512 return 1; /*It is your exit */ 2346 return 1; /*It is your exit */
2347
2513 if (exit_owner && /*There is a owner */ 2348 if (exit_owner && /*There is a owner */
2514 (op->contr) && /*A player tries to pass */ 2349 (op->contr) && /*A player tries to pass */
2515 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */ 2350 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */
2516 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */ 2351 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2517 return 0; 2352 return 0;
2353
2518 return 1; 2354 return 1;
2519 } 2355 }
2520 } 2356 }
2357
2521 return 0; 2358 return 0;
2522} 2359}
2523 2360
2361/**
2362 * This function will try to apply a lighter and in case no lighter
2363 * is specified it will try to find a lighter in the players inventory,
2364 * and inform him about this requirement.
2365 *
2366 * who - the player
2367 * op - the item we want to light
2368 * lighter - the lighter or 0 if a lighter has yet to be found
2369 */
2370static object *
2371auto_apply_lighter (object *who, object *op, object *lighter)
2372{
2373 if (lighter == 0)
2374 {
2375 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2376 {
2377 if (tmp->type == LIGHTER)
2378 {
2379 lighter = tmp;
2380 break;
2381 }
2382 }
2383
2384 if (!lighter)
2385 {
2386 who->failmsg (format (
2387 "You can't light up the %s with your bare hands! "
2388 "H<You need a lighter in your inventory, for example a flint and steel.>",
2389 &op->name));
2390 return 0;
2391 }
2392 }
2393
2394 // last_eat == 0 means the lighter is not being used up!
2395 if (lighter->last_eat && lighter->stats.food)
2396 {
2397 /* lighter gets used up */
2398 lighter = lighter->split ();
2399 lighter->stats.food--;
2400 who->insert (lighter);
2401 }
2402 else if (lighter->last_eat)
2403 {
2404 /* no charges left in lighter */
2405 who->failmsg (format (
2406 "You attempt to light the %s with a used up %s.",
2407 &op->name, &lighter->name));
2408 return 0;
2409 }
2410
2411 return lighter;
2412}
2413
2414/**
2415 * Designed primarily to light torches/lanterns/etc.
2416 * Also burns up burnable material too. First object in the inventory is
2417 * the selected object to "burn". -b.t.
2418 */
2419static void
2420apply_lighter (object *who, object *lighter)
2421{
2422 object *item;
2423 int is_player_env = 0;
2424
2425 item = find_marked_object (who);
2426 if (item)
2427 {
2428 if (!auto_apply_lighter (who, item, lighter))
2429 return;
2430
2431 /* Perhaps we should split what we are trying to light on fire?
2432 * I can't see many times when you would want to light multiple
2433 * objects at once.
2434 */
2435
2436 save_throw_object (item, AT_FIRE, who);
2437
2438 if (item->destroyed ()
2439 || ((item->type == LAMP || item->type == TORCH)
2440 && item->glow_radius > 0))
2441 who->statusmsg (format (
2442 "You light the %s with the %s.",
2443 &item->name, &lighter->name));
2444 else
2445 who->failmsg (format (
2446 "You attempt to light the %s with the %s and fail.",
2447 &item->name, &lighter->name));
2448 }
2449 else
2450 who->failmsg ("You need to mark a lightable object.");
2451}
2452
2453/**
2454 * This function generates a cursed effect for cursed lamps and torches.
2455 */
2456void player_apply_lamp_cursed_effect (object *who, object *op)
2457{
2458 if (op->level)
2459 {
2460 who->failmsg (format (
2461 "The %s was cursed, it explodes in a big fireball!",
2462 &op->name));
2463 create_exploding_ball_at (who, op->level);
2464 }
2465 else
2466 {
2467 who->failmsg (format (
2468 "The %s was cursed, it crumbles to dust, at least it didn't explode.!",
2469 &op->name));
2470 }
2471
2472 op->destroy ();
2473}
2474
2475/**
2476 * Apply for players and lamps
2477 *
2478 * who - the player
2479 * op - the lamp
2480 */
2481void player_apply_lamp (object *who, object *op)
2482{
2483 bool switch_on = op->glow_radius ? false : true;
2484
2485 if (switch_on)
2486 {
2487 object *lighter = 0;
2488
2489 if (op->flag [FLAG_IS_LIGHTABLE]
2490 && !(lighter = auto_apply_lighter (who, op, 0)))
2491 return;
2492
2493 if (op->stats.food < 1)
2494 {
2495 if (op->type == LAMP)
2496 who->failmsg (format (
2497 "The %s is out of fuel! "
2498 "H<Lamps and similar items need fuel. They cannot be refilled.>",
2499 &op->name));
2500 else
2501 who->failmsg (format (
2502 "The %s is burnt out! "
2503 "H<Torches and similar items burn out and become worthless.>",
2504 &op->name));
2505 return;
2506 }
2507
2508 if (op->flag [FLAG_CURSED])
2509 {
2510 player_apply_lamp_cursed_effect (who, op);
2511 return;
2512 }
2513
2514 if (lighter)
2515 who->statusmsg (format (
2516 "You light up the %s with the %s.", &op->name, &lighter->name));
2517 else
2518 who->statusmsg (format ("You light up the %s.", &op->name));
2519 }
2520 else
2521 {
2522 if (op->flag [FLAG_CURSED])
2523 {
2524 player_apply_lamp_cursed_effect (who, op);
2525 return;
2526 }
2527
2528 if (op->type == TORCH)
2529 {
2530 if (!op->flag [FLAG_IS_LIGHTABLE])
2531 {
2532 who->statusmsg (format (
2533 "You put out the %s. "
2534 "H<The %s can't be used anymore, as it can't be lighted up again.>",
2535 &op->name, &op->name));
2536 }
2537 else
2538 who->statusmsg (format (
2539 "You put out the %s."
2540 "H<Torches wear out if you put them out.>",
2541 &op->name));
2542 }
2543 else
2544 who->statusmsg (format ("You turn off the %s.", &op->name));
2545 }
2546
2547 apply_lamp (op, switch_on);
2548}
2549
2550void get_animation_from_arch (object *op, arch_ptr a)
2551{
2552 op->animation_id = a->animation_id;
2553 op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE];
2554 op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE];
2555 op->anim_speed = a->anim_speed;
2556 op->last_anim = 0;
2557 op->state = 0;
2558 op->face = a->face;
2559
2560 if (NUM_ANIMATIONS(op) > 1)
2561 {
2562 SET_ANIMATION(op, 0);
2563 animate_object (op, op->direction);
2564 }
2565 else
2566 update_object (op, UP_OBJ_FACE);
2567}
2568
2569/**
2570 * Apply for LAMPs and TORCHes.
2571 *
2572 * op - the lamp
2573 * switch_on - a flag which says whether the lamp should be switched on or off
2574 */
2575void apply_lamp (object *op, bool switch_on)
2576{
2577 op->set_glow_radius (switch_on ? op->range : 0);
2578 op->set_speed (switch_on ? op->arch->speed : 0);
2579
2580 // torches wear out if you put them out
2581 if (op->type == TORCH && !switch_on)
2582 {
2583 if (op->flag [FLAG_IS_LIGHTABLE])
2584 {
2585 op->stats.food -= (double) op->arch->stats.food / 15;
2586 if (op->stats.food < 0)
2587 op->stats.food = 0;
2588 }
2589 else
2590 op->stats.food = 0;
2591 }
2592
2593 // lamps and torched get worthless when used up
2594 if (op->stats.food <= 0)
2595 op->value = 0;
2596
2597 // FIXME: This is a hack to make the more sane torches and lamps
2598 // still animated ;-/
2599 if (op->other_arch)
2600 get_animation_from_arch (op, switch_on ? op->other_arch : op->arch);
2601
2602 if (object *pl = op->visible_to ())
2603 esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op);
2604}
2605
2606/**
2607 * This handles items of type 'transformer'.
2608 * Basically those items, used with a marked item, transform both items into something
2609 * else.
2610 * "Transformer" item has food decreased by 1, removed if 0 (0 at start means illimited)..
2611 * Change information is contained in the 'slaying' field of the marked item.
2612 * The format is as follow: transformer:[number ]yield[;transformer:...].
2613 * This way an item can be transformed in many things, and/or many objects.
2614 * The 'slaying' field for transformer is used as verb for the action.
2615 */
2616static void
2617apply_item_transformer (object *pl, object *transformer)
2618{
2619 object *marked;
2620 object *new_item;
2621 char *find;
2622 char *separator;
2623 int yield;
2624 char got[MAX_BUF];
2625 int len;
2626
2627 if (!pl || !transformer)
2628 return;
2629
2630 marked = find_marked_object (pl);
2631
2632 if (!marked)
2633 {
2634 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
2635 return;
2636 }
2637
2638 if (!marked->slaying)
2639 {
2640 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
2641 return;
2642 }
2643
2644 /* check whether they are compatible or not */
2645 find = strstr (&marked->slaying, transformer->arch->archname);
2646 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
2647 {
2648 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
2649 return;
2650 }
2651
2652 find += strlen (transformer->arch->archname) + 1;
2653 /* Item can be used, now find how many and what it yields */
2654 if (isdigit (*(find)))
2655 {
2656 yield = atoi (find);
2657 if (yield < 1)
2658 {
2659 LOG (llevDebug, "apply_item_transformer: item %s has slaying-yield %d.", query_base_name (marked, 0), yield);
2660 yield = 1;
2661 }
2662 }
2663 else
2664 yield = 1;
2665
2666 while (isdigit (*find))
2667 find++;
2668
2669 while (*find == ' ')
2670 find++;
2671
2672 memset (got, 0, MAX_BUF);
2673
2674 if ((separator = strchr (find, ';')) != NULL)
2675 len = separator - find;
2676 else
2677 len = strlen (find);
2678
2679 if (len > MAX_BUF - 1)
2680 len = MAX_BUF - 1;
2681
2682 strcpy (got, find);
2683 got[len] = '\0';
2684
2685 /* Now create new item, remove used ones when required. */
2686 new_item = get_archetype (got);
2687 if (!new_item)
2688 {
2689 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
2690 return;
2691 }
2692
2693 new_item->nrof = yield;
2694
2695 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
2696
2697 pl->insert (new_item);
2698 /* Eat up one item */
2699 marked->decrease ();
2700
2701 /* Eat one transformer if needed */
2702 if (transformer->stats.food)
2703 if (--transformer->stats.food == 0)
2704 transformer->decrease ();
2705}
2524 2706
2525/** 2707/**
2526 * Main apply handler. 2708 * Main apply handler.
2527 * 2709 *
2528 * Checks for unpaid items before applying. 2710 * Checks for unpaid items before applying.
… …
2530 * Return value: 2712 * Return value:
2531 * 0: player or monster can't apply objects of that type 2713 * 0: player or monster can't apply objects of that type
2532 * 1: has been applied, or there was an error applying the object 2714 * 1: has been applied, or there was an error applying the object
2533 * 2: objects of that type can't be applied if not in inventory 2715 * 2: objects of that type can't be applied if not in inventory
2534 * 2716 *
2535 * op is the object that is causing object to be applied, tmp is the object 2717 * who is the object that is causing object to be applied, op is the object
2536 * being applied. 2718 * being applied.
2537 * 2719 *
2538 * aflag is special (always apply/unapply) flags. Nothing is done with 2720 * aflag is special (always apply/unapply) flags. Nothing is done with
2539 * them in this function - they are passed to apply_special 2721 * them in this function - they are passed to apply_special
2540 */ 2722 */
2541
2542int 2723int
2543manual_apply (object *op, object *tmp, int aflag) 2724manual_apply (object *who, object *op, int aflag)
2544{ 2725{
2545 if (tmp->head) 2726 op = op->head_ ();
2546 tmp = tmp->head;
2547 2727
2548 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2728 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
2549 { 2729 {
2550 if (op->type == PLAYER) 2730 if (who->type == PLAYER)
2551 { 2731 {
2552 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2732 examine (who, op);
2733 //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
2553 return 1; 2734 return 1;
2554 } 2735 }
2555 else 2736 else
2556 {
2557 return 0; /* monsters just skip unpaid items */ 2737 return 0; /* monsters just skip unpaid items */
2558 }
2559 } 2738 }
2560 2739
2561 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2740 if (INVOKE_OBJECT (APPLY, op, ARG_OBJECT (who)))
2562 return RESULT_INT (0); 2741 return RESULT_INT (0);
2563 2742
2564 switch (tmp->type) 2743 switch (op->type)
2565 { 2744 {
2566
2567 case CF_HANDLE: 2745 case T_HANDLE:
2568 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2746 who->play_sound (sound_find ("turn_handle"));
2569 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2747 who->statusmsg ("You turn the handle.");
2570 tmp->value = tmp->value ? 0 : 1; 2748 op->value = op->value ? 0 : 1;
2571 SET_ANIMATION (tmp, tmp->value); 2749 SET_ANIMATION (op, op->value);
2572 update_object (tmp, UP_OBJ_FACE); 2750 update_object (op, UP_OBJ_FACE);
2573 push_button (tmp); 2751 push_button (op, who);
2574 return 1; 2752 return 1;
2575 2753
2576 case TRIGGER: 2754 case TRIGGER:
2577 if (check_trigger (tmp, op)) 2755 if (check_trigger (op, who, who))
2578 { 2756 {
2579 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2757 who->statusmsg ("You turn the handle.");
2580 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2758 who->play_sound (sound_find ("turn_handle"));
2581 } 2759 }
2582 else 2760 else
2583 { 2761 who->failmsg ("The handle doesn't move.");
2584 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2762
2585 }
2586 return 1; 2763 return 1;
2587 2764
2588 case EXIT: 2765 case EXIT:
2589 if (op->type != PLAYER) 2766 if (who->type != PLAYER)
2590 return 0; 2767 return 0;
2768
2591 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2769 if (!EXIT_PATH (op) || !is_legal_2ways_exit (who, op))
2592 { 2770 who->failmsg (format ("The %s is closed. H<And will stay closed, until somebody fires up the map editor and adds it.>", query_name (op)));
2593 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2594 }
2595 else 2771 else
2596 { 2772 {
2597 /* Don't display messages for random maps. */ 2773 /* Don't display messages for random maps. */
2598 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2) && strncmp (EXIT_PATH (tmp), "/random/", 8)) 2774 if (op->msg && !EXIT_PATH (op).starts_with ("/!"))
2599 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2775 who->statusmsg (op->msg, NDI_NAVY);
2776
2600 enter_exit (op, tmp); 2777 who->enter_exit (op);
2601 } 2778 }
2779
2602 return 1; 2780 return 1;
2603 2781
2782 case INSCRIBABLE:
2783 who->statusmsg (op->msg);
2784 // maybe show a spell menu to chose from or something like that
2785 return 1;
2786
2604 case SIGN: 2787 case SIGN:
2605 apply_sign (op, tmp, 0); 2788 apply_sign (who, op, 0);
2606 return 1; 2789 return 1;
2607 2790
2608 case BOOK: 2791 case BOOK:
2609 if (op->type == PLAYER) 2792 if (who->type == PLAYER)
2610 { 2793 {
2611 apply_book (op, tmp); 2794 apply_book (who, op);
2612 return 1; 2795 return 1;
2613 } 2796 }
2614 else 2797 else
2798 return 0;
2799
2800 case SKILLSCROLL:
2801 if (who->type == PLAYER)
2615 { 2802 {
2616 return 0;
2617 }
2618
2619 case SKILLSCROLL:
2620 if (op->type == PLAYER)
2621 {
2622 apply_skillscroll (op, tmp); 2803 apply_skillscroll (who, op);
2623 return 1;
2624 }
2625 return 0;
2626
2627 case SPELLBOOK:
2628 if (op->type == PLAYER)
2629 {
2630 apply_spellbook (op, tmp);
2631 return 1;
2632 }
2633 return 0;
2634
2635 case SCROLL:
2636 apply_scroll (op, tmp, 0);
2637 return 1;
2638
2639 case POTION:
2640 (void) apply_potion (op, tmp);
2641 return 1;
2642
2643 /* Eneq(@csd.uu.se): Handle apply on containers. */
2644 case CLOSE_CON:
2645 if (op->type == PLAYER)
2646 (void) esrv_apply_container (op, tmp->env);
2647 else
2648 (void) apply_container (op, tmp->env);
2649 return 1;
2650
2651 case CONTAINER:
2652 if (op->type == PLAYER)
2653 (void) esrv_apply_container (op, tmp);
2654 else
2655 (void) apply_container (op, tmp);
2656 return 1;
2657
2658 case TREASURE:
2659 if (op->type == PLAYER)
2660 {
2661 apply_treasure (op, tmp);
2662 return 1; 2804 return 1;
2663 } 2805 }
2664 else 2806 else
2807 return 0;
2808
2809 case SPELLBOOK:
2810 if (who->type == PLAYER)
2665 { 2811 {
2812 apply_spellbook (who, op);
2666 return 0; 2813 return 1;
2667 } 2814 }
2815 else
2816 return 0;
2817
2818 case SCROLL:
2819 apply_scroll (who, op, 0);
2820 return 1;
2821
2822 case POTION:
2823 apply_potion (who, op);
2824 return 1;
2825
2826 /* Eneq(@csd.uu.se): Handle apply on containers. */
2827 //TODO: remove, as it is unsed?
2828 case CLOSE_CON:
2829 apply_container (who, op->env);
2830 return 1;
2831
2832 case CONTAINER:
2833 apply_container (who, op);
2834 return 1;
2835
2836 case TREASURE:
2837 if (who->type == PLAYER)
2838 {
2839 apply_treasure (who, op);
2840 return 1;
2841 }
2842 else
2843 return 0;
2844
2845 case LAMP:
2846 case TORCH:
2847 player_apply_lamp (who, op);
2848 return 1;
2668 2849
2669 case WEAPON: 2850 case WEAPON:
2670 case ARMOUR: 2851 case ARMOUR:
2671 case BOOTS: 2852 case BOOTS:
2672 case GLOVES: 2853 case GLOVES:
… …
2680 case WAND: 2861 case WAND:
2681 case ROD: 2862 case ROD:
2682 case HORN: 2863 case HORN:
2683 case SKILL: 2864 case SKILL:
2684 case BOW: 2865 case BOW:
2685 case LAMP:
2686 case BUILDER: 2866 case BUILDER:
2687 case SKILL_TOOL: 2867 case SKILL_TOOL:
2688 if (tmp->env != op) 2868 if (op->env != who)
2689 return 2; /* not in inventory */ 2869 return 2; /* not in inventory */
2870
2690 (void) apply_special (op, tmp, aflag); 2871 apply_special (who, op, aflag);
2691 return 1; 2872 return 1;
2692 2873
2693 case DRINK: 2874 case DRINK:
2694 case FOOD: 2875 case FOOD:
2695 case FLESH: 2876 case FLESH:
2696 apply_food (op, tmp); 2877 apply_food (who, op);
2697 return 1; 2878 return 1;
2698 2879
2699 case POISON: 2880 case POISON:
2700 apply_poison (op, tmp); 2881 apply_poison (who, op);
2701 return 1; 2882 return 1;
2702 2883
2703 case SAVEBED: 2884 case SAVEBED:
2885 return 1;
2886
2887 case ARMOUR_IMPROVER:
2704 if (op->type == PLAYER) 2888 if (who->type == PLAYER)
2705 { 2889 {
2706 apply_savebed (op); 2890 apply_armour_improver (who, op);
2707 return 1; 2891 return 1;
2708 } 2892 }
2709 else 2893 else
2894 return 0;
2895
2896 case WEAPON_IMPROVER:
2897 check_improve_weapon (who, op);
2898 return 1;
2899
2900 case CLOCK:
2901 if (who->type == PLAYER)
2710 { 2902 {
2711 return 0; 2903 char buf[MAX_BUF];
2904 timeofday_t tod;
2905
2906 get_tod (&tod);
2907 who->play_sound (sound_find ("sound_clock"));
2908 who->statusmsg (format (
2909 "It is %d minute%s past %d o'clock %s",
2910 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2911 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2712 } 2912 ));
2713
2714 case ARMOUR_IMPROVER:
2715 if (op->type == PLAYER)
2716 {
2717 apply_armour_improver (op, tmp);
2718 return 1; 2913 return 1;
2719 } 2914 }
2720 else 2915 else
2916 return 0;
2917
2918 case MENU:
2919 if (who->type == PLAYER)
2721 { 2920 {
2722 return 0; 2921 shop_listing (op, who);
2723 }
2724
2725 case WEAPON_IMPROVER:
2726 (void) check_improve_weapon (op, tmp);
2727 return 1;
2728
2729 case CLOCK:
2730 if (op->type == PLAYER)
2731 {
2732 char buf[MAX_BUF];
2733 timeofday_t tod;
2734
2735 get_tod (&tod);
2736 sprintf (buf, "It is %d minute%s past %d o'clock %s",
2737 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2738 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am"));
2739 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0);
2740 new_draw_info (NDI_UNIQUE, 0, op, buf);
2741 return 1; 2922 return 1;
2742 } 2923 }
2743 else 2924 else
2925 return 0;
2926
2927 case POWER_CRYSTAL:
2928 apply_power_crystal (who, op); /* see egoitem.c */
2929 return 1;
2930
2931 case LIGHTER: /* for lighting torches/lanterns/etc */
2932 if (who->type == PLAYER)
2744 { 2933 {
2745 return 0; 2934 apply_lighter (who, op);
2746 }
2747
2748 case MENU:
2749 if (op->type == PLAYER)
2750 {
2751 shop_listing (op);
2752 return 1; 2935 return 1;
2753 } 2936 }
2754 else 2937 else
2755 {
2756 return 0; 2938 return 0;
2757 }
2758
2759 case POWER_CRYSTAL:
2760 apply_power_crystal (op, tmp); /* see egoitem.c */
2761 return 1;
2762
2763 case LIGHTER: /* for lighting torches/lanterns/etc */
2764 if (op->type == PLAYER)
2765 {
2766 apply_lighter (op, tmp);
2767 return 1;
2768 }
2769 else
2770 {
2771 return 0;
2772 }
2773 2939
2774 case ITEM_TRANSFORMER: 2940 case ITEM_TRANSFORMER:
2775 apply_item_transformer (op, tmp); 2941 apply_item_transformer (who, op);
2776 return 1; 2942 return 1;
2777 2943
2778 default: 2944 default:
2779 return 0; 2945 return 0;
2780 } 2946 }
2781} 2947}
2782
2783 2948
2784/* quiet suppresses the "don't know how to apply" and "you must get it first" 2949/* quiet suppresses the "don't know how to apply" and "you must get it first"
2785 * messages as needed by player_apply_below(). But there can still be 2950 * messages as needed by player_apply_below(). But there can still be
2786 * "but you are floating high above the ground" messages. 2951 * "but you are floating high above the ground" messages.
2787 * 2952 *
2788 * Same return value as apply() function. 2953 * Same return value as apply() function.
2789 */ 2954 */
2790int 2955int
2791player_apply (object *pl, object *op, int aflag, int quiet) 2956player_apply (object *pl, object *op, int aflag, int quiet)
2792{ 2957{
2793 int tmp;
2794
2795 if (op->env == NULL && (pl->move_type & MOVE_FLYING)) 2958 if (!op->env && (pl->move_type & MOVE_FLYING))
2796 { 2959 {
2797 /* player is flying and applying object not in inventory */ 2960 /* player is flying and applying object not in inventory */
2798 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2961 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2799 { 2962 {
2800 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2963 pl->failmsg ("But you are floating high above the ground! "
2964 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
2965 "or waiting till the levitation effect wears off.>");
2801 return 0; 2966 return 0;
2802 } 2967 }
2803 } 2968 }
2804 2969
2805 /* Check for PLAYER to avoid a DM to disappear in a puff of smoke if
2806 * applied.
2807 */
2808 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
2809 {
2810 play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE);
2811 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff " "of smoke!");
2812 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
2813 remove_ob (op);
2814 free_object (op);
2815 return 1;
2816 }
2817
2818 pl->contr->last_used = op; 2970 pl->contr->last_used = op;
2819 pl->contr->last_used_id = op->count;
2820 2971
2821 tmp = manual_apply (pl, op, aflag); 2972 int tmp = manual_apply (pl, op, aflag);
2973
2822 if (!quiet) 2974 if (!quiet)
2823 { 2975 {
2824 if (tmp == 0) 2976 if (tmp == 0)
2825 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op)); 2977 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2826 else if (tmp == 2) 2978 else if (tmp == 2)
2827 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n"); 2979 pl->failmsg ("You must get it first!\n");
2828 } 2980 }
2981
2829 return tmp; 2982 return tmp;
2830} 2983}
2831 2984
2832/** 2985/**
2833 * player_apply_below attempts to apply the object 'below' the player. 2986 * player_apply_below attempts to apply the object 'below' the player.
2834 * If the player has an open container, we use that for below, otherwise 2987 * If the player has an open container, we use that for below, otherwise
2835 * we use the ground. 2988 * we use the ground.
2836 */ 2989 */
2837
2838void 2990void
2839player_apply_below (object *pl) 2991player_apply_below (object *pl)
2840{ 2992{
2841 object *tmp, *next;
2842 int floors; 2993 int floors = 0;
2843 2994
2844 /* If using a container, set the starting item to be the top 2995 /* If using a container, set the starting item to be the top
2845 * item in the container. Otherwise, use the map. 2996 * item in the container. Otherwise, use the map.
2846 */
2847 tmp = (pl->container != NULL) ? pl->container->inv : pl->below;
2848
2849 /* This is perhaps more complicated. However, I want to make sure that 2997 * This is perhaps more complicated. However, I want to make sure that
2850 * we don't use a corrupt pointer for the next object, so we get the 2998 * we don't use a corrupt pointer for the next object, so we get the
2851 * next object in the stack before applying. This is can only be a 2999 * next object in the stack before applying. This is can only be a
2852 * problem if player_apply() has a bug in that it uses the object but does 3000 * problem if player_apply() has a bug in that it uses the object but does
2853 * not return a proper value. 3001 * not return a proper value.
2854 */ 3002 */
2855 for (floors = 0; tmp != NULL; tmp = next) 3003 for (object *next, *tmp = pl->container_ () ? pl->container_ ()->inv : pl->below; tmp; tmp = next)
2856 { 3004 {
2857 next = tmp->below; 3005 next = tmp->below;
3006
2858 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3007 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2859 floors++; 3008 floors++;
2860 else if (floors > 0) 3009 else if (floors > 0)
2861 return; /* process only floor objects after first floor object */ 3010 return; /* process only floor objects after first floor object */
2862 3011
… …
2864 * person moving on it, also activate. Added code to make it 3013 * person moving on it, also activate. Added code to make it
2865 * so that at least one of players movement types be that which 3014 * so that at least one of players movement types be that which
2866 * the item needs. 3015 * the item needs.
2867 */ 3016 */
2868 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 3017 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2869 {
2870 if (player_apply (pl, tmp, 0, 1) == 1) 3018 if (player_apply (pl, tmp, 0, 1) == 1)
2871 return; 3019 return;
2872 } 3020
2873 if (floors >= 2) 3021 if (floors >= 2)
2874 return; /* process at most two floor objects */ 3022 return; /* process at most two floor objects */
2875 } 3023 }
2876} 3024}
2877 3025
… …
2882 * to keep the size of apply_special to a more managable size. 3030 * to keep the size of apply_special to a more managable size.
2883 */ 3031 */
2884static int 3032static int
2885unapply_special (object *who, object *op, int aflags) 3033unapply_special (object *who, object *op, int aflags)
2886{ 3034{
2887 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 3035 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
3036 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2888 return RESULT_INT (0); 3037 return RESULT_INT (0);
2889 3038
2890 object *tmp2;
2891
2892 CLEAR_FLAG (op, FLAG_APPLIED); 3039 CLEAR_FLAG (op, FLAG_APPLIED);
3040
2893 switch (op->type) 3041 switch (op->type)
2894 { 3042 {
3043 case SKILL_TOOL:
3044 // unapplying a skill tool should also unapply the skill it governs
3045 // but this is hard, as it shouldn't do so when the skill can
3046 // be used for other reasons
3047 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3048 if (tmp->skill == op->skill
3049 && tmp->type == SKILL
3050 && tmp->flag [FLAG_APPLIED]
3051 && !tmp->flag [FLAG_CAN_USE_SKILL])
3052 unapply_special (who, tmp, 0);
3053
3054 change_abil (who, op);
3055 break;
3056
2895 case WEAPON: 3057 case WEAPON:
2896 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 3058 if (player *pl = who->contr)
3059 if (op == pl->combat_ob)
3060 {
3061 pl->combat_ob = 0;
3062 who->change_weapon (pl->ranged_ob);
3063 }
2897 3064
3065 who->statusmsg (format ("You unwield %s.", query_name (op)));
3066
2898 (void) change_abil (who, op); 3067 change_abil (who, op);
2899 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2900 CLEAR_FLAG (who, FLAG_READY_WEAPON); 3068 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2901 clear_skill (who);
2902 break; 3069 break;
2903 3070
2904 case SKILL: /* allows objects to impart skills */
2905 case SKILL_TOOL: 3071 case SKILL:
2906 if (op != who->chosen_skill) 3072 if (who->contr)
2907 { 3073 {
2908 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 3074 if (IS_COMBAT_SKILL (op->subtype))
3075 who->change_weapon (who->contr->combat_ob = 0);
3076 else if (IS_RANGED_SKILL (op->subtype))
3077 who->change_weapon (who->contr->ranged_ob = 0);
3078
3079 if (op->invisible)
3080 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
3081 else
3082 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2909 } 3083 }
2910 if (who->type == PLAYER) 3084
2911 {
2912 if (who->contr->shoottype == range_skill)
2913 who->contr->shoottype = range_none;
2914 if (!op->invisible)
2915 {
2916 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2917 }
2918 else
2919 {
2920 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2921 }
2922 }
2923 (void) change_abil (who, op); 3085 change_abil (who, op);
2924 who->chosen_skill = NULL;
2925 CLEAR_FLAG (who, FLAG_READY_SKILL); 3086 CLEAR_FLAG (who, FLAG_READY_SKILL);
2926 break; 3087 break;
2927 3088
2928 case ARMOUR: 3089 case ARMOUR:
2929 case HELMET: 3090 case HELMET:
… …
2933 case GLOVES: 3094 case GLOVES:
2934 case AMULET: 3095 case AMULET:
2935 case GIRDLE: 3096 case GIRDLE:
2936 case BRACERS: 3097 case BRACERS:
2937 case CLOAK: 3098 case CLOAK:
2938 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 3099 who->statusmsg (format ("You unwear %s.", query_name (op)));
2939 (void) change_abil (who, op); 3100 change_abil (who, op);
2940 break; 3101 break;
2941 case LAMP:
2942 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2943 tmp2 = arch_to_object (op->other_arch);
2944 tmp2->x = op->x;
2945 tmp2->y = op->y;
2946 tmp2->map = op->map;
2947 tmp2->below = op->below;
2948 tmp2->above = op->above;
2949 tmp2->stats.food = op->stats.food;
2950 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2951 3102
2952 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2953 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2954
2955 if (who->type == PLAYER)
2956 esrv_del_item (who->contr, op->count);
2957
2958 remove_ob (op);
2959 free_object (op);
2960 insert_ob_in_ob (tmp2, who);
2961 fix_player (who);
2962 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2963 {
2964 if (who->type == PLAYER)
2965 {
2966 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2967 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2968 }
2969 }
2970 if (who->type == PLAYER)
2971 esrv_send_item (who, tmp2);
2972 return 1; /* otherwise, an attempt to drop causes problems */
2973 break;
2974 case BOW: 3103 case BOW:
2975 case WAND: 3104 case WAND:
2976 case ROD: 3105 case ROD:
2977 case HORN: 3106 case HORN:
2978 clear_skill (who); 3107 if (player *pl = who->contr)
2979 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2980 if (who->type == PLAYER)
2981 { 3108 {
2982 who->contr->shoottype = range_none; 3109 if (op == pl->ranged_ob)
3110 {
3111 pl->ranged_ob = 0;
3112 who->change_weapon (pl->combat_ob);
3113 }
3114
3115 who->statusmsg (format ("You unready %s.", query_name (op)));
2983 } 3116 }
2984 else 3117 else
2985 { 3118 {
3119 who->change_skill (0);
3120
2986 if (op->type == BOW) 3121 if (op->type == BOW)
2987 CLEAR_FLAG (who, FLAG_READY_BOW); 3122 CLEAR_FLAG (who, FLAG_READY_BOW);
2988 else 3123 else
2989 CLEAR_FLAG (who, FLAG_READY_RANGE); 3124 CLEAR_FLAG (who, FLAG_READY_RANGE);
2990 } 3125 }
3126
2991 break; 3127 break;
2992 3128
2993 case BUILDER: 3129 case BUILDER:
2994 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 3130 if (who->contr)
2995 who->contr->shoottype = range_none; 3131 who->statusmsg (format ("You unready %s.", query_name (op)));
2996 who->contr->ranges[range_builder] = NULL;
2997 break; 3132 break;
2998 3133
2999 default: 3134 default:
3000 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 3135 who->statusmsg (format ("You unapply %s.", query_name (op)));
3001 break; 3136 break;
3002 } 3137 }
3003 3138
3004 fix_player (who); 3139 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
3005 3140 if (object *pl = op->visible_to ())
3006 if (!(aflags & AP_NO_MERGE))
3007 {
3008 object *tmp;
3009
3010 tmp = merge_ob (op, NULL);
3011 if (who->type == PLAYER)
3012 {
3013 if (tmp)
3014 { /* it was merged */
3015 esrv_del_item (who->contr, op->count);
3016 op = tmp;
3017 }
3018
3019 esrv_send_item (who, op); 3141 esrv_send_item (pl, op);
3020 } 3142
3021 } 3143 who->update_stats ();
3144
3022 return 0; 3145 return 0;
3023} 3146}
3024 3147
3025/** 3148/**
3026 * Returns the object that is using location 'loc'. 3149 * Returns the object that is using location 'loc'.
3027 * Note that 'start' is the first object to start examing - we 3150 * Note that 'start' is the first object to start examing - we
3028 * then go through the below of this. In this way, you can do 3151 * then go through the below of this. In this way, you can do
3029 * something like: 3152 * something like:
3030 * tmp = get_item_from_body_location(who->inv, 1); 3153 * tmp = get_next_item_from_body_location(who->inv, 1);
3031 * if (tmp) tmp1 = get_item_from_body_location(tmp->below, 1); 3154 * if (tmp) tmp1 = get_next_item_from_body_location(tmp->below, 1);
3032 * to find the second object that may use this location, etc. 3155 * to find the second object that may use this location, etc.
3033 * Returns NULL if no match is found. 3156 * Returns NULL if no match is found.
3034 * loc is the index into the array we are looking for a match. 3157 * loc is the index into the array we are looking for a match.
3035 * don't return invisible objects unless they are skill objects 3158 * don't return invisible objects unless they are skill objects
3036 * invisible other objects that use 3159 * invisible other objects that use
3037 * up body locations can be used as restrictions. 3160 * up body locations can be used as restrictions.
3038 */ 3161 */
3039object * 3162static object *
3040get_item_from_body_location (object *start, int loc) 3163get_next_item_from_body_location (int loc, object *start)
3041{ 3164{
3042 object *tmp;
3043
3044 if (!start)
3045 return NULL;
3046
3047 for (tmp = start; tmp; tmp = tmp->below) 3165 for (object *tmp = start; tmp; tmp = tmp->below)
3048 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 3166 if (tmp->flag [FLAG_APPLIED]
3167 && tmp->slot[loc].info
3168 && (!tmp->invisible || tmp->type == SKILL))
3049 return tmp; 3169 return tmp;
3050 3170
3051 return NULL; 3171 return 0;
3052} 3172}
3053
3054
3055 3173
3056/** 3174/**
3057 * 'op' wants to apply an object, but can't because of other equipment. 3175 * 'op' wants to apply an object, but can't because of other equipment.
3058 * This should only be called when it is known 3176 * This should only be called when it is known
3059 * that there are objects to unapply. This makes pretty heavy 3177 * that there are objects to unapply. This makes pretty heavy
… …
3062 * Returns 0 on success, returns 1 if there is some problem. 3180 * Returns 0 on success, returns 1 if there is some problem.
3063 * if aflags is AP_PRINT, we instead print out waht to unapply 3181 * if aflags is AP_PRINT, we instead print out waht to unapply
3064 * instead of doing it. This is a lot less code than having 3182 * instead of doing it. This is a lot less code than having
3065 * another function that does just that. 3183 * another function that does just that.
3066 */ 3184 */
3185
3186#define CANNOT_REMOVE_CURSED \
3187 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
3188 "Praying over an altar, scrolls of remove curse/damnation, " \
3189 "priests or even other players might help.>"
3190
3067int 3191int
3068unapply_for_ob (object *who, object *op, int aflags) 3192unapply_for_ob (object *who, object *op, int aflags)
3069{ 3193{
3070 int i; 3194 if (op->is_range ())
3071 object *tmp = NULL, *last;
3072
3073 /* If we are applying a shield or weapon, unapply any equipped shield
3074 * or weapons first - only allowed to use one weapon/shield at a time.
3075 */
3076 if (op->type == WEAPON || op->type == SHIELD)
3077 {
3078 for (tmp = who->inv; tmp; tmp = tmp->below) 3195 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3079 {
3080 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 3196 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
3081 {
3082 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 3197 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
3083 { 3198 {
3084 if (aflags & AP_PRINT) 3199 if (aflags & AP_PRINT)
3085 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 3200 who->failmsg (query_name (tmp));
3086 else 3201 else
3087 unapply_special (who, tmp, aflags); 3202 unapply_special (who, tmp, aflags);
3088 } 3203 }
3089 else 3204 else
3090 { 3205 {
3091 /* In this case, we want to try and remove a cursed item. 3206 /* In this case, we want to try and remove a cursed item.
3092 * While we know it won't work, we want unapply_special to 3207 * While we know it won't work, we want unapply_special to
3093 * at least generate the message. 3208 * at least generate the message.
3094 */ 3209 */
3095 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 3210 who->failmsg (format ("No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED, query_name (tmp)));
3096 return 1; 3211 return 1;
3097 }
3098
3099 } 3212 }
3100 }
3101 }
3102 3213
3103 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 3214 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3104 { 3215 {
3105 /* this used up a slot that we need to free */ 3216 /* this used up a slot that we need to free */
3106 if (op->body_info[i]) 3217 if (op->slot[i].info)
3107 { 3218 {
3108 last = who->inv; 3219 object *last = who->inv;
3109 3220
3110 /* We do a while loop - may need to remove several items in order 3221 /* We do a while loop - may need to remove several items in order
3111 * to free up enough slots. 3222 * to free up enough slots.
3112 */ 3223 */
3113 while ((who->body_used[i] + op->body_info[i]) < 0) 3224 while ((who->slot[i].used + op->slot[i].info) < 0)
3114 { 3225 {
3115 tmp = get_item_from_body_location (last, i); 3226 object *tmp = get_next_item_from_body_location (i, last);
3227
3116 if (!tmp) 3228 if (!tmp)
3117 { 3229 {
3118#if 0 3230#if 0
3119 /* Not a bug - we'll get this if the player has cursed items 3231 /* Not a bug - we'll get this if the player has cursed items
3120 * equipped. 3232 * equipped.
3121 */ 3233 */
3122 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 3234 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
3123#endif 3235#endif
3124 return 1; 3236 return 1;
3125 } 3237 }
3238
3126 /* If we are just printing, we don't care about cursed status */ 3239 /* If we are just printing, we don't care about cursed status */
3127 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 3240 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
3128 { 3241 {
3129 if (aflags & AP_PRINT) 3242 if (aflags & AP_PRINT)
3130 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 3243 who->failmsg (query_name (tmp));
3131 else 3244 else
3132 unapply_special (who, tmp, aflags); 3245 unapply_special (who, tmp, aflags);
3133 } 3246 }
3134 else 3247 else
3135 { 3248 {
3136 /* Cursed item that we can't unequip - tell the player. 3249 /* Cursed item that we can't unequip - tell the player.
3137 * Note this could be annoying if this is just one of a few, 3250 * Note this could be annoying if this is just one of a few,
3138 * so it may not be critical (eg, putting on a ring and you have 3251 * so it may not be critical (eg, putting on a ring and you have
3139 * one cursed ring.) 3252 * one cursed ring.)
3140 */ 3253 */
3141 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 3254 who->failmsg (format ("The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp)));
3142 } 3255 }
3256
3143 last = tmp->below; 3257 last = tmp->below;
3144 } 3258 }
3145 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 3259 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
3146 * return in the !tmp would have kicked in. 3260 * return in the !tmp would have kicked in.
3147 */ 3261 */
3148 } /* if op is using this body location */ 3262 } /* if op is using this body location */
3149 } /* for body lcoations */ 3263 } /* for body lcoations */
3264
3150 return 0; 3265 return 0;
3151} 3266}
3152 3267
3153/** 3268/**
3154 * Checks to see if 'who' can apply object 'op'. 3269 * Checks to see if 'who' can apply object 'op'.
3155 * Returns 0 if apply can be done without anything special. 3270 * Returns 0 if apply can be done without anything special.
3156 * Otherwise returns a bitmask - potentially several of these may be 3271 * Otherwise returns a bitmask - potentially several of these may be
3157 * set, but largely depends on circumstance - in the future, processing 3272 * set, but largely depends on circumstance - in the future, processing
3158 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 3273 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
3159 * is set, do we really are what the other flags may be?) 3274 * is set, do we really care what the other flags may be?)
3160 * 3275 *
3161 * See include/define.h for detailed description of the meaning of 3276 * See include/define.h for detailed description of the meaning of
3162 * these return values. 3277 * these return values.
3163 */ 3278 */
3164int 3279int
3165can_apply_object (object *who, object *op) 3280can_apply_object (object *who, object *op)
3166{ 3281{
3167 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 3282 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
3168 return RESULT_INT (0); 3283 return RESULT_INT (0);
3169 3284
3170 int i, retval = 0; 3285 int retval = 0;
3171 object *tmp = NULL, *ws = NULL; 3286 object *tmp = 0, *ws = 0;
3172 3287
3173 /* Players have 2 'arm's, so they could in theory equip 2 shields or 3288 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3174 * 2 weapons, but we don't want to let them do that. So if they are
3175 * trying to equip a weapon or shield, see if they already have one
3176 * in place and store that way.
3177 */
3178 if (op->type == WEAPON || op->type == SHIELD)
3179 { 3289 {
3180 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 3290 if (op->slot[i].info)
3181 { 3291 {
3182 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 3292 /* Item uses more slots than we have */
3293 if (who->slot[i].info + op->slot [i].info < 0)
3183 { 3294 {
3184 retval = CAN_APPLY_UNAPPLY;
3185 ws = tmp;
3186 }
3187 }
3188 }
3189
3190
3191 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
3192 {
3193 if (op->body_info[i])
3194 {
3195 /* Item uses more slots than we have */
3196 if (FABS (op->body_info[i]) > who->body_info[i])
3197 {
3198 /* Could return now for efficiently - rest of info below isn' 3295 /* Could return now for efficiency - rest of info below isn't
3199 * really needed. 3296 * really needed.
3200 */ 3297 */
3201 retval |= CAN_APPLY_NEVER; 3298 retval |= CAN_APPLY_NEVER;
3202 } 3299 }
3203 else if ((who->body_used[i] + op->body_info[i]) < 0) 3300 else if (who->slot[i].used + op->slot[i].info < 0)
3204 { 3301 {
3205 /* in this case, equipping this would use more free spots than 3302 /* in this case, equipping this would use more free spots than
3206 * we have. 3303 * we have.
3207 */ 3304 */
3208 object *tmp1;
3209
3210 3305
3211 /* if we have an applied weapon/shield, and unapply it would free 3306 /* if we have an applied weapon/shield, and unapply it would free
3212 * enough slots to equip the new item, then just set this can 3307 * enough slots to equip the new item, then just set "can
3213 * continue. We don't care about the logic below - if you have 3308 * apply unapply". We don't care about the logic below - if you have a
3214 * shield equipped and try to equip another shield, there is only 3309 * shield equipped and try to equip another shield, there is only
3215 * one choice. However, the check for the number of body locations 3310 * one choice. However, the check for the number of body locations
3216 * does take into the account cases where what is being applied 3311 * does take into the account cases where what is being applied
3217 * may be two handed for example. 3312 * may be two handed for example.
3218 */ 3313 */
3219 if (ws) 3314 if (ws)
3220 { 3315 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
3221 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0)
3222 { 3316 {
3223 retval |= CAN_APPLY_UNAPPLY; 3317 retval |= CAN_APPLY_UNAPPLY;
3224 continue; 3318 continue;
3225 } 3319 }
3226 }
3227 3320
3228 tmp1 = get_item_from_body_location (who->inv, i); 3321 object *tmp1 = get_next_item_from_body_location (i, who->inv);
3229 if (!tmp1) 3322 if (!tmp1)
3230 { 3323 {
3231#if 0 3324#if 0
3232 /* This is sort of an error, but happens a lot when old players 3325 /* This is sort of an error, but happens a lot when old players
3233 * join in with more stuff equipped than they are now allowed. 3326 * join in with more stuff equipped than they are now allowed.
… …
3241 /* need to unapply something. However, if this something 3334 /* need to unapply something. However, if this something
3242 * is different than we had found before, it means they need 3335 * is different than we had found before, it means they need
3243 * to apply multiple objects 3336 * to apply multiple objects
3244 */ 3337 */
3245 retval |= CAN_APPLY_UNAPPLY; 3338 retval |= CAN_APPLY_UNAPPLY;
3339
3246 if (!tmp) 3340 if (!tmp)
3247 tmp = tmp1; 3341 tmp = tmp1;
3248 else if (tmp != tmp1) 3342 else if (tmp != tmp1)
3249 {
3250 retval |= CAN_APPLY_UNAPPLY_MULT; 3343 retval |= CAN_APPLY_UNAPPLY_MULT;
3251 } 3344
3252 /* This object isn't using up all the slots, so there must 3345 /* This object isn't using up all the slots, so there must
3253 * be another. If so, and it the new item doesn't need all 3346 * be another. If so, and it the new item doesn't need all
3254 * the slots, the player then has a choice. 3347 * the slots, the player then has a choice.
3255 */ 3348 */
3256 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 3349 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
3350 && abs (op->slot[i].info) < who->slot[i].info)
3257 retval |= CAN_APPLY_UNAPPLY_CHOICE; 3351 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3258 3352
3259 /* Does unequippint 'tmp1' free up enough slots for this to be 3353 /* Does unequippint 'tmp1' free up enough slots for this to be
3260 * equipped? If not, there must be something else to unapply. 3354 * equipped? If not, there must be something else to unapply.
3261 */ 3355 */
3262 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 3356 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3263 retval |= CAN_APPLY_UNAPPLY_MULT; 3357 retval |= CAN_APPLY_UNAPPLY_MULT;
3264
3265 } 3358 }
3266 } /* if not enough free slots */ 3359 } /* if not enough free slots */
3267 } /* if this object uses location i */ 3360 } /* if this object uses location i */
3268 } /* for i -> num_body_locations loop */ 3361 } /* for i -> num_body_locations loop */
3269 3362
… …
3274 * and weapons all use the same slot. Similar for horn/rod/wand - they 3367 * and weapons all use the same slot. Similar for horn/rod/wand - they
3275 * all use the same location. 3368 * all use the same location.
3276 */ 3369 */
3277 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3370 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3278 retval |= CAN_APPLY_RESTRICTION; 3371 retval |= CAN_APPLY_RESTRICTION;
3372
3279 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3373 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3280 retval |= CAN_APPLY_RESTRICTION; 3374 retval |= CAN_APPLY_RESTRICTION;
3281 3375
3282
3283 if (who->type != PLAYER) 3376 if (who->type != PLAYER)
3284 { 3377 {
3285 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3378 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3286 retval |= CAN_APPLY_RESTRICTION; 3379 retval |= CAN_APPLY_RESTRICTION;
3380
3287 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3381 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3288 retval |= CAN_APPLY_RESTRICTION; 3382 retval |= CAN_APPLY_RESTRICTION;
3383
3289 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3384 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3290 retval |= CAN_APPLY_RESTRICTION; 3385 retval |= CAN_APPLY_RESTRICTION;
3386
3291 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3387 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3292 retval |= CAN_APPLY_RESTRICTION; 3388 retval |= CAN_APPLY_RESTRICTION;
3293 } 3389 }
3390
3294 return retval; 3391 return retval;
3295} 3392}
3296
3297
3298 3393
3299/** 3394/**
3300 * who is the object using the object. It can be a monster. 3395 * who is the object using the object. It can be a monster.
3301 * op is the object they are using. op is an equipment type item, 3396 * op is the object they are using. op is an equipment type item,
3302 * eg, one which you put on and keep on for a while, and not something 3397 * eg, one which you put on and keep on for a while, and not something
… …
3311 * AP_UNAPPLY=always unapply). 3406 * AP_UNAPPLY=always unapply).
3312 * 3407 *
3313 * Optional flags: 3408 * Optional flags:
3314 * AP_NO_MERGE: don't merge an unapplied object with other objects 3409 * AP_NO_MERGE: don't merge an unapplied object with other objects
3315 * AP_IGNORE_CURSE: unapply cursed items 3410 * AP_IGNORE_CURSE: unapply cursed items
3411 * AP_NO_READY: do not ready skills when applying skill tools
3316 * 3412 *
3317 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3413 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3318 * 3414 *
3319 * apply_special() doesn't check for unpaid items. 3415 * apply_special() doesn't check for unpaid items.
3320 */ 3416 */
3417
3418#define LACK_ITEM_POWER \
3419 " H<You lack enough unused item power to use this weapon, see the skills command.>"
3420
3321int 3421int
3322apply_special (object *who, object *op, int aflags) 3422apply_special (object *who, object *op, int aflags)
3323{ 3423{
3324 int basic_flag = aflags & AP_BASIC_FLAGS; 3424 int basic_flag = aflags & AP_BASIC_FLAGS;
3325 object *tmp, *tmp2, *skop = NULL; 3425 object *tmp, *tmp2, *skop = NULL;
3326 int i;
3327 3426
3328 if (who == NULL) 3427 if (who == NULL)
3329 { 3428 {
3330 LOG (llevError, "apply_special() from object without environment.\n"); 3429 LOG (llevError, "apply_special() from object without environment.\n");
3331 return 1; 3430 return 1;
… …
3341 if (basic_flag == AP_APPLY) 3440 if (basic_flag == AP_APPLY)
3342 return 0; 3441 return 0;
3343 3442
3344 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3443 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3345 { 3444 {
3346 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3445 who->failmsg (format ("No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED, query_name (op)));
3347 return 1; 3446 return 1;
3348 } 3447 }
3448
3349 return unapply_special (who, op, aflags); 3449 return unapply_special (who, op, aflags);
3350 } 3450 }
3351
3352 if (basic_flag == AP_UNAPPLY) 3451 else if (basic_flag == AP_UNAPPLY)
3353 return 0; 3452 return 0;
3354 3453
3355 i = can_apply_object (who, op); 3454 // if the item is combat/ranged, wield the relevant slot first
3455 // to resolve conflicts.
3456 if (player *pl = who->contr)
3457 switch (op->slottype ())
3458 {
3459 case slot_combat: who->change_weapon (pl->combat_ob); break;
3460 case slot_ranged: who->change_weapon (pl->ranged_ob); break;
3461 }
3462
3463 splay (op);
3356 3464
3357 /* Can't just apply this object. Lets see what not and what to do */ 3465 /* Can't just apply this object. Lets see what not and what to do */
3358 if (i) 3466 if (int i = can_apply_object (who, op))
3359 { 3467 {
3360 if (i & CAN_APPLY_NEVER) 3468 if (i & CAN_APPLY_NEVER)
3361 { 3469 {
3362 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3470 who->failmsg (format ("You don't have the body to use a %s. H<You can never apply this item.>", query_name (op)));
3363 return 1; 3471 return 1;
3364 } 3472 }
3365 else if (i & CAN_APPLY_RESTRICTION) 3473 else if (i & CAN_APPLY_RESTRICTION)
3366 { 3474 {
3367 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3475 who->failmsg (format (
3476 "You have a prohibition against using a %s. "
3477 "H<Your belief, profession or class prevents you from applying this item.>",
3478 query_name (op)
3479 ));
3368 return 1; 3480 return 1;
3369 } 3481 }
3482
3370 if (who->type != PLAYER) 3483 if (who->type != PLAYER)
3371 { 3484 {
3372 /* Some error, so don't try to equip something more */ 3485 /* Some error, so don't try to equip something more */
3373 if (unapply_for_ob (who, op, aflags)) 3486 if (unapply_for_ob (who, op, aflags))
3374 return 1; 3487 return 1;
3375 } 3488 }
3376 else 3489 else
3377 { 3490 {
3378 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3491 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3379 { 3492 {
3380 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3493 who->failmsg ("You need to unapply some of the following item(s) or change your applymode:");
3381 unapply_for_ob (who, op, AP_PRINT); 3494 unapply_for_ob (who, op, AP_PRINT);
3382 return 1; 3495 return 1;
3383 } 3496 }
3384 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3497 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3385 {
3386 i = unapply_for_ob (who, op, aflags); 3498 if (unapply_for_ob (who, op, aflags))
3387 if (i)
3388 return 1; 3499 return 1;
3389 } 3500 }
3390 }
3391 } 3501 }
3502
3392 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3503 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3393 { 3504 {
3394 skop = find_skill_by_name (who, op->skill); 3505 skop = find_skill_by_name (who, op->skill);
3506
3395 if (!skop) 3507 if (!skop)
3396 { 3508 {
3397 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3509 who->failmsg (format ("You need the %s skill to use this item!", &op->skill));
3398 return 1; 3510 return 1;
3399 } 3511 }
3400 else 3512 else
3401 {
3402 /* While experience will be credited properly, we want to change the 3513 /* While experience will be credited properly, we want to change the
3403 * skill so that the dam and wc get updated 3514 * skill so that the dam and wc get updated
3404 */ 3515 */
3405 change_skill (who, skop, 0); 3516 who->change_skill (skop);
3406 }
3407 }
3408
3409 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3410 { 3517 }
3411 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3518
3519 if (!check_item_power (who, op->item_power))
3520 {
3521 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3412 return 1; 3522 return 1;
3413 } 3523 }
3414
3415 3524
3416 /* Ok. We are now at the state where we can apply the new object. 3525 /* Ok. We are now at the state where we can apply the new object.
3417 * Note that we don't have the checks for can_use_... 3526 * Note that we don't have the checks for can_use_...
3418 * below - that is already taken care of by can_apply_object. 3527 * below - that is already taken care of by can_apply_object.
3419 */ 3528 */
3420 3529 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3421
3422 if (op->nrof > 1)
3423 tmp = get_split_ob (op, op->nrof - 1);
3424 else
3425 tmp = NULL;
3426 3530
3427 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3531 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3428 return RESULT_INT (0); 3532 return RESULT_INT (0);
3429 3533
3430 switch (op->type) 3534 switch (op->type)
3431 { 3535 {
3432 case WEAPON: 3536 case WEAPON:
3433 if (!check_weapon_power (who, op->last_eat)) 3537 //TODO: this obviously fails for players using a shorter prefix
3434 { 3538 // i.e. "R" can use Ragnarok's sword.
3435 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3539 if (op->level && !op->name.starts_with (who->name))
3436 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3437 if (tmp != NULL)
3438 (void) insert_ob_in_ob (tmp, who);
3439 return 1;
3440 }
3441 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3442 { 3540 {
3443 /* if the weapon does not have the name as the character, can't use it. */ 3541 /* if the weapon does not have the name as the character, can't use it. */
3444 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3542 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3445 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3543 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3544
3446 if (tmp != NULL) 3545 if (tmp)
3447 (void) insert_ob_in_ob (tmp, who); 3546 insert_ob_in_ob (tmp, who);
3547
3448 return 1; 3548 return 1;
3449 } 3549 }
3550
3551 if (!skop)
3552 {
3553 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3554 return 1;
3555 }
3556
3450 SET_FLAG (op, FLAG_APPLIED); 3557 SET_FLAG (op, FLAG_APPLIED);
3451
3452 if (skop)
3453 change_skill (who, skop, 1); 3558 who->change_skill (skop);
3454 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3559
3560 if (who->contr)
3561 who->change_weapon (who->contr->combat_ob = op);
3562
3563 who->statusmsg (format ("You wield %s.", query_name (op)));
3564
3455 SET_FLAG (who, FLAG_READY_WEAPON); 3565 SET_FLAG (who, FLAG_READY_WEAPON);
3456
3457 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3458
3459 (void) change_abil (who, op); 3566 change_abil (who, op);
3460 break; 3567 break;
3461 3568
3462 case ARMOUR: 3569 case ARMOUR:
3463 case HELMET: 3570 case HELMET:
3464 case SHIELD: 3571 case SHIELD:
… …
3468 case BRACERS: 3575 case BRACERS:
3469 case CLOAK: 3576 case CLOAK:
3470 case RING: 3577 case RING:
3471 case AMULET: 3578 case AMULET:
3472 SET_FLAG (op, FLAG_APPLIED); 3579 SET_FLAG (op, FLAG_APPLIED);
3473 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3580 who->statusmsg (format ("You wear %s.", query_name (op)));
3474 (void) change_abil (who, op); 3581 change_abil (who, op);
3475 break; 3582 break;
3476 case LAMP: 3583
3477 if (op->stats.food < 1) 3584 case SKILL_TOOL:
3585 // applying a skill tool also readies the skill
3586 SET_FLAG (op, FLAG_APPLIED);
3587
3588 if (!(aflags & AP_NO_READY))
3478 { 3589 {
3479 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3590 skop = find_skill_by_name (who, op->skill);
3591 if (!skop->flag [FLAG_APPLIED])
3592 apply_special (who, skop, AP_APPLY);
3593 }
3594 break;
3595
3596 case SKILL:
3597 if (player *pl = who->contr)
3598 {
3599 if (IS_COMBAT_SKILL (op->subtype))
3600 {
3601 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3602 {
3603 for (object *item = who->inv; item; item = item->below)
3604 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3605 {
3606 if (item->skill == op->skill)
3607 {
3608 who->change_weapon (pl->combat_ob = item);
3609 goto found_weapon;
3610 }
3611 }
3612
3613 who->failmsg (format (
3614 "You need to apply a '%s' melee weapon before readying this skill. "
3615 "H<Some skills need an item, in this case a melee weapon, to function.>",
3616 &op->skill
3617 ));
3618 return 1;
3619
3620 found_weapon:;
3621 }
3622 else
3623 who->change_weapon (pl->combat_ob = op);
3624 }
3625 else if (IS_RANGED_SKILL (op->subtype))
3626 {
3627 if (skill_flags [op->subtype] & SF_NEED_BOW)
3628 {
3629 for (object *item = who->inv; item; item = item->below)
3630 if (item->type == BOW && item->flag [FLAG_APPLIED])
3631 {
3632 //TODO: bows should/must all have skill missile weapon right now
3633 who->change_weapon (pl->ranged_ob = item);
3634 goto found_bow;
3635 }
3636
3637 who->failmsg (
3638 "You need to apply a missile weapon before readying this skill. "
3639 "H<Some skills need an item, in this case a missile weapon, to function.>"
3640 );
3641 return 1;
3642
3643 found_bow:;
3644 }
3645 else
3646 who->change_weapon (pl->ranged_ob = op);
3647 }
3648
3649 if (!op->invisible)
3650 {
3651 who->statusmsg (format (
3652 "You ready %s."
3653 "You can now use the skill: %s.",
3654 query_name (op),
3655 &op->skill
3656 ));
3657 }
3658 else
3659 who->statusmsg (format ("Readied skill: %s.", op->skill ? &op->skill : &op->name));
3660 }
3661 else
3662 {
3663 SET_FLAG (op, FLAG_APPLIED);
3664 change_abil (who, op);
3665 who->chosen_skill = op;
3666 SET_FLAG (who, FLAG_READY_SKILL);
3667 }
3668
3669 break;
3670
3671 case BOW:
3672 if (op->level && !op->name.starts_with (who->name))
3673 {
3674 who->failmsg ("The weapon does not recognize you as its owner. "
3675 "H<Its name indicates that it belongs to somebody else.>");
3676 if (tmp)
3677 insert_ob_in_ob (tmp, who);
3678
3480 return 1; 3679 return 1;
3481 } 3680 }
3482 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3483 tmp2 = arch_to_object (op->other_arch);
3484 tmp2->stats.food = op->stats.food;
3485 SET_FLAG (tmp2, FLAG_APPLIED);
3486 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3487 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3488 insert_ob_in_ob (tmp2, who);
3489 3681
3490 /* Remove the old lantern */ 3682 /*FALLTHROUGH*/
3491 if (who->type == PLAYER)
3492 esrv_del_item (who->contr, op->count);
3493
3494 remove_ob (op);
3495 free_object (op);
3496
3497 /* insert the portion that was split off */
3498 if (tmp != NULL)
3499 {
3500 (void) insert_ob_in_ob (tmp, who);
3501 if (who->type == PLAYER)
3502 esrv_send_item (who, tmp);
3503 }
3504 fix_player (who);
3505 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3506 {
3507 if (who->type == PLAYER)
3508 {
3509 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3510 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3511 }
3512 }
3513 if (who->type == PLAYER)
3514 esrv_send_item (who, tmp2);
3515 return 0;
3516 break;
3517
3518 /* this part is needed for skill-tools */
3519 case SKILL:
3520 case SKILL_TOOL:
3521 if (who->chosen_skill)
3522 {
3523 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3524 return 1;
3525 }
3526 if (who->type == PLAYER)
3527 {
3528 who->contr->shoottype = range_skill;
3529 who->contr->ranges[range_skill] = op;
3530 if (!op->invisible)
3531 {
3532 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3533 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3534 }
3535 else
3536 {
3537 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3538 }
3539 }
3540 SET_FLAG (op, FLAG_APPLIED);
3541 (void) change_abil (who, op);
3542 who->chosen_skill = op;
3543 SET_FLAG (who, FLAG_READY_SKILL);
3544 break;
3545
3546 case BOW: 3683 case WAND:
3547 if (!check_weapon_power (who, op->last_eat))
3548 {
3549 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use.");
3550 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3551 if (tmp != NULL)
3552 (void) insert_ob_in_ob (tmp, who);
3553 return 1;
3554 }
3555 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3556 {
3557 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3558 if (tmp != NULL)
3559 (void) insert_ob_in_ob (tmp, who);
3560 return 1;
3561 }
3562 /*FALLTHROUGH*/ case WAND:
3563 case ROD: 3684 case ROD:
3564 case HORN: 3685 case HORN:
3565 /* check for skill, alter player status */ 3686 /* check for skill, alter player status */
3687
3688 if (!skop)
3689 {
3690 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3691 return 1;
3692 }
3693
3566 SET_FLAG (op, FLAG_APPLIED); 3694 SET_FLAG (op, FLAG_APPLIED);
3567 if (skop)
3568 change_skill (who, skop, 0); 3695 who->change_skill (skop);
3569 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3570 3696
3571 if (who->type == PLAYER) 3697 if (who->contr)
3572 { 3698 {
3699 who->contr->ranged_ob = op;
3700
3701 who->statusmsg (format ("You ready %s.", query_name (op)));
3702
3573 if (op->type == BOW) 3703 if (op->type == BOW)
3574 { 3704 {
3705 who->current_weapon = op;
3575 (void) change_abil (who, op); 3706 change_abil (who, op);
3576 new_draw_info_format (NDI_UNIQUE, 0, who,
3577 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3707 who->statusmsg (format ("You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)));
3578 who->contr->shoottype = range_bow;
3579 }
3580 else
3581 {
3582 who->contr->shoottype = range_misc;
3583 } 3708 }
3584 } 3709 }
3585 else 3710 else
3586 { 3711 {
3587 if (op->type == BOW) 3712 if (op->type == BOW)
3588 SET_FLAG (who, FLAG_READY_BOW); 3713 SET_FLAG (who, FLAG_READY_BOW);
3589 else 3714 else
3590 SET_FLAG (who, FLAG_READY_RANGE); 3715 SET_FLAG (who, FLAG_READY_RANGE);
3591 } 3716 }
3717
3592 break; 3718 break;
3593 3719
3594 case BUILDER: 3720 case BUILDER:
3595 if (who->contr->ranges[range_builder]) 3721 if (who->type == PLAYER)
3722 {
3723 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3724 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3596 unapply_special (who, who->contr->ranges[range_builder], 0); 3725 unapply_special (who, who->contr->ranged_ob, 0);
3597 who->contr->shoottype = range_builder; 3726
3727 who->statusmsg (format ("You ready your %s.", query_name (op)));
3728
3598 who->contr->ranges[range_builder] = op; 3729 who->contr->ranged_ob = op;
3599 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3730 }
3600 break; 3731 break;
3601 3732
3602 default: 3733 default:
3603 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3734 who->statusmsg (format ("You apply %s.", query_name (op)));
3604 } /* end of switch op->type */ 3735 }
3605 3736
3606 SET_FLAG (op, FLAG_APPLIED); 3737 SET_FLAG (op, FLAG_APPLIED);
3607 3738
3608 if (tmp != NULL) 3739 if (tmp)
3609 tmp = insert_ob_in_ob (tmp, who); 3740 who->insert (tmp);
3610 3741
3611 fix_player (who); 3742 who->update_stats ();
3612 3743
3613 /* We exclude spell casting objects. The fire code will set the 3744 /* We exclude spell casting objects. The fire code will set the
3614 * been applied flag when they are used - until that point, 3745 * been applied flag when they are used - until that point,
3615 * you don't know anything about them. 3746 * you don't know anything about them.
3616 */ 3747 */
3617 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD) 3748 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3618 SET_FLAG (op, FLAG_BEEN_APPLIED); 3749 SET_FLAG (op, FLAG_BEEN_APPLIED);
3619 3750
3620 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3751 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3621 {
3622 if (who->type == PLAYER) 3752 if (who->type == PLAYER)
3623 { 3753 {
3624 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3754 who->failmsg (
3755 "Oops, it feels deadly cold! "
3756 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3757 );
3625 SET_FLAG (op, FLAG_KNOWN_CURSED); 3758 SET_FLAG (op, FLAG_KNOWN_CURSED);
3626 } 3759 }
3627 } 3760
3628 if (who->type == PLAYER) 3761 if (object *pl = op->visible_to ())
3629 {
3630 /* if multiple objects were applied, update both slots */
3631 if (tmp)
3632 esrv_send_item (who, tmp);
3633 esrv_send_item (who, op); 3762 esrv_send_item (pl, op);
3634 } 3763
3635 return 0; 3764 return 0;
3636} 3765}
3637
3638 3766
3639int 3767int
3640monster_apply_special (object *who, object *op, int aflags) 3768monster_apply_special (object *who, object *op, int aflags)
3641{ 3769{
3642 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3770 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3643 return 1; 3771 return 1;
3772
3644 return apply_special (who, op, aflags); 3773 return apply_special (who, op, aflags);
3645} 3774}
3646 3775
3647/** 3776/**
3648 * Map was just loaded, handle op's initialisation. 3777 * Map was just loaded, handle op's initialisation.
… …
3653auto_apply (object *op) 3782auto_apply (object *op)
3654{ 3783{
3655 object *tmp = NULL, *tmp2; 3784 object *tmp = NULL, *tmp2;
3656 int i; 3785 int i;
3657 3786
3787 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3788
3658 switch (op->type) 3789 switch (op->type)
3659 { 3790 {
3660 case SHOP_FLOOR: 3791 case SHOP_FLOOR:
3661 if (!HAS_RANDOM_ITEMS (op)) 3792 if (!op->has_random_items ())
3662 return 0; 3793 return 0;
3794
3663 do 3795 do
3664 { 3796 {
3665 i = 10; /* let's give it 10 tries */ 3797 i = 10; /* let's give it 10 tries */
3666 while ((tmp = generate_treasure (op->randomitems, 3798 while ((tmp = generate_treasure (op->randomitems,
3667 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3799 op->stats.exp
3800 ? (int) op->stats.exp
3801 : max (op->map->difficulty, 5)))
3802 == NULL && --i);
3803
3668 if (tmp == NULL) 3804 if (tmp == NULL)
3669 return 0; 3805 return 0;
3806
3670 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3807 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3671 { 3808 {
3672 free_object (tmp); 3809 tmp->destroy ();
3673 tmp = NULL; 3810 tmp = NULL;
3674 } 3811 }
3675 } 3812 }
3676 while (!tmp); 3813 while (!tmp);
3814
3677 tmp->x = op->x; 3815 tmp->x = op->x;
3678 tmp->y = op->y; 3816 tmp->y = op->y;
3679 SET_FLAG (tmp, FLAG_UNPAID); 3817 SET_FLAG (tmp, FLAG_UNPAID);
3680 insert_ob_in_map (tmp, op->map, NULL, 0); 3818 insert_ob_in_map (tmp, op->map, NULL, 0);
3681 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
3682 identify (tmp); 3819 identify (tmp);
3683 break; 3820 break;
3684 3821
3685 case TREASURE: 3822 case TREASURE:
3686 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3823 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3687 return 0; 3824 return 0;
3825
3688 while ((op->stats.hp--) > 0) 3826 while (op->stats.hp-- > 0)
3689 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3827 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0,
3690 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); 3828 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3691 3829
3692 /* If we generated an object and put it in this object inventory, 3830 /* If we generated an object and put it in this object inventory,
3693 * move it to the parent object as the current object is about 3831 * move it to the parent object as the current object is about
3694 * to disappear. An example of this item is the random_* stuff 3832 * to disappear. An example of this item is the random_* stuff
3695 * that is put inside other objects. 3833 * that is put inside other objects.
3696 */ 3834 */
3697 for (tmp = op->inv; tmp; tmp = tmp2)
3698 {
3699 tmp2 = tmp->below;
3700 remove_ob (tmp);
3701 if (op->env) 3835 if (op->env)
3702 insert_ob_in_ob (tmp, op->env); 3836 while (op->inv)
3703 else 3837 op->env->insert (op->inv);
3704 free_object (tmp); 3838
3705 } 3839 op->destroy ();
3706 remove_ob (op);
3707 free_object (op);
3708 break; 3840 break;
3709 } 3841 }
3710 return tmp ? 1 : 0;
3711}
3712 3842
3843 return !!tmp;
3844}
3845
3713/** 3846/**
3714 * fix_auto_apply goes through the entire map (only the first time 3847 * fix_auto_apply goes through the entire map every time a map
3715 * when an original map is loaded) and performs special actions for 3848 * is loaded or swapped in and performs special actions for
3716 * certain objects (most initialization of chests and creation of 3849 * certain objects (most initialization of chests and creation of
3717 * treasures and stuff). Calls auto_apply if appropriate. 3850 * treasures and stuff). Calls auto_apply if appropriate.
3718 */ 3851 */
3719void 3852void
3720fix_auto_apply (maptile *m) 3853maptile::fix_auto_apply ()
3721{ 3854{
3722 object *tmp, *above = NULL; 3855 if (!spaces)
3723 int x, y;
3724
3725 if (m == NULL)
3726 return; 3856 return;
3727 3857
3728 for (x = 0; x < MAP_WIDTH (m); x++) 3858 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3729 for (y = 0; y < MAP_HEIGHT (m); y++) 3859 for (object *tmp = ms->bot; tmp; )
3730 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above)
3731 { 3860 {
3732 above = tmp->above; 3861 object *above = tmp->above;
3733 3862
3734 if (tmp->inv) 3863 if (tmp->inv)
3735 { 3864 {
3736 object *invtmp, *invnext; 3865 object *invtmp, *invnext;
3737 3866
3738 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3867 for (invtmp = tmp->inv; invtmp; invtmp = invnext)
3739 { 3868 {
3740 invnext = invtmp->below; 3869 invnext = invtmp->below;
3741 3870
3742 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3871 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3743 auto_apply (invtmp); 3872 auto_apply (invtmp);
3744 else if (invtmp->type == TREASURE && HAS_RANDOM_ITEMS (invtmp)) 3873 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3745 { 3874 {
3746 while ((invtmp->stats.hp--) > 0) 3875 while (invtmp->stats.hp-- > 0)
3747 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0);
3748
3749 invtmp->randomitems = NULL;
3750 }
3751 else if (invtmp && invtmp->arch
3752 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && HAS_RANDOM_ITEMS (invtmp))
3753 {
3754 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3876 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3877
3878 invtmp->randomitems = NULL;
3879 }
3880 else if (invtmp && invtmp->arch
3881 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3882 {
3883 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3755 /* Need to clear this so that we never try to create 3884 /* Need to clear this so that we never try to create
3756 * treasure again for this object 3885 * treasure again for this object
3757 */ 3886 */
3758 invtmp->randomitems = NULL; 3887 invtmp->randomitems = NULL;
3759 } 3888 }
3760 } 3889 }
3761 /* This is really temporary - the code at the bottom will 3890 /* This is really temporary - the code at the bottom will
3762 * also set randomitems to null. The problem is there are bunches 3891 * also set randomitems to null. The problem is there are bunches
3763 * of maps/players already out there with items that have spells 3892 * of maps/players already out there with items that have spells
3764 * which haven't had the randomitems set to null yet. 3893 * which haven't had the randomitems set to null yet.
3765 * MSW 2004-05-13 3894 * MSW 2004-05-13
3766 * 3895 *
3767 * And if it's a spellbook, it's better to set randomitems to NULL too, 3896 * And if it's a spellbook, it's better to set randomitems to NULL too,
3768 * else you get two spells in the book ^_- 3897 * else you get two spells in the book ^_-
3769 * Ryo 2004-08-16 3898 * Ryo 2004-08-16
3770 */ 3899 */
3771 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3900 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3772 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK) 3901 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3773 tmp->randomitems = NULL;
3774
3775 }
3776
3777 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3778 auto_apply (tmp);
3779 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && HAS_RANDOM_ITEMS (tmp))
3780 {
3781 while ((tmp->stats.hp--) > 0)
3782 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
3783 tmp->randomitems = NULL; 3902 tmp->randomitems = NULL;
3903
3784 } 3904 }
3905
3906 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3907 auto_apply (tmp);
3908 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3909 {
3910 while ((tmp->stats.hp--) > 0)
3911 create_treasure (tmp->randomitems, tmp, 0, difficulty, 0);
3912 tmp->randomitems = NULL;
3913 }
3785 else if (tmp->type == TIMED_GATE) 3914 else if (tmp->type == TIMED_GATE)
3786 { 3915 {
3787 object *head = tmp->head != NULL ? tmp->head : tmp; 3916 object *head = tmp->head != NULL ? tmp->head : tmp;
3788 3917
3789 if (QUERY_FLAG (head, FLAG_IS_LINKED)) 3918 if (QUERY_FLAG (head, FLAG_IS_LINKED))
3790 {
3791 tmp->speed = 0; 3919 tmp->set_speed (0);
3792 update_ob_speed (tmp);
3793 }
3794 } 3920 }
3795 /* This function can be called everytime a map is loaded, even when 3921 /* This function can be called everytime a map is loaded, even when
3796 * swapping back in. As such, we don't want to create the treasure 3922 * swapping back in. As such, we don't want to create the treasure
3797 * over and ove again, so after we generate the treasure, blank out 3923 * over and ove again, so after we generate the treasure, blank out
3798 * randomitems so if it is swapped in again, it won't make anything. 3924 * randomitems so if it is swapped in again, it won't make anything.
3799 * This is a problem for the above objects, because they have counters 3925 * This is a problem for the above objects, because they have counters
3800 * which say how many times to make the treasure. 3926 * which say how many times to make the treasure.
3801 */ 3927 */
3802 else if (tmp && tmp->arch && tmp->type != PLAYER 3928 else if (tmp && tmp->arch && tmp->type != PLAYER
3803 && tmp->type != TREASURE && tmp->type != SPELL 3929 && tmp->type != TREASURE && tmp->type != SPELL
3804 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && HAS_RANDOM_ITEMS (tmp)) 3930 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3805 { 3931 {
3806 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 3932 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3807 tmp->randomitems = NULL; 3933 tmp->randomitems = NULL;
3808 } 3934 }
3935
3936 // close all containers
3937 else if (tmp->type == CONTAINER)
3938 tmp->flag [FLAG_APPLIED] = 0;
3939
3940 tmp = above;
3809 } 3941 }
3810 3942
3811 for (x = 0; x < MAP_WIDTH (m); x++) 3943 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3812 for (y = 0; y < MAP_HEIGHT (m); y++) 3944 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3813 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)
3814 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3945 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3815 check_trigger (tmp, tmp->above); 3946 check_trigger (tmp, tmp->above, tmp->above);
3816} 3947}
3817 3948
3818/** 3949/**
3819 * Handles player eating food that temporarily changes status (resistances, stats). 3950 * Handles player eating food that temporarily changes status (resistances, stats).
3820 * This used to call cast_change_attr(), but 3951 * This used to call cast_change_attr(), but
3821 * that doesn't work with the new spell code. Since we know what 3952 * that doesn't work with the new spell code. Since we know what
3822 * the food changes, just grab a force and use that instead. 3953 * the food changes, just grab a force and use that instead.
3823 */ 3954 */
3824
3825void 3955void
3826eat_special_food (object *who, object *food) 3956eat_special_food (object *who, object *food)
3827{ 3957{
3828 object *force; 3958 object *force;
3829 int i, did_one = 0; 3959 int i, did_one = 0;
3830 sint8 k;
3831 3960
3832 force = get_archetype (FORCE_NAME); 3961 char buf[64];
3962 snprintf (buf, sizeof(buf), "sp_food_%s", &food->title);
3963 shstr key (buf);
3833 3964
3834 for (i = 0; i < NUM_STATS; i++)
3835 {
3836 k = get_attr_value (&food->stats, i);
3837 if (k)
3838 {
3839 set_attr_value (&force->stats, i, k);
3840 did_one = 1;
3841 }
3842 }
3843
3844 /* check if we can protect the eater */
3845 for (i = 0; i < NROFATTACKS; i++)
3846 {
3847 if (food->resist[i] > 0)
3848 {
3849 force->resist[i] = food->resist[i] / 2;
3850 did_one = 1;
3851 }
3852 }
3853 if (did_one)
3854 {
3855 force->speed = 0.1;
3856 update_ob_speed (force);
3857 /* bigger morsel of food = longer effect time */ 3965 /* bigger morsel of food = longer effect time */
3858 force->stats.food = food->stats.food / 5; 3966 int duration = TIME2TICK (food->stats.food);
3859 SET_FLAG (force, FLAG_IS_USED_UP); 3967
3860 SET_FLAG (force, FLAG_APPLIED); 3968 if (force = who->force_find (key))
3861 change_abil (who, force); 3969 {
3862 insert_ob_in_ob (force, who); 3970 if (duration > abs (force->speed_left / force->speed))
3971 {
3972 new_draw_info_format (NDI_UNIQUE, 0, who, "More magical force spreads through you. H<The effect will last for about %.10g more seconds.>", TICK2TIME (duration));
3973 force->force_set_timer (duration);
3974 }
3975 else
3976 new_draw_info (NDI_UNIQUE, 0, who, "It had no additional effect.");
3977
3978 return;
3863 } 3979 }
3864 else 3980 else
3865 { 3981 {
3866 free_object (force); 3982 force = who->force_add (key, duration);
3983 force->name = key;
3984
3985 /* check if the food affects a stat */
3986 for (i = 0; i < NUM_STATS; i++)
3987 if (sint8 k = food->stats.stat (i))
3988 {
3989 force->stats.stat (i) = k;
3990 did_one = 1;
3991 }
3992
3993 /* check if we can protect the eater */
3994 for (i = 0; i < NROFATTACKS; i++)
3995 {
3996 if (food->resist[i] > 0)
3997 {
3998 force->resist[i] = food->resist[i];
3999 did_one = 1;
4000 }
4001 }
4002
4003 if (did_one)
4004 {
4005 new_draw_info_format (NDI_UNIQUE, 0, who, "You are suffused with magical force. H<The effect will last for about %.10g seconds.>", TICK2TIME (duration));
4006
4007 /* make the force take effect and report effects to user */
4008 change_abil (who, force);
4009 }
4010 else
4011 force->destroy ();
3867 } 4012 }
3868 4013
3869 /* check for hp, sp change */ 4014 /* check for hp, sp change */
3870 if (food->stats.hp != 0) 4015 if (food->stats.hp != 0)
3871 { 4016 {
3872 if (QUERY_FLAG (food, FLAG_CURSED)) 4017 if (QUERY_FLAG (food, FLAG_CURSED))
3873 { 4018 {
3874 strcpy (who->contr->killer, food->name); 4019 who->contr->killer = food;
3875 hit_player (who, food->stats.hp, food, AT_POISON, 1); 4020 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3876 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 4021 who->failmsg ("Eck!...that was poisonous!");
3877 } 4022 }
3878 else 4023 else
3879 { 4024 {
3880 if (food->stats.hp > 0) 4025 if (food->stats.hp > 0)
3881 new_draw_info (NDI_UNIQUE, 0, who, "You begin to feel better."); 4026 who->statusmsg ("You begin to feel better.");
3882 else 4027 else
3883 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 4028 who->failmsg ("Eck!...that was poisonous!");
4029
3884 who->stats.hp += food->stats.hp; 4030 who->stats.hp += food->stats.hp;
3885 } 4031 }
3886 } 4032 }
4033
3887 if (food->stats.sp != 0) 4034 if (food->stats.sp != 0)
3888 { 4035 {
3889 if (QUERY_FLAG (food, FLAG_CURSED)) 4036 if (QUERY_FLAG (food, FLAG_CURSED))
3890 { 4037 {
3891 new_draw_info (NDI_UNIQUE, 0, who, "You are drained of mana!"); 4038 who->failmsg ("You are drained of mana!");
3892 who->stats.sp -= food->stats.sp; 4039 who->stats.sp -= food->stats.sp;
3893 if (who->stats.sp < 0) 4040 if (who->stats.sp < 0)
3894 who->stats.sp = 0; 4041 who->stats.sp = 0;
3895 } 4042 }
3896 else 4043 else
3897 { 4044 {
3898 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 4045 who->statusmsg ("You feel a rush of magical energy!");
3899 who->stats.sp += food->stats.sp; 4046 who->stats.sp += food->stats.sp;
3900 /* place limit on max sp from food? */ 4047 /* place limit on max sp from food? */
3901 } 4048 }
3902 } 4049 }
3903 fix_player (who);
3904}
3905 4050
3906 4051 who->update_stats ();
3907/**
3908 * Designed primarily to light torches/lanterns/etc.
3909 * Also burns up burnable material too. First object in the inventory is
3910 * the selected object to "burn". -b.t.
3911 */
3912
3913void
3914apply_lighter (object *who, object *lighter)
3915{
3916 object *item;
3917 int is_player_env = 0;
3918 char item_name[MAX_BUF];
3919
3920 item = find_marked_object (who);
3921 if (item)
3922 {
3923 if (lighter->last_eat && lighter->stats.food)
3924 { /* lighter gets used up */
3925 /* Split multiple lighters if they're being used up. Otherwise *
3926 * one charge from each would be used up. --DAMN */
3927 if (lighter->nrof > 1)
3928 {
3929 object *oneLighter = get_object ();
3930
3931 copy_object (lighter, oneLighter);
3932 lighter->nrof -= 1;
3933 oneLighter->nrof = 1;
3934 oneLighter->stats.food--;
3935 esrv_send_item (who, lighter);
3936 oneLighter = insert_ob_in_ob (oneLighter, who);
3937 esrv_send_item (who, oneLighter);
3938 }
3939 else
3940 lighter->stats.food--;
3941 }
3942 else if (lighter->last_eat)
3943 { /* no charges left in lighter */
3944 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name);
3945 return;
3946 }
3947 /* Perhaps we should split what we are trying to light on fire?
3948 * I can't see many times when you would want to light multiple
3949 * objects at once.
3950 */
3951 /* If the item is destroyed, we don't have a valid pointer to the
3952 * name object, so make a copy so the message we print out makes
3953 * some sense.
3954 */
3955 strcpy (item_name, item->name);
3956 if (who == is_player_inv (item))
3957 is_player_env = 1;
3958
3959 save_throw_object (item, AT_FIRE, who);
3960 /* Change to check count and not freed, since the object pointer
3961 * may have gotten recycled
3962 */
3963 if (item->destroyed ())
3964 {
3965 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item_name, &lighter->name);
3966 /* Need to update the player so that the players glow radius
3967 * gets changed.
3968 */
3969 if (is_player_env)
3970 fix_player (who);
3971 }
3972 else
3973 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
3974 }
3975 else /* nothing to light */
3976 new_draw_info (NDI_UNIQUE, 0, who, "You need to mark a lightable object.");
3977
3978}
3979
3980/**
3981 * op made some mistake with a scroll, this takes care of punishment.
3982 * scroll_failure()- hacked directly from spell_failure
3983 */
3984void
3985scroll_failure (object *op, int failure, int power)
3986{
3987 if (abs (failure / 4) > power)
3988 power = abs (failure / 4); /* set minimum effect */
3989
3990 if (failure <= -1 && failure > -15)
3991 { /* wonder */
3992 object *tmp;
3993
3994 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!.");
3995 tmp = get_archetype (SPELL_WONDER);
3996 cast_wonder (op, op, 0, tmp);
3997 free_object (tmp);
3998 }
3999 else if (failure <= -15 && failure > -35)
4000 { /* drain mana */
4001 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!.");
4002 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
4003 if (op->stats.sp < 0)
4004 op->stats.sp = 0;
4005 }
4006 else if (settings.spell_failure_effects == TRUE)
4007 {
4008 if (failure <= -35 && failure > -60)
4009 { /* confusion */
4010 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
4011 confuse_player (op, op, power);
4012 }
4013 else if (failure <= -60 && failure > -70)
4014 { /* paralysis */
4015 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils and paralyzes " "you!");
4016 paralyze_player (op, op, power);
4017 }
4018 else if (failure <= -70 && failure > -80)
4019 { /* blind */
4020 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
4021 blind_player (op, op, power);
4022 }
4023 else if (failure <= -80)
4024 { /* blast the immediate area */
4025 object *tmp;
4026
4027 tmp = get_archetype (LOOSE_MANA);
4028 cast_magic_storm (op, tmp, power);
4029 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!");
4030 free_object (tmp);
4031 }
4032 }
4033} 4052}
4034 4053
4035void 4054void
4036apply_changes_to_player (object *pl, object *change) 4055apply_changes_to_player (object *pl, object *change)
4037{ 4056{
… …
4054 */ 4073 */
4055 int i, j; 4074 int i, j;
4056 4075
4057 for (i = 0; i < NUM_STATS; i++) 4076 for (i = 0; i < NUM_STATS; i++)
4058 { 4077 {
4059 sint8 stat = get_attr_value (stats, i); 4078 int race_bonus = pl->arch->stats.stat (i);
4060 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 4079 sint8 stat = stats->stat (i) + ns->stat (i);
4061 4080
4062 stat += get_attr_value (ns, i);
4063 if (stat > 20 + race_bonus) 4081 if (stat > 20 + race_bonus)
4064 { 4082 {
4065 excess_stat++; 4083 excess_stat++;
4066 stat = 20 + race_bonus; 4084 stat = 20 + race_bonus;
4067 } 4085 }
4068 set_attr_value (stats, i, stat); 4086
4087 stats->stat (i) = stat;
4069 } 4088 }
4070 4089
4071 for (j = 0; excess_stat > 0 && j < 100; j++) 4090 for (j = 0; excess_stat > 0 && j < 100; j++)
4072 { /* try 100 times to assign excess stats */ 4091 { /* try 100 times to assign excess stats */
4073 int i = rndm (0, 6); 4092 int i = rndm (0, 6);
4074 int stat = get_attr_value (stats, i);
4075 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i);
4076 4093
4077 if (i == CHA) 4094 if (i == CHA)
4078 continue; /* exclude cha from this */ 4095 continue; /* exclude cha from this */
4096
4097 int stat = stats->stat (i);
4098 int race_bonus = pl->arch->stats.stat (i);
4079 if (stat < 20 + race_bonus) 4099 if (stat < 20 + race_bonus)
4080 { 4100 {
4081 change_attr_value (stats, i, 1); 4101 change_attr_value (stats, i, 1);
4082 excess_stat--; 4102 excess_stat--;
4083 } 4103 }
4084 } 4104 }
4085 4105
4086 /* insert the randomitems from the change's treasurelist into 4106 /* insert the randomitems from the change's treasurelist into
4087 * the player ref: player.c 4107 * the player ref: player.c
4088 */ 4108 */
4089 if (change->randomitems != NULL) 4109 if (change->randomitems)
4090 give_initial_items (pl, change->randomitems); 4110 give_initial_items (pl, change->randomitems);
4091
4092 4111
4093 /* set up the face, for some races. */ 4112 /* set up the face, for some races. */
4094 4113
4095 /* first, look for the force object banning 4114 /* first, look for the force object banning
4096 * changing the face. Certain races never change face with class. 4115 * changing the face. Certain races never change face with class.
4097 */ 4116 */
4098 for (walk = pl->inv; walk != NULL; walk = walk->below) 4117 for (walk = pl->inv; walk; walk = walk->below)
4099 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 4118 if (walk->name == shstr_NOCLASSFACECHANGE)
4100 flag_change_face = 0; 4119 flag_change_face = 0;
4101 4120
4102 if (flag_change_face) 4121 if (flag_change_face)
4103 { 4122 {
4104 pl->animation_id = GET_ANIM_ID (change);
4105 pl->face = change->face; 4123 pl->face = change->face;
4106 4124 pl->animation_id = change->animation_id;
4107 if (QUERY_FLAG (change, FLAG_ANIMATE)) 4125 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
4108 SET_FLAG (pl, FLAG_ANIMATE);
4109 else
4110 CLEAR_FLAG (pl, FLAG_ANIMATE);
4111 } 4126 }
4112 4127
4113 /* check the special case of can't use weapons */ 4128 /* check the special case of can't use weapons */
4114 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 4129 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
4115 if (!strcmp (change->name, "monk")) 4130 if (change->name == shstr_monk)
4116 CLEAR_FLAG (pl, FLAG_USE_WEAPON); 4131 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
4117 4132
4118 break; 4133 break;
4119 } 4134 }
4120 } 4135 }
4121} 4136}
4122 4137
4123/**
4124 * This handles items of type 'transformer'.
4125 * Basically those items, used with a marked item, transform both items into something
4126 * else.
4127 * "Transformer" item has food decreased by 1, removed if 0 (0 at start means illimited)..
4128 * Change information is contained in the 'slaying' field of the marked item.
4129 * The format is as follow: transformer:[number ]yield[;transformer:...].
4130 * This way an item can be transformed in many things, and/or many objects.
4131 * The 'slaying' field for transformer is used as verb for the action.
4132 */
4133void
4134apply_item_transformer (object *pl, object *transformer)
4135{
4136 object *marked;
4137 object *new_item;
4138 char *find;
4139 char *separator;
4140 int yield;
4141 char got[MAX_BUF];
4142 int len;
4143
4144 if (!pl || !transformer)
4145 return;
4146 marked = find_marked_object (pl);
4147 if (!marked)
4148 {
4149 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer));
4150 return;
4151 }
4152 if (!marked->slaying)
4153 {
4154 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
4155 return;
4156 }
4157 /* check whether they are compatible or not */
4158 find = strstr (marked->slaying, transformer->arch->name);
4159 if (!find || (*(find + strlen (transformer->arch->name)) != ':'))
4160 {
4161 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
4162 return;
4163 }
4164 find += strlen (transformer->arch->name) + 1;
4165 /* Item can be used, now find how many and what it yields */
4166 if (isdigit (*(find)))
4167 {
4168 yield = atoi (find);
4169 if (yield < 1)
4170 {
4171 LOG (llevDebug, "apply_item_transformer: item %s has slaying-yield %d.", query_base_name (marked, 0), yield);
4172 yield = 1;
4173 }
4174 }
4175 else
4176 yield = 1;
4177
4178 while (isdigit (*find))
4179 find++;
4180 while (*find == ' ')
4181 find++;
4182 memset (got, 0, MAX_BUF);
4183 if ((separator = strchr (find, ';')) != NULL)
4184 {
4185 len = separator - find;
4186 }
4187 else
4188 {
4189 len = strlen (find);
4190 }
4191 if (len > MAX_BUF - 1)
4192 len = MAX_BUF - 1;
4193 strcpy (got, find);
4194 got[len] = '\0';
4195
4196 /* Now create new item, remove used ones when required. */
4197 new_item = get_archetype (got);
4198 if (!new_item)
4199 {
4200 new_draw_info_format (NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name (marked, 0));
4201 return;
4202 }
4203
4204 new_item->nrof = yield;
4205 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0));
4206 insert_ob_in_ob (new_item, pl);
4207 esrv_send_inventory (pl, pl);
4208 /* Eat up one item */
4209 decrease_ob_nr (marked, 1);
4210 /* Eat one transformer if needed */
4211 if (transformer->stats.food)
4212 if (--transformer->stats.food == 0)
4213 decrease_ob_nr (transformer, 1);
4214}

Diff Legend

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