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.94 by root, Sun Apr 11 00:34:06 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;
253}
254
255/* This changes the objects 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
265 */
266
267int
268change_skill (object *who, object *new_skill, int flag)
269{
270 int old_range;
271
272 if (who->type != PLAYER)
273 return 0; 211 return 0;
274
275 old_range = who->contr->shoottype;
276
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;
284 }
285
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)
292 apply_special (who, who->chosen_skill, AP_UNAPPLY);
293
294 /* Only goal in this case was to unapply a skill */
295 if (!new_skill)
296 return 0;
297
298 if (apply_special (who, new_skill, AP_APPLY))
299 return 0;
300
301 if (flag & 0x1)
302 who->contr->shoottype = (rangetype)old_range;
303
304 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} 212}
322 213
323/* do_skill() - Main skills use function-similar in scope to cast_spell(). 214/* 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. 215 * 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 216 * 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 219 * 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 220 * from know if a skill was actually used, as many skills don't
330 * give any exp for their direct use (eg, throwing). 221 * give any exp for their direct use (eg, throwing).
331 * It returns 0 if no skill was used. 222 * It returns 0 if no skill was used.
332 */ 223 */
333
334int 224int
335do_skill (object *op, object *part, object *skill, int dir, const char *string) 225do_skill (object *op, object *part, object *skill, int dir, const char *string)
336{ 226{
337 int success = 0, exp = 0; 227 int success = 0, exp = 0;
338 int did_alc = 0;
339 object *tmp, *next;
340 228
341 if (!skill) 229 if (!skill)
342 return 0; 230 return 0;
343 231
344 /* The code below presumes that the skill points to the object that 232 /* 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 234 * 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. 235 * the player doesn't have a bucket for that, create one.
348 */ 236 */
349 if (skill->type != SKILL && op->type == PLAYER) 237 if (skill->type != SKILL && op->type == PLAYER)
350 { 238 {
351 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 239 for (object *tmp = op->inv; tmp; tmp = tmp->below)
352 {
353 if (tmp->type == SKILL && tmp->skill == skill->skill) 240 if (tmp->type == SKILL && tmp->skill == skill->skill)
354 break; 241 {
242 skill = tmp;
243 goto found;
355 } 244 }
356 if (!tmp) 245
357 tmp = give_skill_by_name (op, skill->skill); 246 skill = give_skill_by_name (op, skill->skill);
358 skill = tmp; 247found: ;
359 } 248 }
360 249
361 // skill, by_whom, on_which_object, which direction, skill_argument 250 // 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))) 251 if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))
363 return 0; 252 return 0;
364 253
365 switch (skill->subtype) 254 switch (skill->subtype)
366 { 255 {
367 case SK_LEVITATION: 256 case SK_LEVITATION:
368 /* Not 100% sure if this will work with new movement code - 257 /* Not 100% sure if this will work with new movement code -
369 * the levitation skill has move_type for flying, so when 258 * the levitation skill has move_type for flying, so when
370 * equipped, that should transfer to player, when not, 259 * equipped, that should transfer to player, when not,
371 * shouldn't. 260 * shouldn't.
372 */ 261 */
373 if (QUERY_FLAG (skill, FLAG_APPLIED)) 262 if (skill->flag [FLAG_APPLIED])
374 { 263 {
375 CLEAR_FLAG (skill, FLAG_APPLIED); 264 skill->clr_flag (FLAG_APPLIED);
376 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); 265 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
377 } 266 }
378 else 267 else
379 { 268 {
380 SET_FLAG (skill, FLAG_APPLIED); 269 skill->set_flag (FLAG_APPLIED);
381 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!."); 270 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
382 } 271 }
272
383 op->update_stats (); 273 op->update_stats ();
384 success = 1; 274 success = 1;
385 break; 275 break;
386 276
387 case SK_STEALING: 277 case SK_STEALING:
388 exp = success = steal (op, dir, skill); 278 exp = success = steal (op, dir, skill);
389 break; 279 break;
390 280
391 case SK_LOCKPICKING: 281 case SK_LOCKPICKING:
392 exp = success = pick_lock (op, dir, skill); 282 exp = success = pick_lock (op, dir, skill);
393 break; 283 break;
394 284
395 case SK_HIDING: 285 case SK_HIDING:
396 exp = success = hide (op, skill); 286 exp = success = hide (op, skill);
397 break; 287 break;
398 288
399 case SK_JUMPING: 289 case SK_JUMPING:
400 success = jump (op, dir, skill); 290 exp = success = jump (op, dir, skill);
401 break; 291 break;
402 292
403 case SK_INSCRIPTION: 293 case SK_INSCRIPTION:
404 exp = success = write_on_item (op, string, skill); 294 exp = success = write_on_item (op, string, skill);
405 break; 295 break;
406 296
407 case SK_MEDITATION: 297 case SK_MEDITATION:
408 meditate (op, skill); 298 meditate (op, skill);
409 success = 1; 299 success = 1;
410 break; 300 break;
411 /* note that the following 'attack' skills gain exp through hit_player() */ 301 /* note that the following 'attack' skills gain exp through hit_player() */
412 302
413 case SK_KARATE: 303 case SK_KARATE:
414 (void) attack_hth (op, dir, "karate-chopped", skill); 304 attack_hth (op, dir, "karate-chopped", skill);
415 break; 305 break;
416 306
417 case SK_PUNCHING: 307 case SK_PUNCHING:
418 (void) attack_hth (op, dir, "punched", skill); 308 attack_hth (op, dir, "punched", skill);
419 break; 309 break;
420 310
421 case SK_FLAME_TOUCH: 311 case SK_FLAME_TOUCH:
422 (void) attack_hth (op, dir, "flamed", skill); 312 attack_hth (op, dir, "flamed", skill);
423 break; 313 break;
424 314
425 case SK_SPARK_TOUCH: 315 case SK_SPARK_TOUCH:
426 (void) attack_hth (op, dir, "zapped", skill); 316 attack_hth (op, dir, "zapped", skill);
427 break; 317 break;
428 318
429 case SK_SHIVER: 319 case SK_SHIVER:
430 (void) attack_hth (op, dir, "froze", skill); 320 attack_hth (op, dir, "froze", skill);
431 break; 321 break;
432 322
433 case SK_ACID_SPLASH: 323 case SK_ACID_SPLASH:
434 (void) attack_hth (op, dir, "dissolved", skill); 324 attack_hth (op, dir, "dissolved", skill);
435 break; 325 break;
436 326
437 case SK_POISON_NAIL: 327 case SK_POISON_NAIL:
438 (void) attack_hth (op, dir, "injected poison into", skill); 328 attack_hth (op, dir, "injected poison into", skill);
439 break; 329 break;
440 330
441 case SK_CLAWING: 331 case SK_CLAWING:
442 (void) attack_hth (op, dir, "clawed", skill); 332 attack_hth (op, dir, "clawed", skill);
443 break; 333 break;
444 334
445 case SK_ONE_HANDED_WEAPON: 335 case SK_ONE_HANDED_WEAPON:
446 case SK_TWO_HANDED_WEAPON: 336 case SK_TWO_HANDED_WEAPON:
447 (void) attack_melee_weapon (op, dir, NULL, skill); 337 attack_melee_weapon (op, dir, NULL, skill);
448 break; 338 break;
449 339
450 case SK_FIND_TRAPS: 340 case SK_FIND_TRAPS:
451 exp = success = find_traps (op, skill); 341 exp = success = find_traps (op, skill);
452 break; 342 break;
453 343
454 case SK_SINGING: 344 case SK_SINGING:
455 exp = success = singing (op, dir, skill); 345 exp = success = singing (op, dir, skill);
456 break; 346 break;
457 347
458 case SK_ORATORY: 348 case SK_ORATORY:
459 exp = success = use_oratory (op, dir, skill); 349 exp = success = use_oratory (op, dir, skill);
460 break; 350 break;
461 351
462 case SK_SMITHERY: 352 case SK_SMITHERY:
463 case SK_BOWYER: 353 case SK_BOWYER:
464 case SK_JEWELER: 354 case SK_JEWELER:
465 case SK_ALCHEMY: 355 case SK_ALCHEMY:
466 case SK_THAUMATURGY: 356 case SK_THAUMATURGY:
467 case SK_LITERACY: 357 case SK_LITERACY:
468 case SK_WOODSMAN: 358 case SK_WOODSMAN:
469 /* first, we try to find a cauldron, and do the alchemy thing. 359 /* first, we try to find a cauldron, and do the alchemy thing.
470 * failing that, we go and identify stuff. 360 * failing that, we go and identify stuff.
471 */ 361 */
362 {
363 bool found_cauldron = false;
364
472 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = next) 365 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
473 { 366 {
474 next = tmp->above; 367 next = tmp->above;
475 368
476 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 369 if (tmp->flag [FLAG_IS_CAULDRON])
477 { 370 {
371 found_cauldron = true;
372
373 if (tmp->skill != skill->skill)
374 {
375 op->failmsgf ("You can't use the %s with the %s skill!",
376 query_name (tmp),
377 query_name (skill));
378 break;
379 }
380
478 attempt_do_alchemy (op, tmp); 381 attempt_do_alchemy (op, tmp, skill);
479 382
480 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 383 if (tmp->flag [FLAG_APPLIED])
481 esrv_send_inventory (op, tmp); 384 esrv_send_inventory (op, tmp);
482
483 did_alc = 1;
484 } 385 }
485 } 386 }
486 387
487 if (did_alc == 0) 388 if (!found_cauldron)
488 exp = success = skill_ident (op, skill); 389 exp = success = skill_ident (op, skill);
489 390 }
490 break; 391 break;
491 392
492 case SK_DET_MAGIC: 393 case SK_DET_MAGIC:
493 case SK_DET_CURSE: 394 case SK_DET_CURSE:
494 exp = success = skill_ident (op, skill); 395 exp = success = skill_ident (op, skill);
495 break; 396 break;
496 397
497 case SK_DISARM_TRAPS: 398 case SK_DISARM_TRAPS:
498 exp = success = remove_trap (op, dir, skill); 399 exp = success = remove_trap (op, dir, skill);
499 break; 400 break;
500 401
501 case SK_THROWING: 402 case SK_THROWING:
502 success = skill_throw (op, part, dir, string, skill); 403 success = skill_throw (op, part, dir, string, skill);
503 break; 404 break;
504 405
505 case SK_SET_TRAP: 406 case SK_SET_TRAP:
506 new_draw_info (NDI_UNIQUE, 0, op, "This skill is not currently implemented."); 407 new_draw_info (NDI_UNIQUE, 0, op, "This skill is not currently implemented.");
507 break; 408 break;
508 409
509 case SK_USE_MAGIC_ITEM: 410 case SK_USE_MAGIC_ITEM:
510 case SK_MISSILE_WEAPON: 411 case SK_MISSILE_WEAPON:
511 new_draw_info (NDI_UNIQUE, 0, op, "There is no special attack for this skill."); 412 new_draw_info (NDI_UNIQUE, 0, op, "There is no special attack for this skill.");
512 break; 413 break;
513 414
514 case SK_PRAYING: 415 case SK_PRAYING:
515 success = pray (op, skill); 416 success = pray (op, skill);
516 break; 417 break;
517 418
518 case SK_BARGAINING: 419 case SK_BARGAINING:
519 success = describe_shop (op); 420 success = describe_shop (op);
520 break; 421 break;
521 422
522 case SK_SORCERY: 423 case SK_SORCERY:
523 case SK_EVOCATION: 424 case SK_EVOCATION:
524 case SK_PYROMANCY: 425 case SK_PYROMANCY:
525 case SK_SUMMONING: 426 case SK_SUMMONING:
526 case SK_CLIMBING: 427 case SK_CLIMBING:
527 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); 428 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
528 break; 429 break;
529 430
431 case SK_MINING:
432 success = skill_mining (op, part, skill, dir, string);
433 break;
434
435 case SK_FISHING:
436 success = skill_fishing (op, part, skill, dir, string);
437 break;
438
530 default: 439 default:
531 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); 440 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
532 break; 441 break;
533 } 442 }
534 443
535 /* For players we now update the speed_left from using the skill. 444 /* 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 445 * Monsters have no skill use time because of the random nature in
537 * which use_monster_skill is called already simulates this. 446 * which use_monster_skill is called already simulates this.
538 * If certain skills should take more/less time, that should be 447 * If certain skills should take more/less time, that should be
539 * in the code for the skill itself. 448 * in the code for the skill itself.
540 */ 449 */
541
542 if (op->type == PLAYER) 450 if (op->type == PLAYER)
543 op->speed_left -= 1.0; 451 op->speed_left -= 1.f;
544 452
545 /* this is a good place to add experience for successfull use of skills. 453 /* this is a good place to add experience for successfull use of skills.
546 * Note that add_exp() will figure out player/monster experience 454 * Note that add_exp() will figure out player/monster experience
547 * gain problems. 455 * gain problems.
548 */ 456 */
… …
576 * op is the object that was 'defeated'. 484 * op is the object that was 'defeated'.
577 * skill is the skill used. If no skill is used, it should just 485 * skill is the skill used. If no skill is used, it should just
578 * point back to who. 486 * point back to who.
579 * 487 *
580 */ 488 */
581
582int 489int
583calc_skill_exp (object *who, object *op, object *skill) 490calc_skill_exp (object *who, object *op, object *skill)
584{ 491{
585 int op_exp = 0, op_lvl = 0; 492 int op_exp = 0, op_lvl = 0;
586 float base, value, lvl_mult = 0.0; 493 float base, value, lvl_mult = 0.0;
… …
595 * If an object is not alive and magical we set the base exp higher to 502 * 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 503 * help out exp awards for skill_ident skills. Also, if
597 * an item is type RUNE, we give out exp based on stats.Cha 504 * an item is type RUNE, we give out exp based on stats.Cha
598 * and level (this was the old system) -b.t. 505 * and level (this was the old system) -b.t.
599 */ 506 */
600
601 if (!op) 507 if (!op)
602 { /* no item/creature */ 508 { /* no item/creature */
603 op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty; 509 op_lvl = max (1, who->map->difficulty);
604 op_exp = 0; 510 op_exp = 0;
605 } 511 }
606 else if (op->type == RUNE || op->type == TRAP) 512 else if (op->type == RUNE || op->type == TRAP)
607 { /* all traps. If stats.Cha > 1 we use that 513 { /* all traps. If stats.Cha > 1 we use that
608 * for the amount of experience */ 514 * for the amount of experience */
… …
611 } 517 }
612 else 518 else
613 { /* all other items/living creatures */ 519 { /* all other items/living creatures */
614 op_exp = op->stats.exp; 520 op_exp = op->stats.exp;
615 op_lvl = op->level; 521 op_lvl = op->level;
616 if (!QUERY_FLAG (op, FLAG_ALIVE)) 522 if (!op->flag [FLAG_ALIVE])
617 { /* for ident/make items */ 523 op_lvl += 5 * abs (op->magic); /* for ident/make items */
618 op_lvl += 5 * abs (op->magic);
619 }
620 } 524 }
621 525
622 if (op_lvl < 1) 526 if (op_lvl < 1)
623 op_lvl = 1; 527 op_lvl = 1;
624 528
… …
632 /* if skill really is a skill, then we can look at the skill archetype for 536 /* if skill really is a skill, then we can look at the skill archetype for
633 * bse reward value (exp) and level multiplier factor. 537 * bse reward value (exp) and level multiplier factor.
634 */ 538 */
635 if (skill->type == SKILL) 539 if (skill->type == SKILL)
636 { 540 {
637 base += skill->arch->clone.stats.exp; 541 base += skill->arch->stats.exp;
638 if (settings.simple_exp) 542 if (settings.simple_exp)
639 { 543 {
640 if (skill->arch->clone.level) 544 if (skill->arch->level)
641 lvl_mult = (float) skill->arch->clone.level / 100.0; 545 lvl_mult = (float) skill->arch->level / 100.0;
642 else 546 else
643 lvl_mult = 1.0; /* no adjustment */ 547 lvl_mult = 1.0; /* no adjustment */
644 } 548 }
645 else 549 else
646 { 550 {
647 if (skill->level) 551 if (skill->level)
648 lvl_mult = ((float) skill->arch->clone.level * (float) op_lvl) / ((float) skill->level * 100.0); 552 lvl_mult = ((float) skill->arch->level * (float) op_lvl) / ((float) skill->level * 100.0);
649 else 553 else
650 lvl_mult = 1.0; 554 lvl_mult = 1.0;
651 } 555 }
652 } 556 }
653 else 557 else
654 { 558 {
655 /* Don't divide by zero here! */ 559 /* Don't divide by zero here! */
656 lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1); 560 lvl_mult = (float) op_lvl / (float) max (1, skill->level);
657 } 561 }
658 } 562 }
659 563
660 /* assemble the exp total, and return value */ 564 /* assemble the exp total, and return value */
661 565
… …
675 * This one actually teaches the player the skill as something 579 * This one actually teaches the player the skill as something
676 * they can equip. 580 * they can equip.
677 * Return 0 if the player knows the skill, 1 if the 581 * Return 0 if the player knows the skill, 1 if the
678 * player learns the skill, 2 otherwise. 582 * player learns the skill, 2 otherwise.
679 */ 583 */
680
681int 584int
682learn_skill (object *pl, object *scroll) 585learn_skill (object *pl, object *scroll)
683{ 586{
684 object *tmp;
685
686 if (!scroll->skill) 587 if (!scroll->skill)
687 { 588 {
688 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name); 589 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);
689 return 2; 590 return 2;
690 } 591 }
691 592
692 /* can't use find_skill_by_name because we want skills the player knows 593 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 594
700 /* player already knows it */ 595 /* player already knows it */
701 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 596 if (tmp && tmp->flag [FLAG_CAN_USE_SKILL])
702 return 0; 597 return 0;
703 598
704 /* now a random change to learn, based on player Int. 599 /* now a random change to learn, based on player Int.
705 * give bonus based on level - otherwise stupid characters 600 * give bonus based on level - otherwise stupid characters
706 * might never be able to learn anything. 601 * might never be able to learn anything.
… …
715 { 610 {
716 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); 611 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);
717 return 2; 612 return 2;
718 } 613 }
719 614
720 SET_FLAG (tmp, FLAG_CAN_USE_SKILL); 615 tmp->set_flag (FLAG_CAN_USE_SKILL);
721 link_player_skills (pl); 616
722 return 1; 617 return 1;
723} 618}
724 619
725/* Gives a percentage clipped to 0% -> 100% of a/b. */ 620/* Gives a percentage clipped to 0% -> 100% of a/b. */
726
727/* Probably belongs in some global utils-type file? */ 621/* Probably belongs in some global utils-type file? */
728static int 622static int
729clipped_percent (sint64 a, sint64 b) 623clipped_percent (sint64 a, sint64 b)
730{ 624{
731 int rv; 625 int rv;
… …
751 * Note this function is a bit more complicated becauase we 645 * Note this function is a bit more complicated becauase we
752 * we want ot sort the skills before printing them. If we 646 * we want ot sort the skills before printing them. If we
753 * just dumped this as we found it, this would be a bit 647 * just dumped this as we found it, this would be a bit
754 * simpler. 648 * simpler.
755 */ 649 */
756 650//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
757void 651void
758show_skills (object *op, const char *search) 652show_skills (object *pl, const char *search)
759{ 653{
760 object *tmp = NULL;
761 char buf[MAX_BUF];
762 const char *cp; 654 const char *cp;
763 int i, num_skills_found = 0; 655 int i, num_skills_found = 0;
764 static const char *const periods = "........................................"; 656 const char *const periods = ".............................."; // 30
765 657
766 /* Need to have a pointer and use strdup for qsort to work properly */ 658 /* Need to have a pointer and use strdup for qsort to work properly */
767 char skills[NUM_SKILLS][MAX_BUF]; 659 char skills[NUM_SKILLS][128]; // d'oh
768 660
661 object *op = pl->contr->ob;
769 662
770 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 663 for (object *tmp = op->inv; tmp; tmp = tmp->below)
771 { 664 {
772 if (tmp->type == SKILL) 665 if (tmp->type == SKILL)
773 { 666 {
774 if (search && strstr (tmp->name, search) == NULL) 667 if (search && !tmp->name.contains (search))
775 continue; 668 continue;
669
670 char buf[30];
671
776 /* Basically want to fill this out to 40 spaces with periods */ 672 /* Basically want to fill this out to 30 spaces with periods */
777 sprintf (buf, "%s%s", &tmp->name, periods); 673 snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
778 buf[40] = 0;
779 674
780 if (settings.permanent_exp_ratio) 675 if (settings.permanent_exp_ratio)
781 {
782 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)", 676 snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
783 buf, tmp->level, tmp->stats.exp, 677 buf, tmp->level, tmp->stats.exp,
784 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp)); 678 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
785 }
786 else 679 else
787 {
788 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")", 680 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)); 681 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
790 } 682
791 /* I don't know why some characters get a bunch of skills, but 683 /* I don't know why some characters get a bunch of skills, but
792 * it sometimes happens (maybe a leftover from bugier earlier code 684 * it sometimes happens (maybe a leftover from bugier earlier code
793 * and those character are still about). In any case, lets handle 685 * and those character are still about). In any case, lets handle
794 * it so it doesn't crash the server - otherwise, one character may 686 * it so it doesn't crash the server - otherwise, one character may
795 * crash the server numerous times. 687 * crash the server numerous times.
796 */ 688 */
797 if (num_skills_found >= NUM_SKILLS) 689 if (num_skills_found >= NUM_SKILLS)
798 { 690 {
799 new_draw_info (NDI_RED, 0, op, "Your character has too many skills."); 691 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"); 692 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Something isn't right - contact the server admin");
801 break; 693 break;
802 } 694 }
803 } 695 }
804 } 696 }
805 697
806 clear_win_info (op); 698 dynbuf_text &msg = msg_dynbuf; msg.clear ();
807 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:"); 699
700 msg << "T<Player skills:>\n\n";
808 if (num_skills_found > 1) 701 if (num_skills_found > 1)
809 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) strcmp); 702 qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp);
810 703
811 for (i = 0; i < num_skills_found; i++) 704 for (i = 0; i < num_skills_found; i++)
812 { 705 msg << " C<" << skills [i] << ">\n";
813 new_draw_info (NDI_UNIQUE, 0, op, skills[i]);
814 }
815 706
816 new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5); 707 msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r";
817 708
818 cp = determine_god (op); 709 cp = determine_god (op);
819 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time"); 710 msg << "You worship " << (cp ? cp : "no god at current time") << ".\r";
820 711
821 new_draw_info_format (NDI_UNIQUE, 0, op, "Your equipped item power is %d out of %d\n", 712 msg << "Your equipped item power is " << (int)op->contr->item_power
822 op->contr->item_power, (int) (op->level * settings.item_power_factor)); 713 << " out of " << int (op->level * settings.item_power_factor)
714 << ".\n";
715
716 pl->contr->infobox (MSG_CHANNEL ("skills"), msg);
823} 717}
824 718
825/* use_skill() - similar to invoke command, it executes the skill in the 719/* 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 720 * 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. 721 * 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 722 * 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. 723 * our own find_skill_by_name so we can try to do better string matching.
830 */ 724 */
831
832int 725int
833use_skill (object *op, const char *string) 726use_skill (object *op, const char *string)
834{ 727{
835 object *skop; 728 object *skop;
836 size_t len; 729 size_t len;
837 730
838 if (!string) 731 if (!string)
839 return 0; 732 return 0;
840 733
841 for (skop = op->inv; skop != NULL; skop = skop->below) 734 for (skop = op->inv; skop; skop = skop->below)
842 { 735 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)))) 736 && !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill))))
737 {
738 skop = find_skill_by_name (op, skop->skill);
845 break; 739 break;
846 else if (skop->type == SKILL_TOOL && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
847 break;
848 } 740 }
741
849 if (!skop) 742 if (!skop)
850 { 743 {
851 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 744 op->failmsgf ("Unable to find skill %s.", string);
745 return 0;
746 }
747
748 if (!(skill_flags [skop->subtype] & SF_USE))
749 {
750 op->failmsgf (
751 "You feel as if you wanted to do something funny, but you can't remember what. "
752 "H<The %s skill cannot be C<use_skill>'ed - maybe you need to C<ready_skill> it, "
753 "use it with some item, or it's always active.>",
754 &skop->skill
755 );
852 return 0; 756 return 0;
853 } 757 }
854 758
855 len = strlen (skop->skill); 759 len = strlen (skop->skill);
856 760
… …
858 * options given to the skill. Its pretty simple - if there 762 * options given to the skill. Its pretty simple - if there
859 * are extra parameters (as deteremined by string length), we 763 * are extra parameters (as deteremined by string length), we
860 * want to skip over any leading spaces. 764 * want to skip over any leading spaces.
861 */ 765 */
862 if (len >= strlen (string)) 766 if (len >= strlen (string))
863 {
864 string = NULL; 767 string = NULL;
865 }
866 else 768 else
867 { 769 {
868 string += len; 770 string += len;
869 while (*string == 0x20) 771 while (*string == 0x20)
870 string++; 772 string++;
773
871 if (strlen (string) == 0) 774 if (strlen (string) == 0)
872 string = NULL; 775 string = NULL;
873 } 776 }
874 777
875#ifdef SKILL_UTIL_DEBUG 778#ifdef SKILL_UTIL_DEBUG
876 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none"); 779 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");
877#endif 780#endif
878 781
879 /* Change to the new skill, then execute it. */
880 if (do_skill (op, op, skop, op->facing, string)) 782 if (do_skill (op, op, skop, op->facing, string))
881 return 1; 783 return 1;
882 784
883 return 0; 785 return 0;
884} 786}
885 787
886static bool 788static bool
887hth_skill_p (object *skill) 789hth_skill_p (object *skill)
888{ 790{
889 for (unsigned int i = 0; i < sizeof (unarmed_skills); ++i) 791 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} 792}
895 793
896/* This finds the first unarmed skill the player has, and returns it. 794/* This finds the first unarmed skill the player has, and returns it.
897 */ 795 */
898static object * 796static object *
899find_player_hth_skill (object *op) 797find_player_hth_skill (object *op)
900{ 798{
901 for (object *tmp = op->inv; tmp; tmp = tmp->below) 799 for (object *tmp = op->inv; tmp; tmp = tmp->below)
902 if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp)) 800 if (tmp->type == SKILL && tmp->flag [FLAG_CAN_USE_SKILL] && hth_skill_p (tmp))
903 return tmp; 801 return tmp;
904 802
905 return 0; 803 return 0;
906} 804}
907 805
… …
912 * tmp is the targetted monster. 810 * tmp is the targetted monster.
913 * op is what is attacking 811 * op is what is attacking
914 * string is passed along to describe what messages to describe 812 * string is passed along to describe what messages to describe
915 * the damage. 813 * the damage.
916 */ 814 */
917
918static int 815static int
919do_skill_attack (object *tmp, object *op, const char *string, object *skill) 816do_skill_attack (object *tmp, object *op, const char *string, object *skill)
920{ 817{
921 int success;
922
923 if (INVOKE_OBJECT (SKILL_ATTACK, op, ARG_OBJECT (tmp), ARG_STRING (string), ARG_OBJECT (skill))) 818 if (INVOKE_OBJECT (SKILL_ATTACK, op, ARG_OBJECT (tmp), ARG_STRING (string), ARG_OBJECT (skill)))
924 return RESULT_INT (0); 819 return RESULT_INT (0);
925 820
926 /* For Players only: if there is no ready weapon, and no "attack" skill 821 /* 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. 822 * 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, 823 * 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 824 * 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. 825 * through that code if skill is set to change to the skill.
931 */ 826 */
932 if (op->type == PLAYER) 827 if (player *pl = op->contr)
933 { 828 {
934 if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) 829 if (skill)
935 { 830 {
936 if (!skill) 831 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; 832 return 0;
960 }
961 } 833 }
962 else 834 else
963 { 835 {
964 /* Seen some crashes below where current_weapon is not set, 836 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 { 837 {
970 object *tmp; 838 if (op->flag [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 { 839 {
840 for (tmp = op->inv; tmp; tmp = tmp->below)
841 if (tmp->type == WEAPON && tmp->flag [FLAG_APPLIED])
842 break;
843
844 if (!tmp)
979 LOG (llevError, "Could not find applied weapon on %s\n", &op->name); 845 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
980 op->current_weapon = NULL; 846
847 pl->combat_ob = tmp;
848 }
849
850 if (!pl->combat_ob)
851 {
852 /* See if the players chosen skill is a combat skill, and use
853 * it if appropriate.
854 */
855 if (op->chosen_skill && hth_skill_p (op->chosen_skill))
856 skill = op->chosen_skill;
857 else
858 {
859 skill = find_player_hth_skill (op);
860
861 if (!skill)
862 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
863 }
864
865 op->apply (skill);
866 }
867
868 if (!pl->combat_ob)
869 {
870 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
981 return 0; 871 return 0;
982 } 872 }
983 else
984 {
985 op->current_weapon = tmp;
986 }
987 } 873 }
988 874
989 change_skill (op, find_skill_by_name (op, op->current_weapon->skill), 1); 875 if (!op->apply (pl->combat_ob))
876 return 0;
990 } 877 }
991 }
992 878
993 /* lose invisiblity/hiding status for running attacks */ 879 /* lose invisiblity/hiding status for running attacks */
994 880 if (pl->tmp_invis)
995 if (op->type == PLAYER && op->contr->tmp_invis) 881 {
996 {
997 op->contr->tmp_invis = 0; 882 pl->tmp_invis = 0;
998 op->invisible = 0; 883 op->invisible = 0;
999 op->hide = 0; 884 op->flag [FLAG_HIDDEN] = 0;
1000 update_object (op, UP_OBJ_FACE); 885 update_object (op, UP_OBJ_CHANGE);
886 }
1001 } 887 }
1002 888
1003 success = attack_ob (tmp, op); 889 int success = attack_ob (tmp, op);
1004 890
1005 /* print appropriate messages to the player */ 891 /* print appropriate messages to the player */
1006 892
1007 if (success && string != NULL && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) 893 if (success && string && tmp && !tmp->flag [FLAG_FREED])
1008 { 894 {
1009 if (op->type == PLAYER) 895 if (op->type == PLAYER)
1010 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); 896 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
1011 else if (tmp->type == PLAYER) 897 else if (tmp->type == PLAYER)
1012 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); 898 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
1013 } 899 }
900
1014 return success; 901 return success;
1015} 902}
1016
1017 903
1018/* skill_attack() - Core routine for use when we attack using a skills 904/* skill_attack() - Core routine for use when we attack using a skills
1019 * system. In essence, this code handles 905 * system. In essence, this code handles
1020 * all skill-based attacks, ie hth, missile and melee weapons should be 906 * 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(), 907 * treated here. If an opponent is already supplied by move_player(),
1022 * we move right onto do_skill_attack(), otherwise we find if an 908 * we move right onto do_skill_attack(), otherwise we find if an
1023 * appropriate opponent exists. 909 * appropriate opponent exists.
1024 * 910 *
1025 * This is called by move_player() and attack_hth() 911 * This is called by move_player() and attack_hth()
1026 * 912 *
1027 * Initial implementation by -bt thomas@astro.psu.edu 913 * Initial implementation by -bt thomas@astro.psu.edu
1028 */ 914 */
1029
1030int 915int
1031skill_attack (object *tmp, object *pl, int dir, const char *string, object *skill) 916skill_attack (object *tmp, object *pl, int dir, const char *string, object *skill)
1032{ 917{
1033 sint16 tx, ty; 918 sint16 tx, ty;
1034 maptile *m; 919 maptile *m;
… …
1041 ty = freearr_y[dir]; 926 ty = freearr_y[dir];
1042 927
1043 /* If we don't yet have an opponent, find if one exists, and attack. 928 /* 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() 929 * Legal opponents are the same as outlined in move_player_attack()
1045 */ 930 */
1046 931 if (!tmp)
1047 if (tmp == NULL)
1048 { 932 {
1049 m = pl->map; 933 m = pl->map;
1050 tx = pl->x + freearr_x[dir]; 934 tx = pl->x + freearr_x[dir];
1051 ty = pl->y + freearr_y[dir]; 935 ty = pl->y + freearr_y[dir];
1052 936
… …
1057 /* space must be blocked for there to be anything interesting to do */ 941 /* space must be blocked for there to be anything interesting to do */
1058 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) 942 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))
1059 return 0; 943 return 0;
1060 944
1061 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above) 945 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above)
1062 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) 946 if ((tmp->flag [FLAG_ALIVE] && tmp->stats.hp >= 0) || tmp->flag [FLAG_CAN_ROLL] || tmp->type == LOCKED_DOOR)
1063 { 947 {
1064 /* Don't attack party members */ 948 /* Don't attack party members */
1065 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) 949 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
1066 return 0; 950 return 0;
951
1067 break; 952 break;
1068 } 953 }
1069 } 954 }
955
1070 if (!tmp) 956 if (!tmp)
1071 { 957 {
1072 if (pl->type == PLAYER) 958 if (pl->type == PLAYER)
1073 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!"); 959 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!");
960
1074 return 0; 961 return 0;
1075 } 962 }
1076 963
1077 return do_skill_attack (tmp, pl, string, skill); 964 return do_skill_attack (tmp, pl, string, skill);
1078} 965}
1079
1080 966
1081/* attack_hth() - this handles all hand-to-hand attacks -b.t. */ 967/* attack_hth() - this handles all hand-to-hand attacks -b.t. */
1082 968
1083/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first 969/* 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 970 * (attack_hth) we check for weapon use, etc in the second (the new
1085 * function skill_attack() we actually attack. 971 * function skill_attack() we actually attack.
1086 */ 972 */
1087
1088static int 973static int
1089attack_hth (object *pl, int dir, const char *string, object *skill) 974attack_hth (object *pl, int dir, const char *string, object *skill)
1090{ 975{
1091 object *enemy = NULL, *weapon; 976 object *enemy = NULL, *weapon;
1092 977
1093 if (QUERY_FLAG (pl, FLAG_READY_WEAPON)) 978 if (pl->flag [FLAG_READY_WEAPON])
1094 for (weapon = pl->inv; weapon; weapon = weapon->below) 979 for (weapon = pl->inv; weapon; weapon = weapon->below)
1095 { 980 {
1096 if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED)) 981 if (weapon->type == WEAPON && weapon->flag [FLAG_APPLIED])
1097 { 982 {
1098 CLEAR_FLAG (weapon, FLAG_APPLIED); 983 weapon->clr_flag (FLAG_APPLIED);
1099 CLEAR_FLAG (pl, FLAG_READY_WEAPON); 984 pl->clr_flag (FLAG_READY_WEAPON);
1100 pl->update_stats (); 985 pl->update_stats ();
1101 if (pl->type == PLAYER) 986 if (pl->type == PLAYER)
1102 { 987 {
1103 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); 988 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
1104 esrv_update_item (UPD_FLAGS, pl, weapon); 989 esrv_update_item (UPD_FLAGS, pl, weapon);
1105 } 990 }
991
1106 break; 992 break;
1107 } 993 }
1108 } 994 }
995
1109 return skill_attack (enemy, pl, dir, string, skill); 996 return skill_attack (enemy, pl, dir, string, skill);
1110} 997}
1111
1112 998
1113/* attack_melee_weapon() - this handles melee weapon attacks -b.t. 999/* 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. 1000 * 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 1001 * But there is a real neato possible feature of this scheme which
1116 * bears mentioning: 1002 * bears mentioning:
1117 * Since we are only calling this from do_skill() in the future 1003 * Since we are only calling this from do_skill() in the future
1118 * we may make this routine handle 'special' melee weapons attacks 1004 * we may make this routine handle 'special' melee weapons attacks
1119 * (like disarming manuever with sai) based on player SK_level and 1005 * (like disarming manuever with sai) based on player SK_level and
1120 * weapon type. 1006 * weapon type.
1121 */ 1007 */
1122
1123static int 1008static int
1124attack_melee_weapon (object *op, int dir, const char *string, object *skill) 1009attack_melee_weapon (object *op, int dir, const char *string, object *skill)
1125{ 1010{
1126 1011
1127 if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) 1012 if (!op->flag [FLAG_READY_WEAPON])
1128 { 1013 {
1129 if (op->type == PLAYER) 1014 if (op->type == PLAYER)
1130 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); 1015 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");
1016
1131 return 0; 1017 return 0;
1132 } 1018 }
1019
1133 return skill_attack (NULL, op, dir, string, skill); 1020 return skill_attack (NULL, op, dir, string, skill);
1134
1135} 1021}
1022

Diff Legend

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