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.35 by root, Tue May 1 05:48:20 2007 UTC vs.
Revision 1.102 by root, Sat Apr 23 04:56:57 2011 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,2011 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
… …
51# define def(uc, flags) flags, 51# define def(uc, flags) flags,
52# include "skillinc.h" 52# include "skillinc.h"
53# undef def 53# undef def
54}; 54};
55 55
56vector<object_ptr> skillvec;
57
56static int attack_hth (object *pl, int dir, const char *string, object *skill); 58static int attack_hth (object *pl, int dir, const char *string, object *skill);
57static int attack_melee_weapon (object *op, int dir, const char *string, object *skill); 59static int attack_melee_weapon (object *op, int dir, const char *string, object *skill);
58 60
59/* init_skills basically just sets up the skill_names table 61/* init_skills basically just sets up the skill_names table
60 * above. The index into the array is set up by the 62 * above. The index into the array is set up by the
61 * subtypes. 63 * subtypes.
62 */ 64 */
63void 65void
64init_skills (void) 66init_skills ()
65{ 67{
66 for (archetype *at = first_archetype; at; at = at->next) 68 // nop
67 if (at->clone.type == SKILL) 69}
70
71void
72add_skill_archetype (object *o)
73{
74 assert (("skill name must equal skill skill", o->name == o->skill));
75
76 for (vector<object_ptr>::iterator i = skillvec.begin (); i != skillvec.end (); ++i)
77 if ((*i)->name == o->name)
68 { 78 {
69 if (skill_names[at->clone.subtype]) 79 // replace existing entry
70 LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", 80 SKILL_INDEX (o) = i - skillvec.begin ();
71 at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill); 81 *i = o;
72 else 82 return;
73 skill_names[at->clone.subtype] = at->clone.skill;
74 } 83 }
75 84
76 /* This isn't really an error if there is no skill subtype set, but 85 // add new entry
77 * checking for this may catch some user errors. 86 assert (("only CS_NUM_SKILLS skills supported by client protocol", skillvec.size () < CS_NUM_SKILLS));
78 */ 87 SKILL_INDEX (o) = skillvec.size ();
79 for (int i = 1; i < NUM_SKILLS; i++) 88 skillvec.push_back (o);
80 if (!skill_names[i])
81 LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);
82} 89}
83 90
84/* This function goes through the player inventory and sets 91/* This function goes through the player inventory and sets
85 * up the last_skills[] array in the player object. 92 * up the last_skills[] array in the player object.
86 * the last_skills[] is used to more quickly lookup skills - 93 * the last_skills[] is used to more quickly lookup skills -
87 * mostly used for sending exp. 94 * mostly used for sending exp.
88 */ 95 */
89void 96void
90link_player_skills (object *op) 97player::link_skills ()
91{ 98{
99 for (int i = 0; i < CS_NUM_SKILLS; ++i)
100 last_skill_ob [i] = 0;
101
92 for (object *tmp = op->inv; tmp; tmp = tmp->below) 102 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
93 if (tmp->type == SKILL) 103 if (tmp->type == SKILL)
94 { 104 {
95 /* This is really a warning, hence no else below */ 105 int idx = SKILL_INDEX (tmp);
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 106
100 if (tmp->subtype >= NUM_SKILLS) 107 assert (IN_RANGE_EXC (idx, 0, CS_NUM_SKILLS));
101 LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS); 108
102 else 109 if (last_skill_ob [idx] != tmp)
103 { 110 {
104 op->contr->last_skill_ob[tmp->subtype] = tmp; 111 last_skill_ob [idx] = tmp;
105 op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go 112 if (ns)
113 ns->last_skill_exp [idx] = -1;
106 } 114 }
107 } 115 }
108} 116}
109 117
118static object *
119find_skill (object *who, shstr_cmp name)
120{
121 if (who->chosen_skill
122 && who->chosen_skill->skill == name
123 && who->chosen_skill->type == SKILL)
124 return who->chosen_skill;
125
126 for (object *tmp = who->inv; tmp; tmp = tmp->below)
127 if (tmp->skill == name && tmp->type == SKILL)
128 return splay (tmp);
129
130 return 0;
131}
132
133object *
134player::find_skill (shstr_cmp name) const
135{
136 // might want to use last_skill_obj at one point, or maybe not
137 return ::find_skill (ob, name);
138}
139
110/* This returns the skill pointer of the given name (the 140/* This returns the skill pointer of the given name (the
111 * one that accumlates exp, has the level, etc). 141 * one that accumulates exp, has the level, etc).
112 * 142 *
113 * It is presumed that the player will be needing to actually 143 * 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 144 * use the skill, so thus if use of the skill requires a skill
115 * tool, this code will equip it. 145 * tool, this code will equip it.
116 */ 146 */
117object * 147object *
118find_skill_by_name (object *who, const char *name) 148find_skill_by_name (object *who, shstr_cmp sh)
119{ 149{
120 object *skill = NULL, *skill_tool = NULL, *tmp; 150 object *skill_tool = 0;
121 151
122 if (!name)
123 return NULL;
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 (tmp = who->inv; tmp != NULL; tmp = tmp->below) 152 for (object *tmp = who->inv; tmp; tmp = tmp->below)
153 if (tmp->skill == sh)
130 { 154 {
131 if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name)) 155 if (tmp->type == SKILL && (tmp->flag [FLAG_CAN_USE_SKILL] || tmp->flag [FLAG_APPLIED]))
132 skill = tmp; 156 /* If this is a skill that can be used without applying tool, return it */
133 157 return splay (tmp);
134 /* Try to find appropriate skilltool. If the player has one already 158 /* Try to find appropriate skilltool. If the player has one already
135 * applied, we try to keep using that one. 159 * applied, we try to keep using that one.
136 */ 160 */
137 else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name)) 161 else if (tmp->type == SKILL_TOOL && !skill_tool)
138 {
139 if (QUERY_FLAG (tmp, FLAG_APPLIED))
140 skill_tool = tmp; 162 skill_tool = tmp;
141 else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED))
142 skill_tool = tmp;
143 } 163 }
144 } 164
145 /* If this is a skill that can be used without a tool, return it */ 165 if (!skill_tool)
146 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
147 return skill; 166 return 0;
148 167
149 /* Player has a tool to use the skill. IF not applied, apply it - 168 /* Player has a tool to use the skill. If not applied, apply it -
150 * if not successful, return null. If they do have the skill tool 169 * if not successful, return null. If they do have the skill tool
151 * but not the skill itself, give it to them. 170 * but not the skill itself, give it to them.
152 */ 171 */
153 if (skill_tool) 172 object *skill = who->give_skill (skill_tool->skill);
154 {
155 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
156 {
157 if (apply_special (who, skill_tool, 0))
158 return NULL;
159 }
160 173
161 if (!skill) 174 if (!skill_tool->flag [FLAG_APPLIED])
162 { 175 if (!who->apply (splay (skill_tool)))
163 skill = give_skill_by_name (who, skill_tool->skill);
164 link_player_skills (who);
165 }
166
167 return skill; 176 return 0;
168 }
169 177
178 return splay (skill);
179}
180
181object *
182find_skill_by_name_fuzzy (object *who, const char *name)
183{
184 if (name)
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;
190
170 return NULL; 191 return 0;
171} 192}
172
173 193
174/* This returns the skill pointer of the given name (the 194/* This returns the skill pointer of the given name (the
175 * one that accumlates exp, has the level, etc). 195 * one that accumulates exp, has the level, etc).
176 * 196 *
177 * It is presumed that the player will be needing to actually 197 * It is presumed that the player will be needing to actually
178 * 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
179 * tool, this code will equip it. 199 * tool, this code will equip it.
180 * 200 *
181 * This code is basically the same as find_skill_by_name() above, 201 * This code is basically the same as find_skill_by_name() above,
182 * but instead a skill name, we search by matching number. 202 * but instead a skill name, we search by matching number.
183 * this replaces find_skill. 203 * this replaces find_skill.
204 *
205 * MUST NOT BE USED IN NEW CODE! (schmorp)
184 */ 206 */
185object * 207object *
186find_skill_by_number (object *who, int skillno) 208find_skill_by_number (object *who, int skillno)
187{ 209{
188 object *skill = NULL, *skill_tool = NULL, *tmp;
189
190 if (skillno < 1 || skillno >= NUM_SKILLS)
191 return NULL;
192
193 for (tmp = who->inv; tmp != NULL; tmp = tmp->below) 210 for (object *tmp = who->inv; tmp; tmp = tmp->below)
194 {
195 if (tmp->type == SKILL && tmp->subtype == skillno) 211 if (tmp->type == SKILL && tmp->subtype == skillno)
196 skill = tmp; 212 if (object *skop = find_skill_by_name (who, tmp->skill))
213 return skop;
197 214
198 /* Try to find appropriate skilltool. If the player has one already 215 return 0;
199 * applied, we try to keep using that one. 216}
200 */ 217
201 else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno) 218object *
202 { 219object::give_skill (shstr_cmp name, bool can_use)
203 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 220{
204 skill_tool = tmp; 221 object *skill = find_skill (this, name);
205 else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED)) 222
206 skill_tool = tmp; 223 if (!skill)
207 } 224 skill = give_skill_by_name (this, name);
208 } 225
209 /* If this is a skill that can be used without a tool, return it */ 226 if (skill && can_use)
210 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL)) 227 skill->flag [FLAG_CAN_USE_SKILL] = true;
228
211 return skill; 229 return skill;
212
213 /* Player has a tool to use the skill. IF not applied, apply it -
214 * if not successful, return null. If they do have the skill tool
215 * but not the skill itself, give it to them.
216 */
217 if (skill_tool)
218 {
219 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
220 {
221 if (apply_special (who, skill_tool, 0))
222 return NULL;
223 }
224
225 if (!skill)
226 {
227 skill = give_skill_by_name (who, skill_tool->skill);
228 link_player_skills (who);
229 }
230
231 return skill;
232 }
233
234 return NULL;
235}
236
237/* This changes the objects skill to new_skill.
238 * note that this function doesn't always need to get used -
239 * you can now add skill exp to the player without the chosen_skill being
240 * set. This function is of most interest to players to update
241 * the various range information.
242 * if new_skill is null, this just unapplies the skill.
243 * flag has the current meaning:
244 * 0x1: If set, don't update the range pointer. This is useful when we
245 * need to ready a new skill, but don't want to clobber range.
246 * return 1 on success, 0 on error
247 */
248int
249change_skill (object *who, object *new_skill, int flag)
250{
251 if (who->type != PLAYER)
252 return 0;
253
254 if (!new_skill)
255 {
256 LOG (llevError | logBacktrace, "change_skill called on %s with NULL skill\n",
257 who->debug_desc ());
258 return 0;
259 }
260
261 player *pl = who->contr;
262
263 // move skill to front, so it will be preferred next time
264 new_skill->remove ();
265 who->insert (new_skill);
266
267 if (apply_special (who, new_skill, AP_APPLY))
268 return 0;
269
270 return 1;
271}
272
273/* This function just clears the chosen_skill and range_skill values
274 * in the player.
275 */
276void
277clear_skill (object *who)
278{
279 who->chosen_skill = 0;
280 CLEAR_FLAG (who, FLAG_READY_SKILL);
281
282 if (who->type == PLAYER)
283 {
284 if (who->contr->ranged_ob && who->contr->ranged_ob->type == SKILL)
285 who->contr->ranged_ob = 0;
286 }
287} 230}
288 231
289/* do_skill() - Main skills use function-similar in scope to cast_spell(). 232/* 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. 233 * 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 234 * We require a separate routine outside of fire() so as to allow monsters
… …
298 */ 241 */
299int 242int
300do_skill (object *op, object *part, object *skill, int dir, const char *string) 243do_skill (object *op, object *part, object *skill, int dir, const char *string)
301{ 244{
302 int success = 0, exp = 0; 245 int success = 0, exp = 0;
303 int did_alc = 0;
304 object *tmp, *next;
305 246
306 if (!skill) 247 if (!skill)
307 return 0; 248 return 0;
308 249
309 /* The code below presumes that the skill points to the object that 250 /* 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 252 * 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. 253 * the player doesn't have a bucket for that, create one.
313 */ 254 */
314 if (skill->type != SKILL && op->type == PLAYER) 255 if (skill->type != SKILL && op->type == PLAYER)
315 { 256 {
316 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 257 for (object *tmp = op->inv; tmp; tmp = tmp->below)
317 if (tmp->type == SKILL && tmp->skill == skill->skill) 258 if (tmp->type == SKILL && tmp->skill == skill->skill)
318 break; 259 {
260 skill = tmp;
261 goto found;
262 }
319 263
320 if (!tmp)
321 tmp = give_skill_by_name (op, skill->skill); 264 skill = give_skill_by_name (op, skill->skill);
322 265found: ;
323 skill = tmp;
324 } 266 }
325 267
326 // skill, by_whom, on_which_object, which direction, skill_argument 268 // 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))) 269 if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))
328 return 0; 270 return 0;
… …
333 /* Not 100% sure if this will work with new movement code - 275 /* Not 100% sure if this will work with new movement code -
334 * the levitation skill has move_type for flying, so when 276 * the levitation skill has move_type for flying, so when
335 * equipped, that should transfer to player, when not, 277 * equipped, that should transfer to player, when not,
336 * shouldn't. 278 * shouldn't.
337 */ 279 */
338 if (QUERY_FLAG (skill, FLAG_APPLIED)) 280 if (skill->flag [FLAG_APPLIED])
339 { 281 {
340 CLEAR_FLAG (skill, FLAG_APPLIED); 282 skill->clr_flag (FLAG_APPLIED);
341 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); 283 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
342 } 284 }
343 else 285 else
344 { 286 {
345 SET_FLAG (skill, FLAG_APPLIED); 287 skill->set_flag (FLAG_APPLIED);
346 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!."); 288 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
347 } 289 }
348 290
349 op->update_stats (); 291 op->update_stats ();
350 success = 1; 292 success = 1;
351 break; 293 break;
… …
361 case SK_HIDING: 303 case SK_HIDING:
362 exp = success = hide (op, skill); 304 exp = success = hide (op, skill);
363 break; 305 break;
364 306
365 case SK_JUMPING: 307 case SK_JUMPING:
366 success = jump (op, dir, skill); 308 exp = success = jump (op, dir, skill);
367 break; 309 break;
368 310
369 case SK_INSCRIPTION: 311 case SK_INSCRIPTION:
370 exp = success = write_on_item (op, string, skill); 312 exp = success = write_on_item (op, string, skill);
371 break; 313 break;
… …
433 case SK_LITERACY: 375 case SK_LITERACY:
434 case SK_WOODSMAN: 376 case SK_WOODSMAN:
435 /* first, we try to find a cauldron, and do the alchemy thing. 377 /* first, we try to find a cauldron, and do the alchemy thing.
436 * failing that, we go and identify stuff. 378 * failing that, we go and identify stuff.
437 */ 379 */
380 {
381 bool found_cauldron = false;
382
438 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = next) 383 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
439 { 384 {
440 next = tmp->above; 385 next = tmp->above;
441 386
442 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 387 if (tmp->flag [FLAG_IS_CAULDRON])
443 { 388 {
389 found_cauldron = true;
390
391 if (tmp->skill != skill->skill)
392 {
393 op->failmsgf ("You can't use the %s with the %s skill!",
394 query_name (tmp),
395 query_name (skill));
396 break;
397 }
398
444 attempt_do_alchemy (op, tmp); 399 attempt_do_alchemy (op, tmp, skill);
445 400
446 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 401 if (tmp->flag [FLAG_APPLIED])
447 esrv_send_inventory (op, tmp); 402 esrv_send_inventory (op, tmp);
448
449 did_alc = 1;
450 } 403 }
451 } 404 }
452 405
453 if (did_alc == 0) 406 if (!found_cauldron)
454 exp = success = skill_ident (op, skill); 407 exp = success = skill_ident (op, skill);
455 408 }
456 break; 409 break;
457 410
458 case SK_DET_MAGIC: 411 case SK_DET_MAGIC:
459 case SK_DET_CURSE: 412 case SK_DET_CURSE:
460 exp = success = skill_ident (op, skill); 413 exp = success = skill_ident (op, skill);
… …
491 case SK_SUMMONING: 444 case SK_SUMMONING:
492 case SK_CLIMBING: 445 case SK_CLIMBING:
493 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); 446 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
494 break; 447 break;
495 448
449 case SK_MINING:
450 success = skill_mining (op, part, skill, dir, string);
451 break;
452
496 default: 453 default:
497 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); 454 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
498 break; 455 break;
499 } 456 }
500 457
… …
502 * Monsters have no skill use time because of the random nature in 459 * Monsters have no skill use time because of the random nature in
503 * which use_monster_skill is called already simulates this. 460 * which use_monster_skill is called already simulates this.
504 * If certain skills should take more/less time, that should be 461 * If certain skills should take more/less time, that should be
505 * in the code for the skill itself. 462 * in the code for the skill itself.
506 */ 463 */
507
508 if (op->type == PLAYER) 464 if (op->type == PLAYER)
509 op->speed_left -= 1.0; 465 op->speed_left -= 1.f;
510 466
511 /* this is a good place to add experience for successfull use of skills. 467 /* this is a good place to add experience for successfull use of skills.
512 * Note that add_exp() will figure out player/monster experience 468 * Note that add_exp() will figure out player/monster experience
513 * gain problems. 469 * gain problems.
514 */ 470 */
… …
560 * If an object is not alive and magical we set the base exp higher to 516 * 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 517 * help out exp awards for skill_ident skills. Also, if
562 * an item is type RUNE, we give out exp based on stats.Cha 518 * an item is type RUNE, we give out exp based on stats.Cha
563 * and level (this was the old system) -b.t. 519 * and level (this was the old system) -b.t.
564 */ 520 */
565
566 if (!op) 521 if (!op)
567 { /* no item/creature */ 522 { /* no item/creature */
568 op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty; 523 op_lvl = max (1, who->map->difficulty);
569 op_exp = 0; 524 op_exp = 0;
570 } 525 }
571 else if (op->type == RUNE || op->type == TRAP) 526 else if (op->type == RUNE || op->type == TRAP)
572 { /* all traps. If stats.Cha > 1 we use that 527 { /* all traps. If stats.Cha > 1 we use that
573 * for the amount of experience */ 528 * for the amount of experience */
… …
576 } 531 }
577 else 532 else
578 { /* all other items/living creatures */ 533 { /* all other items/living creatures */
579 op_exp = op->stats.exp; 534 op_exp = op->stats.exp;
580 op_lvl = op->level; 535 op_lvl = op->level;
581 if (!QUERY_FLAG (op, FLAG_ALIVE)) 536 if (!op->flag [FLAG_ALIVE])
582 { /* for ident/make items */ 537 op_lvl += 5 * abs (op->magic); /* for ident/make items */
583 op_lvl += 5 * abs (op->magic);
584 }
585 } 538 }
586 539
587 if (op_lvl < 1) 540 if (op_lvl < 1)
588 op_lvl = 1; 541 op_lvl = 1;
589 542
… …
597 /* if skill really is a skill, then we can look at the skill archetype for 550 /* if skill really is a skill, then we can look at the skill archetype for
598 * bse reward value (exp) and level multiplier factor. 551 * bse reward value (exp) and level multiplier factor.
599 */ 552 */
600 if (skill->type == SKILL) 553 if (skill->type == SKILL)
601 { 554 {
602 base += skill->arch->clone.stats.exp; 555 base += skill->arch->stats.exp;
603 if (settings.simple_exp) 556 if (settings.simple_exp)
604 { 557 {
605 if (skill->arch->clone.level) 558 if (skill->arch->level)
606 lvl_mult = (float) skill->arch->clone.level / 100.0; 559 lvl_mult = (float) skill->arch->level / 100.0;
607 else 560 else
608 lvl_mult = 1.0; /* no adjustment */ 561 lvl_mult = 1.0; /* no adjustment */
609 } 562 }
610 else 563 else
611 { 564 {
612 if (skill->level) 565 if (skill->level)
613 lvl_mult = ((float) skill->arch->clone.level * (float) op_lvl) / ((float) skill->level * 100.0); 566 lvl_mult = ((float) skill->arch->level * (float) op_lvl) / ((float) skill->level * 100.0);
614 else 567 else
615 lvl_mult = 1.0; 568 lvl_mult = 1.0;
616 } 569 }
617 } 570 }
618 else 571 else
619 { 572 {
620 /* Don't divide by zero here! */ 573 /* Don't divide by zero here! */
621 lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1); 574 lvl_mult = (float) op_lvl / (float) max (1, skill->level);
622 } 575 }
623 } 576 }
624 577
625 /* assemble the exp total, and return value */ 578 /* assemble the exp total, and return value */
626 579
… …
643 * player learns the skill, 2 otherwise. 596 * player learns the skill, 2 otherwise.
644 */ 597 */
645int 598int
646learn_skill (object *pl, object *scroll) 599learn_skill (object *pl, object *scroll)
647{ 600{
648 object *tmp;
649
650 if (!scroll->skill) 601 if (!scroll->skill)
651 { 602 {
652 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name); 603 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);
653 return 2; 604 return 2;
654 } 605 }
655 606
656 /* can't use find_skill_by_name because we want skills the player knows 607 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 608
664 /* player already knows it */ 609 /* player already knows it */
665 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 610 if (tmp && tmp->flag [FLAG_CAN_USE_SKILL])
666 return 0; 611 return 0;
667 612
668 /* now a random change to learn, based on player Int. 613 /* now a random change to learn, based on player Int.
669 * give bonus based on level - otherwise stupid characters 614 * give bonus based on level - otherwise stupid characters
670 * might never be able to learn anything. 615 * might never be able to learn anything.
… …
679 { 624 {
680 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); 625 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);
681 return 2; 626 return 2;
682 } 627 }
683 628
684 SET_FLAG (tmp, FLAG_CAN_USE_SKILL); 629 tmp->set_flag (FLAG_CAN_USE_SKILL);
685 link_player_skills (pl); 630
686 return 1; 631 return 1;
687} 632}
688 633
689/* Gives a percentage clipped to 0% -> 100% of a/b. */ 634/* Gives a percentage clipped to 0% -> 100% of a/b. */
690
691/* Probably belongs in some global utils-type file? */ 635/* Probably belongs in some global utils-type file? */
692static int 636static int
693clipped_percent (sint64 a, sint64 b) 637clipped_percent (sint64 a, sint64 b)
694{ 638{
695 int rv; 639 int rv;
… …
703 return 0; 647 return 0;
704 else if (rv > 100) 648 else if (rv > 100)
705 return 100; 649 return 100;
706 650
707 return rv; 651 return rv;
652}
653
654static int
655cmp_skillp (const void *sk1, const void *sk2)
656{
657 return strcmp (&((*(const object **) sk1)->name),
658 &((*(const object **) sk2)->name));
708} 659}
709 660
710/* show_skills() - Meant to allow players to examine 661/* show_skills() - Meant to allow players to examine
711 * their current skill list. 662 * their current skill list.
712 * This shows the amount of exp they have in the skills. 663 * This shows the amount of exp they have in the skills.
… …
715 * Note this function is a bit more complicated becauase we 666 * Note this function is a bit more complicated becauase we
716 * we want ot sort the skills before printing them. If we 667 * we want ot sort the skills before printing them. If we
717 * just dumped this as we found it, this would be a bit 668 * just dumped this as we found it, this would be a bit
718 * simpler. 669 * simpler.
719 */ 670 */
720
721void 671void
722show_skills (object *op, const char *search) 672show_skills (object *pl, const char *search)
723{ 673{
724 object *tmp = NULL;
725 char buf[MAX_BUF];
726 const char *cp; 674 const char *cp;
727 int i, num_skills_found = 0; 675 int i, num_skills_found = 0;
728 static const char *const periods = "........................................"; 676 object *skills[CS_NUM_SKILLS];
677 object *op = pl->contr->ob;
729 678
730 /* Need to have a pointer and use strdup for qsort to work properly */ 679 /* find the skills */
731 char skills[NUM_SKILLS][MAX_BUF];
732
733
734 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 680 for (object *tmp = op->inv; tmp; tmp = tmp->below)
735 { 681 {
736 if (tmp->type == SKILL) 682 if (tmp->type == SKILL)
737 { 683 {
738 if (search && strstr (tmp->name, search) == NULL) 684 if (search && !tmp->name.contains (search))
739 continue; 685 continue;
740 /* Basically want to fill this out to 40 spaces with periods */
741 sprintf (buf, "%s%s", &tmp->name, periods);
742 buf[40] = 0;
743 686
744 if (settings.permanent_exp_ratio) 687 skills[num_skills_found++] = tmp;
745 { 688
746 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
747 buf, tmp->level, tmp->stats.exp,
748 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
749 }
750 else
751 {
752 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
753 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
754 }
755 /* 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
756 * it sometimes happens (maybe a leftover from bugier earlier code 690 * it sometimes happens (maybe a leftover from bugier earlier code
757 * and those character are still about). In any case, lets handle 691 * and those character are still about). In any case, lets handle
758 * 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
759 * crash the server numerous times. 693 * crash the server numerous times.
760 */ 694 */
761 if (num_skills_found >= NUM_SKILLS) 695 if (num_skills_found >= CS_NUM_SKILLS)
762 { 696 {
763 new_draw_info (NDI_RED, 0, op, "Your character has too many skills."); 697 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Your character has too many skills.");
764 new_draw_info (NDI_RED, 0, op, "Something isn't right - contact the server admin"); 698 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Something isn't right - contact the server admin");
765 break; 699 break;
766 } 700 }
767 } 701 }
768 } 702 }
769 703
770 clear_win_info (op); 704 dynbuf_text &msg = msg_dynbuf; msg.clear ();
771 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:"); 705
706 msg << "T<Player skills:>\n\n";
772 if (num_skills_found > 1) 707 if (num_skills_found > 1)
773 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) std::strcmp); 708 qsort (skills, num_skills_found, sizeof (skills [0]), cmp_skillp);
774 709
710 char buf[31]; /* +1 for '\0' */
711 const char *const periods = ".............................."; // 30
712
775 for (i = 0; i < num_skills_found; i++) 713 for (i = 0; i < num_skills_found; i++) {
776 new_draw_info (NDI_UNIQUE, 0, op, skills[i]); 714 object *tmp = skills[i];
777 715
778 new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5); 716 /* Basically want to fill this out to 30 spaces with periods */
717 snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
718
719 msg << " C<";
720
721 if (settings.permanent_exp_ratio)
722 msg.printf ("%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
723 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul),
724 clipped_percent (tmp->perm_exp, tmp->stats.exp));
725 else
726 msg.printf ("%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
727 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
728
729 msg << ">\n";
730 }
731
732 msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r";
779 733
780 cp = determine_god (op); 734 cp = determine_god (op);
781 new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time"); 735 msg << "You worship " << (cp ? cp : "no god at current time") << ".\r";
782 736
783 new_draw_info_format (NDI_UNIQUE, 0, op, "Your equipped item power is %d out of %d\n", 737 msg << "Your equipped item power is " << (int)op->contr->item_power
784 op->contr->item_power, (int) (op->level * settings.item_power_factor)); 738 << " out of " << int (op->level * settings.item_power_factor)
739 << ".\n";
740
741 pl->contr->infobox (MSG_CHANNEL ("skills"), msg);
785} 742}
786 743
787/* use_skill() - similar to invoke command, it executes the skill in the 744/* use_skill() - similar to invoke command, it executes the skill in the
788 * direction that the user is facing. Returns false if we are unable to 745 * direction that the user is facing. Returns false if we are unable to
789 * change to the requested skill, or were unable to use the skill properly. 746 * change to the requested skill, or were unable to use the skill properly.
790 * This is tricky because skills can have spaces. We basically roll 747 * This is tricky because skills can have spaces. We basically roll
791 * our own find_skill_by_name so we can try to do better string matching. 748 * our own find_skill_by_name so we can try to do better string matching.
792 */ 749 */
793
794int 750int
795use_skill (object *op, const char *string) 751use_skill (object *op, const char *string)
796{ 752{
797 object *skop; 753 object *skop;
798 size_t len; 754 size_t len;
799 755
800 if (!string) 756 if (!string)
801 return 0; 757 return 0;
802 758
803 for (skop = op->inv; skop != NULL; skop = skop->below) 759 for (skop = op->inv; skop; skop = skop->below)
804 { 760 if ((skop->type == SKILL || skop->type == SKILL_TOOL)
805 if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) &&
806 !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 761 && !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill))))
762 {
763 skop = find_skill_by_name (op, skop->skill);
807 break; 764 break;
808 else if (skop->type == SKILL_TOOL && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
809 break;
810 } 765 }
766
811 if (!skop) 767 if (!skop)
812 { 768 {
813 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 769 op->failmsgf ("Unable to find skill %s.", string);
770 return 0;
771 }
772
773 if (!(skill_flags [skop->subtype] & SF_USE))
774 {
775 op->failmsgf (
776 "You feel as if you wanted to do something funny, but you can't remember what. "
777 "H<The %s skill cannot be C<use_skill>'ed - maybe you need to C<ready_skill> it, "
778 "use it with some item, or it's always active.>",
779 &skop->skill
780 );
814 return 0; 781 return 0;
815 } 782 }
816 783
817 len = strlen (skop->skill); 784 len = strlen (skop->skill);
818 785
… …
820 * options given to the skill. Its pretty simple - if there 787 * options given to the skill. Its pretty simple - if there
821 * are extra parameters (as deteremined by string length), we 788 * are extra parameters (as deteremined by string length), we
822 * want to skip over any leading spaces. 789 * want to skip over any leading spaces.
823 */ 790 */
824 if (len >= strlen (string)) 791 if (len >= strlen (string))
825 {
826 string = NULL; 792 string = NULL;
827 }
828 else 793 else
829 { 794 {
830 string += len; 795 string += len;
831 while (*string == 0x20) 796 while (*string == 0x20)
832 string++; 797 string++;
798
833 if (strlen (string) == 0) 799 if (strlen (string) == 0)
834 string = NULL; 800 string = NULL;
835 } 801 }
836 802
837#ifdef SKILL_UTIL_DEBUG 803#ifdef SKILL_UTIL_DEBUG
838 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none"); 804 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");
839#endif 805#endif
840 806
841 /* Change to the new skill, then execute it. */
842 if (do_skill (op, op, skop, op->facing, string)) 807 if (do_skill (op, op, skop, op->facing, string))
843 return 1; 808 return 1;
844 809
845 return 0; 810 return 0;
846} 811}
847 812
848static bool 813static bool
849hth_skill_p (object *skill) 814hth_skill_p (object *skill)
850{ 815{
851 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT; 816 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_ITEM)) == SF_COMBAT;
852} 817}
853 818
854/* This finds the first unarmed skill the player has, and returns it. 819/* This finds the first unarmed skill the player has, and returns it.
855 */ 820 */
856static object * 821static object *
857find_player_hth_skill (object *op) 822find_player_hth_skill (object *op)
858{ 823{
859 for (object *tmp = op->inv; tmp; tmp = tmp->below) 824 for (object *tmp = op->inv; tmp; tmp = tmp->below)
860 if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp)) 825 if (tmp->type == SKILL && tmp->flag [FLAG_CAN_USE_SKILL] && hth_skill_p (tmp))
861 return tmp; 826 return tmp;
862 827
863 return 0; 828 return 0;
864} 829}
865 830
… …
884 * the caller should have set it appropriately). We still want to pass 849 * the caller should have set it appropriately). We still want to pass
885 * through that code if skill is set to change to the skill. 850 * through that code if skill is set to change to the skill.
886 */ 851 */
887 if (player *pl = op->contr) 852 if (player *pl = op->contr)
888 { 853 {
889 if (!pl->combat_ob) 854 if (skill)
890 { 855 {
891 if (QUERY_FLAG (op, FLAG_READY_WEAPON)) 856 if (!op->apply (skill))
857 return 0;
858 }
859 else
860 {
861 if (!pl->combat_ob)
892 { 862 {
893 for (tmp = op->inv; tmp; tmp = tmp->below) 863 if (op->flag [FLAG_READY_WEAPON])
894 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
895 break;
896
897 if (!tmp)
898 { 864 {
865 for (tmp = op->inv; tmp; tmp = tmp->below)
866 if (tmp->type == WEAPON && tmp->flag [FLAG_APPLIED])
867 break;
868
869 if (!tmp)
899 LOG (llevError, "Could not find applied weapon on %s\n", &op->name); 870 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
900 return 0; 871
872 pl->combat_ob = tmp;
901 } 873 }
902 874
903 change_skill (op, find_skill_by_name (op, tmp->skill), 1); 875 if (!pl->combat_ob)
904 }
905 else
906 {
907 if (!skill)
908 { 876 {
909 /* See if the players chosen skill is a combat skill, and use 877 /* See if the players chosen skill is a combat skill, and use
910 * it if appropriate. 878 * it if appropriate.
911 */ 879 */
912 if (op->chosen_skill && hth_skill_p (op->chosen_skill)) 880 if (op->chosen_skill && hth_skill_p (op->chosen_skill))
… …
914 else 882 else
915 { 883 {
916 skill = find_player_hth_skill (op); 884 skill = find_player_hth_skill (op);
917 885
918 if (!skill) 886 if (!skill)
919 {
920 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); 887 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
921 return 0;
922 }
923 } 888 }
889
890 op->apply (skill);
924 } 891 }
925 892
926 /* now try to ready the new skill */ 893 if (!pl->combat_ob)
927 if (!change_skill (op, skill, 0)) 894 {
928 { /* oh oh, trouble! */ 895 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
929 new_draw_info_format (NDI_UNIQUE, 0, tmp, "Couldn't change to skill %s", &skill->name);
930 return 0; 896 return 0;
931 } 897 }
932 } 898 }
933 899
934 if (!pl->combat_ob) 900 if (!op->apply (pl->combat_ob))
901 return 0;
902
903 if (!op->chosen_skill)
935 { 904 {
936 LOG (llevError, "Could not find anything to attack on %s\n", &op->name); 905 LOG (llevError, "do_skill_attack: weapon has no skill (%s)", pl->combat_ob->debug_desc ());
906 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "You hit a bug in the server, please contact an admin!");
937 return 0; 907 return 0;
938 } 908 }
939 } 909 }
940 910
941 if (op->current_weapon != pl->combat_ob)
942 {
943 op->current_weapon = pl->combat_ob;
944 op->update_stats ();
945 }
946
947 /* lose invisiblity/hiding status for running attacks */ 911 /* lose invisiblity/hiding status for running attacks */
948
949 if (pl->tmp_invis) 912 if (pl->tmp_invis)
950 { 913 {
951 pl->tmp_invis = 0; 914 pl->tmp_invis = 0;
952 op->invisible = 0; 915 op->invisible = 0;
953 op->hide = 0; 916 op->flag [FLAG_HIDDEN] = 0;
954 update_object (op, UP_OBJ_CHANGE); 917 update_object (op, UP_OBJ_CHANGE);
955 } 918 }
956 } 919 }
957 920
958 int success = attack_ob (tmp, op); 921 int success = attack_ob (tmp, op);
959 922
960 /* print appropriate messages to the player */ 923 /* print appropriate messages to the player */
961 924
962 if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) 925 if (success && string && tmp && !tmp->flag [FLAG_FREED])
963 { 926 {
964 if (op->type == PLAYER) 927 if (op->type == PLAYER)
965 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); 928 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
966 else if (tmp->type == PLAYER) 929 else if (tmp->type == PLAYER)
967 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); 930 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
… …
970 return success; 933 return success;
971} 934}
972 935
973/* skill_attack() - Core routine for use when we attack using a skills 936/* skill_attack() - Core routine for use when we attack using a skills
974 * system. In essence, this code handles 937 * system. In essence, this code handles
975 * all skill-based attacks, ie hth, missile and melee weapons should be 938 * all skill-based attacks, i.e. hth, missile and melee weapons should be
976 * treated here. If an opponent is already supplied by move_player(), 939 * treated here. If an opponent is already supplied by move_player(),
977 * we move right onto do_skill_attack(), otherwise we find if an 940 * we move right onto do_skill_attack(), otherwise we find if an
978 * appropriate opponent exists. 941 * appropriate opponent exists.
979 * 942 *
980 * This is called by move_player() and attack_hth() 943 * This is called by move_player() and attack_hth()
… …
1010 /* space must be blocked for there to be anything interesting to do */ 973 /* space must be blocked for there to be anything interesting to do */
1011 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) 974 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))
1012 return 0; 975 return 0;
1013 976
1014 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above) 977 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above)
1015 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) 978 if ((tmp->flag [FLAG_ALIVE] && tmp->stats.hp >= 0) || tmp->flag [FLAG_CAN_ROLL] || tmp->type == LOCKED_DOOR)
1016 { 979 {
1017 /* Don't attack party members */ 980 /* Don't attack party members */
1018 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) 981 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
1019 return 0; 982 return 0;
1020 983
… …
1031 } 994 }
1032 995
1033 return do_skill_attack (tmp, pl, string, skill); 996 return do_skill_attack (tmp, pl, string, skill);
1034} 997}
1035 998
1036
1037/* attack_hth() - this handles all hand-to-hand attacks -b.t. */ 999/* attack_hth() - this handles all hand-to-hand attacks -b.t. */
1038 1000
1039/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first 1001/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first
1040 * (attack_hth) we check for weapon use, etc in the second (the new 1002 * (attack_hth) we check for weapon use, etc in the second (the new
1041 * function skill_attack() we actually attack. 1003 * function skill_attack() we actually attack.
1042 */ 1004 */
1043
1044static int 1005static int
1045attack_hth (object *pl, int dir, const char *string, object *skill) 1006attack_hth (object *pl, int dir, const char *string, object *skill)
1046{ 1007{
1047 object *enemy = NULL, *weapon; 1008 object *enemy = NULL, *weapon;
1048 1009
1049 if (QUERY_FLAG (pl, FLAG_READY_WEAPON)) 1010 if (pl->flag [FLAG_READY_WEAPON])
1050 for (weapon = pl->inv; weapon; weapon = weapon->below) 1011 for (weapon = pl->inv; weapon; weapon = weapon->below)
1051 { 1012 {
1052 if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED)) 1013 if (weapon->type == WEAPON && weapon->flag [FLAG_APPLIED])
1053 { 1014 {
1054 CLEAR_FLAG (weapon, FLAG_APPLIED); 1015 weapon->clr_flag (FLAG_APPLIED);
1055 CLEAR_FLAG (pl, FLAG_READY_WEAPON); 1016 pl->clr_flag (FLAG_READY_WEAPON);
1056 pl->update_stats (); 1017 pl->update_stats ();
1057 if (pl->type == PLAYER) 1018 if (pl->type == PLAYER)
1058 { 1019 {
1059 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); 1020 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
1060 esrv_update_item (UPD_FLAGS, pl, weapon); 1021 esrv_update_item (UPD_FLAGS, pl, weapon);
1061 } 1022 }
1023
1062 break; 1024 break;
1063 } 1025 }
1064 } 1026 }
1065 1027
1066 return skill_attack (enemy, pl, dir, string, skill); 1028 return skill_attack (enemy, pl, dir, string, skill);
… …
1077 */ 1039 */
1078static int 1040static int
1079attack_melee_weapon (object *op, int dir, const char *string, object *skill) 1041attack_melee_weapon (object *op, int dir, const char *string, object *skill)
1080{ 1042{
1081 1043
1082 if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) 1044 if (!op->flag [FLAG_READY_WEAPON])
1083 { 1045 {
1084 if (op->type == PLAYER) 1046 if (op->type == PLAYER)
1085 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); 1047 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");
1086 1048
1087 return 0; 1049 return 0;
1088 } 1050 }
1089 1051
1090 return skill_attack (NULL, op, dir, string, skill); 1052 return skill_attack (NULL, op, dir, string, skill);
1091
1092} 1053}
1054

Diff Legend

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