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.29 by root, Mon Aug 27 03:56:17 2007 UTC vs.
Revision 1.45 by root, Thu Jan 1 16:05:13 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* 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
25 * monster race initialization. b.t. 25 * monster race initialization. b.t.
26 */ 26 */
… …
36 36
37/** 37/**
38 * Returns the id of specified god. 38 * Returns the id of specified god.
39 */ 39 */
40int 40int
41lookup_god_by_name (const char *name) 41lookup_god_by_name (shstr_cmp name)
42{ 42{
43 int godnr = -1; 43 if (name)
44 size_t nmlen = strlen (name);
45
46 if (name && strcmp (name, "none"))
47 {
48 godlink *gl;
49
50 for (gl = first_god; gl; gl = gl->next) 44 for (godlink *gl = first_god; gl; gl = gl->next)
51 if (!strncmp (name, gl->name, MIN ((size_t) strlen (gl->name), nmlen))) 45 if (gl->name == name)
52 break;
53
54 if (gl)
55 godnr = gl->id; 46 return gl->id;
56 }
57 47
58 return godnr; 48 return -1;
59} 49}
60 50
61/** 51/**
62 * 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..
63 */ 53 */
64object * 54object *
65find_god (const char *name) 55find_god (shstr_cmp name)
66{ 56{
67 object *god = NULL;
68
69 if (name) 57 if (name)
70 {
71 godlink *gl;
72
73 for (gl = first_god; gl; gl = gl->next) 58 for (godlink *gl = first_god; gl; gl = gl->next)
74 if (!strcmp (name, gl->name)) 59 if (gl->name == name)
75 break;
76 if (gl)
77 god = pntr_to_god_obj (gl); 60 return pntr_to_god_obj (gl);
78 } 61
79 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 ();
80} 79}
81 80
82/** 81/**
83 * Determines if op worships a god. 82 * Determines if op worships a god.
84 * 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.
85 * 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
86 * 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
87 * give them a random one. 86 * give them a random one.
88 */ 87 */
89 88shstr_tmp
90const char *
91determine_god (object *op) 89determine_god (object *op)
92{ 90{
93 int godnr = -1;
94 const char *godname;
95
96 /* spells */ 91 /* spells */
97 if ((op->type == SPELL || op->type == SPELL_EFFECT) && op->title) 92 if ((op->type == SPELL || op->type == SPELL_EFFECT) && op->title)
98 {
99 if (lookup_god_by_name (op->title) >= 0) 93 if (lookup_god_by_name (op->title) >= 0)
100 return op->title; 94 return op->title;
95
96 if (!op->is_player () && op->flag [FLAG_ALIVE])
101 } 97 {
102
103 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_ALIVE))
104 {
105
106 /* find a god based on race */ 98 /* find a god based on race */
107 if (!op->title) 99 if (!op->title)
108 {
109 if (op->race)
110 {
111 godname = get_god_for_race (op->race); 100 op->title = get_god_for_race (op->race);
112
113 if (godname)
114 op->title = godname;
115 }
116 }
117 101
118 /* find a random god */ 102 /* find a random god */
119 if (!op->title) 103 if (!op->title)
120 { 104 {
121 godlink *gl = first_god;
122
123 godnr = rndm (1, gl->id); 105 int godnr = rndm (1, first_god->id);
124 while (gl) 106
125 { 107 for (godlink *gl = first_god; gl && gl->id != godnr; gl = gl->next)
126 if (gl->id == godnr) 108 if (gl->id == godnr)
109 {
110 op->title = gl->name;
127 break; 111 break;
128
129 gl = gl->next;
130 } 112 }
131
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 for (object *tmp = op->inv; tmp; tmp = tmp->below) 124 for (object *tmp = op->inv; tmp; tmp = tmp->below)
147 if (tmp->type == SKILL && tmp->subtype == SK_PRAYING) 125 if (tmp->type == SKILL && tmp->subtype == SK_PRAYING)
148 { 126 {
149 if (tmp->title) 127 if (tmp->title)
150 return tmp->title; 128 return tmp->title;
151 else 129
152 return "none"; 130 break;
153 } 131 }
154 }
155 132
156 return "none"; 133 return shstr_none;
157} 134}
158 135
159/** 136/**
160 * 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
161 */ 138 */
162static int 139static int
163same_string (const char *s1, const char *s2) 140same_string (const char *s1, const char *s2)
164{ 141{
165 if (s1 == NULL) 142 if (s1 == s2)
166 if (s2 == NULL)
167 return 1; 143 return 1;
144 else if (s1 && s2)
145 return !strcmp (s1, s2);
168 else 146 else
169 return 0;
170 else if (s2 == NULL)
171 return 0; 147 return 0;
172 else
173 return strcmp (s1, s2) == 0;
174} 148}
175 149
176/** 150/**
177 * 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).
178 * Any matching items in the inventory are deleted, and a 152 * Any matching items in the inventory are deleted, and a
… …
192 166
193 if (tmp->type == item->type 167 if (tmp->type == item->type
194 && same_string (tmp->name, item->name) 168 && same_string (tmp->name, item->name)
195 && 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))
196 { 170 {
197
198 /* message */ 171 /* message */
199 if (tmp->nrof > 1) 172 new_draw_info_format (NDI_UNIQUE, 0, op,
200 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!",
201 else 174 query_short_name (tmp));
202 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s crumbles to dust!", query_short_name (tmp));
203 175
204 tmp->remove (); /* remove obj from players inv. */ 176 tmp->destroy ();
205 esrv_del_item (op->contr, tmp->count); /* notify client */
206 tmp->destroy (); /* free object */
207 } 177 }
208 178
209 if (tmp->inv) 179 if (tmp->inv)
210 follower_remove_similar_item (tmp, item); 180 follower_remove_similar_item (tmp, item);
211 } 181 }
… …
237 * God gives an item to the player. 207 * God gives an item to the player.
238 */ 208 */
239static int 209static int
240god_gives_present (object *op, object *god, treasure *tr) 210god_gives_present (object *op, object *god, treasure *tr)
241{ 211{
242 object *tmp;
243
244 if (!tr->item) 212 if (!tr->item)
245 return 0; 213 return 0;
246 214
247 if (follower_has_similar_item (op, tr->item)) 215 if (follower_has_similar_item (op, tr->item))
248 return 0; 216 return 0;
249 217
250 tmp = arch_to_object (tr->item); 218 object *tmp = arch_to_object (tr->item);
251 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));
252 tmp = insert_ob_in_ob (tmp, op); 220 op->insert (tmp);
253 if (op->type == PLAYER)
254 esrv_send_item (op, tmp);
255 221
256 return 1; 222 return 1;
257} 223}
258 224
259/** 225/**
… …
284 int bonus = (pl->stats.Wis + skill->level) / 10; 250 int bonus = (pl->stats.Wis + skill->level) / 10;
285 251
286 /* we can get neg grace up faster */ 252 /* we can get neg grace up faster */
287 if (pl->stats.grace < 0) 253 if (pl->stats.grace < 0)
288 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
289 /* we can super-charge grace to 2x max */ 256 /* we can super-charge grace to 2x max */
290 if (pl->stats.grace < (2 * pl->stats.maxgrace)) 257 if (pl->stats.grace < 2 * pl->stats.maxgrace)
291 {
292 pl->stats.grace += bonus / 2; 258 pl->stats.grace += bonus / 2;
293 } 259 else
294 if (pl->stats.grace > (2 * pl->stats.maxgrace))
295 {
296 pl->stats.grace = (2 * pl->stats.maxgrace); 260 pl->stats.grace = 2 * pl->stats.maxgrace;
297 }
298 261
299 /* 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
300 * follower, and may intervene to help them out. 263 * follower, and may intervene to help them out.
301 */ 264 */
302 bonus = MAX (1, bonus + MAX (pl->stats.luck, -3)); /* -- DAMN -- */ 265 bonus = MAX (1, bonus + MAX (pl->stats.luck, -3)); /* -- DAMN -- */
… …
409 { 372 {
410 remove = 0; 373 remove = 0;
411 break; 374 break;
412 } 375 }
413 } 376 }
377
414 if (remove) 378 if (remove)
415 { 379 do_forget_spell (op, tmp->name);
416 /* just do the work of removing the spell ourselves - we already
417 * know that the player knows the spell
418 */
419 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", &tmp->name);
420 player_unready_range_ob (op->contr, tmp);
421 tmp->destroy ();
422 }
423
424 } 380 }
425} 381}
426 382
427/** 383/**
428 * This function is called whenever a player has 384 * This function is called whenever a player has
… …
436 object *old_god = NULL; /* old god */ 392 object *old_god = NULL; /* old god */
437 treasure *tr; 393 treasure *tr;
438 object *item, *skop, *next; 394 object *item, *skop, *next;
439 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. */
440 396
441
442 old_god = find_god (determine_god (op)); 397 old_god = find_god (determine_god (op));
443 398
444 /* take away any special god-characteristic items. */ 399 /* take away any special god-characteristic items. */
445 for (item = op->inv; item != NULL; item = next) 400 for (item = op->inv; item; item = next)
446 { 401 {
447 next = item->below; 402 next = item->below;
403
448 // remove all invisible startequip items which are not skill, exp or force 404 // remove all invisible startequip items which are not skill, exp or force
449 if (QUERY_FLAG (item, FLAG_STARTEQUIP) && item->invisible && 405 if (QUERY_FLAG (item, FLAG_STARTEQUIP) && item->invisible &&
450 (item->type != SKILL) && (item->type != FORCE)) 406 (item->type != SKILL) && (item->type != FORCE))
451 { 407 {
452
453 if (item->type == SPELL) 408 if (item->type == SPELL)
409 {
454 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 }
455 413
456 player_unready_range_ob (op->contr, item); 414 player_unready_range_ob (op->contr, item);
457 item->destroy (); 415 item->destroy ();
458 } 416 }
459 } 417 }
… …
465 follower_remove_similar_item (op, tr->item); 423 follower_remove_similar_item (op, tr->item);
466 424
467 if (!op || !new_god) 425 if (!op || !new_god)
468 return; 426 return;
469 427
470 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))
471 { 429 {
472 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);
473 431
474 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)
475 { 433 {
… …
478 cast_magic_storm (op, tmp, new_god->level + 10); 436 cast_magic_storm (op, tmp, new_god->level + 10);
479 } 437 }
480 438
481 return; 439 return;
482 } 440 }
483
484 441
485 /* give the player any special god-characteristic-items. */ 442 /* give the player any special god-characteristic-items. */
486 for (tr = new_god->randomitems->items; tr; tr = tr->next) 443 for (tr = new_god->randomitems->items; tr; tr = tr->next)
487 { 444 {
488 if (tr->item && tr->item->invisible && tr->item->type != SPELLBOOK 445 if (tr->item && tr->item->invisible && tr->item->type != SPELLBOOK
489 && tr->item->type != BOOK && tr->item->type != SPELL) 446 && tr->item->type != BOOK && tr->item->type != SPELL)
490 god_gives_present (op, new_god, tr); 447 god_gives_present (op, new_god, tr);
491 } 448 }
492 449
493
494 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);
495 451
496 for (skop = op->inv; skop != NULL; skop = skop->below) 452 for (skop = op->inv; skop; skop = skop->below)
497 if (skop->type == SKILL && skop->subtype == SK_PRAYING) 453 if (skop->type == SKILL && skop->subtype == SK_PRAYING)
498 break; 454 break;
499 455
500 /* Player has no skill - give them the skill */ 456 /* Player has no skill - give them the skill */
501 if (!skop) 457 if (!skop)
502 {
503 /* 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,
504 * things are really messed up anyways. 459 * things are really messed up anyways.
505 */ 460 */
506 skop = give_skill_by_name (op, get_archetype_by_type_subtype (SKILL, SK_PRAYING)->skill); 461 skop = give_skill_by_name (op, get_archetype_by_type_subtype (SKILL, SK_PRAYING)->skill);
507 link_player_skills (op);
508 }
509 462
510 sk_applied = QUERY_FLAG (skop, FLAG_APPLIED); /* save skill status */ 463 sk_applied = QUERY_FLAG (skop, FLAG_APPLIED); /* save skill status */
511 464
512 /* 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,
513 * so I set undeadified for that. 466 * so I set undeadified for that.
514 * - gros, 21th July 2006. 467 * - gros, 21th July 2006.
515 */ 468 */
516 if ((old_god) && (QUERY_FLAG (old_god, FLAG_UNDEAD))) 469 if (old_god && QUERY_FLAG (old_god, FLAG_UNDEAD))
517 { 470 {
518 CLEAR_FLAG (skop, FLAG_UNDEAD); 471 CLEAR_FLAG (skop, FLAG_UNDEAD);
519 undeadified = 1; 472 undeadified = 1;
520 } 473 }
521 474
522 if (skop->title) 475 if (skop->title)
523 { /* get rid of old god */ 476 {
477 /* get rid of old god */
524 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
525 /* 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 */
526 if (sk_applied || undeadified) 481 if (sk_applied || undeadified)
527 { 482 {
528
529 CLEAR_FLAG (skop, FLAG_APPLIED); 483 CLEAR_FLAG (skop, FLAG_APPLIED);
530 (void) change_abil (op, skop); 484 change_abil (op, skop);
531 } 485 }
532 } 486 }
533 487
534 /* now change to the new gods attributes to exp_obj */ 488 /* now change to the new gods attributes to exp_obj */
535 skop->title = new_god->name; 489 skop->title = new_god->name;
… …
570 * 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
571 * 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.
572 */ 526 */
573 if (!present_in_ob_by_name (FORCE, "no weapon force", op)) 527 if (!present_in_ob_by_name (FORCE, "no weapon force", op))
574 update_priest_flag (new_god, skop, FLAG_USE_WEAPON); 528 update_priest_flag (new_god, skop, FLAG_USE_WEAPON);
529
575 update_priest_flag (new_god, skop, FLAG_USE_ARMOUR); 530 update_priest_flag (new_god, skop, FLAG_USE_ARMOUR);
576 531
577 if (worship_forbids_use (op, skop, FLAG_USE_WEAPON, "weapons")) 532 if (worship_forbids_use (op, skop, FLAG_USE_WEAPON, "weapons"))
578 stop_using_item (op, WEAPON, 2); 533 stop_using_item (op, WEAPON, 2);
579 534
… …
605 */ 560 */
606 561
607int 562int
608worship_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)
609{ 564{
610
611 if (QUERY_FLAG (op->arch, flag)) 565 if (QUERY_FLAG (op->arch, flag))
612 if (QUERY_FLAG (op, flag) != QUERY_FLAG (exp_obj, flag)) 566 if (QUERY_FLAG (op, flag) != QUERY_FLAG (exp_obj, flag))
613 { 567 {
614 update_priest_flag (exp_obj, op, flag); 568 update_priest_flag (exp_obj, op, flag);
615 if (QUERY_FLAG (op, flag)) 569 if (QUERY_FLAG (op, flag))
… …
618 { 572 {
619 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);
620 return 1; 574 return 1;
621 } 575 }
622 } 576 }
577
623 return 0; 578 return 0;
624} 579}
625 580
626/** 581/**
627 * Unapplies up to number worth of items of type 582 * Unapplies up to number worth of items of type
… …
664/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/ 619/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/
665 CLEAR_FLAG (exp_ob, flag); 620 CLEAR_FLAG (exp_ob, flag);
666 }; 621 };
667} 622}
668 623
669
670
671archetype * 624archetype *
672determine_holy_arch (object *god, const char *type) 625determine_holy_arch (object *god, shstr_cmp type)
673{ 626{
674 treasure *tr; 627 treasure *tr;
675 628
676 if (!god || !god->randomitems) 629 if (!god || !god->randomitems)
677 { 630 {
678 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");
679 return NULL; 632 return 0;
680 } 633 }
681 634
682 for (tr = god->randomitems->items; tr; tr = tr->next) 635 for (tr = god->randomitems->items; tr; tr = tr->next)
683 { 636 {
684 if (!tr->item) 637 if (!tr->item)
685 continue; 638 continue;
686 639
687 object *item = tr->item; 640 object *item = tr->item;
688 641
689 if (item->type == BOOK && item->invisible && strcmp (item->name, type) == 0) 642 if (item->type == BOOK && item->invisible && item->name == type)
690 return item->other_arch; 643 return item->other_arch;
691 } 644 }
645
692 return NULL; 646 return 0;
693} 647}
694 648
695/** 649/**
696 * God helps player by removing curse and/or damnation. 650 * God helps player by removing curse and/or damnation.
697 */ 651 */
698static int 652static int
699god_removes_curse (object *op, int remove_damnation) 653god_removes_curse (object *op, int remove_damnation)
700{ 654{
701 object *tmp;
702 int success = 0; 655 int success = 0;
703 656
704 for (tmp = op->inv; tmp; tmp = tmp->below) 657 for (object *tmp = op->inv; tmp; tmp = tmp->below)
705 { 658 {
706 if (tmp->invisible) 659 if (tmp->invisible)
707 continue; 660 continue;
661
708 if (QUERY_FLAG (tmp, FLAG_DAMNED) && !remove_damnation) 662 if (QUERY_FLAG (tmp, FLAG_DAMNED) && !remove_damnation)
709 continue; 663 continue;
664
710 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 665 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
711 { 666 {
712 success = 1; 667 success = 1;
713 CLEAR_FLAG (tmp, FLAG_DAMNED); 668 CLEAR_FLAG (tmp, FLAG_DAMNED);
714 CLEAR_FLAG (tmp, FLAG_CURSED); 669 CLEAR_FLAG (tmp, FLAG_CURSED);
715 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED); 670 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
716 if (op->type == PLAYER) 671
672 if (object *pl = tmp->visible_to ())
717 esrv_send_item (op, tmp); 673 esrv_update_item (UPD_FLAGS, pl, tmp);
718 } 674 }
719 } 675 }
720 676
721 if (success) 677 if (success)
722 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
723 return success; 680 return success;
724} 681}
725 682
726static int 683static int
727follower_level_to_enchantments (int level, int difficulty) 684follower_level_to_enchantments (int level, int difficulty)
… …
732 return 0; 689 return 0;
733 } 690 }
734 691
735 if (level <= 20) 692 if (level <= 20)
736 return level / difficulty; 693 return level / difficulty;
694
737 if (level <= 40) 695 if (level <= 40)
738 return (20 + (level - 20) / 2) / difficulty; 696 return (20 + (level - 20) / 2) / difficulty;
739 697
740 return (30 + (level - 40) / 4) / difficulty; 698 return (30 + (level - 40) / 4) / difficulty;
741} 699}
… …
747 * attacktype, slaying and such. 705 * attacktype, slaying and such.
748 */ 706 */
749static int 707static int
750god_enchants_weapon (object *op, object *god, object *tr, object *skill) 708god_enchants_weapon (object *op, object *god, object *tr, object *skill)
751{ 709{
752 char buf[MAX_BUF];
753 object *weapon; 710 object *weapon;
754 uint32 attacktype; 711 uint32 attacktype;
755 int tmp; 712 int tmp;
756 713
757 for (weapon = op->inv; weapon; weapon = weapon->below) 714 for (weapon = op->inv; weapon; weapon = weapon->below)
758 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))
759 break; 716 break;
760 717
761 if (weapon == NULL || god_examines_item (god, weapon) <= 0) 718 if (!weapon || god_examines_item (god, weapon) <= 0)
762 return 0; 719 return 0;
763 720
764 /* 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 */
765 if (!weapon->title) 722 if (!weapon->title)
766 { 723 {
767 sprintf (buf, "of %s", &god->name); 724 weapon->title = format ("of %s", &god->name);
768 weapon->title = buf; 725
769 if (op->type == PLAYER) 726 if (object *pl = weapon->visible_to ())
770 esrv_update_item (UPD_NAME, op, weapon); 727 esrv_update_item (UPD_NAME, pl, weapon);
728
771 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!");
772 } 730 }
773 731
774 /* Allow the weapon to slay enemies */ 732 /* Allow the weapon to slay enemies */
775 if (!weapon->slaying && god->slaying) 733 if (!weapon->slaying && god->slaying)
… …
792 tmp = follower_level_to_enchantments (skill->level, tr->level); 750 tmp = follower_level_to_enchantments (skill->level, tr->level);
793 if (weapon->magic < tmp) 751 if (weapon->magic < tmp)
794 { 752 {
795 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!");
796 weapon->magic++; 754 weapon->magic++;
797 if (op->type == PLAYER) 755
756 if (object *pl = weapon->visible_to ())
798 esrv_update_item (UPD_NAME, op, weapon); 757 esrv_update_item (UPD_NAME, pl, weapon);
758
799 return 1; 759 return 1;
800 } 760 }
801 761
802 return 0; 762 return 0;
803} 763}
… …
843 if (tl == NULL) 803 if (tl == NULL)
844 continue; 804 continue;
845 805
846 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.");
847 807
848 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);
849 return; 809 return;
850 } 810 }
851 811
852 if (!tr->item) 812 if (!tr->item)
853 continue; 813 continue;
854 814
855 item = tr->item; 815 item = tr->item;
856 816
857 /* Grace limit */ 817 /* Grace limit */
858 if (item->type == BOOK && item->invisible && strcmp (item->name, "grace limit") == 0) 818 if (item->type == BOOK && item->invisible && item->name == shstr_grace_limit)
859 { 819 {
860 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)
861 { 821 {
862 object *tmp;
863
864 /* Follower lacks the required grace for the following 822 /* Follower lacks the required grace for the following
865 * treasure list items. */ 823 * treasure list items. */
866 824
867 tmp = get_archetype (HOLY_POSSESSION); 825 object *tmp = get_archetype (HOLY_POSSESSION);
868 cast_change_ability (op, op, tmp, 0, 1); 826 cast_change_ability (op, op, tmp, 0, 1);
869 tmp->destroy (); 827 tmp->destroy ();
870 return; 828 return;
871 } 829 }
872 830
873 continue; 831 continue;
874 } 832 }
875 833
876 /* Restore grace */ 834 /* Restore grace */
877 if (item->type == BOOK && item->invisible && strcmp (item->name, "restore grace") == 0) 835 if (item->type == BOOK && item->invisible && item->name == shstr_restore_grace)
878 { 836 {
879 if (op->stats.grace >= 0) 837 if (op->stats.grace >= 0)
880 continue; 838 continue;
839
881 op->stats.grace = random_roll (0, 9, op, PREFER_HIGH); 840 op->stats.grace = random_roll (0, 9, op, PREFER_HIGH);
882 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.");
883 return; 842 return;
884 } 843 }
885 844
886 /* Heal damage */ 845 /* Heal damage */
887 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)
888 { 847 {
889 if (op->stats.hp >= op->stats.maxhp) 848 if (op->stats.hp >= op->stats.maxhp)
890 continue; 849 continue;
850
891 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!");
892 op->stats.hp = op->stats.maxhp; 852 op->stats.hp = op->stats.maxhp;
893 return; 853 return;
894 } 854 }
895 855
… …
901 /* Restore to 50 .. 100%, if sp < 50% */ 861 /* Restore to 50 .. 100%, if sp < 50% */
902 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);
903 863
904 if (op->stats.sp >= max / 2) 864 if (op->stats.sp >= max / 2)
905 continue; 865 continue;
866
906 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!");
907 op->stats.sp = new_sp; 868 op->stats.sp = new_sp;
908 } 869 }
909 870
910 /* Various heal spells */ 871 /* Various heal spells */
911 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)
912 { 873 {
913 object *tmp;
914 int success;
915
916 tmp = get_archetype_by_object_name (item->slaying); 874 object *tmp = archetype::get (item->slaying);
917
918 success = cast_heal (op, op, tmp, 0); 875 int success = cast_heal (op, op, tmp, 0);
919 tmp->destroy (); 876 tmp->destroy ();
877
920 if (success) 878 if (success)
921 return; 879 return;
922 else 880 else
923 continue; 881 continue;
924 } 882 }
… …
951 if ((at = archetype::find (ARCH_DEPLETION)) == NULL) 909 if ((at = archetype::find (ARCH_DEPLETION)) == NULL)
952 { 910 {
953 LOG (llevError, "Could not find archetype depletion.\n"); 911 LOG (llevError, "Could not find archetype depletion.\n");
954 continue; 912 continue;
955 } 913 }
914
956 depl = present_arch_in_ob (at, op); 915 depl = present_arch_in_ob (at, op);
957 916
958 if (depl == NULL) 917 if (depl == NULL)
959 continue; 918 continue;
960 919
… …
1031{ 990{
1032 int reaction = 1; 991 int reaction = 1;
1033 object *item = NULL, *skop; 992 object *item = NULL, *skop;
1034 993
1035 for (item = op->inv; item; item = item->below) 994 for (item = op->inv; item; item = item->below)
1036 {
1037 if (QUERY_FLAG (item, FLAG_APPLIED)) 995 if (QUERY_FLAG (item, FLAG_APPLIED))
1038 {
1039 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);
1040 }
1041 }
1042 997
1043 /* 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 */
1044 if (reaction < 0) 999 if (reaction < 0)
1045 { 1000 {
1046 int loss = 10000000; 1001 int loss = 10000000;
1047 int angry = abs (reaction); 1002 int angry = abs (reaction);
1048 1003
1049 for (skop = op->inv; skop != NULL; skop = skop->below) 1004 for (skop = op->inv; skop; skop = skop->below)
1050 if (skop->type == SKILL && skop->subtype == SK_PRAYING) 1005 if (skop->type == SKILL && skop->subtype == SK_PRAYING)
1051 break; 1006 break;
1052 1007
1053 if (skop) 1008 if (skop)
1054 loss = (int) (0.05 * (float) skop->stats.exp); 1009 loss = 0.05f * skop->stats.exp;
1010
1055 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
1056 if (random_roll (0, angry, op, PREFER_LOW)) 1013 if (random_roll (0, angry, op, PREFER_LOW))
1057 { 1014 {
1058 object *tmp = get_archetype (LOOSE_MANA); 1015 object *tmp = get_archetype (LOOSE_MANA);
1059 1016
1060 cast_magic_storm (op, tmp, op->level + (angry * 3)); 1017 cast_magic_storm (op, tmp, op->level + (angry * 3));
1061 } 1018 }
1019
1062 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);
1063 } 1021 }
1022
1064 return reaction; 1023 return reaction;
1065} 1024}
1066 1025
1067/** 1026/**
1068 * God checks item the player is using. 1027 * God checks item the player is using.
1069 * Return either -1 (bad), 0 (neutral) or 1028 * Return either -1 (bad), 0 (neutral) or
1070 * 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
1071 * god, it can be bad...-b.t. 1030 * god, it can be bad...-b.t.
1072 */ 1031 */
1073
1074int 1032int
1075god_examines_item (object *god, object *item) 1033god_examines_item (object *god, object *item)
1076{ 1034{
1077 char buf[MAX_BUF]; 1035 char buf[MAX_BUF];
1078 1036
… …
1081 1039
1082 if (!item->title) 1040 if (!item->title)
1083 return 1; /* unclaimed item are ok */ 1041 return 1; /* unclaimed item are ok */
1084 1042
1085 sprintf (buf, "of %s", &god->name); 1043 sprintf (buf, "of %s", &god->name);
1086 if (!strcmp (item->title, buf)) 1044 if (!strcmp (&item->title, buf))
1087 return 1; /* belongs to that God */ 1045 return 1; /* belongs to that God */
1088 1046
1089 if (god->title) 1047 if (god->title)
1090 { /* check if we have any enemy blessed item */ 1048 { /* check if we have any enemy blessed item */
1091 sprintf (buf, "of %s", &god->title); 1049 sprintf (buf, "of %s", &god->title);
1092 if (!strcmp (item->title, buf)) 1050 if (!strcmp (&item->title, buf))
1093 { 1051 {
1094 if (item->env) 1052 if (item->env)
1095 { 1053 {
1096 char buf[MAX_BUF]; 1054 char buf[MAX_BUF];
1097 1055
1098 sprintf (buf, "Heretic! You are using %s!", query_name (item)); 1056 sprintf (buf, "Heretic! You are using %s!", query_name (item));
1099 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, item->env, buf); 1057 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, item->env, buf);
1100 } 1058 }
1059
1101 return -1; 1060 return -1;
1102 } 1061 }
1103 } 1062 }
1104 1063
1105 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 */
… …
1107 1066
1108/** 1067/**
1109 * Returns priest's god's id. 1068 * Returns priest's god's id.
1110 * Straight calls lookup_god_by_name 1069 * Straight calls lookup_god_by_name
1111 */ 1070 */
1112
1113int 1071int
1114get_god (object *priest) 1072get_god (object *priest)
1115{ 1073{
1116 int godnr = lookup_god_by_name (determine_god (priest)); 1074 return lookup_god_by_name (determine_god (priest));
1117
1118 return godnr;
1119}
1120
1121/**
1122 * Returns a string that is the name of the god that should be natively worshipped by a
1123 * creature of who has race *race
1124 * if we can't find a god that is appropriate, we return NULL
1125 */
1126const char *
1127get_god_for_race (const char *race)
1128{
1129 godlink *gl = first_god;
1130 const char *godname = NULL;
1131
1132 if (race == NULL)
1133 return NULL;
1134 while (gl)
1135 {
1136 if (!strcasecmp (gl->arch->race, race))
1137 {
1138 godname = gl->name;
1139 break;
1140 }
1141 gl = gl->next;
1142 }
1143 return godname;
1144} 1075}
1145 1076
1146/** 1077/**
1147 * 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.
1148 * 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

Diff Legend

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