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

Merge pull request #222 from runelite-extended/merge

Browse Source 
Merge All CoX plugins to one.
This commit is contained in:
Jonathan
2019-05-11 14:23:30 -06:00
committed by GitHub
parent 4f33e8f951 2bfe724353
commit 8e1af0b032
9 changed files with 293 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
runelite-client/src/main/java/net/runelite/client/plugins/olmcrippletimer/OlmCrippleTimerOverlay.java
View File

@@ -1,89 +0,0 @@
/*
* Copyright (c) 2018, https://runelitepl.us
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.olmcrippletimer;
import java.awt.*;
import java.util.*;
import java.util.List;
import javax.inject.Inject;
import net.runelite.api.*;
import net.runelite.api.Point;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldArea;
import net.runelite.api.coords.WorldPoint;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
public class OlmCrippleTimerOverlay extends Overlay {
private final Client client;
private final OlmCrippleTimerPlugin plugin;
@Inject
private OlmCrippleTimerOverlay(Client client, OlmCrippleTimerPlugin plugin){
this.client = client;
this.plugin = plugin;
setPosition(OverlayPosition.DYNAMIC);
setPriority(OverlayPriority.HIGH);
setLayer(OverlayLayer.ABOVE_SCENE);
}
@Override
public Dimension render(Graphics2D graphics) {
if(plugin.isHandCripple()){
int tick = plugin.getTimer();
NPC olmHand = plugin.getHand();
final String tickStr = String.valueOf(tick);
Point canvasPoint = olmHand.getCanvasTextLocation(graphics, tickStr, 50);
renderTextLocation(graphics, tickStr, 12 , Font.BOLD, Color.GRAY, canvasPoint);
}
return null;
}
//this is just copy pasted btw
private void renderTextLocation(Graphics2D graphics, String txtString, int fontSize, int fontStyle, Color fontColor, Point canvasPoint)
{
graphics.setFont(new Font("Arial", fontStyle, fontSize));
if (canvasPoint != null)
{
final Point canvasCenterPoint = new Point(
canvasPoint.getX(),
canvasPoint.getY());
final Point canvasCenterPoint_shadow = new Point(
canvasPoint.getX() + 1,
canvasPoint.getY() + 1) ;
OverlayUtil.renderTextLocation(graphics, canvasCenterPoint_shadow, txtString, Color.BLACK);
OverlayUtil.renderTextLocation(graphics, canvasCenterPoint, txtString, fontColor);
}
}
}

114
runelite-client/src/main/java/net/runelite/client/plugins/olmcrippletimer/OlmCrippleTimerPlugin.java
View File

@@ -1,114 +0,0 @@
/*
* Copyright (c) 2018, https://runelitepl.us
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.olmcrippletimer;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.NPC;
import net.runelite.api.NpcID;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.NpcSpawned;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType;
import net.runelite.client.ui.overlay.OverlayManager;
import javax.inject.Inject;
@PluginDescriptor(
name="Olm Cripple Timer",
description = "Shows a timer over the olm hand cripple",
tags = {"cox", "raid", "clench", "melee", "hand"},
type = PluginType.PVM
)
public class OlmCrippleTimerPlugin extends Plugin{
private static final String OLM_HAND_CRIPPLE = "The Great Olm\'s left claw clenches to protect itself temporarily.";
@Inject
private Client client;
@Getter(AccessLevel.PACKAGE)
private boolean HandCripple;
@Getter(AccessLevel.PACKAGE)
private int timer = 45;
@Getter(AccessLevel.PACKAGE)
private NPC hand;
@Inject
private OverlayManager overlayManager;
@Inject
private OlmCrippleTimerOverlay olmCrippleTimerOverlay;
@Override
protected void startUp() throws Exception {
overlayManager.add(olmCrippleTimerOverlay);
}
@Override
protected void shutDown() throws Exception {
overlayManager.remove(olmCrippleTimerOverlay);
HandCripple = false;
timer = 45;
hand = null;
}
@Subscribe
public void onChatMessage(ChatMessage event)
{
String message = event.getMessage();
if(message.startsWith(OLM_HAND_CRIPPLE)){
HandCripple = true;
timer = 45;
}
}
@Subscribe
public void onNpcDespawned(NpcDespawned npcdespawned){
if(npcdespawned.getNpc().getId() == NpcID.GREAT_OLM_RIGHT_CLAW_7553 || npcdespawned.getNpc().getId() == NpcID.GREAT_OLM_RIGHT_CLAW){
HandCripple = false;
}
}
@Subscribe
public void onNpcSpawned(NpcSpawned npcSpawned)
{
if(npcSpawned.getNpc().getId() == NpcID.GREAT_OLM_LEFT_CLAW_7555 || npcSpawned.getNpc().getId() == NpcID.GREAT_OLM_LEFT_CLAW){
hand = npcSpawned.getNpc();
}
}
@Subscribe
public void onGameTick(GameTick event)
{
if(HandCripple) {
timer--;
if (timer <= 0) {
HandCripple = false;
timer = 45;
}
}
}
}

127
runelite-client/src/main/java/net/runelite/client/plugins/olmprayagainst/OlmPrayAgainstPlugin.java
View File

@@ -1,127 +0,0 @@
/*
* Copyright (c) 2019, ganom <https://github.com/Ganom>
* Copyright (c) 2019, gazivodag <https://github.com/gazivodag>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.olmprayagainst;
import javax.inject.Inject;
import javax.inject.Singleton;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client;
import net.runelite.api.Projectile;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ProjectileMoved;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType;
import net.runelite.client.ui.overlay.OverlayManager;
/*
* Tells you what to pray against Olm (Not to be confused with ganoms swapper)
* Most of the code is from Haha Kut's Alchemical Hydra plugin. (See OlmPrayAgainstOverlay)
*/
@PluginDescriptor(
name = "Olm Pray Against",
description = "Tells you what to pray against Olm",
tags = {"prayer", "olm", "raids", "pray against", "cox"},
type = PluginType.PVM
)
@Slf4j
@Singleton
public class OlmPrayAgainstPlugin extends Plugin
{
@Setter
@Getter
protected PrayAgainst prayAgainstOlm;
@Getter
protected long lastPrayTime;
@Inject
private Client client;
@Inject
private OlmPrayAgainstOverlay overlay;
@Inject
private OverlayManager overlayManager;
@Override
protected void startUp()
{
overlayManager.add(overlay);
}
@Override
protected void shutDown() throws Exception
{
overlayManager.remove(overlay);
}
@Subscribe
public void onChatMessage(ChatMessage event)
{
final String msg = event.getMessage();
if (event.getType() == ChatMessageType.GAMEMESSAGE)
{
if (msg.toLowerCase().contains("aggression"))
{
log.debug("Melee Detected");
prayAgainstOlm = PrayAgainst.MELEE;
lastPrayTime = System.currentTimeMillis();
}
if (msg.toLowerCase().contains("of magical power"))
{
log.debug("Mage Detected");
prayAgainstOlm = PrayAgainst.MAGIC;
lastPrayTime = System.currentTimeMillis();
}
if (msg.toLowerCase().contains("accuracy and dexterity"))
{
log.debug("Missile Detected");
prayAgainstOlm = PrayAgainst.RANGED;
lastPrayTime = System.currentTimeMillis();
}
}
}
@Subscribe
public void onProjectileMoved(ProjectileMoved event)
{
Projectile projectile = event.getProjectile();
if (projectile.getId() == 1339)
{
log.debug("Mage Detected");
prayAgainstOlm = PrayAgainst.MAGIC;
lastPrayTime = System.currentTimeMillis();
}
if (projectile.getId() == 1340)
{
log.debug("Range Detected");
prayAgainstOlm = PrayAgainst.RANGED;
lastPrayTime = System.currentTimeMillis();
}
}
}

