1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | |
3 | * |
|
|
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | Copryight (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | |
7 | * |
7 | This program is free software; you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
9 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | (at your option) any later version. |
11 | * (at your option) any later version. |
11 | |
12 | * |
12 | 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, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
16 | |
17 | * |
17 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
18 | along with this program; if not, write to the Free Software |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * |
20 | |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
21 | The author can be reached via e-mail to <crossfire@schmorp.de> |
|
|
22 | */ |
22 | */ |
23 | |
23 | |
24 | /* Created July 95 to separate skill utilities from actual skills -b.t. */ |
24 | /* Created July 95 to separate skill utilities from actual skills -b.t. */ |
25 | |
25 | |
26 | /* Reconfigured skills code to allow linking of skills to experience |
26 | /* Reconfigured skills code to allow linking of skills to experience |
27 | * categories. This is done solely through the init_new_exp_system() fctn. |
27 | * categories. This is done solely through the init_new_exp_system() fctn. |
… | |
… | |
39 | |
39 | |
40 | /* #define SKILL_UTIL_DEBUG */ |
40 | /* #define SKILL_UTIL_DEBUG */ |
41 | |
41 | |
42 | #include <global.h> |
42 | #include <global.h> |
43 | #include <object.h> |
43 | #include <object.h> |
44 | #ifndef __CEXTRACT__ |
|
|
45 | # include <sproto.h> |
44 | #include <sproto.h> |
46 | #endif |
|
|
47 | #include <living.h> /* for defs of STR,CON,DEX,etc. -b.t. */ |
45 | #include <living.h> /* for defs of STR,CON,DEX,etc. -b.t. */ |
48 | #include <spells.h> |
46 | #include <spells.h> |
49 | |
47 | |
50 | /* Table of unarmed attack skills. Terminated by -1. This |
48 | const uint8_t skill_flags[NUM_SKILLS] = { |
51 | * is also the list that we should try to use skills when |
49 | 0, // SK_NONE |
52 | * automatically applying one for the player. |
50 | # define def(uc, flags) flags, |
53 | */ |
51 | # include "skillinc.h" |
54 | static uint8 unarmed_skills[] = { |
52 | # undef def |
55 | SK_KARATE, |
|
|
56 | SK_CLAWING, |
|
|
57 | SK_FLAME_TOUCH, |
|
|
58 | SK_SPARK_TOUCH, |
|
|
59 | SK_SHIVER, |
|
|
60 | SK_ACID_SPLASH, |
|
|
61 | SK_POISON_NAIL, |
|
|
62 | SK_PUNCHING, |
|
|
63 | (uint8)-1 |
|
|
64 | }; |
53 | }; |
65 | |
54 | |
66 | static int attack_hth (object *pl, int dir, const char *string, object *skill); |
55 | static int attack_hth (object *pl, int dir, const char *string, object *skill); |
67 | static int attack_melee_weapon (object *op, int dir, const char *string, object *skill); |
56 | static int attack_melee_weapon (object *op, int dir, const char *string, object *skill); |
68 | |
57 | |
… | |
… | |
71 | * subtypes. |
60 | * subtypes. |
72 | */ |
61 | */ |
73 | void |
62 | void |
74 | init_skills (void) |
63 | init_skills (void) |
75 | { |
64 | { |
76 | int i; |
65 | for_all_archetypes (at) |
77 | archetype *at; |
|
|
78 | |
|
|
79 | for (at = first_archetype; at != NULL; at = at->next) |
|
|
80 | if (at->clone.type == SKILL) |
66 | if (at->type == SKILL) |
81 | { |
67 | { |
82 | if (skill_names[at->clone.subtype] != NULL) |
68 | if (skill_names[at->subtype]) |
83 | LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", |
69 | LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", |
84 | at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill); |
70 | at->subtype, &skill_names[at->subtype], &at->skill); |
85 | else |
71 | else |
86 | skill_names[at->clone.subtype] = at->clone.skill; |
72 | skill_names[at->subtype] = at->skill; |
87 | } |
73 | } |
88 | |
74 | |
89 | /* This isn't really an error if there is no skill subtype set, but |
75 | /* This isn't really an error if there is no skill subtype set, but |
90 | * checking for this may catch some user errors. |
76 | * checking for this may catch some user errors. |
91 | */ |
77 | */ |
92 | for (i = 1; i < NUM_SKILLS; i++) |
78 | for (int i = 1; i < NUM_SKILLS; i++) |
93 | { |
|
|
94 | if (!skill_names[i]) |
79 | if (!skill_names[i]) |
95 | LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i); |
80 | LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i); |
96 | } |
|
|
97 | } |
81 | } |
98 | |
82 | |
99 | /* This function goes through the player inventory and sets |
83 | /* This function goes through the player inventory and sets |
100 | * up the last_skills[] array in the player object. |
84 | * up the last_skills[] array in the player object. |
101 | * the last_skills[] is used to more quickly lookup skills - |
85 | * the last_skills[] is used to more quickly lookup skills - |
102 | * mostly used for sending exp. |
86 | * mostly used for sending exp. |
103 | */ |
87 | */ |
104 | void |
88 | void |
105 | link_player_skills (object *op) |
89 | player::link_skills () |
106 | { |
90 | { |
107 | object *tmp; |
91 | for (int i = 0; i < NUM_SKILLS; ++i) |
|
|
92 | last_skill_ob [i] = 0; |
108 | |
93 | |
109 | for (tmp = op->inv; tmp; tmp = tmp->below) |
94 | for (object *tmp = ob->inv; tmp; tmp = tmp->below) |
110 | { |
|
|
111 | if (tmp->type == SKILL) |
95 | if (tmp->type == SKILL) |
|
|
96 | { |
|
|
97 | assert (IN_RANGE_EXC (tmp->subtype, 0, NUM_SKILLS)); |
|
|
98 | |
|
|
99 | if (last_skill_ob [tmp->subtype] != tmp) |
112 | { |
100 | { |
113 | /* This is really a warning, hence no else below */ |
101 | /* This is really a warning, hence no else below */ |
114 | if (op->contr->last_skill_ob[tmp->subtype] && op->contr->last_skill_ob[tmp->subtype] != tmp) |
102 | if (last_skill_ob [tmp->subtype]) |
115 | { |
|
|
116 | LOG (llevError, "Multiple skills with the same subtype? %s, %s\n", |
103 | LOG (llevError, "Multiple skills with the same subtype? %s, %s\n", |
117 | &op->contr->last_skill_ob[tmp->subtype]->skill, &tmp->skill); |
104 | &last_skill_ob [tmp->subtype]->skill, &tmp->skill); |
|
|
105 | |
|
|
106 | last_skill_ob [tmp->subtype] = tmp; |
|
|
107 | if (ns) |
|
|
108 | ns->last_skill_exp [tmp->subtype] = -1; |
118 | } |
109 | } |
119 | if (tmp->subtype >= NUM_SKILLS) |
|
|
120 | { |
|
|
121 | LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS); |
|
|
122 | } |
|
|
123 | else |
|
|
124 | { |
|
|
125 | op->contr->last_skill_ob[tmp->subtype] = tmp; |
|
|
126 | op->contr->last_skill_exp[tmp->subtype] = -1; |
|
|
127 | } |
|
|
128 | } |
110 | } |
129 | } |
111 | } |
|
|
112 | |
|
|
113 | static object * |
|
|
114 | find_skill (object *who, shstr_cmp name) |
|
|
115 | { |
|
|
116 | if (who->chosen_skill |
|
|
117 | && who->chosen_skill->skill == name |
|
|
118 | && who->chosen_skill->type == SKILL) |
|
|
119 | return who->chosen_skill; |
|
|
120 | |
|
|
121 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
|
|
122 | if (tmp->skill == name && tmp->type == SKILL) |
|
|
123 | return splay (tmp); |
|
|
124 | |
|
|
125 | return 0; |
|
|
126 | } |
|
|
127 | |
|
|
128 | object *player::find_skill (shstr_cmp name) const |
|
|
129 | { |
|
|
130 | // might want to use last_skill_obj at one point, or maybe not |
|
|
131 | return ::find_skill (ob, name); |
130 | } |
132 | } |
131 | |
133 | |
132 | /* This returns the skill pointer of the given name (the |
134 | /* This returns the skill pointer of the given name (the |
133 | * one that accumlates exp, has the level, etc). |
135 | * one that accumulates exp, has the level, etc). |
134 | * |
136 | * |
135 | * It is presumed that the player will be needing to actually |
137 | * It is presumed that the player will be needing to actually |
136 | * use the skill, so thus if use of the skill requires a skill |
138 | * use the skill, so thus if use of the skill requires a skill |
137 | * tool, this code will equip it. |
139 | * tool, this code will equip it. |
138 | */ |
140 | */ |
139 | object * |
141 | object * |
140 | find_skill_by_name (object *who, const char *name) |
142 | find_skill_by_name (object *who, shstr_cmp sh) |
141 | { |
143 | { |
142 | object *skill = NULL, *skill_tool = NULL, *tmp; |
144 | object *skill_tool = 0; |
143 | |
145 | |
144 | if (!name) |
|
|
145 | return NULL; |
|
|
146 | |
|
|
147 | /* We make sure the length of the string in the object is greater |
|
|
148 | * in length than the passed string. Eg, if we have a skill called |
|
|
149 | * 'hi', we don't want to match if the user passed 'high' |
|
|
150 | */ |
|
|
151 | for (tmp = who->inv; tmp != NULL; tmp = tmp->below) |
146 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
|
|
147 | if (tmp->skill == sh) |
152 | { |
148 | { |
153 | if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name)) |
149 | if (tmp->type == SKILL && (tmp->flag [FLAG_CAN_USE_SKILL] || tmp->flag [FLAG_APPLIED])) |
154 | skill = tmp; |
150 | /* If this is a skill that can be used without applying tool, return it */ |
155 | |
151 | return splay (tmp); |
156 | /* Try to find appropriate skilltool. If the player has one already |
152 | /* Try to find appropriate skilltool. If the player has one already |
157 | * applied, we try to keep using that one. |
153 | * applied, we try to keep using that one. |
158 | */ |
154 | */ |
159 | else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name)) |
155 | else if (tmp->type == SKILL_TOOL && !skill_tool) |
160 | { |
|
|
161 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
|
|
162 | skill_tool = tmp; |
156 | skill_tool = tmp; |
163 | else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED)) |
|
|
164 | skill_tool = tmp; |
|
|
165 | } |
157 | } |
166 | } |
158 | |
167 | /* If this is a skill that can be used without a tool, return it */ |
159 | if (!skill_tool) |
168 | if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL)) |
|
|
169 | return skill; |
160 | return 0; |
170 | |
161 | |
171 | /* Player has a tool to use the skill. IF not applied, apply it - |
162 | /* Player has a tool to use the skill. If not applied, apply it - |
172 | * if not successful, return null. If they do have the skill tool |
163 | * if not successful, return null. If they do have the skill tool |
173 | * but not the skill itself, give it to them. |
164 | * but not the skill itself, give it to them. |
174 | */ |
165 | */ |
175 | if (skill_tool) |
166 | object *skill = find_skill (who, skill_tool->skill); |
176 | { |
167 | |
177 | if (!QUERY_FLAG (skill_tool, FLAG_APPLIED)) |
|
|
178 | { |
|
|
179 | if (apply_special (who, skill_tool, 0)) |
|
|
180 | return NULL; |
|
|
181 | } |
|
|
182 | if (!skill) |
168 | if (!skill) |
183 | { |
|
|
184 | skill = give_skill_by_name (who, skill_tool->skill); |
169 | skill = give_skill_by_name (who, skill_tool->skill); |
185 | link_player_skills (who); |
170 | |
186 | } |
171 | if (!skill_tool->flag [FLAG_APPLIED]) |
|
|
172 | if (apply_special (who, splay (skill_tool), AP_APPLY | AP_NO_READY)) |
187 | return skill; |
173 | return 0; |
188 | } |
174 | |
|
|
175 | return splay (skill); |
|
|
176 | } |
|
|
177 | |
|
|
178 | object * |
|
|
179 | find_skill_by_name_fuzzy (object *who, const char *name) |
|
|
180 | { |
|
|
181 | if (!name) |
|
|
182 | return 0; |
|
|
183 | |
|
|
184 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
|
|
185 | if ((tmp->type == SKILL || tmp->type == SKILL_TOOL) |
|
|
186 | && tmp->skill.starts_with (name)) |
|
|
187 | if (object *skop = find_skill_by_name (who, tmp->skill)) |
|
|
188 | return skop; |
|
|
189 | |
189 | return NULL; |
190 | return 0; |
190 | } |
191 | } |
191 | |
|
|
192 | |
192 | |
193 | /* This returns the skill pointer of the given name (the |
193 | /* This returns the skill pointer of the given name (the |
194 | * one that accumlates exp, has the level, etc). |
194 | * one that accumulates exp, has the level, etc). |
195 | * |
195 | * |
196 | * It is presumed that the player will be needing to actually |
196 | * It is presumed that the player will be needing to actually |
197 | * use the skill, so thus if use of the skill requires a skill |
197 | * use the skill, so thus if use of the skill requires a skill |
198 | * tool, this code will equip it. |
198 | * tool, this code will equip it. |
199 | * |
199 | * |
… | |
… | |
202 | * this replaces find_skill. |
202 | * this replaces find_skill. |
203 | */ |
203 | */ |
204 | object * |
204 | object * |
205 | find_skill_by_number (object *who, int skillno) |
205 | find_skill_by_number (object *who, int skillno) |
206 | { |
206 | { |
207 | object *skill = NULL, *skill_tool = NULL, *tmp; |
|
|
208 | |
|
|
209 | if (skillno < 1 || skillno >= NUM_SKILLS) |
|
|
210 | return NULL; |
|
|
211 | |
|
|
212 | for (tmp = who->inv; tmp != NULL; tmp = tmp->below) |
207 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
213 | { |
|
|
214 | if (tmp->type == SKILL && tmp->subtype == skillno) |
208 | if (tmp->type == SKILL && tmp->subtype == skillno) |
215 | skill = tmp; |
209 | if (object *skop = find_skill_by_name (who, tmp->skill)) |
216 | |
|
|
217 | /* Try to find appropriate skilltool. If the player has one already |
|
|
218 | * applied, we try to keep using that one. |
|
|
219 | */ |
|
|
220 | else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno) |
|
|
221 | { |
|
|
222 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
|
|
223 | skill_tool = tmp; |
|
|
224 | else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED)) |
|
|
225 | skill_tool = tmp; |
|
|
226 | } |
|
|
227 | } |
|
|
228 | /* If this is a skill that can be used without a tool, return it */ |
|
|
229 | if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL)) |
|
|
230 | return skill; |
|
|
231 | |
|
|
232 | /* Player has a tool to use the skill. IF not applied, apply it - |
|
|
233 | * if not successful, return null. If they do have the skill tool |
|
|
234 | * but not the skill itself, give it to them. |
|
|
235 | */ |
|
|
236 | if (skill_tool) |
|
|
237 | { |
|
|
238 | if (!QUERY_FLAG (skill_tool, FLAG_APPLIED)) |
|
|
239 | { |
|
|
240 | if (apply_special (who, skill_tool, 0)) |
|
|
241 | return NULL; |
|
|
242 | } |
|
|
243 | |
|
|
244 | if (!skill) |
|
|
245 | { |
|
|
246 | skill = give_skill_by_name (who, skill_tool->skill); |
|
|
247 | link_player_skills (who); |
|
|
248 | } |
|
|
249 | |
|
|
250 | return skill; |
210 | return skop; |
251 | } |
|
|
252 | |
211 | |
253 | return NULL; |
212 | return 0; |
254 | } |
213 | } |
255 | |
214 | |
256 | /* This changes the objects skill to new_skill. |
215 | /* This changes the objects chosen_skill to new_skill. |
257 | * note that this function doesn't always need to get used - |
|
|
258 | * you can now add skill exp to the player without the chosen_skill being |
|
|
259 | * set. This function is of most interest to players to update |
|
|
260 | * the various range information. |
|
|
261 | * if new_skill is null, this just unapplies the skill. |
|
|
262 | * flag has the current meaning: |
|
|
263 | * 0x1: If set, don't update the range pointer. This is useful when we |
|
|
264 | * need to ready a new skill, but don't want to clobber range. |
|
|
265 | * return 1 on success, 0 on error |
216 | * return 1 on success, 0 on error |
266 | */ |
217 | */ |
267 | |
218 | bool |
268 | int |
219 | object::change_skill (object *new_skill) |
269 | change_skill (object *who, object *new_skill, int flag) |
|
|
270 | { |
220 | { |
271 | int old_range; |
|
|
272 | |
|
|
273 | if (who->type != PLAYER) |
221 | if (type != PLAYER) |
274 | return 0; |
222 | return 0; |
275 | |
223 | |
276 | old_range = who->contr->shoottype; |
224 | // optimise this supposedly common case |
277 | |
225 | if (new_skill == chosen_skill) |
278 | if (who->chosen_skill && who->chosen_skill == new_skill) |
|
|
279 | { |
|
|
280 | /* optimization for changing skill to current skill */ |
|
|
281 | if (who->type == PLAYER && !(flag & 0x1)) |
|
|
282 | who->contr->shoottype = range_skill; |
|
|
283 | |
|
|
284 | return 1; |
226 | return 1; |
285 | } |
|
|
286 | |
227 | |
287 | // move skill to front, so it will be preferred next time |
|
|
288 | new_skill->remove (); |
|
|
289 | who->insert (new_skill); |
|
|
290 | |
|
|
291 | if (!new_skill || who->chosen_skill) |
|
|
292 | if (who->chosen_skill) |
228 | if (chosen_skill) |
293 | apply_special (who, who->chosen_skill, AP_UNAPPLY); |
229 | { |
|
|
230 | chosen_skill->flag [FLAG_APPLIED] = false; |
|
|
231 | change_abil (this, chosen_skill); |
|
|
232 | } |
294 | |
233 | |
295 | /* Only goal in this case was to unapply a skill */ |
234 | chosen_skill = new_skill; |
|
|
235 | |
296 | if (!new_skill) |
236 | if (chosen_skill) |
297 | return 0; |
237 | { |
|
|
238 | chosen_skill->flag [FLAG_APPLIED] = true; |
|
|
239 | change_abil (this, chosen_skill); |
|
|
240 | } |
298 | |
241 | |
299 | if (apply_special (who, new_skill, AP_APPLY)) |
242 | // always clear current weapon, as the selected skill could |
300 | return 0; |
243 | // conflict with the current weapon skill, which would go |
|
|
244 | // undetected and exp would be given to the wrong skill. |
|
|
245 | current_weapon = 0; |
301 | |
246 | |
302 | if (flag & 0x1) |
247 | update_stats (); |
303 | who->contr->shoottype = (rangetype)old_range; |
|
|
304 | |
|
|
305 | return 1; |
248 | return 1; |
306 | } |
|
|
307 | |
|
|
308 | /* This function just clears the chosen_skill and range_skill values |
|
|
309 | * inthe player. |
|
|
310 | */ |
|
|
311 | void |
|
|
312 | clear_skill (object *who) |
|
|
313 | { |
|
|
314 | who->chosen_skill = NULL; |
|
|
315 | CLEAR_FLAG (who, FLAG_READY_SKILL); |
|
|
316 | if (who->type == PLAYER) |
|
|
317 | { |
|
|
318 | who->contr->ranges[range_skill] = NULL; |
|
|
319 | if (who->contr->shoottype == range_skill) |
|
|
320 | who->contr->shoottype = range_none; |
|
|
321 | } |
|
|
322 | } |
249 | } |
323 | |
250 | |
324 | /* do_skill() - Main skills use function-similar in scope to cast_spell(). |
251 | /* do_skill() - Main skills use function-similar in scope to cast_spell(). |
325 | * We handle all requests for skill use outside of some combat here. |
252 | * We handle all requests for skill use outside of some combat here. |
326 | * We require a separate routine outside of fire() so as to allow monsters |
253 | * We require a separate routine outside of fire() so as to allow monsters |
… | |
… | |
329 | * exp - no caller needed that info, but it also prevented the callers |
256 | * exp - no caller needed that info, but it also prevented the callers |
330 | * from know if a skill was actually used, as many skills don't |
257 | * from know if a skill was actually used, as many skills don't |
331 | * give any exp for their direct use (eg, throwing). |
258 | * give any exp for their direct use (eg, throwing). |
332 | * It returns 0 if no skill was used. |
259 | * It returns 0 if no skill was used. |
333 | */ |
260 | */ |
334 | |
|
|
335 | int |
261 | int |
336 | do_skill (object *op, object *part, object *skill, int dir, const char *string) |
262 | do_skill (object *op, object *part, object *skill, int dir, const char *string) |
337 | { |
263 | { |
338 | int success = 0, exp = 0; |
264 | int success = 0, exp = 0; |
339 | int did_alc = 0; |
265 | int did_alc = 0; |
340 | object *tmp, *next; |
|
|
341 | |
266 | |
342 | if (!skill) |
267 | if (!skill) |
343 | return 0; |
268 | return 0; |
344 | |
269 | |
345 | /* 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 |
… | |
… | |
347 | * 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 |
348 | * the player doesn't have a bucket for that, create one. |
273 | * the player doesn't have a bucket for that, create one. |
349 | */ |
274 | */ |
350 | if (skill->type != SKILL && op->type == PLAYER) |
275 | if (skill->type != SKILL && op->type == PLAYER) |
351 | { |
276 | { |
352 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
277 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
353 | { |
|
|
354 | if (tmp->type == SKILL && tmp->skill == skill->skill) |
278 | if (tmp->type == SKILL && tmp->skill == skill->skill) |
355 | break; |
279 | { |
|
|
280 | skill = tmp; |
|
|
281 | goto found; |
356 | } |
282 | } |
357 | if (!tmp) |
283 | |
358 | tmp = give_skill_by_name (op, skill->skill); |
284 | skill = give_skill_by_name (op, skill->skill); |
359 | skill = tmp; |
285 | found: ; |
360 | } |
286 | } |
361 | |
287 | |
362 | // skill, by_whom, on_which_object, which direction, skill_argument |
288 | // skill, by_whom, on_which_object, which direction, skill_argument |
363 | 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))) |
364 | return 0; |
290 | return 0; |
365 | |
291 | |
366 | switch (skill->subtype) |
292 | switch (skill->subtype) |
367 | { |
293 | { |
368 | case SK_LEVITATION: |
294 | case SK_LEVITATION: |
369 | /* Not 100% sure if this will work with new movement code - |
295 | /* Not 100% sure if this will work with new movement code - |
370 | * the levitation skill has move_type for flying, so when |
296 | * the levitation skill has move_type for flying, so when |
371 | * equipped, that should transfer to player, when not, |
297 | * equipped, that should transfer to player, when not, |
372 | * shouldn't. |
298 | * shouldn't. |
373 | */ |
299 | */ |
374 | if (QUERY_FLAG (skill, FLAG_APPLIED)) |
300 | if (QUERY_FLAG (skill, FLAG_APPLIED)) |
375 | { |
301 | { |
376 | CLEAR_FLAG (skill, FLAG_APPLIED); |
302 | CLEAR_FLAG (skill, FLAG_APPLIED); |
377 | new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); |
303 | new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); |
378 | } |
304 | } |
379 | else |
305 | else |
380 | { |
306 | { |
381 | SET_FLAG (skill, FLAG_APPLIED); |
307 | SET_FLAG (skill, FLAG_APPLIED); |
382 | 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!"); |
383 | } |
309 | } |
|
|
310 | |
384 | op->update_stats (); |
311 | op->update_stats (); |
385 | success = 1; |
312 | success = 1; |
386 | break; |
313 | break; |
387 | |
314 | |
388 | case SK_STEALING: |
315 | case SK_STEALING: |
389 | exp = success = steal (op, dir, skill); |
316 | exp = success = steal (op, dir, skill); |
390 | break; |
317 | break; |
391 | |
318 | |
392 | case SK_LOCKPICKING: |
319 | case SK_LOCKPICKING: |
393 | exp = success = pick_lock (op, dir, skill); |
320 | exp = success = pick_lock (op, dir, skill); |
394 | break; |
321 | break; |
395 | |
322 | |
396 | case SK_HIDING: |
323 | case SK_HIDING: |
397 | exp = success = hide (op, skill); |
324 | exp = success = hide (op, skill); |
398 | break; |
325 | break; |
399 | |
326 | |
400 | case SK_JUMPING: |
327 | case SK_JUMPING: |
401 | success = jump (op, dir, skill); |
328 | exp = success = jump (op, dir, skill); |
402 | break; |
329 | break; |
403 | |
330 | |
404 | case SK_INSCRIPTION: |
331 | case SK_INSCRIPTION: |
405 | exp = success = write_on_item (op, string, skill); |
332 | exp = success = write_on_item (op, string, skill); |
406 | break; |
333 | break; |
407 | |
334 | |
408 | case SK_MEDITATION: |
335 | case SK_MEDITATION: |
409 | meditate (op, skill); |
336 | meditate (op, skill); |
410 | success = 1; |
337 | success = 1; |
411 | break; |
338 | break; |
412 | /* note that the following 'attack' skills gain exp through hit_player() */ |
339 | /* note that the following 'attack' skills gain exp through hit_player() */ |
413 | |
340 | |
414 | case SK_KARATE: |
341 | case SK_KARATE: |
415 | (void) attack_hth (op, dir, "karate-chopped", skill); |
342 | attack_hth (op, dir, "karate-chopped", skill); |
416 | break; |
343 | break; |
417 | |
344 | |
418 | case SK_PUNCHING: |
345 | case SK_PUNCHING: |
419 | (void) attack_hth (op, dir, "punched", skill); |
346 | attack_hth (op, dir, "punched", skill); |
420 | break; |
347 | break; |
421 | |
348 | |
422 | case SK_FLAME_TOUCH: |
349 | case SK_FLAME_TOUCH: |
423 | (void) attack_hth (op, dir, "flamed", skill); |
350 | attack_hth (op, dir, "flamed", skill); |
424 | break; |
351 | break; |
425 | |
352 | |
426 | case SK_SPARK_TOUCH: |
353 | case SK_SPARK_TOUCH: |
427 | (void) attack_hth (op, dir, "zapped", skill); |
354 | attack_hth (op, dir, "zapped", skill); |
428 | break; |
355 | break; |
429 | |
356 | |
430 | case SK_SHIVER: |
357 | case SK_SHIVER: |
431 | (void) attack_hth (op, dir, "froze", skill); |
358 | attack_hth (op, dir, "froze", skill); |
432 | break; |
359 | break; |
433 | |
360 | |
434 | case SK_ACID_SPLASH: |
361 | case SK_ACID_SPLASH: |
435 | (void) attack_hth (op, dir, "dissolved", skill); |
362 | attack_hth (op, dir, "dissolved", skill); |
436 | break; |
363 | break; |
437 | |
364 | |
438 | case SK_POISON_NAIL: |
365 | case SK_POISON_NAIL: |
439 | (void) attack_hth (op, dir, "injected poison into", skill); |
366 | attack_hth (op, dir, "injected poison into", skill); |
440 | break; |
367 | break; |
441 | |
368 | |
442 | case SK_CLAWING: |
369 | case SK_CLAWING: |
443 | (void) attack_hth (op, dir, "clawed", skill); |
370 | attack_hth (op, dir, "clawed", skill); |
444 | break; |
371 | break; |
445 | |
372 | |
446 | case SK_ONE_HANDED_WEAPON: |
373 | case SK_ONE_HANDED_WEAPON: |
447 | case SK_TWO_HANDED_WEAPON: |
374 | case SK_TWO_HANDED_WEAPON: |
448 | (void) attack_melee_weapon (op, dir, NULL, skill); |
375 | attack_melee_weapon (op, dir, NULL, skill); |
449 | break; |
376 | break; |
450 | |
377 | |
451 | case SK_FIND_TRAPS: |
378 | case SK_FIND_TRAPS: |
452 | exp = success = find_traps (op, skill); |
379 | exp = success = find_traps (op, skill); |
453 | break; |
380 | break; |
454 | |
381 | |
455 | case SK_SINGING: |
382 | case SK_SINGING: |
456 | exp = success = singing (op, dir, skill); |
383 | exp = success = singing (op, dir, skill); |
457 | break; |
384 | break; |
458 | |
385 | |
459 | case SK_ORATORY: |
386 | case SK_ORATORY: |
460 | exp = success = use_oratory (op, dir, skill); |
387 | exp = success = use_oratory (op, dir, skill); |
461 | break; |
388 | break; |
462 | |
389 | |
463 | case SK_SMITHERY: |
390 | case SK_SMITHERY: |
464 | case SK_BOWYER: |
391 | case SK_BOWYER: |
465 | case SK_JEWELER: |
392 | case SK_JEWELER: |
466 | case SK_ALCHEMY: |
393 | case SK_ALCHEMY: |
467 | case SK_THAUMATURGY: |
394 | case SK_THAUMATURGY: |
468 | case SK_LITERACY: |
395 | case SK_LITERACY: |
469 | case SK_WOODSMAN: |
396 | case SK_WOODSMAN: |
470 | /* 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. |
471 | * failing that, we go and identify stuff. |
398 | * failing that, we go and identify stuff. |
472 | */ |
399 | */ |
473 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = next) |
400 | for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) |
474 | { |
401 | { |
475 | next = tmp->above; |
402 | next = tmp->above; |
476 | |
403 | |
477 | if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) |
404 | if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) |
478 | { |
405 | { |
479 | attempt_do_alchemy (op, tmp); |
406 | attempt_do_alchemy (op, tmp); |
480 | |
407 | |
481 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
408 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
482 | esrv_send_inventory (op, tmp); |
409 | esrv_send_inventory (op, tmp); |
483 | |
410 | |
484 | did_alc = 1; |
411 | did_alc = 1; |
485 | } |
412 | } |
486 | } |
413 | } |
487 | |
414 | |
488 | if (did_alc == 0) |
415 | if (did_alc == 0) |
489 | exp = success = skill_ident (op, skill); |
|
|
490 | |
|
|
491 | break; |
|
|
492 | |
|
|
493 | case SK_DET_MAGIC: |
|
|
494 | case SK_DET_CURSE: |
|
|
495 | exp = success = skill_ident (op, skill); |
416 | exp = success = skill_ident (op, skill); |
|
|
417 | |
496 | break; |
418 | break; |
497 | |
419 | |
|
|
420 | case SK_DET_MAGIC: |
|
|
421 | case SK_DET_CURSE: |
|
|
422 | exp = success = skill_ident (op, skill); |
|
|
423 | break; |
|
|
424 | |
498 | case SK_DISARM_TRAPS: |
425 | case SK_DISARM_TRAPS: |
499 | exp = success = remove_trap (op, dir, skill); |
426 | exp = success = remove_trap (op, dir, skill); |
500 | break; |
427 | break; |
501 | |
428 | |
502 | case SK_THROWING: |
429 | case SK_THROWING: |
503 | success = skill_throw (op, part, dir, string, skill); |
430 | success = skill_throw (op, part, dir, string, skill); |
504 | break; |
431 | break; |
505 | |
432 | |
506 | case SK_SET_TRAP: |
433 | case SK_SET_TRAP: |
507 | new_draw_info (NDI_UNIQUE, 0, op, "This skill is not currently implemented."); |
434 | new_draw_info (NDI_UNIQUE, 0, op, "This skill is not currently implemented."); |
508 | break; |
435 | break; |
509 | |
436 | |
510 | case SK_USE_MAGIC_ITEM: |
437 | case SK_USE_MAGIC_ITEM: |
511 | case SK_MISSILE_WEAPON: |
438 | case SK_MISSILE_WEAPON: |
512 | new_draw_info (NDI_UNIQUE, 0, op, "There is no special attack for this skill."); |
439 | new_draw_info (NDI_UNIQUE, 0, op, "There is no special attack for this skill."); |
513 | break; |
440 | break; |
514 | |
441 | |
515 | case SK_PRAYING: |
442 | case SK_PRAYING: |
516 | success = pray (op, skill); |
443 | success = pray (op, skill); |
517 | break; |
444 | break; |
518 | |
445 | |
519 | case SK_BARGAINING: |
446 | case SK_BARGAINING: |
520 | success = describe_shop (op); |
447 | success = describe_shop (op); |
521 | break; |
448 | break; |
522 | |
449 | |
523 | case SK_SORCERY: |
450 | case SK_SORCERY: |
524 | case SK_EVOCATION: |
451 | case SK_EVOCATION: |
525 | case SK_PYROMANCY: |
452 | case SK_PYROMANCY: |
526 | case SK_SUMMONING: |
453 | case SK_SUMMONING: |
527 | case SK_CLIMBING: |
454 | case SK_CLIMBING: |
528 | new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); |
455 | new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); |
529 | break; |
456 | break; |
530 | |
457 | |
531 | default: |
458 | default: |
532 | LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); |
459 | LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); |
533 | break; |
460 | break; |
534 | } |
461 | } |
535 | |
462 | |
536 | /* For players we now update the speed_left from using the skill. |
463 | /* For players we now update the speed_left from using the skill. |
537 | * Monsters have no skill use time because of the random nature in |
464 | * Monsters have no skill use time because of the random nature in |
538 | * which use_monster_skill is called already simulates this. |
465 | * which use_monster_skill is called already simulates this. |
539 | * If certain skills should take more/less time, that should be |
466 | * If certain skills should take more/less time, that should be |
540 | * in the code for the skill itself. |
467 | * in the code for the skill itself. |
541 | */ |
468 | */ |
542 | |
|
|
543 | if (op->type == PLAYER) |
469 | if (op->type == PLAYER) |
544 | op->speed_left -= 1.0; |
470 | op->speed_left -= 1.f; |
545 | |
471 | |
546 | /* this is a good place to add experience for successfull use of skills. |
472 | /* this is a good place to add experience for successfull use of skills. |
547 | * Note that add_exp() will figure out player/monster experience |
473 | * Note that add_exp() will figure out player/monster experience |
548 | * gain problems. |
474 | * gain problems. |
549 | */ |
475 | */ |
… | |
… | |
577 | * op is the object that was 'defeated'. |
503 | * op is the object that was 'defeated'. |
578 | * skill is the skill used. If no skill is used, it should just |
504 | * skill is the skill used. If no skill is used, it should just |
579 | * point back to who. |
505 | * point back to who. |
580 | * |
506 | * |
581 | */ |
507 | */ |
582 | |
|
|
583 | int |
508 | int |
584 | calc_skill_exp (object *who, object *op, object *skill) |
509 | calc_skill_exp (object *who, object *op, object *skill) |
585 | { |
510 | { |
586 | int op_exp = 0, op_lvl = 0; |
511 | int op_exp = 0, op_lvl = 0; |
587 | float base, value, lvl_mult = 0.0; |
512 | float base, value, lvl_mult = 0.0; |
… | |
… | |
596 | * If an object is not alive and magical we set the base exp higher to |
521 | * If an object is not alive and magical we set the base exp higher to |
597 | * help out exp awards for skill_ident skills. Also, if |
522 | * help out exp awards for skill_ident skills. Also, if |
598 | * an item is type RUNE, we give out exp based on stats.Cha |
523 | * an item is type RUNE, we give out exp based on stats.Cha |
599 | * and level (this was the old system) -b.t. |
524 | * and level (this was the old system) -b.t. |
600 | */ |
525 | */ |
601 | |
|
|
602 | if (!op) |
526 | if (!op) |
603 | { /* no item/creature */ |
527 | { /* no item/creature */ |
604 | op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty; |
528 | op_lvl = max (1, who->map->difficulty); |
605 | op_exp = 0; |
529 | op_exp = 0; |
606 | } |
530 | } |
607 | else if (op->type == RUNE || op->type == TRAP) |
531 | else if (op->type == RUNE || op->type == TRAP) |
608 | { /* all traps. If stats.Cha > 1 we use that |
532 | { /* all traps. If stats.Cha > 1 we use that |
609 | * for the amount of experience */ |
533 | * for the amount of experience */ |
… | |
… | |
613 | else |
537 | else |
614 | { /* all other items/living creatures */ |
538 | { /* all other items/living creatures */ |
615 | op_exp = op->stats.exp; |
539 | op_exp = op->stats.exp; |
616 | op_lvl = op->level; |
540 | op_lvl = op->level; |
617 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
541 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
618 | { /* for ident/make items */ |
542 | op_lvl += 5 * abs (op->magic); /* for ident/make items */ |
619 | op_lvl += 5 * abs (op->magic); |
|
|
620 | } |
|
|
621 | } |
543 | } |
622 | |
544 | |
623 | if (op_lvl < 1) |
545 | if (op_lvl < 1) |
624 | op_lvl = 1; |
546 | op_lvl = 1; |
625 | |
547 | |
… | |
… | |
633 | /* if skill really is a skill, then we can look at the skill archetype for |
555 | /* if skill really is a skill, then we can look at the skill archetype for |
634 | * bse reward value (exp) and level multiplier factor. |
556 | * bse reward value (exp) and level multiplier factor. |
635 | */ |
557 | */ |
636 | if (skill->type == SKILL) |
558 | if (skill->type == SKILL) |
637 | { |
559 | { |
638 | base += skill->arch->clone.stats.exp; |
560 | base += skill->arch->stats.exp; |
639 | if (settings.simple_exp) |
561 | if (settings.simple_exp) |
640 | { |
562 | { |
641 | if (skill->arch->clone.level) |
563 | if (skill->arch->level) |
642 | lvl_mult = (float) skill->arch->clone.level / 100.0; |
564 | lvl_mult = (float) skill->arch->level / 100.0; |
643 | else |
565 | else |
644 | lvl_mult = 1.0; /* no adjustment */ |
566 | lvl_mult = 1.0; /* no adjustment */ |
645 | } |
567 | } |
646 | else |
568 | else |
647 | { |
569 | { |
648 | if (skill->level) |
570 | if (skill->level) |
649 | lvl_mult = ((float) skill->arch->clone.level * (float) op_lvl) / ((float) skill->level * 100.0); |
571 | lvl_mult = ((float) skill->arch->level * (float) op_lvl) / ((float) skill->level * 100.0); |
650 | else |
572 | else |
651 | lvl_mult = 1.0; |
573 | lvl_mult = 1.0; |
652 | } |
574 | } |
653 | } |
575 | } |
654 | else |
576 | else |
655 | { |
577 | { |
656 | /* Don't divide by zero here! */ |
578 | /* Don't divide by zero here! */ |
657 | lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1); |
579 | lvl_mult = (float) op_lvl / (float) max (1, skill->level); |
658 | } |
580 | } |
659 | } |
581 | } |
660 | |
582 | |
661 | /* assemble the exp total, and return value */ |
583 | /* assemble the exp total, and return value */ |
662 | |
584 | |
… | |
… | |
676 | * This one actually teaches the player the skill as something |
598 | * This one actually teaches the player the skill as something |
677 | * they can equip. |
599 | * they can equip. |
678 | * Return 0 if the player knows the skill, 1 if the |
600 | * Return 0 if the player knows the skill, 1 if the |
679 | * player learns the skill, 2 otherwise. |
601 | * player learns the skill, 2 otherwise. |
680 | */ |
602 | */ |
681 | |
|
|
682 | int |
603 | int |
683 | learn_skill (object *pl, object *scroll) |
604 | learn_skill (object *pl, object *scroll) |
684 | { |
605 | { |
685 | object *tmp; |
|
|
686 | |
|
|
687 | if (!scroll->skill) |
606 | if (!scroll->skill) |
688 | { |
607 | { |
689 | LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name); |
608 | LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name); |
690 | return 2; |
609 | return 2; |
691 | } |
610 | } |
692 | |
611 | |
693 | /* can't use find_skill_by_name because we want skills the player knows |
612 | object *tmp = find_skill (pl, scroll->skill); |
694 | * but can't use natively. |
|
|
695 | */ |
|
|
696 | |
|
|
697 | for (tmp = pl->inv; tmp != NULL; tmp = tmp->below) |
|
|
698 | if (tmp->type == SKILL && !strncasecmp (scroll->skill, tmp->skill, strlen (scroll->skill))) |
|
|
699 | break; |
|
|
700 | |
613 | |
701 | /* player already knows it */ |
614 | /* player already knows it */ |
702 | if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) |
615 | if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) |
703 | return 0; |
616 | return 0; |
704 | |
617 | |
… | |
… | |
717 | LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); |
630 | LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); |
718 | return 2; |
631 | return 2; |
719 | } |
632 | } |
720 | |
633 | |
721 | SET_FLAG (tmp, FLAG_CAN_USE_SKILL); |
634 | SET_FLAG (tmp, FLAG_CAN_USE_SKILL); |
722 | link_player_skills (pl); |
635 | |
723 | return 1; |
636 | return 1; |
724 | } |
637 | } |
725 | |
638 | |
726 | /* Gives a percentage clipped to 0% -> 100% of a/b. */ |
639 | /* Gives a percentage clipped to 0% -> 100% of a/b. */ |
727 | |
|
|
728 | /* Probably belongs in some global utils-type file? */ |
640 | /* Probably belongs in some global utils-type file? */ |
729 | static int |
641 | static int |
730 | clipped_percent (sint64 a, sint64 b) |
642 | clipped_percent (sint64 a, sint64 b) |
731 | { |
643 | { |
732 | int rv; |
644 | int rv; |
… | |
… | |
752 | * Note this function is a bit more complicated becauase we |
664 | * Note this function is a bit more complicated becauase we |
753 | * we want ot sort the skills before printing them. If we |
665 | * we want ot sort the skills before printing them. If we |
754 | * just dumped this as we found it, this would be a bit |
666 | * just dumped this as we found it, this would be a bit |
755 | * simpler. |
667 | * simpler. |
756 | */ |
668 | */ |
757 | |
669 | //TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo. |
758 | void |
670 | void |
759 | show_skills (object *op, const char *search) |
671 | show_skills (object *pl, const char *search) |
760 | { |
672 | { |
761 | object *tmp = NULL; |
|
|
762 | char buf[MAX_BUF]; |
|
|
763 | const char *cp; |
673 | const char *cp; |
764 | int i, num_skills_found = 0; |
674 | int i, num_skills_found = 0; |
765 | static const char *const periods = "........................................"; |
675 | const char *const periods = ".............................."; // 30 |
766 | |
676 | |
767 | /* Need to have a pointer and use strdup for qsort to work properly */ |
677 | /* Need to have a pointer and use strdup for qsort to work properly */ |
768 | char skills[NUM_SKILLS][MAX_BUF]; |
678 | char skills[NUM_SKILLS][128]; // d'oh |
769 | |
679 | |
|
|
680 | object *op = pl->contr->ob; |
770 | |
681 | |
771 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
682 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
772 | { |
683 | { |
773 | if (tmp->type == SKILL) |
684 | if (tmp->type == SKILL) |
774 | { |
685 | { |
775 | if (search && strstr (tmp->name, search) == NULL) |
686 | if (search && !tmp->name.contains (search)) |
776 | continue; |
687 | continue; |
|
|
688 | |
|
|
689 | char buf[30]; |
|
|
690 | |
777 | /* Basically want to fill this out to 40 spaces with periods */ |
691 | /* Basically want to fill this out to 30 spaces with periods */ |
778 | sprintf (buf, "%s%s", &tmp->name, periods); |
692 | snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods); |
779 | buf[40] = 0; |
|
|
780 | |
693 | |
781 | if (settings.permanent_exp_ratio) |
694 | if (settings.permanent_exp_ratio) |
782 | { |
|
|
783 | sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)", |
695 | snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)", |
784 | buf, tmp->level, tmp->stats.exp, |
696 | buf, tmp->level, tmp->stats.exp, |
785 | level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp)); |
697 | level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp)); |
786 | } |
|
|
787 | else |
698 | else |
788 | { |
|
|
789 | sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")", |
699 | snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")", |
790 | buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul)); |
700 | buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul)); |
791 | } |
701 | |
792 | /* I don't know why some characters get a bunch of skills, but |
702 | /* I don't know why some characters get a bunch of skills, but |
793 | * it sometimes happens (maybe a leftover from bugier earlier code |
703 | * it sometimes happens (maybe a leftover from bugier earlier code |
794 | * and those character are still about). In any case, lets handle |
704 | * and those character are still about). In any case, lets handle |
795 | * it so it doesn't crash the server - otherwise, one character may |
705 | * it so it doesn't crash the server - otherwise, one character may |
796 | * crash the server numerous times. |
706 | * crash the server numerous times. |
… | |
… | |
802 | break; |
712 | break; |
803 | } |
713 | } |
804 | } |
714 | } |
805 | } |
715 | } |
806 | |
716 | |
807 | clear_win_info (op); |
717 | dynbuf_text msg (4096, 1024); |
808 | new_draw_info (NDI_UNIQUE, 0, op, "Player skills:"); |
718 | |
|
|
719 | msg << "T<Player skills:>\n\n"; |
809 | if (num_skills_found > 1) |
720 | if (num_skills_found > 1) |
810 | qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) strcmp); |
721 | qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp); |
811 | |
722 | |
812 | for (i = 0; i < num_skills_found; i++) |
723 | for (i = 0; i < num_skills_found; i++) |
813 | { |
724 | msg << " C<" << skills [i] << ">\n"; |
814 | new_draw_info (NDI_UNIQUE, 0, op, skills[i]); |
|
|
815 | } |
|
|
816 | |
725 | |
817 | new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5); |
726 | msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r"; |
818 | |
727 | |
819 | cp = determine_god (op); |
728 | cp = determine_god (op); |
820 | new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time"); |
729 | msg << "You worship " << (cp ? cp : "no god at current time") << ".\r"; |
821 | |
730 | |
822 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your equipped item power is %d out of %d\n", |
731 | msg << "Your equipped item power is " << (int)op->contr->item_power |
823 | op->contr->item_power, (int) (op->level * settings.item_power_factor)); |
732 | << " out of " << int (op->level * settings.item_power_factor) |
|
|
733 | << ".\n"; |
|
|
734 | |
|
|
735 | pl->contr->infobox (MSG_CHANNEL ("skills"), msg); |
824 | } |
736 | } |
825 | |
737 | |
826 | /* use_skill() - similar to invoke command, it executes the skill in the |
738 | /* use_skill() - similar to invoke command, it executes the skill in the |
827 | * direction that the user is facing. Returns false if we are unable to |
739 | * direction that the user is facing. Returns false if we are unable to |
828 | * change to the requested skill, or were unable to use the skill properly. |
740 | * change to the requested skill, or were unable to use the skill properly. |
829 | * This is tricky because skills can have spaces. We basically roll |
741 | * This is tricky because skills can have spaces. We basically roll |
830 | * our own find_skill_by_name so we can try to do better string matching. |
742 | * our own find_skill_by_name so we can try to do better string matching. |
831 | */ |
743 | */ |
832 | |
|
|
833 | int |
744 | int |
834 | use_skill (object *op, const char *string) |
745 | use_skill (object *op, const char *string) |
835 | { |
746 | { |
836 | object *skop; |
747 | object *skop; |
837 | size_t len; |
748 | size_t len; |
838 | |
749 | |
839 | if (!string) |
750 | if (!string) |
840 | return 0; |
751 | return 0; |
841 | |
752 | |
842 | for (skop = op->inv; skop != NULL; skop = skop->below) |
753 | for (skop = op->inv; skop; skop = skop->below) |
843 | { |
754 | { |
|
|
755 | if (skop->type == SKILL |
844 | if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) && |
756 | && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) |
845 | !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) |
757 | && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) |
846 | break; |
758 | break; |
|
|
759 | else if (skop->type == SKILL_TOOL |
847 | else if (skop->type == SKILL_TOOL && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) |
760 | && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) |
848 | break; |
761 | break; |
849 | } |
762 | } |
|
|
763 | |
850 | if (!skop) |
764 | if (!skop) |
851 | { |
765 | { |
852 | new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); |
766 | new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); |
853 | return 0; |
767 | return 0; |
854 | } |
768 | } |
… | |
… | |
859 | * options given to the skill. Its pretty simple - if there |
773 | * options given to the skill. Its pretty simple - if there |
860 | * are extra parameters (as deteremined by string length), we |
774 | * are extra parameters (as deteremined by string length), we |
861 | * want to skip over any leading spaces. |
775 | * want to skip over any leading spaces. |
862 | */ |
776 | */ |
863 | if (len >= strlen (string)) |
777 | if (len >= strlen (string)) |
864 | { |
|
|
865 | string = NULL; |
778 | string = NULL; |
866 | } |
|
|
867 | else |
779 | else |
868 | { |
780 | { |
869 | string += len; |
781 | string += len; |
870 | while (*string == 0x20) |
782 | while (*string == 0x20) |
871 | string++; |
783 | string++; |
|
|
784 | |
872 | if (strlen (string) == 0) |
785 | if (strlen (string) == 0) |
873 | string = NULL; |
786 | string = NULL; |
874 | } |
787 | } |
875 | |
788 | |
876 | #ifdef SKILL_UTIL_DEBUG |
789 | #ifdef SKILL_UTIL_DEBUG |
877 | LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none"); |
790 | LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none"); |
878 | #endif |
791 | #endif |
879 | |
792 | |
880 | /* Change to the new skill, then execute it. */ |
|
|
881 | if (do_skill (op, op, skop, op->facing, string)) |
793 | if (do_skill (op, op, skop, op->facing, string)) |
882 | return 1; |
794 | return 1; |
883 | |
795 | |
884 | return 0; |
796 | return 0; |
885 | } |
797 | } |
886 | |
798 | |
887 | static bool |
799 | static bool |
888 | hth_skill_p (object *skill) |
800 | hth_skill_p (object *skill) |
889 | { |
801 | { |
890 | for (unsigned int i = 0; i < sizeof (unarmed_skills); ++i) |
802 | return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT; |
891 | if (skill->subtype == unarmed_skills[i]) |
|
|
892 | return 1; |
|
|
893 | |
|
|
894 | return 0; |
|
|
895 | } |
803 | } |
896 | |
804 | |
897 | /* This finds the first unarmed skill the player has, and returns it. |
805 | /* This finds the first unarmed skill the player has, and returns it. |
898 | */ |
806 | */ |
899 | static object * |
807 | static object * |
… | |
… | |
913 | * tmp is the targetted monster. |
821 | * tmp is the targetted monster. |
914 | * op is what is attacking |
822 | * op is what is attacking |
915 | * string is passed along to describe what messages to describe |
823 | * string is passed along to describe what messages to describe |
916 | * the damage. |
824 | * the damage. |
917 | */ |
825 | */ |
918 | |
|
|
919 | static int |
826 | static int |
920 | do_skill_attack (object *tmp, object *op, const char *string, object *skill) |
827 | do_skill_attack (object *tmp, object *op, const char *string, object *skill) |
921 | { |
828 | { |
922 | int success; |
|
|
923 | |
|
|
924 | if (INVOKE_OBJECT (SKILL_ATTACK, op, ARG_OBJECT (tmp), ARG_STRING (string), ARG_OBJECT (skill))) |
829 | if (INVOKE_OBJECT (SKILL_ATTACK, op, ARG_OBJECT (tmp), ARG_STRING (string), ARG_OBJECT (skill))) |
925 | return RESULT_INT (0); |
830 | return RESULT_INT (0); |
926 | |
831 | |
927 | /* For Players only: if there is no ready weapon, and no "attack" skill |
832 | /* For Players only: if there is no ready weapon, and no "attack" skill |
928 | * is readied either then try to find a skill for the player to use. |
833 | * is readied either then try to find a skill for the player to use. |
929 | * it is presumed that if skill is set, it is a valid attack skill (eg, |
834 | * it is presumed that if skill is set, it is a valid attack skill (eg, |
930 | * the caller should have set it appropriately). We still want to pass |
835 | * the caller should have set it appropriately). We still want to pass |
931 | * through that code if skill is set to change to the skill. |
836 | * through that code if skill is set to change to the skill. |
932 | */ |
837 | */ |
933 | if (op->type == PLAYER) |
838 | if (player *pl = op->contr) |
934 | { |
839 | { |
935 | if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) |
840 | if (skill) |
|
|
841 | op->change_skill (skill); |
|
|
842 | else |
936 | { |
843 | { |
937 | if (!skill) |
844 | if (!pl->combat_ob) |
938 | { |
845 | { |
939 | /* See if the players chosen skill is a combat skill, and use |
846 | if (QUERY_FLAG (op, FLAG_READY_WEAPON)) |
940 | * it if appropriate. |
|
|
941 | */ |
|
|
942 | if (op->chosen_skill && hth_skill_p (op->chosen_skill)) |
|
|
943 | skill = op->chosen_skill; |
|
|
944 | else |
|
|
945 | { |
847 | { |
946 | skill = find_player_hth_skill (op); |
848 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
849 | if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) |
|
|
850 | break; |
947 | |
851 | |
948 | if (!skill) |
852 | if (!tmp) |
|
|
853 | LOG (llevError, "Could not find applied weapon on %s\n", &op->name); |
|
|
854 | |
|
|
855 | pl->combat_ob = tmp; |
|
|
856 | } |
|
|
857 | |
|
|
858 | if (!pl->combat_ob) |
|
|
859 | { |
|
|
860 | /* See if the players chosen skill is a combat skill, and use |
|
|
861 | * it if appropriate. |
|
|
862 | */ |
|
|
863 | if (op->chosen_skill && hth_skill_p (op->chosen_skill)) |
|
|
864 | skill = op->chosen_skill; |
|
|
865 | else |
949 | { |
866 | { |
|
|
867 | skill = find_player_hth_skill (op); |
|
|
868 | |
|
|
869 | if (!skill) |
950 | new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); |
870 | new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); |
951 | return 0; |
871 | } |
|
|
872 | |
|
|
873 | if (skill) |
|
|
874 | { |
|
|
875 | op->change_skill (0); |
|
|
876 | apply_special (op, skill, AP_APPLY); |
952 | } |
877 | } |
953 | } |
878 | } |
954 | } |
|
|
955 | |
879 | |
956 | /* now try to ready the new skill */ |
|
|
957 | if (!change_skill (op, skill, 0)) |
|
|
958 | { /* oh oh, trouble! */ |
|
|
959 | new_draw_info_format (NDI_UNIQUE, 0, tmp, "Couldn't change to skill %s", &skill->name); |
|
|
960 | return 0; |
|
|
961 | } |
|
|
962 | } |
|
|
963 | else |
|
|
964 | { |
|
|
965 | /* Seen some crashes below where current_weapon is not set, |
|
|
966 | * even though the flag says it is. So if current weapon isn't set, |
|
|
967 | * do some work in trying to find the object to use. |
|
|
968 | */ |
|
|
969 | if (!op->current_weapon) |
|
|
970 | { |
|
|
971 | object *tmp; |
|
|
972 | |
|
|
973 | LOG (llevError, "Player %s does not have current weapon set but flag_ready_weapon is set\n", &op->name); |
|
|
974 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
975 | if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) |
|
|
976 | break; |
|
|
977 | |
|
|
978 | if (!tmp) |
880 | if (!pl->combat_ob) |
979 | { |
881 | { |
980 | LOG (llevError, "Could not find applied weapon on %s\n", &op->name); |
882 | LOG (llevError, "Could not find anything to attack on %s\n", &op->name); |
981 | op->current_weapon = NULL; |
|
|
982 | return 0; |
883 | return 0; |
983 | } |
884 | } |
984 | else |
|
|
985 | { |
|
|
986 | op->current_weapon = tmp; |
|
|
987 | } |
|
|
988 | } |
885 | } |
989 | |
886 | |
990 | change_skill (op, find_skill_by_name (op, op->current_weapon->skill), 1); |
887 | if (!op->change_weapon (pl->combat_ob)) |
|
|
888 | return 0; |
991 | } |
889 | } |
992 | } |
|
|
993 | |
890 | |
994 | /* lose invisiblity/hiding status for running attacks */ |
891 | /* lose invisiblity/hiding status for running attacks */ |
995 | |
892 | if (pl->tmp_invis) |
996 | if (op->type == PLAYER && op->contr->tmp_invis) |
893 | { |
997 | { |
|
|
998 | op->contr->tmp_invis = 0; |
894 | pl->tmp_invis = 0; |
999 | op->invisible = 0; |
895 | op->invisible = 0; |
1000 | op->hide = 0; |
896 | op->flag [FLAG_HIDDEN] = 0; |
1001 | update_object (op, UP_OBJ_FACE); |
897 | update_object (op, UP_OBJ_CHANGE); |
|
|
898 | } |
1002 | } |
899 | } |
1003 | |
900 | |
1004 | success = attack_ob (tmp, op); |
901 | int success = attack_ob (tmp, op); |
1005 | |
902 | |
1006 | /* print appropriate messages to the player */ |
903 | /* print appropriate messages to the player */ |
1007 | |
904 | |
1008 | if (success && string != NULL && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) |
905 | if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) |
1009 | { |
906 | { |
1010 | if (op->type == PLAYER) |
907 | if (op->type == PLAYER) |
1011 | new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); |
908 | new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); |
1012 | else if (tmp->type == PLAYER) |
909 | else if (tmp->type == PLAYER) |
1013 | new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); |
910 | new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); |
1014 | } |
911 | } |
|
|
912 | |
1015 | return success; |
913 | return success; |
1016 | } |
914 | } |
1017 | |
|
|
1018 | |
915 | |
1019 | /* skill_attack() - Core routine for use when we attack using a skills |
916 | /* skill_attack() - Core routine for use when we attack using a skills |
1020 | * system. In essence, this code handles |
917 | * system. In essence, this code handles |
1021 | * all skill-based attacks, ie hth, missile and melee weapons should be |
918 | * all skill-based attacks, i.e. hth, missile and melee weapons should be |
1022 | * treated here. If an opponent is already supplied by move_player(), |
919 | * treated here. If an opponent is already supplied by move_player(), |
1023 | * we move right onto do_skill_attack(), otherwise we find if an |
920 | * we move right onto do_skill_attack(), otherwise we find if an |
1024 | * appropriate opponent exists. |
921 | * appropriate opponent exists. |
1025 | * |
922 | * |
1026 | * This is called by move_player() and attack_hth() |
923 | * This is called by move_player() and attack_hth() |
1027 | * |
924 | * |
1028 | * Initial implementation by -bt thomas@astro.psu.edu |
925 | * Initial implementation by -bt thomas@astro.psu.edu |
1029 | */ |
926 | */ |
1030 | |
|
|
1031 | int |
927 | int |
1032 | skill_attack (object *tmp, object *pl, int dir, const char *string, object *skill) |
928 | skill_attack (object *tmp, object *pl, int dir, const char *string, object *skill) |
1033 | { |
929 | { |
1034 | sint16 tx, ty; |
930 | sint16 tx, ty; |
1035 | maptile *m; |
931 | maptile *m; |
… | |
… | |
1042 | ty = freearr_y[dir]; |
938 | ty = freearr_y[dir]; |
1043 | |
939 | |
1044 | /* If we don't yet have an opponent, find if one exists, and attack. |
940 | /* If we don't yet have an opponent, find if one exists, and attack. |
1045 | * Legal opponents are the same as outlined in move_player_attack() |
941 | * Legal opponents are the same as outlined in move_player_attack() |
1046 | */ |
942 | */ |
1047 | |
943 | if (!tmp) |
1048 | if (tmp == NULL) |
|
|
1049 | { |
944 | { |
1050 | m = pl->map; |
945 | m = pl->map; |
1051 | tx = pl->x + freearr_x[dir]; |
946 | tx = pl->x + freearr_x[dir]; |
1052 | ty = pl->y + freearr_y[dir]; |
947 | ty = pl->y + freearr_y[dir]; |
1053 | |
948 | |
… | |
… | |
1063 | if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) |
958 | if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) |
1064 | { |
959 | { |
1065 | /* Don't attack party members */ |
960 | /* Don't attack party members */ |
1066 | if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) |
961 | if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) |
1067 | return 0; |
962 | return 0; |
|
|
963 | |
1068 | break; |
964 | break; |
1069 | } |
965 | } |
1070 | } |
966 | } |
|
|
967 | |
1071 | if (!tmp) |
968 | if (!tmp) |
1072 | { |
969 | { |
1073 | if (pl->type == PLAYER) |
970 | if (pl->type == PLAYER) |
1074 | new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!"); |
971 | new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!"); |
|
|
972 | |
1075 | return 0; |
973 | return 0; |
1076 | } |
974 | } |
1077 | |
975 | |
1078 | return do_skill_attack (tmp, pl, string, skill); |
976 | return do_skill_attack (tmp, pl, string, skill); |
1079 | } |
977 | } |
1080 | |
|
|
1081 | |
978 | |
1082 | /* attack_hth() - this handles all hand-to-hand attacks -b.t. */ |
979 | /* attack_hth() - this handles all hand-to-hand attacks -b.t. */ |
1083 | |
980 | |
1084 | /* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first |
981 | /* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first |
1085 | * (attack_hth) we check for weapon use, etc in the second (the new |
982 | * (attack_hth) we check for weapon use, etc in the second (the new |
1086 | * function skill_attack() we actually attack. |
983 | * function skill_attack() we actually attack. |
1087 | */ |
984 | */ |
1088 | |
|
|
1089 | static int |
985 | static int |
1090 | attack_hth (object *pl, int dir, const char *string, object *skill) |
986 | attack_hth (object *pl, int dir, const char *string, object *skill) |
1091 | { |
987 | { |
1092 | object *enemy = NULL, *weapon; |
988 | object *enemy = NULL, *weapon; |
1093 | |
989 | |
… | |
… | |
1102 | if (pl->type == PLAYER) |
998 | if (pl->type == PLAYER) |
1103 | { |
999 | { |
1104 | new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); |
1000 | new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); |
1105 | esrv_update_item (UPD_FLAGS, pl, weapon); |
1001 | esrv_update_item (UPD_FLAGS, pl, weapon); |
1106 | } |
1002 | } |
|
|
1003 | |
1107 | break; |
1004 | break; |
1108 | } |
1005 | } |
1109 | } |
1006 | } |
|
|
1007 | |
1110 | return skill_attack (enemy, pl, dir, string, skill); |
1008 | return skill_attack (enemy, pl, dir, string, skill); |
1111 | } |
1009 | } |
1112 | |
|
|
1113 | |
1010 | |
1114 | /* attack_melee_weapon() - this handles melee weapon attacks -b.t. |
1011 | /* attack_melee_weapon() - this handles melee weapon attacks -b.t. |
1115 | * For now we are just checking to see if we have a ready weapon here. |
1012 | * For now we are just checking to see if we have a ready weapon here. |
1116 | * But there is a real neato possible feature of this scheme which |
1013 | * But there is a real neato possible feature of this scheme which |
1117 | * bears mentioning: |
1014 | * bears mentioning: |
1118 | * Since we are only calling this from do_skill() in the future |
1015 | * Since we are only calling this from do_skill() in the future |
1119 | * we may make this routine handle 'special' melee weapons attacks |
1016 | * we may make this routine handle 'special' melee weapons attacks |
1120 | * (like disarming manuever with sai) based on player SK_level and |
1017 | * (like disarming manuever with sai) based on player SK_level and |
1121 | * weapon type. |
1018 | * weapon type. |
1122 | */ |
1019 | */ |
1123 | |
|
|
1124 | static int |
1020 | static int |
1125 | attack_melee_weapon (object *op, int dir, const char *string, object *skill) |
1021 | attack_melee_weapon (object *op, int dir, const char *string, object *skill) |
1126 | { |
1022 | { |
1127 | |
1023 | |
1128 | if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) |
1024 | if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) |
1129 | { |
1025 | { |
1130 | if (op->type == PLAYER) |
1026 | if (op->type == PLAYER) |
1131 | new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); |
1027 | new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); |
|
|
1028 | |
1132 | return 0; |
1029 | return 0; |
1133 | } |
1030 | } |
|
|
1031 | |
1134 | return skill_attack (NULL, op, dir, string, skill); |
1032 | return skill_attack (NULL, op, dir, string, skill); |
1135 | |
|
|
1136 | } |
1033 | } |
|
|
1034 | |