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.41 by root, Fri May 11 21:07:14 2007 UTC vs.
Revision 1.86 by root, Sat Apr 3 22:30:21 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) 143find_skill_by_name (object *who, shstr_cmp sh)
119{ 144{
120 if (!name) 145 object *skill_tool = 0;
146
147 for (object *tmp = who->inv; tmp; tmp = tmp->below)
148 if (tmp->skill == sh)
149 {
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);
153 /* Try to find appropriate skilltool. If the player has one already
154 * applied, we try to keep using that one.
155 */
156 else if (tmp->type == SKILL_TOOL && !skill_tool)
157 skill_tool = tmp;
158 }
159
160 if (!skill_tool)
121 return 0; 161 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 162
150 /* 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 -
151 * 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
152 * but not the skill itself, give it to them. 165 * but not the skill itself, give it to them.
153 */ 166 */
154 if (skill_tool) 167 object *skill = find_skill (who, skill_tool->skill);
155 {
156 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
157 if (apply_special (who, skill_tool, 0))
158 return 0;
159 168
160 if (!skill) 169 if (!skill)
161 {
162 skill = give_skill_by_name (who, skill_tool->skill); 170 skill = give_skill_by_name (who, skill_tool->skill);
163 link_player_skills (who);
164 }
165 171
172 if (!skill_tool->flag [FLAG_APPLIED])
173 if (apply_special (who, splay (skill_tool), AP_APPLY))
166 return skill; 174 return 0;
167 } 175
176 return splay (skill);
177}
178
179object *
180find_skill_by_name_fuzzy (object *who, const char *name)
181{
182 if (!name)
183 return 0;
184
185 for (object *tmp = who->inv; tmp; tmp = tmp->below)
186 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL)
187 && tmp->skill.starts_with (name))
188 if (object *skop = find_skill_by_name (who, tmp->skill))
189 return skop;
168 190
169 return 0; 191 return 0;
170} 192}
171 193
172
173/* This returns the skill pointer of the given name (the 194/* This returns the skill pointer of the given name (the
174 * one that accumlates exp, has the level, etc). 195 * one that accumulates exp, has the level, etc).
175 * 196 *
176 * It is presumed that the player will be needing to actually 197 * It is presumed that the player will be needing to actually
177 * use the skill, so thus if use of the skill requires a skill 198 * use the skill, so thus if use of the skill requires a skill
178 * tool, this code will equip it. 199 * tool, this code will equip it.
179 * 200 *
… …
182 * this replaces find_skill. 203 * this replaces find_skill.
183 */ 204 */
184object * 205object *
185find_skill_by_number (object *who, int skillno) 206find_skill_by_number (object *who, int skillno)
186{ 207{
187 object *skill = NULL, *skill_tool = NULL, *tmp;
188
189 if (skillno < 1 || skillno >= NUM_SKILLS)
190 return NULL;
191
192 for (tmp = who->inv; tmp != NULL; tmp = tmp->below) 208 for (object *tmp = who->inv; tmp; tmp = tmp->below)
193 {
194 if (tmp->type == SKILL && tmp->subtype == skillno) 209 if (tmp->type == SKILL && tmp->subtype == skillno)
195 skill = tmp; 210 if (object *skop = find_skill_by_name (who, tmp->skill))
196
197 /* Try to find appropriate skilltool. If the player has one already
198 * applied, we try to keep using that one.
199 */
200 else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno)
201 {
202 if (QUERY_FLAG (tmp, FLAG_APPLIED))
203 skill_tool = tmp;
204 else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED))
205 skill_tool = tmp;
206 }
207 }
208 /* If this is a skill that can be used without a tool, return it */
209 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
210 return skill;
211
212 /* Player has a tool to use the skill. IF not applied, apply it -
213 * if not successful, return null. If they do have the skill tool
214 * but not the skill itself, give it to them.
215 */
216 if (skill_tool)
217 {
218 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
219 {
220 if (apply_special (who, skill_tool, 0))
221 return NULL;
222 }
223
224 if (!skill)
225 {
226 skill = give_skill_by_name (who, skill_tool->skill);
227 link_player_skills (who);
228 }
229
230 return skill; 211 return skop;
231 }
232 212
233 return NULL; 213 return 0;
234} 214}
235 215
236/* This changes the objects skill to new_skill. 216/* This changes the objects chosen_skill to new_skill.
237 * note that this function doesn't always need to get used -
238 * you can now add skill exp to the player without the chosen_skill being
239 * set. This function is of most interest to players to update
240 * the various range information.
241 * return 1 on success, 0 on error 217 * return 1 on success, 0 on error
242 */ 218 */
243int 219bool
244change_skill (object *who, object *new_skill, int flag) 220object::change_skill (object *new_skill)
245{ 221{
246 if (who->type != PLAYER) 222 if (type != PLAYER)
247 return 0; 223 return 0;
248 224
249 // optimise this supposedly common case 225 // optimise this supposedly common case
250 if (new_skill == who->chosen_skill) 226 if (new_skill == chosen_skill)
251 return 1; 227 return 1;
252 228
253 if (who->chosen_skill) 229 if (chosen_skill)
254 apply_special (who, who->chosen_skill, AP_UNAPPLY);
255
256 if (!new_skill)
257 {
258 LOG (llevError | logBacktrace, "change_skill called on %s with NULL skill\n",
259 who->debug_desc ());
260 return 0;
261 } 230 {
231 chosen_skill->flag [FLAG_APPLIED] = false;
232 change_abil (this, chosen_skill);
233 }
262 234
263 player *pl = who->contr; 235 chosen_skill = new_skill;
264 236
265 // move skill to front, so it will be prefered next time 237 if (chosen_skill)
266 new_skill->remove (); 238 {
267 who->insert (new_skill); 239 chosen_skill->flag [FLAG_APPLIED] = true;
240 change_abil (this, chosen_skill);
241 }
268 242
269 if (apply_special (who, new_skill, AP_APPLY)) 243 // always clear current weapon, as the selected skill could
270 return 0; 244 // conflict with the current weapon skill, which would go
245 // undetected and exp would be given to the wrong skill.
246 current_weapon = 0;
271 247
248 update_stats ();
272 return 1; 249 return 1;
273}
274
275/* This function just clears the chosen_skill and range_skill values
276 * in the player.
277 */
278void
279clear_skill (object *who)
280{
281 who->chosen_skill = 0;
282 CLEAR_FLAG (who, FLAG_READY_SKILL);
283
284 if (who->type == PLAYER)
285 if (who->contr->ranged_ob && who->contr->ranged_ob->type == SKILL)
286 who->contr->ranged_ob = 0;
287} 250}
288 251
289/* do_skill() - Main skills use function-similar in scope to cast_spell(). 252/* do_skill() - Main skills use function-similar in scope to cast_spell().
290 * We handle all requests for skill use outside of some combat here. 253 * We handle all requests for skill use outside of some combat here.
291 * We require a separate routine outside of fire() so as to allow monsters 254 * We require a separate routine outside of fire() so as to allow monsters
… …
298 */ 261 */
299int 262int
300do_skill (object *op, object *part, object *skill, int dir, const char *string) 263do_skill (object *op, object *part, object *skill, int dir, const char *string)
301{ 264{
302 int success = 0, exp = 0; 265 int success = 0, exp = 0;
303 int did_alc = 0;
304 object *tmp, *next;
305 266
306 if (!skill) 267 if (!skill)
307 return 0; 268 return 0;
308 269
309 /* The code below presumes that the skill points to the object that 270 /* The code below presumes that the skill points to the object that
… …
311 * go and try to find the actual real skill pointer, and if the 272 * go and try to find the actual real skill pointer, and if the
312 * the player doesn't have a bucket for that, create one. 273 * the player doesn't have a bucket for that, create one.
313 */ 274 */
314 if (skill->type != SKILL && op->type == PLAYER) 275 if (skill->type != SKILL && op->type == PLAYER)
315 { 276 {
316 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 277 for (object *tmp = op->inv; tmp; tmp = tmp->below)
317 if (tmp->type == SKILL && tmp->skill == skill->skill) 278 if (tmp->type == SKILL && tmp->skill == skill->skill)
318 break; 279 {
280 skill = tmp;
281 goto found;
282 }
319 283
320 if (!tmp)
321 tmp = give_skill_by_name (op, skill->skill); 284 skill = give_skill_by_name (op, skill->skill);
322 285found: ;
323 skill = tmp;
324 } 286 }
325 287
326 // skill, by_whom, on_which_object, which direction, skill_argument 288 // skill, by_whom, on_which_object, which direction, skill_argument
327 if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string))) 289 if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))
328 return 0; 290 return 0;
… …
341 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); 303 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
342 } 304 }
343 else 305 else
344 { 306 {
345 SET_FLAG (skill, FLAG_APPLIED); 307 SET_FLAG (skill, FLAG_APPLIED);
346 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!."); 308 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
347 } 309 }
348 310
349 op->update_stats (); 311 op->update_stats ();
350 success = 1; 312 success = 1;
351 break; 313 break;
… …
361 case SK_HIDING: 323 case SK_HIDING:
362 exp = success = hide (op, skill); 324 exp = success = hide (op, skill);
363 break; 325 break;
364 326
365 case SK_JUMPING: 327 case SK_JUMPING:
366 success = jump (op, dir, skill); 328 exp = success = jump (op, dir, skill);
367 break; 329 break;
368 330
369 case SK_INSCRIPTION: 331 case SK_INSCRIPTION:
370 exp = success = write_on_item (op, string, skill); 332 exp = success = write_on_item (op, string, skill);
371 break; 333 break;
… …
433 case SK_LITERACY: 395 case SK_LITERACY:
434 case SK_WOODSMAN: 396 case SK_WOODSMAN:
435 /* first, we try to find a cauldron, and do the alchemy thing. 397 /* first, we try to find a cauldron, and do the alchemy thing.
436 * failing that, we go and identify stuff. 398 * failing that, we go and identify stuff.
437 */ 399 */
400 {
401 bool found_cauldron = false;
402
438 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = next) 403 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
439 { 404 {
440 next = tmp->above; 405 next = tmp->above;
441 406
442 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 407 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
443 { 408 {
409 found_cauldron = true;
410
411 if (tmp->skill != skill->skill)
412 {
413 op->failmsg (format ("You can't use the %s with the %s skill!",
414 query_name (tmp),
415 query_name (skill)));
416 break;
417 }
418
444 attempt_do_alchemy (op, tmp); 419 attempt_do_alchemy (op, tmp, skill);
445 420
446 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 421 if (QUERY_FLAG (tmp, FLAG_APPLIED))
447 esrv_send_inventory (op, tmp); 422 esrv_send_inventory (op, tmp);
448
449 did_alc = 1;
450 } 423 }
451 } 424 }
452 425
453 if (did_alc == 0) 426 if (!found_cauldron)
454 exp = success = skill_ident (op, skill); 427 exp = success = skill_ident (op, skill);
455 428 }
456 break; 429 break;
457 430
458 case SK_DET_MAGIC: 431 case SK_DET_MAGIC:
459 case SK_DET_CURSE: 432 case SK_DET_CURSE:
460 exp = success = skill_ident (op, skill); 433 exp = success = skill_ident (op, skill);
… …
491 case SK_SUMMONING: 464 case SK_SUMMONING:
492 case SK_CLIMBING: 465 case SK_CLIMBING:
493 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); 466 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
494 break; 467 break;
495 468
469 case SK_MINING:
470 success = skill_mining (op, part, skill, dir, string);
471 break;
472
473 case SK_FISHING:
474 success = skill_fishing (op, part, skill, dir, string);
475 break;
476
496 default: 477 default:
497 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); 478 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
498 break; 479 break;
499 } 480 }
500 481
… …
502 * Monsters have no skill use time because of the random nature in 483 * Monsters have no skill use time because of the random nature in
503 * which use_monster_skill is called already simulates this. 484 * which use_monster_skill is called already simulates this.
504 * If certain skills should take more/less time, that should be 485 * If certain skills should take more/less time, that should be
505 * in the code for the skill itself. 486 * in the code for the skill itself.
506 */ 487 */
507
508 if (op->type == PLAYER) 488 if (op->type == PLAYER)
509 op->speed_left -= 1.0; 489 op->speed_left -= 1.f;
510 490
511 /* this is a good place to add experience for successfull use of skills. 491 /* this is a good place to add experience for successfull use of skills.
512 * Note that add_exp() will figure out player/monster experience 492 * Note that add_exp() will figure out player/monster experience
513 * gain problems. 493 * gain problems.
514 */ 494 */
… …
560 * If an object is not alive and magical we set the base exp higher to 540 * If an object is not alive and magical we set the base exp higher to
561 * help out exp awards for skill_ident skills. Also, if 541 * help out exp awards for skill_ident skills. Also, if
562 * an item is type RUNE, we give out exp based on stats.Cha 542 * an item is type RUNE, we give out exp based on stats.Cha
563 * and level (this was the old system) -b.t. 543 * and level (this was the old system) -b.t.
564 */ 544 */
565
566 if (!op) 545 if (!op)
567 { /* no item/creature */ 546 { /* no item/creature */
568 op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty; 547 op_lvl = max (1, who->map->difficulty);
569 op_exp = 0; 548 op_exp = 0;
570 } 549 }
571 else if (op->type == RUNE || op->type == TRAP) 550 else if (op->type == RUNE || op->type == TRAP)
572 { /* all traps. If stats.Cha > 1 we use that 551 { /* all traps. If stats.Cha > 1 we use that
573 * for the amount of experience */ 552 * for the amount of experience */
… …
577 else 556 else
578 { /* all other items/living creatures */ 557 { /* all other items/living creatures */
579 op_exp = op->stats.exp; 558 op_exp = op->stats.exp;
580 op_lvl = op->level; 559 op_lvl = op->level;
581 if (!QUERY_FLAG (op, FLAG_ALIVE)) 560 if (!QUERY_FLAG (op, FLAG_ALIVE))
582 { /* for ident/make items */ 561 op_lvl += 5 * abs (op->magic); /* for ident/make items */
583 op_lvl += 5 * abs (op->magic);
584 }
585 } 562 }
586 563
587 if (op_lvl < 1) 564 if (op_lvl < 1)
588 op_lvl = 1; 565 op_lvl = 1;
589 566
… …
597 /* if skill really is a skill, then we can look at the skill archetype for 574 /* if skill really is a skill, then we can look at the skill archetype for
598 * bse reward value (exp) and level multiplier factor. 575 * bse reward value (exp) and level multiplier factor.
599 */ 576 */
600 if (skill->type == SKILL) 577 if (skill->type == SKILL)
601 { 578 {
602 base += skill->arch->clone.stats.exp; 579 base += skill->arch->stats.exp;
603 if (settings.simple_exp) 580 if (settings.simple_exp)
604 { 581 {
605 if (skill->arch->clone.level) 582 if (skill->arch->level)
606 lvl_mult = (float) skill->arch->clone.level / 100.0; 583 lvl_mult = (float) skill->arch->level / 100.0;
607 else 584 else
608 lvl_mult = 1.0; /* no adjustment */ 585 lvl_mult = 1.0; /* no adjustment */
609 } 586 }
610 else 587 else
611 { 588 {
612 if (skill->level) 589 if (skill->level)
613 lvl_mult = ((float) skill->arch->clone.level * (float) op_lvl) / ((float) skill->level * 100.0); 590 lvl_mult = ((float) skill->arch->level * (float) op_lvl) / ((float) skill->level * 100.0);
614 else 591 else
615 lvl_mult = 1.0; 592 lvl_mult = 1.0;
616 } 593 }
617 } 594 }
618 else 595 else
619 { 596 {
620 /* Don't divide by zero here! */ 597 /* Don't divide by zero here! */
621 lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1); 598 lvl_mult = (float) op_lvl / (float) max (1, skill->level);
622 } 599 }
623 } 600 }
624 601
625 /* assemble the exp total, and return value */ 602 /* assemble the exp total, and return value */
626 603
… …
643 * player learns the skill, 2 otherwise. 620 * player learns the skill, 2 otherwise.
644 */ 621 */
645int 622int
646learn_skill (object *pl, object *scroll) 623learn_skill (object *pl, object *scroll)
647{ 624{
648 object *tmp;
649
650 if (!scroll->skill) 625 if (!scroll->skill)
651 { 626 {
652 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name); 627 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);
653 return 2; 628 return 2;
654 } 629 }
655 630
656 /* can't use find_skill_by_name because we want skills the player knows 631 object *tmp = find_skill (pl, scroll->skill);
657 * but can't use natively.
658 */
659
660 for (tmp = pl->inv; tmp != NULL; tmp = tmp->below)
661 if (tmp->type == SKILL && !strncasecmp (scroll->skill, tmp->skill, strlen (scroll->skill)))
662 break;
663 632
664 /* player already knows it */ 633 /* player already knows it */
665 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 634 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
666 return 0; 635 return 0;
667 636
… …
680 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); 649 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);
681 return 2; 650 return 2;
682 } 651 }
683 652
684 SET_FLAG (tmp, FLAG_CAN_USE_SKILL); 653 SET_FLAG (tmp, FLAG_CAN_USE_SKILL);
685 link_player_skills (pl); 654
686 return 1; 655 return 1;
687} 656}
688 657
689/* Gives a percentage clipped to 0% -> 100% of a/b. */ 658/* Gives a percentage clipped to 0% -> 100% of a/b. */
690/* Probably belongs in some global utils-type file? */ 659/* Probably belongs in some global utils-type file? */
… …
714 * Note this function is a bit more complicated becauase we 683 * Note this function is a bit more complicated becauase we
715 * we want ot sort the skills before printing them. If we 684 * we want ot sort the skills before printing them. If we
716 * just dumped this as we found it, this would be a bit 685 * just dumped this as we found it, this would be a bit
717 * simpler. 686 * simpler.
718 */ 687 */
719 688//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
720void 689void
721show_skills (object *op, const char *search) 690show_skills (object *pl, const char *search)
722{ 691{
723 object *tmp = NULL;
724 char buf[MAX_BUF];
725 const char *cp; 692 const char *cp;
726 int i, num_skills_found = 0; 693 int i, num_skills_found = 0;
727 static const char *const periods = "........................................"; 694 const char *const periods = ".............................."; // 30
728 695
729 /* Need to have a pointer and use strdup for qsort to work properly */ 696 /* Need to have a pointer and use strdup for qsort to work properly */
730 char skills[NUM_SKILLS][MAX_BUF]; 697 char skills[NUM_SKILLS][128]; // d'oh
731 698
699 object *op = pl->contr->ob;
732 700
733 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 701 for (object *tmp = op->inv; tmp; tmp = tmp->below)
734 { 702 {
735 if (tmp->type == SKILL) 703 if (tmp->type == SKILL)
736 { 704 {
737 if (search && strstr (tmp->name, search) == NULL) 705 if (search && !tmp->name.contains (search))
738 continue; 706 continue;
707
708 char buf[30];
709
739 /* Basically want to fill this out to 40 spaces with periods */ 710 /* Basically want to fill this out to 30 spaces with periods */
740 sprintf (buf, "%s%s", &tmp->name, periods); 711 snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
741 buf[40] = 0;
742 712
743 if (settings.permanent_exp_ratio) 713 if (settings.permanent_exp_ratio)
744 {
745 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)", 714 snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
746 buf, tmp->level, tmp->stats.exp, 715 buf, tmp->level, tmp->stats.exp,
747 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp)); 716 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
748 }
749 else 717 else
750 {
751 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")", 718 snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
752 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul)); 719 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
753 } 720
754 /* I don't know why some characters get a bunch of skills, but 721 /* I don't know why some characters get a bunch of skills, but
755 * it sometimes happens (maybe a leftover from bugier earlier code 722 * it sometimes happens (maybe a leftover from bugier earlier code
756 * and those character are still about). In any case, lets handle 723 * and those character are still about). In any case, lets handle
757 * it so it doesn't crash the server - otherwise, one character may 724 * it so it doesn't crash the server - otherwise, one character may
758 * crash the server numerous times. 725 * crash the server numerous times.
759 */ 726 */
760 if (num_skills_found >= NUM_SKILLS) 727 if (num_skills_found >= NUM_SKILLS)
761 { 728 {
762 new_draw_info (NDI_RED, 0, op, "Your character has too many skills."); 729 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Your character has too many skills.");
763 new_draw_info (NDI_RED, 0, op, "Something isn't right - contact the server admin"); 730 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Something isn't right - contact the server admin");
764 break; 731 break;
765 } 732 }
766 } 733 }
767 } 734 }
768 735
769 clear_win_info (op); 736 dynbuf_text &msg = msg_dynbuf; msg.clear ();
770 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:"); 737
738 msg << "T<Player skills:>\n\n";
771 if (num_skills_found > 1) 739 if (num_skills_found > 1)
772 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) std::strcmp); 740 qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp);
773 741
774 for (i = 0; i < num_skills_found; i++) 742 for (i = 0; i < num_skills_found; i++)
775 new_draw_info (NDI_UNIQUE, 0, op, skills[i]); 743 msg << " C<" << skills [i] << ">\n";
776 744
777 new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5); 745 msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r";
778 746
779 cp = determine_god (op); 747 cp = determine_god (op);
780 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time"); 748 msg << "You worship " << (cp ? cp : "no god at current time") << ".\r";
781 749
782 new_draw_info_format (NDI_UNIQUE, 0, op, "Your equipped item power is %d out of %d\n", 750 msg << "Your equipped item power is " << (int)op->contr->item_power
783 op->contr->item_power, (int) (op->level * settings.item_power_factor)); 751 << " out of " << int (op->level * settings.item_power_factor)
752 << ".\n";
753
754 pl->contr->infobox (MSG_CHANNEL ("skills"), msg);
784} 755}
785 756
786/* use_skill() - similar to invoke command, it executes the skill in the 757/* use_skill() - similar to invoke command, it executes the skill in the
787 * direction that the user is facing. Returns false if we are unable to 758 * direction that the user is facing. Returns false if we are unable to
788 * change to the requested skill, or were unable to use the skill properly. 759 * change to the requested skill, or were unable to use the skill properly.
… …
796 size_t len; 767 size_t len;
797 768
798 if (!string) 769 if (!string)
799 return 0; 770 return 0;
800 771
801 for (skop = op->inv; skop != NULL; skop = skop->below) 772 for (skop = op->inv; skop; skop = skop->below)
802 { 773 {
774 if (skop->type == SKILL
803 if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) && 775 && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
804 !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 776 && !strncasecmp (string, skop->skill, min (strlen (string), (size_t) strlen (skop->skill))))
805 break; 777 break;
778 else if (skop->type == SKILL_TOOL
806 else if (skop->type == SKILL_TOOL && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 779 && !strncasecmp (string, skop->skill, min (strlen (string), (size_t) strlen (skop->skill))))
807 break; 780 break;
808 } 781 }
782
809 if (!skop) 783 if (!skop)
810 { 784 {
811 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 785 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string);
812 return 0; 786 return 0;
813 } 787 }
… …
818 * options given to the skill. Its pretty simple - if there 792 * options given to the skill. Its pretty simple - if there
819 * are extra parameters (as deteremined by string length), we 793 * are extra parameters (as deteremined by string length), we
820 * want to skip over any leading spaces. 794 * want to skip over any leading spaces.
821 */ 795 */
822 if (len >= strlen (string)) 796 if (len >= strlen (string))
823 {
824 string = NULL; 797 string = NULL;
825 }
826 else 798 else
827 { 799 {
828 string += len; 800 string += len;
829 while (*string == 0x20) 801 while (*string == 0x20)
830 string++; 802 string++;
803
831 if (strlen (string) == 0) 804 if (strlen (string) == 0)
832 string = NULL; 805 string = NULL;
833 } 806 }
834 807
835#ifdef SKILL_UTIL_DEBUG 808#ifdef SKILL_UTIL_DEBUG
836 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none"); 809 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");
837#endif 810#endif
838 811
839 /* Change to the new skill, then execute it. */
840 if (do_skill (op, op, skop, op->facing, string)) 812 if (do_skill (op, op, skop, op->facing, string))
841 return 1; 813 return 1;
842 814
843 return 0; 815 return 0;
844} 816}
845 817
846static bool 818static bool
847hth_skill_p (object *skill) 819hth_skill_p (object *skill)
848{ 820{
849 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT; 821 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_ITEM)) == SF_COMBAT;
850} 822}
851 823
852/* This finds the first unarmed skill the player has, and returns it. 824/* This finds the first unarmed skill the player has, and returns it.
853 */ 825 */
854static object * 826static object *
… …
882 * the caller should have set it appropriately). We still want to pass 854 * the caller should have set it appropriately). We still want to pass
883 * through that code if skill is set to change to the skill. 855 * through that code if skill is set to change to the skill.
884 */ 856 */
885 if (player *pl = op->contr) 857 if (player *pl = op->contr)
886 { 858 {
887 if (!pl->combat_ob) 859 if (skill)
860 op->change_skill (skill);
861 else
888 { 862 {
889 if (QUERY_FLAG (op, FLAG_READY_WEAPON)) 863 if (!pl->combat_ob)
890 { 864 {
891 for (tmp = op->inv; tmp; tmp = tmp->below) 865 if (QUERY_FLAG (op, FLAG_READY_WEAPON))
892 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
893 break;
894
895 if (!tmp)
896 { 866 {
867 for (tmp = op->inv; tmp; tmp = tmp->below)
868 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
869 break;
870
871 if (!tmp)
897 LOG (llevError, "Could not find applied weapon on %s\n", &op->name); 872 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
898 return 0; 873
874 pl->combat_ob = tmp;
899 } 875 }
900 876
901 change_skill (op, find_skill_by_name (op, tmp->skill), 1); 877 if (!pl->combat_ob)
902 }
903 else
904 {
905 if (!skill)
906 { 878 {
907 /* See if the players chosen skill is a combat skill, and use 879 /* See if the players chosen skill is a combat skill, and use
908 * it if appropriate. 880 * it if appropriate.
909 */ 881 */
910 if (op->chosen_skill && hth_skill_p (op->chosen_skill)) 882 if (op->chosen_skill && hth_skill_p (op->chosen_skill))
… …
912 else 884 else
913 { 885 {
914 skill = find_player_hth_skill (op); 886 skill = find_player_hth_skill (op);
915 887
916 if (!skill) 888 if (!skill)
917 {
918 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); 889 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
919 return 0;
920 }
921 } 890 }
891
892 op->apply (skill);
922 } 893 }
923 894
924 /* now try to ready the new skill */ 895 if (!pl->combat_ob)
925 if (!change_skill (op, skill, 0)) 896 {
926 { /* oh oh, trouble! */ 897 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
927 new_draw_info_format (NDI_UNIQUE, 0, op, "Couldn't change to skill %s", &skill->name);
928 return 0; 898 return 0;
929 } 899 }
930 } 900 }
931 901
932 if (!pl->combat_ob) 902 if (!op->apply (pl->combat_ob))
933 {
934 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
935 return 0; 903 return 0;
936 }
937 } 904 }
938
939 op->set_weapon (pl->combat_ob);
940 905
941 /* lose invisiblity/hiding status for running attacks */ 906 /* lose invisiblity/hiding status for running attacks */
942 if (pl->tmp_invis) 907 if (pl->tmp_invis)
943 { 908 {
944 pl->tmp_invis = 0; 909 pl->tmp_invis = 0;
945 op->invisible = 0; 910 op->invisible = 0;
946 op->hide = 0; 911 op->flag [FLAG_HIDDEN] = 0;
947 update_object (op, UP_OBJ_CHANGE); 912 update_object (op, UP_OBJ_CHANGE);
948 } 913 }
949 } 914 }
950 915
951 int success = attack_ob (tmp, op); 916 int success = attack_ob (tmp, op);
… …
963 return success; 928 return success;
964} 929}
965 930
966/* skill_attack() - Core routine for use when we attack using a skills 931/* skill_attack() - Core routine for use when we attack using a skills
967 * system. In essence, this code handles 932 * system. In essence, this code handles
968 * all skill-based attacks, ie hth, missile and melee weapons should be 933 * all skill-based attacks, i.e. hth, missile and melee weapons should be
969 * treated here. If an opponent is already supplied by move_player(), 934 * treated here. If an opponent is already supplied by move_player(),
970 * we move right onto do_skill_attack(), otherwise we find if an 935 * we move right onto do_skill_attack(), otherwise we find if an
971 * appropriate opponent exists. 936 * appropriate opponent exists.
972 * 937 *
973 * This is called by move_player() and attack_hth() 938 * This is called by move_player() and attack_hth()
… …
1078 1043
1079 return 0; 1044 return 0;
1080 } 1045 }
1081 1046
1082 return skill_attack (NULL, op, dir, string, skill); 1047 return skill_attack (NULL, op, dir, string, skill);
1083
1084} 1048}
1049

Diff Legend

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