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.30 by root, Sun Apr 29 03:44:36 2007 UTC vs.
Revision 1.61 by root, Tue May 6 16:32:34 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copryight (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* 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. */
26 25
27/* Reconfigured skills code to allow linking of skills to experience 26/* Reconfigured skills code to allow linking of skills to experience
… …
44#include <object.h> 43#include <object.h>
45#include <sproto.h> 44#include <sproto.h>
46#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. */
47#include <spells.h> 46#include <spells.h>
48 47
49/* Table of unarmed attack skills. Terminated by -1. This 48const uint8_t skill_flags[NUM_SKILLS] = {
50 * is also the list that we should try to use skills when 49 0, // SK_NONE
51 * automatically applying one for the player. 50# define def(uc, flags) flags,
52 */ 51# include "skillinc.h"
53static uint8 unarmed_skills[] = { 52# undef def
54 SK_KARATE,
55 SK_CLAWING,
56 SK_FLAME_TOUCH,
57 SK_SPARK_TOUCH,
58 SK_SHIVER,
59 SK_ACID_SPLASH,
60 SK_POISON_NAIL,
61 SK_PUNCHING,
62 (uint8)-1
63}; 53};
64 54
65static 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);
66static 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);
67 57
… …
70 * subtypes. 60 * subtypes.
71 */ 61 */
72void 62void
73init_skills (void) 63init_skills (void)
74{ 64{
75 int i; 65 for_all_archetypes (at)
76 archetype *at;
77
78 for (at = first_archetype; at != NULL; at = at->next)
79 if (at->clone.type == SKILL) 66 if (at->type == SKILL)
80 { 67 {
81 if (skill_names[at->clone.subtype] != NULL) 68 if (skill_names[at->subtype])
82 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",
83 at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill); 70 at->subtype, &skill_names[at->subtype], &at->skill);
84 else 71 else
85 skill_names[at->clone.subtype] = at->clone.skill; 72 skill_names[at->subtype] = at->skill;
86 } 73 }
87 74
88 /* 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
89 * checking for this may catch some user errors. 76 * checking for this may catch some user errors.
90 */ 77 */
91 for (i = 1; i < NUM_SKILLS; i++) 78 for (int i = 1; i < NUM_SKILLS; i++)
92 {
93 if (!skill_names[i]) 79 if (!skill_names[i])
94 LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i); 80 LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);
95 }
96} 81}
97 82
98/* This function goes through the player inventory and sets 83/* This function goes through the player inventory and sets
99 * up the last_skills[] array in the player object. 84 * up the last_skills[] array in the player object.
100 * the last_skills[] is used to more quickly lookup skills - 85 * the last_skills[] is used to more quickly lookup skills -
… …
119 op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go 104 op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go
120 } 105 }
121 } 106 }
122} 107}
123 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;
117}
118
124/* This returns the skill pointer of the given name (the 119/* This returns the skill pointer of the given name (the
125 * one that accumlates exp, has the level, etc). 120 * one that accumulates exp, has the level, etc).
126 * 121 *
127 * It is presumed that the player will be needing to actually 122 * It is presumed that the player will be needing to actually
128 * 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
129 * tool, this code will equip it. 124 * tool, this code will equip it.
130 */ 125 */
131object * 126object *
132find_skill_by_name (object *who, const char *name) 127find_skill_by_name (object *who, const shstr &sh)
133{ 128{
134 object *skill = NULL, *skill_tool = NULL, *tmp; 129 object *skill_tool = 0;
135 130
136 if (!name)
137 return NULL;
138
139 /* We make sure the length of the string in the object is greater
140 * in length than the passed string. Eg, if we have a skill called
141 * 'hi', we don't want to match if the user passed 'high'
142 */
143 for (tmp = who->inv; tmp != NULL; tmp = tmp->below) 131 for (object *tmp = who->inv; tmp; tmp = tmp->below)
132 if (tmp->skill == sh)
144 { 133 {
145 if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name)) 134 if (tmp->type == SKILL && (tmp->flag [FLAG_CAN_USE_SKILL] || tmp->flag [FLAG_APPLIED]))
146 skill = tmp; 135 /* If this is a skill that can be used without applying tool, return it */
147 136 return splay (tmp);
148 /* Try to find appropriate skilltool. If the player has one already 137 /* Try to find appropriate skilltool. If the player has one already
149 * applied, we try to keep using that one. 138 * applied, we try to keep using that one.
150 */ 139 */
151 else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name)) 140 else if (tmp->type == SKILL_TOOL && !skill_tool)
152 {
153 if (QUERY_FLAG (tmp, FLAG_APPLIED))
154 skill_tool = tmp; 141 skill_tool = tmp;
155 else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED))
156 skill_tool = tmp;
157 } 142 }
158 } 143
159 /* If this is a skill that can be used without a tool, return it */ 144 if (!skill_tool)
160 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
161 return skill; 145 return 0;
162 146
163 /* 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 -
164 * 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
165 * but not the skill itself, give it to them. 149 * but not the skill itself, give it to them.
166 */ 150 */
167 if (skill_tool) 151 object *skill = find_skill (who, skill_tool->skill);
168 { 152
169 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
170 {
171 if (apply_special (who, skill_tool, 0))
172 return NULL;
173 }
174 if (!skill) 153 if (!skill)
175 { 154 {
176 skill = give_skill_by_name (who, skill_tool->skill); 155 skill = give_skill_by_name (who, skill_tool->skill);
177 link_player_skills (who); 156 link_player_skills (who);
178 } 157 }
158
159 if (!skill_tool->flag [FLAG_APPLIED])
160 if (apply_special (who, splay (skill_tool), AP_APPLY | AP_NO_READY))
179 return skill; 161 return 0;
180 } 162
163 return splay (skill);
164}
165
166object *
167find_skill_by_name (object *who, const char *name)
168{
169 if (!name)
170 return 0;
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
181 return NULL; 178 return 0;
182} 179}
183
184 180
185/* This returns the skill pointer of the given name (the 181/* This returns the skill pointer of the given name (the
186 * one that accumlates exp, has the level, etc). 182 * one that accumulates exp, has the level, etc).
187 * 183 *
188 * It is presumed that the player will be needing to actually 184 * It is presumed that the player will be needing to actually
189 * 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
190 * tool, this code will equip it. 186 * tool, this code will equip it.
191 * 187 *
… …
194 * this replaces find_skill. 190 * this replaces find_skill.
195 */ 191 */
196object * 192object *
197find_skill_by_number (object *who, int skillno) 193find_skill_by_number (object *who, int skillno)
198{ 194{
199 object *skill = NULL, *skill_tool = NULL, *tmp;
200
201 if (skillno < 1 || skillno >= NUM_SKILLS)
202 return NULL;
203
204 for (tmp = who->inv; tmp != NULL; tmp = tmp->below) 195 for (object *tmp = who->inv; tmp; tmp = tmp->below)
205 {
206 if (tmp->type == SKILL && tmp->subtype == skillno) 196 if (tmp->type == SKILL && tmp->subtype == skillno)
207 skill = tmp; 197 if (object *skop = find_skill_by_name (who, tmp->skill))
208
209 /* Try to find appropriate skilltool. If the player has one already
210 * applied, we try to keep using that one.
211 */
212 else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno)
213 {
214 if (QUERY_FLAG (tmp, FLAG_APPLIED))
215 skill_tool = tmp;
216 else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED))
217 skill_tool = tmp;
218 }
219 }
220 /* If this is a skill that can be used without a tool, return it */
221 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
222 return skill;
223
224 /* Player has a tool to use the skill. IF not applied, apply it -
225 * if not successful, return null. If they do have the skill tool
226 * but not the skill itself, give it to them.
227 */
228 if (skill_tool)
229 {
230 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
231 {
232 if (apply_special (who, skill_tool, 0))
233 return NULL;
234 }
235
236 if (!skill)
237 {
238 skill = give_skill_by_name (who, skill_tool->skill);
239 link_player_skills (who);
240 }
241
242 return skill; 198 return skop;
243 }
244 199
245 return NULL; 200 return 0;
246} 201}
247 202
248/* This changes the objects skill to new_skill. 203/* This changes the objects chosen_skill to new_skill.
249 * note that this function doesn't always need to get used -
250 * you can now add skill exp to the player without the chosen_skill being
251 * set. This function is of most interest to players to update
252 * the various range information.
253 * if new_skill is null, this just unapplies the skill.
254 * flag has the current meaning:
255 * 0x1: If set, don't update the range pointer. This is useful when we
256 * need to ready a new skill, but don't want to clobber range.
257 * return 1 on success, 0 on error 204 * return 1 on success, 0 on error
258 */ 205 */
259 206bool
260int 207object::change_skill (object *new_skill)
261change_skill (object *who, object *new_skill, int flag)
262{ 208{
263 int old_range;
264
265 if (who->type != PLAYER) 209 if (type != PLAYER)
266 return 0; 210 return 0;
267 211
268 old_range = who->contr->shoottype; 212 // optimise this supposedly common case
269 213 if (new_skill == chosen_skill)
270 if (who->chosen_skill && who->chosen_skill == new_skill)
271 {
272 /* optimization for changing skill to current skill */
273 if (who->type == PLAYER && !(flag & 0x1))
274 who->contr->shoottype = range_skill;
275
276 return 1; 214 return 1;
277 }
278 215
279 // move skill to front, so it will be preferred next time
280 new_skill->remove ();
281 who->insert (new_skill);
282
283 if (!new_skill || who->chosen_skill)
284 if (who->chosen_skill) 216 if (chosen_skill)
285 apply_special (who, who->chosen_skill, AP_UNAPPLY); 217 {
218 chosen_skill->flag [FLAG_APPLIED] = false;
219 change_abil (this, chosen_skill);
220 }
286 221
287 /* Only goal in this case was to unapply a skill */ 222 chosen_skill = new_skill;
223
288 if (!new_skill) 224 if (chosen_skill)
289 return 0; 225 {
226 chosen_skill->flag [FLAG_APPLIED] = true;
227 change_abil (this, chosen_skill);
228 }
290 229
291 if (apply_special (who, new_skill, AP_APPLY)) 230 // always clear current weapon, as the selected skill could
292 return 0; 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;
293 234
294 if (flag & 0x1) 235 update_stats ();
295 who->contr->shoottype = (rangetype)old_range;
296
297 return 1; 236 return 1;
298}
299
300/* This function just clears the chosen_skill and range_skill values
301 * inthe player.
302 */
303void
304clear_skill (object *who)
305{
306 who->chosen_skill = NULL;
307 CLEAR_FLAG (who, FLAG_READY_SKILL);
308 if (who->type == PLAYER)
309 {
310 who->contr->ranges[range_skill] = NULL;
311 if (who->contr->shoottype == range_skill)
312 who->contr->shoottype = range_none;
313 }
314} 237}
315 238
316/* 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().
317 * 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.
318 * 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
… …
321 * 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
322 * 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
323 * give any exp for their direct use (eg, throwing). 246 * give any exp for their direct use (eg, throwing).
324 * It returns 0 if no skill was used. 247 * It returns 0 if no skill was used.
325 */ 248 */
326
327int 249int
328do_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)
329{ 251{
330 int success = 0, exp = 0; 252 int success = 0, exp = 0;
331 int did_alc = 0; 253 int did_alc = 0;
332 object *tmp, *next;
333 254
334 if (!skill) 255 if (!skill)
335 return 0; 256 return 0;
336 257
337 /* 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
… …
339 * 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
340 * the player doesn't have a bucket for that, create one. 261 * the player doesn't have a bucket for that, create one.
341 */ 262 */
342 if (skill->type != SKILL && op->type == PLAYER) 263 if (skill->type != SKILL && op->type == PLAYER)
343 { 264 {
344 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 265 for (object *tmp = op->inv; tmp; tmp = tmp->below)
345 if (tmp->type == SKILL && tmp->skill == skill->skill) 266 if (tmp->type == SKILL && tmp->skill == skill->skill)
346 break; 267 {
268 skill = tmp;
269 goto found;
270 }
347 271
348 if (!tmp)
349 tmp = give_skill_by_name (op, skill->skill); 272 skill = give_skill_by_name (op, skill->skill);
350 273found: ;
351 skill = tmp;
352 } 274 }
353 275
354 // skill, by_whom, on_which_object, which direction, skill_argument 276 // skill, by_whom, on_which_object, which direction, skill_argument
355 if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string))) 277 if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))
356 return 0; 278 return 0;
… …
369 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); 291 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
370 } 292 }
371 else 293 else
372 { 294 {
373 SET_FLAG (skill, FLAG_APPLIED); 295 SET_FLAG (skill, FLAG_APPLIED);
374 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!");
375 } 297 }
376 298
377 op->update_stats (); 299 op->update_stats ();
378 success = 1; 300 success = 1;
379 break; 301 break;
… …
461 case SK_LITERACY: 383 case SK_LITERACY:
462 case SK_WOODSMAN: 384 case SK_WOODSMAN:
463 /* 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.
464 * failing that, we go and identify stuff. 386 * failing that, we go and identify stuff.
465 */ 387 */
466 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)
467 { 389 {
468 next = tmp->above; 390 next = tmp->above;
469 391
470 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 392 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
471 { 393 {
… …
532 * If certain skills should take more/less time, that should be 454 * If certain skills should take more/less time, that should be
533 * in the code for the skill itself. 455 * in the code for the skill itself.
534 */ 456 */
535 457
536 if (op->type == PLAYER) 458 if (op->type == PLAYER)
537 op->speed_left -= 1.0; 459 op->speed_left -= 1.f;
538 460
539 /* 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.
540 * Note that add_exp() will figure out player/monster experience 462 * Note that add_exp() will figure out player/monster experience
541 * gain problems. 463 * gain problems.
542 */ 464 */
… …
570 * op is the object that was 'defeated'. 492 * op is the object that was 'defeated'.
571 * 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
572 * point back to who. 494 * point back to who.
573 * 495 *
574 */ 496 */
575
576int 497int
577calc_skill_exp (object *who, object *op, object *skill) 498calc_skill_exp (object *who, object *op, object *skill)
578{ 499{
579 int op_exp = 0, op_lvl = 0; 500 int op_exp = 0, op_lvl = 0;
580 float base, value, lvl_mult = 0.0; 501 float base, value, lvl_mult = 0.0;
… …
589 * 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
590 * help out exp awards for skill_ident skills. Also, if 511 * help out exp awards for skill_ident skills. Also, if
591 * 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
592 * and level (this was the old system) -b.t. 513 * and level (this was the old system) -b.t.
593 */ 514 */
594
595 if (!op) 515 if (!op)
596 { /* no item/creature */ 516 { /* no item/creature */
597 op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty; 517 op_lvl = max (1, who->map->difficulty);
598 op_exp = 0; 518 op_exp = 0;
599 } 519 }
600 else if (op->type == RUNE || op->type == TRAP) 520 else if (op->type == RUNE || op->type == TRAP)
601 { /* all traps. If stats.Cha > 1 we use that 521 { /* all traps. If stats.Cha > 1 we use that
602 * for the amount of experience */ 522 * for the amount of experience */
… …
606 else 526 else
607 { /* all other items/living creatures */ 527 { /* all other items/living creatures */
608 op_exp = op->stats.exp; 528 op_exp = op->stats.exp;
609 op_lvl = op->level; 529 op_lvl = op->level;
610 if (!QUERY_FLAG (op, FLAG_ALIVE)) 530 if (!QUERY_FLAG (op, FLAG_ALIVE))
611 { /* for ident/make items */ 531 op_lvl += 5 * abs (op->magic); /* for ident/make items */
612 op_lvl += 5 * abs (op->magic);
613 }
614 } 532 }
615 533
616 if (op_lvl < 1) 534 if (op_lvl < 1)
617 op_lvl = 1; 535 op_lvl = 1;
618 536
… …
626 /* if skill really is a skill, then we can look at the skill archetype for 544 /* if skill really is a skill, then we can look at the skill archetype for
627 * bse reward value (exp) and level multiplier factor. 545 * bse reward value (exp) and level multiplier factor.
628 */ 546 */
629 if (skill->type == SKILL) 547 if (skill->type == SKILL)
630 { 548 {
631 base += skill->arch->clone.stats.exp; 549 base += skill->arch->stats.exp;
632 if (settings.simple_exp) 550 if (settings.simple_exp)
633 { 551 {
634 if (skill->arch->clone.level) 552 if (skill->arch->level)
635 lvl_mult = (float) skill->arch->clone.level / 100.0; 553 lvl_mult = (float) skill->arch->level / 100.0;
636 else 554 else
637 lvl_mult = 1.0; /* no adjustment */ 555 lvl_mult = 1.0; /* no adjustment */
638 } 556 }
639 else 557 else
640 { 558 {
641 if (skill->level) 559 if (skill->level)
642 lvl_mult = ((float) skill->arch->clone.level * (float) op_lvl) / ((float) skill->level * 100.0); 560 lvl_mult = ((float) skill->arch->level * (float) op_lvl) / ((float) skill->level * 100.0);
643 else 561 else
644 lvl_mult = 1.0; 562 lvl_mult = 1.0;
645 } 563 }
646 } 564 }
647 else 565 else
648 { 566 {
649 /* Don't divide by zero here! */ 567 /* Don't divide by zero here! */
650 lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1); 568 lvl_mult = (float) op_lvl / (float) max (1, skill->level);
651 } 569 }
652 } 570 }
653 571
654 /* assemble the exp total, and return value */ 572 /* assemble the exp total, and return value */
655 573
… …
669 * This one actually teaches the player the skill as something 587 * This one actually teaches the player the skill as something
670 * they can equip. 588 * they can equip.
671 * Return 0 if the player knows the skill, 1 if the 589 * Return 0 if the player knows the skill, 1 if the
672 * player learns the skill, 2 otherwise. 590 * player learns the skill, 2 otherwise.
673 */ 591 */
674
675int 592int
676learn_skill (object *pl, object *scroll) 593learn_skill (object *pl, object *scroll)
677{ 594{
678 object *tmp;
679
680 if (!scroll->skill) 595 if (!scroll->skill)
681 { 596 {
682 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name); 597 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);
683 return 2; 598 return 2;
684 } 599 }
685 600
686 /* can't use find_skill_by_name because we want skills the player knows 601 object *tmp = find_skill (pl, scroll->skill);
687 * but can't use natively.
688 */
689
690 for (tmp = pl->inv; tmp != NULL; tmp = tmp->below)
691 if (tmp->type == SKILL && !strncasecmp (scroll->skill, tmp->skill, strlen (scroll->skill)))
692 break;
693 602
694 /* player already knows it */ 603 /* player already knows it */
695 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 604 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
696 return 0; 605 return 0;
697 606
… …
715 link_player_skills (pl); 624 link_player_skills (pl);
716 return 1; 625 return 1;
717} 626}
718 627
719/* Gives a percentage clipped to 0% -> 100% of a/b. */ 628/* Gives a percentage clipped to 0% -> 100% of a/b. */
720
721/* Probably belongs in some global utils-type file? */ 629/* Probably belongs in some global utils-type file? */
722static int 630static int
723clipped_percent (sint64 a, sint64 b) 631clipped_percent (sint64 a, sint64 b)
724{ 632{
725 int rv; 633 int rv;
… …
745 * Note this function is a bit more complicated becauase we 653 * Note this function is a bit more complicated becauase we
746 * we want ot sort the skills before printing them. If we 654 * we want ot sort the skills before printing them. If we
747 * just dumped this as we found it, this would be a bit 655 * just dumped this as we found it, this would be a bit
748 * simpler. 656 * simpler.
749 */ 657 */
750 658//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
751void 659void
752show_skills (object *op, const char *search) 660show_skills (object *op, const char *search)
753{ 661{
754 object *tmp = NULL; 662 object *tmp = NULL;
755 char buf[MAX_BUF]; 663 char buf[MAX_BUF];
… …
757 int i, num_skills_found = 0; 665 int i, num_skills_found = 0;
758 static const char *const periods = "........................................"; 666 static const char *const periods = "........................................";
759 667
760 /* Need to have a pointer and use strdup for qsort to work properly */ 668 /* Need to have a pointer and use strdup for qsort to work properly */
761 char skills[NUM_SKILLS][MAX_BUF]; 669 char skills[NUM_SKILLS][MAX_BUF];
762
763 670
764 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 671 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
765 { 672 {
766 if (tmp->type == SKILL) 673 if (tmp->type == SKILL)
767 { 674 {
… …
770 /* Basically want to fill this out to 40 spaces with periods */ 677 /* Basically want to fill this out to 40 spaces with periods */
771 sprintf (buf, "%s%s", &tmp->name, periods); 678 sprintf (buf, "%s%s", &tmp->name, periods);
772 buf[40] = 0; 679 buf[40] = 0;
773 680
774 if (settings.permanent_exp_ratio) 681 if (settings.permanent_exp_ratio)
775 {
776 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)", 682 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
777 buf, tmp->level, tmp->stats.exp, 683 buf, tmp->level, tmp->stats.exp,
778 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp)); 684 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
779 }
780 else 685 else
781 {
782 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")", 686 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
783 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul)); 687 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
784 } 688
785 /* I don't know why some characters get a bunch of skills, but 689 /* I don't know why some characters get a bunch of skills, but
786 * it sometimes happens (maybe a leftover from bugier earlier code 690 * it sometimes happens (maybe a leftover from bugier earlier code
787 * and those character are still about). In any case, lets handle 691 * and those character are still about). In any case, lets handle
788 * it so it doesn't crash the server - otherwise, one character may 692 * it so it doesn't crash the server - otherwise, one character may
789 * crash the server numerous times. 693 * crash the server numerous times.
… …
795 break; 699 break;
796 } 700 }
797 } 701 }
798 } 702 }
799 703
800 clear_win_info (op);
801 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:"); 704 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:");
802 if (num_skills_found > 1) 705 if (num_skills_found > 1)
803 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) std::strcmp); 706 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) std::strcmp);
804 707
805 for (i = 0; i < num_skills_found; i++) 708 for (i = 0; i < num_skills_found; i++)
… …
818 * direction that the user is facing. Returns false if we are unable to 721 * direction that the user is facing. Returns false if we are unable to
819 * change to the requested skill, or were unable to use the skill properly. 722 * change to the requested skill, or were unable to use the skill properly.
820 * This is tricky because skills can have spaces. We basically roll 723 * This is tricky because skills can have spaces. We basically roll
821 * our own find_skill_by_name so we can try to do better string matching. 724 * our own find_skill_by_name so we can try to do better string matching.
822 */ 725 */
823
824int 726int
825use_skill (object *op, const char *string) 727use_skill (object *op, const char *string)
826{ 728{
827 object *skop; 729 object *skop;
828 size_t len; 730 size_t len;
829 731
830 if (!string) 732 if (!string)
831 return 0; 733 return 0;
832 734
833 for (skop = op->inv; skop != NULL; skop = skop->below) 735 for (skop = op->inv; skop; skop = skop->below)
834 { 736 {
737 if (skop->type == SKILL
835 if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) && 738 && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
836 !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 739 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
837 break; 740 break;
741 else if (skop->type == SKILL_TOOL
838 else if (skop->type == SKILL_TOOL && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 742 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
839 break; 743 break;
840 } 744 }
745
841 if (!skop) 746 if (!skop)
842 { 747 {
843 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 748 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string);
844 return 0; 749 return 0;
845 } 750 }
… …
850 * options given to the skill. Its pretty simple - if there 755 * options given to the skill. Its pretty simple - if there
851 * are extra parameters (as deteremined by string length), we 756 * are extra parameters (as deteremined by string length), we
852 * want to skip over any leading spaces. 757 * want to skip over any leading spaces.
853 */ 758 */
854 if (len >= strlen (string)) 759 if (len >= strlen (string))
855 {
856 string = NULL; 760 string = NULL;
857 }
858 else 761 else
859 { 762 {
860 string += len; 763 string += len;
861 while (*string == 0x20) 764 while (*string == 0x20)
862 string++; 765 string++;
766
863 if (strlen (string) == 0) 767 if (strlen (string) == 0)
864 string = NULL; 768 string = NULL;
865 } 769 }
866 770
867#ifdef SKILL_UTIL_DEBUG 771#ifdef SKILL_UTIL_DEBUG
868 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none"); 772 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");
869#endif 773#endif
870 774
871 /* Change to the new skill, then execute it. */
872 if (do_skill (op, op, skop, op->facing, string)) 775 if (do_skill (op, op, skop, op->facing, string))
873 return 1; 776 return 1;
874 777
875 return 0; 778 return 0;
876} 779}
877 780
878static bool 781static bool
879hth_skill_p (object *skill) 782hth_skill_p (object *skill)
880{ 783{
881 for (unsigned int i = 0; i < sizeof (unarmed_skills); ++i) 784 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT;
882 if (skill->subtype == unarmed_skills[i])
883 return 1;
884
885 return 0;
886} 785}
887 786
888/* This finds the first unarmed skill the player has, and returns it. 787/* This finds the first unarmed skill the player has, and returns it.
889 */ 788 */
890static object * 789static object *
… …
907 * the damage. 806 * the damage.
908 */ 807 */
909static int 808static int
910do_skill_attack (object *tmp, object *op, const char *string, object *skill) 809do_skill_attack (object *tmp, object *op, const char *string, object *skill)
911{ 810{
912 int success;
913
914 if (INVOKE_OBJECT (SKILL_ATTACK, op, ARG_OBJECT (tmp), ARG_STRING (string), ARG_OBJECT (skill))) 811 if (INVOKE_OBJECT (SKILL_ATTACK, op, ARG_OBJECT (tmp), ARG_STRING (string), ARG_OBJECT (skill)))
915 return RESULT_INT (0); 812 return RESULT_INT (0);
916 813
917 /* For Players only: if there is no ready weapon, and no "attack" skill 814 /* For Players only: if there is no ready weapon, and no "attack" skill
918 * is readied either then try to find a skill for the player to use. 815 * is readied either then try to find a skill for the player to use.
919 * it is presumed that if skill is set, it is a valid attack skill (eg, 816 * it is presumed that if skill is set, it is a valid attack skill (eg,
920 * the caller should have set it appropriately). We still want to pass 817 * the caller should have set it appropriately). We still want to pass
921 * through that code if skill is set to change to the skill. 818 * through that code if skill is set to change to the skill.
922 */ 819 */
923 if (op->type == PLAYER) 820 if (player *pl = op->contr)
924 { 821 {
925 if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) 822 if (!pl->combat_ob)
926 { 823 {
927 if (!skill) 824 if (QUERY_FLAG (op, FLAG_READY_WEAPON))
928 { 825 {
929 /* See if the players chosen skill is a combat skill, and use 826 for (tmp = op->inv; tmp; tmp = tmp->below)
930 * it if appropriate. 827 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
828 break;
829
830 if (!tmp)
831 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
832
833 pl->combat_ob = tmp;
931 */ 834 }
932 if (op->chosen_skill && hth_skill_p (op->chosen_skill)) 835
933 skill = op->chosen_skill; 836 if (!pl->combat_ob)
934 else 837 {
838 if (!skill)
935 { 839 {
936 skill = find_player_hth_skill (op); 840 /* See if the players chosen skill is a combat skill, and use
937 841 * it if appropriate.
938 if (!skill) 842 */
843 if (op->chosen_skill && hth_skill_p (op->chosen_skill))
844 skill = op->chosen_skill;
845 else
939 { 846 {
847 skill = find_player_hth_skill (op);
848
849 if (!skill)
940 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); 850 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
941 return 0;
942 } 851 }
943 } 852 }
853
854 if (skill)
855 {
856 op->change_skill (0);
857 apply_special (op, skill, AP_APPLY);
858 }
944 } 859 }
945 860
946 /* now try to ready the new skill */ 861 if (!pl->combat_ob)
947 if (!change_skill (op, skill, 0)) 862 {
948 { /* oh oh, trouble! */ 863 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
949 new_draw_info_format (NDI_UNIQUE, 0, tmp, "Couldn't change to skill %s", &skill->name);
950 return 0; 864 return 0;
951 } 865 }
952 } 866 }
953 else 867
868 if (!op->change_weapon (pl->combat_ob))
869 return 0;
870
871 /* lose invisiblity/hiding status for running attacks */
872 if (pl->tmp_invis)
954 { 873 {
955 /* Seen some crashes below where current_weapon is not set, 874 pl->tmp_invis = 0;
956 * even though the flag says it is. So if current weapon isn't set, 875 op->invisible = 0;
957 * do some work in trying to find the object to use. 876 op->hide = 0;
958 */ 877 update_object (op, UP_OBJ_CHANGE);
959 if (!op->current_weapon)
960 {
961 object *tmp;
962
963 LOG (llevError, "Player %s does not have current weapon set but flag_ready_weapon is set\n", &op->name);
964 for (tmp = op->inv; tmp; tmp = tmp->below)
965 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
966 break;
967
968 if (!tmp)
969 {
970 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
971 op->current_weapon = NULL;
972 return 0;
973 }
974 else
975 {
976 op->current_weapon = tmp;
977 }
978 }
979
980 change_skill (op, find_skill_by_name (op, op->current_weapon->skill), 1);
981 } 878 }
982 } 879 }
983 880
984 /* lose invisiblity/hiding status for running attacks */
985
986 if (op->type == PLAYER && op->contr->tmp_invis)
987 {
988 op->contr->tmp_invis = 0;
989 op->invisible = 0;
990 op->hide = 0;
991 update_object (op, UP_OBJ_CHANGE);
992 }
993
994 success = attack_ob (tmp, op); 881 int success = attack_ob (tmp, op);
995 882
996 /* print appropriate messages to the player */ 883 /* print appropriate messages to the player */
997 884
998 if (success && string != NULL && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) 885 if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED))
999 { 886 {
1000 if (op->type == PLAYER) 887 if (op->type == PLAYER)
1001 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); 888 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
1002 else if (tmp->type == PLAYER) 889 else if (tmp->type == PLAYER)
1003 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); 890 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
… …
1031 ty = freearr_y[dir]; 918 ty = freearr_y[dir];
1032 919
1033 /* If we don't yet have an opponent, find if one exists, and attack. 920 /* If we don't yet have an opponent, find if one exists, and attack.
1034 * Legal opponents are the same as outlined in move_player_attack() 921 * Legal opponents are the same as outlined in move_player_attack()
1035 */ 922 */
1036 923 if (!tmp)
1037 if (tmp == NULL)
1038 { 924 {
1039 m = pl->map; 925 m = pl->map;
1040 tx = pl->x + freearr_x[dir]; 926 tx = pl->x + freearr_x[dir];
1041 ty = pl->y + freearr_y[dir]; 927 ty = pl->y + freearr_y[dir];
1042 928
… …
1052 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) 938 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR)
1053 { 939 {
1054 /* Don't attack party members */ 940 /* Don't attack party members */
1055 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) 941 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
1056 return 0; 942 return 0;
943
1057 break; 944 break;
1058 } 945 }
1059 } 946 }
947
1060 if (!tmp) 948 if (!tmp)
1061 { 949 {
1062 if (pl->type == PLAYER) 950 if (pl->type == PLAYER)
1063 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!"); 951 new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!");
952
1064 return 0; 953 return 0;
1065 } 954 }
1066 955
1067 return do_skill_attack (tmp, pl, string, skill); 956 return do_skill_attack (tmp, pl, string, skill);
1068} 957}
1069
1070 958
1071/* attack_hth() - this handles all hand-to-hand attacks -b.t. */ 959/* attack_hth() - this handles all hand-to-hand attacks -b.t. */
1072 960
1073/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first 961/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first
1074 * (attack_hth) we check for weapon use, etc in the second (the new 962 * (attack_hth) we check for weapon use, etc in the second (the new
1075 * function skill_attack() we actually attack. 963 * function skill_attack() we actually attack.
1076 */ 964 */
1077
1078static int 965static int
1079attack_hth (object *pl, int dir, const char *string, object *skill) 966attack_hth (object *pl, int dir, const char *string, object *skill)
1080{ 967{
1081 object *enemy = NULL, *weapon; 968 object *enemy = NULL, *weapon;
1082 969
… …
1091 if (pl->type == PLAYER) 978 if (pl->type == PLAYER)
1092 { 979 {
1093 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); 980 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
1094 esrv_update_item (UPD_FLAGS, pl, weapon); 981 esrv_update_item (UPD_FLAGS, pl, weapon);
1095 } 982 }
983
1096 break; 984 break;
1097 } 985 }
1098 } 986 }
1099 987
1100 return skill_attack (enemy, pl, dir, string, skill); 988 return skill_attack (enemy, pl, dir, string, skill);
… …
1120 1008
1121 return 0; 1009 return 0;
1122 } 1010 }
1123 1011
1124 return skill_attack (NULL, op, dir, string, skill); 1012 return skill_attack (NULL, op, dir, string, skill);
1125
1126} 1013}
1014

Diff Legend

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