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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.29 by root, Wed Mar 14 04:12:29 2007 UTC vs.
Revision 1.92 by root, Sat Apr 10 04:54:10 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	};
64		55
65	static int attack_hth (object pl, int dir, const char string, object *skill);	56	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);	57	static int attack_melee_weapon (object op, int dir, const char string, object *skill);
67		58
68	/* init_skills basically just sets up the skill_names table	59	/* init_skills basically just sets up the skill_names table
69	* above. The index into the array is set up by the	60	* above. The index into the array is set up by the
70	* subtypes.	61	* subtypes.
71	*/	62	*/
72	void	63	void
73	init_skills (void)	64	init_skills ()
74	{	65	{
75	int i;	66	for_all_archetypes (at)
76	archetype *at;
77
78	for (at = first_archetype; at != NULL; at = at->next)
79	if (at->clone.type == SKILL)	67	if (at->type == SKILL)
80	{	68	{
81	if (skill_names[at->clone.subtype] != NULL)	69	if (skill_names[at->subtype])
82	LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n",	70	LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n",
83	at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill);	71	at->subtype, &skill_names[at->subtype], &at->skill);
84	else	72	else
85	skill_names[at->clone.subtype] = at->clone.skill;	73	skill_names[at->subtype] = at->skill;
86	}	74	}
87		75
88	/* This isn't really an error if there is no skill subtype set, but	76	/* This isn't really an error if there is no skill subtype set, but
89	* checking for this may catch some user errors.	77	* checking for this may catch some user errors.
90	*/	78	*/
91	for (i = 1; i < NUM_SKILLS; i++)	79	for (int i = 1; i < NUM_SKILLS; i++)
92	{
93	if (!skill_names[i])	80	if (!skill_names[i])
94	LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);	81	LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);
95	}
96	}	82	}
97		83
98	/* This function goes through the player inventory and sets	84	/* This function goes through the player inventory and sets
99	* up the last_skills[] array in the player object.	85	* up the last_skills[] array in the player object.
100	* the last_skills[] is used to more quickly lookup skills -	86	* the last_skills[] is used to more quickly lookup skills -
101	* mostly used for sending exp.	87	* mostly used for sending exp.
102	*/	88	*/
103	void	89	void
104	link_player_skills (object *op)	90	player::link_skills ()
105	{	91	{
		92	for (int i = 0; i < NUM_SKILLS; ++i)
		93	last_skill_ob [i] = 0;
		94
106	for (object *tmp = op->inv; tmp; tmp = tmp->below)	95	for (object *tmp = ob->inv; tmp; tmp = tmp->below)
107	if (tmp->type == SKILL)	96	if (tmp->type == SKILL)
108	{	97	{
109	/* This is really a warning, hence no else below */	98	assert (IN_RANGE_EXC (tmp->subtype, 0, NUM_SKILLS));
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		99
114	if (tmp->subtype >= NUM_SKILLS)	100	if (last_skill_ob [tmp->subtype] != tmp)
115	LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS);
116	else
117	{	101	{
		102	/* This is really a warning, hence no else below */
		103	if (last_skill_ob [tmp->subtype])
		104	LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",
		105	&last_skill_ob [tmp->subtype]->skill, &tmp->skill);
		106
118	op->contr->last_skill_ob[tmp->subtype] = tmp;	107	last_skill_ob [tmp->subtype] = tmp;
119	op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go	108	if (ns)
		109	ns->last_skill_exp [tmp->subtype] = -1;
120	}	110	}
121	}	111	}
122	}	112	}
123		113
		114	static object *
		115	find_skill (object *who, shstr_cmp name)
		116	{
		117	if (who->chosen_skill
		118	&& who->chosen_skill->skill == name
		119	&& who->chosen_skill->type == SKILL)
		120	return who->chosen_skill;
		121
		122	for (object *tmp = who->inv; tmp; tmp = tmp->below)
		123	if (tmp->skill == name && tmp->type == SKILL)
		124	return splay (tmp);
		125
		126	return 0;
		127	}
		128
		129	object *player::find_skill (shstr_cmp name) const
		130	{
		131	// might want to use last_skill_obj at one point, or maybe not
		132	return ::find_skill (ob, name);
		133	}
		134
