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

Merge remote-tracking branch 'kamiel/overhead-api-additions' into next

Browse Source
This commit is contained in:
Adam
2018-05-01 21:24:44 -04:00
parent 3f0782e83a 62deed7730
commit 24865f050f
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-api/src/main/java/net/runelite/api/HeadIcon.java
View File

@@ -28,5 +28,9 @@ public enum HeadIcon
{
MELEE,
RANGED,
MAGIC;
MAGIC,
RETRIBUTION,
SMITE,
REDEMPTION,
RANGE_MAGE; //used by Kalphite Queen
}

3
runelite-mixins/src/main/java/net/runelite/mixins/RSNpcCompositionMixin.java
View File

@@ -28,6 +28,7 @@ import net.runelite.api.HeadIcon;
import static net.runelite.api.HeadIcon.MAGIC;
import static net.runelite.api.HeadIcon.MELEE;
import static net.runelite.api.HeadIcon.RANGED;
import static net.runelite.api.HeadIcon.RANGE_MAGE;
import net.runelite.api.events.NpcActionChanged;
import net.runelite.api.mixins.FieldHook;
import net.runelite.api.mixins.Inject;
@@ -50,6 +51,8 @@ public abstract class RSNpcCompositionMixin implements RSNPCComposition
return RANGED;
case 2:
return MAGIC;
case 6:
return RANGE_MAGE;
default:
return null;
}

9
runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java
View File

@@ -31,6 +31,9 @@ import net.runelite.api.HeadIcon;
import static net.runelite.api.HeadIcon.MAGIC;
import static net.runelite.api.HeadIcon.MELEE;
import static net.runelite.api.HeadIcon.RANGED;
import static net.runelite.api.HeadIcon.REDEMPTION;
import static net.runelite.api.HeadIcon.RETRIBUTION;
import static net.runelite.api.HeadIcon.SMITE;
import net.runelite.api.Model;
import net.runelite.api.Perspective;
import net.runelite.api.Point;
@@ -88,6 +91,12 @@ public abstract class RSPlayerMixin implements RSPlayer
return RANGED;
case 2:
return MAGIC;
case 3:
return RETRIBUTION;
case 4:
return SMITE;
case 5:
return REDEMPTION;
default:
return null;
}