1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game |
2 | * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * Crossfire TRT is free software: you can redistribute it and/or modify |
9 | * 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 |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
19 | * along with this program; if not, write to the Free Software |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
|
|
21 | * |
20 | * |
22 | * The author can be reached via e-mail to <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | #include <global.h> |
24 | #include <global.h> |
26 | #include <pwd.h> |
|
|
27 | #include <sproto.h> |
25 | #include <sproto.h> |
28 | #include <sounds.h> |
26 | #include <sounds.h> |
29 | #include <living.h> |
27 | #include <living.h> |
30 | #include <object.h> |
28 | #include <object.h> |
31 | #include <spells.h> |
29 | #include <spells.h> |
… | |
… | |
124 | continue; |
122 | continue; |
125 | |
123 | |
126 | if (*buf == '%') |
124 | if (*buf == '%') |
127 | { /* send one news */ |
125 | { /* send one news */ |
128 | if (size > 0) |
126 | if (size > 0) |
129 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ |
127 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */ |
130 | |
128 | |
131 | strcpy (subject, buf + 1); |
129 | strcpy (subject, buf + 1); |
132 | strip_endline (subject); |
130 | strip_endline (subject); |
133 | size = 0; |
131 | size = 0; |
134 | news[0] = '\0'; |
132 | news[0] = '\0'; |
… | |
… | |
144 | size += strlen (buf); |
142 | size += strlen (buf); |
145 | } |
143 | } |
146 | } |
144 | } |
147 | |
145 | |
148 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, |
146 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, |
149 | MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); |
147 | MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news); |
150 | close_and_delete (fp, comp); |
148 | close_and_delete (fp, comp); |
151 | } |
149 | } |
152 | |
150 | |
153 | /* This loads the first map an puts the player on it. */ |
151 | /* This loads the first map an puts the player on it. */ |
154 | static void |
152 | static void |
155 | set_first_map (object *op) |
153 | set_first_map (object *op) |
156 | { |
154 | { |
157 | op->contr->maplevel = first_map_path; |
155 | op->contr->maplevel = first_map_path; |
158 | op->x = -1; |
156 | op->x = -1; |
159 | op->y = -1; |
157 | op->y = -1; |
160 | } |
|
|
161 | |
|
|
162 | void |
|
|
163 | player::enter_map () |
|
|
164 | { |
|
|
165 | object *tmp = object::create (); |
|
|
166 | |
|
|
167 | EXIT_PATH (tmp) = maplevel; |
|
|
168 | EXIT_X (tmp) = ob->x; |
|
|
169 | EXIT_Y (tmp) = ob->y; |
|
|
170 | ob->enter_exit (tmp); |
|
|
171 | |
|
|
172 | tmp->destroy (); |
|
|
173 | } |
158 | } |
174 | |
159 | |
175 | void |
160 | void |
176 | player::activate () |
161 | player::activate () |
177 | { |
162 | { |
… | |
… | |
182 | ob->remove (); |
167 | ob->remove (); |
183 | ob->map = 0; |
168 | ob->map = 0; |
184 | ob->activate_recursive (); |
169 | ob->activate_recursive (); |
185 | CLEAR_FLAG (ob, FLAG_FRIENDLY); |
170 | CLEAR_FLAG (ob, FLAG_FRIENDLY); |
186 | add_friendly_object (ob); |
171 | add_friendly_object (ob); |
187 | enter_map (); |
|
|
188 | } |
172 | } |
189 | |
173 | |
190 | void |
174 | void |
191 | player::deactivate () |
175 | player::deactivate () |
192 | { |
176 | { |
… | |
… | |
194 | return; |
178 | return; |
195 | |
179 | |
196 | terminate_all_pets (ob); |
180 | terminate_all_pets (ob); |
197 | remove_friendly_object (ob); |
181 | remove_friendly_object (ob); |
198 | ob->deactivate_recursive (); |
182 | ob->deactivate_recursive (); |
|
|
183 | |
|
|
184 | if (ob->map) |
199 | maplevel = ob->map->path; |
185 | maplevel = ob->map->path; |
|
|
186 | |
200 | ob->remove (); |
187 | ob->remove (); |
201 | ob->map = 0; |
188 | ob->map = 0; |
202 | party = 0; |
189 | party = 0; |
203 | |
190 | |
204 | // for weird reasons, this is often "ob", keeping a circular reference |
191 | combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this |
205 | ranges [range_skill] = 0; |
|
|
206 | |
192 | |
207 | players.erase (this); |
193 | players.erase (this); |
208 | } |
194 | } |
209 | |
195 | |
210 | // connect the player with a specific client |
196 | // connect the player with a specific client |
211 | // also changed, rationalises, and fixes some incorrect settings |
197 | // also changes, rationalises, and fixes some incorrect settings |
212 | void |
198 | void |
213 | player::connect (client *ns) |
199 | player::connect (client *ns) |
214 | { |
200 | { |
215 | this->ns = ns; |
201 | this->ns = ns; |
216 | ns->pl = this; |
202 | ns->pl = this; |
… | |
… | |
220 | ob->close_container (); //TODO: client-specific |
206 | ob->close_container (); //TODO: client-specific |
221 | |
207 | |
222 | ns->update_look = 0; |
208 | ns->update_look = 0; |
223 | ns->look_position = 0; |
209 | ns->look_position = 0; |
224 | |
210 | |
225 | clear_los (ob); |
211 | clear_los (this); |
226 | |
212 | |
227 | ns->reset_stats (); |
213 | ns->reset_stats (); |
228 | |
214 | |
229 | /* make sure he's a player -- needed because of class change. */ |
215 | /* make sure he's a player -- needed because of class change. */ |
230 | ob->type = PLAYER; // we are paranoid |
216 | ob->type = PLAYER; // we are paranoid |
231 | ob->race = ob->arch->clone.race; |
217 | ob->race = ob->arch->race; |
232 | |
|
|
233 | if (!legal_range (ob, shoottype)) |
|
|
234 | shoottype = range_none; |
|
|
235 | |
218 | |
236 | ob->carrying = sum_weight (ob); |
219 | ob->carrying = sum_weight (ob); |
237 | link_player_skills (ob); |
220 | link_player_skills (ob); |
238 | |
221 | |
239 | CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); |
222 | CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); |
240 | |
223 | |
241 | assign (title, ob->arch->clone.name); |
224 | assign (title, ob->arch->object::name); |
242 | |
225 | |
243 | /* if it's a dragon player, set the correct title here */ |
226 | /* if it's a dragon player, set the correct title here */ |
244 | if (is_dragon_pl (ob)) |
227 | if (is_dragon_pl (ob)) |
245 | { |
228 | { |
246 | object *tmp, *abil = 0, *skin = 0; |
229 | object *tmp, *abil = 0, *skin = 0; |
247 | |
230 | |
248 | shstr_cmp dragon_ability_force ("dragon_ability_force"); |
|
|
249 | shstr_cmp dragon_skin_force ("dragon_skin_force"); |
|
|
250 | |
|
|
251 | for (tmp = ob->inv; tmp; tmp = tmp->below) |
231 | for (tmp = ob->inv; tmp; tmp = tmp->below) |
252 | if (tmp->type == FORCE) |
232 | if (tmp->type == FORCE) |
253 | if (tmp->arch->name == dragon_ability_force) |
233 | if (tmp->arch->archname == shstr_dragon_ability_force) |
254 | abil = tmp; |
234 | abil = tmp; |
255 | else if (tmp->arch->name == dragon_skin_force) |
235 | else if (tmp->arch->archname == shstr_dragon_skin_force) |
256 | skin = tmp; |
236 | skin = tmp; |
257 | |
237 | |
258 | set_dragon_name (ob, abil, skin); |
238 | set_dragon_name (ob, abil, skin); |
259 | } |
239 | } |
260 | |
240 | |
261 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
241 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
262 | |
242 | |
263 | esrv_new_player (this, ob->weight + ob->carrying); |
243 | esrv_new_player (this, ob->weight + ob->carrying); |
264 | |
244 | |
|
|
245 | ob->flag [FLAG_READY_WEAPON] = false; |
|
|
246 | ob->flag [FLAG_READY_SKILL] = false; |
|
|
247 | ob->flag [FLAG_READY_BOW] = false; |
|
|
248 | |
|
|
249 | for (object *op = ob->inv; op; op = op->below) |
|
|
250 | if (op->flag [FLAG_APPLIED]) |
|
|
251 | switch (op->type) |
|
|
252 | { |
|
|
253 | case SKILL: |
|
|
254 | ob->flag [FLAG_APPLIED] = false; |
|
|
255 | break; |
|
|
256 | |
|
|
257 | case WAND: |
|
|
258 | case ROD: |
|
|
259 | case HORN: |
|
|
260 | case BOW: |
|
|
261 | ranged_ob = op; |
|
|
262 | break; |
|
|
263 | |
|
|
264 | case WEAPON: |
|
|
265 | combat_ob = op; |
|
|
266 | break; |
|
|
267 | } |
|
|
268 | |
|
|
269 | ob->change_weapon (combat_ob ? combat_ob : ranged_ob); |
265 | ob->update_stats (); |
270 | ob->update_stats (); |
|
|
271 | |
266 | ns->floorbox_update (); |
272 | ns->floorbox_update (); |
267 | |
|
|
268 | esrv_send_inventory (ob, ob); |
273 | esrv_send_inventory (ob, ob); |
269 | esrv_add_spells (this, 0); |
274 | esrv_add_spells (this, 0); |
270 | |
275 | |
271 | activate (); |
276 | activate (); |
272 | |
277 | |
… | |
… | |
288 | |
293 | |
289 | INVOKE_PLAYER (DISCONNECT, this); |
294 | INVOKE_PLAYER (DISCONNECT, this); |
290 | |
295 | |
291 | ns->reset_stats (); |
296 | ns->reset_stats (); |
292 | ns->pl = 0; |
297 | ns->pl = 0; |
293 | this->ns = 0; |
298 | ns = 0; |
294 | } |
299 | } |
295 | |
300 | |
296 | if (ob) |
301 | if (ob) |
|
|
302 | { |
297 | ob->close_container (); //TODO: client-specific |
303 | ob->close_container (); //TODO: client-specific |
|
|
304 | ob->drop_unpaid_items (); |
|
|
305 | } |
|
|
306 | |
|
|
307 | observe = ob; |
298 | |
308 | |
299 | deactivate (); |
309 | deactivate (); |
300 | } |
310 | } |
301 | |
311 | |
302 | // the need for this function can be explained |
312 | // the need for this function can be explained |
303 | // by load_object not returning the object |
313 | // by load_object not returning the object |
304 | void |
314 | void |
305 | player::set_object (object *op) |
315 | player::set_object (object *op) |
306 | { |
316 | { |
307 | ob = op; |
317 | ob = observe = op; |
308 | ob->contr = this; /* this aren't yet in archetype */ |
318 | ob->contr = this; /* this aren't yet in archetype */ |
309 | |
319 | |
310 | ob->speed_left = 0.5; |
|
|
311 | ob->speed = 1.0; |
320 | ob->speed = 1.0f; |
|
|
321 | ob->speed_left = 0.5f; |
|
|
322 | |
312 | ob->direction = 5; /* So player faces south */ |
323 | ob->direction = 5; /* So player faces south */ |
|
|
324 | } |
|
|
325 | |
|
|
326 | void |
|
|
327 | player::set_observe (object *op) |
|
|
328 | { |
|
|
329 | observe = op ? op : ob; |
|
|
330 | do_los = 1; |
313 | } |
331 | } |
314 | |
332 | |
315 | player::player () |
333 | player::player () |
316 | { |
334 | { |
317 | /* There are some elements we want initialised to non zero value - |
335 | /* There are some elements we want initialised to non zero value - |
318 | * we deal with that below this point. |
336 | * we deal with that below this point. |
319 | */ |
337 | */ |
320 | outputs_sync = 16; /* Every 2 seconds */ |
338 | outputs_sync = 4; |
321 | outputs_count = 8; /* Keeps present behaviour */ |
339 | outputs_count = 4; |
322 | unapply = unapply_nochoice; |
340 | unapply = unapply_nochoice; |
323 | |
341 | |
324 | savebed_map = first_map_path; /* Init. respawn position */ |
342 | savebed_map = first_map_path; /* Init. respawn position */ |
325 | |
343 | |
326 | gen_sp_armour = 10; |
344 | gen_sp_armour = 10; |
327 | shoottype = range_none; |
|
|
328 | bowtype = bow_normal; |
345 | bowtype = bow_normal; |
329 | petmode = pet_normal; |
346 | petmode = pet_normal; |
330 | listening = 10; |
347 | listening = 10; |
331 | usekeys = containers; |
348 | usekeys = containers; |
332 | peaceful = 1; /* default peaceful */ |
349 | peaceful = 1; /* default peaceful */ |
333 | do_los = 1; |
350 | do_los = 1; |
|
|
351 | |
|
|
352 | weapon_sp = 1.0f; |
|
|
353 | weapon_sp_left = 0.5f; |
334 | } |
354 | } |
335 | |
355 | |
336 | void |
356 | void |
337 | player::do_destroy () |
357 | player::do_destroy () |
338 | { |
358 | { |
… | |
… | |
343 | if (ob) |
363 | if (ob) |
344 | { |
364 | { |
345 | ob->destroy_inv (false); |
365 | ob->destroy_inv (false); |
346 | ob->destroy (); |
366 | ob->destroy (); |
347 | } |
367 | } |
|
|
368 | |
|
|
369 | ob = observe = 0; |
348 | } |
370 | } |
349 | |
371 | |
350 | player::~player () |
372 | player::~player () |
351 | { |
373 | { |
352 | /* Clear item stack */ |
374 | /* Clear item stack */ |
… | |
… | |
379 | * Note: there MUST be at least one player archetype! |
401 | * Note: there MUST be at least one player archetype! |
380 | */ |
402 | */ |
381 | archetype * |
403 | archetype * |
382 | get_player_archetype (archetype *at) |
404 | get_player_archetype (archetype *at) |
383 | { |
405 | { |
384 | archetype *start = at; |
406 | archvec::iterator i = at ? archetypes.find (at) : archetypes.begin (); |
385 | |
407 | |
386 | for (;;) |
408 | for (;;) |
387 | { |
409 | { |
388 | if (at == NULL || at->next == NULL) |
410 | if (++i == archetypes.end ()) |
389 | at = first_archetype; |
411 | i = archetypes.begin (); |
390 | else |
412 | else if (*i == at) |
391 | at = at->next; |
413 | cleanup ("not a single player archetype found"); |
392 | |
414 | |
393 | if (at->clone.type == PLAYER) |
415 | if ((*i)->type == PLAYER) |
394 | return at; |
416 | return *i; |
395 | |
|
|
396 | if (at == start) |
|
|
397 | { |
|
|
398 | LOG (llevError, "No Player archetypes\n"); |
|
|
399 | exit (-1); |
|
|
400 | } |
|
|
401 | } |
417 | } |
402 | } |
418 | } |
403 | |
419 | |
404 | object * |
420 | object * |
405 | get_nearest_player (object *mon) |
421 | get_nearest_player (object *mon) |
… | |
… | |
771 | } |
787 | } |
772 | |
788 | |
773 | void |
789 | void |
774 | object::roll_stats () |
790 | object::roll_stats () |
775 | { |
791 | { |
776 | int statsort [7]; |
792 | int statsort [NUM_STATS]; |
777 | |
793 | |
778 | for (;;) |
794 | for (;;) |
779 | { |
795 | { |
780 | int sum = 0; |
796 | int sum = 0; |
781 | for (int i = 7; i--; ) |
797 | for (int i = NUM_STATS; i--; ) |
782 | sum += statsort [i] = roll_stat (); |
798 | sum += statsort [i] = roll_stat (); |
783 | |
799 | |
784 | if (sum >= 82 && sum <= 116) |
800 | if (sum >= 82 && sum <= 116) |
785 | break; |
801 | break; |
786 | } |
802 | } |
787 | |
803 | |
788 | // Sort the stats so that rerolling is easier... |
804 | // Sort the stats so that rerolling is easier... |
789 | std::sort (statsort, statsort + 7, std::greater<int>()); |
805 | std::sort (statsort, statsort + NUM_STATS, std::greater<int>()); |
790 | |
806 | |
|
|
807 | for (int i = 0; i < NUM_STATS; ++i) |
791 | stats.Str = statsort[0]; |
808 | stats.stat (i) = statsort [i]; |
792 | stats.Dex = statsort[1]; |
|
|
793 | stats.Con = statsort[2]; |
|
|
794 | stats.Int = statsort[3]; |
|
|
795 | stats.Wis = statsort[4]; |
|
|
796 | stats.Pow = statsort[5]; |
|
|
797 | stats.Cha = statsort[6]; |
|
|
798 | |
809 | |
799 | stats.exp = 0; |
810 | stats.exp = 0; |
800 | stats.ac = 0; |
811 | stats.ac = 0; |
801 | |
812 | |
802 | stats.hp = stats.maxhp; |
813 | stats.hp = stats.maxhp; |
… | |
… | |
814 | } |
825 | } |
815 | |
826 | |
816 | void |
827 | void |
817 | object::swap_stats (int a, int b) |
828 | object::swap_stats (int a, int b) |
818 | { |
829 | { |
819 | int tmp = get_attr_value (&contr->orig_stats, a); |
830 | swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b)); |
820 | set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b)); |
|
|
821 | set_attr_value (&contr->orig_stats, b, tmp); |
|
|
822 | |
831 | |
|
|
832 | for (int i = 0; i < NUM_STATS; ++i) |
823 | stats.Str = contr->orig_stats.Str; |
833 | stats.stat (i) = contr->orig_stats.stat (i); |
824 | stats.Dex = contr->orig_stats.Dex; |
|
|
825 | stats.Con = contr->orig_stats.Con; |
|
|
826 | stats.Int = contr->orig_stats.Int; |
|
|
827 | stats.Wis = contr->orig_stats.Wis; |
|
|
828 | stats.Pow = contr->orig_stats.Pow; |
|
|
829 | stats.Cha = contr->orig_stats.Cha; |
|
|
830 | |
834 | |
831 | //TODO: the following code looks so borked and should, at the very least, |
835 | //TODO: the following code looks so borked and should, at the very least, |
832 | // be merged with the similar code in roll_stats |
836 | // be merged with the similar code in roll_stats |
833 | stats.ac = 0; |
837 | stats.ac = 0; |
834 | |
838 | |
… | |
… | |
865 | * appropriate action with it (change race, or other things). |
869 | * appropriate action with it (change race, or other things). |
866 | * The function name is for historical reasons - now we have |
870 | * The function name is for historical reasons - now we have |
867 | * separate race and class; this actually changes the RACE, |
871 | * separate race and class; this actually changes the RACE, |
868 | * not the class. |
872 | * not the class. |
869 | */ |
873 | */ |
870 | int |
874 | void |
871 | key_change_class (object *op, char key) |
875 | player::chargen_race_done () |
872 | { |
876 | { |
873 | int tmp_loop; |
|
|
874 | |
|
|
875 | if (key == 'd' || key == 'D') |
|
|
876 | { |
|
|
877 | char buf[MAX_BUF]; |
|
|
878 | |
|
|
879 | /* this must before then initial items are given */ |
877 | /* this must before then initial items are given */ |
880 | esrv_new_player (op->contr, op->weight + op->carrying); |
878 | esrv_new_player (ob->contr, ob->weight + ob->carrying); |
881 | |
879 | |
882 | treasurelist *tl = find_treasurelist ("starting_wealth"); |
880 | treasurelist *tl = treasurelist::find ("starting_wealth"); |
883 | if (tl) |
881 | if (tl) |
884 | create_treasure (tl, op, 0, 0, 0); |
882 | create_treasure (tl, ob, 0, 0, 0); |
885 | |
883 | |
886 | INVOKE_PLAYER (BIRTH, op->contr); |
884 | INVOKE_PLAYER (BIRTH, ob->contr); |
887 | INVOKE_PLAYER (LOGIN, op->contr); |
885 | INVOKE_PLAYER (LOGIN, ob->contr); |
888 | |
886 | |
889 | op->contr->ns->state = ST_PLAYING; |
887 | ob->contr->ns->state = ST_PLAYING; |
890 | |
888 | |
891 | if (op->msg) |
889 | if (ob->msg) |
892 | op->msg = NULL; |
890 | ob->msg = 0; |
893 | |
891 | |
894 | /* We create this now because some of the unique maps will need it |
892 | /* We create this now because some of the unique maps will need it |
895 | * to save here. |
893 | * to save here. |
896 | */ |
894 | */ |
|
|
895 | { |
|
|
896 | char buf[MAX_BUF]; |
897 | sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); |
897 | sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name); |
898 | make_path_to_file (buf); |
898 | make_path_to_file (buf); |
|
|
899 | } |
899 | |
900 | |
900 | start_info (op); |
901 | start_info (ob); |
901 | CLEAR_FLAG (op, FLAG_WIZ); |
902 | CLEAR_FLAG (ob, FLAG_WIZ); |
902 | give_initial_items (op, op->randomitems); |
903 | give_initial_items (ob, ob->randomitems); |
903 | link_player_skills (op); |
904 | link_player_skills (ob); |
904 | esrv_send_inventory (op, op); |
905 | esrv_send_inventory (ob, ob); |
905 | op->update_stats (); |
906 | ob->update_stats (); |
906 | |
907 | |
907 | /* This moves the player to a different start map, if there |
908 | /* This moves the player to a different start map, if there |
908 | * is one for this race |
909 | * is one for this race |
909 | */ |
910 | */ |
910 | if (*first_map_ext_path) |
911 | if (*first_map_ext_path) |
911 | { |
912 | { |
912 | object *tmp; |
913 | object *tmp; |
913 | char mapname[MAX_BUF]; |
914 | char mapname[MAX_BUF]; |
914 | |
915 | |
915 | snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); |
916 | snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname); |
916 | tmp = object::create (); |
917 | tmp = object::create (); |
917 | EXIT_PATH (tmp) = mapname; |
918 | EXIT_PATH (tmp) = mapname; |
918 | EXIT_X (tmp) = op->x; |
919 | EXIT_X (tmp) = ob->x; |
919 | EXIT_Y (tmp) = op->y; |
920 | EXIT_Y (tmp) = ob->y; |
920 | op->enter_exit (tmp); /* we don't really care if it succeeded; |
921 | ob->enter_exit (tmp); /* we don't really care if it succeeded; |
921 | * if the map isn't there, then stay on the |
922 | * if the map isn't there, then stay on the |
922 | * default initial map */ |
923 | * default initial map */ |
923 | tmp->destroy (); |
924 | tmp->destroy (); |
924 | } |
925 | } |
925 | else |
926 | else |
926 | LOG (llevDebug, "first_map_ext_path not set\n"); |
927 | LOG (llevDebug, "first_map_ext_path not set\n"); |
|
|
928 | } |
927 | |
929 | |
928 | return 0; |
930 | void |
929 | } |
931 | player::chargen_race_next () |
930 | |
932 | { |
931 | /* Following actually changes the race - this is the default command |
933 | /* Following actually changes the race - this is the default command |
932 | * if we don't match with one of the options above. |
934 | * if we don't match with one of the options above. |
933 | */ |
935 | */ |
934 | |
936 | |
935 | tmp_loop = 0; |
937 | do |
936 | while (!tmp_loop) |
|
|
937 | { |
938 | { |
938 | shstr name = op->name; |
939 | shstr name = ob->name; |
939 | int x = op->x, y = op->y; |
940 | int x = ob->x, y = ob->y; |
940 | |
941 | |
941 | op->remove_statbonus (); |
942 | ob->remove_statbonus (); |
942 | op->remove (); |
943 | ob->remove (); |
943 | op->arch = get_player_archetype (op->arch); |
944 | ob->arch = get_player_archetype (ob->arch); |
944 | op->arch->clone.copy_to (op); |
945 | ob->arch->copy_to (ob); |
945 | op->instantiate (); |
946 | ob->instantiate (); |
946 | op->stats = op->contr->orig_stats; |
947 | ob->stats = ob->contr->orig_stats; |
947 | op->name = op->name_pl = name; |
948 | ob->name = ob->name_pl = name; |
948 | op->x = x; |
949 | ob->x = x; |
949 | op->y = y; |
950 | ob->y = y; |
950 | SET_ANIMATION (op, 2); /* So player faces south */ |
951 | SET_ANIMATION (ob, 2); /* So player faces south */ |
951 | insert_ob_in_map (op, op->map, op, 0); |
952 | insert_ob_in_map (ob, ob->map, ob, 0); |
952 | assign (op->contr->title, op->arch->clone.name); |
953 | assign (ob->contr->title, ob->arch->object::name); |
953 | op->add_statbonus (); |
954 | ob->add_statbonus (); |
954 | tmp_loop = allowed_class (op); |
|
|
955 | } |
955 | } |
|
|
956 | while (!allowed_class (ob)); |
956 | |
957 | |
957 | update_object (op, UP_OBJ_FACE); |
958 | update_object (ob, UP_OBJ_FACE); |
958 | esrv_update_item (UPD_FACE, op, op); |
959 | esrv_update_item (UPD_FACE, ob, ob); |
959 | op->update_stats (); |
960 | ob->update_stats (); |
960 | op->stats.hp = op->stats.maxhp; |
961 | ob->stats.hp = ob->stats.maxhp; |
961 | op->stats.sp = op->stats.maxsp; |
962 | ob->stats.sp = ob->stats.maxsp; |
962 | op->stats.grace = 0; |
963 | ob->stats.grace = 0; |
963 | |
|
|
964 | if (op->msg) |
|
|
965 | new_draw_info (NDI_BLUE, 0, op, op->msg); |
|
|
966 | |
|
|
967 | send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n"); |
|
|
968 | return 0; |
|
|
969 | } |
964 | } |
970 | |
965 | |
971 | void |
966 | void |
972 | flee_player (object *op) |
967 | flee_player (object *op) |
973 | { |
968 | { |
… | |
… | |
1020 | /* Cornered, get rid of scared */ |
1015 | /* Cornered, get rid of scared */ |
1021 | CLEAR_FLAG (op, FLAG_SCARED); |
1016 | CLEAR_FLAG (op, FLAG_SCARED); |
1022 | op->enemy = NULL; |
1017 | op->enemy = NULL; |
1023 | } |
1018 | } |
1024 | |
1019 | |
1025 | |
|
|
1026 | /* check_pick sees if there is stuff to be picked up/picks up stuff. |
1020 | /* check_pick sees if there is stuff to be picked up/picks up stuff. |
1027 | * IT returns 1 if the player should keep on moving, 0 if he should |
1021 | * It returns 1 if the player should keep on moving, 0 if he should |
1028 | * stop. |
1022 | * stop. |
1029 | */ |
1023 | */ |
1030 | int |
1024 | int |
1031 | check_pick (object *op) |
1025 | check_pick (object *op) |
1032 | { |
1026 | { |
… | |
… | |
1109 | if (tmp->name != NULL) |
1103 | if (tmp->name != NULL) |
1110 | sprintf (putstring, "item name: %s item type: %d weight/value: %d", |
1104 | sprintf (putstring, "item name: %s item type: %d weight/value: %d", |
1111 | &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); |
1105 | &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); |
1112 | else |
1106 | else |
1113 | sprintf (putstring, "item name: %s item type: %d weight/value: %d", |
1107 | sprintf (putstring, "item name: %s item type: %d weight/value: %d", |
1114 | &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); |
1108 | &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); |
1115 | |
1109 | |
1116 | new_draw_info (NDI_UNIQUE, 0, op, putstring); |
1110 | new_draw_info (NDI_UNIQUE, 0, op, putstring); |
1117 | } |
1111 | } |
1118 | |
1112 | |
1119 | /* philosophy: |
1113 | /* philosophy: |
… | |
… | |
1194 | pick_up (op, tmp); |
1188 | pick_up (op, tmp); |
1195 | continue; |
1189 | continue; |
1196 | } |
1190 | } |
1197 | |
1191 | |
1198 | if (op->contr->mode & PU_READABLES) |
1192 | if (op->contr->mode & PU_READABLES) |
1199 | if (tmp->type == BOOK || tmp->type == SCROLL) |
1193 | if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE) |
1200 | { |
1194 | { |
1201 | pick_up (op, tmp); |
1195 | pick_up (op, tmp); |
1202 | continue; |
1196 | continue; |
1203 | } |
1197 | } |
1204 | |
1198 | |
… | |
… | |
1312 | /* careful: chairs and tables are weapons! */ |
1306 | /* careful: chairs and tables are weapons! */ |
1313 | if (op->contr->mode & PU_ALLWEAPON) |
1307 | if (op->contr->mode & PU_ALLWEAPON) |
1314 | { |
1308 | { |
1315 | if (tmp->type == WEAPON && tmp->name != NULL) |
1309 | if (tmp->type == WEAPON && tmp->name != NULL) |
1316 | { |
1310 | { |
1317 | if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && |
1311 | if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL && |
1318 | strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) |
1312 | strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL) |
1319 | { |
1313 | { |
1320 | pick_up (op, tmp); |
1314 | pick_up (op, tmp); |
1321 | continue; |
1315 | continue; |
1322 | } |
1316 | } |
1323 | } |
1317 | } |
1324 | |
1318 | |
1325 | if (tmp->type == WEAPON && tmp->name == NULL) |
1319 | if (tmp->type == WEAPON && tmp->name == NULL) |
1326 | { |
1320 | { |
1327 | if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) |
1321 | if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL) |
1328 | { |
1322 | { |
1329 | pick_up (op, tmp); |
1323 | pick_up (op, tmp); |
1330 | continue; |
1324 | continue; |
1331 | } |
1325 | } |
1332 | } |
1326 | } |
… | |
… | |
1357 | if (tmp->name != NULL) |
1351 | if (tmp->name != NULL) |
1358 | { |
1352 | { |
1359 | fprintf (stderr, "%s", tmp->name); |
1353 | fprintf (stderr, "%s", tmp->name); |
1360 | } |
1354 | } |
1361 | else |
1355 | else |
1362 | fprintf (stderr, "%s", tmp->arch->name); |
1356 | fprintf (stderr, "%s", tmp->arch->archname); |
1363 | fprintf (stderr, ",%d] = ", tmp->type); |
1357 | fprintf (stderr, ",%d] = ", tmp->type); |
1364 | fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); |
1358 | fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); |
1365 | #endif |
1359 | #endif |
1366 | continue; |
1360 | continue; |
1367 | } |
1361 | } |
… | |
… | |
1437 | else |
1431 | else |
1438 | { |
1432 | { |
1439 | for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) |
1433 | for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) |
1440 | { |
1434 | { |
1441 | attacktype = 1 << attacknum; |
1435 | attacktype = 1 << attacknum; |
1442 | if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) |
1436 | if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0) |
1443 | if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) |
1437 | if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby) |
1444 | { |
1438 | { |
1445 | tmp = arrow; |
1439 | tmp = arrow; |
1446 | betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; |
1440 | betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100; |
1447 | } |
1441 | } |
1448 | } |
1442 | } |
1449 | if ((2 + arrow->magic + arrow->stats.dam) > betterby) |
1443 | if ((2 + arrow->magic + arrow->stats.dam) > betterby) |
1450 | { |
1444 | { |
1451 | tmp = arrow; |
1445 | tmp = arrow; |
… | |
… | |
1470 | * find_better_arrow to find a decent arrow to use. |
1464 | * find_better_arrow to find a decent arrow to use. |
1471 | * op = the shooter |
1465 | * op = the shooter |
1472 | * type = bow->race |
1466 | * type = bow->race |
1473 | * dir = fire direction |
1467 | * dir = fire direction |
1474 | */ |
1468 | */ |
1475 | |
|
|
1476 | object * |
1469 | object * |
1477 | pick_arrow_target (object *op, const char *type, int dir) |
1470 | pick_arrow_target (object *op, const char *type, int dir) |
1478 | { |
1471 | { |
1479 | object *tmp = NULL; |
1472 | object *tmp = NULL; |
1480 | maptile *m; |
1473 | maptile *m; |
… | |
… | |
1545 | */ |
1538 | */ |
1546 | int |
1539 | int |
1547 | fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) |
1540 | fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) |
1548 | { |
1541 | { |
1549 | object *left, *bow; |
1542 | object *left, *bow; |
1550 | int bowspeed, mflags; |
1543 | int mflags; |
1551 | maptile *m; |
1544 | maptile *m; |
1552 | |
1545 | |
1553 | if (!dir) |
1546 | if (!dir) |
1554 | { |
1547 | { |
1555 | new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); |
1548 | new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); |
1556 | return 0; |
1549 | return 0; |
1557 | } |
1550 | } |
1558 | |
1551 | |
1559 | if (op->type == PLAYER) |
1552 | if (op->contr) |
1560 | bow = op->contr->ranges[range_bow]; |
1553 | bow = op->current_weapon; |
1561 | else |
1554 | else |
1562 | { |
1555 | { |
1563 | for (bow = op->inv; bow; bow = bow->below) |
1556 | for (bow = op->inv; bow; bow = bow->below) |
1564 | /* Don't check for applied - monsters don't apply bows - in that way, they |
1557 | /* Don't check for applied - monsters don't apply bows - in that way, they |
1565 | * don't need to switch back and forth between bows and weapons. |
1558 | * don't need to switch back and forth between bows and weapons. |
… | |
… | |
1570 | if (!bow) |
1563 | if (!bow) |
1571 | { |
1564 | { |
1572 | LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); |
1565 | LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); |
1573 | return 0; |
1566 | return 0; |
1574 | } |
1567 | } |
|
|
1568 | |
|
|
1569 | // optimisation: move object to top so we will find it quickly again |
|
|
1570 | if (bow->below) |
|
|
1571 | { |
|
|
1572 | bow->remove (); |
|
|
1573 | op->insert (bow); |
|
|
1574 | } |
|
|
1575 | |
1575 | } |
1576 | } |
1576 | |
1577 | |
1577 | if (!bow->race || !bow->skill) |
1578 | if (!bow->race || !bow->skill) |
1578 | { |
1579 | { |
1579 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); |
1580 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); |
1580 | return 0; |
1581 | return 0; |
1581 | } |
1582 | } |
1582 | |
|
|
1583 | bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex]; |
|
|
1584 | |
|
|
1585 | /* penalize ROF for bestarrow */ |
|
|
1586 | if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow) |
|
|
1587 | bowspeed -= dex_bonus[op->stats.Dex] + 5; |
|
|
1588 | |
|
|
1589 | if (bowspeed < 1) |
|
|
1590 | bowspeed = 1; |
|
|
1591 | |
1583 | |
1592 | if (arrow == NULL) |
1584 | if (arrow == NULL) |
1593 | { |
1585 | { |
1594 | if ((arrow = find_arrow (op, bow->race)) == NULL) |
1586 | if ((arrow = find_arrow (op, bow->race)) == NULL) |
1595 | { |
1587 | { |
1596 | if (op->type == PLAYER) |
1588 | if (op->type == PLAYER) |
1597 | new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); |
1589 | new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); |
1598 | /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ |
1590 | /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ |
1599 | else |
1591 | else |
1600 | CLEAR_FLAG (op, FLAG_READY_BOW); |
1592 | CLEAR_FLAG (op, FLAG_READY_BOW); |
|
|
1593 | |
1601 | return 0; |
1594 | return 0; |
1602 | } |
1595 | } |
1603 | } |
1596 | } |
1604 | |
1597 | |
1605 | mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); |
1598 | mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); |
… | |
… | |
1629 | |
1622 | |
1630 | arrow->set_owner (op); |
1623 | arrow->set_owner (op); |
1631 | arrow->skill = bow->skill; |
1624 | arrow->skill = bow->skill; |
1632 | arrow->direction = dir; |
1625 | arrow->direction = dir; |
1633 | |
1626 | |
|
|
1627 | arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */ |
|
|
1628 | arrow->stats.hp = arrow->stats.dam; |
|
|
1629 | arrow->stats.grace = arrow->attacktype; |
|
|
1630 | |
|
|
1631 | if (arrow->slaying) |
|
|
1632 | arrow->spellarg = strdup (arrow->slaying); |
|
|
1633 | |
|
|
1634 | #if 0 |
|
|
1635 | if (player *pl = op->contr) |
|
|
1636 | { |
|
|
1637 | float speed = pl->weapon_sp; |
|
|
1638 | |
|
|
1639 | /* penalize ROF for bestarrow */ |
|
|
1640 | if (pl->bowtype == bow_bestarrow) |
|
|
1641 | speed *= .9f; |
|
|
1642 | else |
|
|
1643 | speed *= 1.f + dex_bonus[op->stats.Dex] * .2f; |
|
|
1644 | |
|
|
1645 | op->speed_left += speed - op->speed; |
|
|
1646 | } |
|
|
1647 | #endif |
|
|
1648 | |
|
|
1649 | SET_ANIMATION (arrow, arrow->direction); |
|
|
1650 | |
|
|
1651 | /* update the speed */ |
|
|
1652 | arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f |
|
|
1653 | + bow->stats.dam / 7.f; |
|
|
1654 | |
|
|
1655 | arrow->set_speed (max (arrow->speed, 2.f)); |
|
|
1656 | arrow->speed_left = 0; |
|
|
1657 | |
|
|
1658 | int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; |
|
|
1659 | |
1634 | if (op->type == PLAYER) |
1660 | if (op->type == PLAYER) |
1635 | { |
1661 | { |
1636 | op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; |
|
|
1637 | op->update_stats (); |
|
|
1638 | } |
|
|
1639 | |
|
|
1640 | SET_ANIMATION (arrow, arrow->direction); |
|
|
1641 | arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ |
|
|
1642 | arrow->stats.hp = arrow->stats.dam; |
|
|
1643 | arrow->stats.grace = arrow->attacktype; |
|
|
1644 | if (arrow->slaying != NULL) |
|
|
1645 | arrow->spellarg = strdup (arrow->slaying); |
|
|
1646 | |
|
|
1647 | /* Note that this was different for monsters - they got their level |
|
|
1648 | * added to the damage. I think the strength bonus is more proper. |
|
|
1649 | */ |
|
|
1650 | |
|
|
1651 | arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic; |
|
|
1652 | |
|
|
1653 | /* update the speed */ |
|
|
1654 | arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? |
|
|
1655 | 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; |
|
|
1656 | |
|
|
1657 | arrow->set_speed (max (arrow->speed, 1.0)); |
|
|
1658 | arrow->speed_left = 0; |
|
|
1659 | |
|
|
1660 | if (op->type == PLAYER) |
|
|
1661 | { |
|
|
1662 | arrow->stats.wc = 20 - bow->magic - arrow->magic - |
|
|
1663 | (op->chosen_skill ? op->chosen_skill->level : op->level) - |
|
|
1664 | dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod; |
|
|
1665 | |
|
|
1666 | arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; |
1662 | arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; |
|
|
1663 | wc -= dex_bonus[op->stats.Dex]; |
|
|
1664 | |
|
|
1665 | if (!arrow->slaying) |
|
|
1666 | arrow->slaying = op->slaying; |
|
|
1667 | |
|
|
1668 | arrow->attacktype |= op->attacktype; |
1667 | } |
1669 | } |
1668 | else |
1670 | else |
1669 | { |
1671 | { |
1670 | arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod; |
|
|
1671 | arrow->level = op->level; |
1672 | arrow->level = op->level; |
1672 | } |
1673 | arrow->stats.wc -= bow->magic; |
1673 | |
1674 | |
1674 | if (arrow->attacktype == AT_PHYSICAL) |
1675 | if (!arrow->slaying) |
|
|
1676 | arrow->slaying = bow->slaying; |
|
|
1677 | |
1675 | arrow->attacktype |= bow->attacktype; |
1678 | arrow->attacktype |= bow->attacktype; |
|
|
1679 | } |
1676 | |
1680 | |
1677 | if (bow->slaying) |
1681 | wc -= arrow->level; |
1678 | arrow->slaying = bow->slaying; |
1682 | arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM); |
1679 | |
1683 | |
|
|
1684 | arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); |
1680 | arrow->move_type = MOVE_FLY_LOW; |
1685 | arrow->move_type = MOVE_FLY_LOW; |
1681 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
1686 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
1682 | |
1687 | |
1683 | play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); |
1688 | op->play_sound (sound_find ("fire_arrow")); |
1684 | m->insert (arrow, sx, sy, op); |
1689 | m->insert (arrow, sx, sy, op); |
1685 | |
1690 | |
1686 | if (!arrow->destroyed ()) |
1691 | if (!arrow->destroyed ()) |
1687 | move_arrow (arrow); |
1692 | move_arrow (arrow); |
1688 | |
1693 | |
… | |
… | |
1709 | { |
1714 | { |
1710 | int ret = 0, wcmod = 0; |
1715 | int ret = 0, wcmod = 0; |
1711 | |
1716 | |
1712 | if (op->contr->bowtype == bow_bestarrow) |
1717 | if (op->contr->bowtype == bow_bestarrow) |
1713 | { |
1718 | { |
1714 | ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); |
1719 | ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); |
1715 | } |
1720 | } |
1716 | else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) |
1721 | else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) |
1717 | { |
1722 | { |
1718 | if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) |
1723 | if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) |
1719 | wcmod = -1; |
1724 | wcmod = -1; |
… | |
… | |
1729 | else if (op->contr->bowtype == bow_spreadshot) |
1734 | else if (op->contr->bowtype == bow_spreadshot) |
1730 | { |
1735 | { |
1731 | ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1736 | ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1732 | ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); |
1737 | ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); |
1733 | ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); |
1738 | ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); |
1734 | |
|
|
1735 | } |
1739 | } |
1736 | else |
1740 | else |
1737 | { |
1741 | { |
1738 | /* Simple case */ |
1742 | /* Simple case */ |
1739 | ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1743 | ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1740 | } |
1744 | } |
|
|
1745 | |
1741 | return ret; |
1746 | return ret; |
1742 | } |
1747 | } |
1743 | |
|
|
1744 | |
1748 | |
1745 | /* Fires a misc (wand/rod/horn) object in 'dir'. |
1749 | /* Fires a misc (wand/rod/horn) object in 'dir'. |
1746 | * Broken apart from 'fire' to keep it more readable. |
1750 | * Broken apart from 'fire' to keep it more readable. |
1747 | */ |
1751 | */ |
1748 | void |
1752 | void |
1749 | fire_misc_object (object *op, int dir) |
1753 | fire_misc_object (object *op, int dir) |
1750 | { |
1754 | { |
1751 | object *item; |
1755 | object *item = op->contr->ranged_ob; |
1752 | |
1756 | |
1753 | if (!op->contr->ranges[range_misc]) |
1757 | if (!item) |
1754 | { |
1758 | { |
1755 | new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); |
1759 | new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); |
1756 | return; |
1760 | return; |
1757 | } |
1761 | } |
1758 | |
1762 | |
1759 | item = op->contr->ranges[range_misc]; |
|
|
1760 | if (!item->inv) |
1763 | if (!item->inv) |
1761 | { |
1764 | { |
1762 | LOG (llevError, "Object %s lacks a spell\n", &item->name); |
1765 | LOG (llevError, "Object %s lacks a spell\n", &item->name); |
1763 | return; |
1766 | return; |
1764 | } |
1767 | } |
|
|
1768 | |
|
|
1769 | if (!op->change_weapon (item)) |
|
|
1770 | return; |
|
|
1771 | |
1765 | if (item->type == WAND) |
1772 | if (item->type == WAND) |
1766 | { |
1773 | { |
1767 | if (item->stats.food <= 0) |
1774 | if (item->stats.food <= 0) |
1768 | { |
1775 | { |
1769 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
1776 | op->contr->play_sound (sound_find ("wand_poof")); |
1770 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); |
1777 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); |
|
|
1778 | |
1771 | return; |
1779 | return; |
1772 | } |
1780 | } |
1773 | } |
1781 | } |
1774 | else if (item->type == ROD || item->type == HORN) |
1782 | else if (item->type == ROD || item->type == HORN) |
1775 | { |
1783 | { |
1776 | if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) |
1784 | if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) |
1777 | { |
1785 | { |
1778 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
1786 | op->contr->play_sound (sound_find ("wand_poof")); |
|
|
1787 | |
1779 | if (item->type == ROD) |
1788 | if (item->type == ROD) |
1780 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); |
1789 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); |
1781 | else |
1790 | else |
1782 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); |
1791 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); |
|
|
1792 | |
1783 | return; |
1793 | return; |
1784 | } |
1794 | } |
1785 | } |
1795 | } |
1786 | |
1796 | |
1787 | if (cast_spell (op, item, dir, item->inv, NULL)) |
1797 | if (cast_spell (op, item, dir, item->inv, NULL)) |
… | |
… | |
1794 | object *tmp; |
1804 | object *tmp; |
1795 | |
1805 | |
1796 | if (item->arch) |
1806 | if (item->arch) |
1797 | { |
1807 | { |
1798 | CLEAR_FLAG (item, FLAG_ANIMATE); |
1808 | CLEAR_FLAG (item, FLAG_ANIMATE); |
1799 | item->face = item->arch->clone.face; |
1809 | item->face = item->arch->face; |
1800 | item->set_speed (0); |
1810 | item->set_speed (0); |
1801 | } |
1811 | } |
1802 | |
1812 | |
1803 | if ((tmp = item->in_player ())) |
1813 | if ((tmp = item->in_player ())) |
1804 | esrv_update_item (UPD_ANIM, tmp, item); |
1814 | esrv_update_item (UPD_ANIM, tmp, item); |
… | |
… | |
1809 | } |
1819 | } |
1810 | } |
1820 | } |
1811 | |
1821 | |
1812 | /* Received a fire command for the player - go and do it. |
1822 | /* Received a fire command for the player - go and do it. |
1813 | */ |
1823 | */ |
1814 | void |
1824 | bool |
1815 | fire (object *op, int dir) |
1825 | fire (object *op, int dir) |
1816 | { |
1826 | { |
1817 | int spellcost = 0; |
1827 | int spellcost = 0; |
1818 | |
1828 | |
1819 | /* check for loss of invisiblity/hide */ |
1829 | /* check for loss of invisiblity/hide */ |
1820 | if (action_makes_visible (op)) |
1830 | if (action_makes_visible (op)) |
1821 | make_visible (op); |
1831 | make_visible (op); |
1822 | |
1832 | |
1823 | switch (op->contr->shoottype) |
1833 | player *pl = op->contr; |
|
|
1834 | |
|
|
1835 | if (pl->golem) |
|
|
1836 | { |
|
|
1837 | control_golem (op->contr->golem, dir); |
|
|
1838 | return false; |
1824 | { |
1839 | } |
1825 | case range_none: |
|
|
1826 | return; |
|
|
1827 | |
1840 | |
1828 | case range_bow: |
1841 | object *ob = pl->ranged_ob; |
|
|
1842 | |
|
|
1843 | if (!ob) |
|
|
1844 | return false; |
|
|
1845 | |
|
|
1846 | if (!op->change_weapon (ob)) |
|
|
1847 | return false; |
|
|
1848 | |
|
|
1849 | if (op->speed_left > 0.f) |
|
|
1850 | --op->speed_left; |
|
|
1851 | else |
|
|
1852 | return false; |
|
|
1853 | |
|
|
1854 | switch (ob->type) |
|
|
1855 | { |
|
|
1856 | case BOW: |
1829 | player_fire_bow (op, dir); |
1857 | player_fire_bow (op, dir); |
1830 | return; |
1858 | break; |
1831 | |
1859 | |
1832 | case range_magic: /* Casting spells */ |
1860 | case SPELL: |
1833 | spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); |
1861 | spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0); |
1834 | return; |
1862 | break; |
1835 | |
1863 | |
1836 | case range_misc: |
1864 | case BUILDER: |
|
|
1865 | apply_map_builder (op, dir); |
|
|
1866 | break; |
|
|
1867 | |
|
|
1868 | case SKILL: |
|
|
1869 | do_skill (op, op, ob, dir, 0); |
|
|
1870 | break; |
|
|
1871 | |
|
|
1872 | default: |
1837 | fire_misc_object (op, dir); |
1873 | fire_misc_object (op, dir); |
1838 | return; |
1874 | break; |
1839 | |
|
|
1840 | case range_golem: /* Control summoned monsters from scrolls */ |
|
|
1841 | if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED)) |
|
|
1842 | { |
|
|
1843 | op->contr->ranges[range_golem] = 0; |
|
|
1844 | op->contr->shoottype = range_none; |
|
|
1845 | } |
|
|
1846 | else |
|
|
1847 | control_golem (op->contr->ranges[range_golem], dir); |
|
|
1848 | return; |
|
|
1849 | |
|
|
1850 | case range_skill: |
|
|
1851 | if (!op->chosen_skill) |
|
|
1852 | { |
|
|
1853 | if (op->type == PLAYER) |
|
|
1854 | new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); |
|
|
1855 | return; |
|
|
1856 | } |
|
|
1857 | |
|
|
1858 | do_skill (op, op, op->chosen_skill, dir, NULL); |
|
|
1859 | return; |
|
|
1860 | case range_builder: |
|
|
1861 | apply_map_builder (op, dir); |
|
|
1862 | return; |
|
|
1863 | default: |
|
|
1864 | new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); |
|
|
1865 | return; |
|
|
1866 | } |
1875 | } |
|
|
1876 | |
|
|
1877 | return true; |
1867 | } |
1878 | } |
1868 | |
1879 | |
1869 | /* find_key |
1880 | /* find_key |
1870 | * We try to find a key for the door as passed. If we find a key |
1881 | * We try to find a key for the door as passed. If we find a key |
1871 | * and successfully use it, we return the key, otherwise NULL |
1882 | * and successfully use it, we return the key, otherwise NULL |
… | |
… | |
1958 | * 0 otherwise |
1969 | * 0 otherwise |
1959 | */ |
1970 | */ |
1960 | static int |
1971 | static int |
1961 | player_attack_door (object *op, object *door) |
1972 | player_attack_door (object *op, object *door) |
1962 | { |
1973 | { |
1963 | /* If its a door, try to find a use a key. If we do destroy the door, |
1974 | /* If its a door, try to find a key. If we do destroy the door, |
1964 | * might as well return immediately as there is nothing more to do - |
1975 | * might as well return immediately as there is nothing more to do - |
1965 | * otherwise, we fall through to the rest of the code. |
1976 | * otherwise, we fall through to the rest of the code. |
1966 | */ |
1977 | */ |
1967 | object *key = find_key (op, op, door); |
1978 | object *key = find_key (op, op, door); |
1968 | |
1979 | |
1969 | /* IF we found a key, do some extra work */ |
1980 | /* If we found a key, do some extra work */ |
1970 | if (key) |
1981 | if (key) |
1971 | { |
1982 | { |
1972 | object *container = key->env; |
1983 | object *container = key->env; |
1973 | |
1984 | |
1974 | play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); |
|
|
1975 | if (action_makes_visible (op)) |
1985 | if (action_makes_visible (op)) |
1976 | make_visible (op); |
1986 | make_visible (op); |
|
|
1987 | |
1977 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
1988 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
1978 | spring_trap (door->inv, op); |
1989 | spring_trap (door->inv, op); |
1979 | |
1990 | |
1980 | if (door->type == DOOR) |
1991 | if (door->type == DOOR) |
1981 | hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ |
1992 | hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ |
… | |
… | |
2007 | * It should keep the code cleaner. |
2018 | * It should keep the code cleaner. |
2008 | * When this is called, the players direction has been updated |
2019 | * When this is called, the players direction has been updated |
2009 | * (taking into account confusion.) The player is also actually |
2020 | * (taking into account confusion.) The player is also actually |
2010 | * going to try and move (not fire weapons). |
2021 | * going to try and move (not fire weapons). |
2011 | */ |
2022 | */ |
2012 | void |
2023 | bool |
2013 | move_player_attack (object *op, int dir) |
2024 | move_player_attack (object *op, int dir) |
2014 | { |
2025 | { |
2015 | object *tmp, *mon; |
|
|
2016 | sint16 nx, ny; |
|
|
2017 | int on_battleground; |
2026 | int on_battleground; |
2018 | maptile *m; |
|
|
2019 | |
2027 | |
2020 | nx = freearr_x[dir] + op->x; |
2028 | sint16 nx = freearr_x[dir] + op->x; |
2021 | ny = freearr_y[dir] + op->y; |
2029 | sint16 ny = freearr_y[dir] + op->y; |
2022 | |
2030 | |
2023 | on_battleground = op_on_battleground (op, 0, 0); |
2031 | on_battleground = op_on_battleground (op, 0, 0); |
|
|
2032 | |
|
|
2033 | if (out_of_map (op->map, nx, ny)) |
|
|
2034 | return false; |
|
|
2035 | |
|
|
2036 | if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op)) |
|
|
2037 | { |
|
|
2038 | --op->speed_left; |
|
|
2039 | return true; |
|
|
2040 | } |
2024 | |
2041 | |
2025 | /* If braced, or can't move to the square, and it is not out of the |
2042 | /* If braced, or can't move to the square, and it is not out of the |
2026 | * map, attack it. Note order of if statement is important - don't |
2043 | * map, attack it. Note order of if statement is important - don't |
2027 | * want to be calling move_ob if braced, because move_ob will move the |
2044 | * want to be calling move_ob if braced, because move_ob will move the |
2028 | * player. This is a pretty nasty hack, because if we could |
2045 | * player. This is a pretty nasty hack, because if we could |
2029 | * move to some space, it then means that if we are braced, we should |
2046 | * move to some space, it then means that if we are braced, we should |
2030 | * do nothing at all. As it is, if we are braced, we go through |
2047 | * do nothing at all. As it is, if we are braced, we go through |
2031 | * quite a bit of processing. However, it probably is less than what |
2048 | * quite a bit of processing. However, it probably is less than what |
2032 | * move_ob uses. |
2049 | * move_ob uses. |
2033 | */ |
2050 | */ |
2034 | if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) |
|
|
2035 | { |
|
|
2036 | if (OUT_OF_REAL_MAP (op->map, nx, ny)) |
|
|
2037 | { |
|
|
2038 | m = op->map->xy_find (nx, ny); |
2051 | maptile *m = op->map->xy_find (nx, ny); |
2039 | if (!m) |
|
|
2040 | return; /* Don't think this should happen */ |
|
|
2041 | } |
|
|
2042 | else |
|
|
2043 | m = op->map; |
|
|
2044 | |
2052 | |
2045 | if (!(tmp = m->at (nx, ny).bot)) |
|
|
2046 | return; |
|
|
2047 | |
|
|
2048 | mon = 0; |
|
|
2049 | /* Go through all the objects, and find ones of interest. Only stop if |
2053 | /* Go through all the objects, and find ones of interest. Only stop if |
2050 | * we find a monster - that is something we know we want to attack. |
2054 | * we find a monster - that is something we know we want to attack. |
2051 | * if its a door or barrel (can roll) see if there may be monsters |
2055 | * if its a door or barrel (can roll) see if there may be monsters |
2052 | * on the space |
2056 | * on the space |
2053 | */ |
2057 | */ |
2054 | while (tmp) |
2058 | object *mon; |
2055 | { |
2059 | for (mon = m->at (nx, ny).bot; mon; mon = mon->above) |
2056 | if (tmp == op) |
2060 | { |
2057 | { |
2061 | if ((mon->flag [FLAG_ALIVE] |
2058 | tmp = tmp->above; |
2062 | || mon->type == LOCKED_DOOR |
2059 | continue; |
2063 | || mon->flag [FLAG_CAN_ROLL]) |
2060 | } |
|
|
2061 | |
|
|
2062 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) |
|
|
2063 | { |
|
|
2064 | mon = tmp; |
2064 | && mon != op) |
2065 | break; |
2065 | break; |
2066 | } |
2066 | } |
2067 | |
2067 | |
2068 | if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL)) |
|
|
2069 | mon = tmp; |
|
|
2070 | |
|
|
2071 | tmp = tmp->above; |
|
|
2072 | } |
|
|
2073 | |
|
|
2074 | if (!mon) /* This happens anytime the player tries to move */ |
2068 | if (!mon) /* This happens anytime the player tries to move */ |
2075 | return; /* into a wall */ |
2069 | return false; /* into a wall */ |
2076 | |
2070 | |
2077 | if (mon->head) |
|
|
2078 | mon = mon->head; |
2071 | mon = mon->head_ (); |
2079 | |
2072 | |
2080 | if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) |
2073 | if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) |
|
|
2074 | if (op->contr->weapon_sp_left > 0.f) |
2081 | if (player_attack_door (op, mon)) |
2075 | if (player_attack_door (op, mon)) |
|
|
2076 | { |
|
|
2077 | --op->contr->weapon_sp_left; |
2082 | return; |
2078 | return true; |
|
|
2079 | } |
2083 | |
2080 | |
2084 | /* The following deals with possibly attacking peaceful |
2081 | /* The following deals with possibly attacking peaceful |
2085 | * or frienddly creatures. Basically, all players are considered |
2082 | * or friendly creatures. Basically, all players are considered |
2086 | * unaggressive. If the moving player has peaceful set, then the |
2083 | * unaggressive. If the moving player has peaceful set, then the |
2087 | * object should be pushed instead of attacked. It is assumed that |
2084 | * object should be pushed instead of attacked. It is assumed that |
2088 | * if you are braced, you will not attack friends accidently, |
2085 | * if you are braced, you will not attack friends accidently, |
2089 | * and thus will not push them. |
2086 | * and thus will not push them. |
2090 | */ |
2087 | */ |
2091 | |
2088 | |
2092 | /* If the creature is a pet, push it even if the player is not |
2089 | /* If the creature is a pet, push it even if the player is not |
2093 | * peaceful. Our assumption is the creature is a pet if the |
2090 | * peaceful. Our assumption is the creature is a pet if the |
2094 | * player owns it and it is either friendly or unagressive. |
2091 | * player owns it and it is either friendly or unagressive. |
2095 | */ |
2092 | */ |
2096 | if ((op->type == PLAYER) |
2093 | if (op->type == PLAYER |
2097 | #if COZY_SERVER |
|
|
2098 | && |
|
|
2099 | ((mon->owner && mon->owner->contr |
2094 | && ((mon->owner && mon->owner->contr |
2100 | && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) |
2095 | && same_party (mon->owner->contr->party, op->contr->party)) |
2101 | #else |
|
|
2102 | && mon->owner == op |
2096 | || mon->owner == op) |
2103 | #endif |
|
|
2104 | && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) |
2097 | && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) |
2105 | { |
2098 | { |
2106 | /* If we're braced, we don't want to switch places with it */ |
2099 | /* If we're braced, we don't want to switch places with it */ |
2107 | if (op->contr->braced) |
2100 | if (op->contr->braced) |
2108 | return; |
2101 | return false; |
2109 | |
2102 | |
2110 | play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); |
2103 | if (op->speed_left > 0.f) |
|
|
2104 | { |
|
|
2105 | --op->speed_left; |
|
|
2106 | |
|
|
2107 | op->play_sound (sound_find ("push_player")); |
2111 | (void) push_ob (mon, dir, op); |
2108 | push_ob (mon, dir, op); |
|
|
2109 | |
2112 | if (op->contr->tmp_invis || op->hide) |
2110 | if (op->contr->tmp_invis || op->hide) |
2113 | make_visible (op); |
2111 | make_visible (op); |
2114 | |
2112 | |
2115 | return; |
2113 | return true; |
2116 | } |
2114 | } |
|
|
2115 | else |
|
|
2116 | return false; |
|
|
2117 | } |
2117 | |
2118 | |
2118 | /* in certain circumstances, you shouldn't attack friendly |
2119 | /* in certain circumstances, you shouldn't attack friendly |
2119 | * creatures. Note that if you are braced, you can't push |
2120 | * creatures. Note that if you are braced, you can't push |
2120 | * someone, but put it inside this loop so that you won't |
2121 | * someone, but put it inside this loop so that you won't |
2121 | * attack them either. |
2122 | * attack them either. |
2122 | */ |
2123 | */ |
2123 | if ((mon->type == PLAYER || mon->enemy != op) && |
2124 | if ((mon->type == PLAYER || mon->enemy != op) |
2124 | (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( |
2125 | && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) |
2125 | #ifdef PROHIBIT_PLAYERKILL |
|
|
2126 | (op->contr->peaceful |
2126 | && ((op->contr->peaceful |
2127 | || (mon->type == PLAYER |
2127 | || (mon->type == PLAYER && mon->contr->peaceful)) |
2128 | && mon->contr-> |
|
|
2129 | peaceful)) && |
|
|
2130 | #else |
|
|
2131 | op->contr->peaceful && |
|
|
2132 | #endif |
|
|
2133 | !on_battleground)) |
2128 | && !on_battleground)) |
|
|
2129 | { |
|
|
2130 | if (op->speed_left > 0.f) |
2134 | { |
2131 | { |
|
|
2132 | --op->speed_left; |
|
|
2133 | |
2135 | if (!op->contr->braced) |
2134 | if (!op->contr->braced) |
2136 | { |
2135 | { |
2137 | play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); |
2136 | op->play_sound (sound_find ("push_player")); |
2138 | push_ob (mon, dir, op); |
2137 | push_ob (mon, dir, op); |
2139 | } |
2138 | } |
2140 | else |
2139 | else |
2141 | new_draw_info (0, 0, op, "You withhold your attack"); |
2140 | new_draw_info (0, 0, op, "You withhold your attack"); |
2142 | |
2141 | |
2143 | if (op->contr->tmp_invis || op->hide) |
2142 | if (op->contr->tmp_invis || op->hide) |
2144 | make_visible (op); |
2143 | make_visible (op); |
2145 | } |
|
|
2146 | |
2144 | |
|
|
2145 | return true; |
|
|
2146 | } |
|
|
2147 | } |
2147 | /* If the object is a boulder or other rollable object, then |
2148 | /* If the object is a boulder or other rollable object, then |
2148 | * roll it if not braced. You can't roll it if you are braced. |
2149 | * roll it if not braced. You can't roll it if you are braced. |
2149 | */ |
2150 | */ |
2150 | else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) |
2151 | else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) |
|
|
2152 | { |
|
|
2153 | if (op->speed_left > 0.f) |
2151 | { |
2154 | { |
|
|
2155 | --op->speed_left; |
|
|
2156 | |
2152 | recursive_roll (mon, dir, op); |
2157 | recursive_roll (mon, dir, op); |
2153 | if (action_makes_visible (op)) |
2158 | if (action_makes_visible (op)) |
2154 | make_visible (op); |
2159 | make_visible (op); |
2155 | } |
|
|
2156 | |
2160 | |
|
|
2161 | return true; |
|
|
2162 | } |
|
|
2163 | } |
2157 | /* Any generic living creature. Including things like doors. |
2164 | /* Any generic living creature. Including things like doors. |
2158 | * Way it works is like this: First, it must have some hit points |
2165 | * Way it works is like this: First, it must have some hit points |
2159 | * and be living. Then, it must be one of the following: |
2166 | * and be living. Then, it must be one of the following: |
2160 | * 1) Not a player, 2) A player, but of a different party. Note |
2167 | * 1) Not a player, 2) A player, but of a different party. Note |
2161 | * that party_number -1 is no party, so attacks can still happen. |
2168 | * that party_number -1 is no party, so attacks can still happen. |
2162 | */ |
2169 | */ |
2163 | else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && |
2170 | else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && |
2164 | ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) |
2171 | ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) |
2165 | { |
2172 | { |
2166 | |
2173 | if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS]) |
2167 | /* If the player hasn't hit something this tick, and does |
|
|
2168 | * so, give them speed boost based on weapon speed. Doing |
|
|
2169 | * it here is better than process_players2, which basically |
|
|
2170 | * incurred a 1 tick offset. |
|
|
2171 | */ |
|
|
2172 | if (!op->contr->has_hit) |
|
|
2173 | { |
2174 | { |
2174 | op->speed_left += op->speed / op->contr->weapon_sp; |
2175 | --op->contr->weapon_sp_left; |
2175 | |
|
|
2176 | op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */ |
|
|
2177 | } |
|
|
2178 | |
2176 | |
2179 | skill_attack (mon, op, 0, 0, 0); |
2177 | skill_attack (mon, op, 0, 0, 0); |
2180 | |
|
|
2181 | /* If attacking another player, that player gets automatic |
|
|
2182 | * hitback, and doesn't loose luck either. |
|
|
2183 | * Disable hitback on the battleground or if the target is |
|
|
2184 | * the wiz. |
|
|
2185 | */ |
|
|
2186 | if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ)) |
|
|
2187 | { |
|
|
2188 | short luck = mon->stats.luck; |
|
|
2189 | |
|
|
2190 | mon->contr->has_hit = 1; |
|
|
2191 | skill_attack (op, mon, 0, 0, 0); |
|
|
2192 | mon->stats.luck = luck; |
|
|
2193 | } |
|
|
2194 | |
2178 | |
2195 | if (action_makes_visible (op)) |
2179 | if (action_makes_visible (op)) |
2196 | make_visible (op); |
2180 | make_visible (op); |
2197 | } |
|
|
2198 | } /* if player should attack something */ |
|
|
2199 | } |
|
|
2200 | |
2181 | |
2201 | int |
2182 | return true; |
|
|
2183 | } |
|
|
2184 | } |
|
|
2185 | |
|
|
2186 | return false; |
|
|
2187 | } |
|
|
2188 | |
|
|
2189 | bool |
2202 | move_player (object *op, int dir) |
2190 | move_player (object *op, int dir) |
2203 | { |
2191 | { |
2204 | int pick; |
2192 | int pick; |
2205 | |
2193 | |
2206 | if (!op->map || op->map->in_memory != MAP_IN_MEMORY) |
2194 | if (!op->map || op->map->in_memory != MAP_IN_MEMORY) |
… | |
… | |
2220 | op->facing = dir; |
2208 | op->facing = dir; |
2221 | |
2209 | |
2222 | if (op->hide) |
2210 | if (op->hide) |
2223 | do_hidden_move (op); |
2211 | do_hidden_move (op); |
2224 | |
2212 | |
|
|
2213 | bool retval; |
|
|
2214 | |
2225 | if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) |
2215 | if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) |
2226 | /*nop */ ; |
2216 | retval = RESULT_INT (0); |
2227 | else if (op->contr->fire_on) |
2217 | else if (op->contr->fire_on) |
2228 | fire (op, dir); |
2218 | retval = fire (op, dir); |
2229 | else |
2219 | else |
2230 | { |
2220 | { |
2231 | move_player_attack (op, dir); |
2221 | retval = move_player_attack (op, dir); |
2232 | pick = check_pick (op); |
2222 | pick = check_pick (op); |
2233 | } |
2223 | } |
2234 | |
2224 | |
2235 | /* Add special check for newcs players and fire on - this way, the |
2225 | /* Add special check for newcs players and fire on - this way, the |
2236 | * server can handle repeat firing. |
2226 | * server can handle repeat firing. |
… | |
… | |
2243 | /* Update how the player looks. Use the facing, so direction may |
2233 | /* Update how the player looks. Use the facing, so direction may |
2244 | * get reset to zero. This allows for full animation capabilities |
2234 | * get reset to zero. This allows for full animation capabilities |
2245 | * for players. |
2235 | * for players. |
2246 | */ |
2236 | */ |
2247 | animate_object (op, op->facing); |
2237 | animate_object (op, op->facing); |
2248 | return 0; |
2238 | |
|
|
2239 | return retval; |
2249 | } |
2240 | } |
2250 | |
2241 | |
2251 | /* This is similar to handle_player, below, but is only used by the |
2242 | /* This is similar to handle_player, below, but is only used by the |
2252 | * new client/server stuff. |
2243 | * new client/server stuff. |
2253 | * This is sort of special, in that the new client/server actually uses |
2244 | * This is sort of special, in that the new client/server actually uses |
2254 | * the new speed values for commands. |
2245 | * the new speed values for commands. |
2255 | * |
2246 | * |
2256 | * Returns true if there are more actions we can do. |
2247 | * Returns true if there are more actions we can do. Should not do |
|
|
2248 | * many actions in a row, as that would be too unfair to other |
|
|
2249 | * players. |
2257 | */ |
2250 | */ |
2258 | int |
2251 | bool |
2259 | handle_newcs_player (object *op) |
2252 | handle_newcs_player (object *op) |
2260 | { |
2253 | { |
2261 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2254 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2262 | { |
2255 | { |
2263 | flee_player (op); |
2256 | if (op->speed_left > 0.f) |
2264 | /* If player is still scared, that is his action for this tick */ |
|
|
2265 | if (QUERY_FLAG (op, FLAG_SCARED)) |
|
|
2266 | { |
2257 | { |
2267 | op->speed_left--; |
2258 | --op->speed_left; |
|
|
2259 | flee_player (op); |
|
|
2260 | |
2268 | return 0; |
2261 | return true; |
2269 | } |
2262 | } |
|
|
2263 | else |
|
|
2264 | return false; |
2270 | } |
2265 | } |
2271 | |
|
|
2272 | /* I've been seeing crashes where the golem has been destroyed, but |
|
|
2273 | * the player object still points to the defunct golem. The code that |
|
|
2274 | * destroys the golem looks correct, and it doesn't always happen, so |
|
|
2275 | * put this in a a workaround to clean up the golem pointer. |
|
|
2276 | */ |
|
|
2277 | if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED)) |
|
|
2278 | op->contr->ranges[range_golem] = 0; |
|
|
2279 | |
2266 | |
2280 | /* call this here - we also will call this in do_ericserver, but |
2267 | /* call this here - we also will call this in do_ericserver, but |
2281 | * the players time has been increased when doericserver has been |
2268 | * the players time has been increased when doericserver has been |
2282 | * called, so we recheck it here. |
2269 | * called, so we recheck it here. |
2283 | */ |
2270 | */ |
2284 | if (op->contr->ns->handle_command ()) |
2271 | if (op->contr->ns->handle_command ()) |
2285 | return 1; |
2272 | return true; |
2286 | |
2273 | |
2287 | if (op->speed_left > 0) |
|
|
2288 | { |
|
|
2289 | if (op->direction && (op->contr->run_on || op->contr->fire_on)) |
2274 | if (op->direction && (op->contr->run_on || op->contr->fire_on)) |
2290 | { |
|
|
2291 | /* All move commands take 1 tick, at least for now */ |
|
|
2292 | op->speed_left--; |
|
|
2293 | |
|
|
2294 | /* Instead of all the stuff below, let move_player take care |
|
|
2295 | * of it. Also, some of the skill stuff is only put in |
|
|
2296 | * there, as well as the confusion stuff. |
|
|
2297 | */ |
|
|
2298 | move_player (op, op->direction); |
2275 | return move_player (op, op->direction); |
2299 | |
2276 | |
2300 | return op->speed_left > 0; |
|
|
2301 | } |
|
|
2302 | } |
|
|
2303 | |
|
|
2304 | return 0; |
2277 | return false; |
2305 | } |
2278 | } |
2306 | |
2279 | |
2307 | int |
2280 | int |
2308 | save_life (object *op) |
2281 | save_life (object *op) |
2309 | { |
2282 | { |
… | |
… | |
2311 | return 0; |
2284 | return 0; |
2312 | |
2285 | |
2313 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2286 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2314 | if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) |
2287 | if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) |
2315 | { |
2288 | { |
2316 | play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); |
2289 | op->play_sound (sound_find ("ob_evaporate")); |
2317 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); |
2290 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); |
2318 | |
2291 | |
2319 | if (op->contr) |
2292 | if (op->contr) |
2320 | esrv_del_item (op->contr, tmp->count); |
2293 | esrv_del_item (op->contr, tmp->count); |
2321 | |
2294 | |
… | |
… | |
2341 | /* This goes throws the inventory and removes unpaid objects, and puts them |
2314 | /* This goes throws the inventory and removes unpaid objects, and puts them |
2342 | * back in the map (location and map determined by values of env). This |
2315 | * back in the map (location and map determined by values of env). This |
2343 | * function will descend into containers. op is the object to start the search |
2316 | * function will descend into containers. op is the object to start the search |
2344 | * from. |
2317 | * from. |
2345 | */ |
2318 | */ |
2346 | void |
2319 | static void |
2347 | remove_unpaid_objects (object *op, object *env) |
2320 | drop_unpaid_items (object *op, object *env) |
2348 | { |
2321 | { |
2349 | while (op) |
2322 | while (op) |
2350 | { |
2323 | { |
2351 | object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ |
2324 | object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ |
2352 | |
2325 | |
… | |
… | |
2356 | esrv_del_item (env->contr, op->count); |
2329 | esrv_del_item (env->contr, op->count); |
2357 | |
2330 | |
2358 | op->insert_at (env); |
2331 | op->insert_at (env); |
2359 | } |
2332 | } |
2360 | else if (op->inv) |
2333 | else if (op->inv) |
2361 | remove_unpaid_objects (op->inv, env); |
2334 | drop_unpaid_items (op->inv, env); |
2362 | |
2335 | |
2363 | op = next; |
2336 | op = next; |
2364 | } |
2337 | } |
|
|
2338 | } |
|
|
2339 | |
|
|
2340 | void |
|
|
2341 | object::drop_unpaid_items () |
|
|
2342 | { |
|
|
2343 | if (!flag [FLAG_REMOVED]) |
|
|
2344 | ::drop_unpaid_items (inv, this); |
2365 | } |
2345 | } |
2366 | |
2346 | |
2367 | /* |
2347 | /* |
2368 | * Returns pointer a static string containing gravestone text |
2348 | * Returns pointer a static string containing gravestone text |
2369 | * Moved from apply.c to player.c - player.c is what |
2349 | * Moved from apply.c to player.c - player.c is what |
… | |
… | |
2438 | make_visible (op); |
2418 | make_visible (op); |
2439 | new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); |
2419 | new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); |
2440 | } |
2420 | } |
2441 | } |
2421 | } |
2442 | |
2422 | |
2443 | if (op->contr->outputs_sync) |
|
|
2444 | { |
|
|
2445 | for (i = 0; i < NUM_OUTPUT_BUFS; i++) |
|
|
2446 | if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) |
|
|
2447 | flush_output_element (op, &op->contr->outputs[i]); |
|
|
2448 | } |
|
|
2449 | |
|
|
2450 | if (op->contr->ns->state == ST_PLAYING) |
2423 | if (op->contr->ns->state == ST_PLAYING) |
2451 | { |
2424 | { |
2452 | /* these next three if clauses make it possible to SLOW DOWN |
2425 | /* these next three if clauses make it possible to SLOW DOWN |
2453 | hp/grace/spellpoint regeneration. */ |
2426 | hp/grace/spellpoint regeneration. */ |
2454 | if (op->contr->gen_hp >= 0) |
2427 | if (op->contr->gen_hp >= 0) |
… | |
… | |
2474 | gen_grace = op->stats.maxgrace; |
2447 | gen_grace = op->stats.maxgrace; |
2475 | rate_grace -= rate_grace / 2 * op->contr->gen_grace; |
2448 | rate_grace -= rate_grace / 2 * op->contr->gen_grace; |
2476 | } |
2449 | } |
2477 | |
2450 | |
2478 | /* Regenerate Spell Points */ |
2451 | /* Regenerate Spell Points */ |
2479 | if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) |
2452 | if (!op->contr->golem && --op->last_sp < 0) |
2480 | { |
2453 | { |
2481 | gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); |
2454 | gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); |
2482 | if (op->stats.sp < op->stats.maxsp) |
2455 | if (op->stats.sp < op->stats.maxsp) |
2483 | { |
2456 | { |
2484 | op->stats.sp++; |
2457 | op->stats.sp++; |
… | |
… | |
2582 | } |
2555 | } |
2583 | |
2556 | |
2584 | /* Digestion */ |
2557 | /* Digestion */ |
2585 | if (--op->last_eat < 0) |
2558 | if (--op->last_eat < 0) |
2586 | { |
2559 | { |
2587 | #ifdef COZY_SERVER |
2560 | int bonus = max (0, op->contr->digestion), |
2588 | int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; |
2561 | penalty = max (0, -op->contr->digestion); |
2589 | int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0; |
|
|
2590 | #else |
|
|
2591 | int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; |
|
|
2592 | #endif |
|
|
2593 | |
2562 | |
2594 | if (op->contr->gen_hp > 0) |
|
|
2595 | op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); |
2563 | op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1); |
2596 | else |
|
|
2597 | op->last_eat = 25 * (1 + bonus) / (penalty + 1); |
|
|
2598 | |
2564 | |
2599 | /* dms do not consume food */ |
2565 | /* dms do not consume food */ |
2600 | if (!QUERY_FLAG (op, FLAG_WIZ)) |
2566 | if (!QUERY_FLAG (op, FLAG_WIZ)) |
2601 | op->stats.food--; |
2567 | op->stats.food--; |
2602 | } |
2568 | } |
… | |
… | |
2663 | object *tmp; |
2629 | object *tmp; |
2664 | |
2630 | |
2665 | if (save_life (op)) |
2631 | if (save_life (op)) |
2666 | return; |
2632 | return; |
2667 | |
2633 | |
2668 | |
|
|
2669 | /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas |
2634 | /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas |
2670 | * in cities ONLY!!! It is very important that this doesn't get abused. |
2635 | * in cities ONLY!!! It is very important that this doesn't get abused. |
2671 | * Look at op_on_battleground() for more info --AndreasV |
2636 | * Look at op_on_battleground() for more info --AndreasV |
2672 | */ |
2637 | */ |
2673 | if (op_on_battleground (op, &x, &y)) |
2638 | if (op_on_battleground (op, &x, &y)) |
… | |
… | |
2725 | strcpy (op->contr->killer, "starvation"); |
2690 | strcpy (op->contr->killer, "starvation"); |
2726 | } |
2691 | } |
2727 | else |
2692 | else |
2728 | sprintf (buf, "%s died.", &op->name); |
2693 | sprintf (buf, "%s died.", &op->name); |
2729 | |
2694 | |
2730 | play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); |
2695 | op->contr->play_sound (sound_find ("player_dies")); |
2731 | |
2696 | |
2732 | /* save the map location for corpse, gravestone */ |
2697 | /* save the map location for corpse, gravestone */ |
2733 | x = op->x; |
2698 | x = op->x; |
2734 | y = op->y; |
2699 | y = op->y; |
2735 | map = op->map; |
2700 | map = op->map; |
… | |
… | |
2912 | |
2877 | |
2913 | /* |
2878 | /* |
2914 | * Check to see if the player has any unpaid items. If so, remove them |
2879 | * Check to see if the player has any unpaid items. If so, remove them |
2915 | * and put them back in the map. |
2880 | * and put them back in the map. |
2916 | */ |
2881 | */ |
2917 | remove_unpaid_objects (op->inv, op); |
2882 | op->drop_unpaid_items (); |
2918 | |
2883 | |
2919 | /****************************************/ |
2884 | /****************************************/ |
2920 | /* */ |
2885 | /* */ |
2921 | /* Move player to his current respawn- */ |
2886 | /* Move player to his current respawn- */ |
2922 | /* position (usually last savebed) */ |
2887 | /* position (usually last savebed) */ |
… | |
… | |
2942 | object *force; |
2907 | object *force; |
2943 | int at; |
2908 | int at; |
2944 | |
2909 | |
2945 | force = get_archetype (FORCE_NAME); |
2910 | force = get_archetype (FORCE_NAME); |
2946 | /* 50 ticks should be enough time for the spell to abate */ |
2911 | /* 50 ticks should be enough time for the spell to abate */ |
2947 | force->speed = 0.1; |
2912 | force->speed = 0.1f; |
2948 | force->speed_left = -5.0; |
2913 | force->speed_left = -5.f; |
2949 | SET_FLAG (force, FLAG_APPLIED); |
2914 | SET_FLAG (force, FLAG_APPLIED); |
2950 | for (at = 0; at < NROFATTACKS; at++) |
2915 | for (at = 0; at < NROFATTACKS; at++) |
2951 | if (will_kill_again & (1 << at)) |
2916 | if (will_kill_again & (1 << at)) |
2952 | force->resist[at] = 100; |
2917 | force->resist[at] = 100; |
2953 | |
2918 | |
… | |
… | |
3074 | } |
3039 | } |
3075 | |
3040 | |
3076 | int |
3041 | int |
3077 | is_true_undead (object *op) |
3042 | is_true_undead (object *op) |
3078 | { |
3043 | { |
3079 | if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) |
3044 | if (QUERY_FLAG (op->arch, FLAG_UNDEAD)) |
3080 | return 1; |
3045 | return 1; |
3081 | |
3046 | |
3082 | return 0; |
3047 | return 0; |
3083 | } |
3048 | } |
3084 | |
3049 | |
… | |
… | |
3128 | /* For Hidden creatures - a chance of becoming 'unhidden' |
3093 | /* For Hidden creatures - a chance of becoming 'unhidden' |
3129 | * every time they move - as we subtract off 'invisibility' |
3094 | * every time they move - as we subtract off 'invisibility' |
3130 | * AND, for players, if they move into a ridiculously unhideable |
3095 | * AND, for players, if they move into a ridiculously unhideable |
3131 | * spot (surrounded by clear terrain in broad daylight). -b.t. |
3096 | * spot (surrounded by clear terrain in broad daylight). -b.t. |
3132 | */ |
3097 | */ |
3133 | |
|
|
3134 | void |
3098 | void |
3135 | do_hidden_move (object *op) |
3099 | do_hidden_move (object *op) |
3136 | { |
3100 | { |
3137 | int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); |
3101 | int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); |
3138 | object *skop; |
3102 | object *skop; |
… | |
… | |
3255 | * a blocked los square. |
3219 | * a blocked los square. |
3256 | * we use the archetype to figure out offsets. |
3220 | * we use the archetype to figure out offsets. |
3257 | */ |
3221 | */ |
3258 | while (op) |
3222 | while (op) |
3259 | { |
3223 | { |
3260 | dx = rv.distance_x + op->arch->clone.x; |
3224 | dx = rv.distance_x + op->arch->x; |
3261 | dy = rv.distance_y + op->arch->clone.y; |
3225 | dy = rv.distance_y + op->arch->y; |
3262 | |
3226 | |
3263 | /* only the viewable area the player sees is updated by LOS |
3227 | /* only the viewable area the player sees is updated by LOS |
3264 | * code, so we need to restrict ourselves to that range of values |
3228 | * code, so we need to restrict ourselves to that range of values |
3265 | * for any meaningful values. |
3229 | * for any meaningful values. |
3266 | */ |
3230 | */ |
… | |
… | |
3371 | char buf[MAX_BUF]; /* tmp. string buffer */ |
3335 | char buf[MAX_BUF]; /* tmp. string buffer */ |
3372 | int i = 0, j = 0; |
3336 | int i = 0, j = 0; |
3373 | |
3337 | |
3374 | /* get the appropriate treasurelist */ |
3338 | /* get the appropriate treasurelist */ |
3375 | if (atnr == ATNR_FIRE) |
3339 | if (atnr == ATNR_FIRE) |
3376 | trlist = find_treasurelist ("dragon_ability_fire"); |
3340 | trlist = treasurelist::find ("dragon_ability_fire"); |
3377 | else if (atnr == ATNR_COLD) |
3341 | else if (atnr == ATNR_COLD) |
3378 | trlist = find_treasurelist ("dragon_ability_cold"); |
3342 | trlist = treasurelist::find ("dragon_ability_cold"); |
3379 | else if (atnr == ATNR_ELECTRICITY) |
3343 | else if (atnr == ATNR_ELECTRICITY) |
3380 | trlist = find_treasurelist ("dragon_ability_elec"); |
3344 | trlist = treasurelist::find ("dragon_ability_elec"); |
3381 | else if (atnr == ATNR_POISON) |
3345 | else if (atnr == ATNR_POISON) |
3382 | trlist = find_treasurelist ("dragon_ability_poison"); |
3346 | trlist = treasurelist::find ("dragon_ability_poison"); |
3383 | |
3347 | |
3384 | if (trlist == NULL || who->type != PLAYER) |
3348 | if (trlist == NULL || who->type != PLAYER) |
3385 | return; |
3349 | return; |
3386 | |
3350 | |
3387 | for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); |
3351 | for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); |
… | |
… | |
3391 | /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ |
3355 | /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ |
3392 | return; |
3356 | return; |
3393 | } |
3357 | } |
3394 | |
3358 | |
3395 | /* everything seems okay - now bring on the gift: */ |
3359 | /* everything seems okay - now bring on the gift: */ |
3396 | item = &(tr->item->clone); |
3360 | item = tr->item; |
3397 | |
3361 | |
3398 | if (item->type == SPELL) |
3362 | if (item->type == SPELL) |
3399 | { |
3363 | { |
3400 | if (check_spell_known (who, item->name)) |
3364 | if (check_spell_known (who, item->name)) |
3401 | return; |
3365 | return; |
… | |
… | |
3460 | { |
3424 | { |
3461 | /* forces in the treasurelist can alter the player's stats */ |
3425 | /* forces in the treasurelist can alter the player's stats */ |
3462 | object *skin; |
3426 | object *skin; |
3463 | |
3427 | |
3464 | /* first get the dragon skin force */ |
3428 | /* first get the dragon skin force */ |
3465 | shstr_cmp dragon_skin_force ("dragon_skin_force"); |
|
|
3466 | for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) |
3429 | for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below) |
3467 | ; |
3430 | ; |
3468 | |
3431 | |
3469 | if (!skin) |
3432 | if (!skin) |
3470 | return; |
3433 | return; |
3471 | |
3434 | |
… | |
… | |
3519 | * not readied. |
3482 | * not readied. |
3520 | */ |
3483 | */ |
3521 | void |
3484 | void |
3522 | player_unready_range_ob (player *pl, object *ob) |
3485 | player_unready_range_ob (player *pl, object *ob) |
3523 | { |
3486 | { |
3524 | for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) |
3487 | if (pl->ob->current_weapon == ob) |
|
|
3488 | pl->ob->current_weapon = 0; |
|
|
3489 | |
|
|
3490 | if (pl->combat_ob == ob) |
|
|
3491 | pl->combat_ob = 0; |
|
|
3492 | |
3525 | if (pl->ranges[i] == ob) |
3493 | if (pl->ranged_ob == ob) |
3526 | { |
|
|
3527 | pl->ranges[i] = 0; |
3494 | pl->ranged_ob = 0; |
3528 | if (pl->shoottype == i) |
|
|
3529 | pl->shoottype = range_none; |
|
|
3530 | } |
|
|
3531 | } |
3495 | } |
3532 | |
3496 | |
3533 | sint8 |
3497 | sint8 |
3534 | player::visibility_at (maptile *map, int x, int y) const |
3498 | player::visibility_at (maptile *map, int x, int y) const |
3535 | { |
3499 | { |