Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000169 

Bauernblut verwandelt Bauernarmee in Ghast
  Habe das auf temporäre Kröten geändert, analog zu Magiern
This commit is contained in:
Enno Rehling 2004-07-06 18:40:08 +00:00
parent 4be3bc99fa
commit eb2334124e
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/kernel/alchemy.c
View File

@ -87,12 +87,6 @@ herbsearch(region * r, unit * u, int max)
} }
} }
#ifdef OLD_DEMON_POTION
attrib_type at_bauernblut = {
"bauernblut", NULL, NULL, NULL, NULL, NULL
};
#endif
int int
use_potion(unit * u, const item_type * itype, int amount, struct order *ord) use_potion(unit * u, const item_type * itype, int amount, struct order *ord)
{ {

3
src/common/kernel/alchemy.h
View File

@ -83,9 +83,6 @@ void herbsearch(struct region * r, struct unit * u, int max);
int use_potion(struct unit * u, const struct item_type * itype, int amount, struct order *); int use_potion(struct unit * u, const struct item_type * itype, int amount, struct order *);
void init_potions(void); void init_potions(void);
#ifdef OLD_DEMON_POTION
extern struct attrib_type at_bauernblut;
#endif
extern int get_effect(const struct unit * u, const struct potion_type * effect); extern int get_effect(const struct unit * u, const struct potion_type * effect);
extern int change_effect(struct unit * u, const struct potion_type * effect, int value); extern int change_effect(struct unit * u, const struct potion_type * effect, int value);
extern attrib_type at_effect; extern attrib_type at_effect;

17
src/common/kernel/item.c
View File

@ -1993,19 +1993,14 @@ use_bloodpotion(struct unit *u, const struct potion_type *ptype, int amount, str
assert(ptype==oldpotiontype[P_BAUERNBLUT]); assert(ptype==oldpotiontype[P_BAUERNBLUT]);
unused(ptype); unused(ptype);
if (u->race == new_race[RC_DAEMON] ) { if (u->race == new_race[RC_DAEMON] ) {
#ifdef OLD_DEMON_POTION
attrib * a = (attrib*)a_find(u->attribs, &at_bauernblut);
if (!a) a = a_add(&u->attribs, a_new(&at_bauernblut));
a->data.i += 100*amount;
#else
change_effect(u, ptype, 100*amount); change_effect(u, ptype, 100*amount);
#endif
} else { } else {
/* bekommt nicht: */ trigger * trestore = trigger_changerace(u, u->race, u->irace);
cmistake(u, ord, 165, MSG_EVENT); int duration = 2 + rand() % 8;
u->race = new_race[RC_GHOUL];
u_setfaction(u, findfaction(MONSTER_FACTION)); add_trigger(&u->attribs, "timer", trigger_timeout(duration, trestore));
} u->irace = u->race = new_race[RC_TOAD];
}
return 0; return 0;
} }