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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines