[ViewVC] Diff of: cvs/deliantra/server/server/c

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.76 by root, Sun Sep 7 21:31:23 2008 UTC vs.
Revision 1.115 by root, Sun Apr 4 02:51:57 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	/*	25	/*
25	* Object (handling) commands	26	* Object (handling) commands
26	*/	27	*/
27		28
28	#include <global.h>	29	#include <global.h>
29	#include <loader.h>
30	#include <skills.h>	30	#include <skills.h>
31	#include <sproto.h>	31	#include <sproto.h>
32	#include <living.h>	32	#include <living.h>
33	#include <math.h>
34		33
35	/*	34	/*
36	* Object id parsing functions	35	* Object id parsing functions
37	*/	36	*/
38		37
133	{	132	{
134	new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");	133	new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
135	return 0;	134	return 0;
136	}	135	}
137		136
138	skill = find_skill_by_name (pl, params);	137	skill = find_skill_by_name_fuzzy (pl, params);
139		138
140	if (!skill)	139	if (!skill)
141	{	140	{
142	new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);	141	new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the %s skill.", params);
143	return 0;	142	return 0;
144	}	143	}
145		144
146	pl->change_skill (0);	145	pl->apply (skill);
147	apply_special (pl, skill, AP_APPLY);
148	return 1;	146	return 1;
149	}
150
151	/* These functions (command_search, command_disarm) are really just wrappers for
152	* things like 'use_skill ...'). In fact, they should really be obsoleted
153	* and replaced with those.
154	*/
155	int
156	command_search (object op, char params)
157	{
158	return use_skill (op, skill_names[SK_FIND_TRAPS]);
159	}
160
161	int
162	command_disarm (object op, char params)
163	{
164	return use_skill (op, skill_names[SK_DISARM_TRAPS]);
165	}	147	}
166		148
167	/* A little special because we do want to pass the full params along	149	/* A little special because we do want to pass the full params along
168	* as it includes the object to throw.	150	* as it includes the object to throw.
169	*/	151	*/
…		…
171	command_throw (object op, char params)	153	command_throw (object op, char params)
172	{	154	{
173	if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))	155	if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))
174	return do_skill (op, op, skop, op->facing, params);	156	return do_skill (op, op, skop, op->facing, params);
175	else	157	else
176	new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing.");	158	new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the throwing skill.");
177		159
178	return 0;	160	return 0;
179	}	161	}
180		162
181	int	163	int
…		…
207		189
208	while (*params == ' ')	190	while (*params == ' ')
209	params++;	191	params++;
210		192
211	if (object *inv = find_best_apply_object_match (op, params, aflag))	193	if (object *inv = find_best_apply_object_match (op, params, aflag))
212	player_apply (op, inv, aflag, 0);	194	player_apply (op, inv, aflag);
213	else	195	else
214	new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params);	196	new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params);
215	}	197	}
216		198
217	return 0;	199	return 0;
…		…
241	return 0;	223	return 0;
242	}	224	}
243		225
244	if (sack->race && (sack->race != op->race \|\| op->type == CONTAINER \|\| (sack->stats.food && sack->stats.food != op->type)))	226	if (sack->race && (sack->race != op->race \|\| op->type == CONTAINER \|\| (sack->stats.food && sack->stats.food != op->type)))
245	{	227	{
246	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));	228	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can only put objects of type '%s' into the %s.", &sack->race, query_name (sack));
247	return 0;	229	return 0;
248	}	230	}
249		231
250	if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)	232	if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
251	{	233	{
…		…
377	count = tmp->nrof;	359	count = tmp->nrof;
378		360
379	/* container is open, so use it */	361	/* container is open, so use it */
380	if (tmp->flag [FLAG_STARTEQUIP])	362	if (tmp->flag [FLAG_STARTEQUIP])
381	alt = op;	363	alt = op;
382	else if (op->container)	364	else if ((alt = op->container_ ()))
383	{	365	{
384	alt = op->container;
385	if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))	366	if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
386	goto leave;	367	goto leave;
387	}	368	}
388	else	369	else
389	{ /* non container pickup */	370	{ /* non container pickup */
…		…
443	int	424	int
444	command_take (object op, char params)	425	command_take (object op, char params)
445	{	426	{
446	object tmp, next;	427	object tmp, next;
447		428
448	if (op->container)	429	if (op->container_ ())
449	tmp = op->container->inv;	430	tmp = op->container_ ()->inv;
450	else	431	else
451	{	432	{
452	tmp = op->above;	433	tmp = op->above;
453	if (tmp)	434	if (tmp)
454	while (tmp->above)	435	while (tmp->above)
…		…
466		447
467	/* Makes processing easier */	448	/* Makes processing easier */
468	if (params && *params == '\0')	449	if (params && *params == '\0')
469	params = 0;	450	params = 0;
470		451
471	int cnt = MAX_ITEM_PER_DROP;	452	int cnt = MAX_ITEM_PER_ACTION;
472		453
473	while (tmp)	454	while (tmp)
474	{	455	{
475	next = tmp->below;	456	next = tmp->below;
476		457
…		…
520		501
521	return 0;	502	return 0;
522	}	503	}
523		504
524	/*	505	/*
525	* This function was part of drop, now is own function.	506	* This function was part of drop, now is own function.
526	* Player 'op' tries to put object 'tmp' into sack 'sack',	507	* Player 'op' tries to put object 'tmp' into sack 'sack',
527	* if nrof is non zero, then nrof objects is tried to put into sack.	508	* if nrof is non zero, then nrof objects is tried to put into sack.
		509	*
528	* Note that the 'sack' in question can now be a transport,	510	* Note that the 'sack' in question can now be a transport,
529	* so this function isn't named very good anymore.	511	* so this function isn't named very good anymore.
530	*/	512	*/
531	void	513	void
532	put_object_in_sack (object op, object sack, object *tmp, uint32 nrof)	514	put_object_in_sack (object op, object sack, object *tmp, uint32 nrof)
…		…
535	char buf[MAX_BUF];	517	char buf[MAX_BUF];
536		518
537	if (sack == tmp)	519	if (sack == tmp)
538	return; /* Can't put an object in itself */	520	return; /* Can't put an object in itself */
539		521
540	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	522	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP))
541	{	523	{
542	new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));	524	new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
543	return;	525	return;
544	}	526	}
545		527
…		…
554		536
555	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)	537	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
556	{	538	{
557	tmp = tmp2->below;	539	tmp = tmp2->below;
558		540
559	if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))	541	if ((sack->type == CONTAINER && sack_can_hold (op, op->container_ (), tmp2, tmp2->nrof)))
560	put_object_in_sack (op, sack, tmp2, 0);	542	put_object_in_sack (op, sack, tmp2, 0);
561	else	543	else
562	{	544	{
563	sprintf (buf, "Your %s fills up.", query_name (sack));	545	sprintf (buf, "Your %s fills up.", query_name (sack));
564	new_draw_info (NDI_UNIQUE, 0, op, buf);	546	new_draw_info (NDI_UNIQUE, 0, op, buf);
…		…
585		567
586	new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));	568	new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
587	sack->insert (tmp);	569	sack->insert (tmp);
588	}	570	}
589		571
		572	/* In contrast to drop_object (op, tmp, nrof) above this function takes the
		573	* already split off object, and feeds it to the event handlers and does
		574	* other magic with it.
		575	*
		576	* <droppper> is the object that dropped this object and <obj> is the
		577	* object that was dropped.
		578	*
		579	* Make sure to check what happened with <obj> after this function returns!
		580	* Otherwise you may leak this object.
		581	*/
		582	void
		583	drop_object (object dropper, object obj)
		584	{
		585	if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
		586	return;
		587
		588	if (obj->destroyed () \|\| obj->is_inserted ())
		589	return;
		590
		591	if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
		592	{
		593	dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
		594	dropper->statusmsg ("The god who lent it to you retrieves it.");
		595
		596	obj->destroy ();
		597	dropper->update_stats ();
		598	return;
		599	}
		600
		601	for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
		602	floor;
		603	floor = floor->above)
		604	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
		605	return;
		606
		607	if (obj->destroyed () \|\| obj->is_inserted ())
		608	return;
		609
		610	if (dropper->is_in_shop () && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
		611	if (!sell_item (obj, dropper))
		612	return;
		613
		614	if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
		615	return;
		616
		617	/* If nothing special happened with this object, the default action is to
		618	* insert it below the dropper:
		619	*/
		620
		621	obj->x = dropper->x;
		622	obj->y = dropper->y;
		623
		624	insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
		625	}
		626
590	/*	627	/*
591	* This function was part of drop, now is own function.	628	* This function was part of drop, now is own function.
592	* Player 'op' tries to drop object 'tmp', if tmp is non zero, then	629	* Player 'op' tries to drop object 'tmp', if tmp is non zero, then
593	* nrof objects is tried to dropped.	630	* nrof objects are tried to drop.
594	* This is used when dropping objects onto the floor.	631	* This is used when dropping objects onto the floor.
595	*/	632	*/
596	void	633	void
597	drop_object (object op, object tmp, uint32 nrof)	634	drop_object (object op, object tmp, uint32 nrof)
598	{	635	{
…		…
601		638
602	if (QUERY_FLAG (tmp, FLAG_APPLIED))	639	if (QUERY_FLAG (tmp, FLAG_APPLIED))
603	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))	640	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))
604	return; /* can't unapply it */	641	return; /* can't unapply it */
605		642
606	//fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
607
608	/* We are only dropping some of the items. We split the current object	643	/* We are only dropping some of the items. We split the current object
609	* off	644	* off
610	*/	645	*/
611	if (!can_split (op, tmp, nrof))	646	if (!can_split (op, tmp, nrof))
612
613	if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
614	return;	647	return;
615		648
616	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	649	drop_object (op, tmp);
617	{
618	op->statusmsg (format ("You drop the %s.", query_name (tmp)));
619	op->statusmsg ("The gods who lent it to you retrieves it.");
620		650
621	tmp->destroy ();	651	if (!tmp->destroyed () && !tmp->is_inserted ())
622	op->update_stats ();
623	return;
624	}	652	{
625		653	// if nothing happened with the object we give it back
626	/* Call this before we update the various windows/players. At least	654	op->insert (tmp);
627	* that we, we know the weight is correct.
628	*/
629	// 2007-11-26: moved op->update_stats away and calling it later after
630	// all items of a drop command have been processed.
631
632	for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
633	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
634	return;
635
636	if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
637	{	655	}
638	if (!sell_item (tmp, op))
639	return; // if we can't sell it we don't drop it
640	}
641
642	tmp->x = op->x;
643	tmp->y = op->y;
644
645	insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
646	}	656	}
647		657
648	void	658	void
649	drop (object op, object tmp)	659	drop (object op, object tmp)
650	{	660	{
…		…
659	if (tmp->env && tmp->env->type != PLAYER)	669	if (tmp->env && tmp->env->type != PLAYER)
660	{	670	{
661	/* Just toss the object - probably shouldn't be hanging	671	/* Just toss the object - probably shouldn't be hanging
662	* around anyways	672	* around anyways
663	*/	673	*/
664	tmp->remove ();
665	tmp->destroy ();	674	tmp->destroy ();
666	return;	675	return;
667	}	676	}
668	else	677	else
669	{
670	while (tmp && tmp->invisible)	678	while (tmp && tmp->invisible)
671	tmp = tmp->below;	679	tmp = tmp->below;
672	}
673	}	680	}
674		681
675	if (tmp == NULL)	682	if (!tmp)
676	{	683	{
677	new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");	684	new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
678	return;	685	return;
679	}	686	}
680		687
…		…
694	}	701	}
695		702
696	if (op->type == PLAYER && op->contr->last_used == tmp)	703	if (op->type == PLAYER && op->contr->last_used == tmp)
697	op->contr->last_used = tmp->below ? tmp->below	704	op->contr->last_used = tmp->below ? tmp->below
698	: tmp->above ? tmp->above	705	: tmp->above ? tmp->above
699	: 0;	706	: (object *)0;
700		707
701	if (op->container)	708	if (op->container_ ())
702	{	709	{
703	if (op->type == PLAYER)	710	if (op->type == PLAYER)
704	put_object_in_sack (op, op->container, tmp, op->contr->count);	711	put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
705	else	712	else
706	put_object_in_sack (op, op->container, tmp, 0);	713	put_object_in_sack (op, op->container_ (), tmp, 0);
707	}	714	}
708	else	715	else
709	{	716	{
710	if (op->type == PLAYER)	717	if (op->type == PLAYER)
711	drop_object (op, tmp, op->contr->count);	718	drop_object (op, tmp, op->contr->count);
…		…
738	/*	745	/*
739	Care must be taken that the next item pointer is not to money as	746	Care must be taken that the next item pointer is not to money as
740	the drop() routine will do unknown things to it when dropping	747	the drop() routine will do unknown things to it when dropping
741	in a shop. --Tero.Pelander@utu.fi	748	in a shop. --Tero.Pelander@utu.fi
742	*/	749	*/
743
744	int cnt = MAX_ITEM_PER_DROP;	750	int cnt = MAX_ITEM_PER_ACTION;
745		751
746	if (!params)	752	if (!params)
747	{	753	{
748	while (curinv)	754	while (curinv)
749	{	755	{
750	nextinv = curinv->below;	756	nextinv = curinv->below;
751		757
752	while (nextinv && nextinv->type == MONEY)	758	while (nextinv && nextinv->type == MONEY)
753	nextinv = nextinv->below;	759	nextinv = nextinv->below;
754		760
755	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&	761	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
756	curinv->type != FOOD && curinv->type != KEY &&	762	&& curinv->type != MONEY
757	curinv->type != SPECIAL_KEY && curinv->type != GEM &&	763	&& curinv->type != FOOD
		764	&& curinv->type != KEY
		765	&& curinv->type != SPECIAL_KEY
		766	&& curinv->type != GEM
		767	&& !curinv->invisible
758	!curinv->invisible && (curinv->type != CONTAINER \|\| op->container != curinv))	768	&& (curinv->type != CONTAINER \|\| op->container_ () != curinv))
759	{	769	{
760	drop (op, curinv);	770	drop (op, curinv);
761	if (--cnt <= 0) break;	771	if (--cnt <= 0) break;
762	}	772	}
763		773
…		…
849		859
850	/* draw_look(op);*/	860	/* draw_look(op);*/
851	return 0;	861	return 0;
852	}	862	}
853		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	*/
		872	static bool
		873	drop_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;
		887	}
		888
854	/* 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
855	* comma seperated list.	890	* comma seperated list.
856	*/	891	*/
857	int	892	int
858	command_drop (object op, char params)	893	command_drop (object op, char params)
…		…
865	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");	900	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
866	return 0;	901	return 0;
867	}	902	}
868	else	903	else
869	{	904	{
870	int cnt = MAX_ITEM_PER_DROP;	905	vector<object *> matched_objs;
871		906
872	for (tmp = op->inv; tmp; tmp = next)	907	for (tmp = op->inv; tmp; tmp = next)
873	{	908	{
874	next = tmp->below;	909	next = tmp->below;
875	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)	910	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)
876	continue;	911	continue;
877		912
878	if (item_matched_string (op, tmp, params))	913	if (item_matched_string (op, tmp, params))
879	{	914	matched_objs.push_back (tmp);
880	drop (op, tmp);
881	if (--cnt <= 0) break;
882	did_one = 1;
883	}	915	}
884	}
885		916
886	if (!did_one)	917	int cnt = MAX_ITEM_PER_ACTION;
		918
		919	if (!drop_vector (op, matched_objs, &cnt))
