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.25 by root, Mon Sep 11 23:33:30 2006 UTC vs.
Revision 1.178 by root, Sun Dec 28 15:28:47 2008 UTC

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

Diff Legend

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