124	/* This returns the skill pointer of the given name (the	135	/* This returns the skill pointer of the given name (the
125	* one that accumlates exp, has the level, etc).	136	* one that accumulates exp, has the level, etc).
126	*	137	*
127	* It is presumed that the player will be needing to actually	138	* 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	139	* use the skill, so thus if use of the skill requires a skill
129	* tool, this code will equip it.	140	* tool, this code will equip it.
130	*/	141	*/
131	object *	142	object *
132	find_skill_by_name (object who, const char name)	143	find_skill_by_name (object *who, shstr_cmp sh)
133	{	144	{
134	object skill = NULL, skill_tool = NULL, *tmp;	145	object *skill_tool = 0;
135		146
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)	147	for (object *tmp = who->inv; tmp; tmp = tmp->below)
		148	if (tmp->skill == sh)
144	{	149	{
145	if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name))	150	if (tmp->type == SKILL && (tmp->flag [FLAG_CAN_USE_SKILL] \|\| tmp->flag [FLAG_APPLIED]))
146	skill = tmp;	151	/* If this is a skill that can be used without applying tool, return it */
147		152	return splay (tmp);
148	/* Try to find appropriate skilltool. If the player has one already	153	/* Try to find appropriate skilltool. If the player has one already
149	* applied, we try to keep using that one.	154	* applied, we try to keep using that one.
150	*/	155	*/
151	else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name))	156	else if (tmp->type == SKILL_TOOL && !skill_tool)
152	{
153	if (QUERY_FLAG (tmp, FLAG_APPLIED))
154	skill_tool = tmp;	157	skill_tool = tmp;
155	else if (!skill_tool \|\| !QUERY_FLAG (skill_tool, FLAG_APPLIED))
156	skill_tool = tmp;
157	}	158	}
158	}	159
159	/* If this is a skill that can be used without a tool, return it */	160	if (!skill_tool)
160	if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
161	return skill;	161	return 0;
162		162
163	/* Player has a tool to use the skill. IF not applied, apply it -	163	/* 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	164	* if not successful, return null. If they do have the skill tool
165	* but not the skill itself, give it to them.	165	* but not the skill itself, give it to them.
166	*/	166	*/
167	if (skill_tool)	167	object *skill = find_skill (who, skill_tool->skill);
168	{	168
169	if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
170	{
171	if (apply_special (who, skill_tool, 0))
172	return NULL;
173	}
174	if (!skill)	169	if (!skill)
175	{
176	skill = give_skill_by_name (who, skill_tool->skill);	170	skill = give_skill_by_name (who, skill_tool->skill);
177	link_player_skills (who);	171
178	}	172	if (!skill_tool->flag [FLAG_APPLIED])
		173	if (!who->apply (splay (skill_tool)))
179	return skill;	174	return 0;
180	}	175
		176	return splay (skill);
		177	}
		178
		179	object *
		180	find_skill_by_name_fuzzy (object who, const char name)
		181	{
		182	if (name)
		183	for (object *tmp = who->inv; tmp; tmp = tmp->below)
		184	if ((tmp->type == SKILL \|\| tmp->type == SKILL_TOOL)
		185	&& tmp->skill.starts_with (name))
		186	if (object *skop = find_skill_by_name (who, tmp->skill))
		187	return skop;
		188
181	return NULL;	189	return 0;
182	}	190	}
183
184		191
185	/* This returns the skill pointer of the given name (the	192	/* This returns the skill pointer of the given name (the
186	* one that accumlates exp, has the level, etc).	193	* one that accumulates exp, has the level, etc).
187	*	194	*
188	* It is presumed that the player will be needing to actually	195	* 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	196	* use the skill, so thus if use of the skill requires a skill
190	* tool, this code will equip it.	197	* tool, this code will equip it.
191	*	198	*
…		…
194	* this replaces find_skill.	201	* this replaces find_skill.
195	*/	202	*/
196	object *	203	object *
197	find_skill_by_number (object *who, int skillno)	204	find_skill_by_number (object *who, int skillno)
198	{	205	{
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)	206	for (object *tmp = who->inv; tmp; tmp = tmp->below)
205	{
206	if (tmp->type == SKILL && tmp->subtype == skillno)	207	if (tmp->type == SKILL && tmp->subtype == skillno)
207	skill = tmp;	208	if (object *skop = find_skill_by_name (who, tmp->skill))
208
209	/* Try to find appropriate skilltool. If the player has one already
210	* applied, we try to keep using that one.
211	*/
212	else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno)
213	{
214	if (QUERY_FLAG (tmp, FLAG_APPLIED))
215	skill_tool = tmp;
216	else if (!skill_tool \|\| !QUERY_FLAG (skill_tool, FLAG_APPLIED))
217	skill_tool = tmp;
218	}
219	}
220	/* If this is a skill that can be used without a tool, return it */
221	if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
222	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;	209	return skop;
243	}
244		210
245	return NULL;	211	return 0;
246	}	212	}
247		213
248	/* This changes the objects skill to new_skill.	214	/* This changes the objects chosen_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	215	* return 1 on success, 0 on error
258	*/	216	*/
259		217	bool
260	int	218	object::change_skill (object *new_skill)
261	change_skill (object who, object new_skill, int flag)
262	{	219	{
263	int old_range;
264
265	if (who->type != PLAYER)	220	if (type != PLAYER)
266	return 0;	221	return 0;
267		222
268	old_range = who->contr->shoottype;	223	// optimise this supposedly common case
269		224	if (new_skill == chosen_skill)
270	if (who->chosen_skill && who->chosen_skill == new_skill)
271	{
272	/* optimization for changing skill to current skill */
273	if (who->type == PLAYER && !(flag & 0x1))
274	who->contr->shoottype = range_skill;
275
276	return 1;	225	return 1;
277	}
278		226
279	// move skill to front, so it will be preferred next time
280	new_skill->remove ();
281	who->insert (new_skill);
282
283	if (!new_skill \|\| who->chosen_skill)
284	if (who->chosen_skill)	227	if (chosen_skill)
285	apply_special (who, who->chosen_skill, AP_UNAPPLY);	228	{
		229	chosen_skill->flag [FLAG_APPLIED] = false;
		230	change_abil (this, chosen_skill);
		231	}
286		232
287	/* Only goal in this case was to unapply a skill */	233	chosen_skill = new_skill;
		234
288	if (!new_skill)	235	if (chosen_skill)
289	return 0;	236	{
		237	chosen_skill->flag [FLAG_APPLIED] = true;
		238	change_abil (this, chosen_skill);
		239	}
290		240
291	if (apply_special (who, new_skill, AP_APPLY))	241	// always clear current weapon, as the selected skill could
292	return 0;	242	// conflict with the current weapon skill, which would go
		243	// undetected and exp would be given to the wrong skill.
		244	current_weapon = 0;
293		245
294	if (flag & 0x1)	246	update_stats ();
295	who->contr->shoottype = (rangetype)old_range;
296
297	return 1;	247	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	}	248	}
315		249
316	/* do_skill() - Main skills use function-similar in scope to cast_spell().	250	/* 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.	251	* 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	252	* We require a separate routine outside of fire() so as to allow monsters
…		…
321	* exp - no caller needed that info, but it also prevented the callers	255	* exp - no caller needed that info, but it also prevented the callers
322	* from know if a skill was actually used, as many skills don't	256	* from know if a skill was actually used, as many skills don't
323	* give any exp for their direct use (eg, throwing).	257	* give any exp for their direct use (eg, throwing).
324	* It returns 0 if no skill was used.	258	* It returns 0 if no skill was used.
325	*/	259	*/
326
327	int	260	int
328	do_skill (object op, object part, object skill, int dir, const char string)	261	do_skill (object op, object part, object skill, int dir, const char string)
329	{	262	{
330	int success = 0, exp = 0;	263	int success = 0, exp = 0;
331	int did_alc = 0;
332	object tmp, next;
333		264
334	if (!skill)	265	if (!skill)
335	return 0;	266	return 0;
336		267
337	/* The code below presumes that the skill points to the object that	268	/* The code below presumes that the skill points to the object that
…		…
339	* go and try to find the actual real skill pointer, and if the	270	* go and try to find the actual real skill pointer, and if the
340	* the player doesn't have a bucket for that, create one.	271	* the player doesn't have a bucket for that, create one.
341	*/	272	*/
342	if (skill->type != SKILL && op->type == PLAYER)	273	if (skill->type != SKILL && op->type == PLAYER)
343	{	274	{
344	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	275	for (object *tmp = op->inv; tmp; tmp = tmp->below)
345	if (tmp->type == SKILL && tmp->skill == skill->skill)	276	if (tmp->type == SKILL && tmp->skill == skill->skill)
346	break;	277	{
		278	skill = tmp;
		279	goto found;
		280	}
347		281
348	if (!tmp)
349	tmp = give_skill_by_name (op, skill->skill);	282	skill = give_skill_by_name (op, skill->skill);
350		283	found: ;
351	skill = tmp;
352	}	284	}
353		285
354	// skill, by_whom, on_which_object, which direction, skill_argument	286	// skill, by_whom, on_which_object, which direction, skill_argument
355	if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))	287	if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))
356	return 0;	288	return 0;
…		…
369	new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");	301	new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
370	}	302	}
371	else	303	else
372	{	304	{
373	SET_FLAG (skill, FLAG_APPLIED);	305	SET_FLAG (skill, FLAG_APPLIED);
374	new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!.");	306	new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
375	}	307	}
376		308
377	op->update_stats ();	309	op->update_stats ();
378	success = 1;	310	success = 1;
379	break;	311	break;
…		…
389	case SK_HIDING:	321	case SK_HIDING:
390	exp = success = hide (op, skill);	322	exp = success = hide (op, skill);
391	break;	323	break;
392		324
393	case SK_JUMPING:	325	case SK_JUMPING:
394	success = jump (op, dir, skill);	326	exp = success = jump (op, dir, skill);
395	break;	327	break;
396		328
397	case SK_INSCRIPTION:	329	case SK_INSCRIPTION:
398	exp = success = write_on_item (op, string, skill);	330	exp = success = write_on_item (op, string, skill);
399	break;	331	break;
…		…
403	success = 1;	335	success = 1;
404	break;	336	break;
405	/* note that the following 'attack' skills gain exp through hit_player() */	337	/* note that the following 'attack' skills gain exp through hit_player() */
406		338
407	case SK_KARATE:	339	case SK_KARATE:
408	(void) attack_hth (op, dir, "karate-chopped", skill);	340	attack_hth (op, dir, "karate-chopped", skill);
409	break;	341	break;
410		342
411	case SK_PUNCHING:	343	case SK_PUNCHING:
412	(void) attack_hth (op, dir, "punched", skill);	344	attack_hth (op, dir, "punched", skill);
413	break;	345	break;
414		346
415	case SK_FLAME_TOUCH:	347	case SK_FLAME_TOUCH:
416	(void) attack_hth (op, dir, "flamed", skill);	348	attack_hth (op, dir, "flamed", skill);
417	break;	349	break;
418		350
419	case SK_SPARK_TOUCH:	351	case SK_SPARK_TOUCH:
420	(void) attack_hth (op, dir, "zapped", skill);	352	attack_hth (op, dir, "zapped", skill);
421	break;	353	break;
422		354
423	case SK_SHIVER:	355	case SK_SHIVER:
424	(void) attack_hth (op, dir, "froze", skill);	356	attack_hth (op, dir, "froze", skill);
425	break;	357	break;
426		358
427	case SK_ACID_SPLASH:	359	case SK_ACID_SPLASH:
428	(void) attack_hth (op, dir, "dissolved", skill);	360	attack_hth (op, dir, "dissolved", skill);
429	break;	361	break;
430		362
431	case SK_POISON_NAIL:	363	case SK_POISON_NAIL:
432	(void) attack_hth (op, dir, "injected poison into", skill);	364	attack_hth (op, dir, "injected poison into", skill);
433	break;	365	break;
434		366
435	case SK_CLAWING:	367	case SK_CLAWING:
436	(void) attack_hth (op, dir, "clawed", skill);	368	attack_hth (op, dir, "clawed", skill);
437	break;	369	break;
438		370
439	case SK_ONE_HANDED_WEAPON:	371	case SK_ONE_HANDED_WEAPON:
440	case SK_TWO_HANDED_WEAPON:	372	case SK_TWO_HANDED_WEAPON:
441	(void) attack_melee_weapon (op, dir, NULL, skill);	373	attack_melee_weapon (op, dir, NULL, skill);
442	break;	374	break;
443		375
444	case SK_FIND_TRAPS:	376	case SK_FIND_TRAPS:
445	exp = success = find_traps (op, skill);	377	exp = success = find_traps (op, skill);
446	break;	378	break;
…		…
461	case SK_LITERACY:	393	case SK_LITERACY:
462	case SK_WOODSMAN:	394	case SK_WOODSMAN:
463	/* first, we try to find a cauldron, and do the alchemy thing.	395	/* first, we try to find a cauldron, and do the alchemy thing.
464	* failing that, we go and identify stuff.	396	* failing that, we go and identify stuff.
465	*/	397	*/
		398	{
		399	bool found_cauldron = false;
		400
466	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = next)	401	for (object next, tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
467	{	402	{
468	next = tmp->above;	403	next = tmp->above;
469		404
470	if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))	405	if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
471	{	406	{
		407	found_cauldron = true;
		408
		409	if (tmp->skill != skill->skill)
		410	{
		411	op->failmsgf ("You can't use the %s with the %s skill!",
		412	query_name (tmp),
		413	query_name (skill));
		414	break;
		415	}
		416
472	attempt_do_alchemy (op, tmp);	417	attempt_do_alchemy (op, tmp, skill);
473		418
474	if (QUERY_FLAG (tmp, FLAG_APPLIED))	419	if (QUERY_FLAG (tmp, FLAG_APPLIED))
475	esrv_send_inventory (op, tmp);	420	esrv_send_inventory (op, tmp);
476
477	did_alc = 1;
478	}	421	}
479	}	422	}
480		423
481	if (did_alc == 0)	424	if (!found_cauldron)
482	exp = success = skill_ident (op, skill);	425	exp = success = skill_ident (op, skill);
483		426	}
484	break;	427	break;
485		428
486	case SK_DET_MAGIC:	429	case SK_DET_MAGIC:
487	case SK_DET_CURSE:	430	case SK_DET_CURSE:
488	exp = success = skill_ident (op, skill);	431	exp = success = skill_ident (op, skill);
…		…
519	case SK_SUMMONING:	462	case SK_SUMMONING:
520	case SK_CLIMBING:	463	case SK_CLIMBING:
521	new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");	464	new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
522	break;	465	break;
523		466
		467	case SK_MINING:
		468	success = skill_mining (op, part, skill, dir, string);
		469	break;
		470
		471	case SK_FISHING:
		472	success = skill_fishing (op, part, skill, dir, string);
		473	break;
		474