887	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");	920	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
888		921
889	if (cnt <= 0)	922	if (cnt <= 0)
890	op->failmsg ("Only dropped some items, can't drop that many items at once.");	923	op->failmsg ("Only dropped some items, can't drop that many items at once.");
891	}	924	}
…		…
970	dynbuf_text buf (512, 512);	1003	dynbuf_text buf (512, 512);
971		1004
972	object *mon = head ? head : this;	1005	object *mon = head ? head : this;
973		1006
974	if (QUERY_FLAG (mon, FLAG_UNDEAD))	1007	if (QUERY_FLAG (mon, FLAG_UNDEAD))
975	buf << " - It is an undead force.\n";	1008	buf << "It is an undead force.\r";
976		1009
977	if (mon->level > who->level)	1010	if (mon->level > who->level)
978	buf << " - It is likely more powerful than you.\n";	1011	buf << "It is likely more powerful than you.\r";
979	else if (mon->level < who->level)	1012	else if (mon->level < who->level)
980	buf << " - It is likely less powerful than you.\n";	1013	buf << "It is likely less powerful than you.\r";
981	else	1014	else
982	buf << " - It is probably as powerful as you.\n";	1015	buf << "It is probably as powerful as you.\r";
983		1016
984	if (mon->attacktype & AT_ACID)	1017	if (mon->attacktype & AT_ACID)
985	buf << " - You seem to smell an acrid odor.\n";	1018	buf << "You seem to smell an acrid odor.\r";
986		1019
987	/* Anyone know why this used to use the clone value instead of the	1020	/* Anyone know why this used to use the clone value instead of the
988	* maxhp field? This seems that it should give more accurate results.	1021	* maxhp field? This seems that it should give more accurate results.
989	*/	1022	*/
990	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))	1023	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
991	{ /* From 1-4 */	1024	{ /* From 1-4 */
992	case 1:	1025	case 1:
993	buf << " - It is in a bad shape.\n";	1026	buf << "It is in a bad shape.\r";
994	break;	1027	break;
995	case 2:	1028	case 2:
996	buf << " - It is hurt.\n";	1029	buf << "It is hurt.\r";
997	break;	1030	break;
998	case 3:	1031	case 3:
999	buf << " - It is somewhat hurt.\n";	1032	buf << "It is somewhat hurt.\r";
1000	break;	1033	break;
1001	case 4:	1034	case 4:
1002	buf << " - It is in excellent shape.\n";	1035	buf << "It is in excellent shape.\r";
1003	break;	1036	break;
1004	}	1037	}
1005		1038
1006	if (present_in_ob (POISONING, mon))	1039	if (present_in_ob (POISONING, mon))
1007	buf << " - It looks very ill.\n";	1040	buf << "It looks very ill.\r";
		1041
		1042	buf << '\n';
1008		1043
1009	return buf;	1044	return buf;
1010	}	1045	}
1011		1046
1012	/* tmp is the object being described, pl is who is examing it. */	1047	/* tmp is the object being described, pl is who is examing it. */
…		…
1019	}	1054	}
1020		1055
1021	std::string	1056	std::string
1022	object::long_desc (object *who)	1057	object::long_desc (object *who)
1023	{	1058	{
1024	std::string buf (query_name (this));	1059	std::string buf (query_name ());
1025		1060
1026	switch (type)	1061	switch (type)
1027	{	1062	{
1028	case RING:	1063	case RING:
1029	case SKILL:	1064	case SKILL:
…		…
1041	case CLOAK:	1076	case CLOAK:
1042	case FOOD:	1077	case FOOD:
1043	case DRINK:	1078	case DRINK:
1044	case FLESH:	1079	case FLESH:
1045	case SKILL_TOOL:	1080	case SKILL_TOOL:
		1081	case LAMP:
1046	case POWER_CRYSTAL:	1082	case POWER_CRYSTAL:
1047	{	1083	{
1048	const char *cp = ::describe_item (this, who);	1084	const char *cp = ::describe_item (this, who);
1049		1085
1050	if (*cp)	1086	if (*cp)
…		…
1065	examine_monster (object op, object tmp)	1101	examine_monster (object op, object tmp)
1066	{	1102	{
1067	new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());	1103	new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1068	}	1104	}
1069		1105
1070	std::string
1071	object::describe (object *who)
1072	{
1073	dynbuf_text buf (1024, 1024);
1074
1075	buf.printf ("That is: %s.\n\n", long_desc (who).c_str ());
1076
1077	if (custom_name)
1078	buf.printf ("You call it %s.\n\n", &custom_name);
1079
1080	switch (type)
1081	{
1082	case SPELLBOOK:
1083	if (flag [FLAG_IDENTIFIED] && inv)
1084	buf.printf ("%s is a %s %s spell.\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1085	break;
1086
1087	case BOOK:
1088	if (msg)
1089	buf << "Something is written in it.\n";
1090	break;
1091
1092	case CONTAINER:
1093	if (race != NULL)
1094	{
1095	if (weight_limit && stats.Str < 100)
1096	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1097	&race, weight_limit / (10.0 * (100 - stats.Str)));
1098	else
1099	buf.printf ("It can hold only %s.\n", &race);
1100	}
1101	else if (weight_limit && stats.Str < 100)
1102	buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1103	break;
1104
1105	case WAND:
1106	if (flag [FLAG_IDENTIFIED])
1107	buf.printf ("It has %d charges left.\n", stats.food);
1108	break;
1109	}
1110
1111	if (materialname && !msg)
1112	buf.printf ("It is made of: %s.\n", &materialname);
1113
1114	if (who)
1115	/* Where to wear this item */
1116	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1117	if (slot[i].info)
1118	{
1119	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1120
1121	if (slot[i].info < -1 && who->slot[i].info)
1122	buf.printf ("(%d)", -slot[i].info);
1123
1124	buf << ".\n";
1125	}
1126
1127	if (weight)
1128	buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1129
1130	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1131	{
1132	buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE \| F_APPROX));
1133
1134	if (is_in_shop (who))
1135	{
1136	if (flag [FLAG_UNPAID])
1137	buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY \| F_SHOP));
1138	else
1139	buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1140	}
1141	}
1142
1143	if (flag [FLAG_MONSTER])
1144	buf << describe_monster (who);
1145
1146	/* Is this item buildable? */
1147	if (flag [FLAG_IS_BUILDABLE])
1148	buf << "This is a buildable item.\n";
1149
1150	/* Does the object have a message? Don't show message for all object
1151	* types - especially if the first entry is a match
1152	*/
1153	if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1154	{
1155	/* This is just a hack so when identifying the items, we print
1156	* out the extra message
1157	*/
1158	if (need_identify (this) && flag [FLAG_IDENTIFIED])
1159	buf << "The object has a story:\n\n";
1160
1161	buf << msg << '\n';
1162	}
1163
1164	buf << '\n';
1165
1166	return std::string (buf.linearise (), buf.size ());
1167	}
1168
1169	static void	1106	static void
1170	display_new_pickup (object *op)	1107	display_new_pickup (object *op)
1171	{	1108	{
1172	int i = op->contr->mode;	1109	int i = op->contr->mode;
1173		1110
1174	if (!(i & PU_NEWMODE))
1175	return;
1176
1177	new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1178	new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);	1111	new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1179	new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);	1112	new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1180	new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);	1113	new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1181		1114
1182	new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);	1115	new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
…		…
1233	};	1166	};
1234		1167
1235	if (!params)	1168	if (!params)
1236	{	1169	{
1237	/* if the new mode is used, just print the settings */	1170	/* if the new mode is used, just print the settings */
1238	if (op->contr->mode & PU_NEWMODE)
1239	{
1240	display_new_pickup (op);	1171	display_new_pickup (op);
1241	return 1;
1242	}
1243	if (1)
1244	LOG (llevDebug, "command_pickup: !params\n");
1245	set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1246	return 0;	1172	return 0;
1247	}	1173	}
1248		1174
1249	while (params == ' ' && params)	1175	while (params == ' ' && params)
1250	params++;	1176	params++;
…		…
1256	for (mode = 0; names[mode]; mode++)	1182	for (mode = 0; names[mode]; mode++)
1257	{	1183	{
1258	if (!strcmp (names[mode], params + 1))	1184	if (!strcmp (names[mode], params + 1))
1259	{	1185	{
1260	i = op->contr->mode;	1186	i = op->contr->mode;
1261	if (!(i & PU_NEWMODE))	1187
1262	i = PU_NEWMODE;
1263	if (*params == '+')	1188	if (*params == '+')
1264	i = i \| modes[mode];	1189	i = i \| modes[mode];
1265	else	1190	else
1266	i = i & ~modes[mode];	1191	i = i & ~modes[mode];
		1192
1267	op->contr->mode = i;	1193	op->contr->mode = i;
1268	display_new_pickup (op);	1194	display_new_pickup (op);
1269	return 1;	1195	return 1;
1270	}	1196	}
1271	}	1197	}
…		…
1273	return 1;	1199	return 1;
1274	}	1200	}
1275		1201
1276	if (sscanf (params, "%u", &i) != 1)	1202	if (sscanf (params, "%u", &i) != 1)
1277	{	1203	{
1278	if (1)
1279	LOG (llevDebug, "command_pickup: params==NULL\n");
1280	new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> .");	1204	new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1281	return 1;	1205	return 1;
1282	}	1206	}
1283	set_pickup_mode (op, i);	1207
		1208	if (i <= PU_RATIO)
		1209	i \|= op->contr->mode & ~PU_RATIO;
		1210
		1211	op->contr->mode = i;
