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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.32 by root, Sun Apr 29 21:44:35 2007 UTC vs.
Revision 1.97 by root, Thu Apr 15 00:36:51 2010 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copryight (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* This program 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 2 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, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
24		24
25	/* Created July 95 to separate skill utilities from actual skills -b.t. */	25	/* Created July 95 to separate skill utilities from actual skills -b.t. */
26		26
27	/* Reconfigured skills code to allow linking of skills to experience	27	/* Reconfigured skills code to allow linking of skills to experience
44	#include <object.h>	44	#include <object.h>
45	#include <sproto.h>	45	#include <sproto.h>
46	#include <living.h> /* for defs of STR,CON,DEX,etc. -b.t. */	46	#include <living.h> /* for defs of STR,CON,DEX,etc. -b.t. */
47	#include <spells.h>	47	#include <spells.h>
48		48
49	/* Table of unarmed attack skills. Terminated by -1. This	49	const uint8_t skill_flags[NUM_SKILLS] = {
50	* is also the list that we should try to use skills when	50	0, // SK_NONE
51	* automatically applying one for the player.	51	# define def(uc, flags) flags,
52	*/	52	# include "skillinc.h"
53	static uint8 unarmed_skills[] = {	53	# undef def
54	SK_KARATE,
55	SK_CLAWING,
56	SK_FLAME_TOUCH,
57	SK_SPARK_TOUCH,
58	SK_SHIVER,
59	SK_ACID_SPLASH,
60	SK_POISON_NAIL,
61	SK_PUNCHING,
62	(uint8)-1
63	};	54	};
		55
		56	vector<object_ptr> skillvec;
64		57
65	static int attack_hth (object pl, int dir, const char string, object *skill);	58	static int attack_hth (object pl, int dir, const char string, object *skill);
66	static int attack_melee_weapon (object op, int dir, const char string, object *skill);	59	static int attack_melee_weapon (object op, int dir, const char string, object *skill);
67		60
68	/* init_skills basically just sets up the skill_names table	61	/* init_skills basically just sets up the skill_names table
69	* above. The index into the array is set up by the	62	* above. The index into the array is set up by the
70	* subtypes.	63	* subtypes.
71	*/	64	*/
72	void	65	void
73	init_skills (void)	66	init_skills ()
74	{	67	{
75	int i;	68	// nop
76	archetype *at;	69	}
77		70
78	for (at = first_archetype; at != NULL; at = at->next)	71	void
79	if (at->clone.type == SKILL)	72	add_skill_archetype (object *o)
		73	{
		74	printf ("<%s><%s>\n", &o->name, &o->skill);//D
		75
		76	assert (("skill name must equal skill skill", o->name == o->skill));
		77
		78	for (vector<object_ptr>::iterator i = skillvec.begin (); i != skillvec.end (); ++i)
		79	if ((*i)->name == o->name)
80	{	80	{
81	if (skill_names[at->clone.subtype] != NULL)	81	// replace existing entry
82	LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n",	82	SKILL_INDEX (o) = i - skillvec.begin ();
83	at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill);	83	*i = o;
84	else	84	return;
85	skill_names[at->clone.subtype] = at->clone.skill;
86	}	85	}
87		86
88	/* This isn't really an error if there is no skill subtype set, but	87	// add new entry
89	* checking for this may catch some user errors.	88	assert (("only CS_NUM_SKILLS skills supported by client protocol", skillvec.size () < CS_NUM_SKILLS));
90	*/	89	SKILL_INDEX (o) = skillvec.size ();
91	for (i = 1; i < NUM_SKILLS; i++)	90	skillvec.push_back (o);
92	{
93	if (!skill_names[i])
94	LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);
95	}
96	}	91	}
97		92
98	/* This function goes through the player inventory and sets	93	/* This function goes through the player inventory and sets
99	* up the last_skills[] array in the player object.	94	* up the last_skills[] array in the player object.
100	* the last_skills[] is used to more quickly lookup skills -	95	* the last_skills[] is used to more quickly lookup skills -
101	* mostly used for sending exp.	96	* mostly used for sending exp.
102	*/	97	*/
103	void	98	void
104	link_player_skills (object *op)	99	player::link_skills ()
105	{	100	{
		101	for (int i = 0; i < CS_NUM_SKILLS; ++i)
		102	last_skill_ob [i] = 0;
		103
106	for (object *tmp = op->inv; tmp; tmp = tmp->below)	104	for (object *tmp = ob->inv; tmp; tmp = tmp->below)
107	if (tmp->type == SKILL)	105	if (tmp->type == SKILL)
108	{	106	{
109	/* This is really a warning, hence no else below */	107	int idx = SKILL_INDEX (tmp);
110	if (op->contr->last_skill_ob[tmp->subtype] && op->contr->last_skill_ob[tmp->subtype] != tmp)
111	LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",
112	&op->contr->last_skill_ob[tmp->subtype]->skill, &tmp->skill);
113		108
114	if (tmp->subtype >= NUM_SKILLS)	109	assert (IN_RANGE_EXC (idx, 0, CS_NUM_SKILLS));
115	LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS);	110
116	else	111	if (last_skill_ob [idx] != tmp)
117	{	112	{
118	op->contr->last_skill_ob[tmp->subtype] = tmp;	113	last_skill_ob [idx] = tmp;
119	op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go	114	if (ns)
		115	ns->last_skill_exp [idx] = -1;
120	}	116	}
121	}	117	}
122	}	118	}
123		119
		120	static object *
		121	find_skill (object *who, shstr_cmp name)
		122	{
		123	if (who->chosen_skill
		124	&& who->chosen_skill->skill == name
		125	&& who->chosen_skill->type == SKILL)
		126	return who->chosen_skill;
		127
		128	for (object *tmp = who->inv; tmp; tmp = tmp->below)
		129	if (tmp->skill == name && tmp->type == SKILL)
		130	return splay (tmp);
		131
		132	return 0;
		133	}
		134
		135	object *
		136	player::find_skill (shstr_cmp name) const
		137	{
		138	// might want to use last_skill_obj at one point, or maybe not
		139	return ::find_skill (ob, name);
		140	}
		141
