ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/apply.C

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.97 by root, Tue May 15 19:07:15 2007 UTC vs.
Revision 1.121 by root, Tue Jul 31 19:23:31 2007 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your 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 GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	#include <cmath>	24	#include <cmath>
26		25
…		…
69		68
70	/* If the director has race set, only affect objects with a arch,	69	/* If the director has race set, only affect objects with a arch,
71	* name or race that matches.	70	* name or race that matches.
72	*/	71	*/
73	if ((op->race) &&	72	if ((op->race) &&
74	((!(victim->arch && arch_flag && victim->arch->name) || op->race != victim->arch->name)) &&	73	((!(victim->arch && arch_flag && victim->arch->archname) || op->race != victim->arch->archname)) &&
75	((!(victim->name && name_flag) || op->race != victim->name)) &&	74	((!(victim->name && name_flag) || op->race != victim->name)) &&
76	((!(victim->race && race_flag) || op->race != victim->race)))	75	((!(victim->race && race_flag) || op->race != victim->race)))
77	return 1;	76	return 1;
78		77
79	/* If the director has slaying set, only affect objects where none	78	/* If the director has slaying set, only affect objects where none
80	* of arch, name, or race match.	79	* of arch, name, or race match.
81	*/	80	*/
82	if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && op->slaying == victim->arch->name))) ||	81	if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->archname && op->slaying == victim->arch->archname))) ||
83	((victim->name && name_flag && op->slaying == victim->name)) ||	82	((victim->name && name_flag && op->slaying == victim->name)) ||
84	((victim->race && race_flag && op->slaying == victim->race)))	83	((victim->race && race_flag && op->slaying == victim->race)))
85	return 1;	84	return 1;
86		85
87	return 0;	86	return 0;
…		…
158		157
159	/**	158	/**
160	* This checks whether the object has a "on_use_yield" field, and if so generated and drops	159	* This checks whether the object has a "on_use_yield" field, and if so generated and drops
161	* matching item.	160	* matching item.
162	**/	161	**/
163	static void	162	void
164	handle_apply_yield (object *tmp)	163	handle_apply_yield (object *tmp)
165	{	164	{
166	const char *yield;	165	const char *yield;
167		166
168	yield = get_ob_key_value (tmp, "on_use_yield");	167	yield = get_ob_key_value (tmp, "on_use_yield");
…		…
425	return 0;	424	return 0;
426		425
427	op = op->below;	426	op = op->below;
428	while (op != NULL)	427	while (op != NULL)
429	{	428	{
430	if (strcmp (op->arch->name, item) == 0)	429	if (strcmp (op->arch->archname, item) == 0)
431	{	430	{
432	if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)	431	if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
433	/* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID))	432	/* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID))
434	{	433	{
435	if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */	434	if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
…		…
459	prev = op;	458	prev = op;
460	op = op->below;	459	op = op->below;
461		460
462	while (op != NULL)	461	while (op != NULL)
463	{	462	{
464	if (strcmp (op->arch->name, item) == 0)	463	if (strcmp (op->arch->archname, item) == 0)
465	{	464	{
466	if (op->nrof >= nrof)	465	if (op->nrof >= nrof)
467	{	466	{
468	decrease_ob_nr (op, nrof);	467	decrease_ob_nr (op, nrof);
469	return;	468	return;
…		…
576	op->update_stats ();	575	op->update_stats ();
577	return 1;	576	return 1;
578	}	577	}
579		578
580	/* Types of improvements, hidden in the sp field. */	579	/* Types of improvements, hidden in the sp field. */
581	#define IMPROVE_PREPARE 1	580	#define IMPROVE_PREPARE 1
582	#define IMPROVE_DAMAGE 2	581	#define IMPROVE_DAMAGE 2
583	#define IMPROVE_WEIGHT 3	582	#define IMPROVE_WEIGHT 3
584	#define IMPROVE_ENCHANT 4	583	#define IMPROVE_ENCHANT 4
585	#define IMPROVE_STR 5	584	#define IMPROVE_STR 5
586	#define IMPROVE_DEX 6	585	#define IMPROVE_DEX 6
587	#define IMPROVE_CON 7	586	#define IMPROVE_CON 7
588	#define IMPROVE_WIS 8	587	#define IMPROVE_WIS 8
589	#define IMPROVE_CHA 9	588	#define IMPROVE_CHA 9
590	#define IMPROVE_INT 10	589	#define IMPROVE_INT 10
591	#define IMPROVE_POW 11	590	#define IMPROVE_POW 11
592
593		591
594	/**	592	/**
595	* This does the prepare weapon scroll.	593	* This does the prepare weapon scroll.
596	* Checks for sacrifice, and so on.	594	* Checks for sacrifice, and so on.
597	*/	595	*/
598
599	int	596	int
600	prepare_weapon (object *op, object *improver, object *weapon)	597	prepare_weapon (object *op, object *improver, object *weapon)
601	{	598	{
602	int sacrifice_count, i;	599	int sacrifice_count, i;
603	char buf[MAX_BUF];	600	char buf[MAX_BUF];
…		…
605	if (weapon->level != 0)	602	if (weapon->level != 0)
606	{	603	{
607	new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared.");	604	new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared.");
608	return 0;	605	return 0;
609	}	606	}
		607
610	for (i = 0; i < NROFATTACKS; i++)	608	for (i = 0; i < NROFATTACKS; i++)
611	if (weapon->resist[i])	609	if (weapon->resist[i])
612	break;	610	break;
613		611
614	/* If we break out, i will be less than nrofattacks, preventing	612	/* If we break out, i will be less than nrofattacks, preventing
…		…
620	weapon->stats.ac) /* AC - only taifu's I think */	618	weapon->stats.ac) /* AC - only taifu's I think */
621	{	619	{
622	new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons.");	620	new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons.");
623	return 0;	621	return 0;
624	}	622	}
		623
625	sacrifice_count = check_sacrifice (op, improver);	624	sacrifice_count = check_sacrifice (op, improver);
626	if (sacrifice_count <= 0)	625	if (sacrifice_count <= 0)
627	return 0;	626	return 0;
		627
628	weapon->level = isqrt (sacrifice_count);	628	weapon->level = isqrt (sacrifice_count);
629	new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");	629	new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
630	eat_item (op, improver->slaying, sacrifice_count);	630	eat_item (op, improver->slaying, sacrifice_count);
631		631
632	new_draw_info_format (NDI_UNIQUE, 0, op, "Your *%s may be improved %d times.", &weapon->name, weapon->level);	632	new_draw_info_format (NDI_UNIQUE, 0, op, "Your *%s may be improved %d times.", &weapon->name, weapon->level);
…		…
855	{	855	{
856	base = base - (base * settings.armor_speed_improvement) / 100;	856	base = base - (base * settings.armor_speed_improvement) / 100;
857	pow++;	857	pow++;
858	}	858	}
859		859
860	ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * base) / 100;	860	ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * base) / 100;
861	}	861	}
862	else	862	else
863	ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * (100 + armour->magic * settings.armor_speed_improvement)) / 100;	863	ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * (100 + armour->magic * settings.armor_speed_improvement)) / 100;
864		864
865	if (!settings.armor_weight_linear)	865	if (!settings.armor_weight_linear)
866	{	866	{
867	int base = 100;	867	int base = 100;
868	int pow = 0;	868	int pow = 0;
…		…
871	{	871	{
872	base = base - (base * settings.armor_weight_reduction) / 100;	872	base = base - (base * settings.armor_weight_reduction) / 100;
873	pow++;	873	pow++;
874	}	874	}
875		875
876	armour->weight = (armour->arch->clone.weight * base) / 100;	876	armour->weight = (armour->arch->weight * base) / 100;
877	}	877	}
878	else	878	else
879	armour->weight = (armour->arch->clone.weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100;	879	armour->weight = (armour->arch->weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100;
880		880
881	if (armour->weight <= 0)	881	if (armour->weight <= 0)
882	{	882	{
883	LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");	883	LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");
884	armour->weight = 1;	884	armour->weight = 1;
885	}	885	}
886		886
887	armour->item_power = get_power_from_ench (armour->arch->clone.item_power + armour->magic);	887	armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
888		888
889	if (op->type == PLAYER)	889	if (op->type == PLAYER)
890	{	890	{
891	esrv_send_item (op, armour);	891	esrv_send_item (op, armour);
892	if (QUERY_FLAG (armour, FLAG_APPLIED))	892	if (QUERY_FLAG (armour, FLAG_APPLIED))
…		…
898	insert_ob_in_ob (tmp, op);	898	insert_ob_in_ob (tmp, op);
899	esrv_send_item (op, tmp);	899	esrv_send_item (op, tmp);
900	}	900	}
901	return 1;	901	return 1;
902	}	902	}
903
904		903
905	/*	904	/*
906	* convert_item() returns 1 if anything was converted, 0 if the item was not	905	* convert_item() returns 1 if anything was converted, 0 if the item was not
907	* what the converter wants, -1 if the converter is broken.	906	* what the converter wants, -1 if the converter is broken.
908	*/	907	*/
…		…
924		923
925	/* We make some assumptions - we assume if it takes money as it type,	924	/* We make some assumptions - we assume if it takes money as it type,
926	* it wants some amount. We don't make change (ie, if something costs	925	* it wants some amount. We don't make change (ie, if something costs
927	* 3 gp and player drops a platinum, tough luck)	926	* 3 gp and player drops a platinum, tough luck)
928	*/	927	*/
929	if (!strcmp (CONV_FROM (converter), "money"))	928	if (CONV_FROM (converter) == shstr_money)
930	{	929	{
931	int cost;
932
933	if (item->type != MONEY)	930	if (item->type != MONEY)
934	return 0;	931	return 0;
935		932
936	nr = (item->nrof * item->value) / CONV_NEED (converter);	933	nr = (item->nrof * item->value) / CONV_NEED (converter);
937	if (!nr)	934	if (!nr)
938	return 0;	935	return 0;
		936
		937	converter->play_sound (sound_find ("shop_buy"));
		938
939	cost = nr * CONV_NEED (converter) / item->value;	939	int cost = nr * CONV_NEED (converter) / item->value;
940	/* take into account rounding errors */	940	/* take into account rounding errors */
941	if (nr * CONV_NEED (converter) % item->value)	941	if (nr * CONV_NEED (converter) % item->value)
942	cost++;	942	cost++;
		943
943	decrease_ob_nr (item, cost);	944	decrease_ob_nr (item, cost);
944		945
945	price_in = cost * item->value;	946	price_in = cost * item->value;
946	}	947	}
947	else	948	else
948	{	949	{
949	if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name ||	950	if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname ||
950	(CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof))	951	(CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof))
951	return 0;	952	return 0;
		953
		954	converter->play_sound (sound_find ("convert_item"));
952		955
953	if (CONV_NEED (converter))	956	if (CONV_NEED (converter))
954	{	957	{
955	nr = item->nrof / CONV_NEED (converter);	958	nr = item->nrof / CONV_NEED (converter);
956	decrease_ob_nr (item, nr * CONV_NEED (converter));	959	decrease_ob_nr (item, nr * CONV_NEED (converter));
…		…
961	price_in = item->value;	964	price_in = item->value;
962	item->destroy ();	965	item->destroy ();
963	}	966	}
964	}	967	}
965		968
966	if (converter->inv != NULL)	969	if (converter->inv)
967	{	970	{
968	object *ob;	971	object *ob;
969	int i;	972	int i;
970	object *ob_to_copy;	973	object *ob_to_copy;
971		974
972	/* select random object from inventory to copy */	975	/* select random object from inventory to copy */
973	ob_to_copy = converter->inv;	976	ob_to_copy = converter->inv;
974	for (ob = converter->inv->below, i = 1; ob != NULL; ob = ob->below, i++)	977	for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
975	{
976	if (rndm (0, i) == 0)	978	if (rndm (0, i) == 0)
977	{
978	ob_to_copy = ob;	979	ob_to_copy = ob;
979	}	980
980	}
981	item = object_create_clone (ob_to_copy);	981	item = object_create_clone (ob_to_copy);
982	CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);	982	CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
983	unflag_inv (item, FLAG_IS_A_TEMPLATE);	983	unflag_inv (item, FLAG_IS_A_TEMPLATE);
984	}	984	}
985	else	985	else
…		…
995	fix_generated_item (item, converter, 0, 0, GT_MINIMAL);	995	fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
996	}	996	}
997		997
998	if (CONV_NR (converter))	998	if (CONV_NR (converter))
999	item->nrof = CONV_NR (converter);	999	item->nrof = CONV_NR (converter);
		1000
