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

Diff Legend

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