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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.65 by root, Mon Sep 22 05:45:55 2008 UTC vs.
Revision 1.97 by root, Thu Apr 15 00:36:51 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	/* 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. */
50	# define def(uc, flags) flags,	51	# define def(uc, flags) flags,
51	# include "skillinc.h"	52	# include "skillinc.h"
52	# undef def	53	# undef def
53	};	54	};
54		55
		56	vector<object_ptr> skillvec;
		57
55	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);
56	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);
57		60
58	/* init_skills basically just sets up the skill_names table	61	/* init_skills basically just sets up the skill_names table
59	* above. The index into the array is set up by the	62	* above. The index into the array is set up by the
60	* subtypes.	63	* subtypes.
61	*/	64	*/
62	void	65	void
63	init_skills (void)	66	init_skills ()
64	{	67	{
65	for_all_archetypes (at)	68	// nop
66	if (at->type == SKILL)	69	}
		70
		71	void
		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)
67	{	80	{
68	if (skill_names[at->subtype])	81	// replace existing entry
69	LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n",	82	SKILL_INDEX (o) = i - skillvec.begin ();
70	at->subtype, &skill_names[at->subtype], &at->skill);	83	*i = o;
71	else	84	return;
72	skill_names[at->subtype] = at->skill;
73	}	85	}
74		86
75	/* This isn't really an error if there is no skill subtype set, but	87	// add new entry
76	* checking for this may catch some user errors.	88	assert (("only CS_NUM_SKILLS skills supported by client protocol", skillvec.size () < CS_NUM_SKILLS));
77	*/	89	SKILL_INDEX (o) = skillvec.size ();
78	for (int i = 1; i < NUM_SKILLS; i++)	90	skillvec.push_back (o);
79	if (!skill_names[i])
80	LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);
81	}	91	}
82		92
83	/* This function goes through the player inventory and sets	93	/* This function goes through the player inventory and sets
84	* up the last_skills[] array in the player object.	94	* up the last_skills[] array in the player object.
85	* the last_skills[] is used to more quickly lookup skills -	95	* the last_skills[] is used to more quickly lookup skills -
86	* mostly used for sending exp.	96	* mostly used for sending exp.
87	*/	97	*/
88	void	98	void
89	link_player_skills (object *op)	99	player::link_skills ()
90	{	100	{
		101	for (int i = 0; i < CS_NUM_SKILLS; ++i)
		102	last_skill_ob [i] = 0;
		103
91	for (object *tmp = op->inv; tmp; tmp = tmp->below)	104	for (object *tmp = ob->inv; tmp; tmp = tmp->below)
92	if (tmp->type == SKILL)	105	if (tmp->type == SKILL)
93	{	106	{
94	/* This is really a warning, hence no else below */	107	int idx = SKILL_INDEX (tmp);
95	if (op->contr->last_skill_ob[tmp->subtype] && op->contr->last_skill_ob[tmp->subtype] != tmp)
96	LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",
97	&op->contr->last_skill_ob[tmp->subtype]->skill, &tmp->skill);
98		108
99	if (tmp->subtype >= NUM_SKILLS)	109	assert (IN_RANGE_EXC (idx, 0, CS_NUM_SKILLS));
100	LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS);	110
101	else	111	if (last_skill_ob [idx] != tmp)
102	{	112	{
103	op->contr->last_skill_ob[tmp->subtype] = tmp;	113	last_skill_ob [idx] = tmp;
104	op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go	114	if (ns)
		115	ns->last_skill_exp [idx] = -1;
105	}	116	}
106	}	117	}
107	}	118	}
108		119
109	static object *	120	static object *
110	find_skill (object *who, const shstr &sh)	121	find_skill (object *who, shstr_cmp name)
111	{	122	{
		123	if (who->chosen_skill
		124	&& who->chosen_skill->skill == name
		125	&& who->chosen_skill->type == SKILL)
		126	return who->chosen_skill;
		127
112	for (object *tmp = who->inv; tmp; tmp = tmp->below)	128	for (object *tmp = who->inv; tmp; tmp = tmp->below)
113	if (tmp->skill == sh && tmp->type == SKILL)	129	if (tmp->skill == name && tmp->type == SKILL)
114	return tmp;	130	return splay (tmp);
115		131
116	return 0;	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);
117	}	140	}
118		141
119	/* This returns the skill pointer of the given name (the	142	/* This returns the skill pointer of the given name (the
120	* one that accumulates exp, has the level, etc).	143	* one that accumulates exp, has the level, etc).
121	*	144	*
122	* It is presumed that the player will be needing to actually	145	* It is presumed that the player will be needing to actually
123	* 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
124	* tool, this code will equip it.	147	* tool, this code will equip it.
125	*/	148	*/
126	object *	149	object *
127	find_skill_by_name (object *who, const shstr &sh)	150	find_skill_by_name (object *who, shstr_cmp sh)
128	{	151	{
129	object *skill_tool = 0;	152	object *skill_tool = 0;
130		153
131	for (object *tmp = who->inv; tmp; tmp = tmp->below)	154	for (object *tmp = who->inv; tmp; tmp = tmp->below)
132	if (tmp->skill == sh)	155	if (tmp->skill == sh)
…		…
146		169
147	/* 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 -
148	* 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
149	* but not the skill itself, give it to them.	172	* but not the skill itself, give it to them.
150	*/	173	*/
151	object *skill = find_skill (who, skill_tool->skill);	174	object *skill = who->give_skill (skill_tool->skill);
152
153	if (!skill)
154	{
155	skill = give_skill_by_name (who, skill_tool->skill);
156	link_player_skills (who);
157	}
158		175
159	if (!skill_tool->flag [FLAG_APPLIED])	176	if (!skill_tool->flag [FLAG_APPLIED])
160	if (apply_special (who, splay (skill_tool), AP_APPLY \| AP_NO_READY))	177	if (!who->apply (splay (skill_tool)))
161	return 0;	178	return 0;
162		179
163	return splay (skill);	180	return splay (skill);
164	}	181	}
165		182
166	object *	183	object *
167	find_skill_by_name (object who, const char name)	184	find_skill_by_name_fuzzy (object who, const char name)
168	{	185	{
169	if (!name)	186	if (name)
170	return 0;
171
172	for (object *tmp = who->inv; tmp; tmp = tmp->below)	187	for (object *tmp = who->inv; tmp; tmp = tmp->below)
173	if ((tmp->type == SKILL \|\| tmp->type == SKILL_TOOL)	188	if ((tmp->type == SKILL \|\| tmp->type == SKILL_TOOL)
174	&& tmp->skill.begins_with (name))	189	&& tmp->skill.starts_with (name))
175	if (object *skop = find_skill_by_name (who, tmp->skill))	190	if (object *skop = find_skill_by_name (who, tmp->skill))
176	return skop;	191	return skop;
177		192
178	return 0;	193	return 0;
179	}	194	}
180		195
181	/* This returns the skill pointer of the given name (the	196	/* This returns the skill pointer of the given name (the
…		…
186	* tool, this code will equip it.	201	* tool, this code will equip it.
187	*	202	*
188	* 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,
189	* but instead a skill name, we search by matching number.	204	* but instead a skill name, we search by matching number.
190	* this replaces find_skill.	205	* this replaces find_skill.
		206	*
		207	* MUST NOT BE USED IN NEW CODE! (schmorp)
191	*/	208	*/
192	object *	209	object *
193	find_skill_by_number (object *who, int skillno)	210	find_skill_by_number (object *who, int skillno)
194	{	211	{
195	for (object *tmp = who->inv; tmp; tmp = tmp->below)	212	for (object *tmp = who->inv; tmp; tmp = tmp->below)
…		…
198	return skop;	215	return skop;
199		216
200	return 0;	217	return 0;
201	}	218	}
202		219
203	/* This changes the objects chosen_skill to new_skill.	220	object *
204	* return 1 on success, 0 on error	221	object::give_skill (shstr_cmp name, bool can_use)
205	*/
206	bool
207	object::change_skill (object *new_skill)
208	{	222	{
209	if (type != PLAYER)	223	object *skill = find_skill (this, name);
210	return 0;
211		224
212	// optimise this supposedly common case
213	if (new_skill == chosen_skill)
214	return 1;
215
216	if (chosen_skill)	225	if (!skill)
217	{	226	skill = give_skill_by_name (this, name);
218	chosen_skill->flag [FLAG_APPLIED] = false;
219	change_abil (this, chosen_skill);
220	}
221		227
222	chosen_skill = new_skill;	228	if (skill && can_use)
		229	skill->flag [FLAG_CAN_USE_SKILL] = true;
223		230
224	if (chosen_skill)
225	{
226	chosen_skill->flag [FLAG_APPLIED] = true;
227	change_abil (this, chosen_skill);
228	}
229
230	// always clear current weapon, as the selected skill could
231	// conflict with the current weapon skill, which would go
232	// undetected and exp would be given to the wrong skill.
233	current_weapon = 0;
234
235	update_stats ();
236	return 1;	231	return skill;
237	}	232	}
238		233
239	/* 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().
240	* 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.
241	* 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
…		…
248	*/	243	*/
249	int	244	int
250	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)
251	{	246	{
252	int success = 0, exp = 0;	247	int success = 0, exp = 0;
253	int did_alc = 0;
254		248
255	if (!skill)	249	if (!skill)
256	return 0;	250	return 0;
257		251
258	/* 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
…		…
283	/* Not 100% sure if this will work with new movement code -	277	/* Not 100% sure if this will work with new movement code -
284	* the levitation skill has move_type for flying, so when	278	* the levitation skill has move_type for flying, so when
285	* equipped, that should transfer to player, when not,	279	* equipped, that should transfer to player, when not,
286	* shouldn't.	280	* shouldn't.
287	*/	281	*/
288	if (QUERY_FLAG (skill, FLAG_APPLIED))	282	if (skill->flag [FLAG_APPLIED])
289	{	283	{
290	CLEAR_FLAG (skill, FLAG_APPLIED);	284	skill->clr_flag (FLAG_APPLIED);
291	new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");	285	new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
292	}	286	}
293	else	287	else
294	{	288	{
295	SET_FLAG (skill, FLAG_APPLIED);	289	skill->set_flag (FLAG_APPLIED);
296	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!");
297	}	291	}
298		292
299	op->update_stats ();	293	op->update_stats ();
300	success = 1;	294	success = 1;
…		…
383	case SK_LITERACY:	377	case SK_LITERACY:
384	case SK_WOODSMAN:	378	case SK_WOODSMAN:
385	/* 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.
386	* failing that, we go and identify stuff.	380	* failing that, we go and identify stuff.
387	*/	381	*/
		382	{
		383	bool found_cauldron = false;
		384
388	for (object next, tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)	385	for (object next, tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
389	{	386	{
390	next = tmp->above;	387	next = tmp->above;
391		388
392	if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))	389	if (tmp->flag [FLAG_IS_CAULDRON])
393	{	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
394	attempt_do_alchemy (op, tmp);	401	attempt_do_alchemy (op, tmp, skill);
395		402
396	if (QUERY_FLAG (tmp, FLAG_APPLIED))	403	if (tmp->flag [FLAG_APPLIED])
397	esrv_send_inventory (op, tmp);	404	esrv_send_inventory (op, tmp);
398
399	did_alc = 1;
400	}	405	}
401	}	406	}
402		407
403	if (did_alc == 0)	408	if (!found_cauldron)
404	exp = success = skill_ident (op, skill);	409	exp = success = skill_ident (op, skill);
405		410	}
406	break;	411	break;
407		412
408	case SK_DET_MAGIC:	413	case SK_DET_MAGIC:
409	case SK_DET_CURSE:	414	case SK_DET_CURSE:
410	exp = success = skill_ident (op, skill);	415	exp = success = skill_ident (op, skill);
…		…
439	case SK_EVOCATION:	444	case SK_EVOCATION:
440	case SK_PYROMANCY:	445	case SK_PYROMANCY:
441	case SK_SUMMONING:	446	case SK_SUMMONING:
442	case SK_CLIMBING:	447	case SK_CLIMBING:
443	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.");
		449	break;
		450
		451	case SK_MINING:
		452	success = skill_mining (op, part, skill, dir, string);
