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

Merge pull request #1652 from NeroOneTrueKing/patch-no-kick-c

Browse source 
Single attacks need to proc per-attack passives too
This commit is contained in:
Chris-plus-alphanumericgibberish 2021-08-17 12:03:44 -04:00 • committed by GitHub
commit fa994e0e92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions

11
src/xhity.c
View file

@ -15317,6 +15317,11 @@ struct monst * mexclude;
*
* Does not include AT_BOOM effects, which are handled in mon.c for monsters.
* SCOPECREEP: handle AT_BOOM effects for players somewhere/somehow.
*
* Call with [attk] and [weapon] (if applicable) with [endofchain]=FALSE for each indiviudal attack
* and then once [attk]=NULL and [endofchain]=TRUE, if there are multiple attacks being made at once
*
* Call with [attk] and [endofchain=TRUE] if there is a single attack being made and retaliated against
*/
int
xpassivey(magr, mdef, attk, weapon, vis, result, pd, endofchain)
@ -15400,7 +15405,7 @@ boolean endofchain; /* if the attacker has finished their attack chain */
/* passives NOT from a creature's attacks */
/* per-attack */
if (!endofchain) {
if (attk) {
/* Iris unbinds on attacking a reflective creature */
if (youagr && u.sealsActive&SEAL_IRIS &&
!(result&MM_DEF_DIED) &&
@ -15651,10 +15656,10 @@ boolean endofchain; /* if the passive is occuring at the end of aggressor's at
else
dmg = 0;
/* These passives specifically happen per attack */
/* These passives specifically happen per attack. */
/* necessary for passives that interact with [attk] */
/* Try not to have passives deal damage like this, because that adds up to a lot quickly. */
if (!endofchain) {
if (attk) {
/* passives from statblock */
if (passive != &noattack && result&MM_HIT) {
switch (passive->adtyp)