524	default:	475	default:
525	LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);	476	LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
526	break;	477	break;
527	}	478	}
528		479
…		…
530	* Monsters have no skill use time because of the random nature in	481	* Monsters have no skill use time because of the random nature in
531	* which use_monster_skill is called already simulates this.	482	* which use_monster_skill is called already simulates this.
532	* If certain skills should take more/less time, that should be	483	* If certain skills should take more/less time, that should be
533	* in the code for the skill itself.	484	* in the code for the skill itself.
534	*/	485	*/
535
536	if (op->type == PLAYER)	486	if (op->type == PLAYER)
537	op->speed_left -= 1.0;	487	op->speed_left -= 1.f;
538		488
539	/* this is a good place to add experience for successfull use of skills.	489	/* this is a good place to add experience for successfull use of skills.
540	* Note that add_exp() will figure out player/monster experience	490	* Note that add_exp() will figure out player/monster experience
541	* gain problems.	491	* gain problems.
542	*/	492	*/
…		…
570	* op is the object that was 'defeated'.	520	* op is the object that was 'defeated'.
571	* skill is the skill used. If no skill is used, it should just	521	* skill is the skill used. If no skill is used, it should just
572	* point back to who.	522	* point back to who.
573	*	523	*
574	*/	524	*/
575
576	int	525	int
577	calc_skill_exp (object who, object op, object *skill)	526	calc_skill_exp (object who, object op, object *skill)
578	{	527	{
579	int op_exp = 0, op_lvl = 0;	528	int op_exp = 0, op_lvl = 0;
580	float base, value, lvl_mult = 0.0;	529	float base, value, lvl_mult = 0.0;
…		…
589	* If an object is not alive and magical we set the base exp higher to	538	* If an object is not alive and magical we set the base exp higher to
590	* help out exp awards for skill_ident skills. Also, if	539	* help out exp awards for skill_ident skills. Also, if
591	* an item is type RUNE, we give out exp based on stats.Cha	540	* an item is type RUNE, we give out exp based on stats.Cha
592	* and level (this was the old system) -b.t.	541	* and level (this was the old system) -b.t.
593	*/	542	*/
594
595	if (!op)	543	if (!op)
596	{ /* no item/creature */	544	{ /* no item/creature */
597	op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty;	545	op_lvl = max (1, who->map->difficulty);
598	op_exp = 0;	546	op_exp = 0;
599	}	547	}
600	else if (op->type == RUNE \|\| op->type == TRAP)	548	else if (op->type == RUNE \|\| op->type == TRAP)
601	{ /* all traps. If stats.Cha > 1 we use that	549	{ /* all traps. If stats.Cha > 1 we use that
602	* for the amount of experience */	550	* for the amount of experience */
…		…
606	else	554	else
607	{ /* all other items/living creatures */	555	{ /* all other items/living creatures */
608	op_exp = op->stats.exp;	556	op_exp = op->stats.exp;
609	op_lvl = op->level;	557	op_lvl = op->level;
610	if (!QUERY_FLAG (op, FLAG_ALIVE))	558	if (!QUERY_FLAG (op, FLAG_ALIVE))
611	{ /* for ident/make items */	559	op_lvl += 5 * abs (op->magic); /* for ident/make items */
612	op_lvl += 5 * abs (op->magic);
613	}
614	}	560	}
615		561
616	if (op_lvl < 1)	562	if (op_lvl < 1)
617	op_lvl = 1;	563	op_lvl = 1;
618		564
…		…
626	/* if skill really is a skill, then we can look at the skill archetype for	572	/* if skill really is a skill, then we can look at the skill archetype for
627	* bse reward value (exp) and level multiplier factor.	573	* bse reward value (exp) and level multiplier factor.
628	*/	574	*/
629	if (skill->type == SKILL)	575	if (skill->type == SKILL)
630	{	576	{
631	base += skill->arch->clone.stats.exp;	577	base += skill->arch->stats.exp;
632	if (settings.simple_exp)	578	if (settings.simple_exp)
633	{	579	{
634	if (skill->arch->clone.level)	580	if (skill->arch->level)
635	lvl_mult = (float) skill->arch->clone.level / 100.0;	581	lvl_mult = (float) skill->arch->level / 100.0;
636	else	582	else
637	lvl_mult = 1.0; /* no adjustment */	583	lvl_mult = 1.0; /* no adjustment */
638	}	584	}
639	else	585	else
640	{	586	{
641	if (skill->level)	587	if (skill->level)
642	lvl_mult = ((float) skill->arch->clone.level * (float) op_lvl) / ((float) skill->level * 100.0);	588	lvl_mult = ((float) skill->arch->level * (float) op_lvl) / ((float) skill->level * 100.0);
643	else	589	else
644	lvl_mult = 1.0;	590	lvl_mult = 1.0;
645	}	591	}
646	}	592	}
647	else	593	else
648	{	594	{
649	/* Don't divide by zero here! */	595	/* Don't divide by zero here! */
650	lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1);	596	lvl_mult = (float) op_lvl / (float) max (1, skill->level);
651	}	597	}
652	}	598	}
653		599
654	/* assemble the exp total, and return value */	600	/* assemble the exp total, and return value */
655		601
…		…
669	* This one actually teaches the player the skill as something	615	* This one actually teaches the player the skill as something
670	* they can equip.	616	* they can equip.
671	* Return 0 if the player knows the skill, 1 if the	617	* Return 0 if the player knows the skill, 1 if the
672	* player learns the skill, 2 otherwise.	618	* player learns the skill, 2 otherwise.
673	*/	619	*/
674
675	int	620	int
676	learn_skill (object pl, object scroll)	621	learn_skill (object pl, object scroll)
677	{	622	{
678	object *tmp;
679
680	if (!scroll->skill)	623	if (!scroll->skill)
681	{	624	{
682	LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);	625	LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);
683	return 2;	626	return 2;
684	}	627	}
685		628
686	/* can't use find_skill_by_name because we want skills the player knows	629	object *tmp = find_skill (pl, scroll->skill);
687	* but can't use natively.
688	*/
689
690	for (tmp = pl->inv; tmp != NULL; tmp = tmp->below)
691	if (tmp->type == SKILL && !strncasecmp (scroll->skill, tmp->skill, strlen (scroll->skill)))
692	break;
693		630
694	/* player already knows it */	631	/* player already knows it */
695	if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))	632	if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
696	return 0;	633	return 0;
697		634
…		…
710	LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);	647	LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);
711	return 2;	648	return 2;
712	}	649	}
713		650
714	SET_FLAG (tmp, FLAG_CAN_USE_SKILL);	651	SET_FLAG (tmp, FLAG_CAN_USE_SKILL);
715	link_player_skills (pl);	652
716	return 1;	653	return 1;
717	}	654	}
718		655
719	/* Gives a percentage clipped to 0% -> 100% of a/b. */	656	/* Gives a percentage clipped to 0% -> 100% of a/b. */
720
721	/* Probably belongs in some global utils-type file? */	657	/* Probably belongs in some global utils-type file? */
722	static int	658	static int
723	clipped_percent (sint64 a, sint64 b)	659	clipped_percent (sint64 a, sint64 b)
724	{	660	{
725	int rv;	661	int rv;
…		…
745	* Note this function is a bit more complicated becauase we	681	* Note this function is a bit more complicated becauase we
746	* we want ot sort the skills before printing them. If we	682	* we want ot sort the skills before printing them. If we
747	* just dumped this as we found it, this would be a bit	683	* just dumped this as we found it, this would be a bit
748	* simpler.	684	* simpler.
749	*/	685	*/
750		686	//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
751	void	687	void
752	show_skills (object op, const char search)	688	show_skills (object pl, const char search)
753	{	689	{
754	object *tmp = NULL;
755	char buf[MAX_BUF];
756	const char *cp;	690	const char *cp;
757	int i, num_skills_found = 0;	691	int i, num_skills_found = 0;
758	static const char *const periods = "........................................";	692	const char *const periods = ".............................."; // 30
759		693
760	/* Need to have a pointer and use strdup for qsort to work properly */	694	/* Need to have a pointer and use strdup for qsort to work properly */
761	char skills[NUM_SKILLS][MAX_BUF];	695	char skills[NUM_SKILLS][128]; // d'oh
762		696
		697	object *op = pl->contr->ob;
763		698
764	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	699	for (object *tmp = op->inv; tmp; tmp = tmp->below)
765	{	700	{
766	if (tmp->type == SKILL)	701	if (tmp->type == SKILL)
767	{	702	{
768	if (search && strstr (tmp->name, search) == NULL)	703	if (search && !tmp->name.contains (search))
769	continue;	704	continue;
		705
		706	char buf[30];
		707
770	/* Basically want to fill this out to 40 spaces with periods */	708	/* Basically want to fill this out to 30 spaces with periods */
771	sprintf (buf, "%s%s", &tmp->name, periods);	709	snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
772	buf[40] = 0;
773		710
774	if (settings.permanent_exp_ratio)	711	if (settings.permanent_exp_ratio)
775	{
776	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",	712	snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
777	buf, tmp->level, tmp->stats.exp,	713	buf, tmp->level, tmp->stats.exp,
778	level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));	714	level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
779	}
780	else	715	else
781	{
782	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",	716	snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
783	buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));	717	buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
784	}	718
785	/* I don't know why some characters get a bunch of skills, but	719	/* I don't know why some characters get a bunch of skills, but
786	* it sometimes happens (maybe a leftover from bugier earlier code	720	* it sometimes happens (maybe a leftover from bugier earlier code
787	* and those character are still about). In any case, lets handle	721	* and those character are still about). In any case, lets handle
788	* it so it doesn't crash the server - otherwise, one character may	722	* it so it doesn't crash the server - otherwise, one character may
789	* crash the server numerous times.	723	* crash the server numerous times.
790	*/	724	*/
791	if (num_skills_found >= NUM_SKILLS)	725	if (num_skills_found >= NUM_SKILLS)
792	{	726	{
793	new_draw_info (NDI_RED, 0, op, "Your character has too many skills.");	727	new_draw_info (NDI_RED \| NDI_REPLY, 0, op, "Your character has too many skills.");
794	new_draw_info (NDI_RED, 0, op, "Something isn't right - contact the server admin");	728	new_draw_info (NDI_RED \| NDI_REPLY, 0, op, "Something isn't right - contact the server admin");
795	break;	729	break;
796	}	730	}
797	}	731	}
798	}	732	}
799		733
800	clear_win_info (op);	734	dynbuf_text &msg = msg_dynbuf; msg.clear ();
801	new_draw_info (NDI_UNIQUE, 0, op, "Player skills:");	735
		736	msg << "T<Player skills:>\n\n";