124	/* This returns the skill pointer of the given name (the	142	/* This returns the skill pointer of the given name (the
125	* one that accumlates exp, has the level, etc).	143	* one that accumulates exp, has the level, etc).
126	*	144	*
127	* It is presumed that the player will be needing to actually	145	* It is presumed that the player will be needing to actually
128	* use the skill, so thus if use of the skill requires a skill	146	* use the skill, so thus if use of the skill requires a skill
129	* tool, this code will equip it.	147	* tool, this code will equip it.
130	*/	148	*/
131	object *	149	object *
132	find_skill_by_name (object who, const char name)	150	find_skill_by_name (object *who, shstr_cmp sh)
133	{	151	{
134	object skill = NULL, skill_tool = NULL, *tmp;	152	object *skill_tool = 0;
135		153
136	if (!name)
137	return NULL;
138
139	/* We make sure the length of the string in the object is greater
140	* in length than the passed string. Eg, if we have a skill called
141	* 'hi', we don't want to match if the user passed 'high'
142	*/
143	for (tmp = who->inv; tmp != NULL; tmp = tmp->below)	154	for (object *tmp = who->inv; tmp; tmp = tmp->below)
		155	if (tmp->skill == sh)
144	{	156	{
145	if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name))	157	if (tmp->type == SKILL && (tmp->flag [FLAG_CAN_USE_SKILL] \|\| tmp->flag [FLAG_APPLIED]))
146	skill = tmp;	158	/* If this is a skill that can be used without applying tool, return it */
147		159	return splay (tmp);
148	/* Try to find appropriate skilltool. If the player has one already	160	/* Try to find appropriate skilltool. If the player has one already
149	* applied, we try to keep using that one.	161	* applied, we try to keep using that one.
150	*/	162	*/
151	else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name))	163	else if (tmp->type == SKILL_TOOL && !skill_tool)
152	{
153	if (QUERY_FLAG (tmp, FLAG_APPLIED))
154	skill_tool = tmp;	164	skill_tool = tmp;
155	else if (!skill_tool \|\| !QUERY_FLAG (skill_tool, FLAG_APPLIED))
156	skill_tool = tmp;
157	}	165	}
158	}	166
159	/* If this is a skill that can be used without a tool, return it */	167	if (!skill_tool)
160	if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
161	return skill;	168	return 0;
162		169
163	/* Player has a tool to use the skill. IF not applied, apply it -	170	/* Player has a tool to use the skill. If not applied, apply it -
164	* if not successful, return null. If they do have the skill tool	171	* if not successful, return null. If they do have the skill tool
165	* but not the skill itself, give it to them.	172	* but not the skill itself, give it to them.
166	*/	173	*/
167	if (skill_tool)	174	object *skill = who->give_skill (skill_tool->skill);
168	{	175
169	if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))	176	if (!skill_tool->flag [FLAG_APPLIED])
170	{	177	if (!who->apply (splay (skill_tool)))
171	if (apply_special (who, skill_tool, 0))
172	return NULL;
173	}
174	if (!skill)
175	{
176	skill = give_skill_by_name (who, skill_tool->skill);
177	link_player_skills (who);
178	}
179	return skill;	178	return 0;
180	}	179
		180	return splay (skill);
		181	}
		182
		183	object *
		184	find_skill_by_name_fuzzy (object who, const char name)
		185	{
		186	if (name)
		187	for (object *tmp = who->inv; tmp; tmp = tmp->below)
		188	if ((tmp->type == SKILL \|\| tmp->type == SKILL_TOOL)
		189	&& tmp->skill.starts_with (name))
		190	if (object *skop = find_skill_by_name (who, tmp->skill))
		191	return skop;
		192
181	return NULL;	193	return 0;
182	}	194	}
183
184		195
185	/* This returns the skill pointer of the given name (the	196	/* This returns the skill pointer of the given name (the
186	* one that accumlates exp, has the level, etc).	197	* one that accumulates exp, has the level, etc).
187	*	198	*
188	* It is presumed that the player will be needing to actually	199	* It is presumed that the player will be needing to actually
189	* use the skill, so thus if use of the skill requires a skill	200	* use the skill, so thus if use of the skill requires a skill
190	* tool, this code will equip it.	201	* tool, this code will equip it.
191	*	202	*
192	* This code is basically the same as find_skill_by_name() above,	203	* This code is basically the same as find_skill_by_name() above,
193	* but instead a skill name, we search by matching number.	204	* but instead a skill name, we search by matching number.
194	* this replaces find_skill.	205	* this replaces find_skill.
		206	*
		207	* MUST NOT BE USED IN NEW CODE! (schmorp)
195	*/	208	*/
196	object *	209	object *
197	find_skill_by_number (object *who, int skillno)	210	find_skill_by_number (object *who, int skillno)
198	{	211	{
199	object skill = NULL, skill_tool = NULL, *tmp;
200
201	if (skillno < 1 \|\| skillno >= NUM_SKILLS)
202	return NULL;
203
204	for (tmp = who->inv; tmp != NULL; tmp = tmp->below)	212	for (object *tmp = who->inv; tmp; tmp = tmp->below)
205	{
206	if (tmp->type == SKILL && tmp->subtype == skillno)	213	if (tmp->type == SKILL && tmp->subtype == skillno)
207	skill = tmp;	214	if (object *skop = find_skill_by_name (who, tmp->skill))
		215	return skop;
208		216
209	/* Try to find appropriate skilltool. If the player has one already	217	return 0;
210	* applied, we try to keep using that one.	218	}
211	*/	219
212	else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno)	220	object *
213	{	221	object::give_skill (shstr_cmp name, bool can_use)
214	if (QUERY_FLAG (tmp, FLAG_APPLIED))	222	{
215	skill_tool = tmp;	223	object *skill = find_skill (this, name);
216	else if (!skill_tool \|\| !QUERY_FLAG (skill_tool, FLAG_APPLIED))	224
217	skill_tool = tmp;	225	if (!skill)
218	}	226	skill = give_skill_by_name (this, name);
219	}	227
220	/* If this is a skill that can be used without a tool, return it */	228	if (skill && can_use)
221	if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))	229	skill->flag [FLAG_CAN_USE_SKILL] = true;
		230
222	return skill;	231	return skill;
223
224	/* Player has a tool to use the skill. IF not applied, apply it -
225	* if not successful, return null. If they do have the skill tool
226	* but not the skill itself, give it to them.
227	*/
228	if (skill_tool)
229	{
230	if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
231	{
232	if (apply_special (who, skill_tool, 0))
233	return NULL;
234	}
235
236	if (!skill)
237	{
238	skill = give_skill_by_name (who, skill_tool->skill);
239	link_player_skills (who);
240	}
241
242	return skill;
243	}
244
245	return NULL;
246	}
247
248	/* This changes the objects skill to new_skill.
249	* note that this function doesn't always need to get used -
250	* you can now add skill exp to the player without the chosen_skill being
251	* set. This function is of most interest to players to update
252	* the various range information.
253	* if new_skill is null, this just unapplies the skill.
254	* flag has the current meaning:
255	* 0x1: If set, don't update the range pointer. This is useful when we
256	* need to ready a new skill, but don't want to clobber range.
257	* return 1 on success, 0 on error
258	*/
259	int
260	change_skill (object who, object new_skill, int flag)
261	{
262	int old_range;
263
264	if (who->type != PLAYER)
265	return 0;
266
267	old_range = who->contr->shoottype;
268
269	if (who->chosen_skill && who->chosen_skill == new_skill)
270	{
271	/* optimization for changing skill to current skill */
272	if (!(flag & 0x1))
273	who->contr->set_range (range_skill);
274
275	return 1;
276	}
277
278	// move skill to front, so it will be preferred next time
279	new_skill->remove ();
280	who->insert (new_skill);
281
282	if (!new_skill)
283	{
284	if (who->chosen_skill)
285	apply_special (who, who->chosen_skill, AP_UNAPPLY);
286
287	/* Only goal in this case was to unapply a skill */
288	return 0;
289	}
290
291	if (apply_special (who, new_skill, AP_APPLY))
292	return 0;
293
294	if (!(flag & 0x1))
295	who->contr->set_range ((rangetype) old_range);
296
297	return 1;
298	}
299
300	/* This function just clears the chosen_skill and range_skill values
301	* inthe player.
302	*/
303	void
304	clear_skill (object *who)
305	{
306	who->chosen_skill = NULL;
307	CLEAR_FLAG (who, FLAG_READY_SKILL);
308	if (who->type == PLAYER)
309	{
310	who->contr->ranges[range_skill] = NULL;
311	if (who->contr->shoottype == range_skill)
312	who->contr->shoottype = range_none;
313	}
314	}	232	}
315		233
316	/* do_skill() - Main skills use function-similar in scope to cast_spell().	234	/* do_skill() - Main skills use function-similar in scope to cast_spell().
317	* We handle all requests for skill use outside of some combat here.	235	* We handle all requests for skill use outside of some combat here.
318	* We require a separate routine outside of fire() so as to allow monsters	236	* We require a separate routine outside of fire() so as to allow monsters
…		…
325	*/	243	*/
326	int	244	int
327	do_skill (object op, object part, object skill, int dir, const char string)	245	do_skill (object op, object part, object skill, int dir, const char string)
328	{	246	{
329	int success = 0, exp = 0;	247	int success = 0, exp = 0;
330	int did_alc = 0;
331	object tmp, next;
332		248
333	if (!skill)	249	if (!skill)
334	return 0;	250	return 0;
335		251
336	/* The code below presumes that the skill points to the object that	252	/* The code below presumes that the skill points to the object that
…		…
338	* go and try to find the actual real skill pointer, and if the	254	* go and try to find the actual real skill pointer, and if the
339	* the player doesn't have a bucket for that, create one.	255	* the player doesn't have a bucket for that, create one.
340	*/	256	*/
341	if (skill->type != SKILL && op->type == PLAYER)	257	if (skill->type != SKILL && op->type == PLAYER)
342	{	258	{
343	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	259	for (object *tmp = op->inv; tmp; tmp = tmp->below)
344	if (tmp->type == SKILL && tmp->skill == skill->skill)	260	if (tmp->type == SKILL && tmp->skill == skill->skill)
345	break;	261	{
		262	skill = tmp;
		263	goto found;
		264	}
346		265
347	if (!tmp)
348	tmp = give_skill_by_name (op, skill->skill);	266	skill = give_skill_by_name (op, skill->skill);
349		267	found: ;
350	skill = tmp;
351	}	268	}
352		269
353	// skill, by_whom, on_which_object, which direction, skill_argument	270	// skill, by_whom, on_which_object, which direction, skill_argument
354	if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))	271	if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))
355	return 0;	272	return 0;
…		…
360	/* Not 100% sure if this will work with new movement code -	277	/* Not 100% sure if this will work with new movement code -
361	* the levitation skill has move_type for flying, so when	278	* the levitation skill has move_type for flying, so when
362	* equipped, that should transfer to player, when not,	279	* equipped, that should transfer to player, when not,
363	* shouldn't.	280	* shouldn't.
364	*/	281	*/
365	if (QUERY_FLAG (skill, FLAG_APPLIED))	282	if (skill->flag [FLAG_APPLIED])
366	{	283	{
367	CLEAR_FLAG (skill, FLAG_APPLIED);	284	skill->clr_flag (FLAG_APPLIED);
368	new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");	285	new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
369	}	286	}
370	else	287	else
371	{	288	{
372	SET_FLAG (skill, FLAG_APPLIED);	289	skill->set_flag (FLAG_APPLIED);
373	new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!.");	290	new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
374	}	291	}
375		292
376	op->update_stats ();	293	op->update_stats ();
377	success = 1;	294	success = 1;
378	break;	295	break;
…		…
388	case SK_HIDING:	305	case SK_HIDING:
389	exp = success = hide (op, skill);	306	exp = success = hide (op, skill);
390	break;	307	break;
391		308
392	case SK_JUMPING:	309	case SK_JUMPING:
393	success = jump (op, dir, skill);	310	exp = success = jump (op, dir, skill);
394	break;	311	break;
395		312
396	case SK_INSCRIPTION:	313	case SK_INSCRIPTION:
397	exp = success = write_on_item (op, string, skill);	314	exp = success = write_on_item (op, string, skill);
398	break;	315	break;
…		…
460	case SK_LITERACY:	377	case SK_LITERACY:
461	case SK_WOODSMAN:	378	case SK_WOODSMAN:
462	/* first, we try to find a cauldron, and do the alchemy thing.	379	/* first, we try to find a cauldron, and do the alchemy thing.
463	* failing that, we go and identify stuff.	380	* failing that, we go and identify stuff.
464	*/	381	*/
		382	{
		383	bool found_cauldron = false;
		384
465	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = next)	385	for (object next, tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
466	{	386	{
467	next = tmp->above;	387	next = tmp->above;
468		388
469	if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))	389	if (tmp->flag [FLAG_IS_CAULDRON])
470	{	390	{
		391	found_cauldron = true;
		392
		393	if (tmp->skill != skill->skill)
		394	{
		395	op->failmsgf ("You can't use the %s with the %s skill!",
		396	query_name (tmp),
		397	query_name (skill));
		398	break;
		399	}
		400
471	attempt_do_alchemy (op, tmp);	401	attempt_do_alchemy (op, tmp, skill);
472		402
473	if (QUERY_FLAG (tmp, FLAG_APPLIED))	403	if (tmp->flag [FLAG_APPLIED])
474	esrv_send_inventory (op, tmp);	404	esrv_send_inventory (op, tmp);
475
476	did_alc = 1;
477	}	405	}
478	}	406	}
479		407
480	if (did_alc == 0)	408	if (!found_cauldron)
481	exp = success = skill_ident (op, skill);	409	exp = success = skill_ident (op, skill);
482		410	}
483	break;	411	break;
484		412
485	case SK_DET_MAGIC:	413	case SK_DET_MAGIC:
486	case SK_DET_CURSE:	414	case SK_DET_CURSE:
487	exp = success = skill_ident (op, skill);	415	exp = success = skill_ident (op, skill);
…		…
518	case SK_SUMMONING:	446	case SK_SUMMONING:
519	case SK_CLIMBING:	447	case SK_CLIMBING:
520	new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");	448	new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
521	break;	449	break;
522		450
		451	case SK_MINING:
		452	success = skill_mining (op, part, skill, dir, string);
		453	break;
		454
