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.22 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.58 by root, Sun Jul 1 05:00:20 2007 UTC

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

Diff Legend

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