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.49 by root, Mon May 14 21:32:27 2007 UTC vs.
Revision 1.92 by root, Sat Apr 10 04:54:10 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 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,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copryight (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 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 it under
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * 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
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* 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. */
26 26
27/* Reconfigured skills code to allow linking of skills to experience 27/* Reconfigured skills code to allow linking of skills to experience
… …
59/* init_skills basically just sets up the skill_names table 59/* init_skills basically just sets up the skill_names table
60 * above. The index into the array is set up by the 60 * above. The index into the array is set up by the
61 * subtypes. 61 * subtypes.
62 */ 62 */
63void 63void
64init_skills (void) 64init_skills ()
65{ 65{
66 for (archetype *at = first_archetype; at; at = at->next) 66 for_all_archetypes (at)
67 if (at->clone.type == SKILL) 67 if (at->type == SKILL)
68 { 68 {
69 if (skill_names[at->clone.subtype]) 69 if (skill_names[at->subtype])
70 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",
71 at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill); 71 at->subtype, &skill_names[at->subtype], &at->skill);
72 else 72 else
73 skill_names[at->clone.subtype] = at->clone.skill; 73 skill_names[at->subtype] = at->skill;
74 } 74 }
75 75
76 /* 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
77 * checking for this may catch some user errors. 77 * checking for this may catch some user errors.
78 */ 78 */
… …
85 * up the last_skills[] array in the player object. 85 * up the last_skills[] array in the player object.
86 * the last_skills[] is used to more quickly lookup skills - 86 * the last_skills[] is used to more quickly lookup skills -
87 * mostly used for sending exp. 87 * mostly used for sending exp.
88 */ 88 */
89void 89void
90link_player_skills (object *op) 90player::link_skills ()
91{ 91{
92 for (int i = 0; i < NUM_SKILLS; ++i)
93 last_skill_ob [i] = 0;
94
92 for (object *tmp = op->inv; tmp; tmp = tmp->below) 95 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
93 if (tmp->type == SKILL) 96 if (tmp->type == SKILL)
94 { 97 {
95 /* This is really a warning, hence no else below */ 98 assert (IN_RANGE_EXC (tmp->subtype, 0, NUM_SKILLS));
96 if (op->contr->last_skill_ob[tmp->subtype] && op->contr->last_skill_ob[tmp->subtype] != tmp)
97 LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",
98 &op->contr->last_skill_ob[tmp->subtype]->skill, &tmp->skill);
99 99
100 if (tmp->subtype >= NUM_SKILLS) 100 if (last_skill_ob [tmp->subtype] != tmp)
101 LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS);
102 else
103 { 101 {
102 /* This is really a warning, hence no else below */
103 if (last_skill_ob [tmp->subtype])
104 LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",
105 &last_skill_ob [tmp->subtype]->skill, &tmp->skill);
106
104 op->contr->last_skill_ob[tmp->subtype] = tmp; 107 last_skill_ob [tmp->subtype] = tmp;
105 op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go 108 if (ns)
109 ns->last_skill_exp [tmp->subtype] = -1;
106 } 110 }
107 } 111 }
108} 112}
109 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);
133}
134
110/* This returns the skill pointer of the given name (the 135/* This returns the skill pointer of the given name (the
111 * one that accumlates exp, has the level, etc). 136 * one that accumulates exp, has the level, etc).
112 * 137 *
113 * It is presumed that the player will be needing to actually 138 * It is presumed that the player will be needing to actually
114 * 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
115 * tool, this code will equip it. 140 * tool, this code will equip it.
116 */ 141 */
117object * 142object *
118find_skill_by_name (object *who, const char *name)
119{
120 if (!name)
121 return 0;
122
123 object *skill = 0, *skill_tool = 0;
124
125 /* We make sure the length of the string in the object is greater
126 * in length than the passed string. Eg, if we have a skill called
127 * 'hi', we don't want to match if the user passed 'high'
128 */
129 for (object *tmp = who->inv; tmp; tmp = tmp->below)
130 {
131 if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && strlen (tmp->skill) >= strlen (name))
132 skill = tmp;
133
134 /* Try to find appropriate skilltool. If the player has one already
135 * applied, we try to keep using that one.
136 */
137 else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && strlen (tmp->skill) >= strlen (name))
138 {
139 if (QUERY_FLAG (tmp, FLAG_APPLIED))
140 skill_tool = tmp;
141 else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED))
142 skill_tool = tmp;
143 }
144 }
145
146 /* If this is a skill that can be used without a tool, return it */
147 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
148 return skill;
149
150 /* Player has a tool to use the skill. If not applied, apply it -
151 * if not successful, return null. If they do have the skill tool
152 * but not the skill itself, give it to them.
153 */
154 if (skill_tool)
155 {
156 if (!skill)
157 {
158 skill = give_skill_by_name (who, skill_tool->skill);
159 link_player_skills (who);
160 }
161
162 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
163 if (apply_special (who, skill_tool, 0))
164 return 0;
165
166 return skill;
167 }
168
169 return 0;
170}
171
172static object *
173find_skill (object *who, const shstr &sh)
174{
175 for (object *tmp = who->inv; tmp; tmp = tmp->below)
176 if (tmp->skill == sh && tmp->type == SKILL)
177 return tmp;
178
179 return 0;
180}
181
182// like the other function above, but for exact matches using a shstr
183// which is very common inside the server. unlike the above function,
184// we always return the skill.
185object *
186find_skill_by_name (object *who, const shstr &sh) 143find_skill_by_name (object *who, shstr_cmp sh)
187{ 144{
188 object *skill_tool = 0; 145 object *skill_tool = 0;
189 146
190 for (object *tmp = who->inv; tmp; tmp = tmp->below) 147 for (object *tmp = who->inv; tmp; tmp = tmp->below)
191 if (tmp->skill == sh) 148 if (tmp->skill == sh)
192 { 149 {
193 if (tmp->type == SKILL && (tmp->flag [FLAG_CAN_USE_SKILL] || tmp->flag [FLAG_APPLIED])) 150 if (tmp->type == SKILL && (tmp->flag [FLAG_CAN_USE_SKILL] || tmp->flag [FLAG_APPLIED]))
194 /* If this is a skill that can be used without applying tool, return it */ 151 /* If this is a skill that can be used without applying tool, return it */
195 return tmp->inv_splay (); 152 return splay (tmp);
196 /* Try to find appropriate skilltool. If the player has one already 153 /* Try to find appropriate skilltool. If the player has one already
197 * applied, we try to keep using that one. 154 * applied, we try to keep using that one.
198 */ 155 */
199 else if (tmp->type == SKILL_TOOL && !skill_tool) 156 else if (tmp->type == SKILL_TOOL && !skill_tool)
200 skill_tool = tmp; 157 skill_tool = tmp;
… …
208 * but not the skill itself, give it to them. 165 * but not the skill itself, give it to them.
209 */ 166 */
210 object *skill = find_skill (who, skill_tool->skill); 167 object *skill = find_skill (who, skill_tool->skill);
211 168
212 if (!skill) 169 if (!skill)
213 {
214 skill = give_skill_by_name (who, skill_tool->skill); 170 skill = give_skill_by_name (who, skill_tool->skill);
215 link_player_skills (who);
216 }
217
218 skill->inv_splay ();
219 171
220 if (!skill_tool->flag [FLAG_APPLIED]) 172 if (!skill_tool->flag [FLAG_APPLIED])
221 if (apply_special (who, skill_tool, AP_APPLY)) 173 if (!who->apply (splay (skill_tool)))
222 return 0; 174 return 0;
223 175
224 return skill; 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;
225} 190}
226 191
227/* This returns the skill pointer of the given name (the 192/* This returns the skill pointer of the given name (the
228 * one that accumulates exp, has the level, etc). 193 * one that accumulates exp, has the level, etc).
229 * 194 *
… …
236 * this replaces find_skill. 201 * this replaces find_skill.
237 */ 202 */
238object * 203object *
239find_skill_by_number (object *who, int skillno) 204find_skill_by_number (object *who, int skillno)
240{ 205{
241 if (!IN_RANGE_EXC (skillno, 1, NUM_SKILLS)) 206 for (object *tmp = who->inv; tmp; tmp = tmp->below)
207 if (tmp->type == SKILL && tmp->subtype == skillno)
208 if (object *skop = find_skill_by_name (who, tmp->skill))
209 return skop;
210
211 return 0;
212}
213
214/* This changes the objects chosen_skill to new_skill.
215 * return 1 on success, 0 on error
216 */
217bool
218object::change_skill (object *new_skill)
219{
220 if (type != PLAYER)
242 return 0; 221 return 0;
243 222
244 object *skill = NULL, *skill_tool = NULL;
245
246 for (object *tmp = who->inv; tmp; tmp = tmp->below)
247 {
248 if (tmp->type == SKILL && tmp->subtype == skillno)
249 skill = tmp;
250
251 /* Try to find appropriate skilltool. If the player has one already
252 * applied, we try to keep using that one.
253 */
254 //TODO: afaics, skill tools have subtype 0 always
255 else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno)
256 {
257 if (QUERY_FLAG (tmp, FLAG_APPLIED))
258 skill_tool = tmp;
259 else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED))
260 skill_tool = tmp;
261 }
262 }
263
264 /* If this is a skill that can be used without a tool, return it */
265 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
266 return skill;
267
268 /* Player has a tool to use the skill. If not applied, apply it -
269 * if not successful, return null. If they do have the skill tool
270 * but not the skill itself, give it to them.
271 */
272 if (skill_tool)
273 {
274 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
275 {
276 if (apply_special (who, skill_tool, 0))
277 return NULL;
278 }
279
280 if (!skill)
281 {
282 skill = give_skill_by_name (who, skill_tool->skill);
283 link_player_skills (who);
284 }
285
286 return skill;
287 }
288
289 return NULL;
290}
291
292/* This changes the objects skill to new_skill.
293 * note that this function doesn't always need to get used -
294 * you can now add skill exp to the player without the chosen_skill being
295 * set. This function is of most interest to players to update
296 * the various range information.
297 * return 1 on success, 0 on error
298 */
299int
300change_skill (object *who, object *new_skill, int flag)
301{
302 if (who->type != PLAYER)
303 return 0;
304
305#if 0
306 // optimise this supposedly common case 223 // optimise this supposedly common case
307 if (new_skill == who->chosen_skill) 224 if (new_skill == chosen_skill)
308 return 1; 225 return 1;
309#endif
310 226
311 if (!new_skill) 227 if (chosen_skill)
312 {
313 LOG (llevError | logBacktrace, "change_skill called on %s with NULL skill\n",
314 who->debug_desc ());
315 return 0;
316 } 228 {
229 chosen_skill->flag [FLAG_APPLIED] = false;
230 change_abil (this, chosen_skill);
231 }
317 232
318 // the skill could be readied already because it is used by a weapon. 233 chosen_skill = new_skill;
319 who->change_weapon (0);
320 new_skill->inv_splay ();
321 234
322 if (apply_special (who, new_skill, AP_APPLY)) 235 if (chosen_skill)
323 return 0; 236 {
237 chosen_skill->flag [FLAG_APPLIED] = true;
238 change_abil (this, chosen_skill);
239 }
324 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 ();
325 return 1; 247 return 1;
326}
327
328/* This function just clears the chosen_skill and range_skill values
329 * in the player.
330 */
331void
332clear_skill (object *who)
333{
334 who->chosen_skill = 0;
335 CLEAR_FLAG (who, FLAG_READY_SKILL);
336
337 if (player *pl = who->contr)
338 if (pl->ranged_ob && pl->ranged_ob->type == SKILL)
339 pl->ranged_ob = 0;
340} 248}
341 249
342/* 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().
343 * 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.
344 * 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
… …
351 */ 259 */
352int 260int
353do_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)
354{ 262{
355 int success = 0, exp = 0; 263 int success = 0, exp = 0;
356 int did_alc = 0;
357 264
358 if (!skill) 265 if (!skill)
359 return 0; 266 return 0;
360 267
361 /* 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
… …
394 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); 301 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
395 } 302 }
396 else 303 else
397 { 304 {
398 SET_FLAG (skill, FLAG_APPLIED); 305 SET_FLAG (skill, FLAG_APPLIED);
399 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!");
400 } 307 }
401 308
402 op->update_stats (); 309 op->update_stats ();
403 success = 1; 310 success = 1;
404 break; 311 break;
… …
414 case SK_HIDING: 321 case SK_HIDING:
415 exp = success = hide (op, skill); 322 exp = success = hide (op, skill);
416 break; 323 break;
417 324
418 case SK_JUMPING: 325 case SK_JUMPING:
419 success = jump (op, dir, skill); 326 exp = success = jump (op, dir, skill);
420 break; 327 break;
421 328
422 case SK_INSCRIPTION: 329 case SK_INSCRIPTION:
423 exp = success = write_on_item (op, string, skill); 330 exp = success = write_on_item (op, string, skill);
424 break; 331 break;
… …
486 case SK_LITERACY: 393 case SK_LITERACY:
487 case SK_WOODSMAN: 394 case SK_WOODSMAN:
488 /* 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.
489 * failing that, we go and identify stuff. 396 * failing that, we go and identify stuff.
490 */ 397 */
398 {
399 bool found_cauldron = false;
400
491 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) 401 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
492 { 402 {
493 next = tmp->above; 403 next = tmp->above;
494 404
495 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 405 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
496 { 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
497 attempt_do_alchemy (op, tmp); 417 attempt_do_alchemy (op, tmp, skill);
498 418
499 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 419 if (QUERY_FLAG (tmp, FLAG_APPLIED))
500 esrv_send_inventory (op, tmp); 420 esrv_send_inventory (op, tmp);
501
502 did_alc = 1;
503 } 421 }
504 } 422 }
505 423
506 if (did_alc == 0) 424 if (!found_cauldron)
507 exp = success = skill_ident (op, skill); 425 exp = success = skill_ident (op, skill);
508 426 }
509 break; 427 break;
510 428
511 case SK_DET_MAGIC: 429 case SK_DET_MAGIC:
512 case SK_DET_CURSE: 430 case SK_DET_CURSE:
513 exp = success = skill_ident (op, skill); 431 exp = success = skill_ident (op, skill);
… …
544 case SK_SUMMONING: 462 case SK_SUMMONING:
545 case SK_CLIMBING: 463 case SK_CLIMBING:
546 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.");
547 break; 465 break;
548 466
467 case SK_MINING:
468 success = skill_mining (op, part, skill, dir, string);
469 break;
470
471 case SK_FISHING:
472 success = skill_fishing (op, part, skill, dir, string);
473 break;
474
549 default: 475 default:
550 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); 476 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
551 break; 477 break;
552 } 478 }
553 479
… …
555 * 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
556 * which use_monster_skill is called already simulates this. 482 * which use_monster_skill is called already simulates this.
557 * If certain skills should take more/less time, that should be 483 * If certain skills should take more/less time, that should be
558 * in the code for the skill itself. 484 * in the code for the skill itself.
559 */ 485 */
560
561 if (op->type == PLAYER) 486 if (op->type == PLAYER)
562 op->speed_left -= 1.f; 487 op->speed_left -= 1.f;
563 488
564 /* 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.
565 * Note that add_exp() will figure out player/monster experience 490 * Note that add_exp() will figure out player/monster experience
… …
613 * 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
614 * help out exp awards for skill_ident skills. Also, if 539 * help out exp awards for skill_ident skills. Also, if
615 * 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
616 * and level (this was the old system) -b.t. 541 * and level (this was the old system) -b.t.
617 */ 542 */
618
619 if (!op) 543 if (!op)
620 { /* no item/creature */ 544 { /* no item/creature */
621 op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty; 545 op_lvl = max (1, who->map->difficulty);
622 op_exp = 0; 546 op_exp = 0;
623 } 547 }
624 else if (op->type == RUNE || op->type == TRAP) 548 else if (op->type == RUNE || op->type == TRAP)
625 { /* all traps. If stats.Cha > 1 we use that 549 { /* all traps. If stats.Cha > 1 we use that
626 * for the amount of experience */ 550 * for the amount of experience */
… …
630 else 554 else
631 { /* all other items/living creatures */ 555 { /* all other items/living creatures */
632 op_exp = op->stats.exp; 556 op_exp = op->stats.exp;
633 op_lvl = op->level; 557 op_lvl = op->level;
634 if (!QUERY_FLAG (op, FLAG_ALIVE)) 558 if (!QUERY_FLAG (op, FLAG_ALIVE))
635 { /* for ident/make items */ 559 op_lvl += 5 * abs (op->magic); /* for ident/make items */
636 op_lvl += 5 * abs (op->magic);
637 }
638 } 560 }
639 561
640 if (op_lvl < 1) 562 if (op_lvl < 1)
641 op_lvl = 1; 563 op_lvl = 1;
642 564
… …
650 /* 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
651 * bse reward value (exp) and level multiplier factor. 573 * bse reward value (exp) and level multiplier factor.
652 */ 574 */
653 if (skill->type == SKILL) 575 if (skill->type == SKILL)
654 { 576 {
655 base += skill->arch->clone.stats.exp; 577 base += skill->arch->stats.exp;
656 if (settings.simple_exp) 578 if (settings.simple_exp)
657 { 579 {
658 if (skill->arch->clone.level) 580 if (skill->arch->level)
659 lvl_mult = (float) skill->arch->clone.level / 100.0; 581 lvl_mult = (float) skill->arch->level / 100.0;
660 else 582 else
661 lvl_mult = 1.0; /* no adjustment */ 583 lvl_mult = 1.0; /* no adjustment */
662 } 584 }
663 else 585 else
664 { 586 {
665 if (skill->level) 587 if (skill->level)
666 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);
667 else 589 else
668 lvl_mult = 1.0; 590 lvl_mult = 1.0;
669 } 591 }
670 } 592 }
671 else 593 else
672 { 594 {
673 /* Don't divide by zero here! */ 595 /* Don't divide by zero here! */
674 lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1); 596 lvl_mult = (float) op_lvl / (float) max (1, skill->level);
675 } 597 }
676 } 598 }
677 599
678 /* assemble the exp total, and return value */ 600 /* assemble the exp total, and return value */
679 601
… …
696 * player learns the skill, 2 otherwise. 618 * player learns the skill, 2 otherwise.
697 */ 619 */
698int 620int
699learn_skill (object *pl, object *scroll) 621learn_skill (object *pl, object *scroll)
700{ 622{
701 object *tmp;
702
703 if (!scroll->skill) 623 if (!scroll->skill)
704 { 624 {
705 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);
706 return 2; 626 return 2;
707 } 627 }
708 628
709 /* can't use find_skill_by_name because we want skills the player knows 629 object *tmp = find_skill (pl, scroll->skill);
710 * but can't use natively.
711 */
712
713 for (tmp = pl->inv; tmp != NULL; tmp = tmp->below)
714 if (tmp->type == SKILL && !strncasecmp (scroll->skill, tmp->skill, strlen (scroll->skill)))
715 break;
716 630
717 /* player already knows it */ 631 /* player already knows it */
718 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 632 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
719 return 0; 633 return 0;
720 634
… …
733 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);
734 return 2; 648 return 2;
735 } 649 }
736 650
737 SET_FLAG (tmp, FLAG_CAN_USE_SKILL); 651 SET_FLAG (tmp, FLAG_CAN_USE_SKILL);
738 link_player_skills (pl); 652
739 return 1; 653 return 1;
740} 654}
741 655
742/* Gives a percentage clipped to 0% -> 100% of a/b. */ 656/* Gives a percentage clipped to 0% -> 100% of a/b. */
743/* Probably belongs in some global utils-type file? */ 657/* Probably belongs in some global utils-type file? */
… …
767 * Note this function is a bit more complicated becauase we 681 * Note this function is a bit more complicated becauase we
768 * we want ot sort the skills before printing them. If we 682 * we want ot sort the skills before printing them. If we
769 * 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
770 * simpler. 684 * simpler.
771 */ 685 */
772 686//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
773void 687void
774show_skills (object *op, const char *search) 688show_skills (object *pl, const char *search)
775{ 689{
776 object *tmp = NULL;
777 char buf[MAX_BUF];
778 const char *cp; 690 const char *cp;
779 int i, num_skills_found = 0; 691 int i, num_skills_found = 0;
780 static const char *const periods = "........................................"; 692 const char *const periods = ".............................."; // 30
781 693
782 /* 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 */
783 char skills[NUM_SKILLS][MAX_BUF]; 695 char skills[NUM_SKILLS][128]; // d'oh
784 696
697 object *op = pl->contr->ob;
785 698
786 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 699 for (object *tmp = op->inv; tmp; tmp = tmp->below)
787 { 700 {
788 if (tmp->type == SKILL) 701 if (tmp->type == SKILL)
789 { 702 {
790 if (search && strstr (tmp->name, search) == NULL) 703 if (search && !tmp->name.contains (search))
791 continue; 704 continue;
705
706 char buf[30];
707
792 /* Basically want to fill this out to 40 spaces with periods */ 708 /* Basically want to fill this out to 30 spaces with periods */
793 sprintf (buf, "%s%s", &tmp->name, periods); 709 snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
794 buf[40] = 0;
795 710
796 if (settings.permanent_exp_ratio) 711 if (settings.permanent_exp_ratio)
797 {
798 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)", 712 snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
799 buf, tmp->level, tmp->stats.exp, 713 buf, tmp->level, tmp->stats.exp,
800 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp)); 714 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
801 }
802 else 715 else
803 {
804 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")", 716 snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
805 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul)); 717 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
806 } 718
807 /* 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
808 * it sometimes happens (maybe a leftover from bugier earlier code 720 * it sometimes happens (maybe a leftover from bugier earlier code
809 * and those character are still about). In any case, lets handle 721 * and those character are still about). In any case, lets handle
810 * 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
811 * crash the server numerous times. 723 * crash the server numerous times.
812 */ 724 */
813 if (num_skills_found >= NUM_SKILLS) 725 if (num_skills_found >= NUM_SKILLS)
814 { 726 {
815 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.");
816 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");
817 break; 729 break;
818 } 730 }
819 } 731 }
820 } 732 }
821 733
822 clear_win_info (op); 734 dynbuf_text &msg = msg_dynbuf; msg.clear ();
823 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:"); 735
736 msg << "T<Player skills:>\n\n";
824 if (num_skills_found > 1) 737 if (num_skills_found > 1)
825 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) std::strcmp); 738 qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp);
826 739
827 for (i = 0; i < num_skills_found; i++) 740 for (i = 0; i < num_skills_found; i++)
828 new_draw_info (NDI_UNIQUE, 0, op, skills[i]); 741 msg << " C<" << skills [i] << ">\n";
829 742
830 new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5); 743 msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r";
831 744
832 cp = determine_god (op); 745 cp = determine_god (op);
833 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time"); 746 msg << "You worship " << (cp ? cp : "no god at current time") << ".\r";
834 747
835 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
836 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);
837} 753}
838 754
839/* 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
840 * 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
841 * 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.
… …
849 size_t len; 765 size_t len;
850 766
851 if (!string) 767 if (!string)
852 return 0; 768 return 0;
853 769
854 for (skop = op->inv; skop != NULL; skop = skop->below) 770 for (skop = op->inv; skop; skop = skop->below)
855 { 771 if ((skop->type == SKILL || skop->type == SKILL_TOOL)
856 if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) &&
857 !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 772 && !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill))))
773 {
774 skop = find_skill_by_name (op, skop->skill);
858 break; 775 break;
859 else if (skop->type == SKILL_TOOL && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
860 break;
861 } 776 }
777
862 if (!skop) 778 if (!skop)
863 { 779 {
864 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 780 op->failmsgf ("Unable to find skill %s.", string);
781 return 0;
782 }
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 );
865 return 0; 792 return 0;
866 } 793 }
867 794
868 len = strlen (skop->skill); 795 len = strlen (skop->skill);
869 796
… …
871 * options given to the skill. Its pretty simple - if there 798 * options given to the skill. Its pretty simple - if there
872 * are extra parameters (as deteremined by string length), we 799 * are extra parameters (as deteremined by string length), we
873 * want to skip over any leading spaces. 800 * want to skip over any leading spaces.
874 */ 801 */
875 if (len >= strlen (string)) 802 if (len >= strlen (string))
876 {
877 string = NULL; 803 string = NULL;
878 }
879 else 804 else
880 { 805 {
881 string += len; 806 string += len;
882 while (*string == 0x20) 807 while (*string == 0x20)
883 string++; 808 string++;
809
884 if (strlen (string) == 0) 810 if (strlen (string) == 0)
885 string = NULL; 811 string = NULL;
886 } 812 }
887 813
888#ifdef SKILL_UTIL_DEBUG 814#ifdef SKILL_UTIL_DEBUG
889 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");
890#endif 816#endif
891 817
892 /* Change to the new skill, then execute it. */
893 if (do_skill (op, op, skop, op->facing, string)) 818 if (do_skill (op, op, skop, op->facing, string))
894 return 1; 819 return 1;
895 820
896 return 0; 821 return 0;
897} 822}
898 823
899static bool 824static bool
900hth_skill_p (object *skill) 825hth_skill_p (object *skill)
901{ 826{
902 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT; 827 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_ITEM)) == SF_COMBAT;
903} 828}
904 829
905/* This finds the first unarmed skill the player has, and returns it. 830/* This finds the first unarmed skill the player has, and returns it.
906 */ 831 */
907static object * 832static object *
… …
935 * 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
936 * 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.
937 */ 862 */
938 if (player *pl = op->contr) 863 if (player *pl = op->contr)
939 { 864 {
940 if (!pl->combat_ob) 865 if (skill)
941 { 866 {
942 if (QUERY_FLAG (op, FLAG_READY_WEAPON)) 867 if (!op->apply (skill))
868 return 0;
869 }
870 else
871 {
872 if (!pl->combat_ob)
943 { 873 {
944 for (tmp = op->inv; tmp; tmp = tmp->below) 874 if (QUERY_FLAG (op, FLAG_READY_WEAPON))
945 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
946 break;
947
948 if (!tmp)
949 { 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)
950 LOG (llevError, "Could not find applied weapon on %s\n", &op->name); 881 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
951 return 0; 882
883 pl->combat_ob = tmp;
952 } 884 }
953 885
954 change_skill (op, find_skill_by_name (op, tmp->skill), 1); 886 if (!pl->combat_ob)
955 }
956 else
957 {
958 if (!skill)
959 { 887 {
960 /* 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
961 * it if appropriate. 889 * it if appropriate.
962 */ 890 */
963 if (op->chosen_skill && hth_skill_p (op->chosen_skill)) 891 if (op->chosen_skill && hth_skill_p (op->chosen_skill))
… …
965 else 893 else
966 { 894 {
967 skill = find_player_hth_skill (op); 895 skill = find_player_hth_skill (op);
968 896
969 if (!skill) 897 if (!skill)
970 {
971 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); 898 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
972 return 0;
973 }
974 } 899 }
900
901 op->apply (skill);
975 } 902 }
976 903
977 /* now try to ready the new skill */ 904 if (!pl->combat_ob)
978 if (!change_skill (op, skill, 0)) 905 {
979 { /* oh oh, trouble! */ 906 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
980 new_draw_info_format (NDI_UNIQUE, 0, op, "Couldn't change to skill %s", &skill->name);
981 return 0; 907 return 0;
982 } 908 }
983 } 909 }
984 910
985 if (!pl->combat_ob) 911 if (!op->apply (pl->combat_ob))
986 {
987 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
988 return 0; 912 return 0;
989 }
990 } 913 }
991
992 if (!op->change_weapon (pl->combat_ob))
993 return 0;
994 914
995 /* lose invisiblity/hiding status for running attacks */ 915 /* lose invisiblity/hiding status for running attacks */
996 if (pl->tmp_invis) 916 if (pl->tmp_invis)
997 { 917 {
998 pl->tmp_invis = 0; 918 pl->tmp_invis = 0;
999 op->invisible = 0; 919 op->invisible = 0;
1000 op->hide = 0; 920 op->flag [FLAG_HIDDEN] = 0;
1001 update_object (op, UP_OBJ_CHANGE); 921 update_object (op, UP_OBJ_CHANGE);
1002 } 922 }
1003 } 923 }
1004 924
1005 int success = attack_ob (tmp, op); 925 int success = attack_ob (tmp, op);
… …
1017 return success; 937 return success;
1018} 938}
1019 939
1020/* 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
1021 * system. In essence, this code handles 941 * system. In essence, this code handles
1022 * 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
1023 * treated here. If an opponent is already supplied by move_player(), 943 * treated here. If an opponent is already supplied by move_player(),
1024 * 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
1025 * appropriate opponent exists. 945 * appropriate opponent exists.
1026 * 946 *
1027 * This is called by move_player() and attack_hth() 947 * This is called by move_player() and attack_hth()
… …
1132 1052
1133 return 0; 1053 return 0;
1134 } 1054 }
1135 1055
1136 return skill_attack (NULL, op, dir, string, skill); 1056 return skill_attack (NULL, op, dir, string, skill);
1137
1138} 1057}
1058

Diff Legend

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