1000	if (nr)	1001	if (nr)
1001	item->nrof *= nr;	1002	item->nrof *= nr;
		1003
1002	if (is_in_shop (converter))	1004	if (is_in_shop (converter))
1003	SET_FLAG (item, FLAG_UNPAID);	1005	SET_FLAG (item, FLAG_UNPAID);
1004	else if (price_in < item->nrof * item->value)	1006	else if (price_in < item->nrof * item->value)
1005	{	1007	{
1006	LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",	1008	LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1007	&converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);	1009	&converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1008
1009	/**	1010	/**
1010	* elmex: we are going to let the game continue, as the mapcreator	1011	* elmex: we are going to let the game continue, as the mapcreator
1011	* propably had something in mind when doing this	1012	* hopefully had something in mind when doing this.
1012	*/	1013	*/
1013	}	1014	}
		1015
		1016	SET_FLAG (item, FLAG_IDENTIFIED);
1014	insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);	1017	insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1015	return 1;	1018	return 1;
1016	}	1019	}
1017		1020
1018	/**	1021	/**
…		…
1139	double opinion;	1142	double opinion;
1140	object *tmp, *next;	1143	object *tmp, *next;
1141		1144
1142	SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */	1145	SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1143		1146
		1147	bool has_unpaid = false;
		1148
		1149	// quite inefficient to do this here twice, but the api doesn'T lend itself to
		1150	// a quick and small change :(
		1151	for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
		1152	if (item->flag [FLAG_UNPAID])
		1153	{
		1154	has_unpaid = true;
		1155	break;
		1156	}
		1157
