… | |
… | |
51 | # define def(uc, flags) flags, |
51 | # define def(uc, flags) flags, |
52 | # include "skillinc.h" |
52 | # include "skillinc.h" |
53 | # undef def |
53 | # undef def |
54 | }; |
54 | }; |
55 | |
55 | |
|
|
56 | vector<object_ptr> skillvec; |
|
|
57 | |
56 | static int attack_hth (object *pl, int dir, const char *string, object *skill); |
58 | static int attack_hth (object *pl, int dir, const char *string, object *skill); |
57 | static int attack_melee_weapon (object *op, int dir, const char *string, object *skill); |
59 | static int attack_melee_weapon (object *op, int dir, const char *string, object *skill); |
58 | |
60 | |
59 | /* init_skills basically just sets up the skill_names table |
61 | /* init_skills basically just sets up the skill_names table |
60 | * above. The index into the array is set up by the |
62 | * above. The index into the array is set up by the |
61 | * subtypes. |
63 | * subtypes. |
62 | */ |
64 | */ |
63 | void |
65 | void |
64 | init_skills () |
66 | init_skills () |
65 | { |
67 | { |
66 | for_all_archetypes (at) |
68 | // nop |
67 | if (at->type == SKILL) |
69 | } |
|
|
70 | |
|
|
71 | void |
|
|
72 | add_skill_archetype (object *o) |
|
|
73 | { |
|
|
74 | assert (("skill name must equal skill skill", o->name == o->skill)); |
|
|
75 | |
|
|
76 | for (vector<object_ptr>::iterator i = skillvec.begin (); i != skillvec.end (); ++i) |
|
|
77 | if ((*i)->name == o->name) |
68 | { |
78 | { |
69 | if (skill_names[at->subtype]) |
79 | // replace existing entry |
70 | LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", |
80 | SKILL_INDEX (o) = i - skillvec.begin (); |
71 | at->subtype, &skill_names[at->subtype], &at->skill); |
81 | *i = o; |
72 | else |
82 | return; |
73 | skill_names[at->subtype] = at->skill; |
|
|
74 | } |
83 | } |
75 | |
84 | |
76 | /* This isn't really an error if there is no skill subtype set, but |
85 | // add new entry |
77 | * checking for this may catch some user errors. |
86 | assert (("only CS_NUM_SKILLS skills supported by client protocol", skillvec.size () < CS_NUM_SKILLS)); |
78 | */ |
87 | SKILL_INDEX (o) = skillvec.size (); |
79 | for (int i = 1; i < NUM_SKILLS; i++) |
88 | skillvec.push_back (o); |
80 | if (!skill_names[i]) |
|
|
81 | LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i); |
|
|
82 | } |
89 | } |
83 | |
90 | |
84 | /* This function goes through the player inventory and sets |
91 | /* This function goes through the player inventory and sets |
85 | * up the last_skills[] array in the player object. |
92 | * up the last_skills[] array in the player object. |
86 | * the last_skills[] is used to more quickly lookup skills - |
93 | * the last_skills[] is used to more quickly lookup skills - |
87 | * mostly used for sending exp. |
94 | * mostly used for sending exp. |
88 | */ |
95 | */ |
89 | void |
96 | void |
90 | player::link_skills () |
97 | player::link_skills () |
91 | { |
98 | { |
92 | for (int i = 0; i < NUM_SKILLS; ++i) |
99 | for (int i = 0; i < CS_NUM_SKILLS; ++i) |
93 | last_skill_ob [i] = 0; |
100 | last_skill_ob [i] = 0; |
94 | |
101 | |
95 | for (object *tmp = ob->inv; tmp; tmp = tmp->below) |
102 | for (object *tmp = ob->inv; tmp; tmp = tmp->below) |
96 | if (tmp->type == SKILL) |
103 | if (tmp->type == SKILL) |
97 | { |
104 | { |
|
|
105 | int idx = SKILL_INDEX (tmp); |
|
|
106 | |
98 | assert (IN_RANGE_EXC (tmp->subtype, 0, NUM_SKILLS)); |
107 | assert (IN_RANGE_EXC (idx, 0, CS_NUM_SKILLS)); |
99 | |
108 | |
100 | if (last_skill_ob [tmp->subtype] != tmp) |
109 | if (last_skill_ob [idx] != tmp) |
101 | { |
110 | { |
102 | /* This is really a warning, hence no else below */ |
|
|
103 | if (last_skill_ob [tmp->subtype]) |
|
|
104 | LOG (llevError, "Multiple skills with the same subtype? %s, %s\n", |
|
|
105 | &last_skill_ob [tmp->subtype]->skill, &tmp->skill); |
|
|
106 | |
|
|
107 | last_skill_ob [tmp->subtype] = tmp; |
111 | last_skill_ob [idx] = tmp; |
108 | if (ns) |
112 | if (ns) |
109 | ns->last_skill_exp [tmp->subtype] = -1; |
113 | ns->last_skill_exp [idx] = -1; |
110 | } |
114 | } |
111 | } |
115 | } |
112 | } |
116 | } |
113 | |
117 | |
114 | static object * |
118 | static object * |
… | |
… | |
124 | return splay (tmp); |
128 | return splay (tmp); |
125 | |
129 | |
126 | return 0; |
130 | return 0; |
127 | } |
131 | } |
128 | |
132 | |
|
|
133 | object * |
129 | object *player::find_skill (shstr_cmp name) const |
134 | player::find_skill (shstr_cmp name) const |
130 | { |
135 | { |
131 | // might want to use last_skill_obj at one point, or maybe not |
136 | // might want to use last_skill_obj at one point, or maybe not |
132 | return ::find_skill (ob, name); |
137 | return ::find_skill (ob, name); |
133 | } |
138 | } |
134 | |
139 | |
… | |
… | |
162 | |
167 | |
163 | /* Player has a tool to use the skill. If not applied, apply it - |
168 | /* Player has a tool to use the skill. If not applied, apply it - |
164 | * if not successful, return null. If they do have the skill tool |
169 | * if not successful, return null. If they do have the skill tool |
165 | * but not the skill itself, give it to them. |
170 | * but not the skill itself, give it to them. |
166 | */ |
171 | */ |
167 | object *skill = find_skill (who, skill_tool->skill); |
172 | object *skill = who->give_skill (skill_tool->skill); |
168 | |
|
|
169 | if (!skill) |
|
|
170 | skill = give_skill_by_name (who, skill_tool->skill); |
|
|
171 | |
173 | |
172 | if (!skill_tool->flag [FLAG_APPLIED]) |
174 | if (!skill_tool->flag [FLAG_APPLIED]) |
173 | if (!who->apply (splay (skill_tool))) |
175 | if (!who->apply (splay (skill_tool))) |
174 | return 0; |
176 | return 0; |
175 | |
177 | |
… | |
… | |
197 | * tool, this code will equip it. |
199 | * tool, this code will equip it. |
198 | * |
200 | * |
199 | * This code is basically the same as find_skill_by_name() above, |
201 | * This code is basically the same as find_skill_by_name() above, |
200 | * but instead a skill name, we search by matching number. |
202 | * but instead a skill name, we search by matching number. |
201 | * this replaces find_skill. |
203 | * this replaces find_skill. |
|
|
204 | * |
|
|
205 | * MUST NOT BE USED IN NEW CODE! (schmorp) |
202 | */ |
206 | */ |
203 | object * |
207 | object * |
204 | find_skill_by_number (object *who, int skillno) |
208 | find_skill_by_number (object *who, int skillno) |
205 | { |
209 | { |
206 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
210 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
207 | if (tmp->type == SKILL && tmp->subtype == skillno) |
211 | if (tmp->type == SKILL && tmp->subtype == skillno) |
208 | if (object *skop = find_skill_by_name (who, tmp->skill)) |
212 | if (object *skop = find_skill_by_name (who, tmp->skill)) |
209 | return skop; |
213 | return skop; |
210 | |
214 | |
211 | return 0; |
215 | return 0; |
|
|
216 | } |
|
|
217 | |
|
|
218 | object * |
|
|
219 | object::give_skill (shstr_cmp name, bool can_use) |
|
|
220 | { |
|
|
221 | object *skill = find_skill (this, name); |
|
|
222 | |
|
|
223 | if (!skill) |
|
|
224 | skill = give_skill_by_name (this, name); |
|
|
225 | |
|
|
226 | if (skill && can_use) |
|
|
227 | skill->flag [FLAG_CAN_USE_SKILL] = true; |
|
|
228 | |
|
|
229 | return skill; |
212 | } |
230 | } |
213 | |
231 | |
214 | /* do_skill() - Main skills use function-similar in scope to cast_spell(). |
232 | /* do_skill() - Main skills use function-similar in scope to cast_spell(). |
215 | * We handle all requests for skill use outside of some combat here. |
233 | * We handle all requests for skill use outside of some combat here. |
216 | * We require a separate routine outside of fire() so as to allow monsters |
234 | * We require a separate routine outside of fire() so as to allow monsters |
… | |
… | |
428 | new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); |
446 | new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); |
429 | break; |
447 | break; |
430 | |
448 | |
431 | case SK_MINING: |
449 | case SK_MINING: |
432 | success = skill_mining (op, part, skill, dir, string); |
450 | success = skill_mining (op, part, skill, dir, string); |
433 | break; |
|
|
434 | |
|
|
435 | case SK_FISHING: |
|
|
436 | success = skill_fishing (op, part, skill, dir, string); |
|
|
437 | break; |
451 | break; |
438 | |
452 | |
439 | default: |
453 | default: |
440 | LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); |
454 | LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); |
441 | break; |
455 | break; |