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.51 by root, Thu May 17 20:27:02 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copryight (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copryight (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your 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 GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
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};
67 55
68static int attack_hth (object *pl, int dir, const char *string, object *skill); 56static 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); 57static int attack_melee_weapon (object *op, int dir, const char *string, object *skill);
70 58
… …
73 * subtypes. 61 * subtypes.
74 */ 62 */
75void 63void
76init_skills (void) 64init_skills (void)
77{ 65{
78 int i;
79 archetype *at;
80
81 for (at = first_archetype; at != NULL; at = at->next) 66 for (archetype *at = first_archetype; at; at = at->next)
82 if (at->clone.type == SKILL) 67 if (at->clone.type == SKILL)
83 { 68 {
84 if (skill_names[at->clone.subtype] != NULL) 69 if (skill_names[at->clone.subtype])
85 LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", 70 LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n",
86 at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill); 71 at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill);
87 else 72 else
88 skill_names[at->clone.subtype] = at->clone.skill; 73 skill_names[at->clone.subtype] = at->clone.skill;
89 } 74 }
90 75
91 /* This isn't really an error if there is no skill subtype set, but 76 /* This isn't really an error if there is no skill subtype set, but
92 * checking for this may catch some user errors. 77 * checking for this may catch some user errors.
93 */ 78 */
94 for (i = 1; i < NUM_SKILLS; i++) 79 for (int i = 1; i < NUM_SKILLS; i++)
95 {
96 if (!skill_names[i]) 80 if (!skill_names[i])
97 LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i); 81 LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);
98 }
99} 82}
100
101 83
102/* This function goes through the player inventory and sets 84/* This function goes through the player inventory and sets
103 * up the last_skills[] array in the player object. 85 * up the last_skills[] array in the player object.
104 * the last_skills[] is used to more quickly lookup skills - 86 * the last_skills[] is used to more quickly lookup skills -
105 * mostly used for sending exp. 87 * mostly used for sending exp.
106 */ 88 */
107void 89void
108link_player_skills (object *op) 90link_player_skills (object *op)
109{ 91{
110 object *tmp;
111
112 for (tmp = op->inv; tmp; tmp = tmp->below) 92 for (object *tmp = op->inv; tmp; tmp = tmp->below)
113 {
114 if (tmp->type == SKILL) 93 if (tmp->type == SKILL)
115 { 94 {
116 /* This is really a warning, hence no else below */ 95 /* This is really a warning, hence no else below */
117 if (op->contr->last_skill_ob[tmp->subtype] && op->contr->last_skill_ob[tmp->subtype] != tmp) 96 if (op->contr->last_skill_ob[tmp->subtype] && op->contr->last_skill_ob[tmp->subtype] != tmp)
118 {
119 LOG (llevError, "Multiple skills with the same subtype? %s, %s\n", 97 LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",
120 &op->contr->last_skill_ob[tmp->subtype]->skill, &tmp->skill); 98 &op->contr->last_skill_ob[tmp->subtype]->skill, &tmp->skill);
121 } 99
122 if (tmp->subtype >= NUM_SKILLS) 100 if (tmp->subtype >= NUM_SKILLS)
123 {
124 LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS); 101 LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS);
125 }
126 else 102 else
127 { 103 {
128 op->contr->last_skill_ob[tmp->subtype] = tmp; 104 op->contr->last_skill_ob[tmp->subtype] = tmp;
129 op->contr->last_skill_exp[tmp->subtype] = -1; 105 op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go
130 } 106 }
131 } 107 }
132 } 108}
109
110static object *
111find_skill (object *who, const shstr &sh)
112{
113 for (object *tmp = who->inv; tmp; tmp = tmp->below)
114 if (tmp->skill == sh && tmp->type == SKILL)
115 return tmp;
116
117 return 0;
133} 118}
134 119
135/* This returns the skill pointer of the given name (the 120/* This returns the skill pointer of the given name (the
136 * one that accumlates exp, has the level, etc). 121 * one that accumulates exp, has the level, etc).
137 * 122 *
138 * It is presumed that the player will be needing to actually 123 * 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 124 * use the skill, so thus if use of the skill requires a skill
140 * tool, this code will equip it. 125 * tool, this code will equip it.
141 */ 126 */
142object * 127object *
143find_skill_by_name (object *who, const char *name) 128find_skill_by_name (object *who, const shstr &sh)
144{ 129{
145 object *skill = NULL, *skill_tool = NULL, *tmp; 130 object *skill_tool = 0;
146 131
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) 132 for (object *tmp = who->inv; tmp; tmp = tmp->below)
133 if (tmp->skill == sh)
155 { 134 {
156 if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name)) 135 if (tmp->type == SKILL && (tmp->flag [FLAG_CAN_USE_SKILL] || tmp->flag [FLAG_APPLIED]))
157 skill = tmp; 136 /* If this is a skill that can be used without applying tool, return it */
158 137 return tmp->inv_splay ();
159 /* Try to find appropriate skilltool. If the player has one already 138 /* Try to find appropriate skilltool. If the player has one already
160 * applied, we try to keep using that one. 139 * applied, we try to keep using that one.
161 */ 140 */
162 else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name)) 141 else if (tmp->type == SKILL_TOOL && !skill_tool)
163 {
164 if (QUERY_FLAG (tmp, FLAG_APPLIED))
165 skill_tool = tmp; 142 skill_tool = tmp;
166 else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED))
167 skill_tool = tmp;
168 } 143 }
169 } 144
170 /* If this is a skill that can be used without a tool, return it */ 145 if (!skill_tool)
171 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
172 return skill; 146 return 0;
173 147
174 /* Player has a tool to use the skill. IF not applied, apply it - 148 /* 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 149 * if not successful, return null. If they do have the skill tool
176 * but not the skill itself, give it to them. 150 * but not the skill itself, give it to them.
177 */ 151 */
178 if (skill_tool) 152 object *skill = find_skill (who, skill_tool->skill);
179 { 153
180 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
181 {
182 if (apply_special (who, skill_tool, 0))
183 return NULL;
184 }
185 if (!skill) 154 if (!skill)
186 { 155 {
187 skill = give_skill_by_name (who, skill_tool->skill); 156 skill = give_skill_by_name (who, skill_tool->skill);
188 link_player_skills (who); 157 link_player_skills (who);
189 } 158 }
159
160 skill->inv_splay ();
161
162 if (!skill_tool->flag [FLAG_APPLIED])
163 if (apply_special (who, skill_tool, AP_APPLY | AP_NO_READY))
164 return 0;
165
190 return skill; 166 return skill;
191 } 167}
168
169object *
170find_skill_by_name (object *who, const char *name)
171{
172 if (!name)
173 return 0;
174
175 for (object *tmp = who->inv; tmp; tmp = tmp->below)
176 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL)
177 && tmp->skill.begins_with (name))
178 if (object *skop = find_skill_by_name (who, tmp->skill))
179 return skop;
180
192 return NULL; 181 return 0;
193} 182}
194
195 183
196/* This returns the skill pointer of the given name (the 184/* This returns the skill pointer of the given name (the
197 * one that accumlates exp, has the level, etc). 185 * one that accumulates exp, has the level, etc).
198 * 186 *
199 * It is presumed that the player will be needing to actually 187 * 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 188 * use the skill, so thus if use of the skill requires a skill
201 * tool, this code will equip it. 189 * tool, this code will equip it.
202 * 190 *
… …
205 * this replaces find_skill. 193 * this replaces find_skill.
206 */ 194 */
207object * 195object *
208find_skill_by_number (object *who, int skillno) 196find_skill_by_number (object *who, int skillno)
209{ 197{
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) 198 for (object *tmp = who->inv; tmp; tmp = tmp->below)
216 {
217 if (tmp->type == SKILL && tmp->subtype == skillno) 199 if (tmp->type == SKILL && tmp->subtype == skillno)
218 skill = tmp; 200 if (object *skop = find_skill_by_name (who, tmp->skill))
219
220 /* Try to find appropriate skilltool. If the player has one already
221 * applied, we try to keep using that one.
222 */
223 else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno)
224 {
225 if (QUERY_FLAG (tmp, FLAG_APPLIED))
226 skill_tool = tmp;
227 else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED))
228 skill_tool = tmp;
229 }
230 }
231 /* If this is a skill that can be used without a tool, return it */
232 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
233 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; 201 return skop;
252 } 202
253 return NULL; 203 return 0;
254} 204}
255 205
256/* This changes the objects skill to new_skill. 206/* This changes the objects chosen_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 207 * return 1 on success, 0 on error
266 */ 208 */
267 209bool
268int 210object::change_skill (object *new_skill)
269change_skill (object *who, object *new_skill, int flag)
270{ 211{
271 int old_range;
272
273 if (who->type != PLAYER) 212 if (type != PLAYER)
274 return 0; 213 return 0;
275 214
276 old_range = who->contr->shoottype; 215 // optimise this supposedly common case
277 216 if (new_skill == chosen_skill)
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; 217 return 1;
284 }
285 218
286 if (!new_skill || who->chosen_skill)
287 if (who->chosen_skill) 219 if (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 } 220 {
298 if (flag & 0x1) 221 chosen_skill->flag [FLAG_APPLIED] = false;
299 who->contr->shoottype = (rangetype) old_range; 222 change_abil (this, chosen_skill);
223 }
300 224
225 chosen_skill = new_skill;
226
227 if (chosen_skill)
228 {
229 chosen_skill->flag [FLAG_APPLIED] = true;
230 change_abil (this, chosen_skill);
231 chosen_skill->inv_splay ();
232 }
233
234 update_stats ();
301 return 1; 235 return 1;
302} 236}
303 237
304/* This function just clears the chosen_skill and range_skill values 238/* This function just clears the chosen_skill and range_skill values
305 * inthe player. 239 * in the player.
306 */ 240 */
307void 241void
308clear_skill (object *who) 242clear_skill (object *who)
309{ 243{
244 if (who->chosen_skill)
245 {
246 who->chosen_skill->flag [FLAG_APPLIED] = false;
310 who->chosen_skill = NULL; 247 who->chosen_skill = 0;
311 CLEAR_FLAG (who, FLAG_READY_SKILL); 248 CLEAR_FLAG (who, FLAG_READY_SKILL);
312 if (who->type == PLAYER)
313 { 249 }
314 who->contr->ranges[range_skill] = NULL; 250
315 if (who->contr->shoottype == range_skill) 251 if (player *pl = who->contr)
316 who->contr->shoottype = range_none; 252 if (pl->ranged_ob && pl->ranged_ob->type == SKILL)
317 } 253 pl->ranged_ob = 0;
318} 254}
319 255
320/* do_skill() - Main skills use function-similar in scope to cast_spell(). 256/* 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. 257 * 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 258 * 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 261 * 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 262 * from know if a skill was actually used, as many skills don't
327 * give any exp for their direct use (eg, throwing). 263 * give any exp for their direct use (eg, throwing).
328 * It returns 0 if no skill was used. 264 * It returns 0 if no skill was used.
329 */ 265 */
330
331int 266int
332do_skill (object *op, object *part, object *skill, int dir, const char *string) 267do_skill (object *op, object *part, object *skill, int dir, const char *string)
333{ 268{
334 int success = 0, exp = 0; 269 int success = 0, exp = 0;
335 int did_alc = 0; 270 int did_alc = 0;
336 object *tmp, *next;
337 271
338 if (!skill) 272 if (!skill)
339 return 0; 273 return 0;
340 274
341 /* The code below presumes that the skill points to the object that 275 /* 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 277 * 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. 278 * the player doesn't have a bucket for that, create one.
345 */ 279 */
346 if (skill->type != SKILL && op->type == PLAYER) 280 if (skill->type != SKILL && op->type == PLAYER)
347 { 281 {
348 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 282 for (object *tmp = op->inv; tmp; tmp = tmp->below)
349 {
350 if (tmp->type == SKILL && tmp->skill == skill->skill) 283 if (tmp->type == SKILL && tmp->skill == skill->skill)
351 break; 284 {
285 skill = tmp;
286 goto found;
352 } 287 }
353 if (!tmp) 288
354 tmp = give_skill_by_name (op, skill->skill); 289 skill = give_skill_by_name (op, skill->skill);
355 skill = tmp; 290found: ;
356 } 291 }
357 292
358 // skill, by_whom, on_which_object, which direction, skill_argument 293 // 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))) 294 if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))
360 return 0; 295 return 0;
361 296
362 switch (skill->subtype) 297 switch (skill->subtype)
363 { 298 {
364 case SK_LEVITATION: 299 case SK_LEVITATION:
365 /* Not 100% sure if this will work with new movement code - 300 /* Not 100% sure if this will work with new movement code -
366 * the levitation skill has move_type for flying, so when 301 * the levitation skill has move_type for flying, so when
367 * equipped, that should transfer to player, when not, 302 * equipped, that should transfer to player, when not,
368 * shouldn't. 303 * shouldn't.
369 */ 304 */
370 if (QUERY_FLAG (skill, FLAG_APPLIED)) 305 if (QUERY_FLAG (skill, FLAG_APPLIED))
371 { 306 {
372 CLEAR_FLAG (skill, FLAG_APPLIED); 307 CLEAR_FLAG (skill, FLAG_APPLIED);
373 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); 308 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
374 } 309 }
375 else 310 else
376 { 311 {
377 SET_FLAG (skill, FLAG_APPLIED); 312 SET_FLAG (skill, FLAG_APPLIED);
378 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!."); 313 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!.");
379 } 314 }
380 fix_player (op); 315
316 op->update_stats ();
381 success = 1; 317 success = 1;
382 break; 318 break;
383 319
384 case SK_STEALING: 320 case SK_STEALING:
385 exp = success = steal (op, dir, skill); 321 exp = success = steal (op, dir, skill);
386 break; 322 break;
387 323
388 case SK_LOCKPICKING: 324 case SK_LOCKPICKING:
389 exp = success = pick_lock (op, dir, skill); 325 exp = success = pick_lock (op, dir, skill);
390 break; 326 break;
391 327
392 case SK_HIDING: 328 case SK_HIDING:
393 exp = success = hide (op, skill); 329 exp = success = hide (op, skill);
394 break; 330 break;
395 331
396 case SK_JUMPING: 332 case SK_JUMPING:
397 success = jump (op, dir, skill); 333 success = jump (op, dir, skill);
398 break; 334 break;
399 335
400 case SK_INSCRIPTION: 336 case SK_INSCRIPTION:
401 exp = success = write_on_item (op, string, skill); 337 exp = success = write_on_item (op, string, skill);
402 break; 338 break;
403 339
404 case SK_MEDITATION: 340 case SK_MEDITATION:
405 meditate (op, skill); 341 meditate (op, skill);
406 success = 1; 342 success = 1;
407 break; 343 break;
408 /* note that the following 'attack' skills gain exp through hit_player() */ 344 /* note that the following 'attack' skills gain exp through hit_player() */
409 345
410 case SK_KARATE: 346 case SK_KARATE:
411 (void) attack_hth (op, dir, "karate-chopped", skill); 347 attack_hth (op, dir, "karate-chopped", skill);
412 break; 348 break;
413 349
414 case SK_PUNCHING: 350 case SK_PUNCHING:
415 (void) attack_hth (op, dir, "punched", skill); 351 attack_hth (op, dir, "punched", skill);
416 break; 352 break;
417 353
418 case SK_FLAME_TOUCH: 354 case SK_FLAME_TOUCH:
419 (void) attack_hth (op, dir, "flamed", skill); 355 attack_hth (op, dir, "flamed", skill);
420 break; 356 break;
421 357
422 case SK_SPARK_TOUCH: 358 case SK_SPARK_TOUCH:
423 (void) attack_hth (op, dir, "zapped", skill); 359 attack_hth (op, dir, "zapped", skill);
424 break; 360 break;
425 361
426 case SK_SHIVER: 362 case SK_SHIVER:
427 (void) attack_hth (op, dir, "froze", skill); 363 attack_hth (op, dir, "froze", skill);
428 break; 364 break;
429 365
430 case SK_ACID_SPLASH: 366 case SK_ACID_SPLASH:
431 (void) attack_hth (op, dir, "dissolved", skill); 367 attack_hth (op, dir, "dissolved", skill);
432 break; 368 break;
433 369
434 case SK_POISON_NAIL: 370 case SK_POISON_NAIL:
435 (void) attack_hth (op, dir, "injected poison into", skill); 371 attack_hth (op, dir, "injected poison into", skill);
436 break; 372 break;
437 373
438 case SK_CLAWING: 374 case SK_CLAWING:
439 (void) attack_hth (op, dir, "clawed", skill); 375 attack_hth (op, dir, "clawed", skill);
440 break; 376 break;
441 377
442 case SK_ONE_HANDED_WEAPON: 378 case SK_ONE_HANDED_WEAPON:
443 case SK_TWO_HANDED_WEAPON: 379 case SK_TWO_HANDED_WEAPON:
444 (void) attack_melee_weapon (op, dir, NULL, skill); 380 attack_melee_weapon (op, dir, NULL, skill);
445 break; 381 break;
446 382
447 case SK_FIND_TRAPS: 383 case SK_FIND_TRAPS:
448 exp = success = find_traps (op, skill); 384 exp = success = find_traps (op, skill);
449 break; 385 break;
450 386
451 case SK_SINGING: 387 case SK_SINGING:
452 exp = success = singing (op, dir, skill); 388 exp = success = singing (op, dir, skill);
453 break; 389 break;
454 390
455 case SK_ORATORY: 391 case SK_ORATORY:
456 exp = success = use_oratory (op, dir, skill); 392 exp = success = use_oratory (op, dir, skill);
457 break; 393 break;
458 394
459 case SK_SMITHERY: 395 case SK_SMITHERY:
460 case SK_BOWYER: 396 case SK_BOWYER:
461 case SK_JEWELER: 397 case SK_JEWELER:
462 case SK_ALCHEMY: 398 case SK_ALCHEMY:
463 case SK_THAUMATURGY: 399 case SK_THAUMATURGY:
464 case SK_LITERACY: 400 case SK_LITERACY:
465 case SK_WOODSMAN: 401 case SK_WOODSMAN:
466 /* first, we try to find a cauldron, and do the alchemy thing. 402 /* first, we try to find a cauldron, and do the alchemy thing.
467 * failing that, we go and identify stuff. 403 * failing that, we go and identify stuff.
468 */ 404 */
469 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = next) 405 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
470 { 406 {
471 next = tmp->above; 407 next = tmp->above;
408
472 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 409 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
473 { 410 {
474 attempt_do_alchemy (op, tmp); 411 attempt_do_alchemy (op, tmp);
412
475 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 413 if (QUERY_FLAG (tmp, FLAG_APPLIED))
476 esrv_send_inventory (op, tmp); 414 esrv_send_inventory (op, tmp);
415
477 did_alc = 1; 416 did_alc = 1;
478 } 417 }
479 } 418 }
419
480 if (did_alc == 0) 420 if (did_alc == 0)
481 exp = success = skill_ident (op, skill);
482 break;
483
484 case SK_DET_MAGIC:
485 case SK_DET_CURSE:
486 exp = success = skill_ident (op, skill); 421 exp = success = skill_ident (op, skill);
422
487 break; 423 break;
488 424
425 case SK_DET_MAGIC:
426 case SK_DET_CURSE:
427 exp = success = skill_ident (op, skill);
428 break;
429
489 case SK_DISARM_TRAPS: 430 case SK_DISARM_TRAPS:
490 exp = success = remove_trap (op, dir, skill); 431 exp = success = remove_trap (op, dir, skill);
491 break; 432 break;
492 433
493 case SK_THROWING: 434 case SK_THROWING:
494 success = skill_throw (op, part, dir, string, skill); 435 success = skill_throw (op, part, dir, string, skill);
495 break; 436 break;
496 437
497 case SK_SET_TRAP: 438 case SK_SET_TRAP:
498 new_draw_info (NDI_UNIQUE, 0, op, "This skill is not currently implemented."); 439 new_draw_info (NDI_UNIQUE, 0, op, "This skill is not currently implemented.");
499 break; 440 break;
500 441
501 case SK_USE_MAGIC_ITEM: 442 case SK_USE_MAGIC_ITEM:
502 case SK_MISSILE_WEAPON: 443 case SK_MISSILE_WEAPON:
503 new_draw_info (NDI_UNIQUE, 0, op, "There is no special attack for this skill."); 444 new_draw_info (NDI_UNIQUE, 0, op, "There is no special attack for this skill.");
504 break; 445 break;
505 446
506 case SK_PRAYING: 447 case SK_PRAYING:
507 success = pray (op, skill); 448 success = pray (op, skill);
508 break; 449 break;
509 450
510 case SK_BARGAINING: 451 case SK_BARGAINING:
511 success = describe_shop (op); 452 success = describe_shop (op);
512 break; 453 break;
513 454
514 case SK_SORCERY: 455 case SK_SORCERY:
515 case SK_EVOCATION: 456 case SK_EVOCATION:
516 case SK_PYROMANCY: 457 case SK_PYROMANCY:
517 case SK_SUMMONING: 458 case SK_SUMMONING:
518 case SK_CLIMBING: 459 case SK_CLIMBING:
519 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); 460 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
520 break; 461 break;
521 462
522 default: 463 default:
523 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); 464 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
524 break; 465 break;
525 } 466 }
526 467
527 /* For players we now update the speed_left from using the skill. 468 /* 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 469 * Monsters have no skill use time because of the random nature in
529 * which use_monster_skill is called already simulates this. 470 * which use_monster_skill is called already simulates this.
530 * If certain skills should take more/less time, that should be 471 * If certain skills should take more/less time, that should be
531 * in the code for the skill itself. 472 * in the code for the skill itself.
532 */ 473 */
533 474
534 if (op->type == PLAYER) 475 if (op->type == PLAYER)
535 op->speed_left -= 1.0; 476 op->speed_left -= 1.f;
536 477
537 /* this is a good place to add experience for successfull use of skills. 478 /* this is a good place to add experience for successfull use of skills.
538 * Note that add_exp() will figure out player/monster experience 479 * Note that add_exp() will figure out player/monster experience
539 * gain problems. 480 * gain problems.
540 */ 481 */
… …
568 * op is the object that was 'defeated'. 509 * op is the object that was 'defeated'.
569 * skill is the skill used. If no skill is used, it should just 510 * skill is the skill used. If no skill is used, it should just
570 * point back to who. 511 * point back to who.
571 * 512 *
572 */ 513 */
573
574int 514int
575calc_skill_exp (object *who, object *op, object *skill) 515calc_skill_exp (object *who, object *op, object *skill)
576{ 516{
577 int op_exp = 0, op_lvl = 0; 517 int op_exp = 0, op_lvl = 0;
578 float base, value, lvl_mult = 0.0; 518 float base, value, lvl_mult = 0.0;
… …
667 * This one actually teaches the player the skill as something 607 * This one actually teaches the player the skill as something
668 * they can equip. 608 * they can equip.
669 * Return 0 if the player knows the skill, 1 if the 609 * Return 0 if the player knows the skill, 1 if the
670 * player learns the skill, 2 otherwise. 610 * player learns the skill, 2 otherwise.
671 */ 611 */
672
673int 612int
674learn_skill (object *pl, object *scroll) 613learn_skill (object *pl, object *scroll)
675{ 614{
676 object *tmp;
677
678 if (!scroll->skill) 615 if (!scroll->skill)
679 { 616 {
680 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name); 617 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);
681 return 2; 618 return 2;
682 } 619 }
683 620
684 /* can't use find_skill_by_name because we want skills the player knows 621 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 622
692 /* player already knows it */ 623 /* player already knows it */
693 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 624 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
694 return 0; 625 return 0;
695
696
697 626
698 /* now a random change to learn, based on player Int. 627 /* now a random change to learn, based on player Int.
699 * give bonus based on level - otherwise stupid characters 628 * give bonus based on level - otherwise stupid characters
700 * might never be able to learn anything. 629 * might never be able to learn anything.
701 */ 630 */
… …
715 link_player_skills (pl); 644 link_player_skills (pl);
716 return 1; 645 return 1;
717} 646}
718 647
719/* Gives a percentage clipped to 0% -> 100% of a/b. */ 648/* Gives a percentage clipped to 0% -> 100% of a/b. */
720
721/* Probably belongs in some global utils-type file? */ 649/* Probably belongs in some global utils-type file? */
722static int 650static int
723clipped_percent (sint64 a, sint64 b) 651clipped_percent (sint64 a, sint64 b)
724{ 652{
725 int rv; 653 int rv;
… …
771 sprintf (buf, "%s%s", &tmp->name, periods); 699 sprintf (buf, "%s%s", &tmp->name, periods);
772 buf[40] = 0; 700 buf[40] = 0;
773 701
774 if (settings.permanent_exp_ratio) 702 if (settings.permanent_exp_ratio)
775 { 703 {
776 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%lld/%lld/%d%%)", 704 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
777 buf, tmp->level, 705 buf, tmp->level, tmp->stats.exp,
778 (long long) tmp->stats.exp,
779 (long long) level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp)); 706 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
780 } 707 }
781 else 708 else
782 { 709 {
783 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%lld/%lld)", 710 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
784 buf, tmp->level, (long long) tmp->stats.exp, (long long) level_exp (tmp->level + 1, op->expmul)); 711 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
785 } 712 }
786 /* I don't know why some characters get a bunch of skills, but 713 /* I don't know why some characters get a bunch of skills, but
787 * it sometimes happens (maybe a leftover from bugier earlier code 714 * it sometimes happens (maybe a leftover from bugier earlier code
788 * and those character are still about). In any case, lets handle 715 * and those character are still about). In any case, lets handle
789 * it so it doesn't crash the server - otherwise, one character may 716 * it so it doesn't crash the server - otherwise, one character may
… …
799 } 726 }
800 727
801 clear_win_info (op); 728 clear_win_info (op);
802 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:"); 729 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:");
803 if (num_skills_found > 1) 730 if (num_skills_found > 1)
804 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) strcmp); 731 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) std::strcmp);
805 732
806 for (i = 0; i < num_skills_found; i++) 733 for (i = 0; i < num_skills_found; i++)
807 {
808 new_draw_info (NDI_UNIQUE, 0, op, skills[i]); 734 new_draw_info (NDI_UNIQUE, 0, op, skills[i]);
809 }
810 735
811 new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5); 736 new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5);
812 737
813 cp = determine_god (op); 738 cp = determine_god (op);
814 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time"); 739 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time");
… …
821 * direction that the user is facing. Returns false if we are unable to 746 * 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. 747 * 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 748 * 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. 749 * our own find_skill_by_name so we can try to do better string matching.
825 */ 750 */
826
827int 751int
828use_skill (object *op, const char *string) 752use_skill (object *op, const char *string)
829{ 753{
830 object *skop; 754 object *skop;
831 size_t len; 755 size_t len;
832 756
833 if (!string) 757 if (!string)
834 return 0; 758 return 0;
835 759
836 for (skop = op->inv; skop != NULL; skop = skop->below) 760 for (skop = op->inv; skop; skop = skop->below)
837 { 761 {
762 if (skop->type == SKILL
838 if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) && 763 && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
839 !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 764 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
840 break; 765 break;
766 else if (skop->type == SKILL_TOOL
841 else if (skop->type == SKILL_TOOL && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 767 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
842 break; 768 break;
843 } 769 }
770
844 if (!skop) 771 if (!skop)
845 { 772 {
846 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 773 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string);
847 return 0; 774 return 0;
848 } 775 }
… …
853 * options given to the skill. Its pretty simple - if there 780 * options given to the skill. Its pretty simple - if there
854 * are extra parameters (as deteremined by string length), we 781 * are extra parameters (as deteremined by string length), we
855 * want to skip over any leading spaces. 782 * want to skip over any leading spaces.
856 */ 783 */
857 if (len >= strlen (string)) 784 if (len >= strlen (string))
858 {
859 string = NULL; 785 string = NULL;
860 }
861 else 786 else
862 { 787 {
863 string += len; 788 string += len;
864 while (*string == 0x20) 789 while (*string == 0x20)
865 string++; 790 string++;
791
866 if (strlen (string) == 0) 792 if (strlen (string) == 0)
867 string = NULL; 793 string = NULL;
868 } 794 }
869 795
870#ifdef SKILL_UTIL_DEBUG 796#ifdef SKILL_UTIL_DEBUG
871 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none"); 797 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");
872#endif 798#endif
873 799
874 /* Change to the new skill, then execute it. */
875 if (do_skill (op, op, skop, op->facing, string)) 800 if (do_skill (op, op, skop, op->facing, string))
876 return 1; 801 return 1;
877 802
878 return 0; 803 return 0;
879} 804}
880 805
806static bool
807hth_skill_p (object *skill)
808{
809 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT;
810}
881 811
882
883/* This finds the best unarmed skill the player has, and returns 812/* 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 */ 813 */
897static object * 814static object *
898find_best_player_hth_skill (object *op) 815find_player_hth_skill (object *op)
899{ 816{
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) 817 for (object *tmp = op->inv; tmp; tmp = tmp->below)
904 { 818 if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp))
905 if (tmp->type == SKILL)
906 {
907 if (dragon && tmp->subtype == SK_CLAWING)
908 return tmp; 819 return tmp;
909 820
910 /* The order in the array is preferred order. So basically, 821 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} 822}
932 823
933/* do_skill_attack() - We have got an appropriate opponent from either 824/* 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 825 * 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. 826 * attacking, take care of messages from the attack and changes in invisible.
… …
937 * tmp is the targetted monster. 828 * tmp is the targetted monster.
938 * op is what is attacking 829 * op is what is attacking
939 * string is passed along to describe what messages to describe 830 * string is passed along to describe what messages to describe
940 * the damage. 831 * the damage.
941 */ 832 */
942
943static int 833static int
944do_skill_attack (object *tmp, object *op, const char *string, object *skill) 834do_skill_attack (object *tmp, object *op, const char *string, object *skill)
945{ 835{
946 int success;
947
948 if (INVOKE_OBJECT (SKILL_ATTACK, op, ARG_OBJECT (tmp), ARG_STRING (string), ARG_OBJECT (skill))) 836 if (INVOKE_OBJECT (SKILL_ATTACK, op, ARG_OBJECT (tmp), ARG_STRING (string), ARG_OBJECT (skill)))
949 return RESULT_INT (0); 837 return RESULT_INT (0);
950 838
951 /* For Players only: if there is no ready weapon, and no "attack" skill 839 /* 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. 840 * 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, 841 * 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 842 * 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. 843 * through that code if skill is set to change to the skill.
956 */ 844 */
957 if (op->type == PLAYER) 845 if (player *pl = op->contr)
958 { 846 {
959 if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) 847 if (!pl->combat_ob)
960 { 848 {
961 size_t i; 849 if (QUERY_FLAG (op, FLAG_READY_WEAPON))
962
963 if (!skill)
964 { 850 {
965 /* See if the players chosen skill is a combat skill, and use
966 * it if appropriate.
967 */
968 if (op->chosen_skill)
969 {
970 for (i = 0; i < sizeof (unarmed_skills); i++)
971 if (op->chosen_skill->subtype == unarmed_skills[i])
972 {
973 skill = op->chosen_skill;
974 break;
975 }
976 }
977 /* If we didn't find a skill above, look harder for a good skill */
978 if (!skill)
979 {
980 skill = find_best_player_hth_skill (op);
981
982 if (!skill)
983 {
984 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
985 return 0;
986 }
987 }
988 }
989 if (skill != op->chosen_skill)
990 {
991 /* now try to ready the new skill */
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;
996 }
997 }
998 }
999 else
1000 {
1001 /* Seen some crashes below where current_weapon is not set,
1002 * even though the flag says it is. So if current weapon isn't set,
1003 * do some work in trying to find the object to use.
1004 */
1005 if (!op->current_weapon)
1006 {
1007 object *tmp;
1008
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) 851 for (tmp = op->inv; tmp; tmp = tmp->below)
1011 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) 852 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
1012 break; 853 break;
1013 854
1014 if (!tmp) 855 if (!tmp)
1015 { 856 {
1016 LOG (llevError, "Could not find applied weapon on %s\n", &op->name); 857 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
1017 op->current_weapon = NULL;
1018 return 0; 858 return 0;
1019 } 859 }
860
861 pl->combat_ob = tmp;
862 }
1020 else 863 else
864 {
865 if (!skill)
1021 { 866 {
1022 op->current_weapon = tmp; 867 /* See if the players chosen skill is a combat skill, and use
868 * it if appropriate.
869 */
870 if (op->chosen_skill && hth_skill_p (op->chosen_skill))
871 skill = op->chosen_skill;
872 else
873 {
874 skill = find_player_hth_skill (op);
875
876 if (!skill)
877 {
878 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
879 return 0;
880 }
881 }
1023 } 882 }
883
884 pl->combat_ob = skill;
885 apply_special (op, skill, AP_APPLY);
1024 } 886 }
1025 887
1026 /* Has ready weapon - make sure chosen_skill is set up properly */ 888 if (!pl->combat_ob)
1027 if (!op->chosen_skill || op->current_weapon->skill != op->chosen_skill->skill)
1028 { 889 {
1029 change_skill (op, find_skill_by_name (op, op->current_weapon->skill), 1); 890 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
891 return 0;
1030 } 892 }
1031 } 893 }
1032 }
1033 894
895 if (!op->change_weapon (pl->combat_ob))
896 return 0;
897
1034 /* lose invisiblity/hiding status for running attacks */ 898 /* lose invisiblity/hiding status for running attacks */
1035 899 if (pl->tmp_invis)
1036 if (op->type == PLAYER && op->contr->tmp_invis) 900 {
1037 {
1038 op->contr->tmp_invis = 0; 901 pl->tmp_invis = 0;
1039 op->invisible = 0; 902 op->invisible = 0;
1040 op->hide = 0; 903 op->hide = 0;
1041 update_object (op, UP_OBJ_FACE); 904 update_object (op, UP_OBJ_CHANGE);
905 }
1042 } 906 }
1043 907
1044 success = attack_ob (tmp, op); 908 int success = attack_ob (tmp, op);
1045 909
1046 /* print appropriate messages to the player */ 910 /* print appropriate messages to the player */
1047 911
1048 if (success && string != NULL && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) 912 if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED))
1049 { 913 {
1050 if (op->type == PLAYER) 914 if (op->type == PLAYER)
1051 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); 915 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
1052 else if (tmp->type == PLAYER) 916 else if (tmp->type == PLAYER)
1053 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); 917 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
1054 } 918 }
919
1055 return success; 920 return success;
1056} 921}
1057
1058 922
1059/* skill_attack() - Core routine for use when we attack using a skills 923/* skill_attack() - Core routine for use when we attack using a skills
1060 * system. In essence, this code handles 924 * system. In essence, this code handles
1061 * all skill-based attacks, ie hth, missile and melee weapons should be 925 * all skill-based attacks, ie hth, missile and melee weapons should be
1062 * treated here. If an opponent is already supplied by move_player(), 926 * treated here. If an opponent is already supplied by move_player(),
… …
1065 * 929 *
1066 * This is called by move_player() and attack_hth() 930 * This is called by move_player() and attack_hth()
1067 * 931 *
1068 * Initial implementation by -bt thomas@astro.psu.edu 932 * Initial implementation by -bt thomas@astro.psu.edu
1069 */ 933 */
1070
1071int 934int
1072skill_attack (object *tmp, object *pl, int dir, const char *string, object *skill) 935skill_attack (object *tmp, object *pl, int dir, const char *string, object *skill)
1073{ 936{
1074 sint16 tx, ty; 937 sint16 tx, ty;
1075 maptile *m; 938 maptile *m;
1076 int mflags; 939 int mflags;
1077 940
1078 if (!dir) 941 if (!dir)
1079 dir = pl->facing; 942 dir = pl->facing;
943
1080 tx = freearr_x[dir]; 944 tx = freearr_x[dir];
1081 ty = freearr_y[dir]; 945 ty = freearr_y[dir];
1082 946
1083 /* If we don't yet have an opponent, find if one exists, and attack. 947 /* 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() 948 * Legal opponents are the same as outlined in move_player_attack()
1085 */ 949 */
1086 950 if (!tmp)
1087 if (tmp == NULL)
1088 { 951 {
1089 m = pl->map; 952 m = pl->map;
1090 tx = pl->x + freearr_x[dir]; 953 tx = pl->x + freearr_x[dir];
1091 ty = pl->y + freearr_y[dir]; 954 ty = pl->y + freearr_y[dir];
1092 955
… …
1096 959
1097 /* space must be blocked for there to be anything interesting to do */ 960 /* 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))) 961 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))
1099 return 0; 962 return 0;
1100 963
1101 for (tmp = get_map_ob (m, tx, ty); tmp; tmp = tmp->above) 964 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) 965 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR)
1103 { 966 {
1104 /* Don't attack party members */ 967 /* Don't attack party members */
1105 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) 968 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
1106 return 0; 969 return 0;
970
1107 break; 971 break;
1108 } 972 }
1109 } 973 }
974
1110 if (!tmp) 975 if (!tmp)
1111 { 976 {
1112 if (pl->type == PLAYER) 977 if (pl->type == PLAYER)
1113 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!"); 978 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!");
979
1114 return 0; 980 return 0;
1115 } 981 }
1116 982
1117 return do_skill_attack (tmp, pl, string, skill); 983 return do_skill_attack (tmp, pl, string, skill);
1118} 984}
1119
1120 985
1121/* attack_hth() - this handles all hand-to-hand attacks -b.t. */ 986/* attack_hth() - this handles all hand-to-hand attacks -b.t. */
1122 987
1123/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first 988/* 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 989 * (attack_hth) we check for weapon use, etc in the second (the new
1125 * function skill_attack() we actually attack. 990 * function skill_attack() we actually attack.
1126 */ 991 */
1127
1128static int 992static int
1129attack_hth (object *pl, int dir, const char *string, object *skill) 993attack_hth (object *pl, int dir, const char *string, object *skill)
1130{ 994{
1131 object *enemy = NULL, *weapon; 995 object *enemy = NULL, *weapon;
1132 996
… …
1135 { 999 {
1136 if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED)) 1000 if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED))
1137 { 1001 {
1138 CLEAR_FLAG (weapon, FLAG_APPLIED); 1002 CLEAR_FLAG (weapon, FLAG_APPLIED);
1139 CLEAR_FLAG (pl, FLAG_READY_WEAPON); 1003 CLEAR_FLAG (pl, FLAG_READY_WEAPON);
1140 fix_player (pl); 1004 pl->update_stats ();
1141 if (pl->type == PLAYER) 1005 if (pl->type == PLAYER)
1142 { 1006 {
1143 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); 1007 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
1144 esrv_update_item (UPD_FLAGS, pl, weapon); 1008 esrv_update_item (UPD_FLAGS, pl, weapon);
1145 } 1009 }
1010
1146 break; 1011 break;
1147 } 1012 }
1148 } 1013 }
1014
1149 return skill_attack (enemy, pl, dir, string, skill); 1015 return skill_attack (enemy, pl, dir, string, skill);
1150} 1016}
1151
1152 1017
1153/* attack_melee_weapon() - this handles melee weapon attacks -b.t. 1018/* 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. 1019 * 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 1020 * But there is a real neato possible feature of this scheme which
1156 * bears mentioning: 1021 * bears mentioning:
1157 * Since we are only calling this from do_skill() in the future 1022 * Since we are only calling this from do_skill() in the future
1158 * we may make this routine handle 'special' melee weapons attacks 1023 * we may make this routine handle 'special' melee weapons attacks
1159 * (like disarming manuever with sai) based on player SK_level and 1024 * (like disarming manuever with sai) based on player SK_level and
1160 * weapon type. 1025 * weapon type.
1161 */ 1026 */
1162
1163static int 1027static int
1164attack_melee_weapon (object *op, int dir, const char *string, object *skill) 1028attack_melee_weapon (object *op, int dir, const char *string, object *skill)
1165{ 1029{
1166 1030
1167 if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) 1031 if (!QUERY_FLAG (op, FLAG_READY_WEAPON))
1168 { 1032 {
1169 if (op->type == PLAYER) 1033 if (op->type == PLAYER)
1170 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); 1034 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");
1035
1171 return 0; 1036 return 0;
1172 } 1037 }
1038
1173 return skill_attack (NULL, op, dir, string, skill); 1039 return skill_attack (NULL, op, dir, string, skill);
1174
1175} 1040}
1041

Diff Legend

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