27
runelite-client/src/main/java/net/runelite/client/plugins/zcox/CoxConfig.java
View File

@@ -1,9 +1,26 @@
/* /*
* THIS SOFTWARE WRITTEN BY A KEYBOARD-WIELDING MONKEY BOI * Copyright (c) 2019, xzact <https://github.com/xzact>
* No rights reserved. Use, redistribute, and modify at your own discretion, * Copyright (c) 2019, ganom <https://github.com/Ganom>
* and in accordance with Yagex and RuneLite guidelines. * All rights reserved.
* However, aforementioned monkey would prefer if you don't sell this plugin for profit. *
* Good luck on your raids! * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.runelite.client.plugins.zcox; package net.runelite.client.plugins.zcox;

27
runelite-client/src/main/java/net/runelite/client/plugins/zcox/CoxOverlay.java
View File

@@ -1,9 +1,26 @@
/* /*
* THIS SOFTWARE WRITTEN BY A KEYBOARD-WIELDING MONKEY BOI * Copyright (c) 2019, xzact <https://github.com/xzact>
* No rights reserved. Use, redistribute, and modify at your own discretion, * Copyright (c) 2019, ganom <https://github.com/Ganom>
* and in accordance with Yagex and RuneLite guidelines. * All rights reserved.
* However, aforementioned monkey would prefer if you don't sell this plugin for profit. *
* Good luck on your raids! * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.runelite.client.plugins.zcox; package net.runelite.client.plugins.zcox;

192
runelite-client/src/main/java/net/runelite/client/plugins/zcox/CoxPlugin.java
View File

@@ -1,9 +1,27 @@
/* /*
* THIS SOFTWARE WRITTEN BY A KEYBOARD-WIELDING MONKEY BOI * Copyright (c) 2019, xzact <https://github.com/xzact>
* No rights reserved. Use, redistribute, and modify at your own discretion, * Copyright (c) 2019, gazivodag <https://github.com/gazivodag>
* and in accordance with Yagex and RuneLite guidelines. * Copyright (c) 2019, ganom <https://github.com/Ganom>
* However, aforementioned monkey would prefer if you don't sell this plugin for profit. * All rights reserved.
* Good luck on your raids! *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.runelite.client.plugins.zcox; package net.runelite.client.plugins.zcox;
@@ -12,19 +30,24 @@ import com.google.inject.Provides;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GraphicsObject; import net.runelite.api.GraphicsObject;
import net.runelite.api.MessageNode; import net.runelite.api.MessageNode;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.NpcID; import net.runelite.api.NpcID;
import net.runelite.api.Projectile;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.NpcSpawned;
import net.runelite.api.events.ProjectileMoved;
import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.ChatMessageManager;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.Subscribe;
@@ -41,6 +64,8 @@ import net.runelite.client.ui.overlay.OverlayManager;
type = PluginType.PVM type = PluginType.PVM
) )
@Slf4j
@Singleton
public class CoxPlugin extends Plugin public class CoxPlugin extends Plugin
{ {
private static final int GAMEOBJECT_ID_PSN = 30032; private static final int GAMEOBJECT_ID_PSN = 30032;
@@ -57,6 +82,26 @@ public class CoxPlugin extends Plugin
private NPC Guard1_NPC; private NPC Guard1_NPC;
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
private NPC Guard2_NPC; private NPC Guard2_NPC;
private static final String OLM_HAND_CRIPPLE = "The Great Olm\'s left claw clenches to protect itself temporarily.";
@Inject
private Client client;
@Getter(AccessLevel.PACKAGE)
private boolean HandCripple;
@Getter(AccessLevel.PACKAGE)
private int timer = 45;
@Getter(AccessLevel.PACKAGE)
private NPC hand;
@Inject
private OverlayManager overlayManager;
@Inject
private OlmCrippleTimerOverlay olmCrippleTimerOverlay;
@Setter
@Getter
protected PrayAgainst prayAgainstOlm;
@Getter
protected long lastPrayTime;
@Inject
private OlmPrayAgainstOverlay prayAgainstOverlay;
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
private boolean runMutta; private boolean runMutta;
@@ -120,13 +165,6 @@ public class CoxPlugin extends Plugin
@Inject @Inject
private ChatMessageManager chatMessageManager; private ChatMessageManager chatMessageManager;
@Inject
private Client client;
@Inject
private OverlayManager overlayManager;
@Inject @Inject
private CoxOverlay overlay; private CoxOverlay overlay;
@@ -143,12 +181,19 @@ public class CoxPlugin extends Plugin
protected void startUp() protected void startUp()
{ {
overlayManager.add(overlay); overlayManager.add(overlay);
overlayManager.add(olmCrippleTimerOverlay);
overlayManager.add(prayAgainstOverlay);
} }
@Override @Override
protected void shutDown() protected void shutDown()
{ {
overlayManager.remove(overlay); overlayManager.remove(overlay);
overlayManager.remove(olmCrippleTimerOverlay);
overlayManager.remove(prayAgainstOverlay);
HandCripple = false;
timer = 45;
hand = null;
} }
@@ -195,6 +240,47 @@ public class CoxPlugin extends Plugin
needOlm = true; needOlm = true;
Olm_NextSpec = -1; Olm_NextSpec = -1;
} }
if (messageNode.getValue().startsWith(OLM_HAND_CRIPPLE))
{
HandCripple = true;
timer = 45;
}
if (messageNode.getValue().toLowerCase().contains("aggression"))
{
log.debug("Melee Detected");
prayAgainstOlm = PrayAgainst.MELEE;
lastPrayTime = System.currentTimeMillis();
}
if (messageNode.getValue().toLowerCase().contains("of magical power"))
{
log.debug("Mage Detected");
prayAgainstOlm = PrayAgainst.MAGIC;
lastPrayTime = System.currentTimeMillis();
}
if (messageNode.getValue().toLowerCase().contains("accuracy and dexterity"))
{
log.debug("Missile Detected");
prayAgainstOlm = PrayAgainst.RANGED;
lastPrayTime = System.currentTimeMillis();
}
}
@Subscribe
public void onProjectileMoved(ProjectileMoved event)
{
Projectile projectile = event.getProjectile();
if (projectile.getId() == 1339)
{
log.debug("Mage Detected");
prayAgainstOlm = PrayAgainst.MAGIC;
lastPrayTime = System.currentTimeMillis();
}
if (projectile.getId() == 1340)
{
log.debug("Range Detected");
prayAgainstOlm = PrayAgainst.RANGED;
lastPrayTime = System.currentTimeMillis();
}
} }
@Subscribe @Subscribe
@@ -212,8 +298,7 @@ public class CoxPlugin extends Plugin
runTekton = true; runTekton = true;
Tekton_NPC = npc; Tekton_NPC = npc;
break; break;
case NpcID.MUTTADILE:
case NpcID.MUTTADILE://momadile resting
Momma_NPC = npc; Momma_NPC = npc;
break; break;
case NpcID.MUTTADILE_7562: case NpcID.MUTTADILE_7562:
@@ -224,28 +309,6 @@ public class CoxPlugin extends Plugin
runMutta = true; runMutta = true;
Momma_NPC = npc; Momma_NPC = npc;
break; break;
// case NpcID.GREAT_OLM_7554:
// System.out.println("Found Olm NPC");
// if (!runOlm)
// {
// Olm_ActionCycle = 4;
/// Olm_TicksUntilAction = 4;
// } else {
// Olm_ActionCycle = 4;
// Olm_TicksUntilAction = 3;
//// }
// OlmPhase++;
// System.out.println("OLM PHASE:"+OlmPhase);
// runOlm = true;
// Olm_NPC = npc;
// Olm_NextSpec = 1;
// break;
//
// case NpcID.GREAT_OLM_LEFT_CLAW:
// case NpcID.GREAT_OLM_LEFT_CLAW_7555:
// OlmMelee_NPC = npc;
// break;
case NpcID.GUARDIAN: case NpcID.GUARDIAN:
Guard1_NPC = npc; Guard1_NPC = npc;
guardTick = -1; guardTick = -1;
@@ -256,8 +319,10 @@ public class CoxPlugin extends Plugin
guardTick = -1; guardTick = -1;
runGuard = true; runGuard = true;
break; break;
case NpcID.GREAT_OLM_RIGHT_CLAW_7553:
//add vanguards case NpcID.GREAT_OLM_LEFT_CLAW:
hand = npc;
break;
} }
} }
@@ -276,28 +341,16 @@ public class CoxPlugin extends Plugin
runTekton = false; runTekton = false;
Tekton_NPC = null; Tekton_NPC = null;
break; break;
case NpcID.MUTTADILE: case NpcID.MUTTADILE:
Momma_NPC = null; Momma_NPC = null;
break; break;
case NpcID.MUTTADILE_7562: case NpcID.MUTTADILE_7562:
Mutta_NPC = null; Mutta_NPC = null;
break; break;
case NpcID.MUTTADILE_7563: case NpcID.MUTTADILE_7563:
runMutta = false; runMutta = false;
Momma_NPC = null; Momma_NPC = null;
break; break;
// case NpcID.GREAT_OLM_7554:
// Olm_NPC = null;
// break;
//case NpcID.GREAT_OLM_LEFT_CLAW:
// case NpcID.GREAT_OLM_LEFT_CLAW_7555:
// OlmMelee_NPC = null;
// break;
//
case NpcID.GUARDIAN: case NpcID.GUARDIAN:
Guard1_NPC = null; Guard1_NPC = null;
runGuard = false; runGuard = false;
@@ -314,7 +367,10 @@ public class CoxPlugin extends Plugin
runGuard = false; runGuard = false;
Guard2_NPC = null; Guard2_NPC = null;
break; break;
//add vanguards case NpcID.GREAT_OLM_RIGHT_CLAW_7553:
case NpcID.GREAT_OLM_LEFT_CLAW:
HandCripple = false;
break;
} }
} }
@@ -338,6 +394,16 @@ public class CoxPlugin extends Plugin
{ {
} }
if (HandCripple)
{
timer--;
if (timer <= 0)
{
HandCripple = false;
timer = 45;
}
}
if (needOlm = true) if (needOlm = true)
{ {
for (NPC monster : client.getNpcs()) for (NPC monster : client.getNpcs())
@@ -435,30 +501,6 @@ public class CoxPlugin extends Plugin
Olm_TicksUntilAction--; Olm_TicksUntilAction--;
} }
//for (GameObject i : client.getGameObjects()) {
// if (i.getId() == GRAPHICSOBJECT_ID_CRYSTAL) {
// WorldPoint newloc;
// for (int x = -1; x <= 1; x++) {
// for (int y = -1; y <= 1; y++) {
// newloc = WorldPoint.fromLocal(client, o.getLocation());
// if (config.LargeCrystals()) {
// newloc = newloc.dx(x);
// newloc = newloc.dy(y);
// }
// Olm_Crystals.add(newloc);
// }
// }
//
// }
// if (o.getId() == GRAPHICSOBJECT_ID_HEAL) {
// Olm_Heal.add(WorldPoint.fromLocal(client, o.getLocation()));
// }
//}
for (GraphicsObject o : client.getGraphicsObjects()) for (GraphicsObject o : client.getGraphicsObjects())
{ {
if (o.getId() == GRAPHICSOBJECT_ID_CRYSTAL) if (o.getId() == GRAPHICSOBJECT_ID_CRYSTAL)

93
runelite-client/src/main/java/net/runelite/client/plugins/zcox/OlmCrippleTimerOverlay.java Normal file
View File

@@ -0,0 +1,93 @@
/*
* Copyright (c) 2018, https://runelitepl.us
* Copyright (c) 2019, ganom <https://github.com/Ganom>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.zcox;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Graphics2D;
import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.NPC;
import net.runelite.api.Point;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil;
public class OlmCrippleTimerOverlay extends Overlay
{
private final Client client;
private final CoxPlugin plugin;
@Inject
private OlmCrippleTimerOverlay(Client client, CoxPlugin plugin)
{
this.client = client;
this.plugin = plugin;
setPosition(OverlayPosition.DYNAMIC);
setPriority(OverlayPriority.HIGH);
setLayer(OverlayLayer.ABOVE_SCENE);
}
@Override
public Dimension render(Graphics2D graphics)
{
if (plugin.isHandCripple())
{
int tick = plugin.getTimer();
NPC olmHand = plugin.getHand();
final String tickStr = String.valueOf(tick);
Point canvasPoint = olmHand.getCanvasTextLocation(graphics, tickStr, 50);
renderTextLocation(graphics, tickStr, 12, Font.BOLD, Color.GRAY, canvasPoint);
}
return null;
}
private void renderTextLocation(Graphics2D graphics, String txtString, int fontSize, int fontStyle, Color fontColor, Point canvasPoint)
{
graphics.setFont(new Font("Arial", fontStyle, fontSize));
if (canvasPoint != null)
{
final Point canvasCenterPoint = new Point(
canvasPoint.getX(),
canvasPoint.getY());
final Point canvasCenterPoint_shadow = new Point(
canvasPoint.getX() + 1,
canvasPoint.getY() + 1);
OverlayUtil.renderTextLocation(graphics, canvasCenterPoint_shadow, txtString, Color.BLACK);
OverlayUtil.renderTextLocation(graphics, canvasCenterPoint, txtString, fontColor);
}
}
}

53
runelite-client/src/main/java/net/runelite/client/plugins/olmprayagainst/OlmPrayAgainstOverlay.java → runelite-client/src/main/java/net/runelite/client/plugins/zcox/OlmPrayAgainstOverlay.java
View File

@@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2019, gazivodag <https://github.com/gazivodag> * Copyright (c) 2019, gazivodag <https://github.com/gazivodag>
* Copyright (c) 2019, ganom <https://github.com/Ganom>
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -21,8 +22,16 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.runelite.client.plugins.olmprayagainst; package net.runelite.client.plugins.zcox;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.SpriteID; import net.runelite.api.SpriteID;
import net.runelite.client.game.SpriteManager; import net.runelite.client.game.SpriteManager;
@@ -31,19 +40,17 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.InfoBoxComponent; import net.runelite.client.ui.overlay.components.InfoBoxComponent;
import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.PanelComponent;
import javax.inject.Inject; class OlmPrayAgainstOverlay extends Overlay
import java.awt.*; {
import java.awt.image.BufferedImage;
class OlmPrayAgainstOverlay extends Overlay { private final CoxPlugin plugin;
private final OlmPrayAgainstPlugin plugin;
private final Client client; private final Client client;
private final SpriteManager spriteManager; private final SpriteManager spriteManager;
private final PanelComponent panelComponent = new PanelComponent(); private final PanelComponent panelComponent = new PanelComponent();
@Inject @Inject
OlmPrayAgainstOverlay(OlmPrayAgainstPlugin plugin, Client client, SpriteManager spriteManager) { OlmPrayAgainstOverlay(CoxPlugin plugin, Client client, SpriteManager spriteManager)
{
this.plugin = plugin; this.plugin = plugin;
this.client = client; this.client = client;
this.spriteManager = spriteManager; this.spriteManager = spriteManager;
@@ -51,31 +58,40 @@ class OlmPrayAgainstOverlay extends Overlay {
panelComponent.setOrientation(PanelComponent.Orientation.VERTICAL); panelComponent.setOrientation(PanelComponent.Orientation.VERTICAL);
} }
public Dimension render(Graphics2D graphics2D) { public Dimension render(Graphics2D graphics2D)
if (plugin.getPrayAgainstOlm() == null) return null; {
if (plugin.getPrayAgainstOlm() == null)
{
return null;
}
panelComponent.getChildren().clear(); panelComponent.getChildren().clear();
if (System.currentTimeMillis() < (plugin.getLastPrayTime() + 120000)) { if (System.currentTimeMillis() < (plugin.getLastPrayTime() + 120000))
{
InfoBoxComponent prayComponent = new InfoBoxComponent(); InfoBoxComponent prayComponent = new InfoBoxComponent();
Image prayImg = scaleImg(getPrayerImage(plugin.prayAgainstOlm)); Image prayImg = scaleImg(getPrayerImage(plugin.prayAgainstOlm));
prayComponent.setImage(prayImg); prayComponent.setImage(prayImg);
prayComponent.setColor(Color.WHITE); prayComponent.setColor(Color.WHITE);
prayComponent.setPreferredSize(new Dimension(40,40)); prayComponent.setPreferredSize(new Dimension(40, 40));
panelComponent.getChildren().add(prayComponent); panelComponent.getChildren().add(prayComponent);
panelComponent.setPreferredSize(new Dimension(40,40)); panelComponent.setPreferredSize(new Dimension(40, 40));
panelComponent.setBorder(new Rectangle(0,0,0,0)); panelComponent.setBorder(new Rectangle(0, 0, 0, 0));
return panelComponent.render(graphics2D); return panelComponent.render(graphics2D);
} else { }
else
{
plugin.setPrayAgainstOlm(null); plugin.setPrayAgainstOlm(null);
} }
return null; return null;
} }
private BufferedImage getPrayerImage(PrayAgainst prayAgainst) { private BufferedImage getPrayerImage(PrayAgainst prayAgainst)
switch (prayAgainst) { {
switch (prayAgainst)
{
case MAGIC: case MAGIC:
return spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MAGIC, 0); return spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MAGIC, 0);
case MELEE: case MELEE:
@@ -86,7 +102,8 @@ class OlmPrayAgainstOverlay extends Overlay {
return null; return null;
} }
private Image scaleImg(final Image img) { private Image scaleImg(final Image img)
{
if (img == null) if (img == null)
{ {
return null; return null;

6
runelite-client/src/main/java/net/runelite/client/plugins/olmprayagainst/PrayAgainst.java → runelite-client/src/main/java/net/runelite/client/plugins/zcox/PrayAgainst.java
View File

@@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2019, gazivodag <https://github.com/gazivodag> * Copyright (c) 2019, gazivodag <https://github.com/gazivodag>
* Copyright (c) 2019, ganom <https://github.com/Ganom>
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -21,9 +22,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.runelite.client.plugins.olmprayagainst; package net.runelite.client.plugins.zcox;
enum PrayAgainst { enum PrayAgainst
{
MELEE, MELEE,
MAGIC, MAGIC,
RANGED RANGED