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.1 by elmex, Sun Aug 13 17:16:04 2006 UTC vs.
Revision 1.58 by root, Sun Jul 1 05:00:20 2007 UTC

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

Diff Legend

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