ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/skill_util.C
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines