ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/gods.C
(Generate patch)

Comparing deliantra/server/server/gods.C (file contents):
Revision 1.9 by root, Tue Dec 12 20:53:03 2006 UTC vs.
Revision 1.45 by root, Thu Jan 1 16:05:13 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23
24 23
25/* Oct 3, 1995 - Code laid down for initial gods, priest alignment, and 24/* Oct 3, 1995 - Code laid down for initial gods, priest alignment, and
26 * monster race initialization. b.t. 25 * monster race initialization. b.t.
27 */ 26 */
28 27
… …
31#include <global.h> 30#include <global.h>
32#include <living.h> 31#include <living.h>
33#include <object.h> 32#include <object.h>
34#include <spells.h> 33#include <spells.h>
35#include <sounds.h> 34#include <sounds.h>
36#ifndef __CEXTRACT__
37# include <sproto.h> 35#include <sproto.h>
38#endif
39 36
40/** 37/**
41 * Returns the id of specified god. 38 * Returns the id of specified god.
42 */ 39 */
43int 40int
44lookup_god_by_name (const char *name) 41lookup_god_by_name (shstr_cmp name)
45{ 42{
46 int godnr = -1; 43 if (name)
47 size_t nmlen = strlen (name);
48
49 if (name && strcmp (name, "none"))
50 {
51 godlink *gl;
52
53 for (gl = first_god; gl; gl = gl->next) 44 for (godlink *gl = first_god; gl; gl = gl->next)
54 if (!strncmp (name, gl->name, MIN ((size_t) strlen (gl->name), nmlen))) 45 if (gl->name == name)
55 break;
56 if (gl)
57 godnr = gl->id; 46 return gl->id;
58 } 47
59 return godnr; 48 return -1;
60} 49}
61 50
62/** 51/**
63 * Returns pointer to specified god's object through pntr_to_god_obj.. 52 * Returns pointer to specified god's object through pntr_to_god_obj..
64 */ 53 */
65object * 54object *
66find_god (const char *name) 55find_god (shstr_cmp name)
67{ 56{
68 object *god = NULL;
69
70 if (name) 57 if (name)
71 {
72 godlink *gl;
73
74 for (gl = first_god; gl; gl = gl->next) 58 for (godlink *gl = first_god; gl; gl = gl->next)
75 if (!strcmp (name, gl->name)) 59 if (gl->name == name)
76 break;
77 if (gl)
78 god = pntr_to_god_obj (gl); 60 return pntr_to_god_obj (gl);
79 } 61
80 return god; 62 return 0;
63}
64
65/**
66 * Returns a string that is the name of the god that should be natively worshipped by a
67 * creature of who has race *race
68 * if we can't find a god that is appropriate, we return NULL
69 */
70static shstr_tmp
71get_god_for_race (shstr_cmp race)
72{
73 if (race)
74 for (godlink *gl = first_god; gl; gl = gl->next)
75 if (gl->arch->race == race)
76 return gl->name;
77
78 return shstr_tmp ();
81} 79}
82 80
83/** 81/**
84 * Determines if op worships a god. 82 * Determines if op worships a god.
85 * Returns the godname if they do or "none" if they have no god. 83 * Returns the godname if they do or "none" if they have no god.
86 * In the case of an NPC, if they have no god, we try and guess 84 * In the case of an NPC, if they have no god, we try and guess
87 * who they should worship based on their race. If that fails we 85 * who they should worship based on their race. If that fails we
88 * give them a random one. 86 * give them a random one.
89 */ 87 */
90 88shstr_tmp
91const char *
92determine_god (object *op) 89determine_god (object *op)
93{ 90{
94 int godnr = -1;
95 const char *godname;
96
97 /* spells */ 91 /* spells */
98 if ((op->type == SPELL || op->type == SPELL_EFFECT) && op->title) 92 if ((op->type == SPELL || op->type == SPELL_EFFECT) && op->title)
99 {
100 if (lookup_god_by_name (op->title) >= 0) 93 if (lookup_god_by_name (op->title) >= 0)
101 return op->title; 94 return op->title;
95
96 if (!op->is_player () && op->flag [FLAG_ALIVE])
102 } 97 {
103
104 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_ALIVE))
105 {
106
107 /* find a god based on race */ 98 /* find a god based on race */
108 if (!op->title) 99 if (!op->title)
109 {
110 if (op->race != NULL)
111 {
112 godname = get_god_for_race (op->race); 100 op->title = get_god_for_race (op->race);
113 if (godname != NULL)
114 {
115 op->title = godname;
116 }
117 }
118 }
119 101
120 /* find a random god */ 102 /* find a random god */
121 if (!op->title) 103 if (!op->title)
122 { 104 {
123 godlink *gl = first_god;
124
125 godnr = rndm (1, gl->id); 105 int godnr = rndm (1, first_god->id);
126 while (gl) 106
127 { 107 for (godlink *gl = first_god; gl && gl->id != godnr; gl = gl->next)
128 if (gl->id == godnr) 108 if (gl->id == godnr)
109 {
110 op->title = gl->name;
129 break; 111 break;
130 gl = gl->next;
131 } 112 }
132 op->title = gl->name;
133 } 113 }
134 114
135 return op->title; 115 return op->title;
136 } 116 }
137
138 117
139 /* The god the player worships is in the praying skill (native skill 118 /* The god the player worships is in the praying skill (native skill
140 * not skill tool). Since a player can only have one instance of 119 * not skill tool). Since a player can only have one instance of
141 * that skill, once we find it, we can return, either with the 120 * that skill, once we find it, we can return, either with the
142 * title or "none". 121 * title or "none".
143 */ 122 */
144 if (op->type == PLAYER) 123 if (op->type == PLAYER)
145 {
146 object *tmp;
147
148 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 124 for (object *tmp = op->inv; tmp; tmp = tmp->below)
149 if (tmp->type == SKILL && tmp->subtype == SK_PRAYING) 125 if (tmp->type == SKILL && tmp->subtype == SK_PRAYING)
150 { 126 {
151 if (tmp->title) 127 if (tmp->title)
152 return (tmp->title); 128 return tmp->title;
153 else 129
154 return ("none"); 130 break;
155 } 131 }
156 } 132
157 return ("none"); 133 return shstr_none;
158} 134}
159 135
160/** 136/**
161 * Returns 1 if s1 and s2 are the same - either both NULL, or strcmp( ) == 0 137 * Returns 1 if s1 and s2 are the same - either both NULL, or strcmp( ) == 0
162 */ 138 */
163static int 139static int
164same_string (const char *s1, const char *s2) 140same_string (const char *s1, const char *s2)
165{ 141{
166 if (s1 == NULL) 142 if (s1 == s2)
167 if (s2 == NULL)
168 return 1; 143 return 1;
144 else if (s1 && s2)
145 return !strcmp (s1, s2);
169 else 146 else
170 return 0;
171 else if (s2 == NULL)
172 return 0; 147 return 0;
173 else
174 return strcmp (s1, s2) == 0;
175} 148}
176
177 149
178/** 150/**
179 * Checks for any occurrence of the given 'item' in the inventory of 'op' (recursively). 151 * Checks for any occurrence of the given 'item' in the inventory of 'op' (recursively).
180 * Any matching items in the inventory are deleted, and a 152 * Any matching items in the inventory are deleted, and a
181 * message is displayed to the player. 153 * message is displayed to the player.
… …
194 166
195 if (tmp->type == item->type 167 if (tmp->type == item->type
196 && same_string (tmp->name, item->name) 168 && same_string (tmp->name, item->name)
197 && same_string (tmp->title, item->title) && same_string (tmp->msg, item->msg) && same_string (tmp->slaying, item->slaying)) 169 && same_string (tmp->title, item->title) && same_string (tmp->msg, item->msg) && same_string (tmp->slaying, item->slaying))
198 { 170 {
199
200 /* message */ 171 /* message */
201 if (tmp->nrof > 1) 172 new_draw_info_format (NDI_UNIQUE, 0, op,
202 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s crumble to dust!", query_short_name (tmp)); 173 tmp->nrof > 1 ? "The %s crumble to dust!" : "The %s crumbles to dust!",
203 else 174 query_short_name (tmp));
204 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s crumbles to dust!", query_short_name (tmp));
205 175
206 tmp->remove (); /* remove obj from players inv. */ 176 tmp->destroy ();
207 esrv_del_item (op->contr, tmp->count); /* notify client */
208 tmp->destroy (0); /* free object */
209 } 177 }
178
210 if (tmp->inv) 179 if (tmp->inv)
211 follower_remove_similar_item (tmp, item); 180 follower_remove_similar_item (tmp, item);
212 } 181 }
213 } 182 }
214} 183}
… …
238 * God gives an item to the player. 207 * God gives an item to the player.
239 */ 208 */
240static int 209static int
241god_gives_present (object *op, object *god, treasure *tr) 210god_gives_present (object *op, object *god, treasure *tr)
242{ 211{
243 object *tmp; 212 if (!tr->item)
244
245 if (follower_has_similar_item (op, &tr->item->clone))
246 return 0; 213 return 0;
247 214
215 if (follower_has_similar_item (op, tr->item))
216 return 0;
217
248 tmp = arch_to_object (tr->item); 218 object *tmp = arch_to_object (tr->item);
249 new_draw_info_format (NDI_UNIQUE, 0, op, "%s lets %s appear in your hands.", &god->name, query_short_name (tmp)); 219 new_draw_info_format (NDI_UNIQUE, 0, op, "%s lets %s appear in your hands.", &god->name, query_short_name (tmp));
250 tmp = insert_ob_in_ob (tmp, op); 220 op->insert (tmp);
251 if (op->type == PLAYER) 221
252 esrv_send_item (op, tmp);
253 return 1; 222 return 1;
254} 223}
255 224
256/** 225/**
257 * Player prays at altar. 226 * Player prays at altar.
… …
270 return; 239 return;
271 240
272 /* hmm. what happend depends on pl's current god, level, etc */ 241 /* hmm. what happend depends on pl's current god, level, etc */
273 if (!pl_god) 242 if (!pl_god)
274 { /*new convert */ 243 { /*new convert */
275 become_follower (pl, &altar->other_arch->clone); 244 become_follower (pl, altar->other_arch);
276 return; 245 return;
277
278 } 246 }
279 else if (!strcmp (&pl_god->name, altar->other_arch->clone.name)) 247 else if (!strcmp (&pl_god->name, altar->other_arch->object::name))
280 { 248 {
281 /* pray at your gods altar */ 249 /* pray at your gods altar */
282 int bonus = (pl->stats.Wis + skill->level) / 10; 250 int bonus = (pl->stats.Wis + skill->level) / 10;
283 251
284 /* we can get neg grace up faster */ 252 /* we can get neg grace up faster */
285 if (pl->stats.grace < 0) 253 if (pl->stats.grace < 0)
286 pl->stats.grace += (bonus > -1 * (pl->stats.grace / 10) ? bonus : -1 * (pl->stats.grace / 10)); 254 pl->stats.grace += (bonus > -1 * (pl->stats.grace / 10) ? bonus : -1 * (pl->stats.grace / 10));
255
287 /* we can super-charge grace to 2x max */ 256 /* we can super-charge grace to 2x max */
288 if (pl->stats.grace < (2 * pl->stats.maxgrace)) 257 if (pl->stats.grace < 2 * pl->stats.maxgrace)
289 {
290 pl->stats.grace += bonus / 2; 258 pl->stats.grace += bonus / 2;
291 } 259 else
292 if (pl->stats.grace > (2 * pl->stats.maxgrace))
293 {
294 pl->stats.grace = (2 * pl->stats.maxgrace); 260 pl->stats.grace = 2 * pl->stats.maxgrace;
295 }
296 261
297 /* Every once in a while, the god decides to checkup on their 262 /* Every once in a while, the god decides to checkup on their
298 * follower, and may intervene to help them out. 263 * follower, and may intervene to help them out.
299 */ 264 */
300 bonus = MAX (1, bonus + MAX (pl->stats.luck, -3)); /* -- DAMN -- */ 265 bonus = MAX (1, bonus + MAX (pl->stats.luck, -3)); /* -- DAMN -- */
301 266
302 if (((random_roll (0, 399, pl, PREFER_LOW)) - bonus) < 0) 267 if (((random_roll (0, 399, pl, PREFER_LOW)) - bonus) < 0)
303 god_intervention (pl, pl_god, skill); 268 god_intervention (pl, pl_god, skill);
304
305 } 269 }
306 else 270 else
307 { /* praying to another god! */ 271 { /* praying to another god! */
308 uint64 loss = 0; 272 uint64 loss = 0;
309 int angry = 1; 273 int angry = 1;
… …
313 * points to the god of this altar (which we have 277 * points to the god of this altar (which we have
314 * already verified is non null). pl_god->other_arch 278 * already verified is non null). pl_god->other_arch
315 * is the opposing god - we need to verify that exists before 279 * is the opposing god - we need to verify that exists before
316 * using its values. 280 * using its values.
317 */ 281 */
318 if (pl_god->other_arch && (altar->other_arch->name == pl_god->other_arch->name)) 282 if (pl_god->other_arch && (altar->other_arch->archname == pl_god->other_arch->archname))
319 { 283 {
320 angry = 2; 284 angry = 2;
321 if (random_roll (0, skill->level + 2, pl, PREFER_LOW) - 5 > 0) 285 if (random_roll (0, skill->level + 2, pl, PREFER_LOW) - 5 > 0)
322 { 286 {
323 object *tmp; 287 object *tmp;
… …
344 308
345 /* May switch Gods, but its random chance based on our current level 309 /* May switch Gods, but its random chance based on our current level
346 * note it gets harder to swap gods the higher we get 310 * note it gets harder to swap gods the higher we get
347 */ 311 */
348 if ((angry == 1) && !(random_roll (0, skill->level, pl, PREFER_LOW))) 312 if ((angry == 1) && !(random_roll (0, skill->level, pl, PREFER_LOW)))
349 {
350 become_follower (pl, &altar->other_arch->clone); 313 become_follower (pl, altar->other_arch);
351 }
352 else 314 else
353 { 315 {
354 /* toss this player off the altar. He can try again. */ 316 /* toss this player off the altar. He can try again. */
355 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, pl, "A divine force pushes you off the altar."); 317 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, pl, "A divine force pushes you off the altar.");
318 pl->contr->fire_on = 0;
319 pl->speed_left = 1.f;
356 move_player (pl, absdir (pl->facing + 4)); /* back him off the way he came. */ 320 move_player (pl, absdir (pl->facing + 4)); /* back him off the way he came. */
357 } 321 }
358 } 322 }
359} 323}
360 324
… …
395 remove = 1; 359 remove = 1;
396 for (tr = god->randomitems->items; tr; tr = tr->next) 360 for (tr = god->randomitems->items; tr; tr = tr->next)
397 { 361 {
398 object *item; 362 object *item;
399 363
400 if (tr->item == NULL) 364 if (!tr->item)
401 continue; 365 continue;
366
402 item = &tr->item->clone; 367 item = tr->item;
403 368
404 /* Basically, see if the matching spell is granted by this god. */ 369 /* Basically, see if the matching spell is granted by this god. */
405 370
406 if (tr->item->clone.type == SPELL && tr->item->clone.name == tmp->name) 371 if (tr->item->type == SPELL && tr->item->object::name == tmp->name)
407 { 372 {
408 remove = 0; 373 remove = 0;
409 break; 374 break;
410 } 375 }
411 } 376 }
377
412 if (remove) 378 if (remove)
413 { 379 do_forget_spell (op, tmp->name);
414 /* just do the work of removing the spell ourselves - we already
415 * know that the player knows the spell
416 */
417 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", &tmp->name);
418 player_unready_range_ob (op->contr, tmp);
419 tmp->remove ();
420 tmp->destroy (0);
421 }
422
423 } 380 }
424} 381}
425 382
426/** 383/**
427 * This function is called whenever a player has 384 * This function is called whenever a player has
… …
435 object *old_god = NULL; /* old god */ 392 object *old_god = NULL; /* old god */
436 treasure *tr; 393 treasure *tr;
437 object *item, *skop, *next; 394 object *item, *skop, *next;
438 int i, sk_applied, undeadified = 0; /* Turns to true if changing god can changes the undead status of the player. */ 395 int i, sk_applied, undeadified = 0; /* Turns to true if changing god can changes the undead status of the player. */
439 396
440
441 old_god = find_god (determine_god (op)); 397 old_god = find_god (determine_god (op));
442 398
443 /* take away any special god-characteristic items. */ 399 /* take away any special god-characteristic items. */
444 for (item = op->inv; item != NULL; item = next) 400 for (item = op->inv; item; item = next)
445 { 401 {
446 next = item->below; 402 next = item->below;
403
447 /* remove all invisible startequip items which are 404 // remove all invisible startequip items which are not skill, exp or force
448 * not skill, exp or force
449 */
450 if (QUERY_FLAG (item, FLAG_STARTEQUIP) && item->invisible && 405 if (QUERY_FLAG (item, FLAG_STARTEQUIP) && item->invisible &&
451 (item->type != SKILL) && (item->type != EXPERIENCE) && (item->type != FORCE)) 406 (item->type != SKILL) && (item->type != FORCE))
452 { 407 {
453
454 if (item->type == SPELL) 408 if (item->type == SPELL)
409 {
455 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", &item->name); 410 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", &item->name);
411 esrv_remove_spell (op->contr, item);
412 }
413
456 player_unready_range_ob (op->contr, item); 414 player_unready_range_ob (op->contr, item);
457 item->remove ();
458 item->destroy (0); 415 item->destroy ();
459 } 416 }
460 } 417 }
461 418
462 /* remove any godgiven items from the old god */ 419 /* remove any godgiven items from the old god */
463 if (old_god) 420 if (old_god)
464 {
465 for (tr = old_god->randomitems->items; tr != NULL; tr = tr->next) 421 for (tr = old_god->randomitems->items; tr; tr = tr->next)
466 {
467 if (tr->item && QUERY_FLAG (&tr->item->clone, FLAG_STARTEQUIP)) 422 if (tr->item && QUERY_FLAG (tr->item, FLAG_STARTEQUIP))
468 follower_remove_similar_item (op, &tr->item->clone); 423 follower_remove_similar_item (op, tr->item);
469 }
470 }
471 424
472 if (!op || !new_god) 425 if (!op || !new_god)
473 return; 426 return;
474 427
475 if (op->race && new_god->slaying && strstr (op->race, new_god->slaying)) 428 if (op->race && new_god->slaying && op->race.contains (new_god->slaying))
476 { 429 {
477 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "Fool! %s detests your kind!", &new_god->name); 430 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "Fool! %s detests your kind!", &new_god->name);
431
478 if (random_roll (0, op->level - 1, op, PREFER_LOW) - 5 > 0) 432 if (random_roll (0, op->level - 1, op, PREFER_LOW) - 5 > 0)
479 { 433 {
480 object *tmp = get_archetype (LOOSE_MANA); 434 object *tmp = get_archetype (LOOSE_MANA);
481 435
482 cast_magic_storm (op, tmp, new_god->level + 10); 436 cast_magic_storm (op, tmp, new_god->level + 10);
483 } 437 }
438
484 return; 439 return;
485 } 440 }
486 441
487
488 /* give the player any special god-characteristic-items. */ 442 /* give the player any special god-characteristic-items. */
489 for (tr = new_god->randomitems->items; tr != NULL; tr = tr->next) 443 for (tr = new_god->randomitems->items; tr; tr = tr->next)
490 { 444 {
491 if (tr->item && tr->item->clone.invisible && tr->item->clone.type != SPELLBOOK && 445 if (tr->item && tr->item->invisible && tr->item->type != SPELLBOOK
492 tr->item->clone.type != BOOK && tr->item->clone.type != SPELL) 446 && tr->item->type != BOOK && tr->item->type != SPELL)
493 god_gives_present (op, new_god, tr); 447 god_gives_present (op, new_god, tr);
494 } 448 }
495 449
496
497 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You become a follower of %s!", &new_god->name); 450 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You become a follower of %s!", &new_god->name);
498 451
499 for (skop = op->inv; skop != NULL; skop = skop->below) 452 for (skop = op->inv; skop; skop = skop->below)
500 if (skop->type == SKILL && skop->subtype == SK_PRAYING) 453 if (skop->type == SKILL && skop->subtype == SK_PRAYING)
501 break; 454 break;
502 455
503 /* Player has no skill - give them the skill */ 456 /* Player has no skill - give them the skill */
504 if (!skop) 457 if (!skop)
505 {
506 /* The arhetype should always be defined - if we crash here because it doesn't, 458 /* The archetype should always be defined - if we crash here because it doesn't,
507 * things are really messed up anyways. 459 * things are really messed up anyways.
508 */ 460 */
509 skop = give_skill_by_name (op, get_archetype_by_type_subtype (SKILL, SK_PRAYING)->clone.skill); 461 skop = give_skill_by_name (op, get_archetype_by_type_subtype (SKILL, SK_PRAYING)->skill);
510 link_player_skills (op);
511 }
512 462
513 sk_applied = QUERY_FLAG (skop, FLAG_APPLIED); /* save skill status */ 463 sk_applied = QUERY_FLAG (skop, FLAG_APPLIED); /* save skill status */
514 464
515 /* Clear the "undead" status. We also need to force a call to change_abil, 465 /* Clear the "undead" status. We also need to force a call to change_abil,
516 * so I set undeadified for that. 466 * so I set undeadified for that.
517 * - gros, 21th July 2006. 467 * - gros, 21th July 2006.
518 */ 468 */
519 if ((old_god) && (QUERY_FLAG (old_god, FLAG_UNDEAD))) 469 if (old_god && QUERY_FLAG (old_god, FLAG_UNDEAD))
520 { 470 {
521 CLEAR_FLAG (skop, FLAG_UNDEAD); 471 CLEAR_FLAG (skop, FLAG_UNDEAD);
522 undeadified = 1; 472 undeadified = 1;
523 } 473 }
524 474
525 if (skop->title) 475 if (skop->title)
526 { /* get rid of old god */ 476 {
477 /* get rid of old god */
527 new_draw_info_format (NDI_UNIQUE, 0, op, "%s's blessing is withdrawn from you.", &skop->title); 478 new_draw_info_format (NDI_UNIQUE, 0, op, "%s's blessing is withdrawn from you.", &skop->title);
479
528 /* The point of this is to really show what abilities the player just lost */ 480 /* The point of this is to really show what abilities the player just lost */
529 if (sk_applied || undeadified) 481 if (sk_applied || undeadified)
530 { 482 {
531
532 CLEAR_FLAG (skop, FLAG_APPLIED); 483 CLEAR_FLAG (skop, FLAG_APPLIED);
533 (void) change_abil (op, skop); 484 change_abil (op, skop);
534 } 485 }
535 } 486 }
536 487
537 /* now change to the new gods attributes to exp_obj */ 488 /* now change to the new gods attributes to exp_obj */
538 skop->title = new_god->name; 489 skop->title = new_god->name;
… …
573 * This also can happen for monks which cannot use weapons. In this case 524 * This also can happen for monks which cannot use weapons. In this case
574 * do not allow to use weapons even if the god otherwise would allow it. 525 * do not allow to use weapons even if the god otherwise would allow it.
575 */ 526 */
576 if (!present_in_ob_by_name (FORCE, "no weapon force", op)) 527 if (!present_in_ob_by_name (FORCE, "no weapon force", op))
577 update_priest_flag (new_god, skop, FLAG_USE_WEAPON); 528 update_priest_flag (new_god, skop, FLAG_USE_WEAPON);
529
578 update_priest_flag (new_god, skop, FLAG_USE_ARMOUR); 530 update_priest_flag (new_god, skop, FLAG_USE_ARMOUR);
579 531
580 if (worship_forbids_use (op, skop, FLAG_USE_WEAPON, "weapons")) 532 if (worship_forbids_use (op, skop, FLAG_USE_WEAPON, "weapons"))
581 stop_using_item (op, WEAPON, 2); 533 stop_using_item (op, WEAPON, 2);
582 534
… …
608 */ 560 */
609 561
610int 562int
611worship_forbids_use (object *op, object *exp_obj, uint32 flag, const char *string) 563worship_forbids_use (object *op, object *exp_obj, uint32 flag, const char *string)
612{ 564{
613
614 if (QUERY_FLAG (&op->arch->clone, flag)) 565 if (QUERY_FLAG (op->arch, flag))
615 if (QUERY_FLAG (op, flag) != QUERY_FLAG (exp_obj, flag)) 566 if (QUERY_FLAG (op, flag) != QUERY_FLAG (exp_obj, flag))
616 { 567 {
617 update_priest_flag (exp_obj, op, flag); 568 update_priest_flag (exp_obj, op, flag);
618 if (QUERY_FLAG (op, flag)) 569 if (QUERY_FLAG (op, flag))
619 new_draw_info_format (NDI_UNIQUE, 0, op, "You may use %s again.", string); 570 new_draw_info_format (NDI_UNIQUE, 0, op, "You may use %s again.", string);
… …
621 { 572 {
622 new_draw_info_format (NDI_UNIQUE, 0, op, "You are forbidden to use %s.", string); 573 new_draw_info_format (NDI_UNIQUE, 0, op, "You are forbidden to use %s.", string);
623 return 1; 574 return 1;
624 } 575 }
625 } 576 }
577
626 return 0; 578 return 0;
627} 579}
628 580
629/** 581/**
630 * Unapplies up to number worth of items of type 582 * Unapplies up to number worth of items of type
… …
667/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/ 619/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/
668 CLEAR_FLAG (exp_ob, flag); 620 CLEAR_FLAG (exp_ob, flag);
669 }; 621 };
670} 622}
671 623
672
673
674archetype * 624archetype *
675determine_holy_arch (object *god, const char *type) 625determine_holy_arch (object *god, shstr_cmp type)
676{ 626{
677 treasure *tr; 627 treasure *tr;
678 628
679 if (!god || !god->randomitems) 629 if (!god || !god->randomitems)
680 { 630 {
681 LOG (llevError, "BUG: determine_holy_arch(): no god or god without " "randomitems\n"); 631 LOG (llevError, "BUG: determine_holy_arch(): no god or god without " "randomitems\n");
682 return NULL; 632 return 0;
683 } 633 }
684 634
685 for (tr = god->randomitems->items; tr != NULL; tr = tr->next) 635 for (tr = god->randomitems->items; tr; tr = tr->next)
686 { 636 {
687 object *item;
688
689 if (!tr->item) 637 if (!tr->item)
690 continue; 638 continue;
691 item = &tr->item->clone;
692 639
640 object *item = tr->item;
641
693 if (item->type == BOOK && item->invisible && strcmp (item->name, type) == 0) 642 if (item->type == BOOK && item->invisible && item->name == type)
694 return item->other_arch; 643 return item->other_arch;
695 } 644 }
645
696 return NULL; 646 return 0;
697} 647}
698 648
699/** 649/**
700 * God helps player by removing curse and/or damnation. 650 * God helps player by removing curse and/or damnation.
701 */ 651 */
702static int 652static int
703god_removes_curse (object *op, int remove_damnation) 653god_removes_curse (object *op, int remove_damnation)
704{ 654{
705 object *tmp;
706 int success = 0; 655 int success = 0;
707 656
708 for (tmp = op->inv; tmp; tmp = tmp->below) 657 for (object *tmp = op->inv; tmp; tmp = tmp->below)
709 { 658 {
710 if (tmp->invisible) 659 if (tmp->invisible)
711 continue; 660 continue;
661
712 if (QUERY_FLAG (tmp, FLAG_DAMNED) && !remove_damnation) 662 if (QUERY_FLAG (tmp, FLAG_DAMNED) && !remove_damnation)
713 continue; 663 continue;
664
714 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 665 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
715 { 666 {
716 success = 1; 667 success = 1;
717 CLEAR_FLAG (tmp, FLAG_DAMNED); 668 CLEAR_FLAG (tmp, FLAG_DAMNED);
718 CLEAR_FLAG (tmp, FLAG_CURSED); 669 CLEAR_FLAG (tmp, FLAG_CURSED);
719 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED); 670 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
720 if (op->type == PLAYER) 671
672 if (object *pl = tmp->visible_to ())
721 esrv_send_item (op, tmp); 673 esrv_update_item (UPD_FLAGS, pl, tmp);
722 } 674 }
723 } 675 }
724 676
725 if (success) 677 if (success)
726 new_draw_info (NDI_UNIQUE, 0, op, "You feel like someone is helping you."); 678 new_draw_info (NDI_UNIQUE, 0, op, "You feel like someone is helping you.");
679
727 return success; 680 return success;
728} 681}
729 682
730static int 683static int
731follower_level_to_enchantments (int level, int difficulty) 684follower_level_to_enchantments (int level, int difficulty)
… …
736 return 0; 689 return 0;
737 } 690 }
738 691
739 if (level <= 20) 692 if (level <= 20)
740 return level / difficulty; 693 return level / difficulty;
694
741 if (level <= 40) 695 if (level <= 40)
742 return (20 + (level - 20) / 2) / difficulty; 696 return (20 + (level - 20) / 2) / difficulty;
697
743 return (30 + (level - 40) / 4) / difficulty; 698 return (30 + (level - 40) / 4) / difficulty;
744} 699}
745 700
746/** 701/**
747 * God wants to enchant weapon. 702 * God wants to enchant weapon.
… …
750 * attacktype, slaying and such. 705 * attacktype, slaying and such.
751 */ 706 */
752static int 707static int
753god_enchants_weapon (object *op, object *god, object *tr, object *skill) 708god_enchants_weapon (object *op, object *god, object *tr, object *skill)
754{ 709{
755 char buf[MAX_BUF];
756 object *weapon; 710 object *weapon;
757 uint32 attacktype; 711 uint32 attacktype;
758 int tmp; 712 int tmp;
759 713
760 for (weapon = op->inv; weapon; weapon = weapon->below) 714 for (weapon = op->inv; weapon; weapon = weapon->below)
761 if ((weapon->type == WEAPON || weapon->type == BOW) && QUERY_FLAG (weapon, FLAG_APPLIED)) 715 if ((weapon->type == WEAPON || weapon->type == BOW) && QUERY_FLAG (weapon, FLAG_APPLIED))
762 break; 716 break;
717
763 if (weapon == NULL || god_examines_item (god, weapon) <= 0) 718 if (!weapon || god_examines_item (god, weapon) <= 0)
764 return 0; 719 return 0;
765 720
766 /* First give it a title, so other gods won't touch it */ 721 /* First give it a title, so other gods won't touch it */
767 if (!weapon->title) 722 if (!weapon->title)
768 { 723 {
769 sprintf (buf, "of %s", &god->name); 724 weapon->title = format ("of %s", &god->name);
770 weapon->title = buf; 725
771 if (op->type == PLAYER) 726 if (object *pl = weapon->visible_to ())
772 esrv_update_item (UPD_NAME, op, weapon); 727 esrv_update_item (UPD_NAME, pl, weapon);
728
773 new_draw_info (NDI_UNIQUE, 0, op, "Your weapon quivers as if struck!"); 729 new_draw_info (NDI_UNIQUE, 0, op, "Your weapon quivers as if struck!");
774 } 730 }
775 731
776 /* Allow the weapon to slay enemies */ 732 /* Allow the weapon to slay enemies */
777 if (!weapon->slaying && god->slaying) 733 if (!weapon->slaying && god->slaying)
… …
794 tmp = follower_level_to_enchantments (skill->level, tr->level); 750 tmp = follower_level_to_enchantments (skill->level, tr->level);
795 if (weapon->magic < tmp) 751 if (weapon->magic < tmp)
796 { 752 {
797 new_draw_info (NDI_UNIQUE, 0, op, "A phosphorescent glow envelops your weapon!"); 753 new_draw_info (NDI_UNIQUE, 0, op, "A phosphorescent glow envelops your weapon!");
798 weapon->magic++; 754 weapon->magic++;
799 if (op->type == PLAYER) 755
756 if (object *pl = weapon->visible_to ())
800 esrv_update_item (UPD_NAME, op, weapon); 757 esrv_update_item (UPD_NAME, pl, weapon);
758
801 return 1; 759 return 1;
802 } 760 }
803 761
804 return 0; 762 return 0;
805} 763}
806
807 764
808/** 765/**
809 * Every once in a while the god will intervene to help the worshiper. 766 * Every once in a while the god will intervene to help the worshiper.
810 * Later, this fctn can be used to supply quests, etc for the 767 * Later, this fctn can be used to supply quests, etc for the
811 * priest. -b.t. 768 * priest. -b.t.
812 * called from pray_at_altar() currently. 769 * called from pray_at_altar() currently.
813 */ 770 */
814
815void 771void
816god_intervention (object *op, object *god, object *skill) 772god_intervention (object *op, object *god, object *skill)
817{ 773{
818 treasure *tr; 774 treasure *tr;
819 775
… …
827 783
828 /* lets do some checks of whether we are kosher with our god */ 784 /* lets do some checks of whether we are kosher with our god */
829 if (god_examines_priest (op, god) < 0) 785 if (god_examines_priest (op, god) < 0)
830 return; 786 return;
831 787
788 op->play_sound (sound_find ("god_intervention"));
832 new_draw_info (NDI_UNIQUE, 0, op, "You feel a holy presence!"); 789 new_draw_info (NDI_UNIQUE, 0, op, "You feel a holy presence!");
833 790
834 for (tr = god->randomitems->items; tr != NULL; tr = tr->next) 791 for (tr = god->randomitems->items; tr; tr = tr->next)
835 { 792 {
836 object *item; 793 object *item;
837 794
838 if (tr->chance <= random_roll (0, 99, op, PREFER_HIGH)) 795 if (tr->chance <= random_roll (0, 99, op, PREFER_HIGH))
839 continue; 796 continue;
840 797
841 /* Treasurelist - generate some treasure for the follower */ 798 /* Treasurelist - generate some treasure for the follower */
842 if (tr->name) 799 if (tr->name)
843 { 800 {
844 treasurelist *tl = find_treasurelist (tr->name); 801 treasurelist *tl = treasurelist::find (tr->name);
845 802
846 if (tl == NULL) 803 if (tl == NULL)
847 continue; 804 continue;
848 805
849 new_draw_info (NDI_UNIQUE, 0, op, "Something appears before your " "eyes. You catch it before it falls to the ground."); 806 new_draw_info (NDI_UNIQUE, 0, op, "Something appears before your eyes. You catch it before it falls to the ground.");
850 807
851 create_treasure (tl, op, GT_STARTEQUIP | GT_ONLY_GOOD | GT_UPDATE_INV, skill->level, 0); 808 create_treasure (tl, op, GT_STARTEQUIP | GT_ONLY_GOOD, skill->level, 0);
852 return; 809 return;
853 } 810 }
854 811
855 if (!tr->item) 812 if (!tr->item)
856 {
857 LOG (llevError, "BUG: empty entry in %s's treasure list\n", &god->name);
858 continue; 813 continue;
859 } 814
860 item = &tr->item->clone; 815 item = tr->item;
861 816
862 /* Grace limit */ 817 /* Grace limit */
863 if (item->type == BOOK && item->invisible && strcmp (item->name, "grace limit") == 0) 818 if (item->type == BOOK && item->invisible && item->name == shstr_grace_limit)
864 { 819 {
865 if (op->stats.grace < item->stats.grace || op->stats.grace < op->stats.maxgrace) 820 if (op->stats.grace < item->stats.grace || op->stats.grace < op->stats.maxgrace)
866 { 821 {
867 object *tmp;
868
869 /* Follower lacks the required grace for the following 822 /* Follower lacks the required grace for the following
870 * treasure list items. */ 823 * treasure list items. */
871 824
872 tmp = get_archetype (HOLY_POSSESSION); 825 object *tmp = get_archetype (HOLY_POSSESSION);
873 cast_change_ability (op, op, tmp, 0, 1); 826 cast_change_ability (op, op, tmp, 0, 1);
874 tmp->destroy (0); 827 tmp->destroy ();
875 return; 828 return;
876 } 829 }
830
877 continue; 831 continue;
878 } 832 }
879 833
880 /* Restore grace */ 834 /* Restore grace */
881 if (item->type == BOOK && item->invisible && strcmp (item->name, "restore grace") == 0) 835 if (item->type == BOOK && item->invisible && item->name == shstr_restore_grace)
882 { 836 {
883 if (op->stats.grace >= 0) 837 if (op->stats.grace >= 0)
884 continue; 838 continue;
839
885 op->stats.grace = random_roll (0, 9, op, PREFER_HIGH); 840 op->stats.grace = random_roll (0, 9, op, PREFER_HIGH);
886 new_draw_info (NDI_UNIQUE, 0, op, "You are returned to a state of grace."); 841 new_draw_info (NDI_UNIQUE, 0, op, "You are returned to a state of grace.");
887 return; 842 return;
888 } 843 }
889 844
890 /* Heal damage */ 845 /* Heal damage */
891 if (item->type == BOOK && item->invisible && strcmp (item->name, "restore hitpoints") == 0) 846 if (item->type == BOOK && item->invisible && strcmp (item->name, "restore hitpoints") == 0)
892 { 847 {
893 if (op->stats.hp >= op->stats.maxhp) 848 if (op->stats.hp >= op->stats.maxhp)
894 continue; 849 continue;
850
895 new_draw_info (NDI_UNIQUE, 0, op, "A white light surrounds and heals you!"); 851 new_draw_info (NDI_UNIQUE, 0, op, "A white light surrounds and heals you!");
896 op->stats.hp = op->stats.maxhp; 852 op->stats.hp = op->stats.maxhp;
897 return; 853 return;
898 } 854 }
899 855
… …
905 /* Restore to 50 .. 100%, if sp < 50% */ 861 /* Restore to 50 .. 100%, if sp < 50% */
906 int new_sp = (int) (random_roll (1000, 1999, op, PREFER_HIGH) / 2000.0 * max); 862 int new_sp = (int) (random_roll (1000, 1999, op, PREFER_HIGH) / 2000.0 * max);
907 863
908 if (op->stats.sp >= max / 2) 864 if (op->stats.sp >= max / 2)
909 continue; 865 continue;
866
910 new_draw_info (NDI_UNIQUE, 0, op, "A blue lightning strikes " "your head but doesn't hurt you!"); 867 new_draw_info (NDI_UNIQUE, 0, op, "A blue lightning strikes your head but doesn't hurt you!");
911 op->stats.sp = new_sp; 868 op->stats.sp = new_sp;
912 } 869 }
913 870
914 /* Various heal spells */ 871 /* Various heal spells */
915 if (item->type == BOOK && item->invisible && strcmp (item->name, "heal spell") == 0) 872 if (item->type == BOOK && item->invisible && strcmp (item->name, "heal spell") == 0)
916 { 873 {
917 object *tmp;
918 int success;
919
920 tmp = get_archetype_by_object_name (item->slaying); 874 object *tmp = archetype::get (item->slaying);
921
922 success = cast_heal (op, op, tmp, 0); 875 int success = cast_heal (op, op, tmp, 0);
923 tmp->destroy (0); 876 tmp->destroy ();
877
924 if (success) 878 if (success)
925 return; 879 return;
926 else 880 else
927 continue; 881 continue;
928 } 882 }
… …
955 if ((at = archetype::find (ARCH_DEPLETION)) == NULL) 909 if ((at = archetype::find (ARCH_DEPLETION)) == NULL)
956 { 910 {
957 LOG (llevError, "Could not find archetype depletion.\n"); 911 LOG (llevError, "Could not find archetype depletion.\n");
958 continue; 912 continue;
959 } 913 }
914
960 depl = present_arch_in_ob (at, op); 915 depl = present_arch_in_ob (at, op);
916
961 if (depl == NULL) 917 if (depl == NULL)
962 continue; 918 continue;
919
963 new_draw_info (NDI_UNIQUE, 0, op, "Shimmering light surrounds and restores you!"); 920 new_draw_info (NDI_UNIQUE, 0, op, "Shimmering light surrounds and restores you!");
921
964 for (i = 0; i < NUM_STATS; i++) 922 for (i = 0; i < NUM_STATS; i++)
965 if (get_attr_value (&depl->stats, i)) 923 if (depl->stats.stat (i))
966 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 924 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
967 depl->remove (); 925
968 depl->destroy (0); 926 depl->destroy ();
969 fix_player (op); 927 op->update_stats ();
970 return; 928 return;
971 } 929 }
972 930
973 /* Voices */ 931 /* Voices */
974 if (item->type == BOOK && item->invisible && strcmp (item->name, "voice_behind") == 0) 932 if (item->type == BOOK && item->invisible && strcmp (item->name, "voice_behind") == 0)
975 { 933 {
976 new_draw_info (NDI_UNIQUE, 0, op, "You hear a voice from behind you, but you don't dare to " "turn around:"); 934 new_draw_info (NDI_UNIQUE, 0, op, "You hear a voice from behind you, but you don't dare to turn around:");
977 new_draw_info (NDI_WHITE, 0, op, item->msg); 935 new_draw_info (NDI_WHITE, 0, op, item->msg);
978 return; 936 return;
979 } 937 }
980 938
981 /* Messages */ 939 /* Messages */
… …
1032{ 990{
1033 int reaction = 1; 991 int reaction = 1;
1034 object *item = NULL, *skop; 992 object *item = NULL, *skop;
1035 993
1036 for (item = op->inv; item; item = item->below) 994 for (item = op->inv; item; item = item->below)
1037 {
1038 if (QUERY_FLAG (item, FLAG_APPLIED)) 995 if (QUERY_FLAG (item, FLAG_APPLIED))
1039 {
1040 reaction += god_examines_item (god, item) * (item->magic ? abs (item->magic) : 1); 996 reaction += god_examines_item (god, item) * (item->magic ? abs (item->magic) : 1);
1041 }
1042 }
1043 997
1044 /* well, well. Looks like we screwed up. Time for god's revenge */ 998 /* well, well. Looks like we screwed up. Time for god's revenge */
1045 if (reaction < 0) 999 if (reaction < 0)
1046 { 1000 {
1047 int loss = 10000000; 1001 int loss = 10000000;
1048 int angry = abs (reaction); 1002 int angry = abs (reaction);
1049 1003
1050 for (skop = op->inv; skop != NULL; skop = skop->below) 1004 for (skop = op->inv; skop; skop = skop->below)
1051 if (skop->type == SKILL && skop->subtype == SK_PRAYING) 1005 if (skop->type == SKILL && skop->subtype == SK_PRAYING)
1052 break; 1006 break;
1053 1007
1054 if (skop) 1008 if (skop)
1055 loss = (int) (0.05 * (float) skop->stats.exp); 1009 loss = 0.05f * skop->stats.exp;
1010
1056 change_exp (op, -random_roll (0, loss * angry - 1, op, PREFER_LOW), skop ? &skop->skill : "none", SK_SUBTRACT_SKILL_EXP); 1011 change_exp (op, -random_roll (0, loss * angry - 1, op, PREFER_LOW), skop ? &skop->skill : "none", SK_SUBTRACT_SKILL_EXP);
1012
1057 if (random_roll (0, angry, op, PREFER_LOW)) 1013 if (random_roll (0, angry, op, PREFER_LOW))
1058 { 1014 {
1059 object *tmp = get_archetype (LOOSE_MANA); 1015 object *tmp = get_archetype (LOOSE_MANA);
1060 1016
1061 cast_magic_storm (op, tmp, op->level + (angry * 3)); 1017 cast_magic_storm (op, tmp, op->level + (angry * 3));
1062 } 1018 }
1019
1063 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "%s becomes angry and punishes you!", &god->name); 1020 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "%s becomes angry and punishes you!", &god->name);
1064 } 1021 }
1022
1065 return reaction; 1023 return reaction;
1066} 1024}
1067 1025
1068/** 1026/**
1069 * God checks item the player is using. 1027 * God checks item the player is using.
1070 * Return either -1 (bad), 0 (neutral) or 1028 * Return either -1 (bad), 0 (neutral) or
1071 * 1 (item is ok). If you are using the item of an enemy 1029 * 1 (item is ok). If you are using the item of an enemy
1072 * god, it can be bad...-b.t. 1030 * god, it can be bad...-b.t.
1073 */ 1031 */
1074
1075int 1032int
1076god_examines_item (object *god, object *item) 1033god_examines_item (object *god, object *item)
1077{ 1034{
1078 char buf[MAX_BUF]; 1035 char buf[MAX_BUF];
1079 1036
… …
1082 1039
1083 if (!item->title) 1040 if (!item->title)
1084 return 1; /* unclaimed item are ok */ 1041 return 1; /* unclaimed item are ok */
1085 1042
1086 sprintf (buf, "of %s", &god->name); 1043 sprintf (buf, "of %s", &god->name);
1087 if (!strcmp (item->title, buf)) 1044 if (!strcmp (&item->title, buf))
1088 return 1; /* belongs to that God */ 1045 return 1; /* belongs to that God */
1089 1046
1090 if (god->title) 1047 if (god->title)
1091 { /* check if we have any enemy blessed item */ 1048 { /* check if we have any enemy blessed item */
1092 sprintf (buf, "of %s", &god->title); 1049 sprintf (buf, "of %s", &god->title);
1093 if (!strcmp (item->title, buf)) 1050 if (!strcmp (&item->title, buf))
1094 { 1051 {
1095 if (item->env) 1052 if (item->env)
1096 { 1053 {
1097 char buf[MAX_BUF]; 1054 char buf[MAX_BUF];
1098 1055
1099 sprintf (buf, "Heretic! You are using %s!", query_name (item)); 1056 sprintf (buf, "Heretic! You are using %s!", query_name (item));
1100 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, item->env, buf); 1057 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, item->env, buf);
1101 } 1058 }
1059
1102 return -1; 1060 return -1;
1103 } 1061 }
1104 } 1062 }
1105 1063
1106 return 0; /* item is sacred to a non-enemy god/or is otherwise magical */ 1064 return 0; /* item is sacred to a non-enemy god/or is otherwise magical */
… …
1108 1066
1109/** 1067/**
1110 * Returns priest's god's id. 1068 * Returns priest's god's id.
1111 * Straight calls lookup_god_by_name 1069 * Straight calls lookup_god_by_name
1112 */ 1070 */
1113
1114int 1071int
1115get_god (object *priest) 1072get_god (object *priest)
1116{ 1073{
1117 int godnr = lookup_god_by_name (determine_god (priest)); 1074 return lookup_god_by_name (determine_god (priest));
1118
1119 return godnr;
1120}
1121
1122/**
1123 * Returns a string that is the name of the god that should be natively worshipped by a
1124 * creature of who has race *race
1125 * if we can't find a god that is appropriate, we return NULL
1126 */
1127const char *
1128get_god_for_race (const char *race)
1129{
1130 godlink *gl = first_god;
1131 const char *godname = NULL;
1132
1133 if (race == NULL)
1134 return NULL;
1135 while (gl)
1136 {
1137 if (!strcasecmp (gl->arch->clone.race, race))
1138 {
1139 godname = gl->name;
1140 break;
1141 }
1142 gl = gl->next;
1143 }
1144 return godname;
1145} 1075}
1146 1076
1147/** 1077/**
1148 * Changes the attributes of cone, smite, and ball spells as needed by the code. 1078 * Changes the attributes of cone, smite, and ball spells as needed by the code.
1149 * Returns false if there was no race to assign to the slaying field of the spell, but 1079 * Returns false if there was no race to assign to the slaying field of the spell, but
1150 * the spell attacktype contains AT_HOLYWORD. -b.t. 1080 * the spell attacktype contains AT_HOLYWORD. -b.t.
1151 */ 1081 */
1152
1153int 1082int
1154tailor_god_spell (object *spellop, object *caster) 1083tailor_god_spell (object *spellop, object *caster)
1155{ 1084{
1156 object *god = find_god (determine_god (caster)); 1085 object *god = find_god (determine_god (caster));
1157 int caster_is_spell = 0; 1086 int caster_is_spell = 0;
… …
1161 1090
1162 /* if caster is a rune or the like, it doesn't worship anything. However, 1091 /* if caster is a rune or the like, it doesn't worship anything. However,
1163 * if this object is owned by someone, then the god that they worship 1092 * if this object is owned by someone, then the god that they worship
1164 * is relevant, so use that. 1093 * is relevant, so use that.
1165 */ 1094 */
1166 if (!god && get_owner (caster)) 1095 if (!god && caster->owner)
1167 god = find_god (determine_god (get_owner (caster))); 1096 god = find_god (determine_god (caster->owner));
1168 1097
1169 if (!god || (spellop->attacktype & AT_HOLYWORD && !god->race)) 1098 if (!god || (spellop->attacktype & AT_HOLYWORD && !god->race))
1170 { 1099 {
1171 if (!caster_is_spell) 1100 if (!caster_is_spell)
1172 new_draw_info (NDI_UNIQUE, 0, caster, "This prayer is useless unless you worship an appropriate god"); 1101 new_draw_info (NDI_UNIQUE, 0, caster, "This prayer is useless unless you worship an appropriate god");
1173 else 1102 else
1174 LOG (llevError, "BUG: tailor_god_spell(): no god\n"); 1103 LOG (llevError, "BUG: tailor_god_spell(): no god\n");
1104
1175 spellop->destroy (0); 1105 spellop->destroy ();
1176 return 0; 1106 return 0;
1177 } 1107 }
1178 1108
1179 /* either holy word or godpower attacks will set the slaying field */ 1109 /* either holy word or godpower attacks will set the slaying field */
1180 if (spellop->attacktype & AT_HOLYWORD || spellop->attacktype & AT_GODPOWER) 1110 if (spellop->attacktype & AT_HOLYWORD || spellop->attacktype & AT_GODPOWER)

Diff Legend

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