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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.5 by elmex, Sun Aug 20 21:26:03 2006 UTC vs.
Revision 1.99 by sf-marcmagus, Fri Oct 16 16:29:47 2009 UTC

1/* 1/*
2 * static char *rcsid_c_object_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * "$Id: c_object.C,v 1.5 2006/08/20 21:26:03 elmex Exp $"; 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
21 *
22 * The authors can be reached via e-mail to <support@deliantra.net>
4 */ 23 */
24
5/* 25/*
6 CrossFire, A Multiplayer game for X-windows
7
8 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
9 Copyright (C) 1992 Frank Tore Johansen
10
11 This program is free software; you can redistribute it and/or modify
12 it under the terms of the GNU General Public License as published by
13 the Free Software Foundation; either version 2 of the License, or
14 (at your option) any later version.
15
16 This program is distributed in the hope that it will be useful,
17 but WITHOUT ANY WARRANTY; without even the implied warranty of
18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 GNU General Public License for more details.
20
21 You should have received a copy of the GNU General Public License
22 along with this program; if not, write to the Free Software
23 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24
25 The author can be reached via e-mail to crossfire-devel@real-time.com
26
27 Object (handling) commands 26 * Object (handling) commands
28*/ 27 */
29 28
30#include <global.h> 29#include <global.h>
31#include <loader.h> 30#include <loader.h>
32#include <skills.h> 31#include <skills.h>
33#ifndef __CEXTRACT__
34#include <sproto.h> 32#include <sproto.h>
35#endif
36#include <living.h> 33#include <living.h>
37#include <math.h> 34#include <math.h>
35
38/* 36/*
39 * Object id parsing functions 37 * Object id parsing functions
40 */ 38 */
41 39
42#define OBLINKMALLOC(p) if(!((p)=(objectlink *)malloc(sizeof(objectlink))))\
43 fatal(OUT_OF_MEMORY);
44
45#define ADD_ITEM(NEW,COUNT)\ 40#define ADD_ITEM(NEW,COUNT)\
46 if(!first) {\ 41 if(!first) {\
47 OBLINKMALLOC(first);\ 42 first = new objectlink;\
48 last=first;\ 43 last=first;\
49 } else {\ 44 } else {\
50 OBLINKMALLOC(last->next);\ 45 last->next = new objectlink;\
51 last=last->next;\ 46 last=last->next;\
52 }\ 47 }\
53 last->next=NULL;\ 48 last->next=0;\
54 last->ob=(NEW);\ 49 last->ob=(NEW);\
55 last->id=(COUNT); 50 last->id=(COUNT);
56 51
57/** 52/**
58 * Search the inventory of 'pl' for what matches best with params. 53 * Search the inventory of 'pl' for what matches best with params.
59 * we use item_matched_string above - this gives us consistent behaviour 54 * we use item_matched_string above - this gives us consistent behaviour
60 * between many commands. Return the best match, or NULL if no match. 55 * between many commands. Return the best match, or NULL if no match.
61 * aflag is used with apply -u , and apply -a to 56 * aflag is used with apply -u , and apply -a to
62 * only unapply applied, or apply unapplied objects 57 * only unapply applied, or apply unapplied objects
63 **/ 58 **/
59static object *
64static object *find_best_apply_object_match(object *pl, const char *params, enum apply_flag aflag) 60find_best_apply_object_match (object *pl, const char *params, enum apply_flag aflag)
65{ 61{
66 object *tmp, *best=NULL; 62 object *best = 0;
67 int match_val=0,tmpmatch; 63 int match_val = 0;
68 64
69 for (tmp=pl->inv; tmp; tmp=tmp->below) { 65 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
66 {
70 if (tmp->invisible) continue; 67 if (tmp->invisible)
68 continue;
69
71 if ((tmpmatch=item_matched_string(pl, tmp, params))>match_val) { 70 int tmpmatch = item_matched_string (pl, tmp, params);
71
72 if (tmpmatch > match_val)
73 {
72 if ((aflag==AP_APPLY) && (QUERY_FLAG(tmp,FLAG_APPLIED))) continue; 74 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED)))
75 continue;
76
73 if ((aflag==AP_UNAPPLY) && (!QUERY_FLAG(tmp,FLAG_APPLIED))) continue; 77 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED)))
78 continue;
79
74 match_val=tmpmatch; 80 match_val = tmpmatch;
75 best=tmp; 81 best = tmp;
76 } 82 }
77 } 83 }
84
78 return best; 85 return best;
79} 86}
80 87
81/** 88/**
82 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL); 89 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL);
83 **/ 90 **/
91object *
84object *find_best_object_match(object *pl, const char *params) 92find_best_object_match (object *pl, const char *params)
85{ 93{
86 return find_best_apply_object_match(pl, params, AP_NULL); 94 return find_best_apply_object_match (pl, params, AP_TOGGLE);
87} 95}
88 96
89/* 97static bool
90 * Notes about item creation: 98can_split (object *pl, object *&op, sint32 nrof)
91 * 1) It is similar in syntax to the dm create command. 99{
92 * 2) It requires a player to have a buildfacility below him, a tool in his 100 if (object *tmp = op->split (nrof ? nrof : op->number_of ()))
93 * possesion, and materials to build with.
94 * 3) The random roll is done in a loop, so if the player tries to make 100,
95 * he makes 100 checks.
96 * 4) Exp is given only on succ. creations, but materials are used regardless.
97 * 5) The properties of the tool are stored in tooltype and weapontype.
98 * 6) The properties of the buildfacilities are stored in tooltype.
99 * 7) For now, all ingredients must be type 73 INORGANIC.
100 * 8) The player can attempt to create any arch, but item_power and value
101 * will prevent most artifacts from being built.
102 * 9) The code allows magic bonuses up to +5. It is not trivial to make a +5
103 * item.
104 *10) If you ever extend it beyond +5, add more gemtypes. Currently the code
105 * looks for gemcost gems per item, per plus. So a +5 item requires
106 * gemcost pearls,rubies,emeralds,sapphires and diamonds. Not cheap.
107 *11) There are a zillion if statements in this code. Alot of checking takes
108 * place here. All of them are needed.
109 */
110
111int command_build (object *pl, char *params) {
112 return 0;
113#if 0
114 object *marked, *facility, *tool, *newobj, *tmp;
115 archetype *at;
116 int skillnr, obpow, number, bonus, mneed, nrof, magic, i, nummade, found;
117 int gemcost;
118 char *bp;
119 materialtype_t *mt;
120
121 /* NOTE THIS FUNCTION IS CURRENTLY DISABLED */
122
123/* Given this is currently disabled, I'm not going to bother updating
124 * it with the new skill system. IT really needs to get the skill object
125 * pointer in a better fashion than it is currently doing.
126 */
127 if (!params) {
128 new_draw_info(NDI_UNIQUE, 0, pl, "Usage:build [nr] [+magic] <object>");
129 return 0;
130 }
131 marked = find_marked_object(pl);
132 if (marked == NULL || !marked->material || marked->materialname == NULL ||
133 marked->type != INORGANIC) {
134 new_draw_info(NDI_UNIQUE, 0, pl, "You must mark some ingredients.");
135 return 0;
136 }
137 while (*params==' ')
138 params++;
139 bp = params;
140 nrof = 1;
141 magic = 0;
142
143 if (sscanf(bp, "%d ", &nrof)) {
144 if ((bp = strchr(params, ' ')) == NULL) {
145 new_draw_info(NDI_UNIQUE, 0, pl,
146 "Usage: build [nr] [+magic] <object>");
147 return 0;
148 }
149 bp++;
150 }
151 if (sscanf(bp, "+%d ", &magic)) {
152 if ((bp = strchr(bp, ' ')) == NULL) {
153 new_draw_info(NDI_UNIQUE, 0, pl,
154 "Usage: build [nr] [+magic] <object>");
155 return 0;
156 }
157 bp++;
158 }
159 while (*bp==' ')
160 bp++;
161 at=find_archetype_by_object_name(bp);
162 if (at == NULL) {
163 new_draw_info_format(NDI_UNIQUE, 0, pl,
164 "You don't know how to make a %s.", bp);
165 return 0;
166 }
167 newobj = get_object();
168 copy_object(&at->clone, newobj);
169
170 skillnr = -1;
171
172 if ((IS_ARMOR(newobj) && newobj->material != M_LEATHER) ||
173 newobj->type == WEAPON)
174 skillnr = SK_SMITH;
175
176 if (IS_ARMOR(newobj) && newobj->material == M_LEATHER)
177 skillnr = SK_WOODSMAN;
178 101 {
179 if (newobj->type == BOW || newobj->type == ARROW) 102 op = tmp;
180 skillnr = SK_BOWYER;
181
182 if (skillnr == -1) {
183 new_draw_info(NDI_UNIQUE, 0, pl, "You don't know how to create that.");
184 return 0;
185 }
186
187 if (!change_skill(pl, skillnr, 0)) {
188 new_draw_info(NDI_UNIQUE, 0, pl,
189 "You lack the needed skill to make that item.");
190 return 0;
191 }
192 facility = NULL;
193 for (tmp=GET_MAP_OB(pl->map, pl->x, pl->y); tmp; tmp=tmp->above)
194 if (tmp->type == BUILDFAC && tmp->tooltype == newobj->type)
195 facility=tmp;
196 if (facility == NULL) {
197 new_draw_info(NDI_UNIQUE, 0, pl, "You lack a suitable workspace.");
198 return 0;
199 }
200 if (magic && !(IS_ARMOR(newobj) || IS_WEAPON(newobj))) {
201 new_draw_info(NDI_UNIQUE, 0, pl, "A magical bonus is only valid with "
202 "armour and weapons.");
203 return 0;
204 }
205
206 /* use newobj->weapontype == tool->weapontype for building weapons */
207 /* use newobj->material == tool->weapontype for building armour */
208 /* newobj->type == tool->tooltype */
209 tool = NULL;
210 for (tmp=pl->inv; tmp; tmp=tmp->below) {
211 if (tmp->type != TOOL)
212 continue;
213 if (IS_ARMOR(newobj) && (newobj->material & tmp->weapontype) &&
214 newobj->type == tmp->tooltype) {
215 if (tool == NULL ||
216 (tool->level + tool->magic) < (tmp->level + tmp->magic))
217 tool = tmp;
218 } else if (IS_WEAPON(newobj) && (newobj->weapontype&tmp->weapontype) &&
219 newobj->type == tmp->tooltype) {
220 if (tool == NULL ||
221 (tool->level + tool->magic) < (tmp->level + tmp->magic))
222 tool = tmp;
223 }
224 /* should split off bows arrows and probably bolts around here */
225 }
226 if (tool == NULL) {
227 new_draw_info(NDI_UNIQUE, 0, pl, "You lack the required tools.");
228 return 0;
229 }
230
231 mt = name_to_material(marked->materialname);
232 if (mt == NULL) {
233 new_draw_info(NDI_UNIQUE, 0, pl, "Your raw materials are garbage.");
234 return 0;
235 }
236 if (magic < 0) {
237 new_draw_info(NDI_UNIQUE, 0, pl, "You cannot create cursed objects.");
238 return 0;
239 }
240 if (magic > 0 && SK_level(pl)/20 < magic) {
241 new_draw_info(NDI_UNIQUE, 0, pl, "You are not powerful enough to "
242 "create such a magical item.");
243 return 0;
244 }
245
246 gemcost = 100;
247 if (newobj->type == ARROW)
248 gemcost = 1;
249 if (magic > 0) {
250 found = 0;
251 for (tmp=GET_MAP_OB(pl->map, pl->x, pl->y); tmp; tmp=tmp->above)
252 if (tmp->type == GEM && !strcmp(tmp->arch->name, "pearl") &&
253 tmp->nrof >= gemcost*nrof*mt->value/100)
254 found++;
255 if (magic > 1)
256 for (tmp=GET_MAP_OB(pl->map, pl->x, pl->y); tmp; tmp=tmp->above)
257 if (tmp->type == GEM && !strcmp(tmp->arch->name, "emerald") &&
258 tmp->nrof >= gemcost*nrof*mt->value/100)
259 found++;
260 if (magic > 2)
261 for (tmp=GET_MAP_OB(pl->map, pl->x, pl->y); tmp; tmp=tmp->above)
262 if (tmp->type == GEM && !strcmp(tmp->arch->name, "sapphire") &&
263 tmp->nrof >= gemcost*nrof*mt->value/100)
264 found++;
265 if (magic > 3)
266 for (tmp=GET_MAP_OB(pl->map, pl->x, pl->y); tmp; tmp=tmp->above)
267 if (tmp->type == GEM && !strcmp(tmp->arch->name, "ruby") &&
268 tmp->nrof >= gemcost*nrof*mt->value/100)
269 found++;
270 if (magic > 4)
271 for (tmp=GET_MAP_OB(pl->map, pl->x, pl->y); tmp; tmp=tmp->above)
272 if (tmp->type == GEM && !strcmp(tmp->arch->name, "diamond") &&
273 tmp->nrof >= gemcost*nrof*mt->value/100)
274 found++;
275 if (found < magic) {
276 new_draw_info(NDI_UNIQUE, 0, pl, "You did not provide a suitable "
277 "sacrifice of gems on the ground to add this much magic.");
278 return 0; 103 return true;
279 }
280 if (25*pow(3, magic)*mt->value/100 > pl->stats.sp) {
281 new_draw_info(NDI_UNIQUE, 0, pl, "You do not have enough mana "
282 "to create this object.");
283 return 0;
284 }
285 }
286
287 /* good lord. Now we have a tool, facilites, materials (marked) and an
288 object we want to create. Thats alot of if's */
289
290 obpow = (newobj->item_power + newobj->value/1000 + 1)*mt->value/100;
291 mneed = nrof*((newobj->weight * mt->weight)/80);
292 /* cost can be balanced out by cost to disassemble items for materials */
293 if ((marked->weight * MAX(1, marked->nrof)) < mneed) {
294 new_draw_info_format(NDI_UNIQUE, 0, pl, "You do not have enough %s.",
295 marked->name);
296 return 0;
297 }
298 if (obpow > (tool->level+tool->magic)) {
299 new_draw_info_format(NDI_UNIQUE, 0, pl, "Your %s is not capable of "
300 "crafting such a complex item.", tool->name);
301 return 0;
302 }
303 set_abs_magic(newobj, magic);
304 set_materialname(newobj, 1, mt);
305 for (i=0, nummade=0; i< nrof; i++) {
306 bonus = tool->level+tool->magic - obpow;
307 number = rndm(1, 3*obpow*magic);
308 LOG(llevDebug, "command_build: skill:%d obpow:%d rndm:%d tool:%s "
309 "newobj:%s marked:%s magic:%d\n", SK_level(pl)+bonus, obpow,
310 number, tool->name, newobj->name, marked->name, magic);
311 if (SK_level(pl)+bonus > number) {
312 /* wow, we actually created something */
313 newobj->x = pl->x;
314 newobj->y = pl->y;
315 newobj->map = pl->map;
316 SET_FLAG(newobj, FLAG_IDENTIFIED);
317 if (i == 0)
318 newobj = insert_ob_in_ob(newobj, pl);
319 else
320 newobj->nrof++;
321 esrv_send_item(pl, newobj);
322 nummade++;
323 } else {
324 free_object(newobj);
325 if (bonus < rndm(1, number-SK_level(pl)+bonus)) {
326 new_draw_info_format(NDI_UNIQUE, 0, pl,
327 "You broke your %s!\n", tool->name);
328 esrv_del_item(pl->contr, tool->count);
329 remove_ob(tool);
330 free_object(tool);
331 break;
332 } 104 }
333 } 105 else
334 /* take away materials too */
335 tmp = get_split_ob(marked, MAX(1, mneed/marked->weight));
336 if (tmp)
337 free_object(tmp);
338 if (marked->nrof < 1)
339 esrv_del_item(pl->contr, marked->count);
340 else
341 esrv_send_item(pl, marked);
342 } 106 {
343 if (magic) 107 if (op->nrof > 1)
344 for (tmp=GET_MAP_OB(pl->map, pl->x, pl->y); tmp; tmp=tmp->above) 108 new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %s.", op->nrof, &op->name_pl);
345 if (tmp->type == GEM && !strcmp(tmp->arch->name, "pearl") && 109 else
346 tmp->nrof >= gemcost*nrof*mt->value/100) 110 new_draw_info_format (NDI_UNIQUE, 0, pl, "There is only one %s.", &op->name);
347 tmp->nrof -= gemcost*nrof*mt->value/100; 111
348 if (magic > 1) 112 return false;
349 for (tmp=GET_MAP_OB(pl->map, pl->x, pl->y); tmp; tmp=tmp->above)
350 if (tmp->type == GEM && !strcmp(tmp->arch->name, "emerald") &&
351 tmp->nrof >= gemcost*nrof*mt->value/100)
352 tmp->nrof -= gemcost*nrof*mt->value/100;
353 if (magic > 2)
354 for (tmp=GET_MAP_OB(pl->map, pl->x, pl->y); tmp; tmp=tmp->above)
355 if (tmp->type == GEM && !strcmp(tmp->arch->name, "sapphire") &&
356 tmp->nrof >= gemcost*nrof*mt->value/100)
357 tmp->nrof -= gemcost*nrof*mt->value/100;
358 if (magic > 3)
359 for (tmp=GET_MAP_OB(pl->map, pl->x, pl->y); tmp; tmp=tmp->above)
360 if (tmp->type == GEM && !strcmp(tmp->arch->name, "ruby") &&
361 tmp->nrof >= gemcost*nrof*mt->value/100)
362 tmp->nrof -= gemcost*nrof*mt->value/100;
363 if (magic > 4)
364 for (tmp=GET_MAP_OB(pl->map, pl->x, pl->y); tmp; tmp=tmp->above)
365 if (tmp->type == GEM && !strcmp(tmp->arch->name, "diamond") &&
366 tmp->nrof >= gemcost*nrof*mt->value/100)
367 tmp->nrof -= gemcost*nrof*mt->value/100;
368 if (magic)
369 for (tmp=GET_MAP_OB(pl->map, pl->x, pl->y); tmp; tmp=tmp->above)
370 if (tmp->type == GEM &&
371 (!strcmp(tmp->arch->name, "diamond") ||
372 !strcmp(tmp->arch->name, "ruby") ||
373 !strcmp(tmp->arch->name, "sapphire") ||
374 !strcmp(tmp->arch->name, "emerald") ||
375 !strcmp(tmp->arch->name, "pearl"))) {
376 if (tmp->nrof == 0) {
377 remove_ob(tmp);
378 free_object(tmp);
379 }
380 if (pl->contr)
381 pl->contr->socket.update_look=1;
382 } 113 }
383 pl->stats.sp -= 25*pow(3, magic)*mt->value/100;
384 fix_player(pl);
385 if (nummade > 1) {
386 new_draw_info_format(NDI_UNIQUE, 0, pl, "You have created %d %s.",
387 nummade, query_base_name(newobj, 1));
388 } else if (nummade == 1) {
389 new_draw_info_format(NDI_UNIQUE, 0, pl, "You have created a %s.",
390 query_base_name(newobj, 0));
391 } else {
392 new_draw_info_format(NDI_UNIQUE, 0, pl,
393 "You have failed to craft a %s.", query_base_name(newobj, 0));
394 return 0;
395 }
396 if (skills[skillnr].category != EXP_NONE)
397 add_exp(pl, obpow*nummade);
398 return 1;
399#endif
400} 114}
401 115
402 116int
403
404int command_uskill ( object *pl, char *params) { 117command_uskill (object *pl, char *params)
118{
405 if (!params) { 119 if (!params)
120 {
406 new_draw_info(NDI_UNIQUE, 0, pl, "Usage: use_skill <skill name>"); 121 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: use_skill <skill name>");
407 return 0; 122 return 0;
408 } 123 }
124
409 return use_skill(pl,params); 125 return use_skill (pl, params);
410} 126}
411 127
128int
412int command_rskill ( object *pl, char *params) { 129command_rskill (object *pl, char *params)
130{
413 object *skill; 131 object *skill;
414 132
415 if (!params) { 133 if (!params)
134 {
416 new_draw_info(NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); 135 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
417 return 0; 136 return 0;
418 } 137 }
138
419 skill = find_skill_by_name(pl, params); 139 skill = find_skill_by_name_fuzzy (pl, params);
420 140
421 if (!skill) { 141 if (!skill)
142 {
422 new_draw_info_format(NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); 143 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);
144 return 0;
145 }
146
147 pl->change_skill (0);
148 apply_special (pl, skill, AP_APPLY);
423 return 0; 149 return 1;
424 }
425 return change_skill(pl,skill, 0);
426} 150}
427
428
429/* These functions (command_search, command_disarm) are really just wrappers for
430 * things like 'use_skill ...'). In fact, they should really be obsoleted
431 * and replaced with those.
432 */
433int command_search (object *op, char *params) {
434 return use_skill(op, skill_names[SK_FIND_TRAPS]);
435}
436
437int command_disarm (object *op, char *params) {
438 return use_skill(op, skill_names[SK_DISARM_TRAPS]);
439}
440
441 151
442/* A little special because we do want to pass the full params along 152/* A little special because we do want to pass the full params along
443 * as it includes the object to throw. 153 * as it includes the object to throw.
444 */ 154 */
155int
445int command_throw (object *op, char *params) 156command_throw (object *op, char *params)
446{ 157{
447 object *skop;
448
449 skop = find_skill_by_name(op, skill_names[SK_THROWING]); 158 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))
450 if (skop) return do_skill(op, op, skop, op->facing,params); 159 return do_skill (op, op, skop, op->facing, params);
451 else { 160 else
452 new_draw_info(NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing."); 161 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing.");
453 } 162
454 return 0; 163 return 0;
455} 164}
456 165
457 166int
458int command_apply (object *op, char *params) 167command_apply (object *op, char *params)
459{ 168{
460 if (!params) { 169 if (!params)
170 {
461 player_apply_below(op); 171 player_apply_below (op);
462 return 0; 172 return 0;
463 } 173 }
464 else { 174 else
175 {
465 apply_flag aflag = (apply_flag) 0; 176 apply_flag aflag = (apply_flag)0;
466 object *inv;
467 177
468 while (*params==' ') params++; 178 while (*params == ' ')
179 params++;
180
469 if (!strncmp(params,"-a ",3)) { 181 if (!strncmp (params, "-a ", 3))
470 aflag=AP_APPLY; 182 {
471 params+=3; 183 aflag = AP_APPLY;
472 } 184 params += 3;
185 }
186
473 if (!strncmp(params,"-u ",3)) { 187 if (!strncmp (params, "-u ", 3))
474 aflag=AP_UNAPPLY; 188 {
475 params+=3; 189 aflag = AP_UNAPPLY;
476 } 190 params += 3;
191 }
192
477 while (*params==' ') params++; 193 while (*params == ' ')
194 params++;
478 195
479 inv=find_best_apply_object_match(op, params, aflag); 196 if (object *inv = find_best_apply_object_match (op, params, aflag))
480 if (inv) {
481 player_apply(op,inv,aflag,0); 197 player_apply (op, inv, aflag, 0);
482 } else 198 else
483 new_draw_info_format(NDI_UNIQUE, 0, op, 199 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params);
484 "Could not find any match to the %s.",params);
485 } 200 }
201
486 return 0; 202 return 0;
487} 203}
488 204
489/* 205/*
490 * Check if an item op can be put into a sack. If pl exists then tell 206 * Check if an item op can be put into a sack. If pl exists then tell
… …
493 * objects (op) we want to put in. We specify it separately instead of 209 * objects (op) we want to put in. We specify it separately instead of
494 * using op->nrof because often times, a player may have specified a 210 * using op->nrof because often times, a player may have specified a
495 * certain number of objects to drop, so we can pass that number, and 211 * certain number of objects to drop, so we can pass that number, and
496 * not need to use split_ob and stuff. 212 * not need to use split_ob and stuff.
497 */ 213 */
214int
498int sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) { 215sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
499 216{
500 if (! QUERY_FLAG (sack, FLAG_APPLIED)) { 217 if (!QUERY_FLAG (sack, FLAG_APPLIED))
501 new_draw_info_format(NDI_UNIQUE, 0, pl,
502 "The %s is not active.", query_name(sack));
503 return 0;
504 } 218 {
219 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
220 return 0;
221 }
222
505 if (sack == op) { 223 if (sack == op)
506 new_draw_info_format(NDI_UNIQUE, 0, pl,
507 "You can't put the %s into itself.", query_name(sack));
508 return 0;
509 } 224 {
510 if (sack->race && (sack->race != op->race || op->type == CONTAINER 225 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack));
511 || (sack->stats.food && sack->stats.food != op->type))) { 226 return 0;
512 new_draw_info_format(NDI_UNIQUE, 0, pl, 227 }
513 "You can put only %s into the %s.", sack->race, query_name(sack)); 228
514 return 0; 229 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
515 } 230 {
231 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));
232 return 0;
233 }
234
516 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) { 235 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
517 new_draw_info_format(NDI_UNIQUE, 0, pl,
518 "You can't put the key into %s.", query_name(sack));
519 return 0;
520 } 236 {
521 if (sack->weight_limit && sack->carrying + (nrof ? nrof : 1) * 237 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
522 (op->weight + (op->type==CONTAINER?(op->carrying*op->stats.Str):0))
523 * (100 - sack->stats.Str) / 100 > sack->weight_limit) {
524 new_draw_info_format(NDI_UNIQUE, 0, pl,
525 "That won't fit in the %s!", query_name(sack));
526 return 0; 238 return 0;
239 }
240
241 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
242 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
243 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
527 } 244 {
245 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
246 return 0;
247 }
248
528 /* All other checks pass, must be OK */ 249 /* All other checks pass, must be OK */
529 return 1; 250 return 1;
530} 251}
531 252
532/* Pick up commands follow */ 253/* Pick up commands follow */
254
533/* pl = player (not always - monsters can use this now) 255/* pl = player (not always - monsters can use this now)
534 * op is the object to put tmp into, 256 * op is the object to put tmp into,
535 * tmp is the object to pick up, nrof is the number to 257 * tmp is the object to pick up, nrof is the number to
536 * pick up (0 means all of them) 258 * pick up (0 means all of them)
537 */ 259 */
260static void
538static void pick_up_object (object *pl, object *op, object *tmp, int nrof) 261pick_up_object (object *pl, object *op, object *tmp, int nrof)
539{ 262{
540 /* buf needs to be big (more than 256 chars) because you can get
541 * very long item names.
542 */
543 char buf[HUGE_BUF];
544 object *env=tmp->env; 263 object *env = tmp->env;
545 uint32 weight, effective_weight_limit; 264 uint32 weight, effective_weight_limit;
546 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 265 int tmp_nrof = tmp->number_of ();
547 266
548 /* IF the player is flying & trying to take the item out of a container 267 /* IF the player is flying & trying to take the item out of a container
549 * that is in his inventory, let him. tmp->env points to the container 268 * that is in his inventory, let him. tmp->env points to the container
550 * (sack, luggage, etc), tmp->env->env then points to the player (nested 269 * (sack, luggage, etc), tmp->env->env then points to the player (nested
551 * containers not allowed as of now) 270 * containers not allowed as of now)
552 */ 271 */
553 if((pl->move_type & MOVE_FLYING) && !QUERY_FLAG(pl, FLAG_WIZ) && 272 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
554 is_player_inv(tmp)!=pl) {
555 new_draw_info(NDI_UNIQUE, 0,pl, "You are levitating, you can't reach the ground!");
556 return;
557 } 273 {
274 pl->failmsg ("You are levitating, you can't reach the ground! "
275 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
276 "or waiting till the levitation effect wears off.>");
277 return;
278 }
279
558 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 280 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
559 return; 281 return;
560 if(QUERY_FLAG(tmp,FLAG_WAS_WIZ) && !QUERY_FLAG(pl, FLAG_WAS_WIZ)) { 282
561 new_draw_info(NDI_UNIQUE, 0,pl, "The object disappears in a puff of smoke!");
562 new_draw_info(NDI_UNIQUE, 0,pl, "It must have been an illusion.");
563 if (pl->type==PLAYER) esrv_del_item (pl->contr, tmp->count);
564 if ( ! QUERY_FLAG (tmp, FLAG_REMOVED))
565 remove_ob (tmp);
566 free_object(tmp);
567 return;
568 }
569
570 if (nrof > tmp_nrof || nrof == 0) 283 if (nrof > tmp_nrof || nrof <= 0)
571 nrof = tmp_nrof; 284 nrof = tmp_nrof;
285
572 /* Figure out how much weight this object will add to the player */ 286 /* Figure out how much weight this object will add to the player */
573 weight = tmp->weight * nrof; 287 weight = tmp->weight * nrof;
288 if (tmp->inv)
574 if (tmp->inv) weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 289 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
575 if (pl->stats.Str <= MAX_STAT) 290
576 effective_weight_limit = weight_limit[pl->stats.Str]; 291 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
577 else 292
578 effective_weight_limit = weight_limit[MAX_STAT];
579 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) { 293 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
294 {
580 new_draw_info(0, 0,pl,"That item is too heavy for you to pick up."); 295 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
581 return; 296 return;
582 } 297 }
583 if (settings.real_wiz == FALSE && QUERY_FLAG(pl, FLAG_WAS_WIZ)) 298
584 SET_FLAG(tmp, FLAG_WAS_WIZ); 299 if (!can_split (pl, tmp, nrof))
585 if (nrof != tmp_nrof) {
586 object *tmp2 = tmp;
587 tag_t tmp2_tag = tmp2->count;
588 tmp = get_split_ob (tmp, nrof);
589 if(!tmp) {
590 new_draw_info(NDI_UNIQUE, 0,pl, errmsg);
591 return; 300 return;
592 } 301
593 /* Tell a client what happened rest of objects */
594 if (pl->type == PLAYER) {
595 if (was_destroyed (tmp2, tmp2_tag))
596 esrv_del_item (pl->contr, tmp2_tag);
597 else
598 esrv_send_item (pl, tmp2);
599 }
600 } else {
601 /* If the object is in a container, send a delete to the client.
602 * - we are moving all the items from the container to elsewhere,
603 * so it needs to be deleted.
604 */
605 if ( ! QUERY_FLAG (tmp, FLAG_REMOVED)) {
606 if (tmp->env && pl->type==PLAYER)
607 esrv_del_item (pl->contr, tmp->count);
608 remove_ob(tmp); /* Unlink it */
609 }
610 }
611 if(QUERY_FLAG(tmp, FLAG_UNPAID)) 302 if (QUERY_FLAG (tmp, FLAG_UNPAID))
612 (void) sprintf(buf,"%s will cost you %s.", query_name(tmp), 303 {
613 query_cost_string(tmp,pl,F_BUY | F_SHOP)); 304 tmp->flag.reset (FLAG_UNPAID);
305 new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
306 tmp->flag.set (FLAG_UNPAID);
307 }
614 else 308 else
615 (void) sprintf(buf,"You pick up the %s.", query_name(tmp)); 309 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
616 new_draw_info(NDI_UNIQUE, 0,pl,buf);
617 310
618 tmp = insert_ob_in_ob(tmp, op); 311 op->insert (tmp);
619
620 /* All the stuff below deals with client/server code, and is only
621 * usable by players
622 */
623 if(pl->type!=PLAYER) return;
624
625 esrv_send_item (pl, tmp);
626 /* These are needed to update the weight for the container we
627 * are putting the object in.
628 */
629 if (op!=pl) {
630 esrv_update_item (UPD_WEIGHT, pl, op);
631 esrv_send_item (pl, pl);
632 }
633
634 /* Update the container the object was in */
635 if (env && env!=pl && env!=op) esrv_update_item (UPD_WEIGHT, pl, env);
636} 312}
637 313
638
639void pick_up(object *op,object *alt)
640/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 314/* modified slightly to allow monsters use this -b.t. 5-31-95 */
315void
316pick_up (object *op, object *alt)
641{ 317{
642 int need_fix_tmp = 0; 318 int need_fix_tmp = 0;
643 object *tmp=NULL; 319 object *tmp = NULL;
644 mapstruct *tmp_map=NULL; 320 maptile *tmp_map = NULL;
645 int count; 321 int count;
646 tag_t tag;
647 322
648 /* Decide which object to pick. */ 323 /* Decide which object to pick. */
649 if (alt) 324 if (alt)
650 { 325 {
651 if ( ! can_pick (op, alt)) { 326 if (!can_pick (op, alt))
327 {
652 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", 328 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);
653 alt->name); 329 goto leave;
330 }
331
332 tmp = alt;
333 }
334 else
335 {
336 if (op->below == NULL || !can_pick (op, op->below))
337 {
338 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up here.");
339 goto leave;
340 }
341
342 tmp = op->below;
343 }
344
345 /* Try to catch it. */
346 tmp_map = tmp->map;
347 tmp = stop_item (tmp);
348 if (tmp == NULL)
654 goto leave; 349 goto leave;
655 } 350
656 tmp = alt; 351 need_fix_tmp = 1;
352 if (!can_pick (op, tmp))
353 goto leave;
354
355 if (op->type == PLAYER)
657 } 356 {
357 count = op->contr->count;
358 if (count == 0)
359 count = tmp->nrof;
360 }
658 else 361 else
659 { 362 count = tmp->nrof;
660 if (op->below == NULL || ! can_pick (op, op->below)) { 363
661 new_draw_info (NDI_UNIQUE, 0, op, 364 /* container is open, so use it */
662 "There is nothing to pick up here."); 365 if (tmp->flag [FLAG_STARTEQUIP])
663 goto leave; 366 alt = op;
664 } 367 else if (op->container)
665 tmp = op->below;
666 } 368 {
667 369 alt = op->container;
668 /* Try to catch it. */ 370 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
669 tmp_map = tmp->map;
670 tmp = stop_item (tmp);
671 if (tmp == NULL)
672 goto leave; 371 goto leave;
673 need_fix_tmp = 1;
674 if ( ! can_pick (op, tmp))
675 goto leave;
676
677 if (op->type==PLAYER) {
678 count=op->contr->count;
679 if (count==0) count = tmp->nrof;
680 } 372 }
681 else 373 else
682 count=tmp->nrof; 374 { /* non container pickup */
683
684 /* container is open, so use it */
685 if (op->container) {
686 alt = op->container;
687 if (alt != tmp->env && !sack_can_hold (op, alt, tmp,count))
688 goto leave;
689 } else { /* non container pickup */
690 for (alt=op->inv; alt; alt=alt->below) 375 for (alt = op->inv; alt; alt = alt->below)
691 if (alt->type==CONTAINER && QUERY_FLAG(alt, FLAG_APPLIED) && 376 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) &&
692 alt->race && alt->race==tmp->race && 377 alt->race && alt->race == tmp->race && sack_can_hold (NULL, alt, tmp, count))
693 sack_can_hold (NULL, alt, tmp,count)) 378 break; /* perfect match */
694 break; /* perfect match */ 379
695 380 if (!alt)
696 if (!alt)
697 for (alt=op->inv; alt; alt=alt->below) 381 for (alt = op->inv; alt; alt = alt->below)
698 if (alt->type==CONTAINER && QUERY_FLAG(alt, FLAG_APPLIED) && 382 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count))
699 sack_can_hold (NULL, alt, tmp,count))
700 break; /* General container comes next */ 383 break; /* General container comes next */
701 if (!alt) 384
385 if (!alt)
702 alt = op; /* No free containers */ 386 alt = op; /* No free containers */
703 } 387 }
388
704 if(tmp->env == alt) { 389 if (tmp->env == alt)
390 {
705 /* here it could be possible to check rent, 391 /* here it could be possible to check rent,
706 * if someone wants to implement it 392 * if someone wants to implement it
707 */ 393 */
708 alt = op; 394 alt = op;
709 } 395 }
396
710#ifdef PICKUP_DEBUG 397#ifdef PICKUP_DEBUG
711 LOG(llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name); 398 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
712#endif 399#endif
713 400
714 /* startequip items are not allowed to be put into containers: */ 401 /* startequip items are not allowed to be put into containers: */
715 if (op->type == PLAYER && alt->type == CONTAINER 402 if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP))
716 && QUERY_FLAG (tmp, FLAG_STARTEQUIP))
717 { 403 {
718 new_draw_info (NDI_UNIQUE, 0, op, 404 new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!");
719 "This object cannot be put into containers!");
720 goto leave; 405 goto leave;
721 } 406 }
722 407
723 tag = tmp->count;
724 pick_up_object (op, alt, tmp, count); 408 pick_up_object (op, alt, tmp, count);
409
725 if (was_destroyed (tmp, tag) || tmp->env) 410 if (tmp->destroyed () || tmp->env)
726 need_fix_tmp = 0; 411 need_fix_tmp = 0;
412
727 if (op->type == PLAYER) 413 if (op->type == PLAYER)
728 op->contr->count=0; 414 op->contr->count = 0;
415
729 goto leave; 416 goto leave;
730 417
731 leave: 418leave:
732 if (need_fix_tmp) 419 if (need_fix_tmp)
733 fix_stopped_item (tmp, tmp_map, op); 420 fix_stopped_item (tmp, tmp_map, op);
734} 421}
735
736 422
737/* This takes (picks up) and item. op is the player 423/* This takes (picks up) and item. op is the player
738 * who issued the command. params is a string to 424 * who issued the command. params is a string to
739 * match against the item name. Basically, always 425 * match against the item name. Basically, always
740 * returns zero, but that should be improved. 426 * returns zero, but that should be improved.
741 */ 427 */
428int
742int command_take (object *op, char *params) 429command_take (object *op, char *params)
743{ 430{
744 object *tmp, *next; 431 object *tmp, *next;
745 432
746 if (op->container) 433 if (op->container)
747 tmp=op->container->inv; 434 tmp = op->container->inv;
748 else { 435 else
749 tmp=op->above; 436 {
750 if (tmp) while (tmp->above) {
751 tmp=tmp->above; 437 tmp = op->above;
752 } 438 if (tmp)
439 while (tmp->above)
440 tmp = tmp->above;
441
442 if (!tmp)
443 tmp = op->below;
444 }
445
753 if (!tmp) 446 if (!tmp)
754 tmp=op->below;
755 } 447 {
756
757 if (tmp==NULL) {
758 new_draw_info(NDI_UNIQUE, 0,op,"Nothing to take!"); 448 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!");
759 return 0; 449 return 0;
760 } 450 }
761 451
762 /* Makes processing easier */ 452 /* Makes processing easier */
763 if (params && *params=='\0') params=NULL; 453 if (params && *params == '\0')
454 params = 0;
764 455
456 int cnt = MAX_ITEM_PER_DROP;
457
765 while (tmp) { 458 while (tmp)
459 {
766 next=tmp->below; 460 next = tmp->below;
767 461
768 if (tmp->invisible) { 462 if (tmp->invisible)
769 tmp=next; 463 {
464 tmp = next;
770 continue; 465 continue;
771 } 466 }
467
772 /* This following two if and else if could be merged into line 468 /* This following two if and else if could be merged into line
773 * but that probably will make it more difficult to read, and 469 * but that probably will make it more difficult to read, and
774 * not make it any more efficient 470 * not make it any more efficient
775 */ 471 */
776 if (params && item_matched_string(op, tmp, params)) { 472 if (params && item_matched_string (op, tmp, params))
473 {
474 if (--cnt < 0) break;
777 pick_up(op, tmp); 475 pick_up (op, tmp);
778 } 476 }
779 else if (can_pick(op, tmp) && !params) { 477 else if (can_pick (op, tmp) && !params)
478 {
479 if (--cnt < 0) break;
780 pick_up(op,tmp); 480 pick_up (op, tmp);
781 break; 481 break;
782 } 482 }
783 tmp=next; 483
784 /* Might as well just skip over the player immediately - 484 tmp = next;
785 * we know it can't be picked up
786 */
787 if (tmp == op) tmp=tmp->below;
788 }
789 if (!params && !tmp) {
790 for (tmp=op->below; tmp!=NULL; tmp=tmp->next)
791 if (!tmp->invisible) {
792 char buf[MAX_BUF];
793 sprintf(buf,"You can't pick up a %s.",
794 tmp->name? tmp->name:"null");
795 new_draw_info(NDI_UNIQUE, 0,op, buf);
796 break;
797 } 485 }
798 if (!tmp) new_draw_info(NDI_UNIQUE, 0,op, "There is nothing to pick up."); 486
487 if (cnt < 0)
799 } 488 {
489 op->failmsg ("Couldn't pick up so many items at once.");
800 return 0; 490 return 0;
801} 491 }
802 492
493 if (!params && !tmp)
494 {
495 for (tmp = op->below; tmp; tmp = tmp->below)
496 if (!tmp->invisible)
497 {
498 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up a %s.", &tmp->name);
499 break;
500 }
501
502 if (!tmp)
503 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
504 }
505
506 return 0;
507}
803 508
804/* 509/*
805 * This function was part of drop, now is own function. 510 * This function was part of drop, now is own function.
806 * Player 'op' tries to put object 'tmp' into sack 'sack', 511 * Player 'op' tries to put object 'tmp' into sack 'sack',
807 * if nrof is non zero, then nrof objects is tried to put into sack. 512 * if nrof is non zero, then nrof objects is tried to put into sack.
513 *
808 * Note that the 'sack' in question can now be a transport, 514 * Note that the 'sack' in question can now be a transport,
809 * so this function isn't named very good anymore. 515 * so this function isn't named very good anymore.
810 */ 516 */
517void
811void put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 518put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
812{ 519{
813 tag_t tmp_tag, tmp2_tag;
814 object *tmp2, *sack2; 520 object *tmp2, *sack2;
815 char buf[MAX_BUF]; 521 char buf[MAX_BUF];
816 522
817 if (sack==tmp) return; /* Can't put an object in itself */ 523 if (sack == tmp)
818 if (sack->type != CONTAINER && sack->type != TRANSPORT) { 524 return; /* Can't put an object in itself */
819 new_draw_info_format(NDI_UNIQUE, 0,op, 525
820 "The %s is not a container.", query_name(sack)); 526 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP))
821 return;
822 } 527 {
823 if (QUERY_FLAG(tmp,FLAG_STARTEQUIP)) { 528 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
824 new_draw_info_format(NDI_UNIQUE, 0,op, 529 return;
825 "You cannot put the %s in the %s.", query_name(tmp),
826 query_name(sack));
827 return;
828 } 530 }
531
829 if (tmp->type == CONTAINER && tmp->inv) { 532 if (tmp->type == CONTAINER && tmp->inv)
830 533 {
831 /* Eneq(@csd.uu.se): If the object to be dropped is a container 534 /* Eneq(@csd.uu.se): If the object to be dropped is a container
832 * we instead move the contents of that container into the active 535 * we instead move the contents of that container into the active
833 * container, this is only done if the object has something in it. 536 * container, this is only done if the object has something in it.
834 */ 537 */
835 sack2 = tmp; 538 sack2 = tmp;
836 new_draw_info_format(NDI_UNIQUE, 0,op, "You move the items from %s into %s.", 539 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack));
837 query_name(tmp), query_name(sack)); 540
838 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) { 541 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
542 {
839 tmp = tmp2->below; 543 tmp = tmp2->below;
544
840 if ((sack->type == CONTAINER && sack_can_hold(op, op->container, tmp2,tmp2->nrof)) || 545 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))
841 (sack->type == TRANSPORT && transport_can_hold(sack, tmp2, tmp2->nrof))) {
842 put_object_in_sack (op, sack, tmp2, 0); 546 put_object_in_sack (op, sack, tmp2, 0);
843 } else { 547 else
548 {
844 sprintf(buf,"Your %s fills up.", query_name(sack)); 549 sprintf (buf, "Your %s fills up.", query_name (sack));
845 new_draw_info(NDI_UNIQUE, 0,op, buf); 550 new_draw_info (NDI_UNIQUE, 0, op, buf);
846 break; 551 break;
552 }
553 }
554
555 return;
847 } 556 }
848 }
849 esrv_update_item (UPD_WEIGHT, op, sack2);
850 return;
851 }
852 557
853 /* Don't worry about this for containers - our caller should have 558 /* Don't worry about this for containers - our caller should have
854 * already checked this. 559 * already checked this.
855 */ 560 */
856 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp,(nrof?nrof:tmp->nrof))) 561 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))
857 return;
858
859 if(QUERY_FLAG(tmp, FLAG_APPLIED)) {
860 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
861 return; 562 return;
862 }
863 563
564 if (QUERY_FLAG (tmp, FLAG_APPLIED))
565 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
566 return;
567
864 /* we want to put some portion of the item into the container */ 568 /* we want to put some portion of the item into the container */
865 if (nrof && tmp->nrof != nrof) { 569 if (!can_split (op, tmp, nrof))
866 object *tmp2 = tmp;
867 tmp2_tag = tmp2->count;
868 tmp = get_split_ob (tmp, nrof);
869
870 if(!tmp) {
871 new_draw_info(NDI_UNIQUE, 0,op, errmsg);
872 return; 570 return;
873 }
874 /* Tell a client what happened other objects */
875 if (was_destroyed (tmp2, tmp2_tag))
876 esrv_del_item (op->contr, tmp2_tag);
877 else /* this can proably be replaced with an update */
878 esrv_send_item (op, tmp2);
879 } else
880 remove_ob(tmp);
881 571
882 new_draw_info_format(NDI_UNIQUE, 0,op, "You put the %s in %s.", 572 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
883 query_name(tmp), query_name(sack)); 573 sack->insert (tmp);
884 tmp_tag = tmp->count;
885 tmp2 = insert_ob_in_ob(tmp, sack);
886 fix_player(op); /* This is overkill, fix_player() is called somewhere */
887 /* in object.c */
888
889 /* If an object merged (and thus, different object), we need to
890 * delete the original.
891 */
892 if (tmp2 != tmp)
893 esrv_del_item (op->contr, tmp_tag);
894
895 esrv_send_item (op, tmp2);
896
897 /* If a transport, need to update all the players in the transport
898 * the view of what is in it.
899 */
900 if (sack->type == TRANSPORT) {
901 for (tmp=sack->inv; tmp; tmp=tmp->below) {
902 if (tmp->type == PLAYER) tmp->contr->socket.update_look=1;
903 }
904 } else {
905 /* update the sacks weight */
906 esrv_update_item (UPD_WEIGHT, op, sack);
907 }
908} 574}
909 575
910/* 576/*
911 * This function was part of drop, now is own function. 577 * This function was part of drop, now is own function.
912 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 578 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
913 * nrof objects is tried to dropped. 579 * nrof objects is tried to dropped.
914 * This is used when dropping objects onto the floor. 580 * This is used when dropping objects onto the floor.
915 */ 581 */
916void 582void
917drop_object (object * op, object * tmp, uint32 nrof) 583drop_object (object *op, object *tmp, uint32 nrof)
918{ 584{
919 char buf[MAX_BUF];
920 object *floor;
921
922 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 585 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
923 return; 586 return;
924 587
925 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 588 if (QUERY_FLAG (tmp, FLAG_APPLIED))
926 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 589 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
927 return; /* can't unapply it */ 590 return; /* can't unapply it */
928 591
929 /* We are only dropping some of the items. We split the current objec 592 /* We are only dropping some of the items. We split the current object
930 * off 593 * off
931 */ 594 */
932 if (nrof && tmp->nrof != nrof) 595 if (!can_split (op, tmp, nrof))
596 return;
597
598 drop_object (op, tmp);
599
600 if (!tmp->destroyed () && !tmp->is_inserted ())
601 {
602 // if nothing happened with the object we give it back
603 op->insert (tmp);
933 { 604 }
934 object *tmp2 = tmp; 605}
935 tag_t tmp2_tag = tmp2->count; 606
936 tmp = get_split_ob (tmp, nrof); 607/* In contrast to drop_object (op, tmp, nrof) above this function takes the
937 if (!tmp) 608 * already split off object, and feeds it to the event handlers and does
609 * other magic with it.
610 *
611 * <droppper> is the object that dropped this object and <obj> is the
612 * object that was dropped.
613 *
614 * Make sure to check what happened with <obj> after this function returns!
615 * Otherwise you may leak this object.
616 */
617void
618drop_object (object *dropper, object *obj)
619{
620 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
621 return;
622
623 if (obj->destroyed () || obj->is_inserted ())
624 return;
625
626 if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
627 {
628 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
629 dropper->statusmsg ("The god who lent it to you retrieves it.");
630
631 obj->destroy ();
632 dropper->update_stats ();
633 return;
634 }
635
636 for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
637 floor;
638 floor = floor->above)
639 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
640 return;
641
642 if (obj->destroyed () || obj->is_inserted ())
643 return;
644
645 if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
646 if (!sell_item (obj, dropper))
647 return;
648
649 /* If nothing special happened with this object, the default action is to
650 * insert it below the dropper:
651 */
652
653 obj->x = dropper->x;
654 obj->y = dropper->y;
655
656 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
657}
658
659void
660drop (object *op, object *tmp)
661{
662 /* Hopeful fix for disappearing objects when dropping from a container -
663 * somehow, players get an invisible object in the container, and the
664 * old logic would skip over invisible objects - works fine for the
665 * playes inventory, but drop inventory wants to use the next value.
666 */
667 if (tmp->invisible)
668 {
669 /* if the following is the case, it must be in an container. */
670 if (tmp->env && tmp->env->type != PLAYER)
938 { 671 {
939 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 672 /* Just toss the object - probably shouldn't be hanging
673 * around anyways
674 */
675 tmp->destroy ();
940 return; 676 return;
941 } 677 }
942 /* Tell a client what happened rest of objects. tmp2 is now the
943 * original object
944 */
945 if (op->type == PLAYER)
946 {
947 if (was_destroyed (tmp2, tmp2_tag))
948 esrv_del_item (op->contr, tmp2_tag);
949 else 678 else
950 esrv_send_item (op, tmp2);
951 } 679 {
952 } 680 while (tmp && tmp->invisible)
953 else 681 tmp = tmp->below;
954 remove_ob (tmp); 682 }
955
956 /* Lauwenmark: Handle for plugin drop event */
957 if (execute_event (tmp, EVENT_DROP, op, NULL, NULL, SCRIPT_FIX_ALL) != 0)
958 return;
959
960 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
961 { 683 }
962 sprintf (buf, "You drop the %s.", query_name (tmp)); 684
963 new_draw_info (NDI_UNIQUE, 0, op, buf); 685 if (tmp == NULL)
964 new_draw_info (NDI_UNIQUE, 0, op, 686 {
965 "The gods who lent it to you retrieves it."); 687 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
966 if (op->type == PLAYER)
967 esrv_del_item (op->contr, tmp->count);
968 free_object (tmp);
969 fix_player (op);
970 return; 688 return;
971 } 689 }
972 690
973/* If SAVE_INTERVAL is commented out, we never want to save 691 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
974 * the player here.
975 */
976#ifdef SAVE_INTERVAL
977 /* I'm not sure why there is a value check - since the save
978 * is done every SAVE_INTERVAL seconds, why care the value
979 * of what he is dropping?
980 */
981 if (op->type == PLAYER && !QUERY_FLAG (tmp, FLAG_UNPAID) &&
982 (tmp->nrof ? tmp->value * tmp->nrof : tmp->value > 2000) &&
983 (op->contr->last_save_time + SAVE_INTERVAL) <= time (NULL))
984 {
985 save_player (op, 1);
986 op->contr->last_save_time = time (NULL);
987 } 692 {
988#endif /* SAVE_INTERVAL */ 693 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
989
990 if (op->type == PLAYER)
991 esrv_del_item (op->contr, tmp->count);
992
993 /* Call this before we update the various windows/players. At least
994 * that we, we know the weight is correct.
995 */
996 fix_player (op); /* This is overkill, fix_player() is called somewhere */
997 /* in object.c */
998
999 if (op->type == PLAYER)
1000 {
1001 op->contr->socket.update_look = 1;
1002 /* Need to update the weight for the player */
1003 esrv_send_item (op, op);
1004 }
1005
1006 for (floor = get_map_ob (op->map, op->x, op->y); floor; floor = floor->above)
1007 if (execute_event (floor, EVENT_DROP_ON, op, tmp, NULL, SCRIPT_FIX_ALL))
1008 return; 694 return;
1009
1010 if (floor
1011 && floor->type == SHOP_FLOOR
1012 && !QUERY_FLAG (tmp, FLAG_UNPAID)
1013 && tmp->type != MONEY)
1014 sell_item (tmp, op);
1015
1016 tmp->x = op->x;
1017 tmp->y = op->y;
1018
1019 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
1020}
1021
1022void drop(object *op, object *tmp)
1023{
1024 /* Hopeful fix for disappearing objects when dropping from a container -
1025 * somehow, players get an invisible object in the container, and the
1026 * old logic would skip over invisible objects - works fine for the
1027 * playes inventory, but drop inventory wants to use the next value.
1028 */
1029 if (tmp->invisible) {
1030 /* if the following is the case, it must be in an container. */
1031 if (tmp->env && tmp->env->type != PLAYER) {
1032 /* Just toss the object - probably shouldn't be hanging
1033 * around anyways
1034 */
1035 remove_ob(tmp);
1036 free_object(tmp);
1037 return;
1038 } else {
1039 while(tmp!=NULL && tmp->invisible)
1040 tmp=tmp->below;
1041 }
1042 } 695 }
1043 696
1044 if (tmp==NULL) {
1045 new_draw_info(NDI_UNIQUE, 0,op,"You don't have anything to drop.");
1046 return;
1047 }
1048 if (QUERY_FLAG(tmp, FLAG_INV_LOCKED)) {
1049 new_draw_info(NDI_UNIQUE, 0,op,"This item is locked");
1050 return;
1051 }
1052 if (QUERY_FLAG(tmp, FLAG_NO_DROP)) { 697 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
698 {
1053#if 0 699#if 0
1054 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 700 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
1055 new_draw_info(NDI_UNIQUE, 0,op, "This item can't be dropped."); 701 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
1056#endif 702#endif
1057 return; 703 return;
1058 } 704 }
1059 705
706 if (op->type == PLAYER && op->contr->last_used == tmp)
707 op->contr->last_used = tmp->below ? tmp->below
708 : tmp->above ? tmp->above
709 : (object *)0;
710
711 if (op->container)
712 {
1060 if (op->type == PLAYER) 713 if (op->type == PLAYER)
1061 { 714 put_object_in_sack (op, op->container, tmp, op->contr->count);
1062 if (op->contr->last_used==tmp && op->contr->last_used_id == tmp->count) {
1063 object *n=NULL;
1064 if(tmp->below != NULL)
1065 n = tmp->below;
1066 else if(tmp->above != NULL)
1067 n = tmp->above;
1068 op->contr->last_used = n;
1069 if (n != NULL)
1070 op->contr->last_used_id = n->count;
1071 else 715 else
1072 op->contr->last_used_id = 0; 716 put_object_in_sack (op, op->container, tmp, 0);
1073 }
1074 }; 717 }
1075 718 else
1076 if (op->container) { 719 {
1077 if (op->type == PLAYER) 720 if (op->type == PLAYER)
1078 {
1079 put_object_in_sack (op, op->container, tmp, op->contr->count);
1080 } else {
1081 put_object_in_sack(op, op->container, tmp, 0);
1082 };
1083 } else {
1084 if (op->type == PLAYER)
1085 {
1086 drop_object (op, tmp, op->contr->count); 721 drop_object (op, tmp, op->contr->count);
1087 } else { 722 else
1088 drop_object(op,tmp,0); 723 drop_object (op, tmp, 0);
1089 };
1090 } 724 }
725
1091 if (op->type == PLAYER) 726 if (op->type == PLAYER)
1092 op->contr->count = 0; 727 op->contr->count = 0;
1093} 728}
1094
1095
1096 729
1097/* Command will drop all items that have not been locked */ 730/* Command will drop all items that have not been locked */
731int
1098int command_dropall (object *op, char *params) { 732command_dropall (object *op, char *params)
733{
1099 734
1100 object * curinv, *nextinv;
1101
1102 if(op->inv == NULL) { 735 if (op->inv == NULL)
736 {
1103 new_draw_info(NDI_UNIQUE, 0,op,"Nothing to drop!"); 737 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
1104 return 0; 738 return 0;
1105 } 739 }
1106 740
1107 curinv = op->inv; 741 object *curinv = op->inv;
742 object *nextinv;
1108 743
1109 /* 744 /*
1110 This is the default. Drops everything not locked or considered 745 This is the default. Drops everything not locked or considered
1111 not something that should be dropped. 746 not something that should be dropped.
1112 */ 747 */
1113 /* 748 /*
1114 Care must be taken that the next item pointer is not to money as 749 Care must be taken that the next item pointer is not to money as
1115 the drop() routine will do unknown things to it when dropping 750 the drop() routine will do unknown things to it when dropping
1116 in a shop. --Tero.Pelander@utu.fi 751 in a shop. --Tero.Pelander@utu.fi
1117 */ 752 */
1118 753
1119 if(params==NULL) { 754 int cnt = MAX_ITEM_PER_DROP;
1120 while(curinv != NULL) { 755
756 if (!params)
757 {
758 while (curinv)
759 {
1121 nextinv = curinv->below; 760 nextinv = curinv->below;
761
1122 while (nextinv && nextinv->type==MONEY) 762 while (nextinv && nextinv->type == MONEY)
1123 nextinv = nextinv->below; 763 nextinv = nextinv->below;
764
1124 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && curinv->type != MONEY && 765 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
1125 curinv->type != FOOD && curinv->type != KEY && 766 curinv->type != FOOD && curinv->type != KEY &&
1126 curinv->type != SPECIAL_KEY && curinv->type != GEM && 767 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
1127 !curinv->invisible && 768 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
1128 (curinv->type!=CONTAINER || op->container!=curinv)) 769 {
1129 { 770 drop (op, curinv);
1130 drop(op,curinv); 771 if (--cnt <= 0) break;
772 }
773
774 curinv = nextinv;
1131 } 775 }
1132 curinv = nextinv;
1133 }
1134 } 776 }
1135
1136 else if(strcmp(params, "weapons") == 0) { 777 else if (strcmp (params, "weapons") == 0)
1137 while(curinv != NULL) { 778 {
779 while (curinv)
780 {
1138 nextinv = curinv->below; 781 nextinv = curinv->below;
782
1139 while (nextinv && nextinv->type==MONEY) 783 while (nextinv && nextinv->type == MONEY)
1140 nextinv = nextinv->below; 784 nextinv = nextinv->below;
1141 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || 785
1142 (curinv->type == BOW) || (curinv->type == ARROW))) 786 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
1143 { 787 {
1144 drop(op,curinv); 788 drop (op, curinv);
1145 } 789 if (--cnt <= 0) break;
790 }
791
1146 curinv = nextinv; 792 curinv = nextinv;
1147 } 793 }
1148 } 794 }
1149
1150 else if(strcmp(params, "armor") == 0 || strcmp(params, "armour") == 0) { 795 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
1151 while(curinv != NULL) { 796 {
797 while (curinv)
798 {
1152 nextinv = curinv->below; 799 nextinv = curinv->below;
800
1153 while (nextinv && nextinv->type==MONEY) 801 while (nextinv && nextinv->type == MONEY)
1154 nextinv = nextinv->below; 802 nextinv = nextinv->below;
1155 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || 803
1156 curinv->type == SHIELD || curinv->type==HELMET)) 804 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
1157 { 805 {
1158 drop(op,curinv); 806 drop (op, curinv);
1159 } 807 if (--cnt <= 0) break;
808 }
809
1160 curinv = nextinv; 810 curinv = nextinv;
1161 } 811 }
1162 } 812 }
1163
1164 else if(strcmp(params, "misc") == 0) { 813 else if (strcmp (params, "misc") == 0)
1165 while(curinv != NULL) { 814 {
815 while (curinv)
816 {
1166 nextinv = curinv->below; 817 nextinv = curinv->below;
818
1167 while (nextinv && nextinv->type==MONEY) 819 while (nextinv && nextinv->type == MONEY)
1168 nextinv = nextinv->below; 820 nextinv = nextinv->below;
821
1169 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && ! QUERY_FLAG(curinv,FLAG_APPLIED)) { 822 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
1170 switch(curinv->type) { 823 {
1171 case HORN: 824 switch (curinv->type)
1172 case BOOK: 825 {
1173 case SPELLBOOK: 826 case HORN:
1174 case GIRDLE: 827 case BOOK:
1175 case AMULET: 828 case SPELLBOOK:
1176 case RING: 829 case GIRDLE:
1177 case CLOAK: 830 case AMULET:
1178 case BOOTS: 831 case RING:
1179 case GLOVES: 832 case CLOAK:
1180 case BRACERS: 833 case BOOTS:
1181 case SCROLL: 834 case GLOVES:
1182 case ARMOUR_IMPROVER: 835 case BRACERS:
1183 case WEAPON_IMPROVER: 836 case SCROLL:
1184 case WAND: 837 case ARMOUR_IMPROVER:
1185 case ROD: 838 case WEAPON_IMPROVER:
1186 case POTION: 839 case WAND:
1187 drop(op,curinv); 840 case ROD:
1188 curinv = nextinv; 841 case POTION:
1189 break; 842 drop (op, curinv);
1190 default: 843 curinv = nextinv;
1191 curinv = nextinv; 844 break;
1192 break; 845 default:
1193 } 846 curinv = nextinv;
1194 } 847 break;
848 }
849
850 if (--cnt <= 0) break;
851 }
852
1195 curinv = nextinv; 853 curinv = nextinv;
1196 } 854 }
1197 } 855 }
1198 op->contr->socket.update_look=1; 856
857 if (cnt <= 0)
858 op->failmsg ("Only dropped some items, can't drop that many items at once.");
859
1199/* draw_look(op);*/ 860/* draw_look(op);*/
1200 return 0; 861 return 0;
862}
863
864
865/* This function tries to drop all objects in the <objs> vector.
866 * <dropper> is the object that wants to drop them.
867 * <cnt> can be a 0 pointer or a pointer to the maximum number of
868 * drop operations to perform.
869 *
870 * Returns true if at least one item was dropped.
871 */
872bool
873drop_vector (object *dropper, vector<object *> &objs, int *cnt)
874{
875 vector<object *>::iterator i;
876
877 bool did_one = false;
878
879 for (i = objs.begin (); i != objs.end (); i++)
880 {
881 drop (dropper, *i);
882 if (cnt && --*cnt <= 0) break;
883 did_one = true;
884 }
885
886 return did_one;
1201} 887}
1202 888
1203/* Object op wants to drop object(s) params. params can be a 889/* Object op wants to drop object(s) params. params can be a
1204 * comma seperated list. 890 * comma seperated list.
1205 */ 891 */
1206 892int
1207int command_drop (object *op, char *params) 893command_drop (object *op, char *params)
1208{ 894{
1209 object *tmp, *next; 895 object *tmp, *next;
1210 int did_one=0; 896 int did_one = 0;
1211 897
1212 if (!params) { 898 if (!params)
899 {
1213 new_draw_info(NDI_UNIQUE,0, op, "Drop what?"); 900 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
1214 return 0;
1215 } else {
1216 for (tmp=op->inv; tmp; tmp=next) {
1217 next=tmp->below;
1218 if (QUERY_FLAG(tmp,FLAG_NO_DROP) ||
1219 tmp->invisible) continue;
1220 if (item_matched_string(op,tmp,params)) {
1221 drop(op, tmp);
1222 did_one=1;
1223 }
1224 }
1225 if (!did_one) new_draw_info(NDI_UNIQUE, 0,op,"Nothing to drop.");
1226 }
1227 if (op->type==PLAYER)
1228 {
1229 op->contr->count=0;
1230 op->contr->socket.update_look=1;
1231 };
1232/* draw_look(op);*/
1233 return 0; 901 return 0;
1234} 902 }
903 else
904 {
905 vector<object *> matched_objs;
1235 906
907 for (tmp = op->inv; tmp; tmp = next)
908 {
909 next = tmp->below;
910 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
911 continue;
912
913 if (item_matched_string (op, tmp, params))
914 matched_objs.push_back (tmp);
915 }
916
917 int cnt = MAX_ITEM_PER_DROP;
918
919 if (!drop_vector (op, matched_objs, &cnt))
920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
921
922 if (cnt <= 0)
923 op->failmsg ("Only dropped some items, can't drop that many items at once.");
924 }
925
926 return 0;
927}
928
929int
1236int command_examine (object *op, char *params) 930command_examine (object *op, char *params)
1237{ 931{
1238 if (!params) { 932 if (!params)
933 {
1239 object *tmp=op->below; 934 object *tmp = op->below;
1240 while (tmp && !LOOK_OBJ(tmp)) tmp=tmp->below; 935
1241 if (tmp) examine(op,tmp); 936 while (tmp && !tmp->client_visible ())
1242 } 937 tmp = tmp->below;
1243 else { 938
1244 object *tmp=find_best_object_match(op,params);
1245 if (tmp) 939 if (tmp)
1246 examine(op,tmp); 940 examine (op, tmp);
941 }
942 else
943 {
944 object *tmp = find_best_object_match (op, params);
945
946 if (tmp)
947 examine (op, tmp);
1247 else 948 else
1248 new_draw_info_format(NDI_UNIQUE,0,op,"Could not find an object that matches %s",params); 949 op->contr->infobox (MSG_CHANNEL ("examine"), format ("Could not find an object that matches %s", params));
1249 } 950 }
951
1250 return 0; 952 return 0;
1251} 953}
1252 954
1253/* op should be a player. 955/* op should be a player.
1254 * we return the object the player has marked with the 'mark' command 956 * we return the object the player has marked with the 'mark' command
1255 * below. If no match is found (or object has changed), we return 957 * below. If no match is found (or object has changed), we return
1256 * NULL. We leave it up to the calling function to print messages if 958 * NULL. We leave it up to the calling function to print messages if
1257 * nothing is found. 959 * nothing is found.
1258 */ 960 */
961object *
1259object *find_marked_object(object *op) 962find_marked_object (object *op)
1260{ 963{
1261 object *tmp; 964 object *tmp;
1262 965
1263 if (!op || !op->contr) return NULL; 966 if (!op || !op->contr)
967 return NULL;
968
1264 if (!op->contr->mark) { 969 if (!op->contr->mark)
970 {
1265/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/ 971/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
1266 return NULL; 972 return 0;
1267 } 973 }
974
1268 /* This may seem like overkill, but we need to make sure that they 975 /* This may seem like overkill, but we need to make sure that they
1269 * player hasn't dropped the item. We use count on the off chance that 976 * player hasn't dropped the item. We use count on the off chance that
1270 * an item got reincarnated at some point. 977 * an item got reincarnated at some point.
1271 */ 978 */
1272 for (tmp=op->inv; tmp; tmp=tmp->below) { 979 for (tmp = op->inv; tmp; tmp = tmp->below)
1273 if (tmp->invisible) continue; 980 {
981 if (tmp->invisible)
982 continue;
983
1274 if (tmp == op->contr->mark) { 984 if (tmp == op->contr->mark)
1275 if (tmp->count == op->contr->mark_count) 985 {
1276 return tmp; 986 if (!tmp->destroyed ())
1277 else { 987 return tmp;
1278 op->contr->mark=NULL; 988 else
1279 op->contr->mark_count=0; 989 {
990 op->contr->mark = 0;
1280/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/ 991/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
1281 return NULL; 992 return 0;
993 }
994 }
1282 } 995 }
1283 } 996
1284 } 997 return 0;
1285 return NULL;
1286} 998}
999
1000std::string
1001object::describe_monster (object *who)
1002{
1003 dynbuf_text buf (512, 512);
1004
1005 object *mon = head ? head : this;
1006
1007 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1008 buf << "It is an undead force.\r";
1009
1010 if (mon->level > who->level)
1011 buf << "It is likely more powerful than you.\r";
1012 else if (mon->level < who->level)
1013 buf << "It is likely less powerful than you.\r";
1014 else
1015 buf << "It is probably as powerful as you.\r";
1016
1017 if (mon->attacktype & AT_ACID)
1018 buf << "You seem to smell an acrid odor.\r";
1019
1020 /* Anyone know why this used to use the clone value instead of the
1021 * maxhp field? This seems that it should give more accurate results.
1022 */
1023 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1024 { /* From 1-4 */
1025 case 1:
1026 buf << "It is in a bad shape.\r";
1027 break;
1028 case 2:
1029 buf << "It is hurt.\r";
1030 break;
1031 case 3:
1032 buf << "It is somewhat hurt.\r";
1033 break;
1034 case 4:
1035 buf << "It is in excellent shape.\r";
1036 break;
1287 1037 }
1288 1038
1289/* op should be a player, params is any params. 1039 if (present_in_ob (POISONING, mon))
1290 * If no params given, we print out the currently marked object. 1040 buf << "It looks very ill.\r";
1291 * otherwise, try to find a matching object - try best match first. 1041
1292 */ 1042 buf << '\n';
1293int command_mark(object *op, char *params) 1043
1044 return buf;
1045}
1046
1047/* tmp is the object being described, pl is who is examing it. */
1048const char *
1049long_desc (object *tmp, object *pl)
1294{ 1050{
1295 if (!op->contr) return 1; 1051 static std::string s;
1296 if (!params) { 1052
1297 object *mark=find_marked_object(op); 1053 return (s = tmp->long_desc (pl)).c_str ();
1298 if (!mark) new_draw_info(NDI_UNIQUE,0,op,"You have no marked object."); 1054}
1299 else new_draw_info_format(NDI_UNIQUE,0,op,"%s is marked.", query_name(mark)); 1055
1056std::string
1057object::long_desc (object *who)
1058{
1059 std::string buf (query_name ());
1060
1061 switch (type)
1300 } 1062 {
1301 else { 1063 case RING:
1302 object *mark1=find_best_object_match(op, params); 1064 case SKILL:
1303 if (!mark1) { 1065 case WEAPON:
1304 new_draw_info_format(NDI_UNIQUE,0,op,"Could not find an object that matches %s",params); 1066 case ARMOUR:
1305 return 1; 1067 case BRACERS:
1306 } 1068 case HELMET:
1307 else { 1069 case SHIELD:
1308 op->contr->mark=mark1; 1070 case BOOTS:
1309 op->contr->mark_count=mark1->count; 1071 case GLOVES:
1310 new_draw_info_format(NDI_UNIQUE,0,op,"Marked item %s", query_name(mark1)); 1072 case AMULET:
1311 return 0; 1073 case GIRDLE:
1312 } 1074 case BOW:
1313 } 1075 case ARROW:
1314 return 0; /*shouldnt get here */ 1076 case CLOAK:
1315} 1077 case FOOD:
1078 case DRINK:
1079 case FLESH:
1080 case SKILL_TOOL:
1081 case LAMP:
1082 case POWER_CRYSTAL:
1083 {
1084 const char *cp = ::describe_item (this, who);
1316 1085
1086 if (*cp)
1087 {
1088 buf.append (" ");
1089 buf.append (cp);
1090 }
1091 }
1092 }
1093
1094 return buf;
1095}
1317 1096
1318/* op is the player 1097/* op is the player
1319 * tmp is the monster being examined. 1098 * tmp is the monster being examined.
1320 */ 1099 */
1100void
1321void examine_monster(object *op,object *tmp) { 1101examine_monster (object *op, object *tmp)
1322 object *mon=tmp->head?tmp->head:tmp; 1102{
1103 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1104}
1323 1105
1324 if(QUERY_FLAG(mon,FLAG_UNDEAD)) 1106static void
1325 new_draw_info(NDI_UNIQUE, 0,op,"It is an undead force."); 1107describe_dump_object (dynbuf &buf, object *ob)
1326 if(mon->level>op->level) 1108{
1327 new_draw_info(NDI_UNIQUE, 0,op,"It is likely more powerful than you."); 1109 char *txt = dump_object (ob);
1328 else if(mon->level<op->level) 1110 for (char *p = txt; *p; ++p) if (*p == '\n') *p = '\r';
1329 new_draw_info(NDI_UNIQUE, 0,op,"It is likely less powerful than you."); 1111 buf << "\n" << txt << "\n";
1330 else
1331 new_draw_info(NDI_UNIQUE, 0,op,"It is probably as powerful as you.");
1332 if(mon->attacktype&AT_ACID)
1333 new_draw_info(NDI_UNIQUE, 0,op,"You seem to smell an acrid odor.");
1334 1112
1335 /* Anyone know why this used to use the clone value instead of the 1113 if (!ob->is_arch ())
1336 * maxhp field? This seems that it should give more accurate results. 1114 describe_dump_object (buf, ob->arch);
1337 */ 1115}
1338 switch((mon->stats.hp+1)*4/(mon->stats.maxhp+1)) { /* From 1-4 */ 1116
1339 case 1: 1117std::string
1340 new_draw_info(NDI_UNIQUE, 0,op,"It is in a bad shape."); 1118object::describe (object *who)
1341 break; 1119{
1342 case 2: 1120 dynbuf_text buf (1024, 1024);
1343 new_draw_info(NDI_UNIQUE, 0,op,"It is hurt."); 1121
1344 break; 1122 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1345 case 3: 1123
1346 new_draw_info(NDI_UNIQUE, 0,op,"It is somewhat hurt."); 1124 if (custom_name)
1347 break; 1125 buf.printf ("You call it %s.\r", &custom_name);
1348 case 4: 1126
1349 new_draw_info(NDI_UNIQUE, 0,op,"It is in excellent shape."); 1127 switch (type)
1350 break;
1351 } 1128 {
1352 if(present_in_ob(POISONING,mon)!=NULL) 1129 case SPELLBOOK:
1353 new_draw_info(NDI_UNIQUE, 0,op,"It looks very ill."); 1130 if (flag [FLAG_IDENTIFIED] && inv)
1354} 1131 buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1132 break;
1355 1133
1134 case BOOK:
1135 if (msg)
1136 buf << "Something is written in it.\r";
1137 break;
1356 1138
1357/* tmp is the object being described, pl is who is examing it. */ 1139 case CONTAINER:
1358char *long_desc(object *tmp, object *pl) { 1140 if (race)
1359 static char buf[VERY_BIG_BUF]; 1141 {
1360 char *cp; 1142 if (weight_limit && stats.Str < 100)
1143 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1144 &race, weight_limit / (10.0 * (100 - stats.Str)));
1145 else
1146 buf.printf ("It can hold only %s.\r", &race);
1147 }
1148 else if (weight_limit && stats.Str < 100)
1149 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1150 break;
1361 1151
1362 if(tmp==NULL) 1152 case WAND:
1363 return ""; 1153 if (flag [FLAG_IDENTIFIED])
1364 1154 buf.printf ("It has %d charges left.\r", stats.food);
1365 buf[0]='\0'; 1155 break;
1366 switch(tmp->type) {
1367 case RING:
1368 case SKILL:
1369 case WEAPON:
1370 case ARMOUR:
1371 case BRACERS:
1372 case HELMET:
1373 case SHIELD:
1374 case BOOTS:
1375 case GLOVES:
1376 case AMULET:
1377 case GIRDLE:
1378 case BOW:
1379 case ARROW:
1380 case CLOAK:
1381 case FOOD:
1382 case DRINK:
1383 case FLESH:
1384 case SKILL_TOOL:
1385 case POWER_CRYSTAL:
1386 if(*(cp=describe_item(tmp, pl))!='\0') {
1387 int len;
1388
1389 strncpy(buf,query_name(tmp), VERY_BIG_BUF-1);
1390 buf[VERY_BIG_BUF-1]=0;
1391 len=strlen(buf);
1392 if (len<VERY_BIG_BUF-5) {
1393 /* Since we know the length, we save a few cpu cycles by using
1394 * it instead of calling strcat */
1395 strcpy(buf+len," ");
1396 len++;
1397 strncpy(buf+len, cp, VERY_BIG_BUF-len-1);
1398 buf[VERY_BIG_BUF-1]=0;
1399 }
1400 } 1156 }
1401 }
1402 if(buf[0]=='\0') {
1403 strncpy(buf,query_name(tmp), VERY_BIG_BUF-1);
1404 buf[VERY_BIG_BUF-1]=0;
1405 }
1406 1157
1407 return buf; 1158 if (materialname && !msg)
1408} 1159 buf << (nrof > 1 ? "They are made of " : "It is made of ")
1160 << materialname
1161 << '\r';
1409 1162
1410void examine(object *op, object *tmp) { 1163 if (who)
1411 char buf[VERY_BIG_BUF];
1412 int i;
1413
1414 if (tmp == NULL || tmp->type == CLOSE_CON)
1415 return;
1416
1417 strcpy(buf,"That is ");
1418 strncat(buf, long_desc(tmp, op), VERY_BIG_BUF-strlen(buf)-1);
1419 buf[VERY_BIG_BUF-1]=0;
1420
1421 new_draw_info(NDI_UNIQUE, 0,op,buf);
1422 buf[0]='\0';
1423
1424 if(tmp->custom_name) {
1425 strcpy(buf,"You call it ");
1426 strncat(buf, tmp->custom_name, VERY_BIG_BUF-strlen(buf)-1);
1427 buf[VERY_BIG_BUF-1]=0;
1428 new_draw_info(NDI_UNIQUE, 0,op,buf);
1429 buf[0]='\0';
1430 }
1431
1432 switch(tmp->type) {
1433 case SPELLBOOK:
1434 if(QUERY_FLAG(tmp, FLAG_IDENTIFIED) && tmp->inv ) {
1435 sprintf(buf,"%s is a %s level %s spell",
1436 tmp->inv->name, get_levelnumber(tmp->inv->level),
1437 tmp->inv->skill);
1438 }
1439 break;
1440
1441 case BOOK:
1442 if(tmp->msg!=NULL)
1443 strcpy(buf,"Something is written in it.");
1444 break;
1445
1446 case CONTAINER:
1447 if(tmp->race!=NULL) {
1448 if(tmp->weight_limit && tmp->stats.Str<100)
1449 sprintf (buf,"It can hold only %s and its weight limit is %.1f kg.",
1450 tmp->race, tmp->weight_limit/(10.0 * (100 - tmp->stats.Str)));
1451 else
1452 sprintf (buf,"It can hold only %s.", tmp->race);
1453 } else
1454 if(tmp->weight_limit && tmp->stats.Str<100)
1455 sprintf (buf,"Its weight limit is %.1f kg.",
1456 tmp->weight_limit/(10.0 * (100 - tmp->stats.Str)));
1457 break;
1458
1459 case WAND:
1460 if(QUERY_FLAG(tmp, FLAG_IDENTIFIED))
1461 sprintf(buf,"It has %d charges left.",tmp->stats.food);
1462 break;
1463 }
1464
1465 if(buf[0]!='\0')
1466 new_draw_info(NDI_UNIQUE, 0,op,buf);
1467
1468 if(tmp->materialname != NULL && !tmp->msg) {
1469 sprintf(buf, "It is made of: %s.", tmp->materialname);
1470 new_draw_info(NDI_UNIQUE, 0, op, buf);
1471 }
1472 /* Where to wear this item */ 1164 /* Where to wear this item */
1473 for (i=0; i < NUM_BODY_LOCATIONS; i++) { 1165 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1474 if (tmp->body_info[i]<-1) { 1166 if (slot[i].info)
1475 if (op->body_info[i]) 1167 {
1476 new_draw_info_format(NDI_UNIQUE, 0,op, 1168 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1477 "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]); 1169
1478 else 1170 if (slot[i].info < -1 && who->slot[i].info)
1479 new_draw_info_format(NDI_UNIQUE, 0,op, 1171 buf.printf ("(%d)", -slot[i].info);
1480 "It goes %s", body_locations[i].nonuse_name); 1172
1481 } else if (tmp->body_info[i]) { 1173 buf << ".\r";
1482 if (op->body_info[i]) 1174 }
1483 new_draw_info_format(NDI_UNIQUE, 0,op, 1175
1484 "It goes %s", body_locations[i].use_name); 1176 if (weight)
1485 else 1177 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1486 new_draw_info_format(NDI_UNIQUE, 0,op, 1178
1487 "It goes %s", body_locations[i].nonuse_name); 1179 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1488 }
1489 } 1180 {
1181 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1490 1182
1491 if(tmp->weight) { 1183 if (is_in_shop (who))
1492 sprintf(buf,tmp->nrof>1?"They weigh %3.3f kg.":"It weighs %3.3f kg.", 1184 {
1493 tmp->weight*(tmp->nrof?tmp->nrof:1)/1000.0); 1185 if (flag [FLAG_UNPAID])
1494 new_draw_info(NDI_UNIQUE, 0,op,buf); 1186 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1495 } 1187 else
1496 1188 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1497 if (tmp->value && !QUERY_FLAG(tmp, FLAG_STARTEQUIP) && !QUERY_FLAG(tmp, FLAG_NO_PICK)) { 1189 }
1498 object *floor;
1499 sprintf(buf,"You reckon %s worth %s.",
1500 tmp->nrof>1?"they are":"it is",query_cost_string(tmp,op, F_TRUE | F_APPROX));
1501 new_draw_info(NDI_UNIQUE, 0,op,buf);
1502 floor = get_map_ob (op->map, op->x, op->y);
1503 if (floor && floor->type == SHOP_FLOOR) {
1504 if(QUERY_FLAG(tmp, FLAG_UNPAID))
1505 sprintf(buf,"%s would cost you %s.",
1506 tmp->nrof>1?"They":"It",query_cost_string(tmp,op,F_BUY | F_SHOP));
1507 else
1508 sprintf(buf,"You are offered %s for %s.",
1509 query_cost_string(tmp,op,F_SELL+F_SHOP), tmp->nrof>1?"them":"it");
1510 new_draw_info(NDI_UNIQUE, 0,op,buf);
1511 }
1512 }
1513
1514 if(QUERY_FLAG(tmp, FLAG_MONSTER))
1515 examine_monster(op,tmp);
1516 1190 }
1191
1192 if (flag [FLAG_MONSTER])
1193 buf << describe_monster (who);
1194
1517 /* Is this item buildable? */ 1195 /* Is this item buildable? */
1518 if ( QUERY_FLAG( tmp, FLAG_IS_BUILDABLE ) ) 1196 if (flag [FLAG_IS_BUILDABLE])
1519 new_draw_info( NDI_UNIQUE, 0, op, "This is a buildable item." ); 1197 buf << "This is a buildable item.\r";
1520 1198
1521 /* Does the object have a message? Don't show message for all object 1199 /* Does the object have a message? Don't show message for all object
1522 * types - especially if the first entry is a match 1200 * types - especially if the first entry is a match
1523 */ 1201 */
1524 if(tmp->msg && tmp->type != EXIT && tmp->type != BOOK && 1202 if (msg)
1525 tmp->type != CORPSE && !tmp->move_on && 1203 {
1526 strncasecmp(tmp->msg, "@match",7)) { 1204 if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1205 {
1206 buf << '\r';
1527 1207
1528 /* This is just a hack so when identifying the items, we print 1208 /* This is just a hack so when identifying the items, we print
1529 * out the extra message 1209 * out the extra message
1530 */ 1210 */
1531 if (need_identify(tmp) && QUERY_FLAG(tmp, FLAG_IDENTIFIED)) 1211 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1532 new_draw_info(NDI_UNIQUE, 0,op, "The object has a story:"); 1212 buf << "The object has a story:\r";
1533 1213
1534 new_draw_info(NDI_UNIQUE, 0,op,tmp->msg); 1214 buf << msg << '\n';
1215 }
1216 }
1217 else if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1218 && (type == SPELLBOOK || type == ROD || type == WAND
1219 || type == ROD || type == POTION || type == SCROLL))
1220 // for spellbooks and other stuff that contains spells, print the spell message,
1221 // unless the object has a custom message handled above.
1222 buf << '\r' << inv->msg << '\n';
1223
1224 // try to display the duration for some potions and scrolls
1225 // this includes change ability potions and group spells,
1226 // but does not handle protection potions
1227 if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1228 && (type == POTION || type == SCROLL))
1535 } 1229 {
1536 new_draw_info(NDI_UNIQUE, 0,op," "); /* Blank line */ 1230 object *spell = inv;
1537}
1538 1231
1539/* 1232 if (spell->subtype == SP_PARTY_SPELL)
1540 * inventory prints object's inventory. If inv==NULL then print player's 1233 spell = spell->other_arch;
1541 * inventory.
1542 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1543 */
1544void inventory(object *op,object *inv) {
1545 object *tmp;
1546 char *in;
1547 int items = 0, length;
1548 1234
1549 if (inv==NULL && op==NULL) { 1235 if (spell->subtype == SP_CHANGE_ABILITY)
1550 new_draw_info(NDI_UNIQUE, 0,op,"Inventory of what object?"); 1236 buf.printf ("\nH<The effect will last about %.10g seconds.>",
1551 return; 1237 TICK2TIME (change_ability_duration (spell, this)));
1552 } 1238 }
1553 tmp = inv ? inv->inv : op->inv;
1554 1239
1555 while (tmp) { 1240 // Display a hint about inscribable items [empty books]
1556 if ((!tmp->invisible && 1241 // This includes the amount of text they can hold.
1557 (inv==NULL || inv->type == CONTAINER || QUERY_FLAG(tmp, FLAG_APPLIED))) 1242 if (type == INSCRIBABLE)
1558 || (!op || QUERY_FLAG(op, FLAG_WIZ)))
1559 items++;
1560 tmp=tmp->below;
1561 }
1562 if (inv==NULL) { /* player's inventory */
1563 if (items==0) {
1564 new_draw_info(NDI_UNIQUE, 0,op,"You carry nothing.");
1565 return;
1566 } else {
1567 length = 28;
1568 in = "";
1569 if (op)
1570 clear_win_info(op);
1571 new_draw_info(NDI_UNIQUE, 0,op,"Inventory:");
1572 } 1243 {
1573 } else { 1244 if (other_arch && other_arch->type == SCROLL)
1574 if (items==0) 1245 buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
1575 return;
1576 else {
1577 length = 28;
1578 in = " ";
1579 }
1580 }
1581 for (tmp=inv?inv->inv:op->inv; tmp; tmp=tmp->below) {
1582 if((!op||!QUERY_FLAG(op, FLAG_WIZ)) && (tmp->invisible ||
1583 (inv && inv->type != CONTAINER && !QUERY_FLAG(tmp, FLAG_APPLIED))))
1584 continue;
1585 if((!op || QUERY_FLAG(op, FLAG_WIZ)))
1586 new_draw_info_format(NDI_UNIQUE, 0,op ,"%s- %-*.*s (%5d) %-8s", in, length, length,
1587 query_name(tmp), tmp->count,query_weight(tmp));
1588 else 1246 else
1589 new_draw_info_format(NDI_UNIQUE,0, op, "%s- %-*.*s %-8s", in, length+8, 1247 buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
1590 length+8, query_name(tmp),
1591 query_weight(tmp)); 1248 weight_limit);
1592 }
1593 if(!inv && op) {
1594 new_draw_info_format(NDI_UNIQUE,0, op ,"%-*s %-8s",
1595 41,"Total weight :",query_weight(op));
1596 }
1597}
1598
1599static void display_new_pickup( object* op )
1600 { 1249 }
1250
1251 buf << '\n';
1252
1253 // the dungeon master additionally gets a complete dump
1254 if (who && who->flag [FLAG_WIZLOOK])
1255 {
1256 buf << "\nT<Object>\n";
1257 describe_dump_object (buf, this);
1258
1259 if (inv)
1260 {
1261 buf << "\nT<Top Inventory>\n";
1262 describe_dump_object (buf, inv);
1263 }
1264 }
1265
1266 return std::string (buf.linearise (), buf.size ());
1267}
1268
1269static void
1270display_new_pickup (object *op)
1271{
1601 int i = op->contr->mode; 1272 int i = op->contr->mode;
1602 1273
1603 if(!(i & PU_NEWMODE)) return;
1604
1605 new_draw_info_format(NDI_UNIQUE, 0,op,"%d NEWMODE",i & PU_NEWMODE?1:0);
1606 new_draw_info_format(NDI_UNIQUE, 0,op,"%d DEBUG",i & PU_DEBUG?1:0); 1274 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1607 new_draw_info_format(NDI_UNIQUE, 0,op,"%d INHIBIT",i & PU_INHIBIT?1:0); 1275 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1608 new_draw_info_format(NDI_UNIQUE, 0,op,"%d STOP",i & PU_STOP?1:0); 1276 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1609 1277
1610 new_draw_info_format(NDI_UNIQUE, 0,op,"%d <= x pickup weight/value RATIO (0==off)",(i & PU_RATIO)*5); 1278 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
1611 1279
1612 new_draw_info_format(NDI_UNIQUE, 0,op,"%d FOOD",i & PU_FOOD?1:0); 1280 new_draw_info_format (NDI_UNIQUE, 0, op, "%d FOOD", i & PU_FOOD ? 1 : 0);
1613 new_draw_info_format(NDI_UNIQUE, 0,op,"%d DRINK",i & PU_DRINK?1:0); 1281 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DRINK", i & PU_DRINK ? 1 : 0);
1614 new_draw_info_format(NDI_UNIQUE, 0,op,"%d VALUABLES",i & PU_VALUABLES?1:0); 1282 new_draw_info_format (NDI_UNIQUE, 0, op, "%d VALUABLES", i & PU_VALUABLES ? 1 : 0);
1615 1283
1616 new_draw_info_format(NDI_UNIQUE, 0,op,"%d BOW",i & PU_BOW?1:0); 1284 new_draw_info_format (NDI_UNIQUE, 0, op, "%d BOW", i & PU_BOW ? 1 : 0);
1617 new_draw_info_format(NDI_UNIQUE, 0,op,"%d ARROW",i & PU_ARROW?1:0); 1285 new_draw_info_format (NDI_UNIQUE, 0, op, "%d ARROW", i & PU_ARROW ? 1 : 0);
1618 1286
1619 new_draw_info_format(NDI_UNIQUE, 0,op,"%d HELMET",i & PU_HELMET?1:0); 1287 new_draw_info_format (NDI_UNIQUE, 0, op, "%d HELMET", i & PU_HELMET ? 1 : 0);
1620 new_draw_info_format(NDI_UNIQUE, 0,op,"%d SHIELD",i & PU_SHIELD?1:0); 1288 new_draw_info_format (NDI_UNIQUE, 0, op, "%d SHIELD", i & PU_SHIELD ? 1 : 0);
1621 new_draw_info_format(NDI_UNIQUE, 0,op,"%d ARMOUR",i & PU_ARMOUR?1:0); 1289 new_draw_info_format (NDI_UNIQUE, 0, op, "%d ARMOUR", i & PU_ARMOUR ? 1 : 0);
1622 1290
1623 new_draw_info_format(NDI_UNIQUE, 0,op,"%d BOOTS",i & PU_BOOTS?1:0); 1291 new_draw_info_format (NDI_UNIQUE, 0, op, "%d BOOTS", i & PU_BOOTS ? 1 : 0);
1624 new_draw_info_format(NDI_UNIQUE, 0,op,"%d GLOVES",i & PU_GLOVES?1:0); 1292 new_draw_info_format (NDI_UNIQUE, 0, op, "%d GLOVES", i & PU_GLOVES ? 1 : 0);
1625 new_draw_info_format(NDI_UNIQUE, 0,op,"%d CLOAK",i & PU_CLOAK?1:0); 1293 new_draw_info_format (NDI_UNIQUE, 0, op, "%d CLOAK", i & PU_CLOAK ? 1 : 0);
1626 new_draw_info_format(NDI_UNIQUE, 0,op,"%d KEY",i & PU_KEY?1:0); 1294 new_draw_info_format (NDI_UNIQUE, 0, op, "%d KEY", i & PU_KEY ? 1 : 0);
1627 1295
1628 new_draw_info_format(NDI_UNIQUE, 0,op,"%d MISSILEWEAPON",i & PU_MISSILEWEAPON?1:0); 1296 new_draw_info_format (NDI_UNIQUE, 0, op, "%d MISSILEWEAPON", i & PU_MISSILEWEAPON ? 1 : 0);
1629 new_draw_info_format(NDI_UNIQUE, 0,op,"%d ALLWEAPON",i & PU_ALLWEAPON?1:0); 1297 new_draw_info_format (NDI_UNIQUE, 0, op, "%d ALLWEAPON", i & PU_ALLWEAPON ? 1 : 0);
1630 new_draw_info_format(NDI_UNIQUE, 0,op,"%d MAGICAL",i & PU_MAGICAL?1:0); 1298 new_draw_info_format (NDI_UNIQUE, 0, op, "%d MAGICAL", i & PU_MAGICAL ? 1 : 0);
1631 new_draw_info_format(NDI_UNIQUE, 0,op,"%d POTION",i & PU_POTION?1:0); 1299 new_draw_info_format (NDI_UNIQUE, 0, op, "%d POTION", i & PU_POTION ? 1 : 0);
1632 1300
1633 new_draw_info_format(NDI_UNIQUE, 0,op,"%d SPELLBOOK",i & PU_SPELLBOOK?1:0); 1301 new_draw_info_format (NDI_UNIQUE, 0, op, "%d SPELLBOOK", i & PU_SPELLBOOK ? 1 : 0);
1634 new_draw_info_format(NDI_UNIQUE, 0,op,"%d SKILLSCROLL",i & PU_SKILLSCROLL?1:0); 1302 new_draw_info_format (NDI_UNIQUE, 0, op, "%d SKILLSCROLL", i & PU_SKILLSCROLL ? 1 : 0);
1635 new_draw_info_format(NDI_UNIQUE, 0,op,"%d READABLES",i & PU_READABLES?1:0); 1303 new_draw_info_format (NDI_UNIQUE, 0, op, "%d READABLES", i & PU_READABLES ? 1 : 0);
1636 new_draw_info_format(NDI_UNIQUE, 0,op,"%d MAGICDEVICE", i & PU_MAGIC_DEVICE?1:0); 1304 new_draw_info_format (NDI_UNIQUE, 0, op, "%d MAGICDEVICE", i & PU_MAGIC_DEVICE ? 1 : 0);
1637 1305
1638 new_draw_info_format(NDI_UNIQUE, 0,op,"%d NOT CURSED", i & PU_NOT_CURSED?1:0); 1306 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NOT CURSED", i & PU_NOT_CURSED ? 1 : 0);
1639 1307
1640 new_draw_info_format(NDI_UNIQUE, 0,op,"%d JEWELS", i & PU_JEWELS?1:0); 1308 new_draw_info_format (NDI_UNIQUE, 0, op, "%d JEWELS", i & PU_JEWELS ? 1 : 0);
1309 new_draw_info_format (NDI_UNIQUE, 0, op, "%d FLESH", i & PU_FLESH ? 1 : 0);
1641 1310
1642 new_draw_info_format(NDI_UNIQUE, 0,op,""); 1311 new_draw_info_format (NDI_UNIQUE, 0, op, "");
1643 } 1312}
1644 1313
1314int
1645int command_pickup (object *op, char *params) 1315command_pickup (object *op, char *params)
1646{ 1316{
1647 uint32 i; 1317 uint32 i;
1648 static const char* names[ ] = { 1318 static const char *names[] = {
1649 "debug", "inhibit", "stop", "food", "drink", "valuables", "bow", "arrow", "helmet", 1319 "debug", "inhibit", "stop", "food", "drink", "valuables", "bow", "arrow", "helmet",
1650 "shield", "armour", "boots", "gloves", "cloak", "key", "missile", "allweapon", 1320 "shield", "armour", "boots", "gloves", "cloak", "key", "missile", "allweapon",
1651 "magical", "potion", "spellbook", "skillscroll", "readables", "magicdevice", "notcursed", "jewels", NULL }; 1321 "magical", "potion", "spellbook", "skillscroll", "readables", "magicdevice", "notcursed",
1322 "jewels", "flesh", NULL
1323 };
1652 static uint32 modes[ ] = { 1324 static uint32 modes[] = {
1653 PU_DEBUG, PU_INHIBIT, PU_STOP, PU_FOOD, PU_DRINK, PU_VALUABLES, PU_BOW, PU_ARROW, PU_HELMET, 1325 PU_DEBUG, PU_INHIBIT, PU_STOP, PU_FOOD, PU_DRINK, PU_VALUABLES, PU_BOW, PU_ARROW, PU_HELMET,
1654 PU_SHIELD, PU_ARMOUR, PU_BOOTS, PU_GLOVES, PU_CLOAK, PU_KEY, PU_MISSILEWEAPON, PU_ALLWEAPON, 1326 PU_SHIELD, PU_ARMOUR, PU_BOOTS, PU_GLOVES, PU_CLOAK, PU_KEY, PU_MISSILEWEAPON, PU_ALLWEAPON,
1655 PU_MAGICAL, PU_POTION, PU_SPELLBOOK, PU_SKILLSCROLL, PU_READABLES, PU_MAGIC_DEVICE, PU_NOT_CURSED, PU_JEWELS, 0 }; 1327 PU_MAGICAL, PU_POTION, PU_SPELLBOOK, PU_SKILLSCROLL, PU_READABLES, PU_MAGIC_DEVICE, PU_NOT_CURSED,
1328 PU_JEWELS, PU_FLESH, 0
1329 };
1656 1330
1657 if(!params) { 1331 if (!params)
1332 {
1658 /* if the new mode is used, just print the settings */ 1333 /* if the new mode is used, just print the settings */
1659 if(op->contr->mode & PU_NEWMODE)
1660 {
1661 display_new_pickup( op ); 1334 display_new_pickup (op);
1662 return 1;
1663 }
1664 if(1) LOG(llevDebug, "command_pickup: !params\n");
1665 set_pickup_mode(op, (op->contr->mode > 6)? 0: op->contr->mode+1);
1666 return 0; 1335 return 0;
1667 } 1336 }
1668 1337
1669 while ( *params == ' ' && *params ) 1338 while (*params == ' ' && *params)
1670 params++; 1339 params++;
1671 1340
1672 if ( *params == '+' || *params == '-' ) 1341 if (*params == '+' || *params == '-')
1673 { 1342 {
1674 int mode; 1343 int mode;
1344
1675 for ( mode = 0; names[ mode ]; mode++ ) 1345 for (mode = 0; names[mode]; mode++)
1676 { 1346 {
1677 if ( !strcmp( names[ mode ], params + 1 ) ) 1347 if (!strcmp (names[mode], params + 1))
1678 { 1348 {
1679 i = op->contr->mode; 1349 i = op->contr->mode;
1680 if ( !( i & PU_NEWMODE ) ) 1350
1681 i = PU_NEWMODE;
1682 if ( *params == '+' ) 1351 if (*params == '+')
1683 i = i | modes[ mode ]; 1352 i = i | modes[mode];
1684 else 1353 else
1685 i = i & ~modes[ mode ]; 1354 i = i & ~modes[mode];
1355
1686 op->contr->mode = i; 1356 op->contr->mode = i;
1687 display_new_pickup( op ); 1357 display_new_pickup (op);
1688 return 1; 1358 return 1;
1689 } 1359 }
1690 } 1360 }
1691 new_draw_info_format( NDI_UNIQUE, 0, op, "Pickup: invalid item %s\n", params ); 1361 new_draw_info_format (NDI_UNIQUE, 0, op, "Pickup: invalid item %s\n", params);
1692 return 1; 1362 return 1;
1693 } 1363 }
1694 1364
1695 if(sscanf(params, "%u", &i) != 1) { 1365 if (sscanf (params, "%u", &i) != 1)
1696 if(1) LOG(llevDebug, "command_pickup: params==NULL\n"); 1366 {
1697 new_draw_info(NDI_UNIQUE, 0,op,"Usage: pickup <0-7> or <value_density> ."); 1367 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1698 return 1; 1368 return 1;
1699 } 1369 }
1700 set_pickup_mode(op,i); 1370
1371 if (i <= PU_RATIO)
1372 i |= op->contr->mode & ~PU_RATIO;
1373
1374 op->contr->mode = i;
1701 1375
1702 return 1; 1376 return 1;
1703} 1377}
1704 1378
1705void set_pickup_mode(object *op,int i) { 1379int
1706 switch(op->contr->mode=i) {
1707 case 0:
1708 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Don't pick up.");
1709 break;
1710 case 1:
1711 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up one item.");
1712 break;
1713 case 2:
1714 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up one item and stop.");
1715 break;
1716 case 3:
1717 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Stop before picking up.");
1718 break;
1719 case 4:
1720 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all items.");
1721 break;
1722 case 5:
1723 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all items and stop.");
1724 break;
1725 case 6:
1726 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all magic items.");
1727 break;
1728 case 7:
1729 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all coins and gems");
1730 break;
1731 }
1732}
1733
1734int command_search_items (object *op, char *params) 1380command_search_items (object *op, char *params)
1735{ 1381{
1736 char buf[MAX_BUF]; 1382 char buf[MAX_BUF];
1737 1383
1738 if (settings.search_items == FALSE)
1739 return 1;
1740
1741 if(params == NULL) { 1384 if (params == NULL)
1385 {
1742 if(op->contr->search_str[0]=='\0') { 1386 if (op->contr->search_str[0] == '\0')
1387 {
1743 new_draw_info(NDI_UNIQUE, 0,op,"Example: search magic+1"); 1388 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1744 new_draw_info(NDI_UNIQUE, 0,op,"Would automatically pick up all"); 1389 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1745 new_draw_info(NDI_UNIQUE, 0,op,"items containing the word 'magic+1'."); 1390 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1746 return 1; 1391 return 1;
1747 } 1392 }
1393
1748 op->contr->search_str[0]='\0'; 1394 op->contr->search_str[0] = '\0';
1749 new_draw_info(NDI_UNIQUE, 0,op,"Search mode turned off."); 1395 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1750 fix_player(op); 1396 op->update_stats ();
1751 return 1;
1752 }
1753 if((int)strlen(params) >= MAX_BUF) {
1754 new_draw_info(NDI_UNIQUE, 0,op,"Search string too long.");
1755 return 1;
1756 }
1757 strcpy(op->contr->search_str, params);
1758 sprintf(buf,"Searching for '%s'.",op->contr->search_str);
1759 new_draw_info(NDI_UNIQUE, 0,op,buf);
1760 fix_player(op);
1761 return 1; 1397 return 1;
1762}
1763
1764/*
1765 * Changing the custom name of an item
1766 *
1767 * Syntax is: rename <what object> to <new name>
1768 * if '<what object>' is omitted, marked object is used
1769 * if 'to <new name>' is omitted, custom name is cleared
1770 *
1771 * Names are considered for all purpose having a length <=127 (max length sent to client
1772 * by server) */
1773
1774int command_rename_item(object *op, char *params)
1775{
1776 char buf[VERY_BIG_BUF];
1777 int itemnumber;
1778 object *item=NULL;
1779 char *closebrace;
1780 size_t counter;
1781
1782 if (params) {
1783 /* Let's skip white spaces */
1784 while(' '==*params) params++;
1785
1786 /* Checking the first part */
1787 if ((itemnumber = atoi(params))!=0) {
1788 for (item=op->inv; item && ((item->count != itemnumber) || item->invisible); item=item->below);
1789 if (!item) {
1790 new_draw_info(NDI_UNIQUE,0,op,"Tried to rename an invalid item.");
1791 return 1;
1792 }
1793 while(isdigit(*params) || ' '==*params) params++;
1794 }
1795 else if ('<'==*params) {
1796 /* Got old name, let's get it & find appropriate matching item */
1797 closebrace=strchr(params,'>');
1798 if(!closebrace) {
1799 new_draw_info(NDI_UNIQUE,0,op,"Syntax error!");
1800 return 1;
1801 } 1398 }
1802 /* Sanity check for buffer overruns */
1803 if((closebrace-params)>127) {
1804 new_draw_info(NDI_UNIQUE,0,op,"Old name too long (up to 127 characters allowed)!");
1805 return 1;
1806 }
1807 /* Copy the old name */
1808 strncpy(buf,params+1,closebrace-params-1);
1809 buf[closebrace-params-1]='\0';
1810 1399
1811 /* Find best matching item */ 1400 if (strlen (params) >= MAX_BUF)
1812 item=find_best_object_match(op,buf);
1813 if(!item) {
1814 new_draw_info(NDI_UNIQUE,0,op,"Could not find a matching item to rename.");
1815 return 1;
1816 }
1817
1818 /* Now need to move pointer to just after > */
1819 params=closebrace+1;
1820 while(' '==*params) params++;
1821
1822 } else {
1823 /* Use marked item */
1824 item=find_marked_object(op);
1825 if(!item) {
1826 new_draw_info(NDI_UNIQUE,0,op,"No marked item to rename.");
1827 return 1;
1828 }
1829 } 1401 {
1830 1402 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1831 /* Now let's find the new name */
1832 if(!strncmp(params,"to ",3)) {
1833 params+=3;
1834 while(' '==*params) params++;
1835 if('<'!=*params) {
1836 new_draw_info(NDI_UNIQUE,0,op,"Syntax error, expecting < at start of new name!");
1837 return 1;
1838 }
1839 closebrace=strchr(params+1,'>');
1840 if(!closebrace) {
1841 new_draw_info(NDI_UNIQUE,0,op,"Syntax error, expecting > at end of new name!");
1842 return 1;
1843 }
1844
1845 /* Sanity check for buffer overruns */
1846 if((closebrace-params)>127) {
1847 new_draw_info(NDI_UNIQUE,0,op,"New name too long (up to 127 characters allowed)!");
1848 return 1;
1849 }
1850
1851 /* Copy the new name */
1852 strncpy(buf,params+1,closebrace-params-1);
1853 buf[closebrace-params-1]='\0';
1854
1855 /* Let's check it for weird characters */
1856 for(counter=0;counter<strlen(buf);counter++) {
1857 if(isalnum(buf[counter])) continue;
1858 if(' '==buf[counter]) continue;
1859 if('\''==buf[counter]) continue;
1860 if('+'==buf[counter]) continue;
1861 if('_'==buf[counter]) continue;
1862 if('-'==buf[counter]) continue;
1863
1864 /* If we come here, then the name contains an invalid character...
1865 tell the player & exit */
1866 new_draw_info(NDI_UNIQUE,0,op,"Invalid new name!");
1867 return 1;
1868 }
1869
1870 } else {
1871 /* If param contains something, then syntax error... */
1872 if(strlen(params)) {
1873 new_draw_info(NDI_UNIQUE,0,op,"Syntax error, expected 'to <' after old name!");
1874 return 1;
1875 }
1876 /* New name is empty */
1877 buf[0]='\0';
1878 }
1879 } else {
1880 /* Last case: params==NULL */
1881 item=find_marked_object(op);
1882 if(!item) {
1883 new_draw_info(NDI_UNIQUE,0,op,"No marked item to rename.");
1884 return 1; 1403 return 1;
1885 } 1404 }
1886 buf[0]='\0';
1887 }
1888 1405
1889 if (QUERY_FLAG(item, FLAG_UNPAID)) { 1406 strcpy (op->contr->search_str, params);
1890 new_draw_info(NDI_UNIQUE,0,op,"You can't rename an unpaid item! You should pay for it first."); 1407 sprintf (buf, "Now searching for '%s'.", op->contr->search_str);
1891 return 1; 1408 new_draw_info (NDI_UNIQUE, 0, op, buf);
1892 } 1409 op->update_stats ();
1893
1894 /* Coming here, everything is fine... */
1895 if(!strlen(buf)) {
1896 /* Clear custom name */
1897 if(item->custom_name) {
1898 FREE_AND_CLEAR_STR(item->custom_name);
1899
1900 new_draw_info_format(NDI_UNIQUE, 0, op,"You stop calling your %s with weird names.",query_base_name(item,item->nrof>1?1:0));
1901 esrv_update_item(UPD_NAME,op,item);
1902 } else {
1903 new_draw_info(NDI_UNIQUE,0,op,"This item has no custom name.");
1904 }
1905 } else {
1906 /* Set custom name */
1907 FREE_AND_COPY(item->custom_name,buf);
1908
1909 new_draw_info_format(NDI_UNIQUE, 0, op,"Your %s will now be called %s.",query_base_name(item,item->nrof>1?1:0),buf);
1910 esrv_update_item(UPD_NAME,op,item);
1911 }
1912 1410
1913 return 1; 1411 return 1;
1914} 1412}
1413

Diff Legend

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