802	if (num_skills_found > 1)	737	if (num_skills_found > 1)
803	qsort (skills, num_skills_found, MAX_BUF, (int ()(const void , const void *)) std::strcmp);	738	qsort (skills, num_skills_found, sizeof (skills [0]), (int ()(const void , const void *)) std::strcmp);
804		739
805	for (i = 0; i < num_skills_found; i++)	740	for (i = 0; i < num_skills_found; i++)
806	new_draw_info (NDI_UNIQUE, 0, op, skills[i]);	741	msg << " C<" << skills [i] << ">\n";
807		742
808	new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5);	743	msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r";
809		744
810	cp = determine_god (op);	745	cp = determine_god (op);
811	new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time");	746	msg << "You worship " << (cp ? cp : "no god at current time") << ".\r";
812		747
813	new_draw_info_format (NDI_UNIQUE, 0, op, "Your equipped item power is %d out of %d\n",	748	msg << "Your equipped item power is " << (int)op->contr->item_power
814	op->contr->item_power, (int) (op->level * settings.item_power_factor));	749	<< " out of " << int (op->level * settings.item_power_factor)
		750	<< ".\n";
		751
		752	pl->contr->infobox (MSG_CHANNEL ("skills"), msg);
815	}	753	}
816		754
817	/* use_skill() - similar to invoke command, it executes the skill in the	755	/* use_skill() - similar to invoke command, it executes the skill in the
818	* direction that the user is facing. Returns false if we are unable to	756	* direction that the user is facing. Returns false if we are unable to
819	* change to the requested skill, or were unable to use the skill properly.	757	* change to the requested skill, or were unable to use the skill properly.
820	* This is tricky because skills can have spaces. We basically roll	758	* This is tricky because skills can have spaces. We basically roll
821	* our own find_skill_by_name so we can try to do better string matching.	759	* our own find_skill_by_name so we can try to do better string matching.
822	*/	760	*/
823
824	int	761	int
825	use_skill (object op, const char string)	762	use_skill (object op, const char string)
826	{	763	{
827	object *skop;	764	object *skop;
828	size_t len;	765	size_t len;
829		766
830	if (!string)	767	if (!string)
831	return 0;	768	return 0;
832		769
833	for (skop = op->inv; skop != NULL; skop = skop->below)	770	for (skop = op->inv; skop; skop = skop->below)
834	{	771	if ((skop->type == SKILL \|\| skop->type == SKILL_TOOL)
835	if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) &&
836	!strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))	772	&& !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill))))
		773	{
		774	skop = find_skill_by_name (op, skop->skill);
837	break;	775	break;
838	else if (skop->type == SKILL_TOOL && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
839	break;
840	}	776	}
		777