1144	if (op->type != PLAYER)	1158	if (op->type != PLAYER)
1145	{	1159	{
1146	/* Remove all the unpaid objects that may be carried here.	1160	/* Remove all the unpaid objects that may be carried here.
1147	* This could be pets or monsters that are somehow in	1161	* This could be pets or monsters that are somehow in
1148	* the shop.	1162	* the shop.
…		…
1174	/* unpaid objects, or non living objects, can't transfer by	1188	/* unpaid objects, or non living objects, can't transfer by
1175	* shop mats. Instead, put it on a nearby space.	1189	* shop mats. Instead, put it on a nearby space.
1176	*/	1190	*/
1177	if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE))	1191	if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE))
1178	{	1192	{
1179
1180	/* Somebody dropped an unpaid item, just move to an adjacent place. */	1193	/* Somebody dropped an unpaid item, just move to an adjacent place. */
1181	int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);	1194	int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1182		1195
1183	if (i != -1)	1196	if (i != -1)
1184	rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);	1197	rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
…		…
1192	}	1205	}
1193	else if (can_pay (op) && get_payment (op))	1206	else if (can_pay (op) && get_payment (op))
1194	{	1207	{
1195	/* this is only used for players */	1208	/* this is only used for players */
1196	rv = teleport (shop_mat, SHOP_MAT, op);	1209	rv = teleport (shop_mat, SHOP_MAT, op);
		1210
		1211	if (has_unpaid)
		1212	op->contr->play_sound (sound_find ("shop_buy"));
		1213	else if (is_in_shop (op))
		1214	op->contr->play_sound (sound_find ("shop_enter"));
		1215	else
		1216	op->contr->play_sound (sound_find ("shop_leave"));
1197		1217
1198	if (shop_mat->msg)	1218	if (shop_mat->msg)
1199	new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg);	1219	new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg);
1200	/* This check below is a bit simplistic - generally it should be correct,	1220	/* This check below is a bit simplistic - generally it should be correct,
1201	* but there is never a guarantee that the bottom space on the map is	1221	* but there is never a guarantee that the bottom space on the map is
…		…
1216	}	1236	}
1217	}	1237	}
1218	else	1238	else
1219	{	1239	{
1220	/* if we get here, a player tried to leave a shop but was not able	1240	/* if we get here, a player tried to leave a shop but was not able
1221	* to afford the items he has. We try to move the player so that	1241	* to afford the items he has. We try to move the player so that
1222	* they are not on the mat anymore	1242	* they are not on the mat anymore
1223	*/	1243	*/
1224	int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);	1244	int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1225		1245
1226	if (i == -1)	1246	if (i == -1)
1227	{
1228	LOG (llevError, "Internal shop-mat problem.\n");	1247	LOG (llevError, "Internal shop-mat problem.\n");
1229	}
1230	else	1248	else
1231	{	1249	{
1232	op->remove ();	1250	op->remove ();
1233	op->x += freearr_x[i];	1251	op->x += freearr_x[i];
1234	op->y += freearr_y[i];	1252	op->y += freearr_y[i];
…		…
1245	*/	1263	*/
1246	static void	1264	static void
1247	apply_sign (object *op, object *sign, int autoapply)	1265	apply_sign (object *op, object *sign, int autoapply)
1248	{	1266	{
1249	readable_message_type *msgType;	1267	readable_message_type *msgType;
1250	char newbuf[HUGE_BUF];
1251		1268
1252	if (sign->msg == NULL)	1269	if (sign->msg == NULL)
1253	{	1270	{
1254	new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it.");	1271	new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it.");
1255	return;	1272	return;
…		…
1259	{	1276	{
1260	if (sign->last_eat >= sign->stats.food)	1277	if (sign->last_eat >= sign->stats.food)
1261	{	1278	{
1262	if (!sign->move_on)	1279	if (!sign->move_on)
1263	new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore.");	1280	new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore.");
		1281
1264	return;	1282	return;
1265	}	1283	}
1266		1284
1267	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1285	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1268	sign->last_eat++;	1286	sign->last_eat++;
…		…
1276	if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)	1294	if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1277	{	1295	{
1278	new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");	1296	new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1279	return;	1297	return;
1280	}	1298	}
		1299
		1300	if (op->contr)
		1301	if (client *ns = op->contr->ns)
		1302	{
		1303	ns->play_sound (sign->sound);
1281	msgType = get_readable_message_type (sign);	1304	msgType = get_readable_message_type (sign);
		1305
		1306	if (ns->can_msg)
		1307	ns->send_msg (NDI_NAVY, msgType->msgtype, &sign->msg);
		1308	else
		1309	{
		1310	char newbuf[HUGE_BUF];
1282	snprintf (newbuf, sizeof (newbuf), "%hhu %s", autoapply ? 1 : 0, &sign->msg);	1311	snprintf (newbuf, sizeof (newbuf), "%u %s", autoapply ? 1 : 0, &sign->msg);
1283	draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg);	1312	draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg);
		1313	}
		1314	}
1284	}	1315	}
1285		1316
1286	/**	1317	/**
1287	* 'victim' moves onto 'trap'	1318	* 'victim' moves onto 'trap'
1288	* 'victim' leaves 'trap'	1319	* 'victim' leaves 'trap'
…		…
1311	* proper. This code was causing needless crashes.	1342	* proper. This code was causing needless crashes.
1312	*/	1343	*/
1313	if (recursion_depth >= 500)	1344	if (recursion_depth >= 500)
1314	{	1345	{
1315	LOG (llevDebug, "WARNING: move_apply(): aborting recursion "	1346	LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1316	"[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->name, &trap->name, &victim->arch->name, &victim->name);	1347	"[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
1317	return;	1348	return;
1318	}	1349	}
		1350
1319	recursion_depth++;	1351	recursion_depth++;
1320	if (trap->head)	1352	if (trap->head)
1321	trap = trap->head;	1353	trap = trap->head;
1322		1354
1323	if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))	1355	if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
…		…
1421		1453
1422	if ((ab->move_type && trap->move_on) || ab->move_type == 0)	1454	if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1423	{	1455	{
1424	if (!sound_was_played)	1456	if (!sound_was_played)
1425	{	1457	{
1426	play_sound_map (trap->map, trap->x, trap->y, SOUND_FALL_HOLE);	1458	trap->play_sound (sound_find ("fall_hole"));
1427	sound_was_played = 1;	1459	sound_was_played = 1;
1428	}	1460	}
		1461
1429	new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!");	1462	new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!");
1430	transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab);	1463	transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab);
1431	}	1464	}
1432	}	1465	}
1433	goto leave;	1466	goto leave;
1434	}	1467	}
1435		1468
1436
1437	case CONVERTER:	1469	case CONVERTER:
1438	if (convert_item (victim, trap) < 0)	1470	if (convert_item (victim, trap) < 0)
1439	{	1471	{
1440	new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));	1472	new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1441	get_archetype ("burnout")->insert_at (trap, trap);	1473	get_archetype ("burnout")->insert_at (trap, trap);
…		…
1466	* Processing will happen if the head runs into the pit	1498	* Processing will happen if the head runs into the pit
1467	*/	1499	*/
1468	if (victim->head)	1500	if (victim->head)
1469	goto leave;	1501	goto leave;
1470		1502
1471	play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE);	1503	victim->play_sound (sound_find ("fall_hole"));
1472	new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n");	1504	new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n");
1473	transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);	1505	transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1474	goto leave;	1506	goto leave;
1475		1507
1476	case EXIT:	1508	case EXIT:
…		…
1518	}	1550	}
1519	goto leave;	1551	goto leave;
1520		1552
1521	default:	1553	default:
1522	LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "	1554	LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1523	"handled in move_apply()\n", &trap->name, &trap->arch->name, trap->type);	1555	"handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1524	goto leave;	1556	goto leave;
1525	}	1557	}
1526		1558
1527	leave:	1559	leave:
1528	recursion_depth--;	1560	recursion_depth--;
…		…
1540	if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))	1572	if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1541	{	1573	{
1542	new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");	1574	new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1543	return;	1575	return;
1544	}	1576	}
		1577
1545	if (tmp->msg == NULL)	1578	if (!tmp->msg)
1546	{	1579	{
1547	new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name);	1580	new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name);
1548	return;	1581	return;
1549	}	1582	}
1550		1583
1551	/* need a literacy skill to read stuff! */	1584	/* need a literacy skill to read stuff! */
1552	skill_ob = find_skill_by_name (op, tmp->skill);	1585	skill_ob = find_skill_by_name (op, tmp->skill);
1553	if (!skill_ob)	1586	if (!skill_ob)
1554	{	1587	{
1555	new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols.");	1588	new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the skill to read this>");
1556	return;	1589	return;
1557	}	1590	}
		1591
1558	lev_diff = tmp->level - (skill_ob->level + 5);	1592	lev_diff = tmp->level - (skill_ob->level + 5);
1559	if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)	1593	if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1560	{	1594	{
1561	if (lev_diff < 2)	1595	if (lev_diff < 2)
1562	new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension.");	1596	new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension.");
…		…
1573	return;	1607	return;
1574	}	1608	}
1575		1609
1576	readable_message_type *msgType = get_readable_message_type (tmp);	1610	readable_message_type *msgType = get_readable_message_type (tmp);
1577		1611
		1612	if (player *pl = op->contr)
		1613	if (client *ns = pl->ns)
		1614	if (ns->can_msg)
		1615	{
		1616	dynbuf_text buf;
		1617	buf << long_desc (tmp, op)
		1618	<< "\n\n"
		1619	<< tmp->msg
		1620	<< '\0';
		1621	ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
		1622	}
		1623	else
1578	draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,	1624	draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1579	msgType->message_type, msgType->message_subtype,	1625	msgType->message_type, msgType->message_subtype,
1580	"You open the %s and start reading.\n%s", (char *)"%s\n%s",	1626	"You open the %s and start reading.\n%s", (char *)"%s\n%s",
1581	long_desc (tmp, op), &tmp->msg);	1627	long_desc (tmp, op), &tmp->msg);
1582		1628
1583	/* gain xp from reading */	1629	/* gain xp from reading */
1584	if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))	1630	if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1585	{ /* only if not read before */	1631	{ /* only if not read before */
1586	int exp_gain = calc_skill_exp (op, tmp, skill_ob);	1632	int exp_gain = calc_skill_exp (op, tmp, skill_ob);
…		…
1652	return;	1698	return;
1653	}	1699	}
1654	return;	1700	return;
1655	}	1701	}
1656		1702
1657	play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0);	1703	op->contr->play_sound (sound_find ("learn_spell"));
		1704
1658	tmp = spell->clone ();	1705	tmp = spell->clone ();
1659	insert_ob_in_ob (tmp, op);	1706	insert_ob_in_ob (tmp, op);
1660		1707
1661	if (special_prayer)	1708	if (special_prayer)
1662	SET_FLAG (tmp, FLAG_STARTEQUIP);	1709	SET_FLAG (tmp, FLAG_STARTEQUIP);
…		…
1707		1754
1708	/* artifact_spellbooks have 'slaying' field point to a spell name,	1755	/* artifact_spellbooks have 'slaying' field point to a spell name,
1709	* instead of having their spell stored in stats.sp. These are	1756	* instead of having their spell stored in stats.sp. These are
1710	* legacy spellbooks	1757	* legacy spellbooks
1711	*/	1758	*/
1712
1713	if (tmp->slaying != NULL)	1759	if (tmp->slaying)
1714	{	1760	{
1715	spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));	1761	spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1716	if (!spell)	1762	if (!spell)
1717	{	1763	{
1718	new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying);	1764	new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying);
1719	return;	1765	return;
1720	}	1766	}
1721	else	1767	else
1722	insert_ob_in_ob (spell, tmp);	1768	insert_ob_in_ob (spell, tmp);
		1769
