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.1 by elmex, Sun Aug 13 17:16:04 2006 UTC vs.
Revision 1.4 by root, Sun Sep 3 00:18:42 2006 UTC

1/* 1/*
2 * static char *rcsid_gods_c = 2 * static char *rcsid_gods_c =
3 * "$Id: gods.C,v 1.1 2006/08/13 17:16:04 elmex Exp $"; 3 * "$Id: gods.C,v 1.4 2006/09/03 00:18:42 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
… …
48int lookup_god_by_name(const char *name) { 48int lookup_god_by_name(const char *name) {
49 int godnr=-1; 49 int godnr=-1;
50 size_t nmlen = strlen(name); 50 size_t nmlen = strlen(name);
51 51
52 if(name && strcmp(name,"none")) { 52 if(name && strcmp(name,"none")) {
53 godlink *gl; 53 godlink *gl;
54 for(gl=first_god;gl;gl=gl->next) 54 for(gl=first_god;gl;gl=gl->next)
55 if(!strncmp(name,gl->name,MIN(strlen(gl->name),nmlen))) 55 if(!strncmp(name,gl->name,MIN(strlen(gl->name),nmlen)))
56 break; 56 break;
57 if(gl) godnr=gl->id; 57 if(gl) godnr=gl->id;
58 } 58 }
59 return godnr; 59 return godnr;
60} 60}
61 61
62/** 62/**
… …
64 */ 64 */
65object *find_god(const char *name) { 65object *find_god(const char *name) {
66 object *god=NULL; 66 object *god=NULL;
67 67
68 if(name) { 68 if(name) {
69 godlink *gl; 69 godlink *gl;
70 70
71 for(gl=first_god;gl;gl=gl->next) 71 for(gl=first_god;gl;gl=gl->next)
72 if(!strcmp(name,gl->name)) break; 72 if(!strcmp(name,gl->name)) break;
73 if(gl) god=pntr_to_god_obj(gl); 73 if(gl) god=pntr_to_god_obj(gl);
74 } 74 }
75 return god; 75 return god;
76} 76}
77 77
78/** 78/**
… …
89 89
90 /* spells */ 90 /* spells */
91 if ((op->type == SPELL || op->type == SPELL_EFFECT) && 91 if ((op->type == SPELL || op->type == SPELL_EFFECT) &&
92 op->title) 92 op->title)
93 { 93 {
94 if (lookup_god_by_name(op->title)>=0) return op->title; 94 if (lookup_god_by_name(op->title)>=0) return op->title;
95 } 95 }
96 96
97 if(op->type!= PLAYER && QUERY_FLAG(op,FLAG_ALIVE)) { 97 if(op->type!= PLAYER && QUERY_FLAG(op,FLAG_ALIVE)) {
98 98
99 /* find a god based on race */ 99 /* find a god based on race */
100 if(!op->title) { 100 if(!op->title) {
101 if (op->race !=NULL) { 101 if (op->race !=NULL) {
102 godname=get_god_for_race(op->race); 102 godname=get_god_for_race(op->race);
103 if (godname!=NULL) { 103 if (godname!=NULL) {
104 op->title = add_string(godname); 104 op->title = godname;
105 } 105 }
106 } 106 }
107 } 107 }
108 108
109 /* find a random god */ 109 /* find a random god */
110 if(!op->title) { 110 if(!op->title) {
111 godlink *gl = first_god; 111 godlink *gl = first_god;
112 112
113 godnr = rndm(1, gl->id); 113 godnr = rndm(1, gl->id);
114 while(gl) { 114 while(gl) {
115 if(gl->id == godnr) break; 115 if(gl->id == godnr) break;
116 gl=gl->next; 116 gl=gl->next;
117 } 117 }
118 op->title = add_string(gl->name); 118 op->title = gl->name;
119 } 119 }
120 120
121 return op->title; 121 return op->title;
122 } 122 }
123 123
124 124
125 /* The god the player worships is in the praying skill (native skill 125 /* 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 126 * 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 127 * that skill, once we find it, we can return, either with the
128 * title or "none". 128 * title or "none".
129 */ 129 */
130 if(op->type==PLAYER) { 130 if(op->type==PLAYER) {
131 object *tmp; 131 object *tmp;
132 for (tmp=op->inv; tmp!=NULL; tmp=tmp->below) 132 for (tmp=op->inv; tmp!=NULL; tmp=tmp->below)
133 if (tmp->type == SKILL && tmp->subtype == SK_PRAYING) { 133 if (tmp->type == SKILL && tmp->subtype == SK_PRAYING) {
134 if (tmp->title) return (tmp->title); 134 if (tmp->title) return (tmp->title);
135 else return("none"); 135 else return("none");
136 } 136 }
137 } 137 }
138 return ("none"); 138 return ("none");
139} 139}
140 140
141/** 141/**
… …
166 object *tmp, *next; 166 object *tmp, *next;
167 167
168 if (op && op->type == PLAYER && op->contr) { 168 if (op && op->type == PLAYER && op->contr) {
169 /* search the inventory */ 169 /* search the inventory */
170 for (tmp = op->inv; tmp != NULL; tmp = next) { 170 for (tmp = op->inv; tmp != NULL; tmp = next) {
171 next = tmp->below; /* backup in case we remove tmp */ 171 next = tmp->below; /* backup in case we remove tmp */
172 172
173 if (tmp->type == item->type 173 if (tmp->type == item->type
174 && same_string (tmp->name, item->name) 174 && same_string (tmp->name, item->name)
175 && same_string (tmp->title, item->title) 175 && same_string (tmp->title, item->title)
176 && same_string (tmp->msg, item->msg) 176 && same_string (tmp->msg, item->msg)
177 && same_string (tmp->slaying, item->slaying)) { 177 && same_string (tmp->slaying, item->slaying)) {
178 178
179 /* message */ 179 /* message */
180 if (tmp->nrof > 1) 180 if (tmp->nrof > 1)
181 new_draw_info_format(NDI_UNIQUE,0,op, 181 new_draw_info_format(NDI_UNIQUE,0,op,
182 "The %s crumble to dust!", query_short_name(tmp)); 182 "The %s crumble to dust!", query_short_name(tmp));
183 else 183 else
184 new_draw_info_format(NDI_UNIQUE,0,op, 184 new_draw_info_format(NDI_UNIQUE,0,op,
185 "The %s crumbles to dust!", query_short_name(tmp)); 185 "The %s crumbles to dust!", query_short_name(tmp));
186 186
187 remove_ob(tmp); /* remove obj from players inv. */ 187 remove_ob(tmp); /* remove obj from players inv. */
188 esrv_del_item(op->contr, tmp->count); /* notify client */ 188 esrv_del_item(op->contr, tmp->count); /* notify client */
189 free_object(tmp); /* free object */ 189 free_object(tmp); /* free object */
190 } 190 }
191 if (tmp->inv) 191 if (tmp->inv)
192 follower_remove_similar_item(tmp, item); 192 follower_remove_similar_item(tmp, item);
193 } 193 }
194 } 194 }
195} 195}
196 196
197/** 197/**
198 * Checks for any occurrence of the given 'item' in the inventory of 'op' (recursively). 198 * Checks for any occurrence of the given 'item' in the inventory of 'op' (recursively).
… …
225 if (follower_has_similar_item (op, &tr->item->clone)) 225 if (follower_has_similar_item (op, &tr->item->clone))
226 return 0; 226 return 0;
227 227
228 tmp = arch_to_object (tr->item); 228 tmp = arch_to_object (tr->item);
229 new_draw_info_format (NDI_UNIQUE, 0, op, 229 new_draw_info_format (NDI_UNIQUE, 0, op,
230 "%s lets %s appear in your hands.", god->name, query_short_name (tmp)); 230 "%s lets %s appear in your hands.", &god->name, query_short_name (tmp));
231 tmp = insert_ob_in_ob (tmp, op); 231 tmp = insert_ob_in_ob (tmp, op);
232 if (op->type == PLAYER) 232 if (op->type == PLAYER)
233 esrv_send_item (op, tmp); 233 esrv_send_item (op, tmp);
234 return 1; 234 return 1;
235} 235}
… …
239 * Checks for god changing, divine intervention, and so on. 239 * Checks for god changing, divine intervention, and so on.
240 */ 240 */
241void pray_at_altar(object *pl, object *altar, object *skill) { 241void pray_at_altar(object *pl, object *altar, object *skill) {
242 object *pl_god=find_god(determine_god(pl)); 242 object *pl_god=find_god(determine_god(pl));
243 243
244 /* Lauwenmark: Handle for plugin altar-parying (apply) event */ 244 if (INVOKE_PLAYER (PRAY_ALTAR, pl->contr, ARG_OBJECT (altar), ARG_OBJECT (skill)))
245 if (execute_event(altar, EVENT_APPLY,pl,NULL,NULL,SCRIPT_FIX_ALL)!=0)
246 return; 245 return;
247 246
248 /* If non consecrate altar, don't do anything */ 247 /* If non consecrate altar, don't do anything */
249 if (!altar->other_arch) return; 248 if (!altar->other_arch) return;
250 249
251 /* hmm. what happend depends on pl's current god, level, etc */ 250 /* hmm. what happend depends on pl's current god, level, etc */
252 if(!pl_god) { /*new convert */ 251 if(!pl_god) { /*new convert */
253 become_follower(pl,&altar->other_arch->clone); 252 become_follower(pl,&altar->other_arch->clone);
254 return; 253 return;
255 254
256 } else if(!strcmp(pl_god->name,altar->other_arch->clone.name)) { 255 } else if(!strcmp(&pl_god->name,altar->other_arch->clone.name)) {
257 /* pray at your gods altar */ 256 /* pray at your gods altar */
258 int bonus = (pl->stats.Wis+skill->level)/10; 257 int bonus = (pl->stats.Wis+skill->level)/10;
259 258
260 /* we can get neg grace up faster */ 259 /* we can get neg grace up faster */
261 if(pl->stats.grace<0) pl->stats.grace+=(bonus>-1*(pl->stats.grace/10) ? 260 if(pl->stats.grace<0) pl->stats.grace+=(bonus>-1*(pl->stats.grace/10) ?
262 bonus : -1*(pl->stats.grace/10)); 261 bonus : -1*(pl->stats.grace/10));
263 /* we can super-charge grace to 2x max */ 262 /* we can super-charge grace to 2x max */
264 if(pl->stats.grace<(2*pl->stats.maxgrace)) { 263 if(pl->stats.grace<(2*pl->stats.maxgrace)) {
265 pl->stats.grace+=bonus/2; 264 pl->stats.grace+=bonus/2;
266 } 265 }
267 if(pl->stats.grace>(2*pl->stats.maxgrace)) { 266 if(pl->stats.grace>(2*pl->stats.maxgrace)) {
268 pl->stats.grace=(2*pl->stats.maxgrace); 267 pl->stats.grace=(2*pl->stats.maxgrace);
269 } 268 }
270 269
271 /* Every once in a while, the god decides to checkup on their 270 /* Every once in a while, the god decides to checkup on their
272 * follower, and may intervene to help them out. 271 * follower, and may intervene to help them out.
273 */ 272 */
274 bonus = MAX(1, bonus + MAX(pl->stats.luck, -3)); /* -- DAMN -- */ 273 bonus = MAX(1, bonus + MAX(pl->stats.luck, -3)); /* -- DAMN -- */
275 274
276 if(((random_roll(0, 399, pl, PREFER_LOW))-bonus)<0) 275 if(((random_roll(0, 399, pl, PREFER_LOW))-bonus)<0)
277 god_intervention(pl,pl_god, skill); 276 god_intervention(pl,pl_god, skill);
278 277
279 } else { /* praying to another god! */ 278 } else { /* praying to another god! */
280 uint64 loss = 0; 279 uint64 loss = 0;
281 int angry=1; 280 int angry=1;
282 281
283 /* I believe the logic for detecting opposing gods was completely 282 /* I believe the logic for detecting opposing gods was completely
284 * broken - I think it should work now. altar->other_arch 283 * broken - I think it should work now. altar->other_arch
285 * points to the god of this altar (which we have 284 * points to the god of this altar (which we have
286 * already verified is non null). pl_god->other_arch 285 * already verified is non null). pl_god->other_arch
287 * is the opposing god - we need to verify that exists before 286 * is the opposing god - we need to verify that exists before
288 * using its values. 287 * using its values.
289 */ 288 */
290 if(pl_god->other_arch && 289 if(pl_god->other_arch &&
291 (altar->other_arch->name==pl_god->other_arch->name)) { 290 (altar->other_arch->name==pl_god->other_arch->name)) {
292 angry=2; 291 angry=2;
293 if(random_roll(0, skill->level+2, pl, PREFER_LOW)-5 > 0) { 292 if(random_roll(0, skill->level+2, pl, PREFER_LOW)-5 > 0) {
294 object *tmp; 293 object *tmp;
295 294
296 /* you really screwed up */ 295 /* you really screwed up */
297 angry=3; 296 angry=3;
298 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,pl, 297 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,pl,
299 "Foul Priest! %s punishes you!",pl_god->name); 298 "Foul Priest! %s punishes you!",&pl_god->name);
300 tmp=get_archetype(LOOSE_MANA); 299 tmp=get_archetype(LOOSE_MANA);
301 cast_magic_storm(pl,tmp, pl_god->level+20); 300 cast_magic_storm(pl,tmp, pl_god->level+20);
302 } else 301 } else
303 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,pl, 302 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,pl,
304 "Foolish heretic! %s is livid!",pl_god->name); 303 "Foolish heretic! %s is livid!",&pl_god->name);
305 } else 304 } else
306 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,pl, 305 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,pl,
307 "Heretic! %s is angered!",pl_god->name); 306 "Heretic! %s is angered!",&pl_god->name);
308 307
309 /* whether we will be successfull in defecting or not - 308 /* whether we will be successfull in defecting or not -
310 * we lose experience from the clerical experience obj 309 * we lose experience from the clerical experience obj
311 */ 310 */
312 311
313 loss = angry * (skill->stats.exp / 10); 312 loss = angry * (skill->stats.exp / 10);
314 if(loss) 313 if(loss)
315 change_exp(pl, -random_roll64(0, loss, pl, PREFER_LOW), 314 change_exp(pl, -random_roll64(0, loss, pl, PREFER_LOW),
316 skill?skill->skill:"none", SK_SUBTRACT_SKILL_EXP); 315 skill ? &skill->skill : "none", SK_SUBTRACT_SKILL_EXP);
317 316
318 /* May switch Gods, but its random chance based on our current level 317 /* May switch Gods, but its random chance based on our current level
319 * note it gets harder to swap gods the higher we get 318 * note it gets harder to swap gods the higher we get
320 */ 319 */
321 if((angry==1) && !(random_roll(0, skill->level, pl, PREFER_LOW))) { 320 if((angry==1) && !(random_roll(0, skill->level, pl, PREFER_LOW))) {
322 become_follower(pl,&altar->other_arch->clone); 321 become_follower(pl,&altar->other_arch->clone);
323 } else { 322 } else {
324 /* toss this player off the altar. He can try again. */ 323 /* toss this player off the altar. He can try again. */
325 new_draw_info(NDI_UNIQUE|NDI_NAVY,0,pl, 324 new_draw_info(NDI_UNIQUE|NDI_NAVY,0,pl,
326 "A divine force pushes you off the altar."); 325 "A divine force pushes you off the altar.");
327 move_player(pl,absdir(pl->facing + 4)); /* back him off the way he came. */ 326 move_player(pl,absdir(pl->facing + 4)); /* back him off the way he came. */
328 } 327 }
329 } 328 }
330} 329}
331 330
332/** 331/**
333 * Removes special prayers given by a god. 332 * Removes special prayers given by a god.
… …
343 342
344 /* Outer loop iterates over all special prayer marks */ 343 /* Outer loop iterates over all special prayer marks */
345 for (tmp = op->inv; tmp; tmp = next_tmp) { 344 for (tmp = op->inv; tmp; tmp = next_tmp) {
346 next_tmp = tmp->below; 345 next_tmp = tmp->below;
347 346
348 /* we mark special prayers with the STARTEQUIP flag, so if it isn't 347 /* we mark special prayers with the STARTEQUIP flag, so if it isn't
349 * in that category, not something we need to worry about. 348 * in that category, not something we need to worry about.
350 */ 349 */
351 if (tmp->type != SPELL || !QUERY_FLAG(tmp, FLAG_STARTEQUIP)) 350 if (tmp->type != SPELL || !QUERY_FLAG(tmp, FLAG_STARTEQUIP))
352 continue; 351 continue;
353 352
354 if (god->randomitems == NULL) { 353 if (god->randomitems == NULL) {
355 LOG (llevError, "BUG: check_special_prayers(): god %s without randomitems\n", god->name); 354 LOG (llevError, "BUG: check_special_prayers(): god %s without randomitems\n", &god->name);
356 do_forget_spell (op, tmp->name); 355 do_forget_spell (op, tmp->name);
357 continue; 356 continue;
358 } 357 }
359 358
360 /* Inner loop tries to find the special prayer in the god's treasure 359 /* Inner loop tries to find the special prayer in the god's treasure
361 * list. We default that the spell should be removed. 360 * list. We default that the spell should be removed.
362 */ 361 */
363 remove=1; 362 remove=1;
364 for (tr = god->randomitems->items; tr; tr = tr->next) 363 for (tr = god->randomitems->items; tr; tr = tr->next)
365 { 364 {
366 object *item; 365 object *item;
367 366
368 if (tr->item == NULL) 367 if (tr->item == NULL)
369 continue; 368 continue;
370 item = &tr->item->clone; 369 item = &tr->item->clone;
371 370
372 /* Basically, see if the matching spell is granted by this god. */ 371 /* Basically, see if the matching spell is granted by this god. */
373 372
374 if (tr->item->clone.type == SPELL && tr->item->clone.name == tmp->name) { 373 if (tr->item->clone.type == SPELL && tr->item->clone.name == tmp->name) {
375 remove=0; 374 remove=0;
376 break; 375 break;
377 } 376 }
378 } 377 }
379 if (remove) { 378 if (remove) {
380 /* just do the work of removing the spell ourselves - we already 379 /* just do the work of removing the spell ourselves - we already
381 * know that the player knows the spell 380 * know that the player knows the spell
382 */ 381 */
383 new_draw_info_format (NDI_UNIQUE|NDI_NAVY, 0, op, 382 new_draw_info_format (NDI_UNIQUE|NDI_NAVY, 0, op,
384 "You lose knowledge of %s.", tmp->name); 383 "You lose knowledge of %s.", &tmp->name);
385 player_unready_range_ob(op->contr, tmp); 384 player_unready_range_ob(op->contr, tmp);
386 remove_ob(tmp); 385 remove_ob(tmp);
387 free_object(tmp); 386 free_object(tmp);
388 } 387 }
389 388
390 } 389 }
391} 390}
392 391
393/** 392/**
… …
406 405
407 old_god = find_god(determine_god(op)); 406 old_god = find_god(determine_god(op));
408 407
409 /* take away any special god-characteristic items. */ 408 /* take away any special god-characteristic items. */
410 for(item=op->inv;item!=NULL;item=next) { 409 for(item=op->inv;item!=NULL;item=next) {
411 next = item->below; 410 next = item->below;
412 /* remove all invisible startequip items which are 411 /* remove all invisible startequip items which are
413 * not skill, exp or force 412 * not skill, exp or force
414 */ 413 */
415 if(QUERY_FLAG(item,FLAG_STARTEQUIP) && item->invisible && 414 if(QUERY_FLAG(item,FLAG_STARTEQUIP) && item->invisible &&
416 (item->type != SKILL) && (item->type != EXPERIENCE) && 415 (item->type != SKILL) && (item->type != EXPERIENCE) &&
417 (item->type != FORCE)) { 416 (item->type != FORCE)) {
418 417
419 if (item->type == SPELL) 418 if (item->type == SPELL)
420 new_draw_info_format(NDI_UNIQUE|NDI_NAVY, 0, op, 419 new_draw_info_format(NDI_UNIQUE|NDI_NAVY, 0, op,
421 "You lose knowledge of %s.", item->name); 420 "You lose knowledge of %s.", &item->name);
422 player_unready_range_ob(op->contr, item); 421 player_unready_range_ob(op->contr, item);
423 remove_ob(item); 422 remove_ob(item);
424 free_object(item); 423 free_object(item);
425 } 424 }
426 } 425 }
427 426
428 /* remove any godgiven items from the old god */ 427 /* remove any godgiven items from the old god */
429 if (old_god) { 428 if (old_god) {
430 for(tr=old_god->randomitems->items; tr!=NULL; tr = tr->next) { 429 for(tr=old_god->randomitems->items; tr!=NULL; tr = tr->next) {
431 if (tr->item && QUERY_FLAG(&tr->item->clone, FLAG_STARTEQUIP)) 430 if (tr->item && QUERY_FLAG(&tr->item->clone, FLAG_STARTEQUIP))
432 follower_remove_similar_item(op, &tr->item->clone); 431 follower_remove_similar_item(op, &tr->item->clone);
433 } 432 }
434 } 433 }
435 434
436 if(!op||!new_god) return; 435 if(!op||!new_god) return;
437 436
438 if(op->race && new_god->slaying && strstr(op->race,new_god->slaying)) { 437 if(op->race && new_god->slaying && strstr(op->race,new_god->slaying)) {
439 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,op,"Fool! %s detests your kind!", 438 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,op,"Fool! %s detests your kind!",
440 new_god->name); 439 &new_god->name);
441 if(random_roll(0, op->level-1, op, PREFER_LOW)-5>0) { 440 if(random_roll(0, op->level-1, op, PREFER_LOW)-5>0) {
442 object *tmp = get_archetype(LOOSE_MANA); 441 object *tmp = get_archetype(LOOSE_MANA);
443 cast_magic_storm(op,tmp, new_god->level+10); 442 cast_magic_storm(op,tmp, new_god->level+10);
444 } 443 }
445 return; 444 return;
446 } 445 }
447 446
448 447
449 /* give the player any special god-characteristic-items. */ 448 /* give the player any special god-characteristic-items. */
450 for(tr=new_god->randomitems->items; tr!=NULL; tr = tr->next) { 449 for(tr=new_god->randomitems->items; tr!=NULL; tr = tr->next) {
… …
452 tr->item->clone.type != BOOK && tr->item->clone.type != SPELL) 451 tr->item->clone.type != BOOK && tr->item->clone.type != SPELL)
453 god_gives_present(op,new_god,tr); } 452 god_gives_present(op,new_god,tr); }
454 453
455 454
456 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,op, 455 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,op,
457 "You become a follower of %s!",new_god->name); 456 "You become a follower of %s!",&new_god->name);
458 457
459 for (skop = op->inv; skop != NULL; skop=skop->below) 458 for (skop = op->inv; skop != NULL; skop=skop->below)
460 if (skop->type == SKILL && skop->subtype == SK_PRAYING) break; 459 if (skop->type == SKILL && skop->subtype == SK_PRAYING) break;
461 460
462 /* Player has no skill - give them the skill */ 461 /* Player has no skill - give them the skill */
463 if (!skop) { 462 if (!skop) {
464 /* The arhetype should always be defined - if we crash here because it doesn't, 463 /* The arhetype should always be defined - if we crash here because it doesn't,
465 * things are really messed up anyways. 464 * things are really messed up anyways.
466 */ 465 */
467 skop = give_skill_by_name(op, get_archetype_by_type_subtype(SKILL, SK_PRAYING)->clone.skill); 466 skop = give_skill_by_name(op, get_archetype_by_type_subtype(SKILL, SK_PRAYING)->clone.skill);
468 link_player_skills(op); 467 link_player_skills(op);
469 } 468 }
470 469
471 sk_applied=QUERY_FLAG(skop,FLAG_APPLIED); /* save skill status */ 470 sk_applied=QUERY_FLAG(skop,FLAG_APPLIED); /* save skill status */
472 471
473 /* Clear the "undead" status. We also need to force a call to change_abil, 472 /* Clear the "undead" status. We also need to force a call to change_abil,
… …
480 undeadified=1; 479 undeadified=1;
481 } 480 }
482 481
483 if(skop->title) { /* get rid of old god */ 482 if(skop->title) { /* get rid of old god */
484 new_draw_info_format(NDI_UNIQUE,0,op, 483 new_draw_info_format(NDI_UNIQUE,0,op,
485 "%s's blessing is withdrawn from you.",skop->title); 484 "%s's blessing is withdrawn from you.", &skop->title);
486 /* The point of this is to really show what abilities the player just lost */ 485 /* The point of this is to really show what abilities the player just lost */
487 if (sk_applied || undeadified) { 486 if (sk_applied || undeadified) {
488 487
489 CLEAR_FLAG(skop,FLAG_APPLIED); 488 CLEAR_FLAG(skop,FLAG_APPLIED);
490 (void) change_abil(op,skop); 489 (void) change_abil(op,skop);
491 } 490 }
492 free_string(skop->title);
493 } 491 }
494 492
495 /* now change to the new gods attributes to exp_obj */ 493 /* now change to the new gods attributes to exp_obj */
496 skop->title = add_string(new_god->name); 494 skop->title = new_god->name;
497 skop->path_attuned=new_god->path_attuned; 495 skop->path_attuned=new_god->path_attuned;
498 skop->path_repelled=new_god->path_repelled; 496 skop->path_repelled=new_god->path_repelled;
499 skop->path_denied=new_god->path_denied; 497 skop->path_denied=new_god->path_denied;
500 /* copy god's resistances */ 498 /* copy god's resistances */
501 memcpy(skop->resist, new_god->resist, sizeof(new_god->resist)); 499 memcpy(skop->resist, new_god->resist, sizeof(new_god->resist));
… …
503 /* make sure that certain immunities do NOT get passed 501 /* make sure that certain immunities do NOT get passed
504 * to the follower! 502 * to the follower!
505 */ 503 */
506 for (i=0; i<NROFATTACKS; i++) 504 for (i=0; i<NROFATTACKS; i++)
507 if (skop->resist[i] > 30 && (i==ATNR_FIRE || i==ATNR_COLD || 505 if (skop->resist[i] > 30 && (i==ATNR_FIRE || i==ATNR_COLD ||
508 i==ATNR_ELECTRICITY || i==ATNR_POISON)) 506 i==ATNR_ELECTRICITY || i==ATNR_POISON))
509 skop->resist[i] = 30; 507 skop->resist[i] = 30;
510 508
511 skop->stats.hp= (sint16) new_god->last_heal; 509 skop->stats.hp= (sint16) new_god->last_heal;
512 skop->stats.sp= (sint16) new_god->last_sp; 510 skop->stats.sp= (sint16) new_god->last_sp;
513 skop->stats.grace= (sint16) new_god->last_grace; 511 skop->stats.grace= (sint16) new_god->last_grace;
514 skop->stats.food= (sint16) new_god->last_eat; 512 skop->stats.food= (sint16) new_god->last_eat;
… …
522 update_priest_flag(new_god,skop,FLAG_UNDEAD); 520 update_priest_flag(new_god,skop,FLAG_UNDEAD);
523 update_priest_flag(new_god,skop,FLAG_BLIND); 521 update_priest_flag(new_god,skop,FLAG_BLIND);
524 update_priest_flag(new_god,skop,FLAG_XRAYS); /* better have this if blind! */ 522 update_priest_flag(new_god,skop,FLAG_XRAYS); /* better have this if blind! */
525 523
526 new_draw_info_format(NDI_UNIQUE,0,op, 524 new_draw_info_format(NDI_UNIQUE,0,op,
527 "You are bathed in %s's aura.",new_god->name); 525 "You are bathed in %s's aura.",&new_god->name);
528 526
529 /* Weapon/armour use are special...handle flag toggles here as this can 527 /* Weapon/armour use are special...handle flag toggles here as this can
530 * only happen when gods are worshipped and if the new priest could 528 * only happen when gods are worshipped and if the new priest could
531 * have used armour/weapons in the first place. 529 * have used armour/weapons in the first place.
532 * 530 *
533 * This also can happen for monks which cannot use weapons. In this case 531 * This also can happen for monks which cannot use weapons. In this case
534 * do not allow to use weapons even if the god otherwise would allow it. 532 * do not allow to use weapons even if the god otherwise would allow it.
535 */ 533 */
536 if (!present_in_ob_by_name(FORCE, "no weapon force", op)) 534 if (!present_in_ob_by_name(FORCE, "no weapon force", op))
537 update_priest_flag(new_god,skop,FLAG_USE_WEAPON); 535 update_priest_flag(new_god,skop,FLAG_USE_WEAPON);
538 update_priest_flag(new_god,skop,FLAG_USE_ARMOUR); 536 update_priest_flag(new_god,skop,FLAG_USE_ARMOUR);
539 537
540 if(worship_forbids_use(op,skop,FLAG_USE_WEAPON,"weapons")) 538 if(worship_forbids_use(op,skop,FLAG_USE_WEAPON,"weapons"))
541 stop_using_item(op,WEAPON,2); 539 stop_using_item(op,WEAPON,2);
542 540
543 if(worship_forbids_use(op,skop,FLAG_USE_ARMOUR,"armour")) { 541 if(worship_forbids_use(op,skop,FLAG_USE_ARMOUR,"armour")) {
544 stop_using_item(op,ARMOUR,1); 542 stop_using_item(op,ARMOUR,1);
545 stop_using_item(op,HELMET,1); 543 stop_using_item(op,HELMET,1);
546 stop_using_item(op,BOOTS,1); 544 stop_using_item(op,BOOTS,1);
547 stop_using_item(op,GLOVES,1); 545 stop_using_item(op,GLOVES,1);
548 stop_using_item(op,SHIELD,1); 546 stop_using_item(op,SHIELD,1);
549 } 547 }
550 548
551 SET_FLAG(skop,FLAG_APPLIED); 549 SET_FLAG(skop,FLAG_APPLIED);
552 (void) change_abil(op,skop); 550 (void) change_abil(op,skop);
553 551
… …
572 update_priest_flag(exp_obj,op,flag); 570 update_priest_flag(exp_obj,op,flag);
573 if(QUERY_FLAG(op,flag)) 571 if(QUERY_FLAG(op,flag))
574 new_draw_info_format(NDI_UNIQUE,0,op,"You may use %s again.",string); 572 new_draw_info_format(NDI_UNIQUE,0,op,"You may use %s again.",string);
575 else { 573 else {
576 new_draw_info_format(NDI_UNIQUE,0,op,"You are forbidden to use %s.",string); 574 new_draw_info_format(NDI_UNIQUE,0,op,"You are forbidden to use %s.",string);
577 return 1; 575 return 1;
578 } 576 }
579 } 577 }
580 return 0; 578 return 0;
581} 579}
582 580
… …
587 object *tmp; 585 object *tmp;
588 586
589 for(tmp=op->inv;tmp&&number;tmp=tmp->below) 587 for(tmp=op->inv;tmp&&number;tmp=tmp->below)
590 if(tmp->type==type&&QUERY_FLAG(tmp,FLAG_APPLIED)) { 588 if(tmp->type==type&&QUERY_FLAG(tmp,FLAG_APPLIED)) {
591 apply_special (op, tmp, AP_UNAPPLY | AP_IGNORE_CURSE); 589 apply_special (op, tmp, AP_UNAPPLY | AP_IGNORE_CURSE);
592 number--; 590 number--;
593 } 591 }
594} 592}
595 593
596/** 594/**
597 * If the god does/doesnt have this flag, we 595 * If the god does/doesnt have this flag, we
… …
602void update_priest_flag (object *god, object *exp_ob, uint32 flag) { 600void update_priest_flag (object *god, object *exp_ob, uint32 flag) {
603 if(QUERY_FLAG(god,flag)&&!QUERY_FLAG(exp_ob,flag)) 601 if(QUERY_FLAG(god,flag)&&!QUERY_FLAG(exp_ob,flag))
604 SET_FLAG(exp_ob,flag); 602 SET_FLAG(exp_ob,flag);
605 else if(QUERY_FLAG(exp_ob,flag)&&!QUERY_FLAG(god,flag)) 603 else if(QUERY_FLAG(exp_ob,flag)&&!QUERY_FLAG(god,flag))
606 { 604 {
607 /* When this is called with the exp_ob set to the player, 605 /* When this is called with the exp_ob set to the player,
608 * this check is broken, because most all players arch 606 * this check is broken, because most all players arch
609 * allow use of weapons. I'm not actually sure why this 607 * allow use of weapons. I'm not actually sure why this
610 * check is here - I guess if you had a case where the 608 * check is here - I guess if you had a case where the
611 * value in the archetype (wisdom) should over ride the restrictions 609 * value in the archetype (wisdom) should over ride the restrictions
612 * the god places on it, this may make sense. But I don't think 610 * the god places on it, this may make sense. But I don't think
613 * there is any case like that. 611 * there is any case like that.
614 */ 612 */
615 613
616/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/ 614/* if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/
617 CLEAR_FLAG(exp_ob,flag); 615 CLEAR_FLAG(exp_ob,flag);
618 }; 616 };
619} 617}
620 618
621 619
622 620
… …
651{ 649{
652 object *tmp; 650 object *tmp;
653 int success = 0; 651 int success = 0;
654 652
655 for (tmp = op->inv; tmp; tmp = tmp->below) { 653 for (tmp = op->inv; tmp; tmp = tmp->below) {
656 if (tmp->invisible) 654 if (tmp->invisible)
657 continue; 655 continue;
658 if (QUERY_FLAG (tmp, FLAG_DAMNED) && ! remove_damnation) 656 if (QUERY_FLAG (tmp, FLAG_DAMNED) && ! remove_damnation)
659 continue; 657 continue;
660 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) { 658 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) {
661 success = 1; 659 success = 1;
662 CLEAR_FLAG (tmp, FLAG_DAMNED); 660 CLEAR_FLAG (tmp, FLAG_DAMNED);
… …
701 uint32 attacktype; 699 uint32 attacktype;
702 int tmp; 700 int tmp;
703 701
704 for (weapon = op->inv; weapon; weapon = weapon->below) 702 for (weapon = op->inv; weapon; weapon = weapon->below)
705 if ((weapon->type == WEAPON || weapon->type == BOW) 703 if ((weapon->type == WEAPON || weapon->type == BOW)
706 && QUERY_FLAG (weapon, FLAG_APPLIED)) 704 && QUERY_FLAG (weapon, FLAG_APPLIED))
707 break; 705 break;
708 if (weapon == NULL || god_examines_item (god, weapon) <= 0) 706 if (weapon == NULL || god_examines_item (god, weapon) <= 0)
709 return 0; 707 return 0;
710 708
711 /* First give it a title, so other gods won't touch it */ 709 /* First give it a title, so other gods won't touch it */
712 if ( ! weapon->title) { 710 if ( ! weapon->title) {
713 sprintf (buf, "of %s", god->name); 711 sprintf (buf, "of %s", &god->name);
714 weapon->title = add_string (buf); 712 weapon->title = buf;
715 if (op->type == PLAYER) 713 if (op->type == PLAYER)
716 esrv_update_item (UPD_NAME, op, weapon); 714 esrv_update_item (UPD_NAME, op, weapon);
717 new_draw_info (NDI_UNIQUE, 0, op, "Your weapon quivers as if struck!"); 715 new_draw_info (NDI_UNIQUE, 0, op, "Your weapon quivers as if struck!");
718 } 716 }
719 717
720 /* Allow the weapon to slay enemies */ 718 /* Allow the weapon to slay enemies */
721 if ( ! weapon->slaying && god->slaying) { 719 if ( ! weapon->slaying && god->slaying) {
722 weapon->slaying = add_string (god->slaying); 720 weapon->slaying = god->slaying;
723 new_draw_info_format (NDI_UNIQUE, 0, op, 721 new_draw_info_format (NDI_UNIQUE, 0, op,
724 "Your %s now hungers to slay enemies of your god!", 722 "Your %s now hungers to slay enemies of your god!",
725 weapon->name); 723 &weapon->name);
726 return 1; 724 return 1;
727 } 725 }
728 726
729 /* Add the gods attacktype */ 727 /* Add the gods attacktype */
730 attacktype = (weapon->attacktype == 0) ? AT_PHYSICAL : weapon->attacktype; 728 attacktype = (weapon->attacktype == 0) ? AT_PHYSICAL : weapon->attacktype;
… …
760{ 758{
761 treasure *tr; 759 treasure *tr;
762 760
763 if ( ! god || ! god->randomitems) { 761 if ( ! god || ! god->randomitems) {
764 LOG (llevError, 762 LOG (llevError,
765 "BUG: god_intervention(): no god or god without randomitems\n"); 763 "BUG: god_intervention(): no god or god without randomitems\n");
766 return; 764 return;
767 } 765 }
768 766
769 check_special_prayers (op, god); 767 check_special_prayers (op, god);
770 768
… …
794 return; 792 return;
795 } 793 }
796 794
797 if ( ! tr->item) { 795 if ( ! tr->item) {
798 LOG (llevError, "BUG: empty entry in %s's treasure list\n", 796 LOG (llevError, "BUG: empty entry in %s's treasure list\n",
799 god->name); 797 &god->name);
800 continue; 798 continue;
801 } 799 }
802 item = &tr->item->clone; 800 item = &tr->item->clone;
803 801
804 /* Grace limit */ 802 /* Grace limit */
805 if (item->type == BOOK && item->invisible 803 if (item->type == BOOK && item->invisible
806 && strcmp (item->name, "grace limit") == 0) { 804 && strcmp (item->name, "grace limit") == 0) {
807 if (op->stats.grace < item->stats.grace 805 if (op->stats.grace < item->stats.grace
808 || op->stats.grace < op->stats.maxgrace) { 806 || op->stats.grace < op->stats.maxgrace) {
809 object *tmp; 807 object *tmp;
810 808
811 /* Follower lacks the required grace for the following 809 /* Follower lacks the required grace for the following
812 * treasure list items. */ 810 * treasure list items. */
813 811
814 tmp = get_archetype(HOLY_POSSESSION); 812 tmp = get_archetype(HOLY_POSSESSION);
815 cast_change_ability(op, op, tmp, 0, 1); 813 cast_change_ability(op, op, tmp, 0, 1);
816 free_object(tmp); 814 free_object(tmp);
817 return; 815 return;
818 } 816 }
819 continue; 817 continue;
820 } 818 }
821 819
… …
859 857
860 /* Various heal spells */ 858 /* Various heal spells */
861 if (item->type == BOOK && item->invisible 859 if (item->type == BOOK && item->invisible
862 && strcmp (item->name, "heal spell") == 0) 860 && strcmp (item->name, "heal spell") == 0)
863 { 861 {
864 object *tmp; 862 object *tmp;
865 int success; 863 int success;
866 864
867 tmp = get_archetype_by_object_name(item->slaying); 865 tmp = get_archetype_by_object_name(item->slaying);
868 866
869 success = cast_heal (op, op, tmp, 0); 867 success = cast_heal (op, op, tmp, 0);
870 free_object(tmp); 868 free_object(tmp);
871 if (success) return; 869 if (success) return;
872 else continue; 870 else continue;
873 } 871 }
874 872
875 /* Remove curse */ 873 /* Remove curse */
876 if (item->type == BOOK && item->invisible 874 if (item->type == BOOK && item->invisible
877 && strcmp (item->name, "remove curse") == 0) 875 && strcmp (item->name, "remove curse") == 0)
… …
953 if (check_spell_known (op, item->name)) 951 if (check_spell_known (op, item->name))
954 continue; 952 continue;
955 if (item->level > skill->level) 953 if (item->level > skill->level)
956 continue; 954 continue;
957 955
958 new_draw_info_format(NDI_UNIQUE, 0, op, 956 new_draw_info_format(NDI_UNIQUE, 0, op,
959 "%s grants you use of a special prayer!", god->name); 957 "%s grants you use of a special prayer!", &god->name);
960 do_learn_spell (op, item, 1); 958 do_learn_spell (op, item, 1);
961 return; 959 return;
962 960
963 } 961 }
964 962
965 /* Other gifts */ 963 /* Other gifts */
966 if ( ! item->invisible) { 964 if ( ! item->invisible) {
967 if (god_gives_present (op, god, tr)) 965 if (god_gives_present (op, god, tr))
968 return; 966 return;
… …
983int god_examines_priest (object *op, object *god) { 981int god_examines_priest (object *op, object *god) {
984 int reaction=1; 982 int reaction=1;
985 object *item=NULL, *skop; 983 object *item=NULL, *skop;
986 984
987 for(item=op->inv;item;item=item->below) { 985 for(item=op->inv;item;item=item->below) {
988 if(QUERY_FLAG(item,FLAG_APPLIED)) { 986 if(QUERY_FLAG(item,FLAG_APPLIED)) {
989 reaction+=god_examines_item(god,item)*(item->magic?abs(item->magic):1); 987 reaction+=god_examines_item(god,item)*(item->magic?abs(item->magic):1);
990 } 988 }
991 } 989 }
992 990
993 /* well, well. Looks like we screwed up. Time for god's revenge */ 991 /* well, well. Looks like we screwed up. Time for god's revenge */
994 if(reaction<0) { 992 if(reaction<0) {
995 int loss = 10000000; 993 int loss = 10000000;
996 int angry = abs(reaction); 994 int angry = abs(reaction);
997 995
998 for (skop = op->inv; skop != NULL; skop=skop->below) 996 for (skop = op->inv; skop != NULL; skop=skop->below)
999 if (skop->type == SKILL && skop->subtype == SK_PRAYING) break; 997 if (skop->type == SKILL && skop->subtype == SK_PRAYING) break;
1000 998
1001 if (skop) 999 if (skop)
1002 loss = (int) (0.05 * (float) skop->stats.exp); 1000 loss = (int) (0.05 * (float) skop->stats.exp);
1003 change_exp(op, -random_roll(0, loss*angry-1, op, PREFER_LOW), 1001 change_exp(op, -random_roll(0, loss*angry-1, op, PREFER_LOW),
1004 skop?skop->skill:"none", SK_SUBTRACT_SKILL_EXP); 1002 skop ? &skop->skill : "none", SK_SUBTRACT_SKILL_EXP);
1005 if(random_roll(0, angry, op, PREFER_LOW)) { 1003 if(random_roll(0, angry, op, PREFER_LOW)) {
1006 object *tmp = get_archetype(LOOSE_MANA); 1004 object *tmp = get_archetype(LOOSE_MANA);
1007 cast_magic_storm(op,tmp,op->level+(angry*3)); 1005 cast_magic_storm(op,tmp,op->level+(angry*3));
1008 } 1006 }
1009 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,op, 1007 new_draw_info_format(NDI_UNIQUE|NDI_NAVY,0,op,
1010 "%s becomes angry and punishes you!",god->name); 1008 "%s becomes angry and punishes you!",&god->name);
1011 } 1009 }
1012 return reaction; 1010 return reaction;
1013} 1011}
1014 1012
1015/** 1013/**
… …
1024 1022
1025 if(!god||!item) return 0; 1023 if(!god||!item) return 0;
1026 1024
1027 if(!item->title) return 1; /* unclaimed item are ok */ 1025 if(!item->title) return 1; /* unclaimed item are ok */
1028 1026
1029 sprintf(buf,"of %s",god->name); 1027 sprintf(buf,"of %s",&god->name);
1030 if(!strcmp(item->title,buf)) return 1; /* belongs to that God */ 1028 if(!strcmp(item->title,buf)) return 1; /* belongs to that God */
1031 1029
1032 if(god->title) { /* check if we have any enemy blessed item*/ 1030 if(god->title) { /* check if we have any enemy blessed item*/
1033 sprintf(buf,"of %s",god->title); 1031 sprintf(buf,"of %s", &god->title);
1034 if(!strcmp(item->title,buf)) { 1032 if(!strcmp(item->title,buf)) {
1035 if(item->env) { 1033 if(item->env) {
1036 char buf[MAX_BUF]; 1034 char buf[MAX_BUF];
1037 sprintf(buf,"Heretic! You are using %s!",query_name(item)); 1035 sprintf(buf,"Heretic! You are using %s!",query_name(item));
1038 new_draw_info(NDI_UNIQUE|NDI_NAVY,0,item->env,buf); 1036 new_draw_info(NDI_UNIQUE|NDI_NAVY,0,item->env,buf);
… …
1064 godlink *gl=first_god; 1062 godlink *gl=first_god;
1065 const char *godname=NULL; 1063 const char *godname=NULL;
1066 1064
1067 if (race == NULL) return NULL; 1065 if (race == NULL) return NULL;
1068 while(gl) { 1066 while(gl) {
1069 if (!strcasecmp(gl->arch->clone.race, race)) { 1067 if (!strcasecmp(gl->arch->clone.race, race)) {
1070 godname=gl->name; 1068 godname=gl->name;
1071 break; 1069 break;
1072 } 1070 }
1073 gl=gl->next; 1071 gl=gl->next;
1074 } 1072 }
1075 return godname; 1073 return godname;
1076} 1074}
1077/** 1075/**
1078 * Changes the attributes of cone, smite, and ball spells as needed by the code. 1076 * Changes the attributes of cone, smite, and ball spells as needed by the code.
… …
1102 return 0; 1100 return 0;
1103 } 1101 }
1104 1102
1105 /* either holy word or godpower attacks will set the slaying field */ 1103 /* either holy word or godpower attacks will set the slaying field */
1106 if (spellop->attacktype & AT_HOLYWORD || spellop->attacktype & AT_GODPOWER) { 1104 if (spellop->attacktype & AT_HOLYWORD || spellop->attacktype & AT_GODPOWER) {
1107 if (spellop->slaying) { 1105 if (spellop->slaying)
1108 free_string(spellop->slaying);
1109 spellop->slaying = NULL; 1106 spellop->slaying = NULL;
1110 } 1107
1111 if(!caster_is_spell) 1108 if(!caster_is_spell)
1112 spellop->slaying = add_string(god->slaying); 1109 spellop->slaying = god->slaying;
1113 else if(caster->slaying) 1110 else if(caster->slaying)
1114 spellop->slaying = add_string(caster->slaying); 1111 spellop->slaying = caster->slaying;
1115 } 1112 }
1116 1113
1117 /* only the godpower attacktype adds the god's attack onto the spell */ 1114 /* only the godpower attacktype adds the god's attack onto the spell */
1118 if(spellop->attacktype & AT_GODPOWER) 1115 if(spellop->attacktype & AT_GODPOWER)
1119 spellop->attacktype=spellop->attacktype|god->attacktype; 1116 spellop->attacktype=spellop->attacktype|god->attacktype;
1120 1117
1121 /* tack on the god's name to the spell */ 1118 /* tack on the god's name to the spell */
1122 if(spellop->attacktype&AT_HOLYWORD||spellop->attacktype&AT_GODPOWER) { 1119 if(spellop->attacktype&AT_HOLYWORD||spellop->attacktype&AT_GODPOWER) {
1123 if(spellop->title)
1124 free_string(spellop->title);
1125 spellop->title=add_string(god->name); 1120 spellop->title = god->name;
1126 if(spellop->title){ 1121 if(spellop->title){
1127 char buf[MAX_BUF]; 1122 char buf[MAX_BUF];
1128 sprintf(buf,"%s of %s",spellop->name,spellop->title); 1123 sprintf(buf,"%s of %s",&spellop->name, &spellop->title);
1129 FREE_AND_COPY(spellop->name, buf); 1124 spellop->name = spellop->name_pl = buf;
1130 FREE_AND_COPY(spellop->name_pl, buf); 1125 }
1131 }
1132 } 1126 }
1133 1127
1134 return 1; 1128 return 1;
1135} 1129}
1136 1130

Diff Legend

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