841	if (!skop)	778	if (!skop)
842	{	779	{
843	new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string);	780	op->failmsgf ("Unable to find skill %s.", string);
		781	return 0;
		782	}
		783
		784	if (!(skill_flags [skop->subtype] & SF_USE))
		785	{
		786	op->failmsgf (
		787	"You feel as if you wanted to do something funny, but you can't remember what. "
		788	"H<The %s skill cannot be C<use_skill>'ed - maybe you need to C<ready_skill> it, "
		789	"use it with some item, or it's always active.>",
		790	&skop->skill
		791	);
844	return 0;	792	return 0;
845	}	793	}
846		794
847	len = strlen (skop->skill);	795	len = strlen (skop->skill);
848		796
…		…
850	* options given to the skill. Its pretty simple - if there	798	* options given to the skill. Its pretty simple - if there
851	* are extra parameters (as deteremined by string length), we	799	* are extra parameters (as deteremined by string length), we
852	* want to skip over any leading spaces.	800	* want to skip over any leading spaces.
853	*/	801	*/
854	if (len >= strlen (string))	802	if (len >= strlen (string))
855	{
856	string = NULL;	803	string = NULL;
857	}
858	else	804	else
859	{	805	{
860	string += len;	806	string += len;
861	while (*string == 0x20)	807	while (*string == 0x20)
862	string++;	808	string++;
		809
863	if (strlen (string) == 0)	810	if (strlen (string) == 0)
864	string = NULL;	811	string = NULL;
865	}	812	}
866		813
867	#ifdef SKILL_UTIL_DEBUG	814	#ifdef SKILL_UTIL_DEBUG
868	LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");	815	LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");
869	#endif	816	#endif
870		817
871	/* Change to the new skill, then execute it. */
872	if (do_skill (op, op, skop, op->facing, string))	818	if (do_skill (op, op, skop, op->facing, string))
873	return 1;	819	return 1;
874		820
875	return 0;	821	return 0;
876	}	822	}
877		823
878	static bool	824	static bool
879	hth_skill_p (object *skill)	825	hth_skill_p (object *skill)
880	{	826	{
881	for (unsigned int i = 0; i < sizeof (unarmed_skills); ++i)	827	return (skill_flags [skill->subtype] & (SF_COMBAT \| SF_NEED_ITEM)) == SF_COMBAT;
882	if (skill->subtype == unarmed_skills[i])
883	return 1;
884
885	return 0;
886	}	828	}
887		829
888	/* This finds the first unarmed skill the player has, and returns it.	830	/* This finds the first unarmed skill the player has, and returns it.
889	*/	831	*/
890	static object *	832	static object *
…		…
904	* tmp is the targetted monster.	846	* tmp is the targetted monster.
905	* op is what is attacking	847	* op is what is attacking
906	* string is passed along to describe what messages to describe	848	* string is passed along to describe what messages to describe
907	* the damage.	849	* the damage.
908	*/	850	*/
909
910	static int	851	static int
911	do_skill_attack (object tmp, object op, const char string, object skill)	852	do_skill_attack (object tmp, object op, const char string, object skill)
912	{	853	{
913	int success;
914
915	if (INVOKE_OBJECT (SKILL_ATTACK, op, ARG_OBJECT (tmp), ARG_STRING (string), ARG_OBJECT (skill)))	854	if (INVOKE_OBJECT (SKILL_ATTACK, op, ARG_OBJECT (tmp), ARG_STRING (string), ARG_OBJECT (skill)))
916	return RESULT_INT (0);	855	return RESULT_INT (0);
917		856
918	/* For Players only: if there is no ready weapon, and no "attack" skill	857	/* For Players only: if there is no ready weapon, and no "attack" skill
919	* is readied either then try to find a skill for the player to use.	858	* is readied either then try to find a skill for the player to use.
920	* it is presumed that if skill is set, it is a valid attack skill (eg,	859	* it is presumed that if skill is set, it is a valid attack skill (eg,
921	* the caller should have set it appropriately). We still want to pass	860	* the caller should have set it appropriately). We still want to pass
922	* through that code if skill is set to change to the skill.	861	* through that code if skill is set to change to the skill.
923	*/	862	*/
924	if (op->type == PLAYER)	863	if (player *pl = op->contr)
925	{	864	{
926	if (!QUERY_FLAG (op, FLAG_READY_WEAPON))	865	if (skill)
927	{	866	{
928	if (!skill)	867	if (!op->apply (skill))
929	{
930	/* See if the players chosen skill is a combat skill, and use
931	* it if appropriate.
932	*/
933	if (op->chosen_skill && hth_skill_p (op->chosen_skill))
934	skill = op->chosen_skill;
935	else
936	{
937	skill = find_player_hth_skill (op);
938
939	if (!skill)
940	{
941	new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
942	return 0;
943	}
944	}
945	}
946
947	/* now try to ready the new skill */
948	if (!change_skill (op, skill, 0))
949	{ /* oh oh, trouble! */
950	new_draw_info_format (NDI_UNIQUE, 0, tmp, "Couldn't change to skill %s", &skill->name);
951	return 0;	868	return 0;
952	}
953	}	869	}
954	else	870	else
955	{	871	{
956	/* Seen some crashes below where current_weapon is not set,	872	if (!pl->combat_ob)
957	* even though the flag says it is. So if current weapon isn't set,
958	* do some work in trying to find the object to use.
959	*/
960	if (!op->current_weapon)
961	{	873	{
962	object *tmp;	874	if (QUERY_FLAG (op, FLAG_READY_WEAPON))
963
964	LOG (llevError, "Player %s does not have current weapon set but flag_ready_weapon is set\n", &op->name);
965	for (tmp = op->inv; tmp; tmp = tmp->below)
966	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
967	break;
968
969	if (!tmp)
970	{	875	{
		876	for (tmp = op->inv; tmp; tmp = tmp->below)
		877	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
		878	break;
		879
		880	if (!tmp)
971	LOG (llevError, "Could not find applied weapon on %s\n", &op->name);	881	LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
972	op->current_weapon = NULL;	882
		883	pl->combat_ob = tmp;
		884	}
		885
		886	if (!pl->combat_ob)
		887	{
		888	/* See if the players chosen skill is a combat skill, and use
		889	* it if appropriate.
		890	*/
		891	if (op->chosen_skill && hth_skill_p (op->chosen_skill))
		892	skill = op->chosen_skill;
		893	else
		894	{
		895	skill = find_player_hth_skill (op);
		896
		897	if (!skill)
		898	new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
		899	}
		900
		901	op->apply (skill);
		902	}
		903
		904	if (!pl->combat_ob)
		905	{
		906	LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
973	return 0;	907	return 0;
974	}	908	}
975	else
976	{
977	op->current_weapon = tmp;
978	}
979	}	909	}
980		910
981	change_skill (op, find_skill_by_name (op, op->current_weapon->skill), 1);	911	if (!op->apply (pl->combat_ob))
		912	return 0;
982	}	913	}
983	}
984		914
985	/* lose invisiblity/hiding status for running attacks */	915	/* lose invisiblity/hiding status for running attacks */
986		916	if (pl->tmp_invis)
987	if (op->type == PLAYER && op->contr->tmp_invis)	917	{
988	{
989	op->contr->tmp_invis = 0;	918	pl->tmp_invis = 0;
990	op->invisible = 0;	919	op->invisible = 0;
991	op->hide = 0;	920	op->flag [FLAG_HIDDEN] = 0;
992	update_object (op, UP_OBJ_CHANGE);	921	update_object (op, UP_OBJ_CHANGE);
		922	}
993	}	923	}
994		924
995	success = attack_ob (tmp, op);	925	int success = attack_ob (tmp, op);
996		926
997	/* print appropriate messages to the player */	927	/* print appropriate messages to the player */
998		928
999	if (success && string != NULL && tmp && !QUERY_FLAG (tmp, FLAG_FREED))	929	if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED))
1000	{	930	{
1001	if (op->type == PLAYER)	931	if (op->type == PLAYER)
1002	new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));	932	new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
1003	else if (tmp->type == PLAYER)	933	else if (tmp->type == PLAYER)
1004	new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);	934	new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
1005	}	935	}
		936
