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.73 by root, Thu Jan 1 19:42:43 2009 UTC vs.
Revision 1.91 by root, Tue Apr 6 00:39:26 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* 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. */
… …
58/* init_skills basically just sets up the skill_names table 59/* init_skills basically just sets up the skill_names table
59 * above. The index into the array is set up by the 60 * above. The index into the array is set up by the
60 * subtypes. 61 * subtypes.
61 */ 62 */
62void 63void
63init_skills (void) 64init_skills ()
64{ 65{
65 for_all_archetypes (at) 66 for_all_archetypes (at)
66 if (at->type == SKILL) 67 if (at->type == SKILL)
67 { 68 {
68 if (skill_names[at->subtype]) 69 if (skill_names[at->subtype])
… …
167 168
168 if (!skill) 169 if (!skill)
169 skill = give_skill_by_name (who, skill_tool->skill); 170 skill = give_skill_by_name (who, skill_tool->skill);
170 171
171 if (!skill_tool->flag [FLAG_APPLIED]) 172 if (!skill_tool->flag [FLAG_APPLIED])
172 if (apply_special (who, splay (skill_tool), AP_APPLY | AP_NO_READY)) 173 if (!who->apply (splay (skill_tool)))
173 return 0; 174 return 0;
174 175
175 return splay (skill); 176 return splay (skill);
176} 177}
177 178
178object * 179object *
179find_skill_by_name_fuzzy (object *who, const char *name) 180find_skill_by_name_fuzzy (object *who, const char *name)
180{ 181{
181 if (!name) 182 if (name)
182 return 0;
183
184 for (object *tmp = who->inv; tmp; tmp = tmp->below) 183 for (object *tmp = who->inv; tmp; tmp = tmp->below)
185 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL) 184 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL)
186 && tmp->skill.starts_with (name)) 185 && tmp->skill.starts_with (name))
187 if (object *skop = find_skill_by_name (who, tmp->skill)) 186 if (object *skop = find_skill_by_name (who, tmp->skill))
188 return skop; 187 return skop;
189 188
190 return 0; 189 return 0;
191} 190}
192 191
193/* This returns the skill pointer of the given name (the 192/* This returns the skill pointer of the given name (the
… …
260 */ 259 */
261int 260int
262do_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)
263{ 262{
264 int success = 0, exp = 0; 263 int success = 0, exp = 0;
265 int did_alc = 0;
266 264
267 if (!skill) 265 if (!skill)
268 return 0; 266 return 0;
269 267
270 /* 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
… …
395 case SK_LITERACY: 393 case SK_LITERACY:
396 case SK_WOODSMAN: 394 case SK_WOODSMAN:
397 /* 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.
398 * failing that, we go and identify stuff. 396 * failing that, we go and identify stuff.
399 */ 397 */
398 {
399 bool found_cauldron = false;
400
400 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)
401 { 402 {
402 next = tmp->above; 403 next = tmp->above;
403 404
404 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 405 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
405 { 406 {
407 found_cauldron = true;
408
409 if (tmp->skill != skill->skill)
410 {
411 op->failmsg (format ("You can't use the %s with the %s skill!",
412 query_name (tmp),
413 query_name (skill)));
414 break;
415 }
416
406 attempt_do_alchemy (op, tmp); 417 attempt_do_alchemy (op, tmp, skill);
407 418
408 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 419 if (QUERY_FLAG (tmp, FLAG_APPLIED))
409 esrv_send_inventory (op, tmp); 420 esrv_send_inventory (op, tmp);
410
411 did_alc = 1;
412 } 421 }
413 } 422 }
414 423
415 if (did_alc == 0) 424 if (!found_cauldron)
416 exp = success = skill_ident (op, skill); 425 exp = success = skill_ident (op, skill);
417 426 }
418 break; 427 break;
419 428
420 case SK_DET_MAGIC: 429 case SK_DET_MAGIC:
421 case SK_DET_CURSE: 430 case SK_DET_CURSE:
422 exp = success = skill_ident (op, skill); 431 exp = success = skill_ident (op, skill);
… …
451 case SK_EVOCATION: 460 case SK_EVOCATION:
452 case SK_PYROMANCY: 461 case SK_PYROMANCY:
453 case SK_SUMMONING: 462 case SK_SUMMONING:
454 case SK_CLIMBING: 463 case SK_CLIMBING:
455 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.");
465 break;
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);
456 break; 473 break;
457 474
458 default: 475 default:
459 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);
460 break; 477 break;
… …
705 * 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
706 * crash the server numerous times. 723 * crash the server numerous times.
707 */ 724 */
708 if (num_skills_found >= NUM_SKILLS) 725 if (num_skills_found >= NUM_SKILLS)
709 { 726 {
710 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.");
711 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");
712 break; 729 break;
713 } 730 }
714 } 731 }
715 } 732 }
716 733
717 dynbuf_text msg (4096, 1024); 734 dynbuf_text &msg = msg_dynbuf; msg.clear ();
718 735
719 msg << "T<Player skills:>\n\n"; 736 msg << "T<Player skills:>\n\n";
720 if (num_skills_found > 1) 737 if (num_skills_found > 1)
721 qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp); 738 qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp);
722 739
… …
749 766
750 if (!string) 767 if (!string)
751 return 0; 768 return 0;
752 769
753 for (skop = op->inv; skop; skop = skop->below) 770 for (skop = op->inv; skop; skop = skop->below)
754 { 771 if ((skop->type == SKILL || skop->type == SKILL_TOOL)
755 if (skop->type == SKILL
756 && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
757 && !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);
758 break; 775 break;
759 else if (skop->type == SKILL_TOOL
760 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
761 break;
762 } 776 }
763 777
764 if (!skop) 778 if (!skop)
765 { 779 {
766 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 780 op->failmsg (format ("Unable to find skill %s.", string));
781 return 0;
782 }
783
784 if (!(skill_flags [skop->subtype] & SF_USE))
785 {
786 op->failmsg (format (
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 ));
767 return 0; 792 return 0;
768 } 793 }
769 794
770 len = strlen (skop->skill); 795 len = strlen (skop->skill);
771 796
… …
797} 822}
798 823
799static bool 824static bool
800hth_skill_p (object *skill) 825hth_skill_p (object *skill)
801{ 826{
802 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;
803} 828}
804 829
805/* 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.
806 */ 831 */
807static object * 832static object *
… …
836 * 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.
837 */ 862 */
838 if (player *pl = op->contr) 863 if (player *pl = op->contr)
839 { 864 {
840 if (skill) 865 if (skill)
841 op->change_skill (skill); 866 {
867 if (!op->apply (skill))
868 return 0;
869 }
842 else 870 else
843 { 871 {
844 if (!pl->combat_ob) 872 if (!pl->combat_ob)
845 { 873 {
846 if (QUERY_FLAG (op, FLAG_READY_WEAPON)) 874 if (QUERY_FLAG (op, FLAG_READY_WEAPON))
… …
868 896
869 if (!skill) 897 if (!skill)
870 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!");
871 } 899 }
872 900
873 if (skill) 901 op->apply (skill);
874 {
875 op->change_skill (0);
876 apply_special (op, skill, AP_APPLY);
877 }
878 } 902 }
879 903
880 if (!pl->combat_ob) 904 if (!pl->combat_ob)
881 { 905 {
882 LOG (llevError, "Could not find anything to attack on %s\n", &op->name); 906 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
883 return 0; 907 return 0;
884 } 908 }
885 } 909 }
886 910
887 if (!op->change_weapon (pl->combat_ob)) 911 if (!op->apply (pl->combat_ob))
888 return 0; 912 return 0;
889 } 913 }
890 914
891 /* lose invisiblity/hiding status for running attacks */ 915 /* lose invisiblity/hiding status for running attacks */
892 if (pl->tmp_invis) 916 if (pl->tmp_invis)

Diff Legend

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