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.40 by root, Fri May 11 20:06:33 2007 UTC

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

Diff Legend

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