1006	return success;	937	return success;
1007	}	938	}
1008
1009		939
1010	/* skill_attack() - Core routine for use when we attack using a skills	940	/* skill_attack() - Core routine for use when we attack using a skills
1011	* system. In essence, this code handles	941	* system. In essence, this code handles
1012	* all skill-based attacks, ie hth, missile and melee weapons should be	942	* all skill-based attacks, i.e. hth, missile and melee weapons should be
1013	* treated here. If an opponent is already supplied by move_player(),	943	* treated here. If an opponent is already supplied by move_player(),
1014	* we move right onto do_skill_attack(), otherwise we find if an	944	* we move right onto do_skill_attack(), otherwise we find if an
1015	* appropriate opponent exists.	945	* appropriate opponent exists.
1016	*	946	*
1017	* This is called by move_player() and attack_hth()	947	* This is called by move_player() and attack_hth()
1018	*	948	*
1019	* Initial implementation by -bt thomas@astro.psu.edu	949	* Initial implementation by -bt thomas@astro.psu.edu
1020	*/	950	*/
1021
1022	int	951	int
1023	skill_attack (object tmp, object pl, int dir, const char string, object skill)	952	skill_attack (object tmp, object pl, int dir, const char string, object skill)
1024	{	953	{
1025	sint16 tx, ty;	954	sint16 tx, ty;
1026	maptile *m;	955	maptile *m;
…		…
1033	ty = freearr_y[dir];	962	ty = freearr_y[dir];
1034		963
1035	/* If we don't yet have an opponent, find if one exists, and attack.	964	/* If we don't yet have an opponent, find if one exists, and attack.
1036	* Legal opponents are the same as outlined in move_player_attack()	965	* Legal opponents are the same as outlined in move_player_attack()
1037	*/	966	*/
1038		967	if (!tmp)
1039	if (tmp == NULL)
1040	{	968	{
1041	m = pl->map;	969	m = pl->map;
1042	tx = pl->x + freearr_x[dir];	970	tx = pl->x + freearr_x[dir];
1043	ty = pl->y + freearr_y[dir];	971	ty = pl->y + freearr_y[dir];
1044		972
…		…
1054	if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL) \|\| tmp->type == LOCKED_DOOR)	982	if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL) \|\| tmp->type == LOCKED_DOOR)
1055	{	983	{
1056	/* Don't attack party members */	984	/* Don't attack party members */
1057	if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))	985	if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
1058	return 0;	986	return 0;
		987