523	default:	455	default:
524	LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);	456	LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
525	break;	457	break;
526	}	458	}
527		459
…		…
529	* Monsters have no skill use time because of the random nature in	461	* Monsters have no skill use time because of the random nature in
530	* which use_monster_skill is called already simulates this.	462	* which use_monster_skill is called already simulates this.
531	* If certain skills should take more/less time, that should be	463	* If certain skills should take more/less time, that should be
532	* in the code for the skill itself.	464	* in the code for the skill itself.
533	*/	465	*/
534
535	if (op->type == PLAYER)	466	if (op->type == PLAYER)
536	op->speed_left -= 1.0;	467	op->speed_left -= 1.f;
537		468
538	/* this is a good place to add experience for successfull use of skills.	469	/* this is a good place to add experience for successfull use of skills.
539	* Note that add_exp() will figure out player/monster experience	470	* Note that add_exp() will figure out player/monster experience
540	* gain problems.	471	* gain problems.
541	*/	472	*/
…		…
569	* op is the object that was 'defeated'.	500	* op is the object that was 'defeated'.
570	* skill is the skill used. If no skill is used, it should just	501	* skill is the skill used. If no skill is used, it should just
571	* point back to who.	502	* point back to who.
572	*	503	*
573	*/	504	*/
574
575	int	505	int
576	calc_skill_exp (object who, object op, object *skill)	506	calc_skill_exp (object who, object op, object *skill)
577	{	507	{
578	int op_exp = 0, op_lvl = 0;	508	int op_exp = 0, op_lvl = 0;
579	float base, value, lvl_mult = 0.0;	509	float base, value, lvl_mult = 0.0;
…		…
588	* If an object is not alive and magical we set the base exp higher to	518	* If an object is not alive and magical we set the base exp higher to
589	* help out exp awards for skill_ident skills. Also, if	519	* help out exp awards for skill_ident skills. Also, if
590	* an item is type RUNE, we give out exp based on stats.Cha	520	* an item is type RUNE, we give out exp based on stats.Cha
591	* and level (this was the old system) -b.t.	521	* and level (this was the old system) -b.t.
592	*/	522	*/
593
594	if (!op)	523	if (!op)
595	{ /* no item/creature */	524	{ /* no item/creature */
596	op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty;	525	op_lvl = max (1, who->map->difficulty);
597	op_exp = 0;	526	op_exp = 0;
598	}	527	}
599	else if (op->type == RUNE \|\| op->type == TRAP)	528	else if (op->type == RUNE \|\| op->type == TRAP)
600	{ /* all traps. If stats.Cha > 1 we use that	529	{ /* all traps. If stats.Cha > 1 we use that
601	* for the amount of experience */	530	* for the amount of experience */
…		…
604	}	533	}
605	else	534	else
606	{ /* all other items/living creatures */	535	{ /* all other items/living creatures */
607	op_exp = op->stats.exp;	536	op_exp = op->stats.exp;
608	op_lvl = op->level;	537	op_lvl = op->level;
609	if (!QUERY_FLAG (op, FLAG_ALIVE))	538	if (!op->flag [FLAG_ALIVE])
610	{ /* for ident/make items */	539	op_lvl += 5 * abs (op->magic); /* for ident/make items */
611	op_lvl += 5 * abs (op->magic);
612	}
613	}	540	}
614		541
615	if (op_lvl < 1)	542	if (op_lvl < 1)
616	op_lvl = 1;	543	op_lvl = 1;
617		544
…		…
625	/* if skill really is a skill, then we can look at the skill archetype for	552	/* if skill really is a skill, then we can look at the skill archetype for
626	* bse reward value (exp) and level multiplier factor.	553	* bse reward value (exp) and level multiplier factor.
627	*/	554	*/
628	if (skill->type == SKILL)	555	if (skill->type == SKILL)
629	{	556	{
630	base += skill->arch->clone.stats.exp;	557	base += skill->arch->stats.exp;
631	if (settings.simple_exp)	558	if (settings.simple_exp)
632	{	559	{
633	if (skill->arch->clone.level)	560	if (skill->arch->level)
634	lvl_mult = (float) skill->arch->clone.level / 100.0;	561	lvl_mult = (float) skill->arch->level / 100.0;
635	else	562	else
636	lvl_mult = 1.0; /* no adjustment */	563	lvl_mult = 1.0; /* no adjustment */
637	}	564	}
638	else	565	else
639	{	566	{
640	if (skill->level)	567	if (skill->level)
641	lvl_mult = ((float) skill->arch->clone.level * (float) op_lvl) / ((float) skill->level * 100.0);	568	lvl_mult = ((float) skill->arch->level * (float) op_lvl) / ((float) skill->level * 100.0);
642	else	569	else
643	lvl_mult = 1.0;	570	lvl_mult = 1.0;
644	}	571	}
645	}	572	}
646	else	573	else
647	{	574	{
648	/* Don't divide by zero here! */	575	/* Don't divide by zero here! */
649	lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1);	576	lvl_mult = (float) op_lvl / (float) max (1, skill->level);
650	}	577	}
651	}	578	}
652		579
653	/* assemble the exp total, and return value */	580	/* assemble the exp total, and return value */
654		581
…		…
668	* This one actually teaches the player the skill as something	595	* This one actually teaches the player the skill as something
669	* they can equip.	596	* they can equip.
670	* Return 0 if the player knows the skill, 1 if the	597	* Return 0 if the player knows the skill, 1 if the
671	* player learns the skill, 2 otherwise.	598	* player learns the skill, 2 otherwise.
672	*/	599	*/
673
674	int	600	int
675	learn_skill (object pl, object scroll)	601	learn_skill (object pl, object scroll)
676	{	602	{
677	object *tmp;
678
679	if (!scroll->skill)	603	if (!scroll->skill)
680	{	604	{
681	LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);	605	LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);
682	return 2;	606	return 2;
683	}	607	}
684		608
685	/* can't use find_skill_by_name because we want skills the player knows	609	object *tmp = find_skill (pl, scroll->skill);
686	* but can't use natively.
687	*/
688
689	for (tmp = pl->inv; tmp != NULL; tmp = tmp->below)
690	if (tmp->type == SKILL && !strncasecmp (scroll->skill, tmp->skill, strlen (scroll->skill)))
691	break;
692		610
693	/* player already knows it */	611	/* player already knows it */
694	if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))	612	if (tmp && tmp->flag [FLAG_CAN_USE_SKILL])
695	return 0;	613	return 0;
696		614
697	/* now a random change to learn, based on player Int.	615	/* now a random change to learn, based on player Int.
698	* give bonus based on level - otherwise stupid characters	616	* give bonus based on level - otherwise stupid characters
699	* might never be able to learn anything.	617	* might never be able to learn anything.
…		…
708	{	626	{
709	LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);	627	LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);
710	return 2;	628	return 2;
711	}	629	}
712		630
713	SET_FLAG (tmp, FLAG_CAN_USE_SKILL);	631	tmp->set_flag (FLAG_CAN_USE_SKILL);
714	link_player_skills (pl);	632
715	return 1;	633	return 1;
716	}	634	}
717		635
718	/* Gives a percentage clipped to 0% -> 100% of a/b. */	636	/* Gives a percentage clipped to 0% -> 100% of a/b. */
719
720	/* Probably belongs in some global utils-type file? */	637	/* Probably belongs in some global utils-type file? */
721	static int	638	static int
722	clipped_percent (sint64 a, sint64 b)	639	clipped_percent (sint64 a, sint64 b)
723	{	640	{
724	int rv;	641	int rv;
…		…
744	* Note this function is a bit more complicated becauase we	661	* Note this function is a bit more complicated becauase we
745	* we want ot sort the skills before printing them. If we	662	* we want ot sort the skills before printing them. If we
746	* just dumped this as we found it, this would be a bit	663	* just dumped this as we found it, this would be a bit
747	* simpler.	664	* simpler.
748	*/	665	*/
749		666	//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
750	void	667	void
751	show_skills (object op, const char search)	668	show_skills (object pl, const char search)
752	{	669	{
753	object *tmp = NULL;
754	char buf[MAX_BUF];
755	const char *cp;	670	const char *cp;
756	int i, num_skills_found = 0;	671	int i, num_skills_found = 0;
757	static const char *const periods = "........................................";	672	const char *const periods = ".............................."; // 30
758		673
759	/* Need to have a pointer and use strdup for qsort to work properly */	674	/* Need to have a pointer and use strdup for qsort to work properly */
760	char skills[NUM_SKILLS][MAX_BUF];	675	char skills[NUM_SKILLS][128]; // d'oh
761		676
		677	object *op = pl->contr->ob;
762		678
763	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	679	for (object *tmp = op->inv; tmp; tmp = tmp->below)
764	{	680	{
765	if (tmp->type == SKILL)	681	if (tmp->type == SKILL)
766	{	682	{
767	if (search && strstr (tmp->name, search) == NULL)	683	if (search && !tmp->name.contains (search))
768	continue;	684	continue;
		685
		686	char buf[30];
		687
769	/* Basically want to fill this out to 40 spaces with periods */	688	/* Basically want to fill this out to 30 spaces with periods */
770	sprintf (buf, "%s%s", &tmp->name, periods);	689	snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
771	buf[40] = 0;
772		690
773	if (settings.permanent_exp_ratio)	691	if (settings.permanent_exp_ratio)
774	{
775	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",	692	snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
776	buf, tmp->level, tmp->stats.exp,	693	buf, tmp->level, tmp->stats.exp,
777	level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));	694	level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
778	}
779	else	695	else
780	{
781	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",	696	snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
782	buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));	697	buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
783	}	698
784	/* I don't know why some characters get a bunch of skills, but	699	/* I don't know why some characters get a bunch of skills, but
785	* it sometimes happens (maybe a leftover from bugier earlier code	700	* it sometimes happens (maybe a leftover from bugier earlier code
786	* and those character are still about). In any case, lets handle	701	* and those character are still about). In any case, lets handle
787	* it so it doesn't crash the server - otherwise, one character may	702	* it so it doesn't crash the server - otherwise, one character may
788	* crash the server numerous times.	703	* crash the server numerous times.
789	*/	704	*/
790	if (num_skills_found >= NUM_SKILLS)	705	if (num_skills_found >= NUM_SKILLS)
791	{	706	{
792	new_draw_info (NDI_RED, 0, op, "Your character has too many skills.");	707	new_draw_info (NDI_RED \| NDI_REPLY, 0, op, "Your character has too many skills.");
793	new_draw_info (NDI_RED, 0, op, "Something isn't right - contact the server admin");	708	new_draw_info (NDI_RED \| NDI_REPLY, 0, op, "Something isn't right - contact the server admin");
794	break;	709	break;
795	}	710	}
796	}	711	}
797	}	712	}
798		713
799	clear_win_info (op);	714	dynbuf_text &msg = msg_dynbuf; msg.clear ();
800	new_draw_info (NDI_UNIQUE, 0, op, "Player skills:");	715
		716	msg << "T<Player skills:>\n\n";
801	if (num_skills_found > 1)	717	if (num_skills_found > 1)
802	qsort (skills, num_skills_found, MAX_BUF, (int ()(const void , const void *)) std::strcmp);	718	qsort (skills, num_skills_found, sizeof (skills [0]), (int ()(const void , const void *)) std::strcmp);
803		719
804	for (i = 0; i < num_skills_found; i++)	720	for (i = 0; i < num_skills_found; i++)
805	new_draw_info (NDI_UNIQUE, 0, op, skills[i]);	721	msg << " C<" << skills [i] << ">\n";
806		722
807	new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5);	723	msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r";
808		724
809	cp = determine_god (op);	725	cp = determine_god (op);
810	new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time");	726	msg << "You worship " << (cp ? cp : "no god at current time") << ".\r";
811		727
812	new_draw_info_format (NDI_UNIQUE, 0, op, "Your equipped item power is %d out of %d\n",	728	msg << "Your equipped item power is " << (int)op->contr->item_power
813	op->contr->item_power, (int) (op->level * settings.item_power_factor));	729	<< " out of " << int (op->level * settings.item_power_factor)
		730	<< ".\n";
		731
		732	pl->contr->infobox (MSG_CHANNEL ("skills"), msg);
814	}	733	}
815		734
816	/* use_skill() - similar to invoke command, it executes the skill in the	735	/* use_skill() - similar to invoke command, it executes the skill in the
817	* direction that the user is facing. Returns false if we are unable to	736	* direction that the user is facing. Returns false if we are unable to
818	* change to the requested skill, or were unable to use the skill properly.	737	* change to the requested skill, or were unable to use the skill properly.
819	* This is tricky because skills can have spaces. We basically roll	738	* This is tricky because skills can have spaces. We basically roll
820	* our own find_skill_by_name so we can try to do better string matching.	739	* our own find_skill_by_name so we can try to do better string matching.
821	*/	740	*/
822
823	int	741	int
824	use_skill (object op, const char string)	742	use_skill (object op, const char string)
825	{	743	{
826	object *skop;	744	object *skop;
827	size_t len;	745	size_t len;
828		746
829	if (!string)	747	if (!string)
830	return 0;	748	return 0;
831		749
832	for (skop = op->inv; skop != NULL; skop = skop->below)	750	for (skop = op->inv; skop; skop = skop->below)
833	{	751	if ((skop->type == SKILL \|\| skop->type == SKILL_TOOL)
834	if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) &&
835	!strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))	752	&& !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill))))
		753	{
		754	skop = find_skill_by_name (op, skop->skill);
836	break;	755	break;
837	else if (skop->type == SKILL_TOOL && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
838	break;
839	}	756	}
		757
