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.2 by root, Fri Aug 25 17:11:53 2006 UTC vs.
Revision 1.42 by root, Wed Dec 31 18:07:41 2008 UTC

1/* 1/*
2 * static char *rcsid_gods_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * "$Id: gods.C,v 1.2 2006/08/25 17:11:53 root Exp $"; 3 *
4 */ 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
11 7 *
12 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
13 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
14 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
15 (at your option) any later version. 11 * (at your option) any later version.
16 12 *
17 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,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details. 16 * GNU General Public License for more details.
21 17 *
22 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
23 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
25 21 * The authors can be reached via e-mail to <support@deliantra.net>
26 The authors can be reached via e-mail at crossfire-devel@real-time.com
27*/ 22 */
28
29 23
30/* 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
31 * monster race initialization. b.t. 25 * monster race initialization. b.t.
32 */ 26 */
33 27
… …
36#include <global.h> 30#include <global.h>
37#include <living.h> 31#include <living.h>
38#include <object.h> 32#include <object.h>
39#include <spells.h> 33#include <spells.h>
40#include <sounds.h> 34#include <sounds.h>
41#ifndef __CEXTRACT__
42#include <sproto.h> 35#include <sproto.h>
43#endif
44 36
45/** 37/**
46 * Returns the id of specified god. 38 * Returns the id of specified god.
47 */ 39 */
40int
48int lookup_god_by_name(const char *name) { 41lookup_god_by_name (const char *name)
49 int godnr=-1; 42{
50 size_t nmlen = strlen(name); 43 shstr_cmp sname (name);
51 44
52 if(name && strcmp(name,"none")) { 45 if (sname)
53 godlink *gl;
54 for(gl=first_god;gl;gl=gl->next) 46 for (godlink *gl = first_god; gl; gl = gl->next)
55 if(!strncmp(name,gl->name,MIN(strlen(gl->name),nmlen))) 47 if (gl->name == name)
56 break; 48 return gl->id;
57 if(gl) godnr=gl->id; 49
58 } 50 return -1;
59 return godnr;
60} 51}
61 52
62/** 53/**
63 * 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..
64 */ 55 */
56object *
65object *find_god(const char *name) { 57find_god (const char *name)
66 object *god=NULL; 58{
67
68 if(name) { 59 if (name)
69 godlink *gl;
70
71 for(gl=first_god;gl;gl=gl->next) 60 for (godlink *gl = first_god; gl; gl = gl->next)
72 if(!strcmp(name,gl->name)) break; 61 if (!strcmp (name, gl->name))
73 if(gl) god=pntr_to_god_obj(gl); 62 return pntr_to_god_obj (gl);
74 } 63
75 return god; 64 return 0;
76} 65}
77 66
78/** 67/**
79 * Determines if op worships a god. 68 * Determines if op worships a god.
80 * 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.
81 * 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
82 * 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
83 * give them a random one. 72 * give them a random one.
84 */ 73 */
85 74shstr_tmp
86const char *determine_god(object *op) { 75determine_god (object *op)
87 int godnr = -1; 76{
88 const char *godname;
89
90 /* spells */ 77 /* spells */
91 if ((op->type == SPELL || op->type == SPELL_EFFECT) && 78 if ((op->type == SPELL || op->type == SPELL_EFFECT) && op->title)
92 op->title) 79 if (lookup_god_by_name (op->title) >= 0)
93 { 80 return op->title;
94 if (lookup_god_by_name(op->title)>=0) return op->title; 81
82 if (!op->is_player () && op->flag [FLAG_ALIVE])
95 } 83 {
96
97 if(op->type!= PLAYER && QUERY_FLAG(op,FLAG_ALIVE)) {
98
99 /* find a god based on race */ 84 /* find a god based on race */
100 if(!op->title) { 85 if (!op->title)
101 if (op->race !=NULL) { 86 op->title = get_god_for_race (op->race);
102 godname=get_god_for_race(op->race); 87
103 if (godname!=NULL) { 88 /* find a random god */
104 op->title = add_string(godname); 89 if (!op->title)
105 } 90 {
91 int godnr = rndm (1, first_god->id);
92
93 for (godlink *gl = first_god; gl && gl->id != godnr; gl = gl->next)
94 if (gl->id == godnr)
95 {
96 op->title = gl->name;
97 break;
98 }
99 }
100
101 return op->title;
106 } 102 }
107 }
108 103
109 /* find a random god */
110 if(!op->title) {
111 godlink *gl = first_god;
112
113 godnr = rndm(1, gl->id);
114 while(gl) {
115 if(gl->id == godnr) break;
116 gl=gl->next;
117 }
118 op->title = add_string(gl->name);
119 }
120
121 return op->title;
122 }
123
124
125 /* 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
126 * 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
127 * 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
128 * title or "none". 107 * title or "none".
129 */ 108 */
130 if(op->type==PLAYER) { 109 if (op->type == PLAYER)
131 object *tmp;
132 for (tmp=op->inv; tmp!=NULL; tmp=tmp->below) 110 for (object *tmp = op->inv; tmp; tmp = tmp->below)
133 if (tmp->type == SKILL && tmp->subtype == SK_PRAYING) { 111 if (tmp->type == SKILL && tmp->subtype == SK_PRAYING)
134 if (tmp->title) return (tmp->title); 112 {
135 else return("none"); 113 if (tmp->title)
136 } 114 return tmp->title;
137 } 115
138 return ("none"); 116 break;
117 }
118
119 return shstr_none;
139} 120}
140 121
141/** 122/**
142 * 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
143 */ 124 */
125static int
144static int same_string (const char *s1, const char *s2) 126same_string (const char *s1, const char *s2)
145{ 127{
146 if (s1 == NULL) 128 if (s1 == s2)
147 if (s2 == NULL)
148 return 1; 129 return 1;
149 else 130 else if (s1 && s2)
150 return 0; 131 return !strcmp (s1, s2);
151 else 132 else
152 if (s2 == NULL)
153 return 0; 133 return 0;
154 else
155 return strcmp (s1, s2) == 0;
156} 134}
157
158 135
159/** 136/**
160 * 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).
161 * Any matching items in the inventory are deleted, and a 138 * Any matching items in the inventory are deleted, and a
162 * message is displayed to the player. 139 * message is displayed to the player.
163 */ 140 */
141static void
164static void follower_remove_similar_item (object *op, object *item) 142follower_remove_similar_item (object *op, object *item)
165{ 143{
166 object *tmp, *next; 144 object *tmp, *next;
167 145
168 if (op && op->type == PLAYER && op->contr) { 146 if (op && op->type == PLAYER && op->contr)
147 {
169 /* search the inventory */ 148 /* search the inventory */
170 for (tmp = op->inv; tmp != NULL; tmp = next) { 149 for (tmp = op->inv; tmp != NULL; tmp = next)
171 next = tmp->below; /* backup in case we remove tmp */
172 150 {
151 next = tmp->below; /* backup in case we remove tmp */
152
173 if (tmp->type == item->type 153 if (tmp->type == item->type
174 && same_string (tmp->name, item->name) 154 && same_string (tmp->name, item->name)
175 && same_string (tmp->title, item->title) 155 && same_string (tmp->title, item->title) && same_string (tmp->msg, item->msg) && same_string (tmp->slaying, item->slaying))
176 && same_string (tmp->msg, item->msg) 156 {
177 && same_string (tmp->slaying, item->slaying)) {
178
179 /* message */ 157 /* message */
180 if (tmp->nrof > 1)
181 new_draw_info_format(NDI_UNIQUE,0,op, 158 new_draw_info_format (NDI_UNIQUE, 0, op,
182 "The %s crumble to dust!", query_short_name(tmp)); 159 tmp->nrof > 1 ? "The %s crumble to dust!" : "The %s crumbles to dust!",
183 else 160 query_short_name (tmp));
184 new_draw_info_format(NDI_UNIQUE,0,op, 161
185 "The %s crumbles to dust!", query_short_name(tmp)); 162 tmp->destroy ();
186 163 }
187 remove_ob(tmp); /* remove obj from players inv. */ 164
188 esrv_del_item(op->contr, tmp->count); /* notify client */
189 free_object(tmp); /* free object */
190 }
191 if (tmp->inv) 165 if (tmp->inv)
192 follower_remove_similar_item(tmp, item); 166 follower_remove_similar_item (tmp, item);
193 } 167 }
194 } 168 }
195} 169}
196 170
197/** 171/**
198 * Checks for any occurrence of the given 'item' in the inventory of 'op' (recursively). 172 * Checks for any occurrence of the given 'item' in the inventory of 'op' (recursively).
199 * Returns 1 if found, else 0. 173 * Returns 1 if found, else 0.
200 */ 174 */
175static int
201static int follower_has_similar_item (object *op, object *item) 176follower_has_similar_item (object *op, object *item)
202{ 177{
203 object *tmp; 178 object *tmp;
204 179
205 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) { 180 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
181 {
206 if (tmp->type == item->type 182 if (tmp->type == item->type
207 && same_string (tmp->name, item->name) 183 && same_string (tmp->name, item->name)
208 && same_string (tmp->title, item->title) 184 && same_string (tmp->title, item->title) && same_string (tmp->msg, item->msg) && same_string (tmp->slaying, item->slaying))
209 && same_string (tmp->msg, item->msg)
210 && same_string (tmp->slaying, item->slaying))
211 return 1; 185 return 1;
212 if (tmp->inv && follower_has_similar_item (tmp, item)) 186 if (tmp->inv && follower_has_similar_item (tmp, item))
213 return 1; 187 return 1;
214 } 188 }
189 return 0;
190}
191
192/**
193 * God gives an item to the player.
194 */
195static int
196god_gives_present (object *op, object *god, treasure *tr)
197{
198 if (!tr->item)
215 return 0; 199 return 0;
216}
217 200
218/**
219 * God gives an item to the player.
220 */
221static int god_gives_present (object *op, object *god, treasure *tr)
222{
223 object *tmp;
224
225 if (follower_has_similar_item (op, &tr->item->clone)) 201 if (follower_has_similar_item (op, tr->item))
226 return 0;
227
228 tmp = arch_to_object (tr->item);
229 new_draw_info_format (NDI_UNIQUE, 0, op,
230 "%s lets %s appear in your hands.", god->name, query_short_name (tmp));
231 tmp = insert_ob_in_ob (tmp, op);
232 if (op->type == PLAYER)
233 esrv_send_item (op, tmp);
234 return 1; 202 return 0;
203
204 object *tmp = arch_to_object (tr->item);
205 new_draw_info_format (NDI_UNIQUE, 0, op, "%s lets %s appear in your hands.", &god->name, query_short_name (tmp));
206 op->insert (tmp);
207
208 return 1;
235} 209}
236 210
237/** 211/**
238 * Player prays at altar. 212 * Player prays at altar.
239 * Checks for god changing, divine intervention, and so on. 213 * Checks for god changing, divine intervention, and so on.
240 */ 214 */
215void
241void pray_at_altar(object *pl, object *altar, object *skill) { 216pray_at_altar (object *pl, object *altar, object *skill)
217{
242 object *pl_god=find_god(determine_god(pl)); 218 object *pl_god = find_god (determine_god (pl));
243 219
244 if (INVOKE_PLAYER (PRAY_ALTAR, pl->contr, ARG_OBJECT (altar), ARG_OBJECT (skill))) 220 if (INVOKE_PLAYER (PRAY_ALTAR, pl->contr, ARG_OBJECT (altar), ARG_OBJECT (skill)))
221 return;
222
223 /* If non consecrate altar, don't do anything */
224 if (!altar->other_arch)
225 return;
226
227 /* hmm. what happend depends on pl's current god, level, etc */
228 if (!pl_god)
229 { /*new convert */
230 become_follower (pl, altar->other_arch);
245 return; 231 return;
246 232 }
247 /* If non consecrate altar, don't do anything */
248 if (!altar->other_arch) return;
249
250 /* hmm. what happend depends on pl's current god, level, etc */
251 if(!pl_god) { /*new convert */
252 become_follower(pl,&altar->other_arch->clone);
253 return;
254
255 } else if(!strcmp(pl_god->name,altar->other_arch->clone.name)) { 233 else if (!strcmp (&pl_god->name, altar->other_arch->object::name))
234 {
256 /* pray at your gods altar */ 235 /* pray at your gods altar */
257 int bonus = (pl->stats.Wis+skill->level)/10; 236 int bonus = (pl->stats.Wis + skill->level) / 10;
258 237
259 /* we can get neg grace up faster */ 238 /* we can get neg grace up faster */
260 if(pl->stats.grace<0) pl->stats.grace+=(bonus>-1*(pl->stats.grace/10) ? 239 if (pl->stats.grace < 0)
261 bonus : -1*(pl->stats.grace/10)); 240 pl->stats.grace += (bonus > -1 * (pl->stats.grace / 10) ? bonus : -1 * (pl->stats.grace / 10));
241
262 /* we can super-charge grace to 2x max */ 242 /* we can super-charge grace to 2x max */
263 if(pl->stats.grace<(2*pl->stats.maxgrace)) { 243 if (pl->stats.grace < 2 * pl->stats.maxgrace)
264 pl->stats.grace+=bonus/2; 244 pl->stats.grace += bonus / 2;
265 } 245 else
266 if(pl->stats.grace>(2*pl->stats.maxgrace)) {
267 pl->stats.grace=(2*pl->stats.maxgrace); 246 pl->stats.grace = 2 * pl->stats.maxgrace;
268 }
269 247
270 /* 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
271 * follower, and may intervene to help them out. 249 * follower, and may intervene to help them out.
272 */ 250 */
273 bonus = MAX(1, bonus + MAX(pl->stats.luck, -3)); /* -- DAMN -- */ 251 bonus = MAX (1, bonus + MAX (pl->stats.luck, -3)); /* -- DAMN -- */
274 252
275 if(((random_roll(0, 399, pl, PREFER_LOW))-bonus)<0) 253 if (((random_roll (0, 399, pl, PREFER_LOW)) - bonus) < 0)
276 god_intervention(pl,pl_god, skill); 254 god_intervention (pl, pl_god, skill);
277 255 }
278 } else { /* praying to another god! */ 256 else
257 { /* praying to another god! */
279 uint64 loss = 0; 258 uint64 loss = 0;
280 int angry=1; 259 int angry = 1;
281 260
282 /* I believe the logic for detecting opposing gods was completely 261 /* I believe the logic for detecting opposing gods was completely
283 * broken - I think it should work now. altar->other_arch 262 * broken - I think it should work now. altar->other_arch
284 * points to the god of this altar (which we have 263 * points to the god of this altar (which we have
285 * already verified is non null). pl_god->other_arch 264 * already verified is non null). pl_god->other_arch
286 * is the opposing god - we need to verify that exists before 265 * is the opposing god - we need to verify that exists before
287 * using its values. 266 * using its values.
288 */ 267 */
289 if(pl_god->other_arch && 268 if (pl_god->other_arch && (altar->other_arch->archname == pl_god->other_arch->archname))
290 (altar->other_arch->name==pl_god->other_arch->name)) { 269 {
291 angry=2; 270 angry = 2;
292 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)
293 object *tmp; 272 {
273 object *tmp;
294 274
295 /* you really screwed up */ 275 /* you really screwed up */
296 angry=3; 276 angry = 3;
297 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,pl, 277 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, pl, "Foul Priest! %s punishes you!", &pl_god->name);
298 "Foul Priest! %s punishes you!",pl_god->name);
299 tmp=get_archetype(LOOSE_MANA); 278 tmp = get_archetype (LOOSE_MANA);
300 cast_magic_storm(pl,tmp, pl_god->level+20); 279 cast_magic_storm (pl, tmp, pl_god->level + 20);
301 } else 280 }
302 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,pl, 281 else
303 "Foolish heretic! %s is livid!",pl_god->name); 282 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, pl, "Foolish heretic! %s is livid!", &pl_god->name);
304 } else 283 }
305 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,pl, 284 else
306 "Heretic! %s is angered!",pl_god->name); 285 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, pl, "Heretic! %s is angered!", &pl_god->name);
307 286
308 /* whether we will be successfull in defecting or not - 287 /* whether we will be successfull in defecting or not -
309 * we lose experience from the clerical experience obj 288 * we lose experience from the clerical experience obj
310 */ 289 */
311 290
312 loss = angry * (skill->stats.exp / 10); 291 loss = angry * (skill->stats.exp / 10);
313 if(loss) 292 if (loss)
314 change_exp(pl, -random_roll64(0, loss, pl, PREFER_LOW), 293 change_exp (pl, -random_roll64 (0, loss, pl, PREFER_LOW), skill ? &skill->skill : "none", SK_SUBTRACT_SKILL_EXP);
315 skill?skill->skill:"none", SK_SUBTRACT_SKILL_EXP);
316 294
317 /* 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
318 * note it gets harder to swap gods the higher we get 296 * note it gets harder to swap gods the higher we get
319 */ 297 */
320 if((angry==1) && !(random_roll(0, skill->level, pl, PREFER_LOW))) { 298 if ((angry == 1) && !(random_roll (0, skill->level, pl, PREFER_LOW)))
321 become_follower(pl,&altar->other_arch->clone); 299 become_follower (pl, altar->other_arch);
322 } else { 300 else
301 {
323 /* toss this player off the altar. He can try again. */ 302 /* toss this player off the altar. He can try again. */
324 new_draw_info(NDI_UNIQUE|NDI_NAVY,0,pl, 303 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, pl, "A divine force pushes you off the altar.");
325 "A divine force pushes you off the altar."); 304 pl->contr->fire_on = 0;
305 pl->speed_left = 1.f;
326 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. */
327 } 307 }
328 } 308 }
329} 309}
330 310
331/** 311/**
332 * Removes special prayers given by a god. 312 * Removes special prayers given by a god.
333 */ 313 */
314static void
334static void check_special_prayers (object *op, object *god) 315check_special_prayers (object *op, object *god)
335{ 316{
336 /* Ensure that 'op' doesn't know any special prayers that are not granted 317 /* Ensure that 'op' doesn't know any special prayers that are not granted
337 * by 'god'. 318 * by 'god'.
338 */ 319 */
339 treasure *tr; 320 treasure *tr;
340 object *tmp, *next_tmp; 321 object *tmp, *next_tmp;
341 int remove=0; 322 int remove = 0;
342 323
343 /* Outer loop iterates over all special prayer marks */ 324 /* Outer loop iterates over all special prayer marks */
344 for (tmp = op->inv; tmp; tmp = next_tmp) { 325 for (tmp = op->inv; tmp; tmp = next_tmp)
326 {
345 next_tmp = tmp->below; 327 next_tmp = tmp->below;
346 328
347 /* we mark special prayers with the STARTEQUIP flag, so if it isn't 329 /* we mark special prayers with the STARTEQUIP flag, so if it isn't
348 * in that category, not something we need to worry about. 330 * in that category, not something we need to worry about.
349 */ 331 */
350 if (tmp->type != SPELL || !QUERY_FLAG(tmp, FLAG_STARTEQUIP)) 332 if (tmp->type != SPELL || !QUERY_FLAG (tmp, FLAG_STARTEQUIP))
351 continue; 333 continue;
352 334
353 if (god->randomitems == NULL) { 335 if (god->randomitems == NULL)
336 {
354 LOG (llevError, "BUG: check_special_prayers(): god %s without randomitems\n", god->name); 337 LOG (llevError, "BUG: check_special_prayers(): god %s without randomitems\n", &god->name);
355 do_forget_spell (op, tmp->name); 338 do_forget_spell (op, tmp->name);
356 continue; 339 continue;
357 } 340 }
358 341
359 /* Inner loop tries to find the special prayer in the god's treasure 342 /* Inner loop tries to find the special prayer in the god's treasure
360 * list. We default that the spell should be removed. 343 * list. We default that the spell should be removed.
361 */ 344 */
362 remove=1; 345 remove = 1;
363 for (tr = god->randomitems->items; tr; tr = tr->next) 346 for (tr = god->randomitems->items; tr; tr = tr->next)
364 { 347 {
365 object *item; 348 object *item;
366 349
367 if (tr->item == NULL) 350 if (!tr->item)
368 continue; 351 continue;
352
369 item = &tr->item->clone; 353 item = tr->item;
370 354
371 /* Basically, see if the matching spell is granted by this god. */ 355 /* Basically, see if the matching spell is granted by this god. */
372 356
373 if (tr->item->clone.type == SPELL && tr->item->clone.name == tmp->name) { 357 if (tr->item->type == SPELL && tr->item->object::name == tmp->name)
374 remove=0; 358 {
375 break; 359 remove = 0;
376 } 360 break;
377 } 361 }
378 if (remove) { 362 }
379 /* just do the work of removing the spell ourselves - we already
380 * know that the player knows the spell
381 */
382 new_draw_info_format (NDI_UNIQUE|NDI_NAVY, 0, op,
383 "You lose knowledge of %s.", tmp->name);
384 player_unready_range_ob(op->contr, tmp);
385 remove_ob(tmp);
386 free_object(tmp);
387 }
388 363
364 if (remove)
365 do_forget_spell (op, tmp->name);
389 } 366 }
390} 367}
391 368
392/** 369/**
393 * This function is called whenever a player has 370 * This function is called whenever a player has
394 * switched to a new god. It handles basically all the stat changes 371 * switched to a new god. It handles basically all the stat changes
395 * that happen to the player, including the removal of godgiven 372 * that happen to the player, including the removal of godgiven
396 * items (from the former cult). 373 * items (from the former cult).
397 */ 374 */
375void
398void become_follower (object *op, object *new_god) { 376become_follower (object *op, object *new_god)
377{
399 object *old_god = NULL; /* old god */ 378 object *old_god = NULL; /* old god */
400 treasure *tr; 379 treasure *tr;
401 object *item, *skop, *next; 380 object *item, *skop, *next;
402 int i,sk_applied,
403 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. */
404 382
405
406 old_god = find_god(determine_god(op)); 383 old_god = find_god (determine_god (op));
407 384
408 /* take away any special god-characteristic items. */ 385 /* take away any special god-characteristic items. */
409 for(item=op->inv;item!=NULL;item=next) { 386 for (item = op->inv; item; item = next)
387 {
410 next = item->below; 388 next = item->below;
411 /* remove all invisible startequip items which are 389
412 * not skill, exp or force 390 // remove all invisible startequip items which are not skill, exp or force
413 */
414 if(QUERY_FLAG(item,FLAG_STARTEQUIP) && item->invisible && 391 if (QUERY_FLAG (item, FLAG_STARTEQUIP) && item->invisible &&
415 (item->type != SKILL) && (item->type != EXPERIENCE) && 392 (item->type != SKILL) && (item->type != FORCE))
416 (item->type != FORCE)) { 393 {
417
418 if (item->type == SPELL) 394 if (item->type == SPELL)
419 new_draw_info_format(NDI_UNIQUE|NDI_NAVY, 0, op, 395 {
420 "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 }
399
421 player_unready_range_ob(op->contr, item); 400 player_unready_range_ob (op->contr, item);
422 remove_ob(item); 401 item->destroy ();
423 free_object(item); 402 }
424 }
425 }
426 403 }
404
427 /* remove any godgiven items from the old god */ 405 /* remove any godgiven items from the old god */
428 if (old_god) { 406 if (old_god)
429 for(tr=old_god->randomitems->items; tr!=NULL; tr = tr->next) { 407 for (tr = old_god->randomitems->items; tr; tr = tr->next)
430 if (tr->item && QUERY_FLAG(&tr->item->clone, FLAG_STARTEQUIP)) 408 if (tr->item && QUERY_FLAG (tr->item, FLAG_STARTEQUIP))
431 follower_remove_similar_item(op, &tr->item->clone); 409 follower_remove_similar_item (op, tr->item);
432 }
433 }
434
435 if(!op||!new_god) return;
436 410
411 if (!op || !new_god)
412 return;
413
437 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))
415 {
438 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,op,"Fool! %s detests your kind!", 416 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "Fool! %s detests your kind!", &new_god->name);
439 new_god->name); 417
440 if(random_roll(0, op->level-1, op, PREFER_LOW)-5>0) { 418 if (random_roll (0, op->level - 1, op, PREFER_LOW) - 5 > 0)
419 {
441 object *tmp = get_archetype(LOOSE_MANA); 420 object *tmp = get_archetype (LOOSE_MANA);
421
442 cast_magic_storm(op,tmp, new_god->level+10); 422 cast_magic_storm (op, tmp, new_god->level + 10);
443 } 423 }
444 return;
445 }
446 424
425 return;
426 }
447 427
448 /* give the player any special god-characteristic-items. */ 428 /* give the player any special god-characteristic-items. */
449 for(tr=new_god->randomitems->items; tr!=NULL; tr = tr->next) { 429 for (tr = new_god->randomitems->items; tr; tr = tr->next)
430 {
450 if(tr->item && tr->item->clone.invisible && tr->item->clone.type != SPELLBOOK && 431 if (tr->item && tr->item->invisible && tr->item->type != SPELLBOOK
451 tr->item->clone.type != BOOK && tr->item->clone.type != SPELL) 432 && tr->item->type != BOOK && tr->item->type != SPELL)
452 god_gives_present(op,new_god,tr); } 433 god_gives_present (op, new_god, tr);
434 }
453 435
436 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You become a follower of %s!", &new_god->name);
454 437
455 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,op,
456 "You become a follower of %s!",new_god->name);
457
458 for (skop = op->inv; skop != NULL; skop=skop->below) 438 for (skop = op->inv; skop; skop = skop->below)
459 if (skop->type == SKILL && skop->subtype == SK_PRAYING) break; 439 if (skop->type == SKILL && skop->subtype == SK_PRAYING)
440 break;
460 441
461 /* Player has no skill - give them the skill */ 442 /* Player has no skill - give them the skill */
462 if (!skop) { 443 if (!skop)
463 /* 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,
464 * things are really messed up anyways. 445 * things are really messed up anyways.
465 */
466 skop = give_skill_by_name(op, get_archetype_by_type_subtype(SKILL, SK_PRAYING)->clone.skill);
467 link_player_skills(op);
468 }
469
470 sk_applied=QUERY_FLAG(skop,FLAG_APPLIED); /* save skill status */
471
472 /* Clear the "undead" status. We also need to force a call to change_abil,
473 * so I set undeadified for that.
474 * - gros, 21th July 2006.
475 */ 446 */
447 skop = give_skill_by_name (op, get_archetype_by_type_subtype (SKILL, SK_PRAYING)->skill);
448
449 sk_applied = QUERY_FLAG (skop, FLAG_APPLIED); /* save skill status */
450
451 /* Clear the "undead" status. We also need to force a call to change_abil,
452 * so I set undeadified for that.
453 * - gros, 21th July 2006.
454 */
476 if ((old_god)&&(QUERY_FLAG(old_god,FLAG_UNDEAD))) 455 if (old_god && QUERY_FLAG (old_god, FLAG_UNDEAD))
477 { 456 {
478 CLEAR_FLAG(skop,FLAG_UNDEAD); 457 CLEAR_FLAG (skop, FLAG_UNDEAD);
479 undeadified=1; 458 undeadified = 1;
480 } 459 }
481 460
461 if (skop->title)
462 {
482 if(skop->title) { /* get rid of old god */ 463 /* get rid of old god */
483 new_draw_info_format(NDI_UNIQUE,0,op, 464 new_draw_info_format (NDI_UNIQUE, 0, op, "%s's blessing is withdrawn from you.", &skop->title);
484 "%s's blessing is withdrawn from you.",skop->title); 465
485 /* 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 */
486 if (sk_applied || undeadified) { 467 if (sk_applied || undeadified)
487 468 {
488 CLEAR_FLAG(skop,FLAG_APPLIED); 469 CLEAR_FLAG (skop, FLAG_APPLIED);
489 (void) change_abil(op,skop); 470 change_abil (op, skop);
490 } 471 }
491 free_string(skop->title);
492 } 472 }
493 473
494 /* now change to the new gods attributes to exp_obj */ 474 /* now change to the new gods attributes to exp_obj */
495 skop->title = add_string(new_god->name); 475 skop->title = new_god->name;
496 skop->path_attuned=new_god->path_attuned; 476 skop->path_attuned = new_god->path_attuned;
497 skop->path_repelled=new_god->path_repelled; 477 skop->path_repelled = new_god->path_repelled;
498 skop->path_denied=new_god->path_denied; 478 skop->path_denied = new_god->path_denied;
499 /* copy god's resistances */ 479 /* copy god's resistances */
500 memcpy(skop->resist, new_god->resist, sizeof(new_god->resist)); 480 memcpy (skop->resist, new_god->resist, sizeof (new_god->resist));
501 481
502 /* make sure that certain immunities do NOT get passed 482 /* make sure that certain immunities do NOT get passed
503 * to the follower! 483 * to the follower!
504 */ 484 */
505 for (i=0; i<NROFATTACKS; i++) 485 for (i = 0; i < NROFATTACKS; i++)
506 if (skop->resist[i] > 30 && (i==ATNR_FIRE || i==ATNR_COLD || 486 if (skop->resist[i] > 30 && (i == ATNR_FIRE || i == ATNR_COLD || i == ATNR_ELECTRICITY || i == ATNR_POISON))
507 i==ATNR_ELECTRICITY || i==ATNR_POISON))
508 skop->resist[i] = 30; 487 skop->resist[i] = 30;
509 488
510 skop->stats.hp= (sint16) new_god->last_heal; 489 skop->stats.hp = (sint16) new_god->last_heal;
511 skop->stats.sp= (sint16) new_god->last_sp; 490 skop->stats.sp = (sint16) new_god->last_sp;
512 skop->stats.grace= (sint16) new_god->last_grace; 491 skop->stats.grace = (sint16) new_god->last_grace;
513 skop->stats.food= (sint16) new_god->last_eat; 492 skop->stats.food = (sint16) new_god->last_eat;
514 skop->stats.luck= (sint8) new_god->stats.luck; 493 skop->stats.luck = (sint8) new_god->stats.luck;
515 /* gods may pass on certain flag properties */ 494 /* gods may pass on certain flag properties */
516 update_priest_flag(new_god,skop,FLAG_SEE_IN_DARK); 495 update_priest_flag (new_god, skop, FLAG_SEE_IN_DARK);
517 update_priest_flag(new_god,skop,FLAG_REFL_SPELL); 496 update_priest_flag (new_god, skop, FLAG_REFL_SPELL);
518 update_priest_flag(new_god,skop,FLAG_REFL_MISSILE); 497 update_priest_flag (new_god, skop, FLAG_REFL_MISSILE);
519 update_priest_flag(new_god,skop,FLAG_STEALTH); 498 update_priest_flag (new_god, skop, FLAG_STEALTH);
520 update_priest_flag(new_god,skop,FLAG_MAKE_INVIS); 499 update_priest_flag (new_god, skop, FLAG_MAKE_INVIS);
521 update_priest_flag(new_god,skop,FLAG_UNDEAD); 500 update_priest_flag (new_god, skop, FLAG_UNDEAD);
522 update_priest_flag(new_god,skop,FLAG_BLIND); 501 update_priest_flag (new_god, skop, FLAG_BLIND);
523 update_priest_flag(new_god,skop,FLAG_XRAYS); /* better have this if blind! */ 502 update_priest_flag (new_god, skop, FLAG_XRAYS); /* better have this if blind! */
524 503
525 new_draw_info_format(NDI_UNIQUE,0,op, 504 new_draw_info_format (NDI_UNIQUE, 0, op, "You are bathed in %s's aura.", &new_god->name);
526 "You are bathed in %s's aura.",new_god->name);
527 505
528 /* Weapon/armour use are special...handle flag toggles here as this can 506 /* Weapon/armour use are special...handle flag toggles here as this can
529 * only happen when gods are worshipped and if the new priest could 507 * only happen when gods are worshipped and if the new priest could
530 * have used armour/weapons in the first place. 508 * have used armour/weapons in the first place.
531 * 509 *
532 * 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
533 * 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.
534 */ 512 */
535 if (!present_in_ob_by_name(FORCE, "no weapon force", op)) 513 if (!present_in_ob_by_name (FORCE, "no weapon force", op))
536 update_priest_flag(new_god,skop,FLAG_USE_WEAPON); 514 update_priest_flag (new_god, skop, FLAG_USE_WEAPON);
515
537 update_priest_flag(new_god,skop,FLAG_USE_ARMOUR); 516 update_priest_flag (new_god, skop, FLAG_USE_ARMOUR);
538 517
539 if(worship_forbids_use(op,skop,FLAG_USE_WEAPON,"weapons")) 518 if (worship_forbids_use (op, skop, FLAG_USE_WEAPON, "weapons"))
540 stop_using_item(op,WEAPON,2); 519 stop_using_item (op, WEAPON, 2);
541 520
542 if(worship_forbids_use(op,skop,FLAG_USE_ARMOUR,"armour")) { 521 if (worship_forbids_use (op, skop, FLAG_USE_ARMOUR, "armour"))
522 {
543 stop_using_item(op,ARMOUR,1); 523 stop_using_item (op, ARMOUR, 1);
544 stop_using_item(op,HELMET,1); 524 stop_using_item (op, HELMET, 1);
545 stop_using_item(op,BOOTS,1); 525 stop_using_item (op, BOOTS, 1);
546 stop_using_item(op,GLOVES,1); 526 stop_using_item (op, GLOVES, 1);
547 stop_using_item(op,SHIELD,1); 527 stop_using_item (op, SHIELD, 1);
548 } 528 }
549 529
550 SET_FLAG(skop,FLAG_APPLIED); 530 SET_FLAG (skop, FLAG_APPLIED);
551 (void) change_abil(op,skop); 531 (void) change_abil (op, skop);
552 532
553 /* return to previous skill status */ 533 /* return to previous skill status */
534 if (!sk_applied)
554 if (!sk_applied) CLEAR_FLAG(skop,FLAG_APPLIED); 535 CLEAR_FLAG (skop, FLAG_APPLIED);
555 536
556 check_special_prayers (op, new_god); 537 check_special_prayers (op, new_god);
557} 538}
558 539
559/** 540/**
560 * Forbids or let player use something item type. 541 * Forbids or let player use something item type.
561 * op is the player. 542 * op is the player.
562 * exp_obj is the widsom experience. 543 * exp_obj is the widsom experience.
563 * flag is the flag to check against. 544 * flag is the flag to check against.
564 * string is the string to print out. 545 * string is the string to print out.
565 */ 546 */
566 547
548int
567int worship_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)
568 550{
569 if(QUERY_FLAG(&op->arch->clone,flag)) 551 if (QUERY_FLAG (op->arch, flag))
570 if(QUERY_FLAG(op,flag)!=QUERY_FLAG(exp_obj,flag)) { 552 if (QUERY_FLAG (op, flag) != QUERY_FLAG (exp_obj, flag))
553 {
571 update_priest_flag(exp_obj,op,flag); 554 update_priest_flag (exp_obj, op, flag);
572 if(QUERY_FLAG(op,flag)) 555 if (QUERY_FLAG (op, flag))
573 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);
574 else { 557 else
558 {
575 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);
576 return 1; 560 return 1;
561 }
577 } 562 }
578 } 563
579 return 0; 564 return 0;
580} 565}
581 566
582/** 567/**
583 * Unapplies up to number worth of items of type 568 * Unapplies up to number worth of items of type
584 */ 569 */
570void
585void stop_using_item ( object *op, int type, int number ) { 571stop_using_item (object *op, int type, int number)
572{
586 object *tmp; 573 object *tmp;
587 574
588 for(tmp=op->inv;tmp&&number;tmp=tmp->below) 575 for (tmp = op->inv; tmp && number; tmp = tmp->below)
589 if(tmp->type==type&&QUERY_FLAG(tmp,FLAG_APPLIED)) { 576 if (tmp->type == type && QUERY_FLAG (tmp, FLAG_APPLIED))
577 {
590 apply_special (op, tmp, AP_UNAPPLY | AP_IGNORE_CURSE); 578 apply_special (op, tmp, AP_UNAPPLY | AP_IGNORE_CURSE);
591 number--; 579 number--;
592 } 580 }
593} 581}
594 582
595/** 583/**
596 * If the god does/doesnt have this flag, we 584 * If the god does/doesnt have this flag, we
597 * give/remove it from the experience object if it doesnt/does 585 * give/remove it from the experience object if it doesnt/does
598 * already exist. For players only! 586 * already exist. For players only!
599 */ 587 */
600 588
589void
601void update_priest_flag (object *god, object *exp_ob, uint32 flag) { 590update_priest_flag (object *god, object *exp_ob, uint32 flag)
591{
602 if(QUERY_FLAG(god,flag)&&!QUERY_FLAG(exp_ob,flag)) 592 if (QUERY_FLAG (god, flag) && !QUERY_FLAG (exp_ob, flag))
603 SET_FLAG(exp_ob,flag); 593 SET_FLAG (exp_ob, flag);
604 else if(QUERY_FLAG(exp_ob,flag)&&!QUERY_FLAG(god,flag)) 594 else if (QUERY_FLAG (exp_ob, flag) && !QUERY_FLAG (god, flag))
605 { 595 {
606 /* When this is called with the exp_ob set to the player, 596 /* When this is called with the exp_ob set to the player,
607 * this check is broken, because most all players arch 597 * this check is broken, because most all players arch
608 * allow use of weapons. I'm not actually sure why this 598 * allow use of weapons. I'm not actually sure why this
609 * check is here - I guess if you had a case where the 599 * check is here - I guess if you had a case where the
610 * value in the archetype (wisdom) should over ride the restrictions 600 * value in the archetype (wisdom) should over ride the restrictions
611 * the god places on it, this may make sense. But I don't think 601 * the god places on it, this may make sense. But I don't think
612 * there is any case like that. 602 * there is any case like that.
613 */ 603 */
614 604
615/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/ 605/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/
616 CLEAR_FLAG(exp_ob,flag); 606 CLEAR_FLAG (exp_ob, flag);
617 }; 607 };
618} 608}
619 609
620 610archetype *
621
622archetype *determine_holy_arch (object *god, const char *type) 611determine_holy_arch (object *god, const char *type)
623{ 612{
624 treasure *tr; 613 treasure *tr;
625 614
626 if ( ! god || ! god->randomitems) { 615 if (!god || !god->randomitems)
616 {
627 LOG (llevError, "BUG: determine_holy_arch(): no god or god without " 617 LOG (llevError, "BUG: determine_holy_arch(): no god or god without " "randomitems\n");
628 "randomitems\n");
629 return NULL; 618 return 0;
630 } 619 }
631 620
632 for (tr = god->randomitems->items; tr != NULL; tr = tr->next) { 621 for (tr = god->randomitems->items; tr; tr = tr->next)
633 object *item; 622 {
634
635 if ( ! tr->item) 623 if (!tr->item)
636 continue; 624 continue;
637 item = &tr->item->clone;
638 625
639 if (item->type == BOOK && item->invisible 626 object *item = tr->item;
640 && strcmp (item->name, type) == 0) 627
628 if (item->type == BOOK && item->invisible && strcmp (item->name, type) == 0)
641 return item->other_arch; 629 return item->other_arch;
642 } 630 }
643 return NULL; 631
632 return 0;
644} 633}
645 634
646/** 635/**
647 * God helps player by removing curse and/or damnation. 636 * God helps player by removing curse and/or damnation.
648 */ 637 */
638static int
649static int god_removes_curse (object *op, int remove_damnation) 639god_removes_curse (object *op, int remove_damnation)
650{ 640{
651 object *tmp;
652 int success = 0; 641 int success = 0;
653 642
654 for (tmp = op->inv; tmp; tmp = tmp->below) { 643 for (object *tmp = op->inv; tmp; tmp = tmp->below)
644 {
655 if (tmp->invisible) 645 if (tmp->invisible)
656 continue; 646 continue;
647
657 if (QUERY_FLAG (tmp, FLAG_DAMNED) && ! remove_damnation) 648 if (QUERY_FLAG (tmp, FLAG_DAMNED) && !remove_damnation)
658 continue; 649 continue;
650
659 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) { 651 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
652 {
660 success = 1; 653 success = 1;
661 CLEAR_FLAG (tmp, FLAG_DAMNED); 654 CLEAR_FLAG (tmp, FLAG_DAMNED);
662 CLEAR_FLAG (tmp, FLAG_CURSED); 655 CLEAR_FLAG (tmp, FLAG_CURSED);
663 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED); 656 CLEAR_FLAG (tmp, FLAG_KNOWN_CURSED);
664 if (op->type == PLAYER)
665 esrv_send_item (op, tmp);
666 }
667 }
668 657
658 if (object *pl = tmp->visible_to ())
659 esrv_update_item (UPD_FLAGS, pl, tmp);
660 }
661 }
662
669 if (success) 663 if (success)
670 new_draw_info (NDI_UNIQUE, 0, op, 664 new_draw_info (NDI_UNIQUE, 0, op, "You feel like someone is helping you.");
671 "You feel like someone is helping you."); 665
672 return success; 666 return success;
673} 667}
674 668
669static int
675static int follower_level_to_enchantments (int level, int difficulty) 670follower_level_to_enchantments (int level, int difficulty)
676{ 671{
677 if (difficulty < 1) { 672 if (difficulty < 1)
678 LOG (llevError, "follower_level_to_enchantments(): " 673 {
679 "difficulty %d is invalid\n", difficulty); 674 LOG (llevError, "follower_level_to_enchantments(): " "difficulty %d is invalid\n", difficulty);
680 return 0; 675 return 0;
681 } 676 }
682 677
683 if (level <= 20) 678 if (level <= 20)
684 return level / difficulty; 679 return level / difficulty;
680
685 if (level <= 40) 681 if (level <= 40)
686 return (20 + (level - 20) / 2) / difficulty; 682 return (20 + (level - 20) / 2) / difficulty;
683
687 return (30 + (level - 40) / 4) / difficulty; 684 return (30 + (level - 40) / 4) / difficulty;
688} 685}
689 686
690/** 687/**
691 * God wants to enchant weapon. 688 * God wants to enchant weapon.
692 * Affected weapon is the applied one (weapon or bow). It's checked to make sure 689 * Affected weapon is the applied one (weapon or bow). It's checked to make sure
693 * it isn't a weapon for another god. If all is all right, update weapon with 690 * it isn't a weapon for another god. If all is all right, update weapon with
694 * attacktype, slaying and such. 691 * attacktype, slaying and such.
695 */ 692 */
693static int
696static int god_enchants_weapon (object *op, object *god, object *tr, object *skill) 694god_enchants_weapon (object *op, object *god, object *tr, object *skill)
697{ 695{
698 char buf[MAX_BUF];
699 object *weapon; 696 object *weapon;
700 uint32 attacktype; 697 uint32 attacktype;
701 int tmp; 698 int tmp;
702 699
703 for (weapon = op->inv; weapon; weapon = weapon->below) 700 for (weapon = op->inv; weapon; weapon = weapon->below)
704 if ((weapon->type == WEAPON || weapon->type == BOW) 701 if ((weapon->type == WEAPON || weapon->type == BOW) && QUERY_FLAG (weapon, FLAG_APPLIED))
705 && QUERY_FLAG (weapon, FLAG_APPLIED))
706 break; 702 break;
703
707 if (weapon == NULL || god_examines_item (god, weapon) <= 0) 704 if (!weapon || god_examines_item (god, weapon) <= 0)
708 return 0;
709
710 /* First give it a title, so other gods won't touch it */
711 if ( ! weapon->title) {
712 sprintf (buf, "of %s", god->name);
713 weapon->title = add_string (buf);
714 if (op->type == PLAYER)
715 esrv_update_item (UPD_NAME, op, weapon);
716 new_draw_info (NDI_UNIQUE, 0, op, "Your weapon quivers as if struck!");
717 }
718
719 /* Allow the weapon to slay enemies */
720 if ( ! weapon->slaying && god->slaying) {
721 weapon->slaying = add_string (god->slaying);
722 new_draw_info_format (NDI_UNIQUE, 0, op,
723 "Your %s now hungers to slay enemies of your god!",
724 weapon->name);
725 return 1;
726 }
727
728 /* Add the gods attacktype */
729 attacktype = (weapon->attacktype == 0) ? AT_PHYSICAL : weapon->attacktype;
730 if ((attacktype & god->attacktype) != god->attacktype) {
731 new_draw_info (NDI_UNIQUE, 0, op, "Your weapon suddenly glows!");
732 weapon->attacktype = attacktype | god->attacktype;
733 return 1;
734 }
735
736 /* Higher magic value */
737 tmp = follower_level_to_enchantments (skill->level, tr->level);
738 if (weapon->magic < tmp) {
739 new_draw_info (NDI_UNIQUE, 0, op,
740 "A phosphorescent glow envelops your weapon!");
741 weapon->magic++;
742 if (op->type == PLAYER)
743 esrv_update_item (UPD_NAME, op, weapon);
744 return 1;
745 }
746
747 return 0; 705 return 0;
748}
749 706
707 /* First give it a title, so other gods won't touch it */
708 if (!weapon->title)
709 {
710 weapon->title = format ("of %s", &god->name);
711
712 if (object *pl = weapon->visible_to ())
713 esrv_update_item (UPD_NAME, pl, weapon);
714
715 new_draw_info (NDI_UNIQUE, 0, op, "Your weapon quivers as if struck!");
716 }
717
718 /* Allow the weapon to slay enemies */
719 if (!weapon->slaying && god->slaying)
720 {
721 weapon->slaying = god->slaying;
722 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s now hungers to slay enemies of your god!", &weapon->name);
723 return 1;
724 }
725
726 /* Add the gods attacktype */
727 attacktype = (weapon->attacktype == 0) ? AT_PHYSICAL : weapon->attacktype;
728 if ((attacktype & god->attacktype) != god->attacktype)
729 {
730 new_draw_info (NDI_UNIQUE, 0, op, "Your weapon suddenly glows!");
731 weapon->attacktype = attacktype | god->attacktype;
732 return 1;
733 }
734
735 /* Higher magic value */
736 tmp = follower_level_to_enchantments (skill->level, tr->level);
737 if (weapon->magic < tmp)
738 {
739 new_draw_info (NDI_UNIQUE, 0, op, "A phosphorescent glow envelops your weapon!");
740 weapon->magic++;
741
742 if (object *pl = weapon->visible_to ())
743 esrv_update_item (UPD_NAME, pl, weapon);
744
745 return 1;
746 }
747
748 return 0;
749}
750 750
751/** 751/**
752 * 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.
753 * 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
754 * priest. -b.t. 754 * priest. -b.t.
755 * called from pray_at_altar() currently. 755 * called from pray_at_altar() currently.
756 */ 756 */
757 757void
758void god_intervention (object *op, object *god, object *skill) 758god_intervention (object *op, object *god, object *skill)
759{ 759{
760 treasure *tr; 760 treasure *tr;
761 761
762 if ( ! god || ! god->randomitems) { 762 if (!god || !god->randomitems)
763 LOG (llevError, 763 {
764 "BUG: god_intervention(): no god or god without randomitems\n"); 764 LOG (llevError, "BUG: god_intervention(): no god or god without randomitems\n");
765 return; 765 return;
766 } 766 }
767 767
768 check_special_prayers (op, god); 768 check_special_prayers (op, god);
769 769
770 /* 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 */
771 if (god_examines_priest (op, god) < 0) 771 if (god_examines_priest (op, god) < 0)
772 return; 772 return;
773 773
774 op->play_sound (sound_find ("god_intervention"));
774 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!");
775 776
776 for (tr = god->randomitems->items; tr != NULL; tr = tr->next) { 777 for (tr = god->randomitems->items; tr; tr = tr->next)
778 {
777 object *item; 779 object *item;
778 780
779 if (tr->chance <= random_roll(0, 99, op, PREFER_HIGH)) 781 if (tr->chance <= random_roll (0, 99, op, PREFER_HIGH))
780 continue; 782 continue;
781 783
782 /* Treasurelist - generate some treasure for the follower */ 784 /* Treasurelist - generate some treasure for the follower */
783 if (tr->name) { 785 if (tr->name)
786 {
784 treasurelist *tl = find_treasurelist (tr->name); 787 treasurelist *tl = treasurelist::find (tr->name);
788
785 if (tl == NULL) 789 if (tl == NULL)
786 continue; 790 continue;
787 791
788 new_draw_info (NDI_UNIQUE, 0, op, "Something appears before your " 792 new_draw_info (NDI_UNIQUE, 0, op, "Something appears before your eyes. You catch it before it falls to the ground.");
789 "eyes. You catch it before it falls to the ground.");
790 793
791 create_treasure (tl, op, GT_STARTEQUIP | GT_ONLY_GOOD 794 create_treasure (tl, op, GT_STARTEQUIP | GT_ONLY_GOOD, skill->level, 0);
792 | GT_UPDATE_INV, skill->level, 0); 795 return;
796 }
797
798 if (!tr->item)
799 continue;
800
801 item = tr->item;
802
803 /* Grace limit */
804 if (item->type == BOOK && item->invisible && strcmp (item->name, "grace limit") == 0)
805 {
806 if (op->stats.grace < item->stats.grace || op->stats.grace < op->stats.maxgrace)
807 {
808 object *tmp;
809
810 /* Follower lacks the required grace for the following
811 * treasure list items. */
812
813 tmp = get_archetype (HOLY_POSSESSION);
814 cast_change_ability (op, op, tmp, 0, 1);
815 tmp->destroy ();
816 return;
817 }
818
819 continue;
820 }
821
822 /* Restore grace */
823 if (item->type == BOOK && item->invisible && strcmp (item->name, "restore grace") == 0)
824 {
825 if (op->stats.grace >= 0)
826 continue;
827 op->stats.grace = random_roll (0, 9, op, PREFER_HIGH);
828 new_draw_info (NDI_UNIQUE, 0, op, "You are returned to a state of grace.");
829 return;
830 }
831
832 /* Heal damage */
833 if (item->type == BOOK && item->invisible && strcmp (item->name, "restore hitpoints") == 0)
834 {
835 if (op->stats.hp >= op->stats.maxhp)
836 continue;
837 new_draw_info (NDI_UNIQUE, 0, op, "A white light surrounds and heals you!");
838 op->stats.hp = op->stats.maxhp;
839 return;
840 }
841
842 /* Restore spellpoints */
843 if (item->type == BOOK && item->invisible && strcmp (item->name, "restore spellpoints") == 0)
844 {
845 int max = (int) (op->stats.maxsp * (item->stats.maxsp / 100.0));
846
847 /* Restore to 50 .. 100%, if sp < 50% */
848 int new_sp = (int) (random_roll (1000, 1999, op, PREFER_HIGH) / 2000.0 * max);
849
850 if (op->stats.sp >= max / 2)
851 continue;
852
853 new_draw_info (NDI_UNIQUE, 0, op, "A blue lightning strikes your head but doesn't hurt you!");
854 op->stats.sp = new_sp;
855 }
856
857 /* Various heal spells */
858 if (item->type == BOOK && item->invisible && strcmp (item->name, "heal spell") == 0)
859 {
860 object *tmp = archetype::get (item->slaying);
861 int success = cast_heal (op, op, tmp, 0);
862 tmp->destroy ();
863
864 if (success)
793 return; 865 return;
866 else
867 continue;
868 }
869
870 /* Remove curse */
871 if (item->type == BOOK && item->invisible && strcmp (item->name, "remove curse") == 0)
794 } 872 {
873 if (god_removes_curse (op, 0))
874 return;
875 else
876 continue;
877 }
795 878
796 if ( ! tr->item) { 879 /* Remove damnation */
797 LOG (llevError, "BUG: empty entry in %s's treasure list\n", 880 if (item->type == BOOK && item->invisible && strcmp (item->name, "remove damnation") == 0)
798 god->name); 881 {
882 if (god_removes_curse (op, 1))
883 return;
884 else
885 continue;
886 }
887
888 /* Heal depletion */
889 if (item->type == BOOK && item->invisible && strcmp (item->name, "heal depletion") == 0)
890 {
891 object *depl;
892 archetype *at;
893 int i;
894
895 if ((at = archetype::find (ARCH_DEPLETION)) == NULL)
896 {
897 LOG (llevError, "Could not find archetype depletion.\n");
799 continue; 898 continue;
800 }
801 item = &tr->item->clone;
802
803 /* Grace limit */
804 if (item->type == BOOK && item->invisible
805 && strcmp (item->name, "grace limit") == 0) {
806 if (op->stats.grace < item->stats.grace
807 || op->stats.grace < op->stats.maxgrace) {
808 object *tmp;
809
810 /* Follower lacks the required grace for the following
811 * treasure list items. */
812
813 tmp = get_archetype(HOLY_POSSESSION);
814 cast_change_ability(op, op, tmp, 0, 1);
815 free_object(tmp);
816 return;
817 } 899 }
818 continue; 900 depl = present_arch_in_ob (at, op);
819 }
820 901
821 /* Restore grace */ 902 if (depl == NULL)
822 if (item->type == BOOK && item->invisible
823 && strcmp (item->name, "restore grace") == 0)
824 {
825 if (op->stats.grace >= 0)
826 continue; 903 continue;
827 op->stats.grace = random_roll(0, 9, op, PREFER_HIGH); 904
905 new_draw_info (NDI_UNIQUE, 0, op, "Shimmering light surrounds and restores you!");
906
907 for (i = 0; i < NUM_STATS; i++)
908 if (depl->stats.stat (i))
909 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
910
911 depl->destroy ();
912 op->update_stats ();
913 return;
914 }
915
916 /* Voices */
917 if (item->type == BOOK && item->invisible && strcmp (item->name, "voice_behind") == 0)
918 {
919 new_draw_info (NDI_UNIQUE, 0, op, "You hear a voice from behind you, but you don't dare to turn around:");
920 new_draw_info (NDI_WHITE, 0, op, item->msg);
921 return;
922 }
923
924 /* Messages */
925 if (item->type == BOOK && item->invisible && strcmp (item->name, "message") == 0)
926 {
828 new_draw_info (NDI_UNIQUE, 0, op, 927 new_draw_info (NDI_UNIQUE, 0, op, item->msg);
829 "You are returned to a state of grace."); 928 return;
929 }
930
931 /* Enchant weapon */
932 if (item->type == BOOK && item->invisible && strcmp (item->name, "enchant weapon") == 0)
933 {
934 if (god_enchants_weapon (op, god, item, skill))
830 return; 935 return;
831 } 936 else
832
833 /* Heal damage */
834 if (item->type == BOOK && item->invisible
835 && strcmp (item->name, "restore hitpoints") == 0)
836 {
837 if (op->stats.hp >= op->stats.maxhp)
838 continue; 937 continue;
839 new_draw_info (NDI_UNIQUE, 0, op, 938 }
840 "A white light surrounds and heals you!"); 939
841 op->stats.hp = op->stats.maxhp; 940 /* Spellbooks - works correctly only for prayers */
941 if (item->type == SPELL)
942 {
943 if (check_spell_known (op, item->name))
944 continue;
945 if (item->level > skill->level)
946 continue;
947
948 new_draw_info_format (NDI_UNIQUE, 0, op, "%s grants you use of a special prayer!", &god->name);
949 do_learn_spell (op, item, 1);
950 return;
951
952 }
953
954 /* Other gifts */
955 if (!item->invisible)
956 {
957 if (god_gives_present (op, god, tr))
842 return; 958 return;
843 }
844
845 /* Restore spellpoints */
846 if (item->type == BOOK && item->invisible
847 && strcmp (item->name, "restore spellpoints") == 0)
848 {
849 int max = (int) (op->stats.maxsp * (item->stats.maxsp / 100.0));
850 /* Restore to 50 .. 100%, if sp < 50% */
851 int new_sp = (int) (random_roll(1000, 1999, op, PREFER_HIGH) / 2000.0 * max);
852 if (op->stats.sp >= max / 2)
853 continue;
854 new_draw_info (NDI_UNIQUE, 0, op, "A blue lightning strikes "
855 "your head but doesn't hurt you!");
856 op->stats.sp = new_sp;
857 }
858
859 /* Various heal spells */
860 if (item->type == BOOK && item->invisible
861 && strcmp (item->name, "heal spell") == 0)
862 {
863 object *tmp;
864 int success;
865
866 tmp = get_archetype_by_object_name(item->slaying);
867
868 success = cast_heal (op, op, tmp, 0);
869 free_object(tmp);
870 if (success) return;
871 else continue;
872 }
873
874 /* Remove curse */
875 if (item->type == BOOK && item->invisible
876 && strcmp (item->name, "remove curse") == 0)
877 {
878 if (god_removes_curse (op, 0))
879 return;
880 else 959 else
881 continue; 960 continue;
882 }
883
884 /* Remove damnation */
885 if (item->type == BOOK && item->invisible
886 && strcmp (item->name, "remove damnation") == 0)
887 { 961 }
888 if (god_removes_curse (op, 1))
889 return;
890 else
891 continue;
892 }
893
894 /* Heal depletion */
895 if (item->type == BOOK && item->invisible
896 && strcmp (item->name, "heal depletion") == 0)
897 {
898 object *depl;
899 archetype *at;
900 int i;
901
902 if ((at = find_archetype(ARCH_DEPLETION)) == NULL) {
903 LOG (llevError, "Could not find archetype depletion.\n");
904 continue;
905 }
906 depl = present_arch_in_ob (at, op);
907 if (depl == NULL)
908 continue;
909 new_draw_info (NDI_UNIQUE, 0, op,
910 "Shimmering light surrounds and restores you!");
911 for (i = 0; i < NUM_STATS; i++)
912 if (get_attr_value (&depl->stats, i))
913 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
914 remove_ob (depl);
915 free_object (depl);
916 fix_player (op);
917 return;
918 }
919
920 /* Voices */
921 if (item->type == BOOK && item->invisible
922 && strcmp (item->name, "voice_behind") == 0)
923 {
924 new_draw_info (NDI_UNIQUE, 0, op,
925 "You hear a voice from behind you, but you don't dare to "
926 "turn around:");
927 new_draw_info (NDI_WHITE, 0, op, item->msg);
928 return;
929 }
930
931 /* Messages */
932 if (item->type == BOOK && item->invisible
933 && strcmp (item->name, "message") == 0)
934 {
935 new_draw_info (NDI_UNIQUE, 0, op, item->msg);
936 return;
937 }
938
939 /* Enchant weapon */
940 if (item->type == BOOK && item->invisible
941 && strcmp (item->name, "enchant weapon") == 0)
942 {
943 if (god_enchants_weapon (op, god, item, skill))
944 return;
945 else
946 continue;
947 }
948
949 /* Spellbooks - works correctly only for prayers */
950 if (item->type == SPELL)
951 {
952 if (check_spell_known (op, item->name))
953 continue;
954 if (item->level > skill->level)
955 continue;
956
957 new_draw_info_format(NDI_UNIQUE, 0, op,
958 "%s grants you use of a special prayer!", god->name);
959 do_learn_spell (op, item, 1);
960 return;
961
962 }
963
964 /* Other gifts */
965 if ( ! item->invisible) {
966 if (god_gives_present (op, god, tr))
967 return;
968 else
969 continue;
970 }
971 /* else ignore it */ 962 /* else ignore it */
972 } 963 }
973 964
974 new_draw_info (NDI_UNIQUE, 0, op, "You feel rapture."); 965 new_draw_info (NDI_UNIQUE, 0, op, "You feel rapture.");
975} 966}
976 967
977/** 968/**
978 * Checks and maybe punishes someone praying. 969 * Checks and maybe punishes someone praying.
979 * All applied items are examined, if player is using more items of other gods, 970 * All applied items are examined, if player is using more items of other gods,
980 * s/he loses experience in praying or general experience if no praying. 971 * s/he loses experience in praying or general experience if no praying.
981 */ 972 */
973int
982int god_examines_priest (object *op, object *god) { 974god_examines_priest (object *op, object *god)
975{
983 int reaction=1; 976 int reaction = 1;
984 object *item=NULL, *skop; 977 object *item = NULL, *skop;
985 978
986 for(item=op->inv;item;item=item->below) { 979 for (item = op->inv; item; item = item->below)
987 if(QUERY_FLAG(item,FLAG_APPLIED)) { 980 if (QUERY_FLAG (item, FLAG_APPLIED))
988 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);
989 }
990 }
991 982
992 /* 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 */
993 if(reaction<0) { 984 if (reaction < 0)
985 {
994 int loss = 10000000; 986 int loss = 10000000;
995 int angry = abs(reaction); 987 int angry = abs (reaction);
996 988
997 for (skop = op->inv; skop != NULL; skop=skop->below) 989 for (skop = op->inv; skop; skop = skop->below)
998 if (skop->type == SKILL && skop->subtype == SK_PRAYING) break; 990 if (skop->type == SKILL && skop->subtype == SK_PRAYING)
991 break;
999 992
1000 if (skop) 993 if (skop)
1001 loss = (int) (0.05 * (float) skop->stats.exp); 994 loss = 0.05f * skop->stats.exp;
1002 change_exp(op, -random_roll(0, loss*angry-1, op, PREFER_LOW), 995
1003 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
1004 if(random_roll(0, angry, op, PREFER_LOW)) { 998 if (random_roll (0, angry, op, PREFER_LOW))
999 {
1005 object *tmp = get_archetype(LOOSE_MANA); 1000 object *tmp = get_archetype (LOOSE_MANA);
1001
1006 cast_magic_storm(op,tmp,op->level+(angry*3)); 1002 cast_magic_storm (op, tmp, op->level + (angry * 3));
1007 } 1003 }
1008 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,op, 1004
1009 "%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);
1010 } 1006 }
1007
1011 return reaction; 1008 return reaction;
1012} 1009}
1013 1010
1014/** 1011/**
1015 * God checks item the player is using. 1012 * God checks item the player is using.
1016 * Return either -1 (bad), 0 (neutral) or 1013 * Return either -1 (bad), 0 (neutral) or
1017 * 1 (item is ok). If you are using the item of an enemy 1014 * 1 (item is ok). If you are using the item of an enemy
1018 * god, it can be bad...-b.t. 1015 * god, it can be bad...-b.t.
1019 */ 1016 */
1020 1017
1018int
1021int god_examines_item(object *god, object *item) { 1019god_examines_item (object *god, object *item)
1020{
1022 char buf[MAX_BUF]; 1021 char buf[MAX_BUF];
1023 1022
1024 if(!god||!item) return 0; 1023 if (!god || !item)
1024 return 0;
1025 1025
1026 if(!item->title) return 1; /* unclaimed item are ok */ 1026 if (!item->title)
1027 return 1; /* unclaimed item are ok */
1027 1028
1028 sprintf(buf,"of %s",god->name); 1029 sprintf (buf, "of %s", &god->name);
1029 if(!strcmp(item->title,buf)) return 1; /* belongs to that God */ 1030 if (!strcmp (item->title, buf))
1031 return 1; /* belongs to that God */
1030 1032
1031 if(god->title) { /* check if we have any enemy blessed item*/ 1033 if (god->title)
1034 { /* check if we have any enemy blessed item */
1032 sprintf(buf,"of %s",god->title); 1035 sprintf (buf, "of %s", &god->title);
1033 if(!strcmp(item->title,buf)) { 1036 if (!strcmp (item->title, buf))
1037 {
1034 if(item->env) { 1038 if (item->env)
1039 {
1035 char buf[MAX_BUF]; 1040 char buf[MAX_BUF];
1041
1036 sprintf(buf,"Heretic! You are using %s!",query_name(item)); 1042 sprintf (buf, "Heretic! You are using %s!", query_name (item));
1037 new_draw_info(NDI_UNIQUE|NDI_NAVY,0,item->env,buf); 1043 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, item->env, buf);
1038 } 1044 }
1039 return -1; 1045 return -1;
1040 } 1046 }
1041 } 1047 }
1042 1048
1043 return 0; /* item is sacred to a non-enemy god/or is otherwise magical */ 1049 return 0; /* item is sacred to a non-enemy god/or is otherwise magical */
1044} 1050}
1045 1051
1046/** 1052/**
1047 * Returns priest's god's id. 1053 * Returns priest's god's id.
1048 * Straight calls lookup_god_by_name 1054 * Straight calls lookup_god_by_name
1049 */ 1055 */
1050 1056
1057int
1051int get_god(object *priest) { 1058get_god (object *priest)
1059{
1052 int godnr=lookup_god_by_name(determine_god(priest)); 1060 return lookup_god_by_name (determine_god (priest));
1053
1054 return godnr;
1055} 1061}
1056 1062
1057/** 1063/**
1058 * 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
1059 * creature of who has race *race 1065 * creature of who has race *race
1060 * 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
1061 */ 1067 */
1068shstr_tmp
1062const char *get_god_for_race(const char *race) { 1069get_god_for_race (const char *race)
1063 godlink *gl=first_god; 1070{
1064 const char *godname=NULL; 1071 if (race)
1065 1072 for (godlink *gl = first_god; gl; gl = gl->next)
1066 if (race == NULL) return NULL;
1067 while(gl) {
1068 if (!strcasecmp(gl->arch->clone.race, race)) { 1073 if (!strcasecmp (gl->arch->race, race))
1069 godname=gl->name;
1070 break;
1071 }
1072 gl=gl->next;
1073 }
1074 return godname; 1074 return gl->name;
1075
1076 return shstr_tmp ();
1075} 1077}
1078
1076/** 1079/**
1077 * 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.
1078 * 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
1079 * the spell attacktype contains AT_HOLYWORD. -b.t. 1082 * the spell attacktype contains AT_HOLYWORD. -b.t.
1080 */ 1083 */
1081 1084int
1082int tailor_god_spell(object *spellop, object *caster) { 1085tailor_god_spell (object *spellop, object *caster)
1086{
1083 object *god=find_god(determine_god(caster)); 1087 object *god = find_god (determine_god (caster));
1084 int caster_is_spell=0; 1088 int caster_is_spell = 0;
1085 1089
1086 if (caster->type==SPELL_EFFECT || caster->type == SPELL) caster_is_spell=1; 1090 if (caster->type == SPELL_EFFECT || caster->type == SPELL)
1091 caster_is_spell = 1;
1087 1092
1088 /* if caster is a rune or the like, it doesn't worship anything. However, 1093 /* if caster is a rune or the like, it doesn't worship anything. However,
1089 * if this object is owned by someone, then the god that they worship 1094 * if this object is owned by someone, then the god that they worship
1090 * is relevant, so use that. 1095 * is relevant, so use that.
1091 */ 1096 */
1092 if (!god && get_owner(caster)) god=find_god(determine_god(get_owner(caster))); 1097 if (!god && caster->owner)
1098 god = find_god (determine_god (caster->owner));
1093 1099
1094 if ( ! god || (spellop->attacktype & AT_HOLYWORD && !god->race)) { 1100 if (!god || (spellop->attacktype & AT_HOLYWORD && !god->race))
1101 {
1095 if ( ! caster_is_spell) 1102 if (!caster_is_spell)
1096 new_draw_info(NDI_UNIQUE, 0, caster,
1097 "This prayer is useless unless you worship an appropriate god"); 1103 new_draw_info (NDI_UNIQUE, 0, caster, "This prayer is useless unless you worship an appropriate god");
1098 else 1104 else
1099 LOG (llevError, "BUG: tailor_god_spell(): no god\n"); 1105 LOG (llevError, "BUG: tailor_god_spell(): no god\n");
1100 free_object(spellop); 1106
1107 spellop->destroy ();
1101 return 0; 1108 return 0;
1102 } 1109 }
1103 1110
1104 /* either holy word or godpower attacks will set the slaying field */ 1111 /* either holy word or godpower attacks will set the slaying field */
1105 if (spellop->attacktype & AT_HOLYWORD || spellop->attacktype & AT_GODPOWER) { 1112 if (spellop->attacktype & AT_HOLYWORD || spellop->attacktype & AT_GODPOWER)
1113 {
1106 if (spellop->slaying) { 1114 if (spellop->slaying)
1107 free_string(spellop->slaying);
1108 spellop->slaying = NULL; 1115 spellop->slaying = NULL;
1109 } 1116
1110 if(!caster_is_spell) 1117 if (!caster_is_spell)
1111 spellop->slaying = add_string(god->slaying); 1118 spellop->slaying = god->slaying;
1112 else if(caster->slaying) 1119 else if (caster->slaying)
1113 spellop->slaying = add_string(caster->slaying); 1120 spellop->slaying = caster->slaying;
1114 } 1121 }
1115 1122
1116 /* only the godpower attacktype adds the god's attack onto the spell */ 1123 /* only the godpower attacktype adds the god's attack onto the spell */
1117 if(spellop->attacktype & AT_GODPOWER) 1124 if (spellop->attacktype & AT_GODPOWER)
1118 spellop->attacktype=spellop->attacktype|god->attacktype; 1125 spellop->attacktype = spellop->attacktype | god->attacktype;
1119 1126
1120 /* tack on the god's name to the spell */ 1127 /* tack on the god's name to the spell */
1121 if(spellop->attacktype&AT_HOLYWORD||spellop->attacktype&AT_GODPOWER) { 1128 if (spellop->attacktype & AT_HOLYWORD || spellop->attacktype & AT_GODPOWER)
1129 {
1130 spellop->title = god->name;
1122 if(spellop->title) 1131 if (spellop->title)
1123 free_string(spellop->title); 1132 {
1124 spellop->title=add_string(god->name);
1125 if(spellop->title){
1126 char buf[MAX_BUF]; 1133 char buf[MAX_BUF];
1134
1127 sprintf(buf,"%s of %s",spellop->name,spellop->title); 1135 sprintf (buf, "%s of %s", &spellop->name, &spellop->title);
1128 FREE_AND_COPY(spellop->name, buf); 1136 spellop->name = spellop->name_pl = buf;
1129 FREE_AND_COPY(spellop->name_pl, buf); 1137 }
1130 }
1131 } 1138 }
1132 1139
1133 return 1; 1140 return 1;
1134} 1141}
1135

Diff Legend

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