1059	break;	988	break;
1060	}	989	}
1061	}	990	}
		991
1062	if (!tmp)	992	if (!tmp)
1063	{	993	{
1064	if (pl->type == PLAYER)	994	if (pl->type == PLAYER)
1065	new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!");	995	new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!");
		996
1066	return 0;	997	return 0;
1067	}	998	}
1068		999
1069	return do_skill_attack (tmp, pl, string, skill);	1000	return do_skill_attack (tmp, pl, string, skill);
1070	}	1001	}
1071
1072		1002
1073	/* attack_hth() - this handles all hand-to-hand attacks -b.t. */	1003	/* attack_hth() - this handles all hand-to-hand attacks -b.t. */
1074		1004
1075	/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first	1005	/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first
1076	* (attack_hth) we check for weapon use, etc in the second (the new	1006	* (attack_hth) we check for weapon use, etc in the second (the new
1077	* function skill_attack() we actually attack.	1007	* function skill_attack() we actually attack.
1078	*/	1008	*/
1079
1080	static int	1009	static int
1081	attack_hth (object pl, int dir, const char string, object *skill)	1010	attack_hth (object pl, int dir, const char string, object *skill)
1082	{	1011	{
1083	object enemy = NULL, weapon;	1012	object enemy = NULL, weapon;
1084		1013
…		…
1093	if (pl->type == PLAYER)	1022	if (pl->type == PLAYER)
1094	{	1023	{
1095	new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");	1024	new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
1096	esrv_update_item (UPD_FLAGS, pl, weapon);	1025	esrv_update_item (UPD_FLAGS, pl, weapon);
1097	}	1026	}
		1027
1098	break;	1028	break;
1099	}	1029	}
1100	}	1030	}
		1031