1723	tmp->slaying = NULL;	1770	tmp->slaying = 0;
1724	}	1771	}
1725		1772
1726	skop = find_skill_by_name (op, tmp->skill);	1773	skop = find_skill_by_name (op, tmp->skill);
1727		1774
1728	/* need a literacy skill to learn spells. Also, having a literacy level	1775	/* need a literacy skill to learn spells. Also, having a literacy level
1729	* lower than the spell will make learning the spell more difficult */	1776	* lower than the spell will make learning the spell more difficult */
1730	if (!skop)	1777	if (!skop)
1731	{	1778	{
1732	new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails.");	1779	new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails. H<You lack the literacy skill.>");
1733	return;	1780	return;
1734	}	1781	}
1735		1782
1736	spell = tmp->inv;	1783	spell = tmp->inv;
1737		1784
1738	if (!spell)	1785	if (!spell)
1739	{	1786	{
1740	LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);	1787	LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1741	new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense.");	1788	new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense. This is a bug, please report!");
1742	return;	1789	return;
1743	}	1790	}
1744		1791
1745	if (skop->level < int (sqrtf (spell->level) * 1.5f))	1792	if (skop->level < int (sqrtf (spell->level) * 1.5f))
1746	{	1793	{
1747	new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]");	1794	new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<Your literacy level is too low.>");
1748	return;	1795	return;
1749	}	1796	}
1750		1797
1751	new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);	1798	new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1752		1799
…		…
1765	* if the player doesn't know the spell, doesn't make a lot of sense that	1812	* if the player doesn't know the spell, doesn't make a lot of sense that
1766	* they would have a special prayer mark.	1813	* they would have a special prayer mark.
1767	*/	1814	*/
1768	if (check_spell_known (op, spell->name))	1815	if (check_spell_known (op, spell->name))
1769	{	1816	{
1770	new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n");	1817	new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell. H<It makes no sense to learn spells twice, and would only waste the spellbook.>\n");
1771	return;	1818	return;
1772	}	1819	}
1773		1820
1774	if (spell->skill)	1821	if (spell->skill)
1775	{	1822	{
…		…
1816	if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))	1863	if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))
1817	change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);	1864	change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
1818	}	1865	}
1819	else	1866	else
1820	{	1867	{
1821	play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);	1868	op->contr->play_sound (sound_find ("fumble_spell"));
1822	new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n");	1869	new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
1823	}	1870	}
1824		1871
1825	decrease_ob (tmp);	1872	decrease_ob (tmp);
1826	}	1873	}
1827		1874
…		…
1839	return;	1886	return;
1840	}	1887	}
1841		1888
1842	if (!tmp->inv || tmp->inv->type != SPELL)	1889	if (!tmp->inv || tmp->inv->type != SPELL)
1843	{	1890	{
1844	new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!");	1891	new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense! H<...and never will make sense.>");
1845	return;	1892	return;
1846	}	1893	}
1847		1894
1848	if (op->type == PLAYER)	1895	if (op->type == PLAYER)
1849	{	1896	{
…		…
1855	*/	1902	*/
1856	skop = find_skill_by_name (op, skill_names[SK_LITERACY]);	1903	skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
1857		1904
1858	if (!skop)	1905	if (!skop)
1859	{	1906	{
1860	new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols.");	1907	new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the literacy skill.>");
1861	return;	1908	return;
1862	}	1909	}
1863		1910
1864	if ((exp_gain = calc_skill_exp (op, tmp, skop)))	1911	if ((exp_gain = calc_skill_exp (op, tmp, skop)))
1865	change_exp (op, exp_gain, skop->skill, 0);	1912	change_exp (op, exp_gain, skop->skill, 0);
…		…
1867		1914
1868	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))	1915	if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1869	identify (tmp);	1916	identify (tmp);
1870		1917
1871	new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name);	1918	new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name);
1872
1873		1919
1874	cast_spell (op, tmp, dir, tmp->inv, NULL);	1920	cast_spell (op, tmp, dir, tmp->inv, NULL);
1875	decrease_ob (tmp);	1921	decrease_ob (tmp);
1876	}	1922	}
1877		1923
…		…
1881	* chest.	1927	* chest.
1882	*/	1928	*/
1883	static void	1929	static void
1884	apply_treasure (object *op, object *tmp)	1930	apply_treasure (object *op, object *tmp)
1885	{	1931	{
1886	object *treas;
1887
1888
1889	/* Nice side effect of new treasure creation method is that the treasure	1932	/* Nice side effect of new treasure creation method is that the treasure
1890	* for the chest is done when the chest is created, and put into the chest	1933	* for the chest is done when the chest is created, and put into the chest
1891	* inventory. So that when the chest burns up, the items still exist. Also	1934	* inventory. So that when the chest burns up, the items still exist. Also
1892	* prevents people fromt moving chests to more difficult maps to get better	1935	* prevents people fromt moving chests to more difficult maps to get better
1893	* treasure	1936	* treasure
1894	*/	1937	*/
1895
1896	treas = tmp->inv;	1938	object *treas = tmp->inv;
1897	if (treas == NULL)	1939
		1940	if (!treas)
1898	{	1941	{
1899	new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty.");	1942	new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty.");
1900	decrease_ob (tmp);	1943	decrease_ob (tmp);
1901	return;	1944	return;
1902	}	1945	}
		1946
1903	while (tmp->inv)	1947	while (tmp->inv)
1904	{	1948	{
1905	treas = tmp->inv;	1949	treas = tmp->inv;
1906		1950
1907	treas->remove ();	1951	treas->remove ();
…		…
1989	/* special food hack -b.t. */	2033	/* special food hack -b.t. */
1990	if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))	2034	if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
1991	eat_special_food (op, tmp);	2035	eat_special_food (op, tmp);
1992	}	2036	}
1993	}	2037	}
		2038
1994	handle_apply_yield (tmp);	2039	handle_apply_yield (tmp);
1995	decrease_ob (tmp);	2040	decrease_ob (tmp);
1996	}	2041	}
1997		2042
1998	/**	2043	/**
…		…
2025	if (meal->type != FLESH || !is_dragon_pl (op))	2070	if (meal->type != FLESH || !is_dragon_pl (op))
2026	return 0;	2071	return 0;
2027		2072
2028	/* now grab the 'dragon_skin'- and 'dragon_ability'-forces	2073	/* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2029	from the player's inventory */	2074	from the player's inventory */
2030	shstr_cmp dragon_ability_force ("dragon_ability_force");
2031	shstr_cmp dragon_skin_force ("dragon_skin_force");
2032
2033	for (tmp = op->inv; tmp; tmp = tmp->below)	2075	for (tmp = op->inv; tmp; tmp = tmp->below)
2034	if (tmp->type == FORCE)	2076	if (tmp->type == FORCE)
2035	if (tmp->arch->name == dragon_skin_force)	2077	if (tmp->arch->archname == shstr_dragon_skin_force)
2036	skin = tmp;	2078	skin = tmp;
2037	else if (tmp->arch->name == dragon_ability_force)	2079	else if (tmp->arch->archname == shstr_dragon_ability_force)
2038	abil = tmp;	2080	abil = tmp;
2039		2081
2040	/* if either skin or ability are missing, this is an old player	2082	/* if either skin or ability are missing, this is an old player
2041	which is not to be considered a dragon -> bail out */	2083	which is not to be considered a dragon -> bail out */
2042	if (skin == NULL || abil == NULL)	2084	if (skin == NULL || abil == NULL)
…		…
2163	static void	2205	static void
2164	apply_armour_improver (object *op, object *tmp)	2206	apply_armour_improver (object *op, object *tmp)
2165	{	2207	{
2166	object *armor;	2208	object *armor;
2167		2209
2168	if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))	2210	if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2169	{	2211	{
2170	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");	2212	new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll. H<The area prevents magic effects.>");
2171	return;	2213	return;
2172	}	2214	}
2173		2215
2174	armor = find_marked_object (op);	2216	armor = find_marked_object (op);
2175		2217
2176	if (!armor)	2218	if (!armor)
2177	{	2219	{
2178	new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object.");	2220	new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
2179	return;	2221	return;
2180	}	2222	}
2181		2223
2182	if (armor->type != ARMOUR	2224	if (armor->type != ARMOUR
2183	&& armor->type != CLOAK	2225	&& armor->type != CLOAK
…		…
2194	extern void	2236	extern void
2195	apply_poison (object *op, object *tmp)	2237	apply_poison (object *op, object *tmp)
2196	{	2238	{
2197	if (op->type == PLAYER)	2239	if (op->type == PLAYER)
2198	{	2240	{
2199	play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0);	2241	op->contr->play_sound (sound_find ("drink_poison"));
2200	new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!");	2242	new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!");
2201	strcpy (op->contr->killer, "poisonous booze");	2243	strcpy (op->contr->killer, "poisonous booze");
2202	}	2244	}
		2245
2203	if (tmp->stats.hp > 0)	2246	if (tmp->stats.hp > 0)
2204	{	2247	{
2205	LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp);	2248	LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp);
2206	hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1);	2249	hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1);
2207	}	2250	}
		2251
