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

Diff Legend

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