1284		1212
1285	return 1;	1213	return 1;
1286	}
1287
1288	void
1289	set_pickup_mode (object *op, int i)
1290	{
1291	switch (op->contr->mode = i)
1292	{
1293	case 0:
1294	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1295	break;
1296	case 1:
1297	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1298	break;
1299	case 2:
1300	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1301	break;
1302	case 3:
1303	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1304	break;
1305	case 4:
1306	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1307	break;
1308	case 5:
1309	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1310	break;
1311	case 6:
1312	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1313	break;
1314	case 7:
1315	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1316	break;
1317	}
1318	}	1214	}
1319		1215
1320	int	1216	int
1321	command_search_items (object op, char params)	1217	command_search_items (object op, char params)
1322	{	1218	{
1323	char buf[MAX_BUF];
1324
1325	if (settings.search_items == FALSE)
1326	return 1;
1327
1328	if (params == NULL)	1219	if (params == NULL)
1329	{	1220	{
1330	if (op->contr->search_str[0] == '\0')	1221	if (op->contr->search_str[0] == '\0')
1331	{	1222	{
1332	new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");	1223	new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1333	new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");	1224	new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1334	new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");	1225	new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1335	return 1;	1226	return 1;
1336	}	1227	}
1337		1228
1338	op->contr->search_str[0] = '\0';	1229	op->contr->search_str[0] = '\0';
1339	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");	1230	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1340	op->update_stats ();	1231	op->contr->queue_stats_update ();
1341	return 1;	1232	return 1;
1342	}	1233	}
1343		1234
1344	if ((int) strlen (params) >= MAX_BUF)	1235	if (strlen (params) >= sizeof (op->contr->search_str))
1345	{	1236	{
1346	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");	1237	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1347	return 1;	1238	return 1;
1348	}	1239	}
1349		1240
1350	strcpy (op->contr->search_str, params);	1241	strcpy (op->contr->search_str, params);
1351	sprintf (buf, "Searching for '%s'.", op->contr->search_str);	1242	new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
1352	new_draw_info (NDI_UNIQUE, 0, op, buf);	1243	op->contr->queue_stats_update ();
1353	op->update_stats ();	1244
1354	return 1;	1245	return 1;
1355	}	1246	}
1356		1247
		1248	int
		1249	command_unlock (object op, char params)
		1250	{
		1251	/* if the unlock command typed with nothing, unlock everything,
		1252	* this might be bad
		1253	*/
		1254	if (params == NULL)
		1255	{
		1256	for (object *item = op->inv; item; item = item->below)
		1257	{
		1258	CLEAR_FLAG(item, FLAG_INV_LOCKED);
		1259	//d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with null param.");
		1260	esrv_update_item (UPD_FLAGS, op, item);
		1261	}
		1262	return 0;
		1263	}
		1264
		1265	/* if the unlock command is used with a param,
		1266	* unlock what matches. i.e. unlock material, should unlock all the materials
		1267	*/
		1268	for (object *item = op->inv; item; item = item->below)
		1269	if (item->name.contains (params))
		1270	{
		1271	CLEAR_FLAG (item, FLAG_INV_LOCKED);
		1272	//d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with a param.");
		1273	esrv_update_item (UPD_FLAGS, op, item);
		1274	}
		1275
		1276	return 0;
		1277	}
		1278
		1279	int
		1280	command_lock (object op, char params)
		1281	{
		1282	/* if the lock command is typed by itself, lock everything
		1283	*/
		1284	if (params == NULL)
		1285	{
		1286	for (object *item = op->inv; item; item = item->below)
		1287	{
		1288	SET_FLAG (item, FLAG_INV_LOCKED);
		1289	//d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with null param.");
		1290	esrv_update_item (UPD_FLAGS, op, item);
		1291	}
		1292	return 0;
		1293	}
		1294
		1295	/* if the lock command is used with a param, lock what matches.
		1296	* i.e. lock material, should lock all the materials
		1297	*/
		1298	for (object *item = op->inv; item; item = item->below)
		1299	if (item->name.contains (params))
		1300	{
		1301	SET_FLAG (item, FLAG_INV_LOCKED);
		1302	//d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with param.");
		1303	esrv_update_item (UPD_FLAGS, op, item);
		1304	}
		1305
		1306	return 0;
		1307	}

Diff Legend

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

Comparing deliantra/server/server/c_object.C (file contents): Revision 1.76 by root, Sun Sep 7 21:31:23 2008 UTC vs. Revision 1.115 by root, Sun Apr 4 02:51:57 2010 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.76 by root, Sun Sep 7 21:31:23 2008 UTC vs.
Revision 1.115 by root, Sun Apr 4 02:51:57 2010 UTC