1101	return skill_attack (enemy, pl, dir, string, skill);	1032	return skill_attack (enemy, pl, dir, string, skill);
1102	}	1033	}
1103
1104		1034
1105	/* attack_melee_weapon() - this handles melee weapon attacks -b.t.	1035	/* attack_melee_weapon() - this handles melee weapon attacks -b.t.
1106	* For now we are just checking to see if we have a ready weapon here.	1036	* For now we are just checking to see if we have a ready weapon here.
1107	* But there is a real neato possible feature of this scheme which	1037	* But there is a real neato possible feature of this scheme which
1108	* bears mentioning:	1038	* bears mentioning:
1109	* Since we are only calling this from do_skill() in the future	1039	* Since we are only calling this from do_skill() in the future
1110	* we may make this routine handle 'special' melee weapons attacks	1040	* we may make this routine handle 'special' melee weapons attacks
1111	* (like disarming manuever with sai) based on player SK_level and	1041	* (like disarming manuever with sai) based on player SK_level and
1112	* weapon type.	1042	* weapon type.
1113	*/	1043	*/
1114
1115	static int	1044	static int
1116	attack_melee_weapon (object op, int dir, const char string, object *skill)	1045	attack_melee_weapon (object op, int dir, const char string, object *skill)
1117	{	1046	{
1118		1047
1119	if (!QUERY_FLAG (op, FLAG_READY_WEAPON))	1048	if (!QUERY_FLAG (op, FLAG_READY_WEAPON))
1120	{	1049	{
1121	if (op->type == PLAYER)	1050	if (op->type == PLAYER)
1122	new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");	1051	new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");
		1052
1123	return 0;	1053	return 0;
1124	}	1054	}
		1055
1125	return skill_attack (NULL, op, dir, string, skill);	1056	return skill_attack (NULL, op, dir, string, skill);
1126
1127	}	1057	}
		1058

Diff Legend

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

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.29 by root, Wed Mar 14 04:12:29 2007 UTC vs. Revision 1.92 by root, Sat Apr 10 04:54:10 2010 UTC

Diff Legend

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.29 by root, Wed Mar 14 04:12:29 2007 UTC vs.
Revision 1.92 by root, Sat Apr 10 04:54:10 2010 UTC