ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/apply.C
(Generate patch)

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

Diff Legend

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