Changes 2 (#43)

* Initial commit for maxhit plugin

* WIP: Magic max hit calculator

* Add chance to obtain a Unique from Chambers of Xeric

Based on the formula from the wiki. Does not handle >80% chance properly (it should go into a second item)

* MaxHit Refactor a lot for magic max hit

* Wip: refactoring

* Pest Control Update

* Pest Control: Add Intermediate portals

* Revert "Remove raids points overlay"

This reverts commit fbd3ea6202.

* Wip: refactoring

* Fixed WidgetInfo merge issue

* Fixed trident

* Implement range

* Refactored according to intellij analyzer

* Run checkstyle from xml and fix code style issues

* Fix copyright

* Replace item names with item id's

* Code cleanup with reformat code

* Fixed checkstyle

* Use game slotitem

* Use game slotitem

* Fixed prayer bonus

* Looked up value for saradomin strike

* Fixed prayer bonus

* Fixed surge spell id's

* Fixed magix max hit tests

* Fixed rounding after obisidian

* Fix dharok custom formula

* Add melee max hit

* Refactored spellbonus items for magic

* Added voidknight

* Use boosted skill levels and add copyright

* Add accurate attack style for ranging

* Add range Tests

* Cleanup code

* Cleanup code

* Rename calculate methods to be more distinguishable

* Add parenthesis to dharok maxhit formula for clarification

* Fix widgetinfo merge

* Remove print in MaxHitPlugin

* Make sure an Item is not null when checking if the player is wearing it.

* Add daily notification for collection of ogre arrows from Rantz.

Add varbit for rantz arrow collection

Fix continuation indent settings


Group ifs to single check.

* Refactor all relevant daily checks to have grouped if check.


Further refactor grouped ifs

* Adds type

* Raids point overlay
This commit is contained in:
James
2019-04-22 01:49:35 -07:00
committed by Tyler Bochard
parent 3a01eb67dc
commit 41c12a858d
60 changed files with 5848 additions and 279 deletions

View File

@@ -372,6 +372,7 @@ public enum Varbits {
DAILY_ESSENCE_COLLECTED(4547),
DAILY_RUNES_COLLECTED(4540),
DAILY_SAND_COLLECTED(4549),
DAILY_ARROWS_STATE(4563),
DAILY_FLAX_STATE(4559),
/**
* This varbit tracks how much bonemeal has been redeemed from Robin
@@ -481,6 +482,14 @@ public enum Varbits {
*/
GE_OFFER_CREATION_TYPE(4397),
/*
* Spells being auto-casted
*
* */
AUTO_CAST_SPELL(276),
/**
* The active tab within the quest interface
*/

View File

@@ -55,6 +55,8 @@ public class WidgetID
public static final int DIARY_GROUP_ID = 259;
public static final int PEST_CONTROL_BOAT_GROUP_ID = 407;
public static final int PEST_CONTROL_GROUP_ID = 408;
public static final int PEST_CONTROL_EXCHANGE_WINDOW_GROUP_ID = 243;
public static final int PEST_CONTROL_DIALOG_GROUP_ID = 229;
public static final int CLAN_CHAT_GROUP_ID = 7;
public static final int MINIMAP_GROUP_ID = 160;
public static final int LOGIN_CLICK_TO_PLAY_GROUP_ID = 378;
@@ -127,6 +129,7 @@ public class WidgetID
public static final int FULLSCREEN_MAP_GROUP_ID = 165;
public static final int QUESTLIST_GROUP_ID = 399;
public static final int SKILLS_GROUP_ID = 320;
public static final int EQUIPMENT_PAGE_GROUP_ID = 84;
public static final int QUESTTAB_GROUP_ID = 629;
public static final int MUSIC_GROUP_ID = 239;
public static final int MUSICTAB_GROUP_ID = 239;
@@ -164,12 +167,32 @@ public class WidgetID
static class PestControlBoat
{
static final int INFO = 3;
static final int NEXT_DEPARTURE = 4;
static final int PLAYERS_READY = 5;
static final int POINTS = 6;
}
static class PestControlExchangeWindow
{
static final int ITEM_LIST = 2;
static final int BOTTOM = 5;
static final int POINTS = 8;
static final int CONFIRM_BUTTON = 6;
}
static class PestControlDialog
{
static final int TEXT = 1;
static final int CONTINUE = 2;
}
static class PestControl
{
static final int INFO = 3;
static final int TIME = 6;
static final int ACTIVITY_BAR = 12;
static final int ACTIVITY_PROGRESS = 14;
@@ -675,6 +698,28 @@ public class WidgetID
static final int DESTROY_ITEM_NO = 3;
}
static class EquipmentWidgetIdentifiers
{
static final int EQUIP_YOUR_CHARACTER = 3;
static final int STAB_ATTACK_BONUS = 23;
static final int SLASH_ATTACK_BONUS = 24;
static final int CRUSH_ATTACK_BONUS = 25;
static final int MAGIC_ATTACK_BONUS = 26;
static final int RANGED_ATTACK_BONUS = 27;
static final int STAB_DEFENCE_BONUS = 29;
static final int SLASH_DEFENCE_BONUS = 30;
static final int CRUSH_DEFENCE_BONUS = 31;
static final int MAGIC_DEFENCE_BONUS = 32;
static final int RANGED_DEFENCE_BONUS = 33;
static final int MELEE_STRENGTH = 35;
static final int RANGED_STRENGTH = 36;
static final int MAGIC_DAMAGE = 37;
static final int PRAYER_BONUS = 38;
static final int UNDEAD_DAMAGE_BONUS = 40;
static final int SLAYER_DAMAGE_BONUS = 41;
static final int WEIGHT = 43;
}
static class VarrockMuseum
{
static final int VARROCK_MUSEUM_QUESTION = 28;

View File

@@ -83,8 +83,14 @@ public enum WidgetInfo
DIARY_QUEST_WIDGET_TITLE(WidgetID.DIARY_QUEST_GROUP_ID, WidgetID.Diary.DIARY_TITLE),
DIARY_QUEST_WIDGET_TEXT(WidgetID.DIARY_QUEST_GROUP_ID, WidgetID.Diary.DIARY_TEXT),
PEST_CONTROL_DIALOG(WidgetID.PEST_CONTROL_DIALOG_GROUP_ID, 0),
PEST_CONTROL_DIALOG_TEXT(WidgetID.PEST_CONTROL_DIALOG_GROUP_ID, WidgetID.PestControlDialog.TEXT),
PEST_CONTROL_EXCHANGE_WINDOW(WidgetID.PEST_CONTROL_EXCHANGE_WINDOW_GROUP_ID, 0),
PEST_CONTROL_EXCHANGE_WINDOW_POINTS(WidgetID.PEST_CONTROL_EXCHANGE_WINDOW_GROUP_ID, WidgetID.PestControlExchangeWindow.POINTS),
PEST_CONTROL_BOAT_INFO(WidgetID.PEST_CONTROL_BOAT_GROUP_ID, WidgetID.PestControlBoat.INFO),
PEST_CONTROL_BOAT_INFO_POINTS(WidgetID.PEST_CONTROL_BOAT_GROUP_ID, WidgetID.PestControlBoat.POINTS),
PEST_CONTROL_INFO(WidgetID.PEST_CONTROL_GROUP_ID, WidgetID.PestControl.INFO),
PEST_CONTROL_INFO_TIME(WidgetID.PEST_CONTROL_GROUP_ID, WidgetID.PestControl.TIME),
PEST_CONTROL_PURPLE_SHIELD(WidgetID.PEST_CONTROL_GROUP_ID, WidgetID.PestControl.PURPLE_SHIELD),
PEST_CONTROL_BLUE_SHIELD(WidgetID.PEST_CONTROL_GROUP_ID, WidgetID.PestControl.BLUE_SHIELD),
PEST_CONTROL_YELLOW_SHIELD(WidgetID.PEST_CONTROL_GROUP_ID, WidgetID.PestControl.YELLOW_SHIELD),
@@ -550,7 +556,12 @@ public enum WidgetInfo
MUSICTAB_LOOP_BUTTON(WidgetID.MUSICTAB_GROUP_ID, 12),
MUSICTAB_UNLOCKED_SONGS(WidgetID.MUSICTAB_GROUP_ID, 13),
QUESTTAB_QUEST_TAB(WidgetID.QUESTTAB_GROUP_ID, WidgetID.QuestTab.QUEST_TAB);
QUESTTAB_QUEST_TAB(WidgetID.QUESTTAB_GROUP_ID, WidgetID.QuestTab.QUEST_TAB),
EQUIPMENT_MELEE_STRENGTH(WidgetID.EQUIPMENT_PAGE_GROUP_ID, WidgetID.EquipmentWidgetIdentifiers.MELEE_STRENGTH),
EQUIPMENT_RANGED_STRENGTH(WidgetID.EQUIPMENT_PAGE_GROUP_ID, WidgetID.EquipmentWidgetIdentifiers.RANGED_STRENGTH),
EQUIPMENT_MAGIC_DAMAGE(WidgetID.EQUIPMENT_PAGE_GROUP_ID, WidgetID.EquipmentWidgetIdentifiers.MAGIC_DAMAGE),
EQUIP_YOUR_CHARACTER(WidgetID.EQUIPMENT_PAGE_GROUP_ID, WidgetID.EquipmentWidgetIdentifiers.EQUIP_YOUR_CHARACTER);
private final int groupId;
private final int childId;