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

attackstyles: add weapon types 28 and 29

Browse Source
This commit is contained in:
Adam
2022-05-25 09:25:28 -04:00
parent 8840659453
commit 663d79d6dc
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStyle.java
View File

@@ -24,6 +24,7 @@
*/ */
package net.runelite.client.plugins.attackstyles; package net.runelite.client.plugins.attackstyles;
import lombok.Getter;
import net.runelite.api.Skill; import net.runelite.api.Skill;
enum AttackStyle enum AttackStyle
@@ -38,7 +39,9 @@ enum AttackStyle
DEFENSIVE_CASTING("Defensive Casting", Skill.MAGIC, Skill.DEFENCE), DEFENSIVE_CASTING("Defensive Casting", Skill.MAGIC, Skill.DEFENCE),
OTHER("Other"); OTHER("Other");
@Getter
private final String name; private final String name;
@Getter
private final Skill[] skills; private final Skill[] skills;
AttackStyle(String name, Skill... skills) AttackStyle(String name, Skill... skills)
@@ -46,14 +49,4 @@ enum AttackStyle
this.name = name; this.name = name;
this.skills = skills; this.skills = skills;
} }
public String getName()
{
return name;
}
public Skill[] getSkills()
{
return skills;
}
} }

11
runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/WeaponType.java
View File

@@ -26,6 +26,7 @@ package net.runelite.client.plugins.attackstyles;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import java.util.Map; import java.util.Map;
import lombok.Getter;
import static net.runelite.client.plugins.attackstyles.AttackStyle.ACCURATE; import static net.runelite.client.plugins.attackstyles.AttackStyle.ACCURATE;
import static net.runelite.client.plugins.attackstyles.AttackStyle.AGGRESSIVE; import static net.runelite.client.plugins.attackstyles.AttackStyle.AGGRESSIVE;
import static net.runelite.client.plugins.attackstyles.AttackStyle.CASTING; import static net.runelite.client.plugins.attackstyles.AttackStyle.CASTING;
@@ -65,8 +66,11 @@ enum WeaponType
TYPE_24(ACCURATE, AGGRESSIVE, CONTROLLED, DEFENSIVE), TYPE_24(ACCURATE, AGGRESSIVE, CONTROLLED, DEFENSIVE),
TYPE_25(CONTROLLED, AGGRESSIVE, null, DEFENSIVE), TYPE_25(CONTROLLED, AGGRESSIVE, null, DEFENSIVE),
TYPE_26(AGGRESSIVE, AGGRESSIVE, null, AGGRESSIVE), TYPE_26(AGGRESSIVE, AGGRESSIVE, null, AGGRESSIVE),
TYPE_27(ACCURATE, null, null, OTHER); TYPE_27(ACCURATE, null, null, OTHER),
TYPE_28(ACCURATE, ACCURATE, LONGRANGE),
TYPE_29(ACCURATE, AGGRESSIVE, AGGRESSIVE, DEFENSIVE);
@Getter
private final AttackStyle[] attackStyles; private final AttackStyle[] attackStyles;
private static final Map<Integer, WeaponType> weaponTypes; private static final Map<Integer, WeaponType> weaponTypes;
@@ -88,11 +92,6 @@ enum WeaponType
this.attackStyles = attackStyles; this.attackStyles = attackStyles;
} }
public AttackStyle[] getAttackStyles()
{
return attackStyles;
}
public static WeaponType getWeaponType(int id) public static WeaponType getWeaponType(int id)
{ {
return weaponTypes.get(id); return weaponTypes.get(id);