1 | /* |
1 | /* |
2 | * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
4 | * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team |
|
|
5 | * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 2002 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * |
8 | * |
8 | * Crossfire TRT is free software: you can redistribute it and/or modify |
9 | * 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 |
10 | * the terms of the Affero GNU General Public License as published by the |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * (at your option) any later version. |
12 | * option) any later version. |
12 | * |
13 | * |
13 | * This program is distributed in the hope that it will be useful, |
14 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
17 | * GNU General Public License for more details. |
17 | * |
18 | * |
18 | * You should have received a copy of the GNU General Public License |
19 | * You should have received a copy of the Affero GNU General Public License |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * and the GNU General Public License along with this program. If not, see |
|
|
21 | * <http://www.gnu.org/licenses/>. |
20 | * |
22 | * |
21 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
23 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
24 | */ |
23 | |
25 | |
24 | /* Created July 95 to separate skill utilities from actual skills -b.t. */ |
26 | /* Created July 95 to separate skill utilities from actual skills -b.t. */ |
25 | |
27 | |
26 | /* Reconfigured skills code to allow linking of skills to experience |
28 | /* Reconfigured skills code to allow linking of skills to experience |
… | |
… | |
50 | # define def(uc, flags) flags, |
52 | # define def(uc, flags) flags, |
51 | # include "skillinc.h" |
53 | # include "skillinc.h" |
52 | # undef def |
54 | # undef def |
53 | }; |
55 | }; |
54 | |
56 | |
|
|
57 | vector<object_ptr> skillvec; |
|
|
58 | |
55 | static int attack_hth (object *pl, int dir, const char *string, object *skill); |
59 | static int attack_hth (object *pl, int dir, const char *string, object *skill); |
56 | static int attack_melee_weapon (object *op, int dir, const char *string, object *skill); |
60 | static int attack_melee_weapon (object *op, int dir, const char *string, object *skill); |
57 | |
61 | |
58 | /* init_skills basically just sets up the skill_names table |
62 | /* init_skills basically just sets up the skill_names table |
59 | * above. The index into the array is set up by the |
63 | * above. The index into the array is set up by the |
60 | * subtypes. |
64 | * subtypes. |
61 | */ |
65 | */ |
62 | void |
66 | void |
63 | init_skills (void) |
67 | init_skills () |
64 | { |
68 | { |
65 | for_all_archetypes (at) |
69 | // nop |
66 | if (at->type == SKILL) |
70 | } |
|
|
71 | |
|
|
72 | void |
|
|
73 | add_skill_archetype (object *o) |
|
|
74 | { |
|
|
75 | assert (("skill name must equal skill skill", o->name == o->skill)); |
|
|
76 | |
|
|
77 | for (auto &&i = skillvec.begin (); i != skillvec.end (); ++i) |
|
|
78 | if ((*i)->name == o->name) |
67 | { |
79 | { |
68 | if (skill_names[at->subtype]) |
80 | // replace existing entry |
69 | LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", |
81 | SKILL_INDEX (o) = i - skillvec.begin (); |
70 | at->subtype, &skill_names[at->subtype], &at->skill); |
82 | *i = o; |
71 | else |
83 | return; |
72 | skill_names[at->subtype] = at->skill; |
|
|
73 | } |
84 | } |
74 | |
85 | |
75 | /* This isn't really an error if there is no skill subtype set, but |
86 | // add new entry |
76 | * checking for this may catch some user errors. |
87 | assert (("only CS_NUM_SKILLS skills supported by client protocol", skillvec.size () < CS_NUM_SKILLS)); |
77 | */ |
88 | SKILL_INDEX (o) = skillvec.size (); |
78 | for (int i = 1; i < NUM_SKILLS; i++) |
89 | skillvec.push_back (o); |
79 | if (!skill_names[i]) |
|
|
80 | LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i); |
|
|
81 | } |
90 | } |
82 | |
91 | |
83 | /* This function goes through the player inventory and sets |
92 | /* This function goes through the player inventory and sets |
84 | * up the last_skills[] array in the player object. |
93 | * up the last_skills[] array in the player object. |
85 | * the last_skills[] is used to more quickly lookup skills - |
94 | * the last_skills[] is used to more quickly lookup skills - |
86 | * mostly used for sending exp. |
95 | * mostly used for sending exp. |
87 | */ |
96 | */ |
88 | void |
97 | void |
89 | link_player_skills (object *op) |
98 | player::link_skills () |
90 | { |
99 | { |
|
|
100 | for (int i = 0; i < CS_NUM_SKILLS; ++i) |
|
|
101 | last_skill_ob [i] = 0; |
|
|
102 | |
91 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
103 | for (object *tmp = ob->inv; tmp; tmp = tmp->below) |
92 | if (tmp->type == SKILL) |
104 | if (tmp->type == SKILL) |
93 | { |
105 | { |
94 | /* This is really a warning, hence no else below */ |
106 | int idx = SKILL_INDEX (tmp); |
95 | if (op->contr->last_skill_ob[tmp->subtype] && op->contr->last_skill_ob[tmp->subtype] != tmp) |
|
|
96 | LOG (llevError, "Multiple skills with the same subtype? %s, %s\n", |
|
|
97 | &op->contr->last_skill_ob[tmp->subtype]->skill, &tmp->skill); |
|
|
98 | |
107 | |
99 | if (tmp->subtype >= NUM_SKILLS) |
108 | assert (IN_RANGE_EXC (idx, 0, CS_NUM_SKILLS)); |
100 | LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS); |
109 | |
101 | else |
110 | if (last_skill_ob [idx] != tmp) |
102 | { |
111 | { |
103 | op->contr->last_skill_ob[tmp->subtype] = tmp; |
112 | last_skill_ob [idx] = tmp; |
104 | op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go |
113 | if (ns) |
|
|
114 | ns->last_skill_exp [idx] = -1; |
105 | } |
115 | } |
106 | } |
116 | } |
107 | } |
117 | } |
108 | |
118 | |
109 | static object * |
119 | static object * |
110 | find_skill (object *who, const shstr &sh) |
120 | find_skill (object *who, shstr_cmp name) |
111 | { |
121 | { |
|
|
122 | if (who->chosen_skill |
|
|
123 | && who->chosen_skill->skill == name |
|
|
124 | && who->chosen_skill->type == SKILL) |
|
|
125 | return who->chosen_skill; |
|
|
126 | |
112 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
127 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
113 | if (tmp->skill == sh && tmp->type == SKILL) |
128 | if (tmp->skill == name && tmp->type == SKILL) |
114 | return tmp; |
129 | return splay (tmp); |
115 | |
130 | |
116 | return 0; |
131 | return 0; |
|
|
132 | } |
|
|
133 | |
|
|
134 | object * |
|
|
135 | player::find_skill (shstr_cmp name) const |
|
|
136 | { |
|
|
137 | // might want to use last_skill_obj at one point, or maybe not |
|
|
138 | return ::find_skill (ob, name); |
117 | } |
139 | } |
118 | |
140 | |
119 | /* This returns the skill pointer of the given name (the |
141 | /* This returns the skill pointer of the given name (the |
120 | * one that accumulates exp, has the level, etc). |
142 | * one that accumulates exp, has the level, etc). |
121 | * |
143 | * |
122 | * It is presumed that the player will be needing to actually |
144 | * It is presumed that the player will be needing to actually |
123 | * use the skill, so thus if use of the skill requires a skill |
145 | * use the skill, so thus if use of the skill requires a skill |
124 | * tool, this code will equip it. |
146 | * tool, this code will equip it. |
125 | */ |
147 | */ |
126 | object * |
148 | object * |
127 | find_skill_by_name (object *who, const shstr &sh) |
149 | find_skill_by_name (object *who, shstr_cmp sh) |
128 | { |
150 | { |
129 | object *skill_tool = 0; |
151 | object *skill_tool = 0; |
130 | |
152 | |
131 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
153 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
132 | if (tmp->skill == sh) |
154 | if (tmp->skill == sh) |
… | |
… | |
146 | |
168 | |
147 | /* Player has a tool to use the skill. If not applied, apply it - |
169 | /* Player has a tool to use the skill. If not applied, apply it - |
148 | * if not successful, return null. If they do have the skill tool |
170 | * if not successful, return null. If they do have the skill tool |
149 | * but not the skill itself, give it to them. |
171 | * but not the skill itself, give it to them. |
150 | */ |
172 | */ |
151 | object *skill = find_skill (who, skill_tool->skill); |
173 | object *skill = who->give_skill (skill_tool->skill); |
152 | |
|
|
153 | if (!skill) |
|
|
154 | { |
|
|
155 | skill = give_skill_by_name (who, skill_tool->skill); |
|
|
156 | link_player_skills (who); |
|
|
157 | } |
|
|
158 | |
174 | |
159 | if (!skill_tool->flag [FLAG_APPLIED]) |
175 | if (!skill_tool->flag [FLAG_APPLIED]) |
160 | if (apply_special (who, splay (skill_tool), AP_APPLY | AP_NO_READY)) |
176 | if (!who->apply (splay (skill_tool))) |
161 | return 0; |
177 | return 0; |
162 | |
178 | |
163 | return splay (skill); |
179 | return splay (skill); |
164 | } |
180 | } |
165 | |
181 | |
166 | object * |
182 | object * |
167 | find_skill_by_name (object *who, const char *name) |
183 | find_skill_by_name_fuzzy (object *who, const char *name) |
168 | { |
184 | { |
169 | if (!name) |
185 | if (name) |
170 | return 0; |
|
|
171 | |
|
|
172 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
186 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
173 | if ((tmp->type == SKILL || tmp->type == SKILL_TOOL) |
187 | if ((tmp->type == SKILL || tmp->type == SKILL_TOOL) |
174 | && tmp->skill.begins_with (name)) |
188 | && tmp->skill.starts_with (name)) |
175 | if (object *skop = find_skill_by_name (who, tmp->skill)) |
189 | if (object *skop = find_skill_by_name (who, tmp->skill)) |
176 | return skop; |
190 | return skop; |
177 | |
191 | |
178 | return 0; |
192 | return 0; |
179 | } |
193 | } |
180 | |
194 | |
181 | /* This returns the skill pointer of the given name (the |
195 | /* This returns the skill pointer of the given name (the |
182 | * one that accumulates exp, has the level, etc). |
196 | * one that accumulates exp, has the level, etc). |
183 | * |
197 | * |
184 | * It is presumed that the player will be needing to actually |
198 | * It is presumed that the player will be needing to actually |
185 | * use the skill, so thus if use of the skill requires a skill |
199 | * use the skill, so thus if use of the skill requires a skill |
186 | * tool, this code will equip it. |
200 | * tool, this code will equip it. |
187 | * |
201 | * |
188 | * This code is basically the same as find_skill_by_name() above, |
202 | * This code is basically the same as find_skill_by_name() above, |
189 | * but instead a skill name, we search by matching number. |
203 | * but instead a skill name, we search by matching number. |
190 | * this replaces find_skill. |
204 | * this replaces find_skill. |
|
|
205 | * |
|
|
206 | * MUST NOT BE USED IN NEW CODE! (schmorp) |
191 | */ |
207 | */ |
192 | object * |
208 | object * |
193 | find_skill_by_number (object *who, int skillno) |
209 | find_skill_by_number (object *who, int skillno) |
194 | { |
210 | { |
195 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
211 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
… | |
… | |
198 | return skop; |
214 | return skop; |
199 | |
215 | |
200 | return 0; |
216 | return 0; |
201 | } |
217 | } |
202 | |
218 | |
203 | /* This changes the objects chosen_skill to new_skill. |
219 | object * |
204 | * return 1 on success, 0 on error |
220 | object::give_skill (shstr_cmp name, bool can_use) |
205 | */ |
|
|
206 | bool |
|
|
207 | object::change_skill (object *new_skill) |
|
|
208 | { |
221 | { |
209 | if (type != PLAYER) |
222 | object *skill = find_skill (this, name); |
210 | return 0; |
|
|
211 | |
223 | |
212 | // optimise this supposedly common case |
|
|
213 | if (new_skill == chosen_skill) |
|
|
214 | return 1; |
|
|
215 | |
|
|
216 | if (chosen_skill) |
224 | if (!skill) |
217 | { |
225 | skill = give_skill_by_name (this, name); |
218 | chosen_skill->flag [FLAG_APPLIED] = false; |
|
|
219 | change_abil (this, chosen_skill); |
|
|
220 | } |
|
|
221 | |
226 | |
222 | chosen_skill = new_skill; |
227 | if (skill && can_use) |
|
|
228 | skill->flag [FLAG_CAN_USE_SKILL] = true; |
223 | |
229 | |
224 | if (chosen_skill) |
|
|
225 | { |
|
|
226 | chosen_skill->flag [FLAG_APPLIED] = true; |
|
|
227 | change_abil (this, chosen_skill); |
|
|
228 | } |
|
|
229 | |
|
|
230 | // always clear current weapon, as the selected skill could |
|
|
231 | // conflict with the current weapon skill, which would go |
|
|
232 | // undetected and exp would be given to the wrong skill. |
|
|
233 | current_weapon = 0; |
|
|
234 | |
|
|
235 | update_stats (); |
|
|
236 | return 1; |
230 | return skill; |
237 | } |
231 | } |
238 | |
232 | |
239 | /* do_skill() - Main skills use function-similar in scope to cast_spell(). |
233 | /* do_skill() - Main skills use function-similar in scope to cast_spell(). |
240 | * We handle all requests for skill use outside of some combat here. |
234 | * We handle all requests for skill use outside of some combat here. |
241 | * We require a separate routine outside of fire() so as to allow monsters |
235 | * We require a separate routine outside of fire() so as to allow monsters |
242 | * to utilize skills. Returns 1 on use of skill, otherwise 0. |
236 | * to utilize skills. Returns 1 on use of skill, otherwise 0. |
243 | * This is changed (2002-11-30) from the old method that returned |
237 | * This is changed (2002-11-30) from the old method that returned |
244 | * exp - no caller needed that info, but it also prevented the callers |
238 | * exp - no caller needed that info, but it also prevented the callers |
245 | * from know if a skill was actually used, as many skills don't |
239 | * from know if a skill was actually used, as many skills don't |
246 | * give any exp for their direct use (eg, throwing). |
240 | * give any exp for their direct use (eg, throwing). |
… | |
… | |
248 | */ |
242 | */ |
249 | int |
243 | int |
250 | do_skill (object *op, object *part, object *skill, int dir, const char *string) |
244 | do_skill (object *op, object *part, object *skill, int dir, const char *string) |
251 | { |
245 | { |
252 | int success = 0, exp = 0; |
246 | int success = 0, exp = 0; |
253 | int did_alc = 0; |
|
|
254 | |
247 | |
255 | if (!skill) |
248 | if (!skill) |
256 | return 0; |
249 | return 0; |
257 | |
250 | |
258 | /* The code below presumes that the skill points to the object that |
251 | /* The code below presumes that the skill points to the object that |
… | |
… | |
283 | /* Not 100% sure if this will work with new movement code - |
276 | /* Not 100% sure if this will work with new movement code - |
284 | * the levitation skill has move_type for flying, so when |
277 | * the levitation skill has move_type for flying, so when |
285 | * equipped, that should transfer to player, when not, |
278 | * equipped, that should transfer to player, when not, |
286 | * shouldn't. |
279 | * shouldn't. |
287 | */ |
280 | */ |
288 | if (QUERY_FLAG (skill, FLAG_APPLIED)) |
281 | if (skill->flag [FLAG_APPLIED]) |
289 | { |
282 | { |
290 | CLEAR_FLAG (skill, FLAG_APPLIED); |
283 | skill->clr_flag (FLAG_APPLIED); |
291 | new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); |
284 | new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); |
292 | } |
285 | } |
293 | else |
286 | else |
294 | { |
287 | { |
295 | SET_FLAG (skill, FLAG_APPLIED); |
288 | skill->set_flag (FLAG_APPLIED); |
296 | new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!."); |
289 | new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!"); |
297 | } |
290 | } |
298 | |
291 | |
299 | op->update_stats (); |
292 | op->update_stats (); |
300 | success = 1; |
293 | success = 1; |
301 | break; |
294 | break; |
… | |
… | |
311 | case SK_HIDING: |
304 | case SK_HIDING: |
312 | exp = success = hide (op, skill); |
305 | exp = success = hide (op, skill); |
313 | break; |
306 | break; |
314 | |
307 | |
315 | case SK_JUMPING: |
308 | case SK_JUMPING: |
316 | success = jump (op, dir, skill); |
309 | exp = success = jump (op, dir, skill); |
317 | break; |
310 | break; |
318 | |
311 | |
319 | case SK_INSCRIPTION: |
312 | case SK_INSCRIPTION: |
320 | exp = success = write_on_item (op, string, skill); |
313 | exp = success = write_on_item (op, string, skill); |
321 | break; |
314 | break; |
… | |
… | |
381 | case SK_ALCHEMY: |
374 | case SK_ALCHEMY: |
382 | case SK_THAUMATURGY: |
375 | case SK_THAUMATURGY: |
383 | case SK_LITERACY: |
376 | case SK_LITERACY: |
384 | case SK_WOODSMAN: |
377 | case SK_WOODSMAN: |
385 | /* first, we try to find a cauldron, and do the alchemy thing. |
378 | /* first, we try to find a cauldron, and do the alchemy thing. |
386 | * failing that, we go and identify stuff. |
379 | * failing that, we go and identify stuff. |
387 | */ |
380 | */ |
|
|
381 | { |
|
|
382 | bool found_cauldron = false; |
|
|
383 | |
388 | for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) |
384 | for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) |
389 | { |
385 | { |
390 | next = tmp->above; |
386 | next = tmp->above; |
391 | |
387 | |
392 | if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) |
388 | if (tmp->flag [FLAG_IS_CAULDRON]) |
393 | { |
389 | { |
|
|
390 | found_cauldron = true; |
|
|
391 | |
|
|
392 | if (tmp->skill != skill->skill) |
|
|
393 | { |
|
|
394 | op->failmsgf ("You can't use the %s with the %s skill!", |
|
|
395 | query_name (tmp), |
|
|
396 | query_name (skill)); |
|
|
397 | break; |
|
|
398 | } |
|
|
399 | |
394 | attempt_do_alchemy (op, tmp); |
400 | attempt_do_alchemy (op, tmp, skill); |
395 | |
401 | |
396 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
402 | if (tmp->flag [FLAG_APPLIED]) |
397 | esrv_send_inventory (op, tmp); |
403 | esrv_send_inventory (op, tmp); |
398 | |
|
|
399 | did_alc = 1; |
|
|
400 | } |
404 | } |
401 | } |
405 | } |
402 | |
406 | |
403 | if (did_alc == 0) |
407 | if (!found_cauldron) |
404 | exp = success = skill_ident (op, skill); |
408 | exp = success = skill_ident (op, skill); |
405 | |
409 | } |
406 | break; |
410 | break; |
407 | |
411 | |
408 | case SK_DET_MAGIC: |
412 | case SK_DET_MAGIC: |
409 | case SK_DET_CURSE: |
413 | case SK_DET_CURSE: |
410 | exp = success = skill_ident (op, skill); |
414 | exp = success = skill_ident (op, skill); |
… | |
… | |
441 | case SK_SUMMONING: |
445 | case SK_SUMMONING: |
442 | case SK_CLIMBING: |
446 | case SK_CLIMBING: |
443 | new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); |
447 | new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); |
444 | break; |
448 | break; |
445 | |
449 | |
|
|
450 | case SK_MINING: |
|
|
451 | success = skill_mining (op, part, skill, dir, string); |
|
|
452 | break; |
|
|
453 | |
446 | default: |
454 | default: |
447 | LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); |
455 | LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); |
448 | break; |
456 | break; |
449 | } |
457 | } |
450 | |
458 | |
451 | /* For players we now update the speed_left from using the skill. |
459 | /* For players we now update the speed_left from using the skill. |
452 | * Monsters have no skill use time because of the random nature in |
460 | * Monsters have no skill use time because of the random nature in |
453 | * which use_monster_skill is called already simulates this. |
461 | * which use_monster_skill is called already simulates this. |
454 | * If certain skills should take more/less time, that should be |
462 | * If certain skills should take more/less time, that should be |
455 | * in the code for the skill itself. |
463 | * in the code for the skill itself. |
456 | */ |
464 | */ |
457 | |
|
|
458 | if (op->type == PLAYER) |
465 | if (op->type == PLAYER) |
459 | op->speed_left -= 1.f; |
466 | op->speed_left -= 1.f; |
460 | |
467 | |
461 | /* this is a good place to add experience for successfull use of skills. |
468 | /* this is a good place to add experience for successfull use of skills. |
462 | * Note that add_exp() will figure out player/monster experience |
469 | * Note that add_exp() will figure out player/monster experience |
… | |
… | |
508 | * non-living magic obj, runes and everything else. |
515 | * non-living magic obj, runes and everything else. |
509 | * |
516 | * |
510 | * If an object is not alive and magical we set the base exp higher to |
517 | * If an object is not alive and magical we set the base exp higher to |
511 | * help out exp awards for skill_ident skills. Also, if |
518 | * help out exp awards for skill_ident skills. Also, if |
512 | * an item is type RUNE, we give out exp based on stats.Cha |
519 | * an item is type RUNE, we give out exp based on stats.Cha |
513 | * and level (this was the old system) -b.t. |
520 | * and level (this was the old system) -b.t. |
514 | */ |
521 | */ |
515 | |
|
|
516 | if (!op) |
522 | if (!op) |
517 | { /* no item/creature */ |
523 | { /* no item/creature */ |
518 | op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty; |
524 | op_lvl = max (1, who->map->difficulty); |
519 | op_exp = 0; |
525 | op_exp = 0; |
520 | } |
526 | } |
521 | else if (op->type == RUNE || op->type == TRAP) |
527 | else if (op->type == RUNE || op->type == TRAP) |
522 | { /* all traps. If stats.Cha > 1 we use that |
528 | { /* all traps. If stats.Cha > 1 we use that |
523 | * for the amount of experience */ |
529 | * for the amount of experience */ |
… | |
… | |
526 | } |
532 | } |
527 | else |
533 | else |
528 | { /* all other items/living creatures */ |
534 | { /* all other items/living creatures */ |
529 | op_exp = op->stats.exp; |
535 | op_exp = op->stats.exp; |
530 | op_lvl = op->level; |
536 | op_lvl = op->level; |
531 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
537 | if (!op->flag [FLAG_ALIVE]) |
532 | { /* for ident/make items */ |
538 | op_lvl += 5 * abs (op->magic); /* for ident/make items */ |
533 | op_lvl += 5 * abs (op->magic); |
|
|
534 | } |
|
|
535 | } |
539 | } |
536 | |
540 | |
537 | if (op_lvl < 1) |
541 | if (op_lvl < 1) |
538 | op_lvl = 1; |
542 | op_lvl = 1; |
539 | |
543 | |
… | |
… | |
566 | } |
570 | } |
567 | } |
571 | } |
568 | else |
572 | else |
569 | { |
573 | { |
570 | /* Don't divide by zero here! */ |
574 | /* Don't divide by zero here! */ |
571 | lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1); |
575 | lvl_mult = (float) op_lvl / (float) max (1, skill->level); |
572 | } |
576 | } |
573 | } |
577 | } |
574 | |
578 | |
575 | /* assemble the exp total, and return value */ |
579 | /* assemble the exp total, and return value */ |
576 | |
580 | |
… | |
… | |
585 | } |
589 | } |
586 | |
590 | |
587 | /* Learn skill. This inserts the requested skill in the player's |
591 | /* Learn skill. This inserts the requested skill in the player's |
588 | * inventory. The skill field of the scroll should have the |
592 | * inventory. The skill field of the scroll should have the |
589 | * exact name of the requested skill. |
593 | * exact name of the requested skill. |
590 | * This one actually teaches the player the skill as something |
594 | * This one actually teaches the player the skill as something |
591 | * they can equip. |
595 | * they can equip. |
592 | * Return 0 if the player knows the skill, 1 if the |
596 | * Return 0 if the player knows the skill, 1 if the |
593 | * player learns the skill, 2 otherwise. |
597 | * player learns the skill, 2 otherwise. |
594 | */ |
598 | */ |
595 | int |
599 | int |
… | |
… | |
602 | } |
606 | } |
603 | |
607 | |
604 | object *tmp = find_skill (pl, scroll->skill); |
608 | object *tmp = find_skill (pl, scroll->skill); |
605 | |
609 | |
606 | /* player already knows it */ |
610 | /* player already knows it */ |
607 | if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) |
611 | if (tmp && tmp->flag [FLAG_CAN_USE_SKILL]) |
608 | return 0; |
612 | return 0; |
609 | |
613 | |
610 | /* now a random change to learn, based on player Int. |
614 | /* now a random change to learn, based on player Int. |
611 | * give bonus based on level - otherwise stupid characters |
615 | * give bonus based on level - otherwise stupid characters |
612 | * might never be able to learn anything. |
616 | * might never be able to learn anything. |
… | |
… | |
621 | { |
625 | { |
622 | LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); |
626 | LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); |
623 | return 2; |
627 | return 2; |
624 | } |
628 | } |
625 | |
629 | |
626 | SET_FLAG (tmp, FLAG_CAN_USE_SKILL); |
630 | tmp->set_flag (FLAG_CAN_USE_SKILL); |
627 | link_player_skills (pl); |
631 | |
628 | return 1; |
632 | return 1; |
629 | } |
633 | } |
630 | |
634 | |
631 | /* Gives a percentage clipped to 0% -> 100% of a/b. */ |
635 | /* Gives a percentage clipped to 0% -> 100% of a/b. */ |
632 | /* Probably belongs in some global utils-type file? */ |
636 | /* Probably belongs in some global utils-type file? */ |
… | |
… | |
644 | return 0; |
648 | return 0; |
645 | else if (rv > 100) |
649 | else if (rv > 100) |
646 | return 100; |
650 | return 100; |
647 | |
651 | |
648 | return rv; |
652 | return rv; |
|
|
653 | } |
|
|
654 | |
|
|
655 | static int |
|
|
656 | cmp_skillp (const void *sk1, const void *sk2) |
|
|
657 | { |
|
|
658 | return strcmp (&((*(const object **) sk1)->name), |
|
|
659 | &((*(const object **) sk2)->name)); |
649 | } |
660 | } |
650 | |
661 | |
651 | /* show_skills() - Meant to allow players to examine |
662 | /* show_skills() - Meant to allow players to examine |
652 | * their current skill list. |
663 | * their current skill list. |
653 | * This shows the amount of exp they have in the skills. |
664 | * This shows the amount of exp they have in the skills. |
654 | * we also include some other non skill related info (god, |
665 | * we also include some other non skill related info (god, |
655 | * max weapon improvments, item power). |
666 | * max weapon improvments, item power). |
656 | * Note this function is a bit more complicated becauase we |
667 | * Note this function is a bit more complicated because we |
657 | * we want ot sort the skills before printing them. If we |
668 | * we want to sort the skills before printing them. If we |
658 | * just dumped this as we found it, this would be a bit |
669 | * just dumped this as we found it, this would be a bit |
659 | * simpler. |
670 | * simpler. |
660 | */ |
671 | */ |
661 | //TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo. |
|
|
662 | void |
672 | void |
663 | show_skills (object *op, const char *search) |
673 | show_skills (object *pl, const char *search) |
664 | { |
674 | { |
665 | object *tmp = NULL; |
|
|
666 | char buf[MAX_BUF]; |
|
|
667 | const char *cp; |
675 | const char *cp; |
668 | int i, num_skills_found = 0; |
676 | int i, num_skills_found = 0; |
669 | static const char *const periods = "........................................"; |
677 | object *skills[CS_NUM_SKILLS]; |
|
|
678 | object *op = pl->contr->ob; |
670 | |
679 | |
671 | /* Need to have a pointer and use strdup for qsort to work properly */ |
680 | /* find the skills */ |
672 | char skills[NUM_SKILLS][MAX_BUF]; |
|
|
673 | |
|
|
674 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
681 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
675 | { |
682 | { |
676 | if (tmp->type == SKILL) |
683 | if (tmp->type == SKILL) |
677 | { |
684 | { |
678 | if (search && strstr (tmp->name, search) == NULL) |
685 | if (search && !tmp->name.contains (search)) |
679 | continue; |
686 | continue; |
680 | /* Basically want to fill this out to 40 spaces with periods */ |
|
|
681 | sprintf (buf, "%s%s", &tmp->name, periods); |
|
|
682 | buf[40] = 0; |
|
|
683 | |
687 | |
684 | if (settings.permanent_exp_ratio) |
688 | skills[num_skills_found++] = tmp; |
685 | sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)", |
|
|
686 | buf, tmp->level, tmp->stats.exp, |
|
|
687 | level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp)); |
|
|
688 | else |
|
|
689 | sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")", |
|
|
690 | buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul)); |
|
|
691 | |
689 | |
692 | /* I don't know why some characters get a bunch of skills, but |
690 | /* I don't know why some characters get a bunch of skills, but |
693 | * it sometimes happens (maybe a leftover from bugier earlier code |
691 | * it sometimes happens (maybe a leftover from bugier earlier code |
694 | * and those character are still about). In any case, lets handle |
692 | * and those character are still about). In any case, lets handle |
695 | * it so it doesn't crash the server - otherwise, one character may |
693 | * it so it doesn't crash the server - otherwise, one character may |
696 | * crash the server numerous times. |
694 | * crash the server numerous times. |
697 | */ |
695 | */ |
698 | if (num_skills_found >= NUM_SKILLS) |
696 | if (num_skills_found >= CS_NUM_SKILLS) |
699 | { |
697 | { |
700 | new_draw_info (NDI_RED, 0, op, "Your character has too many skills."); |
698 | new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Your character has too many skills."); |
701 | new_draw_info (NDI_RED, 0, op, "Something isn't right - contact the server admin"); |
699 | new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Something isn't right - contact the server admin"); |
702 | break; |
700 | break; |
703 | } |
701 | } |
704 | } |
702 | } |
705 | } |
703 | } |
706 | |
704 | |
707 | new_draw_info (NDI_UNIQUE, 0, op, "Player skills:"); |
705 | dynbuf_text &msg = msg_dynbuf; msg.clear (); |
|
|
706 | |
|
|
707 | msg << "T<Player skills:>\n\n"; |
708 | if (num_skills_found > 1) |
708 | if (num_skills_found > 1) |
709 | qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) std::strcmp); |
709 | qsort (skills, num_skills_found, sizeof (skills [0]), cmp_skillp); |
710 | |
710 | |
|
|
711 | char buf[31]; /* +1 for '\0' */ |
|
|
712 | const char *const periods = ".............................."; // 30 |
|
|
713 | |
711 | for (i = 0; i < num_skills_found; i++) |
714 | for (i = 0; i < num_skills_found; i++) { |
712 | new_draw_info (NDI_UNIQUE, 0, op, skills[i]); |
715 | object *tmp = skills[i]; |
713 | |
716 | |
714 | new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5); |
717 | /* Basically want to fill this out to 30 spaces with periods */ |
|
|
718 | snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods); |
|
|
719 | |
|
|
720 | msg << " C<"; |
|
|
721 | |
|
|
722 | if (settings.permanent_exp_ratio) |
|
|
723 | msg.printf ("%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)", |
|
|
724 | buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul), |
|
|
725 | clipped_percent (tmp->perm_exp, tmp->stats.exp)); |
|
|
726 | else |
|
|
727 | msg.printf ("%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")", |
|
|
728 | buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul)); |
|
|
729 | |
|
|
730 | msg << ">\n"; |
|
|
731 | } |
|
|
732 | |
|
|
733 | msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r"; |
715 | |
734 | |
716 | cp = determine_god (op); |
735 | cp = determine_god (op); |
717 | new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time"); |
736 | msg << "You worship " << (cp ? cp : "no god at current time") << ".\r"; |
718 | |
737 | |
719 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your equipped item power is %d out of %d\n", |
738 | msg << "Your equipped item power is " << (int)op->contr->item_power |
720 | op->contr->item_power, (int) (op->level * settings.item_power_factor)); |
739 | << " out of " << int (op->level * settings.item_power_factor) |
721 | } |
740 | << ".\n"; |
722 | |
741 | |
|
|
742 | pl->contr->infobox (MSG_CHANNEL ("skills"), msg); |
|
|
743 | } |
|
|
744 | |
723 | /* use_skill() - similar to invoke command, it executes the skill in the |
745 | /* use_skill() - similar to invoke command, it executes the skill in the |
724 | * direction that the user is facing. Returns false if we are unable to |
746 | * direction that the user is facing. Returns false if we are unable to |
725 | * change to the requested skill, or were unable to use the skill properly. |
747 | * change to the requested skill, or were unable to use the skill properly. |
726 | * This is tricky because skills can have spaces. We basically roll |
748 | * This is tricky because skills can have spaces. We basically roll |
727 | * our own find_skill_by_name so we can try to do better string matching. |
749 | * our own find_skill_by_name so we can try to do better string matching. |
728 | */ |
750 | */ |
729 | int |
751 | int |
730 | use_skill (object *op, const char *string) |
752 | use_skill (object *op, const char *string) |
731 | { |
753 | { |
… | |
… | |
734 | |
756 | |
735 | if (!string) |
757 | if (!string) |
736 | return 0; |
758 | return 0; |
737 | |
759 | |
738 | for (skop = op->inv; skop; skop = skop->below) |
760 | for (skop = op->inv; skop; skop = skop->below) |
739 | { |
761 | if ((skop->type == SKILL || skop->type == SKILL_TOOL) |
740 | if (skop->type == SKILL |
|
|
741 | && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) |
|
|
742 | && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) |
762 | && !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill)))) |
|
|
763 | { |
|
|
764 | skop = find_skill_by_name (op, skop->skill); |
743 | break; |
765 | break; |
744 | else if (skop->type == SKILL_TOOL |
|
|
745 | && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) |
|
|
746 | break; |
|
|
747 | } |
766 | } |
748 | |
767 | |
749 | if (!skop) |
768 | if (!skop) |
750 | { |
769 | { |
751 | new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); |
770 | op->failmsgf ("Unable to find skill %s.", string); |
|
|
771 | return 0; |
|
|
772 | } |
|
|
773 | |
|
|
774 | if (!(skill_flags [skop->subtype] & SF_USE)) |
|
|
775 | { |
|
|
776 | op->failmsgf ( |
|
|
777 | "You feel as if you wanted to do something funny, but you can't remember what. " |
|
|
778 | "H<The %s skill cannot be C<use_skill>'ed - maybe you need to C<ready_skill> it, " |
|
|
779 | "use it with some item, or it's always active.>", |
|
|
780 | &skop->skill |
|
|
781 | ); |
752 | return 0; |
782 | return 0; |
753 | } |
783 | } |
754 | |
784 | |
755 | len = strlen (skop->skill); |
785 | len = strlen (skop->skill); |
756 | |
786 | |
… | |
… | |
782 | } |
812 | } |
783 | |
813 | |
784 | static bool |
814 | static bool |
785 | hth_skill_p (object *skill) |
815 | hth_skill_p (object *skill) |
786 | { |
816 | { |
787 | return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT; |
817 | return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_ITEM)) == SF_COMBAT; |
788 | } |
818 | } |
789 | |
819 | |
790 | /* This finds the first unarmed skill the player has, and returns it. |
820 | /* This finds the first unarmed skill the player has, and returns it. |
791 | */ |
821 | */ |
792 | static object * |
822 | static object * |
793 | find_player_hth_skill (object *op) |
823 | find_player_hth_skill (object *op) |
794 | { |
824 | { |
795 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
825 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
796 | if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp)) |
826 | if (tmp->type == SKILL && tmp->flag [FLAG_CAN_USE_SKILL] && hth_skill_p (tmp)) |
797 | return tmp; |
827 | return tmp; |
798 | |
828 | |
799 | return 0; |
829 | return 0; |
800 | } |
830 | } |
801 | |
831 | |
… | |
… | |
820 | * the caller should have set it appropriately). We still want to pass |
850 | * the caller should have set it appropriately). We still want to pass |
821 | * through that code if skill is set to change to the skill. |
851 | * through that code if skill is set to change to the skill. |
822 | */ |
852 | */ |
823 | if (player *pl = op->contr) |
853 | if (player *pl = op->contr) |
824 | { |
854 | { |
825 | if (!pl->combat_ob) |
855 | if (skill) |
826 | { |
856 | { |
827 | if (QUERY_FLAG (op, FLAG_READY_WEAPON)) |
857 | if (!op->apply (skill)) |
828 | { |
858 | return 0; |
829 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
830 | if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) |
|
|
831 | break; |
|
|
832 | |
|
|
833 | if (!tmp) |
|
|
834 | LOG (llevError, "Could not find applied weapon on %s\n", &op->name); |
|
|
835 | |
|
|
836 | pl->combat_ob = tmp; |
|
|
837 | } |
859 | } |
838 | |
860 | else |
|
|
861 | { |
839 | if (!pl->combat_ob) |
862 | if (!pl->combat_ob) |
840 | { |
863 | { |
|
|
864 | if (op->flag [FLAG_READY_WEAPON]) |
|
|
865 | { |
|
|
866 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
867 | if (tmp->type == WEAPON && tmp->flag [FLAG_APPLIED]) |
|
|
868 | break; |
|
|
869 | |
841 | if (!skill) |
870 | if (!tmp) |
|
|
871 | LOG (llevError, "Could not find applied weapon on %s\n", &op->name); |
|
|
872 | |
|
|
873 | pl->combat_ob = tmp; |
|
|
874 | } |
|
|
875 | |
|
|
876 | if (!pl->combat_ob) |
842 | { |
877 | { |
843 | /* See if the players chosen skill is a combat skill, and use |
878 | /* See if the players chosen skill is a combat skill, and use |
844 | * it if appropriate. |
879 | * it if appropriate. |
845 | */ |
880 | */ |
846 | if (op->chosen_skill && hth_skill_p (op->chosen_skill)) |
881 | if (op->chosen_skill && hth_skill_p (op->chosen_skill)) |
… | |
… | |
850 | skill = find_player_hth_skill (op); |
885 | skill = find_player_hth_skill (op); |
851 | |
886 | |
852 | if (!skill) |
887 | if (!skill) |
853 | new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); |
888 | new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); |
854 | } |
889 | } |
|
|
890 | |
|
|
891 | op->apply (skill); |
855 | } |
892 | } |
856 | |
893 | |
857 | if (skill) |
894 | if (!pl->combat_ob) |
858 | { |
895 | { |
859 | op->change_skill (0); |
896 | LOG (llevError, "Could not find anything to attack on %s\n", &op->name); |
860 | apply_special (op, skill, AP_APPLY); |
897 | return 0; |
861 | } |
898 | } |
862 | } |
899 | } |
863 | |
900 | |
864 | if (!pl->combat_ob) |
901 | if (!op->apply (pl->combat_ob)) |
|
|
902 | return 0; |
|
|
903 | |
|
|
904 | if (!op->chosen_skill) |
865 | { |
905 | { |
866 | LOG (llevError, "Could not find anything to attack on %s\n", &op->name); |
906 | LOG (llevError, "do_skill_attack: weapon has no skill (%s)", pl->combat_ob->debug_desc ()); |
|
|
907 | new_draw_info (NDI_RED | NDI_REPLY, 0, op, "You hit a bug in the server, please contact an admin!"); |
867 | return 0; |
908 | return 0; |
868 | } |
909 | } |
869 | } |
910 | } |
870 | |
|
|
871 | if (!op->change_weapon (pl->combat_ob)) |
|
|
872 | return 0; |
|
|
873 | |
911 | |
874 | /* lose invisiblity/hiding status for running attacks */ |
912 | /* lose invisiblity/hiding status for running attacks */ |
875 | if (pl->tmp_invis) |
913 | if (pl->tmp_invis) |
876 | { |
914 | { |
877 | pl->tmp_invis = 0; |
915 | pl->tmp_invis = 0; |
878 | op->invisible = 0; |
916 | op->invisible = 0; |
879 | op->hide = 0; |
917 | op->flag [FLAG_HIDDEN] = 0; |
880 | update_object (op, UP_OBJ_CHANGE); |
918 | update_object (op, UP_OBJ_CHANGE); |
881 | } |
919 | } |
882 | } |
920 | } |
883 | |
921 | |
884 | int success = attack_ob (tmp, op); |
922 | int success = attack_ob (tmp, op); |
885 | |
923 | |
886 | /* print appropriate messages to the player */ |
924 | /* print appropriate messages to the player */ |
887 | |
925 | |
888 | if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) |
926 | if (success && string && tmp && !tmp->flag [FLAG_FREED]) |
889 | { |
927 | { |
890 | if (op->type == PLAYER) |
928 | if (op->type == PLAYER) |
891 | new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); |
929 | new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); |
892 | else if (tmp->type == PLAYER) |
930 | else if (tmp->type == PLAYER) |
893 | new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); |
931 | new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); |
… | |
… | |
896 | return success; |
934 | return success; |
897 | } |
935 | } |
898 | |
936 | |
899 | /* skill_attack() - Core routine for use when we attack using a skills |
937 | /* skill_attack() - Core routine for use when we attack using a skills |
900 | * system. In essence, this code handles |
938 | * system. In essence, this code handles |
901 | * all skill-based attacks, ie hth, missile and melee weapons should be |
939 | * all skill-based attacks, i.e. hth, missile and melee weapons should be |
902 | * treated here. If an opponent is already supplied by move_player(), |
940 | * treated here. If an opponent is already supplied by move_player(), |
903 | * we move right onto do_skill_attack(), otherwise we find if an |
941 | * we move right onto do_skill_attack(), otherwise we find if an |
904 | * appropriate opponent exists. |
942 | * appropriate opponent exists. |
905 | * |
943 | * |
906 | * This is called by move_player() and attack_hth() |
944 | * This is called by move_player() and attack_hth() |
… | |
… | |
915 | int mflags; |
953 | int mflags; |
916 | |
954 | |
917 | if (!dir) |
955 | if (!dir) |
918 | dir = pl->facing; |
956 | dir = pl->facing; |
919 | |
957 | |
920 | tx = freearr_x[dir]; |
958 | tx = DIRX (dir); |
921 | ty = freearr_y[dir]; |
959 | ty = DIRY (dir); |
922 | |
960 | |
923 | /* If we don't yet have an opponent, find if one exists, and attack. |
961 | /* If we don't yet have an opponent, find if one exists, and attack. |
924 | * Legal opponents are the same as outlined in move_player_attack() |
962 | * Legal opponents are the same as outlined in move_player_attack() |
925 | */ |
963 | */ |
926 | if (!tmp) |
964 | if (!tmp) |
927 | { |
965 | { |
928 | m = pl->map; |
966 | m = pl->map; |
929 | tx = pl->x + freearr_x[dir]; |
967 | tx = pl->x + DIRX (dir); |
930 | ty = pl->y + freearr_y[dir]; |
968 | ty = pl->y + DIRY (dir); |
931 | |
969 | |
932 | mflags = get_map_flags (m, &m, tx, ty, &tx, &ty); |
970 | mflags = get_map_flags (m, &m, tx, ty, &tx, &ty); |
933 | if (mflags & P_OUT_OF_MAP) |
971 | if (mflags & P_OUT_OF_MAP) |
934 | return 0; |
972 | return 0; |
935 | |
973 | |
936 | /* space must be blocked for there to be anything interesting to do */ |
974 | /* space must be blocked for there to be anything interesting to do */ |
937 | if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) |
975 | if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) |
938 | return 0; |
976 | return 0; |
939 | |
977 | |
940 | for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above) |
978 | for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above) |
941 | if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) |
979 | if ((tmp->flag [FLAG_ALIVE] && tmp->stats.hp >= 0) || tmp->flag [FLAG_CAN_ROLL] || tmp->type == LOCKED_DOOR) |
942 | { |
980 | { |
943 | /* Don't attack party members */ |
981 | /* Don't attack party members */ |
944 | if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) |
982 | if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) |
945 | return 0; |
983 | return 0; |
946 | |
984 | |
… | |
… | |
968 | static int |
1006 | static int |
969 | attack_hth (object *pl, int dir, const char *string, object *skill) |
1007 | attack_hth (object *pl, int dir, const char *string, object *skill) |
970 | { |
1008 | { |
971 | object *enemy = NULL, *weapon; |
1009 | object *enemy = NULL, *weapon; |
972 | |
1010 | |
973 | if (QUERY_FLAG (pl, FLAG_READY_WEAPON)) |
1011 | if (pl->flag [FLAG_READY_WEAPON]) |
974 | for (weapon = pl->inv; weapon; weapon = weapon->below) |
1012 | for (weapon = pl->inv; weapon; weapon = weapon->below) |
975 | { |
1013 | { |
976 | if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED)) |
1014 | if (weapon->type == WEAPON && weapon->flag [FLAG_APPLIED]) |
977 | { |
1015 | { |
978 | CLEAR_FLAG (weapon, FLAG_APPLIED); |
1016 | weapon->clr_flag (FLAG_APPLIED); |
979 | CLEAR_FLAG (pl, FLAG_READY_WEAPON); |
1017 | pl->clr_flag (FLAG_READY_WEAPON); |
980 | pl->update_stats (); |
1018 | pl->update_stats (); |
981 | if (pl->type == PLAYER) |
1019 | if (pl->type == PLAYER) |
982 | { |
1020 | { |
983 | new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); |
1021 | new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); |
984 | esrv_update_item (UPD_FLAGS, pl, weapon); |
1022 | esrv_update_item (UPD_FLAGS, pl, weapon); |
… | |
… | |
1002 | */ |
1040 | */ |
1003 | static int |
1041 | static int |
1004 | attack_melee_weapon (object *op, int dir, const char *string, object *skill) |
1042 | attack_melee_weapon (object *op, int dir, const char *string, object *skill) |
1005 | { |
1043 | { |
1006 | |
1044 | |
1007 | if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) |
1045 | if (!op->flag [FLAG_READY_WEAPON]) |
1008 | { |
1046 | { |
1009 | if (op->type == PLAYER) |
1047 | if (op->type == PLAYER) |
1010 | new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); |
1048 | new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); |
1011 | |
1049 | |
1012 | return 0; |
1050 | return 0; |