2208	op->stats.food -= op->stats.food / 4;	2252	op->stats.food -= op->stats.food / 4;
2209	handle_apply_yield (tmp);	2253	handle_apply_yield (tmp);
2210	decrease_ob (tmp);	2254	decrease_ob (tmp);
2211	}	2255	}
2212		2256
…		…
2322		2366
2323	if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))	2367	if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2324	{	2368	{
2325	if (op->type == PLAYER)	2369	if (op->type == PLAYER)
2326	{	2370	{
2327	new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first.");	2371	new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first. H<You cannot use items marked as unpaid.>");
2328	return 1;	2372	return 1;
2329	}	2373	}
2330	else	2374	else
2331	return 0; /* monsters just skip unpaid items */	2375	return 0; /* monsters just skip unpaid items */
2332	}	2376	}
…		…
2336		2380
2337	switch (tmp->type)	2381	switch (tmp->type)
2338	{	2382	{
2339	case CF_HANDLE:	2383	case CF_HANDLE:
2340	new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");	2384	new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2341	play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE);	2385	op->play_sound (sound_find ("turn_handle"));
2342	tmp->value = tmp->value ? 0 : 1;	2386	tmp->value = tmp->value ? 0 : 1;
2343	SET_ANIMATION (tmp, tmp->value);	2387	SET_ANIMATION (tmp, tmp->value);
2344	update_object (tmp, UP_OBJ_FACE);	2388	update_object (tmp, UP_OBJ_FACE);
2345	push_button (tmp);	2389	push_button (tmp);
2346	return 1;	2390	return 1;
2347		2391
2348	case TRIGGER:	2392	case TRIGGER:
2349	if (check_trigger (tmp, op))	2393	if (check_trigger (tmp, op))
2350	{	2394	{
2351	new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");	2395	new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2352	play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE);	2396	op->play_sound (sound_find ("turn_handle"));
2353	}	2397	}
2354	else	2398	else
2355	new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");	2399	new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2356		2400
2357	return 1;	2401	return 1;
…		…
2490		2534
2491	get_tod (&tod);	2535	get_tod (&tod);
2492	sprintf (buf, "It is %d minute%s past %d o'clock %s",	2536	sprintf (buf, "It is %d minute%s past %d o'clock %s",
2493	tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),	2537	tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2494	((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am"));	2538	((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am"));
2495	play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0);	2539	op->play_sound (sound_find ("sound_clock"));
2496	new_draw_info (NDI_UNIQUE, 0, op, buf);	2540	new_draw_info (NDI_UNIQUE, 0, op, buf);
2497	return 1;	2541	return 1;
2498	}	2542	}
2499	else	2543	else
2500	return 0;	2544	return 0;
…		…
2540	int	2584	int
2541	player_apply (object *pl, object *op, int aflag, int quiet)	2585	player_apply (object *pl, object *op, int aflag, int quiet)
2542	{	2586	{
2543	int tmp;	2587	int tmp;
2544		2588
2545	if (op->env == NULL && (pl->move_type & MOVE_FLYING))	2589	if (op->env && (pl->move_type & MOVE_FLYING))
2546	{	2590	{
2547	/* player is flying and applying object not in inventory */	2591	/* player is flying and applying object not in inventory */
2548	if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))	2592	if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2549	{	2593	{
2550	new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!");	2594	new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high above the ground! H<You have to stop levitating first, if you can.>");
2551	return 0;	2595	return 0;
2552	}	2596	}
2553	}
2554
2555	/* Check for PLAYER to avoid a DM to disappear in a puff of smoke if
2556	* applied.
2557	*/
2558	if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
2559	{
2560	play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE);
2561	new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff " "of smoke!");
2562	new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
2563	op->destroy ();
2564	return 1;
2565	}	2597	}
2566		2598
2567	pl->contr->last_used = op;	2599	pl->contr->last_used = op;
2568		2600
2569	tmp = manual_apply (pl, op, aflag);	2601	tmp = manual_apply (pl, op, aflag);
…		…
2572	if (tmp == 0)	2604	if (tmp == 0)
2573	new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op));	2605	new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op));
2574	else if (tmp == 2)	2606	else if (tmp == 2)
2575	new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n");	2607	new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n");
2576	}	2608	}
		2609
2577	return tmp;	2610	return tmp;
2578	}	2611	}
2579		2612
2580	/**	2613	/**
2581	* player_apply_below attempts to apply the object 'below' the player.	2614	* player_apply_below attempts to apply the object 'below' the player.
…		…
2630	{	2663	{
2631	if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))	2664	if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2632	|| INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))	2665	|| INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2633	return RESULT_INT (0);	2666	return RESULT_INT (0);
2634		2667
2635	object *tmp2;
2636
2637	CLEAR_FLAG (op, FLAG_APPLIED);	2668	CLEAR_FLAG (op, FLAG_APPLIED);
2638
2639	if (player *pl = who->contr)
2640	{
2641	if (op == pl->ranged_ob) pl->ranged_ob = 0;
2642	if (op == pl->combat_ob) pl->combat_ob = 0;
2643	}
2644		2669
2645	switch (op->type)	2670	switch (op->type)
2646	{	2671	{
2647	case SKILL_TOOL:	2672	case SKILL_TOOL:
2648	// unapplying a skill tool should also unapply the skill it governs	2673	// unapplying a skill tool should also unapply the skill it governs
…		…
2657		2682
2658	change_abil (who, op);	2683	change_abil (who, op);
2659	break;	2684	break;
2660		2685
2661	case WEAPON:	2686	case WEAPON:
		2687	if (player *pl = who->contr)
		2688	if (op == pl->combat_ob)
		2689	{
		2690	pl->combat_ob = 0;
		2691	who->change_weapon (pl->ranged_ob);
		2692	}
		2693
2662	new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));	2694	new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2663		2695
2664	change_abil (who, op);	2696	change_abil (who, op);
2665	CLEAR_FLAG (who, FLAG_READY_WEAPON);	2697	CLEAR_FLAG (who, FLAG_READY_WEAPON);
2666	clear_skill (who);
2667	break;	2698	break;
2668		2699
2669	case SKILL:	2700	case SKILL:
2670	if (op != who->chosen_skill)
2671	LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2672
2673	if (who->contr)	2701	if (who->contr)
2674	{	2702	{
2675	if (!op->invisible)	2703	if (!op->invisible)
2676	new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));	2704	new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2677	else	2705	else
2678	new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);	2706	new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2679	}	2707	}
2680		2708
2681	change_abil (who, op);	2709	change_abil (who, op);
2682	who->chosen_skill = 0;
2683	CLEAR_FLAG (who, FLAG_READY_SKILL);	2710	CLEAR_FLAG (who, FLAG_READY_SKILL);
2684	break;	2711	break;
2685		2712
2686	case ARMOUR:	2713	case ARMOUR:
2687	case HELMET:	2714	case HELMET:
…		…
2696	new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));	2723	new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2697	change_abil (who, op);	2724	change_abil (who, op);
2698	break;	2725	break;
2699		2726
2700	case LAMP:	2727	case LAMP:
		2728	{
2701	new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);	2729	new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
		2730
2702	tmp2 = arch_to_object (op->other_arch);	2731	object *tmp2 = arch_to_object (op->other_arch);
2703	tmp2->x = op->x;	2732	tmp2->x = op->x;
2704	tmp2->y = op->y;	2733	tmp2->y = op->y;
2705	tmp2->map = op->map;	2734	tmp2->map = op->map;
2706	tmp2->below = op->below;	2735	tmp2->below = op->below;
2707	tmp2->above = op->above;	2736	tmp2->above = op->above;
2708	tmp2->stats.food = op->stats.food;	2737	tmp2->stats.food = op->stats.food;
2709	CLEAR_FLAG (tmp2, FLAG_APPLIED);	2738	CLEAR_FLAG (tmp2, FLAG_APPLIED);
2710		2739
2711	if (QUERY_FLAG (op, FLAG_INV_LOCKED))	2740	if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2712	SET_FLAG (tmp2, FLAG_INV_LOCKED);	2741	SET_FLAG (tmp2, FLAG_INV_LOCKED);
2713		2742
2714	if (who->contr)	2743	if (who->contr)
2715	esrv_del_item (who->contr, op->count);	2744	esrv_del_item (who->contr, op->count);
2716		2745
2717	op->destroy ();	2746	op->destroy ();
2718	insert_ob_in_ob (tmp2, who);	2747	insert_ob_in_ob (tmp2, who);
2719	who->update_stats ();	2748	who->update_stats ();
2720		2749
2721	if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))	2750	if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2722	{	2751	{
2723	if (who->contr)	2752	if (who->contr)
2724	{	2753	{
2725	new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");	2754	new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2726	SET_FLAG (tmp2, FLAG_KNOWN_CURSED);	2755	SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2727	}	2756	}
2728	}	2757	}
2729		2758
2730	if (who->contr)	2759	if (who->contr)
2731	esrv_send_item (who, tmp2);	2760	esrv_send_item (who, tmp2);
		2761	}
2732		2762
2733	return 1; /* otherwise, an attempt to drop causes problems */	2763	return 1; /* otherwise, an attempt to drop causes problems */
2734		2764
2735	case BOW:	2765	case BOW:
2736	case WAND:	2766	case WAND:
2737	case ROD:	2767	case ROD:
2738	case HORN:	2768	case HORN:
2739	clear_skill (who);
2740
2741	if (who->contr)	2769	if (player *pl = who->contr)
		2770	{
		2771	if (op == pl->ranged_ob)
2742	{	2772	{
		2773	pl->ranged_ob = 0;
		2774	who->change_weapon (pl->combat_ob);
		2775	}
		2776
2743	new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));	2777	new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2744
2745	if (who->contr->ranged_ob == op)
2746	who->contr->ranged_ob = 0;
2747
2748	if (who->current_weapon == op)
2749	who->current_weapon = 0;
2750	}	2778	}
2751	else	2779	else
2752	{	2780	{
		2781	who->change_skill (0);
		2782
2753	if (op->type == BOW)	2783	if (op->type == BOW)
2754	CLEAR_FLAG (who, FLAG_READY_BOW);	2784	CLEAR_FLAG (who, FLAG_READY_BOW);
2755	else	2785	else
2756	CLEAR_FLAG (who, FLAG_READY_RANGE);	2786	CLEAR_FLAG (who, FLAG_READY_RANGE);
2757	}	2787	}
2758		2788
2759	break;	2789	break;
2760		2790
2761	case BUILDER:	2791	case BUILDER:
2762	if (who->contr)	2792	if (who->contr)
2763	{
2764	new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));	2793	new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2765
2766	if (who->contr->ranged_ob == op)
2767	who->contr->ranged_ob = 0;
2768	}
2769	break;	2794	break;
2770		2795
2771	default:	2796	default:
2772	new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));	2797	new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
2773	break;	2798	break;
…		…
2829	* Returns 0 on success, returns 1 if there is some problem.	2854	* Returns 0 on success, returns 1 if there is some problem.
2830	* if aflags is AP_PRINT, we instead print out waht to unapply	2855	* if aflags is AP_PRINT, we instead print out waht to unapply
2831	* instead of doing it. This is a lot less code than having	2856	* instead of doing it. This is a lot less code than having
2832	* another function that does just that.	2857	* another function that does just that.
2833	*/	2858	*/
		2859
		2860	#define CANNOT_REMOVE_CURSED \
		2861	"H<You cannot remove cursed or damned items, you first have to remove the curse. " \
		2862	"Praying over an altar, scrolls of remove curse/damnation, " \
		2863	"priests or even other players might help.>"
		2864
2834	int	2865	int
2835	unapply_for_ob (object *who, object *op, int aflags)	2866	unapply_for_ob (object *who, object *op, int aflags)
2836	{	2867	{
2837	if (op->is_range ())	2868	if (op->is_range ())
2838	for (object *tmp = who->inv; tmp; tmp = tmp->below)	2869	for (object *tmp = who->inv; tmp; tmp = tmp->below)
…		…
2848	{	2879	{
2849	/* In this case, we want to try and remove a cursed item.	2880	/* In this case, we want to try and remove a cursed item.
2850	* While we know it won't work, we want unapply_special to	2881	* While we know it won't work, we want unapply_special to
2851	* at least generate the message.	2882	* at least generate the message.
2852	*/	2883	*/
2853	new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp));	2884	new_draw_info_format (NDI_UNIQUE, 0, who,
		2885	"No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED,
		2886	query_name (tmp));
2854	return 1;	2887	return 1;
2855	}	2888	}
2856		2889
2857	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)	2890	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2858	{	2891	{
…		…
2892	/* Cursed item that we can't unequip - tell the player.	2925	/* Cursed item that we can't unequip - tell the player.
2893	* Note this could be annoying if this is just one of a few,	2926	* Note this could be annoying if this is just one of a few,
2894	* so it may not be critical (eg, putting on a ring and you have	2927	* so it may not be critical (eg, putting on a ring and you have
2895	* one cursed ring.)	2928	* one cursed ring.)
2896	*/	2929	*/
2897	new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp));	2930	new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp));
2898	}	2931	}
2899		2932
2900	last = tmp->below;	2933	last = tmp->below;
2901	}	2934	}
2902	/* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the	2935	/* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
…		…
2968	/* This is sort of an error, but happens a lot when old players	3001	/* This is sort of an error, but happens a lot when old players
2969	* join in with more stuff equipped than they are now allowed.	3002	* join in with more stuff equipped than they are now allowed.
2970	*/	3003	*/
2971	LOG (llevError, "Can't find object using location %d on %s\n", i, who->name);	3004	LOG (llevError, "Can't find object using location %d on %s\n", i, who->name);
2972	#endif	3005	#endif
2973	fprintf (stderr, "can apply never due to %d but %d - %d + %d\n",//D
2974	i, who->slot[i].used,ws ? ws->slot[i].info :-77,op->slot[i].info);//D
2975	retval |= CAN_APPLY_NEVER;	3006	retval |= CAN_APPLY_NEVER;
2976	}	3007	}
2977	else	3008	else
2978	{	3009	{
2979	/* need to unapply something. However, if this something	3010	/* need to unapply something. However, if this something
…		…
3051	* AP_UNAPPLY=always unapply).	3082	* AP_UNAPPLY=always unapply).
3052	*	3083	*
3053	* Optional flags:	3084	* Optional flags:
3054	* AP_NO_MERGE: don't merge an unapplied object with other objects	3085	* AP_NO_MERGE: don't merge an unapplied object with other objects
3055	* AP_IGNORE_CURSE: unapply cursed items	3086	* AP_IGNORE_CURSE: unapply cursed items
		3087	* AP_NO_READY: do not ready skills when applying skill tools
3056	*	3088	*
3057	* Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)	3089	* Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3058	*	3090	*
3059	* apply_special() doesn't check for unpaid items.	3091	* apply_special() doesn't check for unpaid items.
3060	*/	3092	*/
		3093
		3094	#define LACK_ITEM_POWER \
		3095	" H<You lack enough unused item power to use this weapon, see the skills command.>"
		3096
3061	int	3097	int
3062	apply_special (object *who, object *op, int aflags)	3098	apply_special (object *who, object *op, int aflags)
3063	{	3099	{
3064	int basic_flag = aflags & AP_BASIC_FLAGS;	3100	int basic_flag = aflags & AP_BASIC_FLAGS;
3065	object *tmp, *tmp2, *skop = NULL;	3101	object *tmp, *tmp2, *skop = NULL;
…		…
3080	if (basic_flag == AP_APPLY)	3116	if (basic_flag == AP_APPLY)
3081	return 0;	3117	return 0;
3082		3118
3083	if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))	3119	if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3084	{	3120	{
3085	new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove %s.", query_name (op));	3121	new_draw_info_format (NDI_UNIQUE, 0, who,
		3122	"No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED,
		3123	query_name (op));
3086	return 1;	3124	return 1;
3087	}	3125	}
3088		3126
3089	return unapply_special (who, op, aflags);	3127	return unapply_special (who, op, aflags);
3090	}	3128	}
…		…
3099	{	3137	{
3100	case slot_combat: who->change_weapon (pl->combat_ob); break;	3138	case slot_combat: who->change_weapon (pl->combat_ob); break;
3101	case slot_ranged: who->change_weapon (pl->ranged_ob); break;	3139	case slot_ranged: who->change_weapon (pl->ranged_ob); break;
3102	}	3140	}
3103		3141
		3142	splay (op);
		3143
3104	/* Can't just apply this object. Lets see what not and what to do */	3144	/* Can't just apply this object. Lets see what not and what to do */
3105	if (int i = can_apply_object (who, op))	3145	if (int i = can_apply_object (who, op))
3106	{	3146	{
3107	if (i & CAN_APPLY_NEVER)	3147	if (i & CAN_APPLY_NEVER)
3108	{	3148	{
3109	new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op));	3149	new_draw_info_format (NDI_UNIQUE, 0, who,
		3150	"You don't have the body to use a %s. H<You can never apply this item.>",
		3151	query_name (op));
3110	return 1;	3152	return 1;
3111	}	3153	}
3112	else if (i & CAN_APPLY_RESTRICTION)	3154	else if (i & CAN_APPLY_RESTRICTION)
3113	{	3155	{
3114	new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op));	3156	new_draw_info_format (NDI_UNIQUE, 0, who,
		3157	"You have a prohibition against using a %s. "
		3158	"H<Your belief, profession or class prevents you from applying this item.>",
		3159	query_name (op));
