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

Diff Legend

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