Merge pull request #526 from Seraph2/demonic-gorilla-aoe-warnings

Added demonic gorilla AoE warnings
This commit is contained in:
Tyler Bochard
2019-06-11 18:28:34 -04:00
committed by GitHub
3 changed files with 52 additions and 4 deletions

View File

@@ -37,10 +37,12 @@ public enum AoeProjectileInfo
LIZARDMAN_SHAMAN_AOE(ProjectileID.LIZARDMAN_SHAMAN_AOE, 5),
CRAZY_ARCHAEOLOGIST_AOE(ProjectileID.CRAZY_ARCHAEOLOGIST_AOE, 3),
ICE_DEMON_RANGED_AOE(ProjectileID.ICE_DEMON_RANGED_AOE, 3),
/**
* When you don't have pray range on ice demon does an ice barrage
*/
ICE_DEMON_ICE_BARRAGE_AOE(ProjectileID.ICE_DEMON_ICE_BARRAGE_AOE, 3),
/**
* The AOE when vasa first starts
*/
@@ -61,7 +63,10 @@ public enum AoeProjectileInfo
*/
GALVEK_MINE(ProjectileID.GALVEK_MINE, 3),
GALVEK_BOMB(ProjectileID.GALVEK_BOMB, 3),
/**
* the AOEs of Grotesque Guardians
*/
DAWN_FREEZE(ProjectileID.DAWN_FREEZE, 3),
DUSK_CEILING(ProjectileID.DUSK_CEILING, 3),
@@ -78,7 +83,6 @@ public enum AoeProjectileInfo
/**
* the AOE of the Corporeal Beast
*/
CORPOREAL_BEAST(ProjectileID.CORPOREAL_BEAST_AOE, 1),
CORPOREAL_BEAST_DARK_CORE(ProjectileID.CORPOREAL_BEAST_DARK_CORE_AOE, 3),
@@ -114,7 +118,12 @@ public enum AoeProjectileInfo
/**
* Cerbs fire
*/
CERB_FIRE(ProjectileID.CERB_FIRE, 2);
CERB_FIRE(ProjectileID.CERB_FIRE, 2),
/**
* Demonic gorilla
*/
DEMONIC_GORILLA_BOULDER(ProjectileID.DEMONIC_GORILLA_BOULDER, 1);
private static final Map<Integer, AoeProjectileInfo> map = new HashMap<>();

View File

@@ -818,4 +818,41 @@ public interface AoeWarningConfig extends Config
{
return false;
}
}
@ConfigItem(
keyName = "demonicGorillaStub",
name = "Demonic Gorilla",
description = "",
position = 64,
parent = "npcStub"
)
default Stub demonicGorillaStub()
{
return new Stub();
}
@ConfigItem(
keyName = "demonicGorilla",
name = "Demonic Gorilla",
description = "Configures if Demonic Gorilla boulder tile markers are displayed",
parent = "demonicGorillaStub",
position = 65
)
default boolean isDemonicGorillaEnabled()
{
return true;
}
@ConfigItem(
keyName = "demonicGorillaNotify",
name = "Demonic Gorilla Notify",
description = "Configures whether or not AoE Projectile Warnings for Demonic Gorilla boulders should trigger a notification",
parent = "demonicGorillaStub",
position = 66,
hide = "aoeNotifyAll"
)
default boolean isDemonicGorillaNotifyEnabled()
{
return false;
}
}

View File

@@ -330,6 +330,8 @@ public class AoeWarningPlugin extends Plugin
return notify ? config.isDrakeNotifyEnabled() : config.isDrakeEnabled();
case CERB_FIRE:
return notify ? config.isCerbFireNotifyEnabled() : config.isCerbFireEnabled();
case DEMONIC_GORILLA_BOULDER:
return notify ? config.isDemonicGorillaNotifyEnabled() : config.isDemonicGorillaEnabled();
}
return false;