noisytoot/notnotdnethack
1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-05-15 12:05:04 +01:00
Code Issues Activity

Spirit alterations

Browse source 
Chupo bugfix

Ahazu grants flail and iron ball
This commit is contained in:
Chris-plus-alphanumericgibberish 2014-06-26 06:45:51 -04:00
parent 9e6a895c3a
commit 4d0a681041
2 changed files with 5 additions and 4 deletions

7
src/sounds.c
View file

@ -1904,7 +1904,8 @@ int tx,ty;
}
else{
pline("The Spider passes you over, and collects her prize.");
if(o) useup(o);
if(o) useupf(o, 1L);
else{
levl[tx][ty].typ = ROOM;
digfarhole(TRUE,tx,ty);
@ -2926,6 +2927,7 @@ bindspirit(seal_id)
switch(seal_id){
case AHAZU:{
if(u.ahazu < moves){
unrestrict_weapon_skill(P_FLAIL);
u.sealsActive |= SEAL_AHAZU;
u.spirit[u.sealCounts] = SEAL_AHAZU;
u.spiritT[u.sealCounts] = moves + bindingPeriod;
@ -3103,7 +3105,6 @@ bindspirit(seal_id)
}break;
case EVE:{
if(u.eve < moves){
unrestrict_weapon_skill(P_FLAIL);
unrestrict_weapon_skill(P_BOW);
unrestrict_weapon_skill(P_HARVEST);
u.sealsActive |= SEAL_EVE;
@ -3408,7 +3409,7 @@ int p_skill;
if(p_skill == P_CLUB) return u.sealsActive & SEAL_YMIR? TRUE : FALSE;
if(p_skill == P_MACE) return u.sealsActive & SEAL_TENEBROUS? TRUE : FALSE;
if(p_skill == P_MORNING_STAR) return u.sealsActive & SEAL_IRIS? TRUE : FALSE;
if(p_skill == P_FLAIL) return u.sealsActive & SEAL_EVE? TRUE : FALSE;
if(p_skill == P_FLAIL) return u.sealsActive & SEAL_AHAZU? TRUE : FALSE;
if(p_skill == P_HAMMER) return u.sealsActive & SEAL_ENKI ? TRUE : FALSE;
if(p_skill == P_QUARTERSTAFF) return u.sealsActive & SEAL_NABERIUS? TRUE : FALSE;
if(p_skill == P_POLEARMS) return u.sealsActive & SEAL_SHIRO? TRUE : FALSE;

2
src/weapon.c
View file

@ -1489,7 +1489,7 @@ struct obj *obj;
/* Not using a weapon */
return (P_BARE_HANDED_COMBAT);
#ifdef CONVICT
if ((obj->otyp == HEAVY_IRON_BALL) && Role_if(PM_CONVICT))
if ((obj->otyp == HEAVY_IRON_BALL) && (Role_if(PM_CONVICT) || u.sealsActive&SEAL_AHAZU))
return objects[obj->otyp].oc_skill;
#endif /* CONVICT */
if (obj->oclass != WEAPON_CLASS && obj->oclass != TOOL_CLASS &&