840	if (!skop)	758	if (!skop)
841	{	759	{
842	new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string);	760	op->failmsgf ("Unable to find skill %s.", string);
		761	return 0;
		762	}
		763
		764	if (!(skill_flags [skop->subtype] & SF_USE))
		765	{
		766	op->failmsgf (
		767	"You feel as if you wanted to do something funny, but you can't remember what. "
		768	"H<The %s skill cannot be C<use_skill>'ed - maybe you need to C<ready_skill> it, "
		769	"use it with some item, or it's always active.>",
		770	&skop->skill
		771	);
843	return 0;	772	return 0;
844	}	773	}
845		774
846	len = strlen (skop->skill);	775	len = strlen (skop->skill);
847		776
…		…
849	* options given to the skill. Its pretty simple - if there	778	* options given to the skill. Its pretty simple - if there
850	* are extra parameters (as deteremined by string length), we	779	* are extra parameters (as deteremined by string length), we
851	* want to skip over any leading spaces.	780	* want to skip over any leading spaces.
852	*/	781	*/
853	if (len >= strlen (string))	782	if (len >= strlen (string))
854	{
855	string = NULL;	783	string = NULL;
856	}
857	else	784	else
858	{	785	{
859	string += len;	786	string += len;
860	while (*string == 0x20)	787	while (*string == 0x20)
861	string++;	788	string++;
		789
862	if (strlen (string) == 0)	790	if (strlen (string) == 0)
863	string = NULL;	791	string = NULL;
864	}	792	}
865		793
866	#ifdef SKILL_UTIL_DEBUG	794	#ifdef SKILL_UTIL_DEBUG
867	LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");	795	LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");
868	#endif	796	#endif
869		797
870	/* Change to the new skill, then execute it. */
871	if (do_skill (op, op, skop, op->facing, string))	798	if (do_skill (op, op, skop, op->facing, string))
872	return 1;	799	return 1;
873		800
874	return 0;	801	return 0;
875	}	802	}
876		803
877	static bool	804	static bool
878	hth_skill_p (object *skill)	805	hth_skill_p (object *skill)
879	{	806	{
880	for (unsigned int i = 0; i < sizeof (unarmed_skills); ++i)	807	return (skill_flags [skill->subtype] & (SF_COMBAT \| SF_NEED_ITEM)) == SF_COMBAT;
881	if (skill->subtype == unarmed_skills[i])
882	return 1;
883
884	return 0;
885	}	808	}
886		809
887	/* This finds the first unarmed skill the player has, and returns it.	810	/* This finds the first unarmed skill the player has, and returns it.
888	*/	811	*/
889	static object *	812	static object *
890	find_player_hth_skill (object *op)	813	find_player_hth_skill (object *op)
891	{	814	{
892	for (object *tmp = op->inv; tmp; tmp = tmp->below)	815	for (object *tmp = op->inv; tmp; tmp = tmp->below)
893	if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp))	816	if (tmp->type == SKILL && tmp->flag [FLAG_CAN_USE_SKILL] && hth_skill_p (tmp))
894	return tmp;	817	return tmp;
895		818
896	return 0;	819	return 0;
897	}	820	}
898		821
…		…
915	* is readied either then try to find a skill for the player to use.	838	* is readied either then try to find a skill for the player to use.
916	* it is presumed that if skill is set, it is a valid attack skill (eg,	839	* it is presumed that if skill is set, it is a valid attack skill (eg,
917	* the caller should have set it appropriately). We still want to pass	840	* the caller should have set it appropriately). We still want to pass
918	* through that code if skill is set to change to the skill.	841	* through that code if skill is set to change to the skill.
919	*/	842	*/
920	if (op->type == PLAYER)	843	if (player *pl = op->contr)
921	{	844	{
922	if (!QUERY_FLAG (op, FLAG_READY_WEAPON))	845	if (skill)
923	{	846	{
924	if (!skill)	847	if (!op->apply (skill))
925	{
926	/* See if the players chosen skill is a combat skill, and use
927	* it if appropriate.
928	*/
929	if (op->chosen_skill && hth_skill_p (op->chosen_skill))
930	skill = op->chosen_skill;
931	else
932	{
933	skill = find_player_hth_skill (op);
934
935	if (!skill)
936	{
937	new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
938	return 0;
939	}
940	}
941	}
942
943	/* now try to ready the new skill */
944	if (!change_skill (op, skill, 0))
945	{ /* oh oh, trouble! */
946	new_draw_info_format (NDI_UNIQUE, 0, tmp, "Couldn't change to skill %s", &skill->name);
947	return 0;	848	return 0;
948	}
949	}	849	}
950	else	850	else
951	{	851	{
952	/* Seen some crashes below where current_weapon is not set,	852	if (!pl->combat_ob)
953	* even though the flag says it is. So if current weapon isn't set,
954	* do some work in trying to find the object to use.
955	*/
956	if (!op->current_weapon)
957	{	853	{
958	object *tmp;	854	if (op->flag [FLAG_READY_WEAPON])
959
960	LOG (llevError, "Player %s does not have current weapon set but flag_ready_weapon is set\n", &op->name);
961	for (tmp = op->inv; tmp; tmp = tmp->below)
962	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
963	break;
964
965	if (!tmp)
966	{	855	{
		856	for (tmp = op->inv; tmp; tmp = tmp->below)
		857	if (tmp->type == WEAPON && tmp->flag [FLAG_APPLIED])
		858	break;
		859
		860	if (!tmp)
967	LOG (llevError, "Could not find applied weapon on %s\n", &op->name);	861	LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
968	op->current_weapon = NULL;	862
		863	pl->combat_ob = tmp;
		864	}
		865
		866	if (!pl->combat_ob)
		867	{
		868	/* See if the players chosen skill is a combat skill, and use
		869	* it if appropriate.
		870	*/
		871	if (op->chosen_skill && hth_skill_p (op->chosen_skill))
		872	skill = op->chosen_skill;
		873	else
		874	{
		875	skill = find_player_hth_skill (op);
		876
		877	if (!skill)
		878	new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
		879	}
		880
		881	op->apply (skill);
		882	}
		883
		884	if (!pl->combat_ob)
		885	{
		886	LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
969	return 0;	887	return 0;
970	}	888	}
971	else
972	op->current_weapon = tmp;
973	}	889	}
974		890
975	change_skill (op, find_skill_by_name (op, op->current_weapon->skill), 1);	891	if (!op->apply (pl->combat_ob))
		892	return 0;
976	}	893	}
977	}
978		894
979	/* lose invisiblity/hiding status for running attacks */	895	/* lose invisiblity/hiding status for running attacks */
980		896	if (pl->tmp_invis)
981	if (op->type == PLAYER && op->contr->tmp_invis)	897	{
982	{
983	op->contr->tmp_invis = 0;	898	pl->tmp_invis = 0;
984	op->invisible = 0;	899	op->invisible = 0;
985	op->hide = 0;	900	op->flag [FLAG_HIDDEN] = 0;
986	update_object (op, UP_OBJ_CHANGE);	901	update_object (op, UP_OBJ_CHANGE);
		902	}
987	}	903	}
988		904
989	int success = attack_ob (tmp, op);	905	int success = attack_ob (tmp, op);
990		906
991	/* print appropriate messages to the player */	907	/* print appropriate messages to the player */
992		908
993	if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED))	909	if (success && string && tmp && !tmp->flag [FLAG_FREED])
994	{	910	{
995	if (op->type == PLAYER)	911	if (op->type == PLAYER)
996	new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));	912	new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
997	else if (tmp->type == PLAYER)	913	else if (tmp->type == PLAYER)
998	new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);	914	new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
…		…
1001	return success;	917	return success;
1002	}	918	}
1003		919
1004	/* skill_attack() - Core routine for use when we attack using a skills	920	/* skill_attack() - Core routine for use when we attack using a skills
1005	* system. In essence, this code handles	921	* system. In essence, this code handles
1006	* all skill-based attacks, ie hth, missile and melee weapons should be	922	* all skill-based attacks, i.e. hth, missile and melee weapons should be
1007	* treated here. If an opponent is already supplied by move_player(),	923	* treated here. If an opponent is already supplied by move_player(),
1008	* we move right onto do_skill_attack(), otherwise we find if an	924	* we move right onto do_skill_attack(), otherwise we find if an
1009	* appropriate opponent exists.	925	* appropriate opponent exists.
1010	*	926	*
1011	* This is called by move_player() and attack_hth()	927	* This is called by move_player() and attack_hth()
…		…
1041	/* space must be blocked for there to be anything interesting to do */	957	/* space must be blocked for there to be anything interesting to do */
1042	if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))	958	if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))
1043	return 0;	959	return 0;
1044		960
1045	for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above)	961	for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above)
1046	if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL) \|\| tmp->type == LOCKED_DOOR)	962	if ((tmp->flag [FLAG_ALIVE] && tmp->stats.hp >= 0) \|\| tmp->flag [FLAG_CAN_ROLL] \|\| tmp->type == LOCKED_DOOR)
1047	{	963	{
1048	/* Don't attack party members */	964	/* Don't attack party members */
1049	if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))	965	if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
1050	return 0;	966	return 0;
1051		967
…		…
1062	}	978	}
1063		979
1064	return do_skill_attack (tmp, pl, string, skill);	980	return do_skill_attack (tmp, pl, string, skill);
1065	}	981	}
1066		982
1067
1068	/* attack_hth() - this handles all hand-to-hand attacks -b.t. */	983	/* attack_hth() - this handles all hand-to-hand attacks -b.t. */
1069		984
1070	/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first	985	/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first
1071	* (attack_hth) we check for weapon use, etc in the second (the new	986	* (attack_hth) we check for weapon use, etc in the second (the new
1072	* function skill_attack() we actually attack.	987	* function skill_attack() we actually attack.
1073	*/	988	*/
1074
1075	static int	989	static int
1076	attack_hth (object pl, int dir, const char string, object *skill)	990	attack_hth (object pl, int dir, const char string, object *skill)
1077	{	991	{
1078	object enemy = NULL, weapon;	992	object enemy = NULL, weapon;
1079		993
1080	if (QUERY_FLAG (pl, FLAG_READY_WEAPON))	994	if (pl->flag [FLAG_READY_WEAPON])
1081	for (weapon = pl->inv; weapon; weapon = weapon->below)	995	for (weapon = pl->inv; weapon; weapon = weapon->below)
1082	{	996	{
1083	if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED))	997	if (weapon->type == WEAPON && weapon->flag [FLAG_APPLIED])
1084	{	998	{
1085	CLEAR_FLAG (weapon, FLAG_APPLIED);	999	weapon->clr_flag (FLAG_APPLIED);
1086	CLEAR_FLAG (pl, FLAG_READY_WEAPON);	1000	pl->clr_flag (FLAG_READY_WEAPON);
1087	pl->update_stats ();	1001	pl->update_stats ();
1088	if (pl->type == PLAYER)	1002	if (pl->type == PLAYER)
1089	{	1003	{
1090	new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");	1004	new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
1091	esrv_update_item (UPD_FLAGS, pl, weapon);	1005	esrv_update_item (UPD_FLAGS, pl, weapon);
1092	}	1006	}
		1007
1093	break;	1008	break;
1094	}	1009	}
1095	}	1010	}
1096		1011
1097	return skill_attack (enemy, pl, dir, string, skill);	1012	return skill_attack (enemy, pl, dir, string, skill);
…		…
1108	*/	1023	*/
1109	static int	1024	static int
1110	attack_melee_weapon (object op, int dir, const char string, object *skill)	1025	attack_melee_weapon (object op, int dir, const char string, object *skill)
1111	{	1026	{
1112		1027
1113	if (!QUERY_FLAG (op, FLAG_READY_WEAPON))	1028	if (!op->flag [FLAG_READY_WEAPON])
1114	{	1029	{
1115	if (op->type == PLAYER)	1030	if (op->type == PLAYER)
1116	new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");	1031	new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");
1117		1032
1118	return 0;	1033	return 0;
1119	}	1034	}
1120		1035
1121	return skill_attack (NULL, op, dir, string, skill);	1036	return skill_attack (NULL, op, dir, string, skill);
1122
1123	}	1037	}
		1038

Diff Legend

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

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.32 by root, Sun Apr 29 21:44:35 2007 UTC vs. Revision 1.97 by root, Thu Apr 15 00:36:51 2010 UTC

Diff Legend

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.32 by root, Sun Apr 29 21:44:35 2007 UTC vs.
Revision 1.97 by root, Thu Apr 15 00:36:51 2010 UTC