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.3 by root, Sat Aug 26 08:44:07 2006 UTC vs.
Revision 1.95 by root, Tue Apr 13 03:44:21 2010 UTC

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

Diff Legend

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