444	break;	453	break;
445		454
446	default:	455	default:
447	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);
448	break;	457	break;
…		…
524	}	533	}
525	else	534	else
526	{ /* all other items/living creatures */	535	{ /* all other items/living creatures */
527	op_exp = op->stats.exp;	536	op_exp = op->stats.exp;
528	op_lvl = op->level;	537	op_lvl = op->level;
529	if (!QUERY_FLAG (op, FLAG_ALIVE))	538	if (!op->flag [FLAG_ALIVE])
530	op_lvl += 5 * abs (op->magic); /* for ident/make items */	539	op_lvl += 5 * abs (op->magic); /* for ident/make items */
531	}	540	}
532		541
533	if (op_lvl < 1)	542	if (op_lvl < 1)
534	op_lvl = 1;	543	op_lvl = 1;
…		…
598	}	607	}
599		608
600	object *tmp = find_skill (pl, scroll->skill);	609	object *tmp = find_skill (pl, scroll->skill);
601		610
602	/* player already knows it */	611	/* player already knows it */
603	if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))	612	if (tmp && tmp->flag [FLAG_CAN_USE_SKILL])
604	return 0;	613	return 0;
605		614
606	/* now a random change to learn, based on player Int.	615	/* now a random change to learn, based on player Int.
607	* give bonus based on level - otherwise stupid characters	616	* give bonus based on level - otherwise stupid characters
608	* might never be able to learn anything.	617	* might never be able to learn anything.
…		…
617	{	626	{
618	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);
619	return 2;	628	return 2;
620	}	629	}
621		630
622	SET_FLAG (tmp, FLAG_CAN_USE_SKILL);	631	tmp->set_flag (FLAG_CAN_USE_SKILL);
623	link_player_skills (pl);	632
624	return 1;	633	return 1;
625	}	634	}
626		635
627	/* Gives a percentage clipped to 0% -> 100% of a/b. */	636	/* Gives a percentage clipped to 0% -> 100% of a/b. */
628	/* Probably belongs in some global utils-type file? */	637	/* Probably belongs in some global utils-type file? */
…		…
654	* 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
655	* simpler.	664	* simpler.
656	*/	665	*/
657	//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.	666	//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
658	void	667	void
659	show_skills (object op, const char search)	668	show_skills (object pl, const char search)
660	{	669	{
661	const char *cp;	670	const char *cp;
662	int i, num_skills_found = 0;	671	int i, num_skills_found = 0;
663	const char *const periods = ".............................."; // 30	672	const char *const periods = ".............................."; // 30
664		673
665	/* 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 */
666	char skills[NUM_SKILLS][128]; // d'oh	675	char skills[NUM_SKILLS][128]; // d'oh
667		676
		677	object *op = pl->contr->ob;
		678
668	for (object *tmp = op->inv; tmp; tmp = tmp->below)	679	for (object *tmp = op->inv; tmp; tmp = tmp->below)
669	{	680	{
670	if (tmp->type == SKILL)	681	if (tmp->type == SKILL)
671	{	682	{
672	if (search && !strstr (tmp->name, search))	683	if (search && !tmp->name.contains (search))
673	continue;	684	continue;
674		685
675	char buf[30];	686	char buf[30];
676		687
677	/* Basically want to fill this out to 30 spaces with periods */	688	/* Basically want to fill this out to 30 spaces with periods */
…		…
691	* 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
692	* crash the server numerous times.	703	* crash the server numerous times.
693	*/	704	*/
694	if (num_skills_found >= NUM_SKILLS)	705	if (num_skills_found >= NUM_SKILLS)
695	{	706	{
696	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.");
697	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");
698	break;	709	break;
699	}	710	}
700	}	711	}
701	}	712	}
702		713
703	dynbuf_text msg (4096, 1024);	714	dynbuf_text &msg = msg_dynbuf; msg.clear ();
704		715
705	msg << "T<Player skills:>\n\n";	716	msg << "T<Player skills:>\n\n";
706	if (num_skills_found > 1)	717	if (num_skills_found > 1)
707	qsort (skills, num_skills_found, sizeof (skills [0]), (int ()(const void , const void *)) std::strcmp);	718	qsort (skills, num_skills_found, sizeof (skills [0]), (int ()(const void , const void *)) std::strcmp);
708		719
…		…
716		727
717	msg << "Your equipped item power is " << (int)op->contr->item_power	728	msg << "Your equipped item power is " << (int)op->contr->item_power
718	<< " out of " << int (op->level * settings.item_power_factor)	729	<< " out of " << int (op->level * settings.item_power_factor)
719	<< ".\n";	730	<< ".\n";
720		731
721	op->contr->infobox (MSG_CHANNEL ("skills"), msg);	732	pl->contr->infobox (MSG_CHANNEL ("skills"), msg);
722	}	733	}
723		734
724	/* 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
725	* 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
726	* 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.
…		…
735		746
736	if (!string)	747	if (!string)
737	return 0;	748	return 0;
738		749
739	for (skop = op->inv; skop; skop = skop->below)	750	for (skop = op->inv; skop; skop = skop->below)
740	{	751	if ((skop->type == SKILL \|\| skop->type == SKILL_TOOL)
741	if (skop->type == SKILL
742	&& QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
743	&& !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);
744	break;	755	break;
745	else if (skop->type == SKILL_TOOL
746	&& !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
747	break;
748	}	756	}
749		757
750	if (!skop)	758	if (!skop)
751	{	759	{
752	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	);
753	return 0;	772	return 0;
754	}	773	}
755		774
756	len = strlen (skop->skill);	775	len = strlen (skop->skill);
757		776
…		…
783	}	802	}
784		803
785	static bool	804	static bool
786	hth_skill_p (object *skill)	805	hth_skill_p (object *skill)
787	{	806	{
788	return (skill_flags [skill->subtype] & (SF_COMBAT \| SF_NEED_WEAPON)) == SF_COMBAT;	807	return (skill_flags [skill->subtype] & (SF_COMBAT \| SF_NEED_ITEM)) == SF_COMBAT;
789	}	808	}
790		809
791	/* 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.
792	*/	811	*/
793	static object *	812	static object *
794	find_player_hth_skill (object *op)	813	find_player_hth_skill (object *op)
795	{	814	{
796	for (object *tmp = op->inv; tmp; tmp = tmp->below)	815	for (object *tmp = op->inv; tmp; tmp = tmp->below)
797	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))
798	return tmp;	817	return tmp;
799		818
800	return 0;	819	return 0;
801	}	820	}
802		821
…		…
822	* 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.
823	*/	842	*/
824	if (player *pl = op->contr)	843	if (player *pl = op->contr)
825	{	844	{
826	if (skill)	845	if (skill)
827	op->change_skill (skill);	846	{
		847	if (!op->apply (skill))
		848	return 0;
		849	}
828	else	850	else
829	{	851	{
830	if (!pl->combat_ob)	852	if (!pl->combat_ob)
831	{	853	{
832	if (QUERY_FLAG (op, FLAG_READY_WEAPON))	854	if (op->flag [FLAG_READY_WEAPON])
833	{	855	{
834	for (tmp = op->inv; tmp; tmp = tmp->below)	856	for (tmp = op->inv; tmp; tmp = tmp->below)
835	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))	857	if (tmp->type == WEAPON && tmp->flag [FLAG_APPLIED])
836	break;	858	break;
837		859
838	if (!tmp)	860	if (!tmp)
839	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);
840		862
…		…
854		876
855	if (!skill)	877	if (!skill)
856	new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");	878	new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
857	}	879	}
858		880
859	if (skill)	881	op->apply (skill);
860	{
861	op->change_skill (0);
862	apply_special (op, skill, AP_APPLY);
863	}
864	}	882	}
865		883
866	if (!pl->combat_ob)	884	if (!pl->combat_ob)
867	{	885	{
868	LOG (llevError, "Could not find anything to attack on %s\n", &op->name);	886	LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
869	return 0;	887	return 0;
870	}	888	}
871	}	889	}
872		890
873	if (!op->change_weapon (pl->combat_ob))	891	if (!op->apply (pl->combat_ob))
874	return 0;	892	return 0;
875	}	893	}
876		894
877	/* lose invisiblity/hiding status for running attacks */	895	/* lose invisiblity/hiding status for running attacks */
878	if (pl->tmp_invis)	896	if (pl->tmp_invis)
879	{	897	{
880	pl->tmp_invis = 0;	898	pl->tmp_invis = 0;
881	op->invisible = 0;	899	op->invisible = 0;
882	op->hide = 0;	900	op->flag [FLAG_HIDDEN] = 0;
883	update_object (op, UP_OBJ_CHANGE);	901	update_object (op, UP_OBJ_CHANGE);
884	}	902	}
885	}	903	}
886		904
887	int success = attack_ob (tmp, op);	905	int success = attack_ob (tmp, op);
888		906
889	/* print appropriate messages to the player */	907	/* print appropriate messages to the player */
890		908
891	if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED))	909	if (success && string && tmp && !tmp->flag [FLAG_FREED])
892	{	910	{
893	if (op->type == PLAYER)	911	if (op->type == PLAYER)
894	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));
895	else if (tmp->type == PLAYER)	913	else if (tmp->type == PLAYER)
896	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);
…		…
939	/* 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 */
940	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)))
941	return 0;	959	return 0;
942		960
943	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)
944	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)
945	{	963	{
946	/* Don't attack party members */	964	/* Don't attack party members */
947	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))
948	return 0;	966	return 0;
949		967
…		…
971	static int	989	static int
972	attack_hth (object pl, int dir, const char string, object *skill)	990	attack_hth (object pl, int dir, const char string, object *skill)
973	{	991	{
974	object enemy = NULL, weapon;	992	object enemy = NULL, weapon;
975		993
976	if (QUERY_FLAG (pl, FLAG_READY_WEAPON))	994	if (pl->flag [FLAG_READY_WEAPON])
977	for (weapon = pl->inv; weapon; weapon = weapon->below)	995	for (weapon = pl->inv; weapon; weapon = weapon->below)
978	{	996	{
979	if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED))	997	if (weapon->type == WEAPON && weapon->flag [FLAG_APPLIED])
980	{	998	{
981	CLEAR_FLAG (weapon, FLAG_APPLIED);	999	weapon->clr_flag (FLAG_APPLIED);
982	CLEAR_FLAG (pl, FLAG_READY_WEAPON);	1000	pl->clr_flag (FLAG_READY_WEAPON);
983	pl->update_stats ();	1001	pl->update_stats ();
984	if (pl->type == PLAYER)	1002	if (pl->type == PLAYER)
985	{	1003	{
986	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.");
987	esrv_update_item (UPD_FLAGS, pl, weapon);	1005	esrv_update_item (UPD_FLAGS, pl, weapon);
…		…
1005	*/	1023	*/
1006	static int	1024	static int
1007	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)
1008	{	1026	{
1009		1027
1010	if (!QUERY_FLAG (op, FLAG_READY_WEAPON))	1028	if (!op->flag [FLAG_READY_WEAPON])
1011	{	1029	{
1012	if (op->type == PLAYER)	1030	if (op->type == PLAYER)
1013	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!");
1014		1032
1015	return 0;	1033	return 0;

Diff Legend

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

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.65 by root, Mon Sep 22 05:45:55 2008 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.65 by root, Mon Sep 22 05:45:55 2008 UTC vs.
Revision 1.97 by root, Thu Apr 15 00:36:51 2010 UTC