ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Adding Addy Dragons to Aoe Warnings (#179)

Browse Source 
* Adding Addy Dragons to Aoe Warnings

* Reformatting AoeProjectileInfo

* Updating ProjId api with new ids
This commit is contained in:
Ganom
2019-05-04 10:17:20 -04:00
committed by vanni
parent 6346b8439f
commit 8415e1709e
3 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runelite-api/src/main/java/net/runelite/api/ProjectileID.java
View File

@@ -44,14 +44,19 @@ public class ProjectileID
public static final int VASA_RANGED_AOE = 1329;
public static final int TEKTON_METEOR_AOE = 660;
public static final int OLM_FALLING_CRYSTAL_AOE = -1; //please help
public static final int OLM_BURNING_AOE = -1;
public static final int OLM_FALLING_CRYSTAL = 1357;
public static final int OLM_BURNING = 1349;
public static final int OLM_FALLING_CRYSTAL_TRAIL = 1352;
public static final int OLM_ACID_TRAIL = 1354;
public static final int OLM_FIRE_LINE = 1347;
public static final int VORKATH_BOMB_AOE = 1481;
public static final int VORKATH_POISON_POOL_AOE = 1483;
public static final int VORKATH_TICK_FIRE_AOE = 1482;
public static final int VORKATH_SPAWN_AOE = 1484;
public static final int ADDY_DRAG_POISON = 1486;
public static final int GALVEK_MINE = 1495;
public static final int GALVEK_BOMB = 1491;
@@ -60,12 +65,12 @@ public class ProjectileID
public static final int VETION_LIGHTNING = 280;
public static final int CHAOS_FANATIC_AOE = 551; //for lack of a better word
public static final int CHAOS_FANATIC_AOE = 551;
public static final int CORPOREAL_BEAST_AOE = 315;
public static final int CORPOREAL_BEAST_DARK_CORE_AOE = 319;
public static final int WINTERTODT_SNOW_FALL_AOE = 501;
public static final int WINTERTODT_SNOW_FALL_AOE = 1310;
public static final int DEMONIC_GORILLA_RANGED = 1302;
public static final int DEMONIC_GORILLA_MAGIC = 1304;

60
runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectileInfo.java
View File

@@ -27,8 +27,6 @@ package net.runelite.client.plugins.aoewarnings;
import java.time.Duration;
import java.util.HashMap;
import java.util.Map;
import net.runelite.api.Projectile;
import net.runelite.api.ProjectileID;
public enum AoeProjectileInfo
@@ -83,41 +81,27 @@ public enum AoeProjectileInfo
/**
* the AOEs of The Great Olm
* missing ids and length, please help
*/
OLM_FALLING_CRYSTAL(1357, 3000, 3),
OLM_BURNING(1349, 2400, 1),
OLM_FALLING_CRYSTAL_TRAIL(1352, 2400, 1),
OLM_ACID_TRAIL(1354, 2400, 1),
OLM_FIRE_LINE(1347, 2400, 1),
OLM_FALLING_CRYSTAL(ProjectileID.OLM_FALLING_CRYSTAL, 3000, 3),
OLM_BURNING(ProjectileID.OLM_BURNING, 2400, 1),
OLM_FALLING_CRYSTAL_TRAIL(ProjectileID.OLM_FALLING_CRYSTAL_TRAIL, 2400, 1),
OLM_ACID_TRAIL(ProjectileID.OLM_ACID_TRAIL, 2400, 1),
OLM_FIRE_LINE(ProjectileID.OLM_FIRE_LINE, 2400, 1),
/**
* the AOE of the Wintertodt snow that falls
*/
WINTERTODT_SNOW_FALL(1310, 4000, 3),
WINTERTODT_SNOW_FALL(ProjectileID.WINTERTODT_SNOW_FALL_AOE, 4000, 3),
/**
* AOE of Xarpus throwing poison
*/
XARPUS_POISON_AOE(ProjectileID.XARPUS_ACID, 4000, 3);
XARPUS_POISON_AOE(ProjectileID.XARPUS_ACID, 4000, 3),
/**
* The id of the projectile to trigger this AoE warning
* Aoe of Addy Drags
*/
private final int id;
/**
* How long the indicator should last for this AoE warning This might
* need to be a bit longer than the projectile actually takes to land as
* there is a fade effect on the warning
*/
private final Duration lifeTime;
/**
* The size of the splash radius of the AoE warning Ex. Lizardman shaman
* AoE is a 3x3, so aoeSize = 3
*/
private final int aoeSize;
ADDY_DRAG_POISON(ProjectileID.ADDY_DRAG_POISON, 2400, 1);
private static final Map<Integer, AoeProjectileInfo> map = new HashMap<>();
@@ -129,6 +113,22 @@ public enum AoeProjectileInfo
}
}
/**
* The id of the projectile to trigger this AoE warning
*/
private final int id;
/**
* How long the indicator should last for this AoE warning This might
* need to be a bit longer than the projectile actually takes to land as
* there is a fade effect on the warning
*/
private final Duration lifeTime;
/**
* The size of the splash radius of the AoE warning Ex. Lizardman shaman
* AoE is a 3x3, so aoeSize = 3
*/
private final int aoeSize;
AoeProjectileInfo(int id, int lifeTimeMillis, int aoeSize)
{
this.id = id;
@@ -136,6 +136,11 @@ public enum AoeProjectileInfo
this.aoeSize = aoeSize;
}
public static AoeProjectileInfo getById(int id)
{
return map.get(id);
}
public Duration getLifeTime()
{
return lifeTime;
@@ -150,9 +155,4 @@ public enum AoeProjectileInfo
{
return aoeSize;
}
public static AoeProjectileInfo getById(int id)
{
return map.get(id);
}
}

2
runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java
View File

@@ -295,6 +295,8 @@ public class AoeWarningPlugin extends Plugin
return config.isWintertodtEnabled();
case XARPUS_POISON_AOE:
return config.isXarpusEnabled();
case ADDY_DRAG_POISON:
return config.addyDrags();
}
return false;