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.10 by root, Tue Sep 12 00:26:16 2006 UTC

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

Diff Legend

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