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

remove P_POWER from use_potion

This commit is contained in:
Enno Rehling 2018-02-17 19:02:02 +01:00
parent afe1cf34f3
commit b602ac5f1a
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/alchemy.c
View File

@ -155,17 +155,6 @@ static int potion_luck(unit *u, region *r, attrib_type *atype, int amount) {
return amount; return amount;
} }
static int potion_power(unit *u, int amount) {
int hp = 10 * amount;
if (hp > u->number) {
hp = u->number;
amount = (hp + 9) % 10;
}
u->hp += hp * unit_max_hp(u) * 4;
return amount;
}
int use_potion(unit * u, const item_type * itype, int amount, struct order *ord) int use_potion(unit * u, const item_type * itype, int amount, struct order *ord)
{ {
region *r = u->region; region *r = u->region;
@ -176,9 +165,6 @@ int use_potion(unit * u, const item_type * itype, int amount, struct order *ord)
else if (itype == oldpotiontype[P_HORSE]) { else if (itype == oldpotiontype[P_HORSE]) {
amount = potion_luck(u, r, &at_horseluck, amount); amount = potion_luck(u, r, &at_horseluck, amount);
} }
else if (itype == oldpotiontype[P_MACHT]) {
amount = potion_power(u, amount);
}
else { else {
change_effect(u, itype, 10 * amount); change_effect(u, itype, 10 * amount);
} }

20
src/items.c
View File

@ -458,6 +458,25 @@ static int use_ointment(unit *u, const item_type *itype,
return potion_ointment(u, amount); return potion_ointment(u, amount);
} }
static int potion_power(unit *u, int amount) {
int hp = 10 * amount;
if (hp > u->number) {
hp = u->number;
amount = (hp + 9) % 10;
}
u->hp += hp * unit_max_hp(u) * 4;
return amount;
}
static int use_power_elixir(unit *u, const item_type *itype,
int amount, struct order *ord)
{
ADDMSG(&u->faction->msgs, msg_message("use_item",
"unit amount item", u, amount, itype->rtype));
return potion_power(u, amount);
}
void register_itemfunctions(void) void register_itemfunctions(void)
{ {
/* have tests: */ /* have tests: */
@ -474,5 +493,6 @@ void register_itemfunctions(void)
register_item_use(use_bloodpotion, "use_peasantblood"); register_item_use(use_bloodpotion, "use_peasantblood");
register_item_use(use_ointment, "use_ointment"); register_item_use(use_ointment, "use_ointment");
register_item_use(use_healing_potion, "use_p14"); register_item_use(use_healing_potion, "use_p14");
register_item_use(use_power_elixir, "use_p13");
register_item_use(use_warmthpotion, "use_nestwarmth"); register_item_use(use_warmthpotion, "use_nestwarmth");
} }