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

*Brand tweaks:

Browse source 
Fire brand gets +6d6 fire damage (equal to fireball)/12d6 vs. fire-hating monsters (natural cold res and no fire res)

Frost brand:
-Now gets blunt mask added instead of Explosion mask
-+3d8 physical damage (or 6d8 vs. cold-haters)
-+3d8 cold damage (or 6d8 vs. cold-haters)

Both brands are allowed to be crow quills, but carcosan stings, chikage, pincer staves, isamusei, diskoses, bestial claws, and mercy blades are all banned.
This commit is contained in:
ChrisANG 2024-11-21 10:14:32 -05:00
parent 35f2e596bb
commit cdc0e08914
4 changed files with 20 additions and 4 deletions

4
include/artilist.h
View file

@ -555,7 +555,7 @@ A("Frost Brand", LONG_SWORD, "ice-runed %s",
3000L, GLASS, MZ_DEFAULT, WT_DEFAULT,
A_NONE, NON_PM, NON_PM, TIER_B, (ARTG_GIFT),
NO_MONS(),
ATTK(AD_COLD, 1, 0), NOFLAG,
ATTK(AD_COLD, 1, 0), NOFLAG, //Also +3d8 cold +3d8 phys
PROPS(COLD_RES), NOFLAG,
PROPS(), NOFLAG,
NOINVOKE, (ARTI_PLUSSEV)
@ -564,7 +564,7 @@ A("Fire Brand", LONG_SWORD, "ember-runed %s",
3000L, OBSIDIAN_MT, MZ_DEFAULT, WT_DEFAULT,
A_NONE, NON_PM, NON_PM, TIER_B, (ARTG_GIFT),
NO_MONS(),
ATTK(AD_FIRE, 1, 0), NOFLAG,
ATTK(AD_FIRE, 1, 0), NOFLAG, //Also +6d6 fire
PROPS(FIRE_RES), NOFLAG,
PROPS(), NOFLAG,
NOINVOKE, (ARTI_PLUSSEV)

8
include/obj.h
View file

@ -599,7 +599,13 @@ struct obj {
!is_vibroweapon((o)) && \
!is_rakuyo((o)) && \
!((o)->otyp == SET_OF_CROW_TALONS) && \
!((o)->otyp == CROW_QUILL) && \
!((o)->otyp == CARCOSAN_STING) && \
!((o)->otyp == CHIKAGE) && \
!((o)->otyp == PINCER_STAFF) && \
!((o)->otyp == ISAMUSEI) && \
!((o)->otyp == DISKOS) && \
!((o)->otyp == BESTIAL_CLAW) && \
!(is_mercy_blade(o)) && \
!((o)->otyp == CRYSTAL_SWORD) && \
!((o)->otyp == RUNESWORD) && \
!((o)->otyp == MIRRORBLADE)) \

10
src/artifact.c
View file

@ -3396,6 +3396,16 @@ int * truedmgptr;
*truedmgptr += (damd ? d(multiplier, damd) : max(dmgtomulti, 1)*multiplier);
else
*plusdmgptr += (damd ? d(multiplier, damd) : max(dmgtomulti, 1)*multiplier);
//Also do a fireball or a hail effect
if(otmp->oartifact == ART_FIRE_BRAND && spec_dbon_applies){
*truedmgptr += d(6*multiplier, 6);
}
else if(otmp->oartifact == ART_FROST_BRAND){
if(spec_dbon_applies)
*truedmgptr += d(3*multiplier, 8);
*plusdmgptr += d(3*multiplier, 8);
}
}
return TRUE;
}

2
src/weapon.c
View file

@ -341,6 +341,7 @@ struct monst *magr;
if ( oartifact == ART_YORSHKA_S_SPEAR
|| oartifact == ART_GREEN_DRAGON_CRESCENT_BLAD
|| oartifact == ART_INFINITY_S_MIRRORED_ARC
|| oartifact == ART_FROST_BRAND
|| (obj && otyp == KAMEREL_VAJRA && !litsaber(obj))
){
attackmask |= WHACK;
@ -385,7 +386,6 @@ struct monst *magr;
if ((obj && oartifact == ART_HOLY_MOONLIGHT_SWORD && obj->lamplit)
|| (oartifact == ART_BLOODLETTER && artinstance[oartifact].BLactive >= moves)
|| oartifact == ART_FIRE_BRAND
|| oartifact == ART_FROST_BRAND
|| oartifact == ART_ARYFAERN_KERYM
|| (obj && check_oprop(obj, OPROP_RLYHW) && u.uinsight >= 24)
){