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.21 by root, Sat May 12 18:14:48 2007 UTC vs.
Revision 1.41 by root, Wed Dec 31 17:35:37 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24
25 23
26/* 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
27 * monster race initialization. b.t. 25 * monster race initialization. b.t.
28 */ 26 */
29 27
… …
40 * Returns the id of specified god. 38 * Returns the id of specified god.
41 */ 39 */
42int 40int
43lookup_god_by_name (const char *name) 41lookup_god_by_name (const char *name)
44{ 42{
45 int godnr = -1; 43 shstr_cmp sname (name);
46 size_t nmlen = strlen (name);
47 44
48 if (name && strcmp (name, "none")) 45 if (sname)
49 {
50 godlink *gl;
51
52 for (gl = first_god; gl; gl = gl->next) 46 for (godlink *gl = first_god; gl; gl = gl->next)
53 if (!strncmp (name, gl->name, MIN ((size_t) strlen (gl->name), nmlen))) 47 if (gl->name == name)
54 break;
55 if (gl)
56 godnr = gl->id; 48 return gl->id;
57 } 49
58 return godnr; 50 return -1;
59} 51}
60 52
61/** 53/**
62 * Returns pointer to specified god's object through pntr_to_god_obj.. 54 * Returns pointer to specified god's object through pntr_to_god_obj..
63 */ 55 */
64object * 56object *
65find_god (const char *name) 57find_god (const char *name)
66{ 58{
67 object *god = NULL;
68
69 if (name) 59 if (name)
70 {
71 godlink *gl;
72
73 for (gl = first_god; gl; gl = gl->next) 60 for (godlink *gl = first_god; gl; gl = gl->next)
74 if (!strcmp (name, gl->name)) 61 if (!strcmp (name, gl->name))
75 break;
76 if (gl)
77 god = pntr_to_god_obj (gl); 62 return pntr_to_god_obj (gl);
78 } 63
79 return god; 64 return 0;
80} 65}
81 66
82/** 67/**
83 * Determines if op worships a god. 68 * Determines if op worships a god.
84 * Returns the godname if they do or "none" if they have no god. 69 * Returns the godname if they do or "none" if they have no god.
85 * In the case of an NPC, if they have no god, we try and guess 70 * In the case of an NPC, if they have no god, we try and guess
86 * who they should worship based on their race. If that fails we 71 * who they should worship based on their race. If that fails we
87 * give them a random one. 72 * give them a random one.
88 */ 73 */
89 74shstr_tmp
90const char *
91determine_god (object *op) 75determine_god (object *op)
92{ 76{
93 int godnr = -1;
94 const char *godname;
95
96 /* spells */ 77 /* spells */
97 if ((op->type == SPELL || op->type == SPELL_EFFECT) && op->title) 78 if ((op->type == SPELL || op->type == SPELL_EFFECT) && op->title)
98 {
99 if (lookup_god_by_name (op->title) >= 0) 79 if (lookup_god_by_name (op->title) >= 0)
100 return op->title; 80 return op->title;
81
82 if (!op->is_player () && op->flag [FLAG_ALIVE])
101 } 83 {
102
103 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_ALIVE))
104 {
105
106 /* find a god based on race */ 84 /* find a god based on race */
107 if (!op->title) 85 if (!op->title)
108 {
109 if (op->race != NULL)
110 {
111 godname = get_god_for_race (op->race); 86 op->title = get_god_for_race (op->race);
112 if (godname != NULL)
113 {
114 op->title = godname;
115 }
116 }
117 }
118 87
119 /* find a random god */ 88 /* find a random god */
120 if (!op->title) 89 if (!op->title)
121 { 90 {
122 godlink *gl = first_god;
123
124 godnr = rndm (1, gl->id); 91 int godnr = rndm (1, first_god->id);
125 while (gl) 92
126 { 93 for (godlink *gl = first_god; gl && gl->id != godnr; gl = gl->next)
127 if (gl->id == godnr) 94 if (gl->id == godnr)
95 {
96 op->title = gl->name;
128 break; 97 break;
129 gl = gl->next;
130 } 98 }
131 op->title = gl->name;
132 } 99 }
133 100
134 return op->title; 101 return op->title;
135 } 102 }
136
137 103
138 /* The god the player worships is in the praying skill (native skill 104 /* The god the player worships is in the praying skill (native skill
139 * not skill tool). Since a player can only have one instance of 105 * not skill tool). Since a player can only have one instance of
140 * that skill, once we find it, we can return, either with the 106 * that skill, once we find it, we can return, either with the
141 * title or "none". 107 * title or "none".
142 */ 108 */
143 if (op->type == PLAYER) 109 if (op->type == PLAYER)
144 {
145 object *tmp;
146
147 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 110 for (object *tmp = op->inv; tmp; tmp = tmp->below)
148 if (tmp->type == SKILL && tmp->subtype == SK_PRAYING) 111 if (tmp->type == SKILL && tmp->subtype == SK_PRAYING)
149 { 112 {
150 if (tmp->title) 113 if (tmp->title)
151 return (tmp->title); 114 return tmp->title;
152 else 115
153 return ("none"); 116 break;
154 } 117 }
155 } 118
156 return ("none"); 119 return shstr_none;
157} 120}
158 121
159/** 122/**
160 * Returns 1 if s1 and s2 are the same - either both NULL, or strcmp( ) == 0 123 * Returns 1 if s1 and s2 are the same - either both NULL, or strcmp( ) == 0
161 */ 124 */
162static int 125static int
163same_string (const char *s1, const char *s2) 126same_string (const char *s1, const char *s2)
164{ 127{
165 if (s1 == NULL) 128 if (s1 == s2)
166 if (s2 == NULL)
167 return 1; 129 return 1;
130 else if (s1 && s2)
131 return !strcmp (s1, s2);
168 else 132 else
169 return 0;
170 else if (s2 == NULL)
171 return 0; 133 return 0;
172 else
173 return strcmp (s1, s2) == 0;
174} 134}
175
176 135
177/** 136/**
178 * Checks for any occurrence of the given 'item' in the inventory of 'op' (recursively). 137 * Checks for any occurrence of the given 'item' in the inventory of 'op' (recursively).
179 * Any matching items in the inventory are deleted, and a 138 * Any matching items in the inventory are deleted, and a
180 * message is displayed to the player. 139 * message is displayed to the player.
… …
193 152
194 if (tmp->type == item->type 153 if (tmp->type == item->type
195 && same_string (tmp->name, item->name) 154 && same_string (tmp->name, item->name)
196 && same_string (tmp->title, item->title) && same_string (tmp->msg, item->msg) && same_string (tmp->slaying, item->slaying)) 155 && same_string (tmp->title, item->title) && same_string (tmp->msg, item->msg) && same_string (tmp->slaying, item->slaying))
197 { 156 {
198
199 /* message */ 157 /* message */
200 if (tmp->nrof > 1) 158 new_draw_info_format (NDI_UNIQUE, 0, op,
201 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s crumble to dust!", query_short_name (tmp)); 159 tmp->nrof > 1 ? "The %s crumble to dust!" : "The %s crumbles to dust!",
202 else 160 query_short_name (tmp));
203 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s crumbles to dust!", query_short_name (tmp));
204 161
205 tmp->remove (); /* remove obj from players inv. */ 162 tmp->destroy ();
206 esrv_del_item (op->contr, tmp->count); /* notify client */
207 tmp->destroy (); /* free object */
208 } 163 }
209 164
210 if (tmp->inv) 165 if (tmp->inv)
211 follower_remove_similar_item (tmp, item); 166 follower_remove_similar_item (tmp, item);
212 } 167 }
… …
238 * God gives an item to the player. 193 * God gives an item to the player.
239 */ 194 */
240static int 195static int
241god_gives_present (object *op, object *god, treasure *tr) 196god_gives_present (object *op, object *god, treasure *tr)
242{ 197{
243 object *tmp;
244
245 if (!tr->item) 198 if (!tr->item)
246 return 0; 199 return 0;
247 200
248 if (follower_has_similar_item (op, &tr->item->clone)) 201 if (follower_has_similar_item (op, tr->item))
249 return 0; 202 return 0;
250 203
251 tmp = arch_to_object (tr->item); 204 object *tmp = arch_to_object (tr->item);
252 new_draw_info_format (NDI_UNIQUE, 0, op, "%s lets %s appear in your hands.", &god->name, query_short_name (tmp)); 205 new_draw_info_format (NDI_UNIQUE, 0, op, "%s lets %s appear in your hands.", &god->name, query_short_name (tmp));
253 tmp = insert_ob_in_ob (tmp, op); 206 op->insert (tmp);
254 if (op->type == PLAYER)
255 esrv_send_item (op, tmp);
256 207
257 return 1; 208 return 1;
258} 209}
259 210
260/** 211/**
… …
274 return; 225 return;
275 226
276 /* hmm. what happend depends on pl's current god, level, etc */ 227 /* hmm. what happend depends on pl's current god, level, etc */
277 if (!pl_god) 228 if (!pl_god)
278 { /*new convert */ 229 { /*new convert */
279 become_follower (pl, &altar->other_arch->clone); 230 become_follower (pl, altar->other_arch);
280 return; 231 return;
281
282 } 232 }
283 else if (!strcmp (&pl_god->name, altar->other_arch->clone.name)) 233 else if (!strcmp (&pl_god->name, altar->other_arch->object::name))
284 { 234 {
285 /* pray at your gods altar */ 235 /* pray at your gods altar */
286 int bonus = (pl->stats.Wis + skill->level) / 10; 236 int bonus = (pl->stats.Wis + skill->level) / 10;
287 237
288 /* we can get neg grace up faster */ 238 /* we can get neg grace up faster */
289 if (pl->stats.grace < 0) 239 if (pl->stats.grace < 0)
290 pl->stats.grace += (bonus > -1 * (pl->stats.grace / 10) ? bonus : -1 * (pl->stats.grace / 10)); 240 pl->stats.grace += (bonus > -1 * (pl->stats.grace / 10) ? bonus : -1 * (pl->stats.grace / 10));
241
291 /* we can super-charge grace to 2x max */ 242 /* we can super-charge grace to 2x max */
292 if (pl->stats.grace < (2 * pl->stats.maxgrace)) 243 if (pl->stats.grace < 2 * pl->stats.maxgrace)
293 {
294 pl->stats.grace += bonus / 2; 244 pl->stats.grace += bonus / 2;
295 } 245 else
296 if (pl->stats.grace > (2 * pl->stats.maxgrace))
297 {
298 pl->stats.grace = (2 * pl->stats.maxgrace); 246 pl->stats.grace = 2 * pl->stats.maxgrace;
299 }
300 247
301 /* Every once in a while, the god decides to checkup on their 248 /* Every once in a while, the god decides to checkup on their
302 * follower, and may intervene to help them out. 249 * follower, and may intervene to help them out.
303 */ 250 */
304 bonus = MAX (1, bonus + MAX (pl->stats.luck, -3)); /* -- DAMN -- */ 251 bonus = MAX (1, bonus + MAX (pl->stats.luck, -3)); /* -- DAMN -- */
305 252
306 if (((random_roll (0, 399, pl, PREFER_LOW)) - bonus) < 0) 253 if (((random_roll (0, 399, pl, PREFER_LOW)) - bonus) < 0)
307 god_intervention (pl, pl_god, skill); 254 god_intervention (pl, pl_god, skill);
308
309 } 255 }
310 else 256 else
311 { /* praying to another god! */ 257 { /* praying to another god! */
312 uint64 loss = 0; 258 uint64 loss = 0;
313 int angry = 1; 259 int angry = 1;
… …
317 * points to the god of this altar (which we have 263 * points to the god of this altar (which we have
318 * already verified is non null). pl_god->other_arch 264 * already verified is non null). pl_god->other_arch
319 * is the opposing god - we need to verify that exists before 265 * is the opposing god - we need to verify that exists before
320 * using its values. 266 * using its values.
321 */ 267 */
322 if (pl_god->other_arch && (altar->other_arch->name == pl_god->other_arch->name)) 268 if (pl_god->other_arch && (altar->other_arch->archname == pl_god->other_arch->archname))
323 { 269 {
324 angry = 2; 270 angry = 2;
325 if (random_roll (0, skill->level + 2, pl, PREFER_LOW) - 5 > 0) 271 if (random_roll (0, skill->level + 2, pl, PREFER_LOW) - 5 > 0)
326 { 272 {
327 object *tmp; 273 object *tmp;
… …
348 294
349 /* May switch Gods, but its random chance based on our current level 295 /* May switch Gods, but its random chance based on our current level
350 * note it gets harder to swap gods the higher we get 296 * note it gets harder to swap gods the higher we get
351 */ 297 */
352 if ((angry == 1) && !(random_roll (0, skill->level, pl, PREFER_LOW))) 298 if ((angry == 1) && !(random_roll (0, skill->level, pl, PREFER_LOW)))
353 {
354 become_follower (pl, &altar->other_arch->clone); 299 become_follower (pl, altar->other_arch);
355 }
356 else 300 else
357 { 301 {
358 /* toss this player off the altar. He can try again. */ 302 /* toss this player off the altar. He can try again. */
359 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, pl, "A divine force pushes you off the altar."); 303 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, pl, "A divine force pushes you off the altar.");
304 pl->contr->fire_on = 0;
305 pl->speed_left = 1.f;
360 move_player (pl, absdir (pl->facing + 4)); /* back him off the way he came. */ 306 move_player (pl, absdir (pl->facing + 4)); /* back him off the way he came. */
361 } 307 }
362 } 308 }
363} 309}
364 310
… …
402 object *item; 348 object *item;
403 349
404 if (!tr->item) 350 if (!tr->item)
405 continue; 351 continue;
406 352
407 item = &tr->item->clone; 353 item = tr->item;
408 354
409 /* Basically, see if the matching spell is granted by this god. */ 355 /* Basically, see if the matching spell is granted by this god. */
410 356
411 if (tr->item->clone.type == SPELL && tr->item->clone.name == tmp->name) 357 if (tr->item->type == SPELL && tr->item->object::name == tmp->name)
412 { 358 {
413 remove = 0; 359 remove = 0;
414 break; 360 break;
415 } 361 }
416 } 362 }
363
417 if (remove) 364 if (remove)
418 { 365 do_forget_spell (op, tmp->name);
419 /* just do the work of removing the spell ourselves - we already
420 * know that the player knows the spell
421 */
422 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", &tmp->name);
423 player_unready_range_ob (op->contr, tmp);
424 tmp->destroy ();
425 }
426
427 } 366 }
428} 367}
429 368
430/** 369/**
431 * This function is called whenever a player has 370 * This function is called whenever a player has
… …
439 object *old_god = NULL; /* old god */ 378 object *old_god = NULL; /* old god */
440 treasure *tr; 379 treasure *tr;
441 object *item, *skop, *next; 380 object *item, *skop, *next;
442 int i, sk_applied, undeadified = 0; /* Turns to true if changing god can changes the undead status of the player. */ 381 int i, sk_applied, undeadified = 0; /* Turns to true if changing god can changes the undead status of the player. */
443 382
444
445 old_god = find_god (determine_god (op)); 383 old_god = find_god (determine_god (op));
446 384
447 /* take away any special god-characteristic items. */ 385 /* take away any special god-characteristic items. */
448 for (item = op->inv; item != NULL; item = next) 386 for (item = op->inv; item; item = next)
449 { 387 {
450 next = item->below; 388 next = item->below;
389
451 // remove all invisible startequip items which are not skill, exp or force 390 // remove all invisible startequip items which are not skill, exp or force
452 if (QUERY_FLAG (item, FLAG_STARTEQUIP) && item->invisible && 391 if (QUERY_FLAG (item, FLAG_STARTEQUIP) && item->invisible &&
453 (item->type != SKILL) && (item->type != FORCE)) 392 (item->type != SKILL) && (item->type != FORCE))
454 { 393 {
455
456 if (item->type == SPELL) 394 if (item->type == SPELL)
395 {
457 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", &item->name); 396 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", &item->name);
397 esrv_remove_spell (op->contr, item);
398 }
458 399
459 player_unready_range_ob (op->contr, item); 400 player_unready_range_ob (op->contr, item);
460 item->destroy (); 401 item->destroy ();
461 } 402 }
462 } 403 }
463 404
464 /* remove any godgiven items from the old god */ 405 /* remove any godgiven items from the old god */
465 if (old_god) 406 if (old_god)
466 for (tr = old_god->randomitems->items; tr; tr = tr->next) 407 for (tr = old_god->randomitems->items; tr; tr = tr->next)
467 if (tr->item && QUERY_FLAG (&tr->item->clone, FLAG_STARTEQUIP)) 408 if (tr->item && QUERY_FLAG (tr->item, FLAG_STARTEQUIP))
468 follower_remove_similar_item (op, &tr->item->clone); 409 follower_remove_similar_item (op, tr->item);
469 410
470 if (!op || !new_god) 411 if (!op || !new_god)
471 return; 412 return;
472 413
473 if (op->race && new_god->slaying && strstr (op->race, new_god->slaying)) 414 if (op->race && new_god->slaying && strstr (op->race, new_god->slaying))
… …
482 } 423 }
483 424
484 return; 425 return;
485 } 426 }
486 427
487
488 /* give the player any special god-characteristic-items. */ 428 /* give the player any special god-characteristic-items. */
489 for (tr = new_god->randomitems->items; tr; tr = tr->next) 429 for (tr = new_god->randomitems->items; tr; tr = tr->next)
490 { 430 {
491 if (tr->item && tr->item->clone.invisible && tr->item->clone.type != SPELLBOOK 431 if (tr->item && tr->item->invisible && tr->item->type != SPELLBOOK
492 && tr->item->clone.type != BOOK && tr->item->clone.type != SPELL) 432 && tr->item->type != BOOK && tr->item->type != SPELL)
493 god_gives_present (op, new_god, tr); 433 god_gives_present (op, new_god, tr);
494 } 434 }
495 435
496
497 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You become a follower of %s!", &new_god->name); 436 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You become a follower of %s!", &new_god->name);
498 437
499 for (skop = op->inv; skop != NULL; skop = skop->below) 438 for (skop = op->inv; skop; skop = skop->below)
500 if (skop->type == SKILL && skop->subtype == SK_PRAYING) 439 if (skop->type == SKILL && skop->subtype == SK_PRAYING)
501 break; 440 break;
502 441
503 /* Player has no skill - give them the skill */ 442 /* Player has no skill - give them the skill */
504 if (!skop) 443 if (!skop)
505 {
506 /* The arhetype should always be defined - if we crash here because it doesn't, 444 /* The archetype should always be defined - if we crash here because it doesn't,
507 * things are really messed up anyways. 445 * things are really messed up anyways.
508 */ 446 */
509 skop = give_skill_by_name (op, get_archetype_by_type_subtype (SKILL, SK_PRAYING)->clone.skill); 447 skop = give_skill_by_name (op, get_archetype_by_type_subtype (SKILL, SK_PRAYING)->skill);
510 link_player_skills (op);
511 }
512 448
513 sk_applied = QUERY_FLAG (skop, FLAG_APPLIED); /* save skill status */ 449 sk_applied = QUERY_FLAG (skop, FLAG_APPLIED); /* save skill status */
514 450
515 /* Clear the "undead" status. We also need to force a call to change_abil, 451 /* Clear the "undead" status. We also need to force a call to change_abil,
516 * so I set undeadified for that. 452 * so I set undeadified for that.
517 * - gros, 21th July 2006. 453 * - gros, 21th July 2006.
518 */ 454 */
519 if ((old_god) && (QUERY_FLAG (old_god, FLAG_UNDEAD))) 455 if (old_god && QUERY_FLAG (old_god, FLAG_UNDEAD))
520 { 456 {
521 CLEAR_FLAG (skop, FLAG_UNDEAD); 457 CLEAR_FLAG (skop, FLAG_UNDEAD);
522 undeadified = 1; 458 undeadified = 1;
523 } 459 }
524 460
525 if (skop->title) 461 if (skop->title)
526 { /* get rid of old god */ 462 {
463 /* get rid of old god */
527 new_draw_info_format (NDI_UNIQUE, 0, op, "%s's blessing is withdrawn from you.", &skop->title); 464 new_draw_info_format (NDI_UNIQUE, 0, op, "%s's blessing is withdrawn from you.", &skop->title);
465
528 /* The point of this is to really show what abilities the player just lost */ 466 /* The point of this is to really show what abilities the player just lost */
529 if (sk_applied || undeadified) 467 if (sk_applied || undeadified)
530 { 468 {
531
532 CLEAR_FLAG (skop, FLAG_APPLIED); 469 CLEAR_FLAG (skop, FLAG_APPLIED);
533 (void) change_abil (op, skop); 470 change_abil (op, skop);
534 } 471 }
535 } 472 }
536 473
537 /* now change to the new gods attributes to exp_obj */ 474 /* now change to the new gods attributes to exp_obj */
538 skop->title = new_god->name; 475 skop->title = new_god->name;
… …
573 * This also can happen for monks which cannot use weapons. In this case 510 * 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. 511 * do not allow to use weapons even if the god otherwise would allow it.
575 */ 512 */
576 if (!present_in_ob_by_name (FORCE, "no weapon force", op)) 513 if (!present_in_ob_by_name (FORCE, "no weapon force", op))
577 update_priest_flag (new_god, skop, FLAG_USE_WEAPON); 514 update_priest_flag (new_god, skop, FLAG_USE_WEAPON);
515
578 update_priest_flag (new_god, skop, FLAG_USE_ARMOUR); 516 update_priest_flag (new_god, skop, FLAG_USE_ARMOUR);
579 517
580 if (worship_forbids_use (op, skop, FLAG_USE_WEAPON, "weapons")) 518 if (worship_forbids_use (op, skop, FLAG_USE_WEAPON, "weapons"))
581 stop_using_item (op, WEAPON, 2); 519 stop_using_item (op, WEAPON, 2);
582 520
… …
608 */ 546 */
609 547
610int 548int
611worship_forbids_use (object *op, object *exp_obj, uint32 flag, const char *string) 549worship_forbids_use (object *op, object *exp_obj, uint32 flag, const char *string)
612{ 550{
613
614 if (QUERY_FLAG (&op->arch->clone, flag)) 551 if (QUERY_FLAG (op->arch, flag))
615 if (QUERY_FLAG (op, flag) != QUERY_FLAG (exp_obj, flag)) 552 if (QUERY_FLAG (op, flag) != QUERY_FLAG (exp_obj, flag))
616 { 553 {
617 update_priest_flag (exp_obj, op, flag); 554 update_priest_flag (exp_obj, op, flag);
618 if (QUERY_FLAG (op, flag)) 555 if (QUERY_FLAG (op, flag))
619 new_draw_info_format (NDI_UNIQUE, 0, op, "You may use %s again.", string); 556 new_draw_info_format (NDI_UNIQUE, 0, op, "You may use %s again.", string);
… …
621 { 558 {
622 new_draw_info_format (NDI_UNIQUE, 0, op, "You are forbidden to use %s.", string); 559 new_draw_info_format (NDI_UNIQUE, 0, op, "You are forbidden to use %s.", string);
623 return 1; 560 return 1;
624 } 561 }
625 } 562 }
563
626 return 0; 564 return 0;
627} 565}
628 566
629/** 567/**
630 * Unapplies up to number worth of items of type 568 * Unapplies up to number worth of items of type
… …
667/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/ 605/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/
668 CLEAR_FLAG (exp_ob, flag); 606 CLEAR_FLAG (exp_ob, flag);
669 }; 607 };
670} 608}
671 609
672
673
674archetype * 610archetype *
675determine_holy_arch (object *god, const char *type) 611determine_holy_arch (object *god, const char *type)
676{ 612{
677 treasure *tr; 613 treasure *tr;
678 614
679 if (!god || !god->randomitems) 615 if (!god || !god->randomitems)
680 { 616 {
681 LOG (llevError, "BUG: determine_holy_arch(): no god or god without " "randomitems\n"); 617 LOG (llevError, "BUG: determine_holy_arch(): no god or god without " "randomitems\n");
682 return NULL; 618 return 0;
683 } 619 }
684 620
685 for (tr = god->randomitems->items; tr; tr = tr->next) 621 for (tr = god->randomitems->items; tr; tr = tr->next)
686 { 622 {
687 if (!tr->item) 623 if (!tr->item)
688 continue; 624 continue;
689 625
690 object *item = &tr->item->clone; 626 object *item = tr->item;
691 627
692 if (item->type == BOOK && item->invisible && strcmp (item->name, type) == 0) 628 if (item->type == BOOK && item->invisible && strcmp (item->name, type) == 0)
693 return item->other_arch; 629 return item->other_arch;
694 } 630 }
631
695 return NULL; 632 return 0;
696} 633}
697 634
698/** 635/**
699 * God helps player by removing curse and/or damnation. 636 * God helps player by removing curse and/or damnation.
700 */ 637 */
701static int 638static int
702god_removes_curse (object *op, int remove_damnation) 639god_removes_curse (object *op, int remove_damnation)
703{ 640{
704 object *tmp;
705 int success = 0; 641 int success = 0;
706 642
707 for (tmp = op->inv; tmp; tmp = tmp->below) 643 for (object *tmp = op->inv; tmp; tmp = tmp->below)
708 { 644 {
709 if (tmp->invisible) 645 if (tmp->invisible)
710 continue; 646 continue;
647
711 if (QUERY_FLAG (tmp, FLAG_DAMNED) && !remove_damnation) 648 if (QUERY_FLAG (tmp, FLAG_DAMNED) && !remove_damnation)
712 continue; 649 continue;
650
713 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 651 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
714 { 652 {
715 success = 1; 653 success = 1;
716 CLEAR_FLAG (tmp, FLAG_DAMNED); 654 CLEAR_FLAG (tmp, FLAG_DAMNED);
717 CLEAR_FLAG (tmp, FLAG_CURSED); 655 CLEAR_FLAG (tmp, FLAG_CURSED);
718 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED); 656 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
719 if (op->type == PLAYER) 657
658 if (object *pl = tmp->visible_to ())
720 esrv_send_item (op, tmp); 659 esrv_update_item (UPD_FLAGS, pl, tmp);
721 } 660 }
722 } 661 }
723 662
724 if (success) 663 if (success)
725 new_draw_info (NDI_UNIQUE, 0, op, "You feel like someone is helping you."); 664 new_draw_info (NDI_UNIQUE, 0, op, "You feel like someone is helping you.");
665
726 return success; 666 return success;
727} 667}
728 668
729static int 669static int
730follower_level_to_enchantments (int level, int difficulty) 670follower_level_to_enchantments (int level, int difficulty)
… …
735 return 0; 675 return 0;
736 } 676 }
737 677
738 if (level <= 20) 678 if (level <= 20)
739 return level / difficulty; 679 return level / difficulty;
680
740 if (level <= 40) 681 if (level <= 40)
741 return (20 + (level - 20) / 2) / difficulty; 682 return (20 + (level - 20) / 2) / difficulty;
742 683
743 return (30 + (level - 40) / 4) / difficulty; 684 return (30 + (level - 40) / 4) / difficulty;
744} 685}
… …
750 * attacktype, slaying and such. 691 * attacktype, slaying and such.
751 */ 692 */
752static int 693static int
753god_enchants_weapon (object *op, object *god, object *tr, object *skill) 694god_enchants_weapon (object *op, object *god, object *tr, object *skill)
754{ 695{
755 char buf[MAX_BUF];
756 object *weapon; 696 object *weapon;
757 uint32 attacktype; 697 uint32 attacktype;
758 int tmp; 698 int tmp;
759 699
760 for (weapon = op->inv; weapon; weapon = weapon->below) 700 for (weapon = op->inv; weapon; weapon = weapon->below)
761 if ((weapon->type == WEAPON || weapon->type == BOW) && QUERY_FLAG (weapon, FLAG_APPLIED)) 701 if ((weapon->type == WEAPON || weapon->type == BOW) && QUERY_FLAG (weapon, FLAG_APPLIED))
762 break; 702 break;
763 703
764 if (weapon == NULL || god_examines_item (god, weapon) <= 0) 704 if (!weapon || god_examines_item (god, weapon) <= 0)
765 return 0; 705 return 0;
766 706
767 /* First give it a title, so other gods won't touch it */ 707 /* First give it a title, so other gods won't touch it */
768 if (!weapon->title) 708 if (!weapon->title)
769 { 709 {
770 sprintf (buf, "of %s", &god->name); 710 weapon->title = format ("of %s", &god->name);
771 weapon->title = buf; 711
772 if (op->type == PLAYER) 712 if (object *pl = weapon->visible_to ())
773 esrv_update_item (UPD_NAME, op, weapon); 713 esrv_update_item (UPD_NAME, pl, weapon);
714
774 new_draw_info (NDI_UNIQUE, 0, op, "Your weapon quivers as if struck!"); 715 new_draw_info (NDI_UNIQUE, 0, op, "Your weapon quivers as if struck!");
775 } 716 }
776 717
777 /* Allow the weapon to slay enemies */ 718 /* Allow the weapon to slay enemies */
778 if (!weapon->slaying && god->slaying) 719 if (!weapon->slaying && god->slaying)
… …
795 tmp = follower_level_to_enchantments (skill->level, tr->level); 736 tmp = follower_level_to_enchantments (skill->level, tr->level);
796 if (weapon->magic < tmp) 737 if (weapon->magic < tmp)
797 { 738 {
798 new_draw_info (NDI_UNIQUE, 0, op, "A phosphorescent glow envelops your weapon!"); 739 new_draw_info (NDI_UNIQUE, 0, op, "A phosphorescent glow envelops your weapon!");
799 weapon->magic++; 740 weapon->magic++;
800 if (op->type == PLAYER) 741
742 if (object *pl = weapon->visible_to ())
801 esrv_update_item (UPD_NAME, op, weapon); 743 esrv_update_item (UPD_NAME, pl, weapon);
744
802 return 1; 745 return 1;
803 } 746 }
804 747
805 return 0; 748 return 0;
806} 749}
807
808 750
809/** 751/**
810 * Every once in a while the god will intervene to help the worshiper. 752 * Every once in a while the god will intervene to help the worshiper.
811 * Later, this fctn can be used to supply quests, etc for the 753 * Later, this fctn can be used to supply quests, etc for the
812 * priest. -b.t. 754 * priest. -b.t.
813 * called from pray_at_altar() currently. 755 * called from pray_at_altar() currently.
814 */ 756 */
815
816void 757void
817god_intervention (object *op, object *god, object *skill) 758god_intervention (object *op, object *god, object *skill)
818{ 759{
819 treasure *tr; 760 treasure *tr;
820 761
… …
828 769
829 /* lets do some checks of whether we are kosher with our god */ 770 /* lets do some checks of whether we are kosher with our god */
830 if (god_examines_priest (op, god) < 0) 771 if (god_examines_priest (op, god) < 0)
831 return; 772 return;
832 773
774 op->play_sound (sound_find ("god_intervention"));
833 new_draw_info (NDI_UNIQUE, 0, op, "You feel a holy presence!"); 775 new_draw_info (NDI_UNIQUE, 0, op, "You feel a holy presence!");
834 776
835 for (tr = god->randomitems->items; tr; tr = tr->next) 777 for (tr = god->randomitems->items; tr; tr = tr->next)
836 { 778 {
837 object *item; 779 object *item;
… …
845 treasurelist *tl = treasurelist::find (tr->name); 787 treasurelist *tl = treasurelist::find (tr->name);
846 788
847 if (tl == NULL) 789 if (tl == NULL)
848 continue; 790 continue;
849 791
850 new_draw_info (NDI_UNIQUE, 0, op, "Something appears before your " "eyes. You catch it before it falls to the ground."); 792 new_draw_info (NDI_UNIQUE, 0, op, "Something appears before your eyes. You catch it before it falls to the ground.");
851 793
852 create_treasure (tl, op, GT_STARTEQUIP | GT_ONLY_GOOD | GT_UPDATE_INV, skill->level, 0); 794 create_treasure (tl, op, GT_STARTEQUIP | GT_ONLY_GOOD, skill->level, 0);
853 return; 795 return;
854 } 796 }
855 797
856 if (!tr->item) 798 if (!tr->item)
857 continue; 799 continue;
858 800
859 item = &tr->item->clone; 801 item = tr->item;
860 802
861 /* Grace limit */ 803 /* Grace limit */
862 if (item->type == BOOK && item->invisible && strcmp (item->name, "grace limit") == 0) 804 if (item->type == BOOK && item->invisible && strcmp (item->name, "grace limit") == 0)
863 { 805 {
864 if (op->stats.grace < item->stats.grace || op->stats.grace < op->stats.maxgrace) 806 if (op->stats.grace < item->stats.grace || op->stats.grace < op->stats.maxgrace)
… …
871 tmp = get_archetype (HOLY_POSSESSION); 813 tmp = get_archetype (HOLY_POSSESSION);
872 cast_change_ability (op, op, tmp, 0, 1); 814 cast_change_ability (op, op, tmp, 0, 1);
873 tmp->destroy (); 815 tmp->destroy ();
874 return; 816 return;
875 } 817 }
818
876 continue; 819 continue;
877 } 820 }
878 821
879 /* Restore grace */ 822 /* Restore grace */
880 if (item->type == BOOK && item->invisible && strcmp (item->name, "restore grace") == 0) 823 if (item->type == BOOK && item->invisible && strcmp (item->name, "restore grace") == 0)
… …
904 /* Restore to 50 .. 100%, if sp < 50% */ 847 /* Restore to 50 .. 100%, if sp < 50% */
905 int new_sp = (int) (random_roll (1000, 1999, op, PREFER_HIGH) / 2000.0 * max); 848 int new_sp = (int) (random_roll (1000, 1999, op, PREFER_HIGH) / 2000.0 * max);
906 849
907 if (op->stats.sp >= max / 2) 850 if (op->stats.sp >= max / 2)
908 continue; 851 continue;
852
909 new_draw_info (NDI_UNIQUE, 0, op, "A blue lightning strikes " "your head but doesn't hurt you!"); 853 new_draw_info (NDI_UNIQUE, 0, op, "A blue lightning strikes your head but doesn't hurt you!");
910 op->stats.sp = new_sp; 854 op->stats.sp = new_sp;
911 } 855 }
912 856
913 /* Various heal spells */ 857 /* Various heal spells */
914 if (item->type == BOOK && item->invisible && strcmp (item->name, "heal spell") == 0) 858 if (item->type == BOOK && item->invisible && strcmp (item->name, "heal spell") == 0)
915 { 859 {
916 object *tmp;
917 int success;
918
919 tmp = get_archetype_by_object_name (item->slaying); 860 object *tmp = archetype::get (item->slaying);
920
921 success = cast_heal (op, op, tmp, 0); 861 int success = cast_heal (op, op, tmp, 0);
922 tmp->destroy (); 862 tmp->destroy ();
863
923 if (success) 864 if (success)
924 return; 865 return;
925 else 866 else
926 continue; 867 continue;
927 } 868 }
… …
973 } 914 }
974 915
975 /* Voices */ 916 /* Voices */
976 if (item->type == BOOK && item->invisible && strcmp (item->name, "voice_behind") == 0) 917 if (item->type == BOOK && item->invisible && strcmp (item->name, "voice_behind") == 0)
977 { 918 {
978 new_draw_info (NDI_UNIQUE, 0, op, "You hear a voice from behind you, but you don't dare to " "turn around:"); 919 new_draw_info (NDI_UNIQUE, 0, op, "You hear a voice from behind you, but you don't dare to turn around:");
979 new_draw_info (NDI_WHITE, 0, op, item->msg); 920 new_draw_info (NDI_WHITE, 0, op, item->msg);
980 return; 921 return;
981 } 922 }
982 923
983 /* Messages */ 924 /* Messages */
… …
1034{ 975{
1035 int reaction = 1; 976 int reaction = 1;
1036 object *item = NULL, *skop; 977 object *item = NULL, *skop;
1037 978
1038 for (item = op->inv; item; item = item->below) 979 for (item = op->inv; item; item = item->below)
1039 {
1040 if (QUERY_FLAG (item, FLAG_APPLIED)) 980 if (QUERY_FLAG (item, FLAG_APPLIED))
1041 {
1042 reaction += god_examines_item (god, item) * (item->magic ? abs (item->magic) : 1); 981 reaction += god_examines_item (god, item) * (item->magic ? abs (item->magic) : 1);
1043 }
1044 }
1045 982
1046 /* well, well. Looks like we screwed up. Time for god's revenge */ 983 /* well, well. Looks like we screwed up. Time for god's revenge */
1047 if (reaction < 0) 984 if (reaction < 0)
1048 { 985 {
1049 int loss = 10000000; 986 int loss = 10000000;
1050 int angry = abs (reaction); 987 int angry = abs (reaction);
1051 988
1052 for (skop = op->inv; skop != NULL; skop = skop->below) 989 for (skop = op->inv; skop; skop = skop->below)
1053 if (skop->type == SKILL && skop->subtype == SK_PRAYING) 990 if (skop->type == SKILL && skop->subtype == SK_PRAYING)
1054 break; 991 break;
1055 992
1056 if (skop) 993 if (skop)
1057 loss = (int) (0.05 * (float) skop->stats.exp); 994 loss = 0.05f * skop->stats.exp;
995
1058 change_exp (op, -random_roll (0, loss * angry - 1, op, PREFER_LOW), skop ? &skop->skill : "none", SK_SUBTRACT_SKILL_EXP); 996 change_exp (op, -random_roll (0, loss * angry - 1, op, PREFER_LOW), skop ? &skop->skill : "none", SK_SUBTRACT_SKILL_EXP);
997
1059 if (random_roll (0, angry, op, PREFER_LOW)) 998 if (random_roll (0, angry, op, PREFER_LOW))
1060 { 999 {
1061 object *tmp = get_archetype (LOOSE_MANA); 1000 object *tmp = get_archetype (LOOSE_MANA);
1062 1001
1063 cast_magic_storm (op, tmp, op->level + (angry * 3)); 1002 cast_magic_storm (op, tmp, op->level + (angry * 3));
1064 } 1003 }
1004
1065 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "%s becomes angry and punishes you!", &god->name); 1005 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "%s becomes angry and punishes you!", &god->name);
1066 } 1006 }
1007
1067 return reaction; 1008 return reaction;
1068} 1009}
1069 1010
1070/** 1011/**
1071 * God checks item the player is using. 1012 * God checks item the player is using.
… …
1114 */ 1055 */
1115 1056
1116int 1057int
1117get_god (object *priest) 1058get_god (object *priest)
1118{ 1059{
1119 int godnr = lookup_god_by_name (determine_god (priest)); 1060 return lookup_god_by_name (determine_god (priest));
1120
1121 return godnr;
1122} 1061}
1123 1062
1124/** 1063/**
1125 * Returns a string that is the name of the god that should be natively worshipped by a 1064 * Returns a string that is the name of the god that should be natively worshipped by a
1126 * creature of who has race *race 1065 * creature of who has race *race
1127 * if we can't find a god that is appropriate, we return NULL 1066 * if we can't find a god that is appropriate, we return NULL
1128 */ 1067 */
1129const char * 1068shstr_tmp
1130get_god_for_race (const char *race) 1069get_god_for_race (const char *race)
1131{ 1070{
1132 godlink *gl = first_god; 1071 if (race)
1133 const char *godname = NULL; 1072 for (godlink *gl = first_god; gl; gl = gl->next)
1134
1135 if (race == NULL)
1136 return NULL;
1137 while (gl)
1138 {
1139 if (!strcasecmp (gl->arch->clone.race, race)) 1073 if (!strcasecmp (gl->arch->race, race))
1140 { 1074 return gl->name;
1141 godname = gl->name; 1075
1142 break; 1076 return shstr_null;
1143 }
1144 gl = gl->next;
1145 }
1146 return godname;
1147} 1077}
1148 1078
1149/** 1079/**
1150 * Changes the attributes of cone, smite, and ball spells as needed by the code. 1080 * Changes the attributes of cone, smite, and ball spells as needed by the code.
1151 * Returns false if there was no race to assign to the slaying field of the spell, but 1081 * Returns false if there was no race to assign to the slaying field of the spell, but

Diff Legend

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