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

Modify xengulfhurty to accept a null magr and implement generic cloud handling using it for hit effects.

Browse source
This commit is contained in:
demogorgon22 2024-02-11 19:46:57 +00:00
parent d7538d60e2
commit 48cfea7b1a
3 changed files with 51 additions and 36 deletions

1
include/extern.h
View file

@ -3432,6 +3432,7 @@ E int FDECL(xmeleehurty, (struct monst *, struct monst *, struct attack *, struc
E void FDECL(getgazeinfo, (int, int, struct permonst *, struct monst *, struct monst *, boolean *, boolean *, boolean *));
E int FDECL(xgazey, (struct monst *, struct monst *, struct attack *, int));
E int FDECL(xengulfhity, (struct monst *, struct monst *, struct attack *, int));
E int FDECL(xengulfhurty, (struct monst *, struct monst *, struct attack *, int));
E void FDECL(passive_obj2, (struct monst *, struct monst *, struct obj *, struct attack *, struct attack *));
E void FDECL(breakobj, (struct obj *, XCHAR_P, XCHAR_P, BOOLEAN_P, BOOLEAN_P));
E int FDECL(hmon_with_unowned_obj, (struct monst *, struct obj **, int));

20
src/region.c
View file

@ -505,7 +505,7 @@ xchar x, y;
int i;
for (i = 0; i < n_regions; i++) {
if (inside_region(regions[i], x, y) &&
regions[i]->arg.adtyp == AD_POSN
regions[i]->arg.adtyp == AD_DRST
) {
return TRUE;
}
@ -963,7 +963,7 @@ genericptr_t p2;
cloud_data = (struct region_arg *) &reg->arg;
switch(cloud_data->adtyp){
case AD_POSN:
case AD_DRST:
return expire_gas_cloud(p1, p2);
case AD_DESC:
return expire_dust_cloud(p1, p2);
@ -989,11 +989,14 @@ genericptr_t p2;
NhRegion *reg;
struct monst *mdef;
struct region_arg *cloud_data;
struct attack attk;
int vis;
int result;
reg = (NhRegion *) p1;
cloud_data = (struct region_arg *) &reg->arg;
switch(cloud_data->adtyp){
case AD_POSN:
case AD_DRST:
return inside_gas_cloud(p1, p2);
case AD_DESC:
return inside_dust_cloud(p1, p2);
@ -1002,7 +1005,14 @@ genericptr_t p2;
}
/* If not a specially handled type, do generic handling */
mdef = p2 ? (struct monst *) p2: &youmonst;
return FALSE;
boolean youdef = (mdef == &youmonst);
attk.aatyp = AT_ENGL;
attk.adtyp = cloud_data->adtyp;
attk.damn = cloud_data->damage;
attk.damd = 1;
vis = getvis((struct monst *) 0, mdef, 0, 0);
result = xengulfhurty((struct monst *) 0, mdef, &attk, vis);
return result & MM_DEF_DIED;
}
@ -1147,7 +1157,7 @@ boolean yours;
NhRect tmprect;
struct region_arg cloud_data;
cloud_data.damage = damage;
cloud_data.adtyp = AD_POSN;
cloud_data.adtyp = AD_DRST;
cloud = create_region((NhRect *) 0, 0);
nrect = radius;

66
src/xhity.c
View file

@ -16,7 +16,6 @@ STATIC_DCL void FDECL(xymissmsg, (struct monst *, struct monst *, struct attack
STATIC_DCL int FDECL(do_weapon_multistriking_effects, (struct monst *, struct monst *, struct attack *, struct obj *, int));
STATIC_DCL int FDECL(xcastmagicy, (struct monst *, struct monst *, struct attack *, int));
STATIC_DCL int FDECL(xtinkery, (struct monst *, struct monst *, struct attack *, int));
STATIC_DCL int FDECL(xengulfhurty, (struct monst *, struct monst *, struct attack *, int));
STATIC_DCL int FDECL(xexplodey, (struct monst *, struct monst *, struct attack *, int));
STATIC_DCL int FDECL(hmoncore, (struct monst *, struct monst *, struct attack *, struct attack *, struct obj **, void *, int, int, int, boolean, int, boolean, int));
STATIC_DCL void FDECL(add_silvered_art_sear_adjectives, (char *, struct obj*));
@ -9898,14 +9897,14 @@ int vis;
int
xengulfhurty(magr, mdef, attk, vis)
struct monst * magr;
struct monst * magr; /* May be NULL if being used for generic cloud damage handling (engulfed by a cloud) */
struct monst * mdef;
struct attack * attk;
int vis;
{
boolean youagr = (magr == &youmonst);
boolean youdef = (mdef == &youmonst);
struct permonst * pa = youagr ? youracedata : magr->data;
struct permonst * pa = magr ? (youagr ? youracedata : magr->data) : (struct permonst *) 0;
struct permonst * pd = youdef ? youracedata : mdef->data;
int result = MM_MISS;
int dmg = d(attk->damn, attk->damd);
@ -9921,7 +9920,7 @@ int vis;
/* the most important and most special case */
case AD_DGST:
if (youdef) {
if (pa->mtyp == PM_METROID_QUEEN && !Drain_resistance) {
if (pa && pa->mtyp == PM_METROID_QUEEN && !Drain_resistance) {
losexp("life force drain", TRUE, FALSE, FALSE);
magr->mhpmax += d(1, 4);
magr->mhp += d(1, 6);
@ -9941,7 +9940,7 @@ int vis;
}
else {
*hp(mdef) -= *hp(mdef)/(u.uswldtim+1); //Floored and current HP, so never fatal.
pline("%s%s digests you!", Monnam(magr),
pline("%s%s digests you!", magr ? Monnam(magr): "Something",
(u.uswldtim == 2) ? " thoroughly" :
(u.uswldtim == 1) ? " utterly" : "");
exercise(A_STR, FALSE);
@ -10051,7 +10050,7 @@ int vis;
}
else { //mvm
/* eating a Rider or its corpse is fatal */
if (is_rider(mdef->data)) {
if (is_rider(mdef->data) && magr) {
if (vis)
pline("%s %s!", Monnam(magr),
mdef->mtyp == PM_FAMINE ?
@ -10070,7 +10069,7 @@ int vis;
}
}
else if(is_indigestible(mdef->data)){
if(canspotmon(magr) || canspotmon(mdef)){
if(magr && (canspotmon(magr) || canspotmon(mdef))){
pline("%s regurgitates %s.", Monnam(magr), mon_nam(mdef));
}
dmg = 0;
@ -10078,7 +10077,7 @@ int vis;
}
else if(is_delouseable(mdef->data)){
mdef = delouse(mdef, AD_DGST);
if(canspotmon(magr) || canspotmon(mdef)){
if(magr && (canspotmon(magr) || canspotmon(mdef))){
pline("%s regurgitates %s.", Monnam(magr), mon_nam(mdef));
}
dmg = 0;
@ -10099,7 +10098,7 @@ int vis;
dmg = mdef->mhpmax*(20-resist)/20;
if(dmg < mdef->mhp){
mdef->mhp -= dmg;//Will not kill defender
if(canspotmon(magr) || canspotmon(mdef)){
if(magr && (canspotmon(magr) || canspotmon(mdef))){
pline("%s regurgitates %s.", Monnam(magr), mon_nam(mdef));
}
dmg = 0;
@ -10123,10 +10122,10 @@ int vis;
}
/* Is a corpse for nutrition possible? It may kill magr */
if (!corpse_chance(mdef, magr, TRUE)) {
if (magr && !corpse_chance(mdef, magr, TRUE)) {
break;
}
if (*hp(magr) < 1) {
if (magr && *hp(magr) < 1) {
result |= MM_AGR_DIED;
break;
}
@ -10135,7 +10134,7 @@ int vis;
* DGST monsters don't die from undead corpses
*/
int num = monsndx(mdef->data);
if (get_mx(magr, MX_EDOG) &&
if (magr && get_mx(magr, MX_EDOG) &&
!((mvitals[num].mvflags & G_NOCORPSE) || get_mx(mdef, MX_ESUM))) {
struct obj *virtualcorpse = mksobj(CORPSE, MKOBJ_NOINIT);
int nutrit;
@ -10221,7 +10220,7 @@ int vis;
if (can_blnd(magr, mdef, attk->aatyp, (struct obj*)0)) {
if (youdef) {
if (uarmh && uarmh->otyp == SHEMAGH &&
if (uarmh && uarmh->otyp == SHEMAGH && magr &&
(magr->mtyp == PM_DUST_VORTEX || magr->mtyp == PM_SINGING_SAND || magr->mtyp == PM_PYROCLASTIC_VORTEX))
{
pline("The %s protects you from the dust!", simple_typename(uarmh->otyp));
@ -10238,7 +10237,7 @@ int vis;
else {
struct obj *otmp = which_armor(mdef, W_ARMH);
if (otmp && otmp->otyp == SHEMAGH && (magr->mtyp == PM_DUST_VORTEX || magr->mtyp == PM_SINGING_SAND)){
if (otmp && otmp->otyp == SHEMAGH && magr && (magr->mtyp == PM_DUST_VORTEX || magr->mtyp == PM_SINGING_SAND)){
if (vis&VIS_MDEF)
pline("The %s protects %s from the dust!", simple_typename(otmp->otyp), Monnam(mdef));
} else {
@ -10295,9 +10294,11 @@ int vis;
/* KMH -- this is okay with unchanging */
rehumanize();
result = MM_DEF_LSVD;
magr->mhp = 1;
expels(magr, pa, FALSE);
pline("Rusting your iron body took a severe toll on the cloud!");
if(magr){
magr->mhp = 1;
expels(magr, pa, FALSE);
pline("Rusting your iron body took a severe toll on the cloud!");
}
}
else {
if (vis&VIS_MDEF) {
@ -10314,7 +10315,9 @@ int vis;
else {
if (mdef->mtame && !vis && !youagr)
pline("May %s rust in peace.", mon_nam(mdef));
result = (MM_HIT | MM_DEF_DIED | (youagr || grow_up(magr, mdef) ? 0 : MM_AGR_DIED));
result = (MM_HIT | MM_DEF_DIED);
if(magr)
result |= ((youagr || grow_up(magr, mdef)) ? 0 : MM_AGR_DIED);
}
}
}
@ -10353,7 +10356,7 @@ int vis;
break;
/* basic damage engulf types */
case AD_PHYS:
if (pa->mtyp == PM_FOG_CLOUD || pa->mtyp == PM_STEAM_VORTEX) {
if (pa && (pa->mtyp == PM_FOG_CLOUD || pa->mtyp == PM_STEAM_VORTEX)) {
if (youdef) {
You("are laden with moisture and %s",
flaming(youracedata) ? "are smoldering out!" :
@ -10376,7 +10379,7 @@ int vis;
}
}
}
else if (pa->mtyp == PM_DREADBLOSSOM_SWARM) {
else if (pa && pa->mtyp == PM_DREADBLOSSOM_SWARM) {
if (youdef) {
You("are sliced by the whirling stems!");
exercise(A_DEX, FALSE);
@ -10444,7 +10447,7 @@ int vis;
dmg = 0;
}
/* message, special effects */
if (((attk->adtyp == AD_EELC) || (youagr || !magr->mcan)) &&
if (((attk->adtyp == AD_EELC) || (youagr || (!magr || !magr->mcan))) &&
(rn2(2) || !youdef || !u.uswallow))
{
/* message */
@ -10461,9 +10464,9 @@ int vis;
}
/* destroy items */
if (!UseInvShock_res(mdef)){
if (mlev(magr) > rn2(20))
if (magr ? mlev(magr) > rn2(20) : !rn2(4))
destroy_item(mdef, WAND_CLASS, AD_ELEC);
if (mlev(magr) > rn2(20))
if (magr ? mlev(magr) > rn2(20) : !rn2(4))
destroy_item(mdef, RING_CLASS, AD_ELEC);
}
/* golem effects */
@ -10499,7 +10502,7 @@ int vis;
dmg = 0;
}
/* message, special effects */
if (((attk->adtyp == AD_ECLD) || (youagr || !magr->mcan)) &&
if (((attk->adtyp == AD_ECLD) || (youagr || (!magr || !magr->mcan))) &&
(rn2(2) || !youdef || !u.uswallow))
{
/* message */
@ -10519,7 +10522,7 @@ int vis;
}
/* destroy items */
if (!UseInvCold_res(mdef)){
if (mlev(magr) > rn2(20))
if (magr ? mlev(magr) > rn2(20): !rn2(4))
destroy_item(mdef, POTION_CLASS, AD_COLD);
}
/* golem effects */
@ -10559,7 +10562,7 @@ int vis;
}
/* message, special effects */
/* This seems buggy mvm. They're really cold if YOU'RE swallowed! */
if (((attk->adtyp == AD_EFIR || attk->adtyp == AD_ACFR) || (youagr || !magr->mcan)) &&
if (((attk->adtyp == AD_EFIR || attk->adtyp == AD_ACFR) || (youagr || (!magr || !magr->mcan))) &&
(rn2(2) || !youdef || !u.uswallow))
{
/* message */
@ -10587,11 +10590,11 @@ int vis;
}
/* destroy items */
if (!UseInvFire_res(mdef)) {
if (mlev(magr) > rn2(20))
if (magr ? mlev(magr) > rn2(20) : !rn2(4))
destroy_item(mdef, SCROLL_CLASS, AD_FIRE);
if (mlev(magr) > rn2(20))
if (magr ? mlev(magr) > rn2(20): !rn2(4))
destroy_item(mdef, POTION_CLASS, AD_FIRE);
if (mlev(magr) > rn2(25))
if (magr? mlev(magr) > rn2(25): !rn2(5))
destroy_item(mdef, SPBOOK_CLASS, AD_FIRE);
}
/* golem effects */
@ -10620,7 +10623,7 @@ int vis;
dmg *= 2;
}
/* message, special effects */
if (youagr || !magr->mcan){
if (youagr || (!magr || !magr->mcan)){
/* message */
if (vis&VIS_MDEF) {
if (dmg) {
@ -10656,7 +10659,8 @@ int vis;
);
}
/* heal from damage dealt*/
heal(magr, min(*hp(mdef), dmg));
if(magr)
heal(magr, min(*hp(mdef), dmg));
}
/* deal damage */
result = xdamagey(magr, mdef, attk, dmg);