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.24 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.92 by root, Sat Apr 10 04:54:10 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines