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

Comparing deliantra/server/server/disease.C (file contents):
Revision 1.34 by root, Sun Aug 12 07:04:48 2007 UTC vs.
Revision 1.60 by root, Sun Nov 29 17:41:08 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* This file contains all the code implementing diseases, 25/* This file contains all the code implementing diseases,
25 * except for odds and ends in attack.c and in 26 * except for odds and ends in attack.c and in
26 * living.c 27 * living.c
… …
44dam^ Damage How much damage it does (%?). 45dam^ Damage How much damage it does (%?).
45maxgrace+ Duration How long before the disease is naturally cured. 46maxgrace+ Duration How long before the disease is naturally cured.
46food DurCount Counter for Duration 47food DurCount Counter for Duration
47 48
48speed Speed How often the disease moves. 49speed Speed How often the disease moves.
49last_sp^ Lethargy Percentage of max speed--10 = 10% speed. 50last_sp^ Lethargy Percentage of max speed. 10 = 10% speed.
50 51
51maxsp^ Mana deplete Saps mana. 52maxsp^ Mana deplete Saps mana.
52ac^ Progressiveness How the diseases increases in severity. 53ac^ Progressiveness How the diseases increases in severity.
53last_eat*^ Deplete food saps food if negative 54last_eat*^ Deplete food saps food if negative
54last_heal GrantImmunity If nonzero, disease does NOT grant immunity 55last_heal GrantImmunity If nonzero, disease does NOT grant immunity
… …
137 Diseases may be contageous. They are objects which exist in a player's 138 Diseases may be contageous. They are objects which exist in a player's
138inventory. They themselves do nothing, except modify Symptoms, or 139inventory. They themselves do nothing, except modify Symptoms, or
139spread to other live objects. Symptoms are what actually damage the player: 140spread to other live objects. Symptoms are what actually damage the player:
140these are their own object. */ 141these are their own object. */
141 142
142/* check if victim is susceptible to disease. */ 143/* grants immunity to plagues we've seen before. */
143static int 144static int
144is_susceptible_to_disease (object *victim, object *disease) 145grant_immunity (object *disease)
145{ 146{
146 if (!QUERY_FLAG (victim, FLAG_ALIVE)) 147 object *immunity;
148 object *walk;
149
150 /* Don't give immunity to this disease if last_heal is set. */
151 if (disease->last_heal)
147 return 0; 152 return 0;
148 153
149 if (strstr (disease->race, "*") && !QUERY_FLAG (victim, FLAG_UNDEAD)) 154 /* first, search for an immunity of the same name */
155 for (walk = disease->env->inv; walk; walk = walk->below)
156 if (walk->type == 98 && disease->name == walk->name)
157 {
158 walk->level = disease->level;
159 return 1; /* just update the existing immunity. */
160 }
161
162 immunity = get_archetype (shstr_immunity);
163
164 immunity->name = disease->name;
165 immunity->level = disease->level;
166 immunity->move_block = 0;
167
168 insert_ob_in_ob (immunity, disease->env);
169
150 return 1; 170 return 1;
171}
151 172
152 if ((disease->race == shstr_undead) && QUERY_FLAG (victim, FLAG_UNDEAD)) 173/* argument is a disease */
174static object *
175find_symptom (object *disease)
176{
177 /* check the inventory for symptoms */
178 for (object *walk = disease->env->inv; walk; walk = walk->below)
179 if (walk->name == disease->name && walk->type == SYMPTOM)
153 return 1; 180 return walk;
154 181
155 if ((victim->race && strstr (disease->race, victim->race)) || strstr (disease->race, victim->name))
156 return 1;
157
158 return 0; 182 return NULL;
159}
160
161int
162move_disease (object *disease)
163{
164 /* first task is to determine if the disease is inside or outside of someone.
165 * If outside, we decrement 'value' until we're gone.
166 */
167
168 if (!disease->env)
169 { /* we're outside of someone */
170 if (disease->stats.maxhp > 0)
171 disease->value--;
172
173 if (!disease->value)
174 {
175 disease->destroy ();
176 return 1;
177 }
178 }
179 else
180 {
181 /* if we're inside a person, have the disease run its course */
182 /* negative/zero food denotes "perpetual" diseases. */
183 if (disease->stats.food > 0)
184 {
185 disease->stats.food--;
186
187 if (!disease->stats.food)
188 {
189 remove_symptoms (disease); /* remove the symptoms of this disease */
190 grant_immunity (disease);
191 disease->destroy ();
192 return 1;
193 }
194 }
195 }
196
197 /* check to see if we infect others */
198 check_infection (disease);
199
200 /* impose or modify the symptoms of the disease */
201 if (disease->env && is_susceptible_to_disease (disease->env, disease))
202 do_symptoms (disease);
203
204 return 0;
205} 183}
206 184
207/* remove any symptoms of disease 185/* remove any symptoms of disease
208 * Modified by MSW 2003-03-28 do try to find all the symptom the 186 * Modified by MSW 2003-03-28 do try to find all the symptom the
209 * player may have - I think through some odd interactoins with 187 * player may have - I think through some odd interactoins with
210 * disease level and player level and whatnot, a player could get 188 * disease level and player level and whatnot, a player could get
211 * more than one symtpom to a disease. 189 * more than one symtpom to a disease.
212 */ 190 */
213 191static int
214int
215remove_symptoms (object *disease) 192remove_symptoms (object *disease)
216{ 193{
217 object *symptom, *victim = NULL; 194 object *symptom, *victim = NULL;
218 195
219 while ((symptom = find_symptom (disease)) != NULL) 196 while ((symptom = find_symptom (disease)) != NULL)
… …
228 victim->update_stats (); 205 victim->update_stats ();
229 206
230 return 0; 207 return 0;
231} 208}
232 209
233/* argument is a disease */
234object *
235find_symptom (object *disease)
236{
237 object *walk;
238
239 /* check the inventory for symptoms */
240 for (walk = disease->env->inv; walk; walk = walk->below)
241 if (walk->name == disease->name && walk->type == SYMPTOM)
242 return walk;
243
244 return NULL;
245}
246
247/* searches around for more victims to infect */ 210/* searches around for more victims to infect */
248int 211static int
249check_infection (object *disease) 212check_infection (object *disease)
250{ 213{
251 int x, y, range, mflags;
252 maptile *map, *map2;
253 object *tmp;
254
255 range = abs (disease->magic); 214 int range = abs (disease->magic);
256 215
257 if (disease->env) 216 object *op = disease->outer_env_or_self ();
258 {
259 x = disease->env->x;
260 y = disease->env->y;
261 map = disease->env->map;
262 }
263 else
264 {
265 x = disease->x;
266 y = disease->y;
267 map = disease->map;
268 }
269 217
270 if (!map) 218 if (!op->is_on_map ())
271 return 0; 219 return 0;
272 220
273 for (int i = x - range; i <= x + range; i++) 221 unordered_mapwalk (op, -range, -range, range, range)
274 for (int j = y - range; j <= y + range; j++)
275 { 222 {
276 sint16 i2, j2; 223 mapspace &ms = m->at (nx, ny);
277 mflags = get_map_flags (map, &map2, i, j, &i2, &j2);
278 224
279 if (!(mflags & P_OUT_OF_MAP) && (mflags & P_IS_ALIVE)) 225 if (ms.flags () & P_IS_ALIVE)
280 for (tmp = GET_MAP_OB (map2, i2, j2); tmp; tmp = tmp->above) 226 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
281 infect_object (tmp, disease, 0); 227 infect_object (tmp, disease, 0);
282 } 228 }
283 229
284 return 1; 230 return 1;
285} 231}
286 232
287/* check to see if an object is infectable: 233/* check if victim is susceptible to disease. */
288 * objects with immunity aren't infectable. 234static int
289 * objects already infected aren't infectable. 235is_susceptible_to_disease (object *victim, object *disease)
290 * dead objects aren't infectable.
291 * undead objects are infectible only if specifically named.
292*/
293int
294infect_object (object *victim, object *disease, int force)
295{ 236{
296 object *tmp; 237 if (!QUERY_FLAG (victim, FLAG_ALIVE))
297 object *new_disease;
298
299 /* don't infect inanimate objects */
300 if (!QUERY_FLAG (victim, FLAG_MONSTER) && !(victim->type == PLAYER))
301 return 0; 238 return 0;
302 239
303 /* check and see if victim can catch disease: diseases 240 if (victim->flag [FLAG_WIZ])
304 * are specific
305 */
306 if (!is_susceptible_to_disease (victim, disease))
307 return 0; 241 return 0;
308 242
309 /* roll the dice on infection before doing the inventory check! */ 243 if (disease->race.contains ("*") && !QUERY_FLAG (victim, FLAG_UNDEAD))
310 if (!force && (random_roll (0, 126, victim, PREFER_HIGH) >= disease->stats.wc))
311 return 0; 244 return 1;
312 245
313 /* do an immunity check */ 246 if ((disease->race == shstr_undead) && QUERY_FLAG (victim, FLAG_UNDEAD))
314 if (victim->head)
315 tmp = victim->head->inv;
316 else
317 tmp = victim->inv;
318
319 /* There used to (IMO) be a flaw in the below - it used to be the case
320 * that if level check was done for both immunity and disease. This could
321 * result in a person with multiple afflictions of the same disease
322 * (eg, level 1 cold, level 2 cold, level 3 cold, etc), as long as
323 * they were cast in that same order. Instead, change it so that
324 * if you diseased, you can't get diseased more.
325 */
326
327 for ( /* tmp initialised in if, above */ ; tmp; tmp = tmp->below)
328 {
329 if (tmp->type == SIGN && tmp->name == disease->name && tmp->level >= disease->level)
330 return 0; /* Immune! */
331 else if (tmp->type == DISEASE && tmp->name == disease->name)
332 return 0; /* already diseased */
333 }
334
335 /* If we've gotten this far, go ahead and infect the victim. */
336 new_disease = disease->clone ();
337 new_disease->stats.food = disease->stats.maxgrace;
338 new_disease->value = disease->stats.maxhp;
339 new_disease->stats.wc -= disease->last_grace; /* self-limiting factor */
340
341 /* Unfortunately, set_owner does the wrong thing to the skills pointers
342 * resulting in exp going into the owners *current* chosen skill.
343 */
344
345 if (disease->owner)
346 {
347 new_disease->set_owner (disease->owner);
348
349 /* Only need to update skill if different */
350 if (new_disease->skill != disease->skill)
351 new_disease->skill = disease->skill;
352 }
353 else
354 { /* for diseases which are passed by hitting, set owner and praying skill */
355 if (disease->env && disease->env->type == PLAYER)
356 {
357 object *player = disease->env;
358
359 new_disease->set_owner (player);
360
361 /* the skill pointer for these diseases should already be set up -
362 * hardcoding in 'praying' is not the right approach.
363 */
364 }
365 }
366
367 insert_ob_in_ob (new_disease, victim->head_ ());
368 /* This appears to be a horrible case of overloading 'NO_PASS'
369 * for meaning in the diseases.
370 */
371 new_disease->move_block = 0;
372 if (new_disease->owner && new_disease->owner->type == PLAYER)
373 {
374 char buf[128];
375
376 /* if the disease has a title, it has a special infection message
377 * This messages is printed in the form MESSAGE victim
378 */
379 if (new_disease->title)
380 sprintf (buf, "%s %s!!", &disease->title, &victim->name);
381 else
382 sprintf (buf, "You infect %s with your disease, %s!", &victim->name, &new_disease->name);
383
384 if (victim->type == PLAYER)
385 new_draw_info (NDI_UNIQUE | NDI_RED, 0, new_disease->owner, buf);
386 else
387 new_draw_info (0, 4, new_disease->owner, buf);
388 }
389
390 if (victim->type == PLAYER)
391 new_draw_info (NDI_UNIQUE | NDI_RED, 0, victim, "You suddenly feel ill.");
392
393 return 1; 247 return 1;
394 248
249 if ((victim->race && disease->race.contains (victim->race)) || disease->race.contains (victim->name))
250 return 1;
251
252 return 0;
395} 253}
396 254
397/* this function monitors the symptoms caused by the disease (if any), 255/* this function monitors the symptoms caused by the disease (if any),
398causes symptoms, and modifies existing symptoms in the case of 256causes symptoms, and modifies existing symptoms in the case of
399existing diseases. */ 257existing diseases. */
400int 258static int
401do_symptoms (object *disease) 259do_symptoms (object *disease)
402{ 260{
403 object *symptom; 261 object *symptom;
404 object *victim; 262 object *victim;
405 object *tmp; 263 object *tmp;
… …
422 280
423 symptom = find_symptom (disease); 281 symptom = find_symptom (disease);
424 if (!symptom) 282 if (!symptom)
425 { 283 {
426 /* no symptom? need to generate one! */ 284 /* no symptom? need to generate one! */
427 object *new_symptom;
428 285
429 /* first check and see if the carrier of the disease is immune. If so, no symptoms! */ 286 /* first check and see if the carrier of the disease is immune. If so, no symptoms! */
430 if (!is_susceptible_to_disease (victim, disease)) 287 if (!is_susceptible_to_disease (victim, disease))
431 return 0; 288 return 0;
432 289
433 /* check for an actual immunity */ 290 /* check for an actual immunity */
434 /* do an immunity check */ 291 /* do an immunity check */
435 if (victim->head) 292 for (tmp = victim->head_ ()->inv; tmp; tmp = tmp->below)
436 tmp = victim->head->inv;
437 else
438 tmp = victim->inv;
439
440 for ( /* tmp initialised in if, above */ ; tmp; tmp = tmp->below)
441 if (tmp->type == SIGN) /* possibly an immunity, or diseased */ 293 if (tmp->type == SIGN) /* possibly an immunity, or diseased */
442 if (tmp->name == disease->name && tmp->level >= disease->level) 294 if (tmp->name == disease->name && tmp->level >= disease->level)
443 return 0; /*Immune! */ 295 return 0; /* Immune! */
444 296
445 new_symptom = get_archetype ("symptom"); 297 object *new_symptom = get_archetype (shstr_symptom);
446 298
447 /* Something special done with dam. We want diseases to be more 299 /* Something special done with dam. We want diseases to be more
448 * random in what they'll kill, so we'll make the damage they 300 * random in what they'll kill, so we'll make the damage they
449 * do random, note, this has a weird effect with progressive diseases. 301 * do random, note, this has a weird effect with progressive diseases.
450 */ 302 */
451 if (disease->stats.dam != 0) 303 if (disease->stats.dam)
452 { 304 {
453 int dam = disease->stats.dam; 305 int dam = disease->stats.dam;
454 306
455 /* reduce the damage, on average, 50%, and making things random. */ 307 /* reduce the damage, on average, 50%, and making things random. */
456 308
… …
480 new_symptom->stats.exp = 0; 332 new_symptom->stats.exp = 0;
481 new_symptom->stats.hp = disease->stats.hp; 333 new_symptom->stats.hp = disease->stats.hp;
482 new_symptom->msg = disease->msg; 334 new_symptom->msg = disease->msg;
483 new_symptom->attacktype = disease->attacktype; 335 new_symptom->attacktype = disease->attacktype;
484 new_symptom->other_arch = disease->other_arch; 336 new_symptom->other_arch = disease->other_arch;
337 new_symptom->skill = disease->skill;
485 338
339 new_symptom->move_block = 0;
340
341 victim->head_ ()->insert (new_symptom);
342
343 // set owner last, as insert clears owner
486 new_symptom->set_owner (disease->owner); 344 new_symptom->set_owner (disease->owner);
487 345
488 if (new_symptom->skill != disease->skill)
489 new_symptom->skill = disease->skill;
490
491 new_symptom->move_block = 0;
492 insert_ob_in_ob (new_symptom, victim);
493 return 1; 346 return 1;
494 } 347 }
495 348
496 /* now deal with progressing diseases: we increase the debility 349 /* now deal with progressing diseases: we increase the debility
497 * caused by the symptoms. 350 * caused by the symptoms.
… …
522 victim->update_stats (); 375 victim->update_stats ();
523 376
524 return 1; 377 return 1;
525} 378}
526 379
527/* grants immunity to plagues we've seen before. */
528int 380int
529grant_immunity (object *disease) 381move_disease (object *disease)
530{ 382{
531 object *immunity; 383 /* First task is to determine if the disease is inside or outside of someone.
384 * If outside, we decrement 'value' until we're gone.
385 */
386
387 if (!disease->env)
388 { /* we're outside of someone */
389 if (disease->stats.maxhp > 0)
390 disease->value--;
391
392 if (!disease->value)
393 {
394 disease->destroy ();
395 return 1;
396 }
397 }
398 else
399 {
400 /* if we're inside a person, have the disease run its course */
401 /* negative/zero food denotes "perpetual" diseases. */
402 if (disease->stats.food > 0)
403 {
404 disease->stats.food--;
405
406 if (!disease->stats.food)
407 {
408 remove_symptoms (disease); /* remove the symptoms of this disease */
409 grant_immunity (disease);
410 disease->destroy ();
411 return 1;
412 }
413 }
414 }
415
416 /* check to see if we infect others */
417 check_infection (disease);
418
419 /* impose or modify the symptoms of the disease */
420 if (disease->env && is_susceptible_to_disease (disease->env, disease))
421 do_symptoms (disease);
422
423 return 0;
424}
425
426/* check to see if an object is infectable:
427 * objects with immunity aren't infectable.
428 * objects already infected aren't infectable.
429 * dead objects aren't infectable.
430 * undead objects are infectible only if specifically named.
431*/
432int
433infect_object (object *victim, object *disease, int force)
434{
532 object *walk; 435 object *tmp;
436 object *new_disease;
533 437
534 /* Don't give immunity to this disease if last_heal is set. */ 438 /* don't infect inanimate objects */
535 if (disease->last_heal) 439 if (!QUERY_FLAG (victim, FLAG_MONSTER) && !(victim->type == PLAYER))
536 return 0; 440 return 0;
537 /* first, search for an immunity of the same name */ 441
538 for (walk = disease->env->inv; walk; walk = walk->below) 442 /* check and see if victim can catch disease: diseases
539 { 443 * are specific
540 if (walk->type == 98 && disease->name == walk->name) 444 */
541 { 445 if (!is_susceptible_to_disease (victim, disease))
542 walk->level = disease->level; 446 return 0;
543 return 1; /* just update the existing immunity. */ 447
544 } 448 /* roll the dice on infection before doing the inventory check! */
449 if (!force && (random_roll (0, 126, victim, PREFER_HIGH) >= disease->stats.wc))
450 return 0;
451
452 /* do an immunity check */
453
454 /* There used to (IMO) be a flaw in the below - it used to be the case
455 * that if level check was done for both immunity and disease. This could
456 * result in a person with multiple afflictions of the same disease
457 * (eg, level 1 cold, level 2 cold, level 3 cold, etc), as long as
458 * they were cast in that same order. Instead, change it so that
459 * if you diseased, you can't get diseased more.
460 */
461
462 for (tmp = victim->head_ ()->inv; tmp; tmp = tmp->below)
463 if (tmp->type == SIGN && tmp->name == disease->name && tmp->level >= disease->level)
464 return 0; /* Immune! */
465 else if (tmp->type == DISEASE && tmp->name == disease->name)
466 return 0; /* already diseased */
467
468 /* If we've gotten this far, go ahead and infect the victim. */
469
470 new_disease = disease->clone ();
471
472 new_disease->stats.food = disease->stats.maxgrace;
473 new_disease->value = disease->stats.maxhp;
474 new_disease->stats.wc -= disease->last_grace; /* self-limiting factor */
475
476 /* This appears to be a horrible case of overloading 'NO_PASS'
477 * for meaning in the diseases.
478 */
479 new_disease->move_block = 0;
480
481 // insert before setting the owner
482 victim->head_ ()->insert (new_disease);
483
484 if (disease->owner)
485 new_disease->set_owner (disease->owner);
486 else if (object *pl = disease->in_player ())
487 /* for diseases which are passed by hitting, set owner and skill */
488 new_disease->set_owner (pl);
489
490 if (new_disease->owner && new_disease->owner->type == PLAYER)
545 } 491 {
546 immunity = get_archetype ("immunity"); 492 const char *buf;
547 immunity->name = disease->name; 493
548 immunity->level = disease->level; 494 /* if the disease has a title, it has a special infection message
549 immunity->move_block = 0; 495 * This messages is printed in the form MESSAGE victim
550 insert_ob_in_ob (immunity, disease->env); 496 */
497 if (new_disease->title)
498 buf = format ("%s %s!!", &disease->title, &victim->name);
499 else
500 buf = format ("You infect %s with your disease, %s!", &victim->name, &new_disease->name);
501
502 if (victim->type == PLAYER)
503 new_draw_info (NDI_UNIQUE | NDI_RED, 0, new_disease->owner, buf);
504 else
505 new_draw_info (0, 4, new_disease->owner, buf);
506 }
507
508 if (victim->type == PLAYER)
509 new_draw_info (NDI_UNIQUE | NDI_RED, 0, victim, "You suddenly feel ill.");
510
551 return 1; 511 return 1;
552
553} 512}
554
555 513
556/* make the symptom do the nasty things it does */ 514/* make the symptom do the nasty things it does */
557
558int 515int
559move_symptom (object *symptom) 516move_symptom (object *symptom)
560{ 517{
561 object *victim = symptom->env; 518 object *victim = symptom->env;
562 object *new_ob;
563 int sp_reduce;
564 519
565 if (victim == NULL || victim->map == NULL) 520 if (!victim || !victim->map)
566 { /* outside a monster/player, die immediately */ 521 { /* outside a monster/player, die immediately */
567 symptom->destroy (); 522 symptom->destroy ();
568 return 0; 523 return 0;
569 } 524 }
570
571 if (symptom->stats.dam > 0)
572 hit_player (victim, symptom->stats.dam, symptom, symptom->attacktype, 1);
573 else
574 hit_player (victim, (int) MAX (1, -victim->stats.maxhp * symptom->stats.dam / 100.0), symptom, symptom->attacktype, 1);
575
576 if (symptom->stats.maxsp > 0)
577 sp_reduce = symptom->stats.maxsp;
578 else
579 sp_reduce = (int) MAX (1, victim->stats.maxsp * symptom->stats.maxsp / 100.0);
580 victim->stats.sp = MAX (0, victim->stats.sp - sp_reduce);
581 525
582 /* create the symptom "other arch" object and drop it here 526 /* create the symptom "other arch" object and drop it here
583 * under every part of the monster 527 * under every part of the monster
584 * The victim may well have died. 528 * The victim may well have died.
585 */ 529 */
586
587 if (victim->map == NULL) 530 if (victim->map)
588 return 0; 531 {
532 victim->play_sound (symptom->sound);
533
589 if (symptom->other_arch) 534 if (symptom->other_arch)
590 { 535 for (object *tmp = victim->head_ (); tmp; tmp = tmp->more)
591 object *tmp;
592
593 tmp = victim;
594 if (tmp->head != NULL)
595 tmp = tmp->head;
596 for ( /*tmp initialised above */ ; tmp != NULL; tmp = tmp->more)
597 { 536 {
598 new_ob = arch_to_object (symptom->other_arch); 537 object *new_ob = symptom->other_arch->instance ();
599 new_ob->x = tmp->x; 538 new_ob->x = tmp->x;
600 new_ob->y = tmp->y; 539 new_ob->y = tmp->y;
601 new_ob->map = victim->map; 540 new_ob->map = victim->map;
602 insert_ob_in_map (new_ob, victim->map, victim, 0); 541 insert_ob_in_map (new_ob, victim->map, victim, 0);
603 } 542 }
604 } 543 }
544
545 int damage =
546 symptom->stats.dam > 0
547 ? symptom->stats.dam
548 : max (1, victim->stats.maxhp * -symptom->stats.dam / 100);
549
550 hit_player (victim, damage, symptom, symptom->attacktype, 1);
551
552 int sp_reduce =
553 symptom->stats.maxsp > 0
554 ? symptom->stats.maxsp
555 : max (1, victim->stats.maxsp * -symptom->stats.maxsp / 100);
556
557 victim->stats.sp = max (0, victim->stats.sp - sp_reduce);
558
605 new_draw_info (NDI_UNIQUE | NDI_RED, 0, victim, symptom->msg); 559 new_draw_info (NDI_UNIQUE | NDI_RED, 0, victim, symptom->msg);
606 560
607 return 1; 561 return 1;
608} 562}
609 563
… …
618 infect_object (victim, disease, 0); 572 infect_object (victim, disease, 0);
619 573
620 return 1; 574 return 1;
621} 575}
622 576
623// find a disease in someone
624object *
625find_disease (object *victim)
626{
627 for (object *disease = victim->inv; disease; disease = disease->below)
628 if (disease->type == DISEASE)
629 return disease;
630
631 return 0;
632}
633
634/* do the cure disease stuff, from the spell "cure disease" */ 577/* do the cure disease stuff, from the spell "cure disease" */
635int 578int
636cure_disease (object *sufferer, object *caster) 579cure_disease (object *sufferer, object *caster, object *spell)
637{ 580{
638 object *disease, *next; 581 object *disease, *next;
639 int casting_level;
640 int cure = 0; 582 int cure = 0;
641 583
642 if (caster)
643 casting_level = caster->level;
644 else
645 casting_level = 1000; /* if null caster, CURE all. */ 584 int casting_level = caster ? caster->level : 1000; /* if null caster, CURE all. */
646 585
647 for (disease = sufferer->inv; disease; disease = next) 586 for (disease = sufferer->inv; disease; disease = next)
648 { 587 {
649 next = disease->below; 588 next = disease->below;
650 589
… …
658 if ((casting_level >= disease->level) || (!(random_roll (0, (disease->level - casting_level - 1), caster, PREFER_LOW)))) 597 if ((casting_level >= disease->level) || (!(random_roll (0, (disease->level - casting_level - 1), caster, PREFER_LOW))))
659 { 598 {
660 remove_symptoms (disease); 599 remove_symptoms (disease);
661 cure = 1; 600 cure = 1;
662 601
663 if (caster) 602 if (caster && spell)
664 change_exp (caster, disease->stats.exp, caster->chosen_skill ? caster->chosen_skill->skill : (const char *) 0, 0); 603 change_exp (caster, disease->stats.exp, spell->skill, SK_EXP_SKILL_ONLY);
665 604
666 disease->destroy (); 605 disease->destroy ();
667 } 606 }
668 } 607 }
669 } 608 }
… …
678 } 617 }
679 618
680 return 1; 619 return 1;
681} 620}
682 621
622#if 0 // unused, but seems interesting
683/* reduces disease progression: reduce_symptoms 623/* reduces disease progression: reduce_symptoms
684 * return true if we actually reduce a disease. 624 * return true if we actually reduce a disease.
685 */ 625 */
686int 626static int
687reduce_symptoms (object *sufferer, int reduction) 627reduce_symptoms (object *sufferer, int reduction)
688{ 628{
689 object *walk; 629 object *walk;
690 int success = 0; 630 int success = 0;
691 631
… …
707 if (success) 647 if (success)
708 new_draw_info (NDI_UNIQUE, 0, sufferer, "Your illness seems less severe."); 648 new_draw_info (NDI_UNIQUE, 0, sufferer, "Your illness seems less severe.");
709 649
710 return success; 650 return success;
711} 651}
652#endif

Diff Legend

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