3115	return 1;	3160	return 1;
3116	}	3161	}
3117		3162
3118	if (who->type != PLAYER)	3163	if (who->type != PLAYER)
3119	{	3164	{
…		…
3146	}	3191	}
3147	else	3192	else
3148	/* While experience will be credited properly, we want to change the	3193	/* While experience will be credited properly, we want to change the
3149	* skill so that the dam and wc get updated	3194	* skill so that the dam and wc get updated
3150	*/	3195	*/
3151	change_skill (who, skop, 0);	3196	who->change_skill (skop);
3152	}	3197	}
3153		3198
3154	if (who->type == PLAYER	3199	if (who->type == PLAYER
3155	&& op->item_power	3200	&& op->item_power
3156	&& op->item_power + who->contr->item_power > settings.item_power_factor * who->level)	3201	&& op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3157	{	3202	{
3158	new_draw_info (NDI_UNIQUE, 0, who,	3203	new_draw_info (NDI_UNIQUE, 0, who,
3159	"Equipping that combined with other items would consume your soul! "	3204	"Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3160	"[use the skills command to check your available item power]");
3161	return 1;	3205	return 1;
3162	}	3206	}
3163		3207
3164	/* Ok. We are now at the state where we can apply the new object.	3208	/* Ok. We are now at the state where we can apply the new object.
3165	* Note that we don't have the checks for can_use_...	3209	* Note that we don't have the checks for can_use_...
…		…
3176	switch (op->type)	3220	switch (op->type)
3177	{	3221	{
3178	case WEAPON:	3222	case WEAPON:
3179	if (!check_weapon_power (who, op->last_eat))	3223	if (!check_weapon_power (who, op->last_eat))
3180	{	3224	{
3181	new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use.\n"	3225	new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. "
3182	"It would consume your soul!.");	3226	"It would consume your soul!." LACK_ITEM_POWER);
3183		3227
3184	if (tmp)	3228	if (tmp)
3185	insert_ob_in_ob (tmp, who);	3229	insert_ob_in_ob (tmp, who);
3186		3230
3187	return 1;	3231	return 1;
…		…
3191	// i.e. "R" can use Ragnarok's sword.	3235	// i.e. "R" can use Ragnarok's sword.
3192	if (op->level && (strncmp (op->name, who->name, strlen (who->name))))	3236	if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3193	{	3237	{
3194	/* if the weapon does not have the name as the character, can't use it. */	3238	/* if the weapon does not have the name as the character, can't use it. */
3195	/* (Ragnarok's sword attempted to be used by Foo: won't work) */	3239	/* (Ragnarok's sword attempted to be used by Foo: won't work) */
3196	new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");	3240	new_draw_info (NDI_UNIQUE, 0, who,
		3241	"The weapon does not recognize you as its owner. "
		3242	"H<Its name indicates that it belongs to somebody else.>");
3197		3243
3198	if (tmp)	3244	if (tmp)
3199	insert_ob_in_ob (tmp, who);	3245	insert_ob_in_ob (tmp, who);
3200		3246
3201	return 1;	3247	return 1;
…		…
3206	new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO	3252	new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3207	return 1;	3253	return 1;
3208	}	3254	}
3209		3255
3210	SET_FLAG (op, FLAG_APPLIED);	3256	SET_FLAG (op, FLAG_APPLIED);
3211	change_skill (who, skop, 1);	3257	who->change_skill (skop);
3212		3258
3213	if (who->contr)	3259	if (who->contr)
3214	who->change_weapon (who->contr->combat_ob = op);	3260	who->change_weapon (who->contr->combat_ob = op);
3215		3261
3216	if (!QUERY_FLAG (who, FLAG_READY_WEAPON))
3217	SET_FLAG (who, FLAG_READY_WEAPON);
3218
3219	new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));	3262	new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3220		3263
		3264	SET_FLAG (who, FLAG_READY_WEAPON);
3221	change_abil (who, op);	3265	change_abil (who, op);
3222	break;	3266	break;
3223		3267
3224	case ARMOUR:	3268	case ARMOUR:
3225	case HELMET:	3269	case HELMET:
…		…
3237	break;	3281	break;
3238		3282
3239	case LAMP:	3283	case LAMP:
3240	if (op->stats.food < 1)	3284	if (op->stats.food < 1)
3241	{	3285	{
3242	new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name);	3286	new_draw_info_format (NDI_UNIQUE, 0, who,
		3287	"Your %s is out of fuel! "
		3288	"H<Lamps and similar items need fuel. They cannot be refilled.>", &op->name);
3243	return 1;	3289	return 1;
3244	}	3290	}
3245		3291
3246	new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);	3292	new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3247	tmp2 = arch_to_object (op->other_arch);	3293	tmp2 = arch_to_object (op->other_arch);
…		…
3270	who->update_stats ();	3316	who->update_stats ();
3271		3317
3272	if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))	3318	if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3273	if (who->type == PLAYER)	3319	if (who->type == PLAYER)
3274	{	3320	{
3275	new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");	3321	new_draw_info (NDI_UNIQUE, 0, who,
		3322	"Oops, it feels deadly cold! "
		3323	"H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3276	SET_FLAG (tmp2, FLAG_KNOWN_CURSED);	3324	SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3277	}	3325	}
3278		3326
3279	if (who->type == PLAYER)	3327	if (who->type == PLAYER)
3280	esrv_send_item (who, tmp2);	3328	esrv_send_item (who, tmp2);
…		…
3282	return 0;	3330	return 0;
3283		3331
3284	case SKILL_TOOL:	3332	case SKILL_TOOL:
3285	// applying a skill tool also readies the skill	3333	// applying a skill tool also readies the skill
3286	SET_FLAG (op, FLAG_APPLIED);	3334	SET_FLAG (op, FLAG_APPLIED);
		3335
		3336	if (!(aflags & AP_NO_READY))
		3337	{
3287	skop = find_skill_by_name (who, op->skill);	3338	skop = find_skill_by_name (who, op->skill);
3288	if (!skop->flag [FLAG_APPLIED])	3339	if (!skop->flag [FLAG_APPLIED])
3289	apply_special (who, skop, AP_APPLY);	3340	apply_special (who, skop, AP_APPLY);
		3341	}
3290	break;	3342	break;
3291		3343
3292	case SKILL:	3344	case SKILL:
3293	if (who->chosen_skill)
3294	{
3295	LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3296	return 1;
3297	}
3298
3299	if (player *pl = who->contr)	3345	if (player *pl = who->contr)
3300	{	3346	{
3301	if (IS_COMBAT_SKILL (op->subtype))	3347	if (IS_COMBAT_SKILL (op->subtype))
3302	{	3348	{
3303	if (skill_flags [op->subtype] & SF_NEED_WEAPON)	3349	if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3304	{	3350	{
3305	for (object *item = who->inv; item; item = item->below)	3351	for (object *item = who->inv; item; item = item->below)
3306	if (item->type == WEAPON && item->flag [FLAG_APPLIED])	3352	if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3307	{	3353	{
		3354	if (item->skill == op->skill)
		3355	{
3308	who->change_weapon (pl->combat_ob = item);	3356	who->change_weapon (pl->combat_ob = item);
3309	goto found_weapon;	3357	goto found_weapon;
		3358	}
3310	}	3359	}
3311		3360
3312	new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a melee weapon before readying this skill");	3361	new_draw_info_format (NDI_UNIQUE, 0, who,
		3362	"You need to apply a '%s' melee weapon before readying this skill. "
		3363	"H<Some skills need an item, in this case a melee weapon, to function.>",
		3364	&op->skill);
3313	return 1;	3365	return 1;
3314		3366
3315	found_weapon:;	3367	found_weapon:;
3316	}	3368	}
3317	else	3369	else
…		…
3322	if (skill_flags [op->subtype] & SF_NEED_BOW)	3374	if (skill_flags [op->subtype] & SF_NEED_BOW)
3323	{	3375	{
3324	for (object *item = who->inv; item; item = item->below)	3376	for (object *item = who->inv; item; item = item->below)
3325	if (item->type == BOW && item->flag [FLAG_APPLIED])	3377	if (item->type == BOW && item->flag [FLAG_APPLIED])
3326	{	3378	{
		3379	//TODO: bows should/must all have skill missile weapon right now
3327	who->change_weapon (pl->ranged_ob = item);	3380	who->change_weapon (pl->ranged_ob = item);
3328	goto found_bow;	3381	goto found_bow;
3329	}	3382	}
3330		3383
		3384	new_draw_info (NDI_UNIQUE, 0, who,
3331	new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill");	3385	"You need to apply a missile weapon before readying this skill. "
		3386	"H<Some skills need an item, in this case a missile weapon, to function.>");
3332	return 1;	3387	return 1;
3333		3388
3334	found_bow:;	3389	found_bow:;
3335	}
3336	else if (skill_flags [op->subtype] & SF_NEED_ITEM)
3337	{
3338	for (object *item = who->inv; item; item = item->below)
3339	if (item->flag [FLAG_APPLIED]
3340	&& (item->type == WAND || item->type == ROD || item->type == HORN))
3341	{
3342	who->change_weapon (pl->ranged_ob = item);
3343	goto found_item;
3344	}
3345
3346	new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a magic item before readying this skill");
3347	return 1;
3348
3349	found_item:;
3350	}	3390	}
3351	else	3391	else
3352	who->change_weapon (pl->ranged_ob = op);	3392	who->change_weapon (pl->ranged_ob = op);
3353	}	3393	}
3354		3394
…		…
3358	new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);	3398	new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3359	}	3399	}
3360	else	3400	else
3361	new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);	3401	new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3362	}	3402	}
3363		3403	else
		3404	{
3364	SET_FLAG (op, FLAG_APPLIED);	3405	SET_FLAG (op, FLAG_APPLIED);
3365	change_abil (who, op);	3406	change_abil (who, op);
3366	who->chosen_skill = op;	3407	who->chosen_skill = op;
3367	SET_FLAG (who, FLAG_READY_SKILL);	3408	SET_FLAG (who, FLAG_READY_SKILL);
		3409	}
		3410
