noisytoot/notnotdnethack
1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-08-07 21:25:26 +01:00
Code Issues Activity

Cha casters are psychic

Browse source 
Suffers 3x metal helm penalty, but

1) Don't need free hands or physical strength.
2) Don't suffer shield penalty.
3) Don't suffer special metal glove penalty.
4) Don't need to speak.

Note: This allows most madmen to cast spells if they find a spellbook, which gives another answer to the "how do I get out of the early game" question.
Also note: Incant madmen as INT casters, which means they don't benefit from this and remain in big trouble!
This commit is contained in:
ChrisANG 2021-10-02 13:46:25 -04:00
parent 330ed33229
commit 4dc2f672d3
1 changed files with 15 additions and 14 deletions

29
src/spell.c
View file

@ -4438,6 +4438,7 @@ int
spelleffects(int spell, boolean atme, int spelltyp)
{
int energy, damage, chance, n, intell;
int casting_stat = base_casting_stat();
int skill, role_skill;
boolean confused = (Confusion != 0);
struct obj *pseudo;
@ -4475,13 +4476,13 @@ spelleffects(int spell, boolean atme, int spelltyp)
if (!Race_if(PM_INCANTIFIER) && u.uhunger <= 10 && spellid(spell) != SPE_DETECT_FOOD) {
You("are too hungry to cast that spell.");
return(0);
} else if (ACURR(A_STR) < 4) {
} else if (ACURR(A_STR) < 4 && casting_stat != A_CHA) {
You("lack the strength to cast spells.");
return(0);
} else if(check_capacity(
"Your concentration falters while carrying so much stuff.")) {
return (1);
} else if (!freehand()) {
} else if (!freehand() && casting_stat != A_CHA) {
Your("arms are not free to cast!");
return (0);
}
@ -5698,25 +5699,25 @@ int spell;
/* Intrinsic and learned ability are combined to calculate
* the probability of player's success at cast a given spell.
*/
int chance, splcaster, special, statused;
int chance, splcaster, special, statused, casting_stat = base_casting_stat();
int difficulty;
int skill;
if(Deadmagic && base_casting_stat() == A_INT) return 0;
if(Catapsi && base_casting_stat() == A_CHA) return 0;
if(Misotheism && base_casting_stat() == A_WIS) return 0;
if(Deadmagic && casting_stat == A_INT) return 0;
if(Catapsi && casting_stat == A_CHA) return 0;
if(Misotheism && casting_stat == A_WIS) return 0;
if(Nullmagic) return 0;
/* Calculate intrinsic ability (splcaster) */
splcaster = urole.spelbase;
special = urole.spelheal;
statused = ACURR(base_casting_stat());
statused = ACURR(casting_stat);
if(Role_if(PM_BARD) && spell_skilltype(spellid(spell)) == P_ENCHANTMENT_SPELL)
statused = ACURR(A_CHA);
if((Doubt || flat_mad_turn(MAD_APOSTASY))
&& (base_casting_stat() == A_WIS || spell_skilltype(spellid(spell)) == P_HEALING_SPELL || spell_skilltype(spellid(spell)) == P_CLERIC_SPELL)
&& (casting_stat == A_WIS || spell_skilltype(spellid(spell)) == P_HEALING_SPELL || spell_skilltype(spellid(spell)) == P_CLERIC_SPELL)
)
return 0;
if(mad_turn(MAD_TOO_BIG))
@ -5860,12 +5861,12 @@ int spell;
if (uarmh) {
if (is_metallic(uarmh) && uarmh->otyp != HELM_OF_BRILLIANCE)
splcaster += uarmhbon;
splcaster += casting_stat == A_CHA ? uarmhbon*3 : uarmhbon;
}
if (uarmg) {
if (is_metallic(uarmg))
splcaster += uarmgbon;
splcaster += casting_stat == A_CHA ? uarmfbon : uarmgbon;
}
if (uarmf) {
@ -5874,7 +5875,7 @@ int spell;
}
if (uarms) {
splcaster += urole.spelshld;
splcaster += casting_stat == A_CHA ? 0 : urole.spelshld;
}
if(u.sealsActive&SEAL_PAIMON) splcaster -= urole.spelarmr;
@ -5998,14 +5999,14 @@ int spell;
chance = 100;
//
if(Babble || Screaming || Strangled || FrozenAir || BloodDrown || Drowning){
if(casting_stat != A_CHA && (Babble || Screaming || Strangled || FrozenAir || BloodDrown || Drowning)){
chance = 0;
}
// these effects totally block the spell-choosing menu, but need to be handled here too for quivered spells
else if ((mad_turn(MAD_TOO_BIG)) ||
(Doubt && base_casting_stat() == A_WIS) ||
(Doubt && casting_stat == A_WIS) ||
// (mad_turn(MAD_SCIAPHILIA) && ()(dimness(u.ux, u.uy) != 3 && dimness(u.ux, u.uy) > 0) || (!levl[u.ux][u.uy].lit && dimness(u.ux, u.uy) == 0)) ||
(base_casting_stat() == A_WIS && flat_mad_turn(MAD_APOSTASY))
(casting_stat == A_WIS && flat_mad_turn(MAD_APOSTASY))
){
chance = 0;
}