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.2 by root, Fri Aug 25 17:11:53 2006 UTC vs.
Revision 1.92 by root, Sat Apr 10 04:54:10 2010 UTC

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

Diff Legend

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