3368	break;	3411	break;
3369		3412
3370	case BOW:	3413	case BOW:
3371	if (!check_weapon_power (who, op->last_eat))	3414	if (!check_weapon_power (who, op->last_eat))
3372	{	3415	{
3373	new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use.");	3416	new_draw_info (NDI_UNIQUE, 0, who,
3374	new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");	3417	"That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3375		3418
3376	if (tmp)	3419	if (tmp)
3377	insert_ob_in_ob (tmp, who);	3420	insert_ob_in_ob (tmp, who);
3378		3421
3379	return 1;	3422	return 1;
3380	}	3423	}
3381		3424
3382	if (op->level && (strncmp (op->name, who->name, strlen (who->name))))	3425	if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3383	{	3426	{
3384	new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");	3427	new_draw_info (NDI_UNIQUE, 0, who,
		3428	"The weapon does not recognize you as its owner. "
		3429	"H<Its name indicates that it belongs to somebody else.>");
3385	if (tmp)	3430	if (tmp)
3386	insert_ob_in_ob (tmp, who);	3431	insert_ob_in_ob (tmp, who);
3387		3432
3388	return 1;	3433	return 1;
3389	}	3434	}
…		…
3399	new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO	3444	new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3400	return 1;	3445	return 1;
3401	}	3446	}
3402		3447
3403	SET_FLAG (op, FLAG_APPLIED);	3448	SET_FLAG (op, FLAG_APPLIED);
3404	change_skill (who, skop, 0);	3449	who->change_skill (skop);
3405		3450
3406	if (who->contr)	3451	if (who->contr)
3407	{	3452	{
3408	who->contr->ranged_ob = op;	3453	who->contr->ranged_ob = op;
3409		3454
…		…
3428	break;	3473	break;
3429		3474
3430	case BUILDER:	3475	case BUILDER:
3431	if (who->type == PLAYER)	3476	if (who->type == PLAYER)
3432	{	3477	{
		3478	//TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3433	if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)	3479	if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3434	unapply_special (who, who->contr->ranged_ob, 0);	3480	unapply_special (who, who->contr->ranged_ob, 0);
3435		3481
3436	new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));	3482	new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3437		3483
…		…
3456	*/	3502	*/
3457	if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)	3503	if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3458	SET_FLAG (op, FLAG_BEEN_APPLIED);	3504	SET_FLAG (op, FLAG_BEEN_APPLIED);
3459		3505
3460	if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))	3506	if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3461	{
3462	if (who->type == PLAYER)	3507	if (who->type == PLAYER)
3463	{	3508	{
3464	new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");	3509	new_draw_info (NDI_UNIQUE, 0, who,
		3510	"Oops, it feels deadly cold! "
		3511	"H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3465	SET_FLAG (op, FLAG_KNOWN_CURSED);	3512	SET_FLAG (op, FLAG_KNOWN_CURSED);
3466	}	3513	}
3467	}
3468		3514
3469	if (who->type == PLAYER)	3515	if (who->type == PLAYER)
3470	{	3516	{
3471	/* if multiple objects were applied, update both slots */	3517	/* if multiple objects were applied, update both slots */
3472	if (tmp)	3518	if (tmp)
…		…
3481	int	3527	int
3482	monster_apply_special (object *who, object *op, int aflags)	3528	monster_apply_special (object *who, object *op, int aflags)
3483	{	3529	{
3484	if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))	3530	if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3485	return 1;	3531	return 1;
		3532
3486	return apply_special (who, op, aflags);	3533	return apply_special (who, op, aflags);
3487	}	3534	}
3488		3535
3489	/**	3536	/**
3490	* Map was just loaded, handle op's initialisation.	3537	* Map was just loaded, handle op's initialisation.
…		…
3816		3863
3817	if (failure <= -1 && failure > -15)	3864	if (failure <= -1 && failure > -15)
3818	{ /* wonder */	3865	{ /* wonder */
3819	object *tmp;	3866	object *tmp;
3820		3867
3821	new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!.");	3868	new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!");
3822	tmp = get_archetype (SPELL_WONDER);	3869	tmp = get_archetype (SPELL_WONDER);
3823	cast_wonder (op, op, 0, tmp);	3870	cast_wonder (op, op, 0, tmp);
3824	tmp->destroy ();	3871	tmp->destroy ();
3825	}	3872	}
3826	else if (failure <= -15 && failure > -35)	3873	else if (failure <= -15 && failure > -35)
…		…
3879	*/	3926	*/
3880	int i, j;	3927	int i, j;
3881		3928
3882	for (i = 0; i < NUM_STATS; i++)	3929	for (i = 0; i < NUM_STATS; i++)
3883	{	3930	{
3884	int race_bonus = pl->arch->clone.stats.stat (i);	3931	int race_bonus = pl->arch->stats.stat (i);
3885	sint8 stat = stats->stat (i) + ns->stat (i);	3932	sint8 stat = stats->stat (i) + ns->stat (i);
3886		3933
3887	if (stat > 20 + race_bonus)	3934	if (stat > 20 + race_bonus)
3888	{	3935	{
3889	excess_stat++;	3936	excess_stat++;
…		…
3899		3946
3900	if (i == CHA)	3947	if (i == CHA)
3901	continue; /* exclude cha from this */	3948	continue; /* exclude cha from this */
3902		3949
3903	int stat = stats->stat (i);	3950	int stat = stats->stat (i);
3904	int race_bonus = pl->arch->clone.stats.stat (i);	3951	int race_bonus = pl->arch->stats.stat (i);
3905	if (stat < 20 + race_bonus)	3952	if (stat < 20 + race_bonus)
3906	{	3953	{
3907	change_attr_value (stats, i, 1);	3954	change_attr_value (stats, i, 1);
3908	excess_stat--;	3955	excess_stat--;
3909	}	3956	}
…		…
3966	char got[MAX_BUF];	4013	char got[MAX_BUF];
3967	int len;	4014	int len;
3968		4015
3969	if (!pl || !transformer)	4016	if (!pl || !transformer)
3970	return;	4017	return;
		4018
3971	marked = find_marked_object (pl);	4019	marked = find_marked_object (pl);
		4020
3972	if (!marked)	4021	if (!marked)
3973	{	4022	{
3974	new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer));	4023	new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer));
3975	return;	4024	return;
3976	}	4025	}
		4026
3977	if (!marked->slaying)	4027	if (!marked->slaying)
3978	{	4028	{
3979	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));	4029	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
3980	return;	4030	return;
3981	}	4031	}
		4032
3982	/* check whether they are compatible or not */	4033	/* check whether they are compatible or not */
3983	find = strstr (marked->slaying, transformer->arch->name);	4034	find = strstr (marked->slaying, transformer->arch->archname);
3984	if (!find || (*(find + strlen (transformer->arch->name)) != ':'))	4035	if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
3985	{	4036	{
3986	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));	4037	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
3987	return;	4038	return;
3988	}	4039	}
		4040
3989	find += strlen (transformer->arch->name) + 1;	4041	find += strlen (transformer->arch->archname) + 1;
3990	/* Item can be used, now find how many and what it yields */	4042	/* Item can be used, now find how many and what it yields */
3991	if (isdigit (*(find)))	4043	if (isdigit (*(find)))
3992	{	4044	{
3993	yield = atoi (find);	4045	yield = atoi (find);
3994	if (yield < 1)	4046	if (yield < 1)
…		…
4002		4054
4003	while (isdigit (*find))	4055	while (isdigit (*find))
4004	find++;	4056	find++;
4005	while (*find == ' ')	4057	while (*find == ' ')
4006	find++;	4058	find++;
		4059
4007	memset (got, 0, MAX_BUF);	4060	memset (got, 0, MAX_BUF);
		4061
4008	if ((separator = strchr (find, ';')) != NULL)	4062	if ((separator = strchr (find, ';')) != NULL)
4009	{
4010	len = separator - find;	4063	len = separator - find;
4011	}
4012	else	4064	else
4013	{
4014	len = strlen (find);	4065	len = strlen (find);
4015	}	4066
4016	if (len > MAX_BUF - 1)	4067	if (len > MAX_BUF - 1)
4017	len = MAX_BUF - 1;	4068	len = MAX_BUF - 1;
		4069
4018	strcpy (got, find);	4070	strcpy (got, find);
4019	got[len] = '\0';	4071	got[len] = '\0';
4020		4072
4021	/* Now create new item, remove used ones when required. */	4073	/* Now create new item, remove used ones when required. */
4022	new_item = get_archetype (got);	4074	new_item = get_archetype (got);
…		…
4030	new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0));	4082	new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0));
4031	insert_ob_in_ob (new_item, pl);	4083	insert_ob_in_ob (new_item, pl);
4032	esrv_send_inventory (pl, pl);	4084	esrv_send_inventory (pl, pl);
4033	/* Eat up one item */	4085	/* Eat up one item */
4034	decrease_ob_nr (marked, 1);	4086	decrease_ob_nr (marked, 1);
		4087
4035	/* Eat one transformer if needed */	4088	/* Eat one transformer if needed */
4036	if (transformer->stats.food)	4089	if (transformer->stats.food)
4037	if (--transformer->stats.food == 0)	4090	if (--transformer->stats.food == 0)
4038	decrease_ob_nr (transformer, 1);	4091	decrease_ob_nr (transformer, 1);
4039	}	4092	}

Diff Legend

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