From f165e5172c7ffbc551e505504ad4211858bbc26c Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Tue, 21 Feb 2023 22:03:14 -0600 Subject: [PATCH] IDBCPlayer: -Had to remove getMaxMeleeStrength and getMeleeStrength functions. --- .../npcs/scripted/entity/ScriptDBCPlayer.java | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java index 9a3d8928b..420fd605a 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java @@ -627,58 +627,4 @@ public class ScriptDBCPlayer extends ScriptPlayer i } return ""; } - - public double getMaxMeleeStrength() { - EntityPlayer player = this.getMCEntity(); - - try { - Class JRMCoreH = Class.forName("JinRyuu.JRMCore.JRMCoreH"); - - Method getString = JRMCoreH.getDeclaredMethod("getString",EntityPlayer.class,String.class); - Method getInt = JRMCoreH.getDeclaredMethod("getInt",EntityPlayer.class,String.class); - Method PlyrAttrbts = JRMCoreH.getDeclaredMethod("PlyrAttrbts",EntityPlayer.class,boolean.class); - Method StusEfcts = JRMCoreH.getDeclaredMethod("StusEfcts",int.class,String.class); - Method getPlayerAttribute = JRMCoreH.getDeclaredMethod("getPlayerAttribute",EntityPlayer.class, int[].class, int.class, int.class, int.class, int.class, String.class, int.class, int.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, int.class, String[].class, boolean.class, String.class); - Method stat = JRMCoreH.getDeclaredMethod("stat", Entity.class, int.class, int.class, int.class, int.class, int.class, int.class, float.class); - Method weightPerc = JRMCoreH.getDeclaredMethod("weightPerc",int.class,EntityPlayer.class); - - int powerType = this.getPowerType(); - int race = this.getRace(); - int state = this.getForm(); - int state2 = this.getForm2(); - int classID = this.getDBCClass(); - double release = this.getRelease(); - String sklx = (String) getString.invoke(null,player, "jrmcSSltX"); - int resrv = (int) getInt.invoke(null,player, "jrmcArcRsrv"); - String absorption = (String) getString.invoke(null,player, "jrmcMajinAbsorptionData"); - int[] plyrAttrbts = (int[]) PlyrAttrbts.invoke(null,player,!this.getFusionString().isEmpty()); - String[] PlyrSkills = ((String) getString.invoke(null,player, "jrmcSSlts")).split(","); - String statusEffects = (String) getString.invoke(null,player, "jrmcStatusEff"); - boolean mj = (boolean) StusEfcts.invoke(null,12, statusEffects); - boolean lg = (boolean) StusEfcts.invoke(null,14, statusEffects); - boolean kk = (boolean) StusEfcts.invoke(null,5, statusEffects); - boolean mc = (boolean) StusEfcts.invoke(null,13, statusEffects); - boolean mn = (boolean) StusEfcts.invoke(null,19, statusEffects); - boolean gd = (boolean) StusEfcts.invoke(null,20, statusEffects); - int STR; - boolean c; - - c = (boolean) StusEfcts.invoke(null,10, statusEffects) || (boolean) StusEfcts.invoke(null,11, statusEffects); - - STR = (int) getPlayerAttribute.invoke(null,player, plyrAttrbts, 0, state, state2, race, sklx, (int)release, resrv, lg, mj, kk, mc, mn, gd, powerType, PlyrSkills, c, absorption); - return (int) stat.invoke(null,player, 0, powerType, 0, STR, race, classID, 0.0F); - } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { - return super.getMeleeStrength(); - } - } - - public double getMeleeStrength() { - try { - Class JRMCoreH = Class.forName("JinRyuu.JRMCore.JRMCoreH"); - Method weightPerc = JRMCoreH.getDeclaredMethod("weightPerc",int.class,EntityPlayer.class); - return this.getMaxMeleeStrength() * this.getRelease() * 0.01D * (float) weightPerc.invoke(null,0, this.getMCEntity()); - } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { - return super.getMeleeStrength(); - } - } } \ No newline at end of file