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.11 by root, Tue Sep 12 00:53:57 2006 UTC vs.
Revision 1.79 by root, Sat Nov 7 18:30:06 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines