diff --git a/mudclient/src/main/java/ClientConfig.java b/mudclient/src/main/java/ClientConfig.java index 1f7a57b..8187266 100644 --- a/mudclient/src/main/java/ClientConfig.java +++ b/mudclient/src/main/java/ClientConfig.java @@ -48,214 +48,214 @@ public final class ClientConfig { private static int[] objMembers; @OriginalMember(owner = "mudclient!b", name = "n", descriptor = "I") - public static int anInt276; + public static int npcCount; @OriginalMember(owner = "mudclient!b", name = "o", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray7; + public static String[] npcName; @OriginalMember(owner = "mudclient!b", name = "p", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray8; + public static String[] npcDesc; @OriginalMember(owner = "mudclient!b", name = "q", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray9; + public static String[] npcOption; @OriginalMember(owner = "mudclient!b", name = "r", descriptor = "[I") - public static int[] anIntArray106; + public static int[] npcAttack; @OriginalMember(owner = "mudclient!b", name = "s", descriptor = "[I") - public static int[] anIntArray107; + public static int[] npcStrength; @OriginalMember(owner = "mudclient!b", name = "t", descriptor = "[I") - public static int[] anIntArray108; + public static int[] npcHits; @OriginalMember(owner = "mudclient!b", name = "u", descriptor = "[I") - public static int[] anIntArray109; + public static int[] npcDefense; @OriginalMember(owner = "mudclient!b", name = "v", descriptor = "[I") - public static int[] anIntArray110; + public static int[] npcAttackable; @OriginalMember(owner = "mudclient!b", name = "w", descriptor = "[[I") - public static int[][] anIntArrayArray13; + public static int[][] npcSprites; @OriginalMember(owner = "mudclient!b", name = "x", descriptor = "[I") - public static int[] anIntArray111; + public static int[] npcHairColor; @OriginalMember(owner = "mudclient!b", name = "y", descriptor = "[I") - public static int[] anIntArray112; + public static int[] npcTopColor; @OriginalMember(owner = "mudclient!b", name = "z", descriptor = "[I") - public static int[] anIntArray113; + public static int[] npcBottomColor; @OriginalMember(owner = "mudclient!b", name = "A", descriptor = "[I") - public static int[] anIntArray114; + public static int[] npcSkinColor; @OriginalMember(owner = "mudclient!b", name = "B", descriptor = "[I") - public static int[] anIntArray115; + public static int[] npcWidth; @OriginalMember(owner = "mudclient!b", name = "C", descriptor = "[I") - public static int[] anIntArray116; + public static int[] npcLength; @OriginalMember(owner = "mudclient!b", name = "D", descriptor = "[I") - public static int[] anIntArray117; + public static int[] npcWalkSpeed; @OriginalMember(owner = "mudclient!b", name = "E", descriptor = "[I") - public static int[] anIntArray118; + public static int[] npcCombatSpeed; @OriginalMember(owner = "mudclient!b", name = "F", descriptor = "[I") - public static int[] anIntArray119; + public static int[] npcCombatWidth; @OriginalMember(owner = "mudclient!b", name = "G", descriptor = "I") - public static int anInt277; + public static int textureCount; @OriginalMember(owner = "mudclient!b", name = "H", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray10; + public static String[] textureName; @OriginalMember(owner = "mudclient!b", name = "I", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray11; + public static String[] textureSubName; @OriginalMember(owner = "mudclient!b", name = "J", descriptor = "I") - public static int anInt278; + public static int animationCount; @OriginalMember(owner = "mudclient!b", name = "K", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray12; + public static String[] animationName; @OriginalMember(owner = "mudclient!b", name = "L", descriptor = "[I") - public static int[] anIntArray120; + public static int[] animationColor; @OriginalMember(owner = "mudclient!b", name = "M", descriptor = "[I") - public static int[] anIntArray121; + public static int[] animationGender; @OriginalMember(owner = "mudclient!b", name = "N", descriptor = "[I") - public static int[] anIntArray122; + public static int[] animatonHasA; @OriginalMember(owner = "mudclient!b", name = "O", descriptor = "[I") - public static int[] anIntArray123; + public static int[] animationHasF; @OriginalMember(owner = "mudclient!b", name = "P", descriptor = "[I") - public static int[] anIntArray124; + public static int[] animationFileId; @OriginalMember(owner = "mudclient!b", name = "Q", descriptor = "I") - private static int anInt279; + private static int locCount; @OriginalMember(owner = "mudclient!b", name = "R", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray13; + public static String[] locName; @OriginalMember(owner = "mudclient!b", name = "S", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray14; + public static String[] locDesc; @OriginalMember(owner = "mudclient!b", name = "T", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray15; + public static String[] locOption1; @OriginalMember(owner = "mudclient!b", name = "U", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray16; + public static String[] locOption2; @OriginalMember(owner = "mudclient!b", name = "V", descriptor = "[I") - public static int[] anIntArray125; + public static int[] locModel; @OriginalMember(owner = "mudclient!b", name = "W", descriptor = "[I") - public static int[] anIntArray126; + public static int[] locWidth; @OriginalMember(owner = "mudclient!b", name = "X", descriptor = "[I") - public static int[] anIntArray127; + public static int[] locLength; @OriginalMember(owner = "mudclient!b", name = "Y", descriptor = "[I") - public static int[] anIntArray128; + public static int[] locType; @OriginalMember(owner = "mudclient!b", name = "Z", descriptor = "[I") - public static int[] anIntArray129; + public static int[] locElevation; @OriginalMember(owner = "mudclient!b", name = "ba", descriptor = "I") - private static int anInt280; + private static int boundCount; @OriginalMember(owner = "mudclient!b", name = "bb", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray17; + public static String[] boundName; @OriginalMember(owner = "mudclient!b", name = "bc", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray18; + public static String[] boundDesc; @OriginalMember(owner = "mudclient!b", name = "bd", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray19; + public static String[] boundOption1; @OriginalMember(owner = "mudclient!b", name = "be", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray20; + public static String[] boundOption2; @OriginalMember(owner = "mudclient!b", name = "bf", descriptor = "[I") - public static int[] anIntArray130; + public static int[] boundHeight; @OriginalMember(owner = "mudclient!b", name = "bg", descriptor = "[I") - public static int[] anIntArray131; + public static int[] boundFrontMask; @OriginalMember(owner = "mudclient!b", name = "bh", descriptor = "[I") - public static int[] anIntArray132; + public static int[] boundBackMask; @OriginalMember(owner = "mudclient!b", name = "bi", descriptor = "[I") - public static int[] anIntArray133; + public static int[] boundBlockWalk; @OriginalMember(owner = "mudclient!b", name = "bj", descriptor = "[I") - public static int[] anIntArray134; + public static int[] boundActive; @OriginalMember(owner = "mudclient!b", name = "bk", descriptor = "I") - private static int anInt281; + private static int roofCount; @OriginalMember(owner = "mudclient!b", name = "bl", descriptor = "[I") - public static int[] anIntArray135; + public static int[] roofHeight; @OriginalMember(owner = "mudclient!b", name = "bm", descriptor = "[I") - public static int[] anIntArray136; + public static int[] roofFill; @OriginalMember(owner = "mudclient!b", name = "bn", descriptor = "I") - private static int anInt282; + private static int decorCount; @OriginalMember(owner = "mudclient!b", name = "bo", descriptor = "[I") - public static int[] anIntArray137; + public static int[] decorFill; @OriginalMember(owner = "mudclient!b", name = "bp", descriptor = "[I") - public static int[] anIntArray138; + public static int[] decorType; @OriginalMember(owner = "mudclient!b", name = "bq", descriptor = "[I") - public static int[] anIntArray139; + public static int[] decorBlockWalk; @OriginalMember(owner = "mudclient!b", name = "br", descriptor = "I") - public static int anInt283; + public static int projectileSpriteCount; @OriginalMember(owner = "mudclient!b", name = "bs", descriptor = "I") - public static int anInt284; + public static int spellCount; @OriginalMember(owner = "mudclient!b", name = "bt", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray21; + public static String[] spellName; @OriginalMember(owner = "mudclient!b", name = "bu", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray22; + public static String[] spellDesc; @OriginalMember(owner = "mudclient!b", name = "bv", descriptor = "[I") - public static int[] anIntArray140; + public static int[] spellLevel; @OriginalMember(owner = "mudclient!b", name = "bw", descriptor = "[I") - public static int[] anIntArray141; + public static int[] spellRunesRequired; @OriginalMember(owner = "mudclient!b", name = "bx", descriptor = "[I") - public static int[] anIntArray142; + public static int[] spellType; @OriginalMember(owner = "mudclient!b", name = "by", descriptor = "[[I") - public static int[][] anIntArrayArray14; + public static int[][] spellRunes; @OriginalMember(owner = "mudclient!b", name = "bz", descriptor = "[[I") - public static int[][] anIntArrayArray15; + public static int[][] spellRunesCount; @OriginalMember(owner = "mudclient!b", name = "bA", descriptor = "I") - public static int anInt285; + public static int prayerCount; @OriginalMember(owner = "mudclient!b", name = "bB", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray23; + public static String[] prayerName; @OriginalMember(owner = "mudclient!b", name = "bC", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray24; + public static String[] prayerDesc; @OriginalMember(owner = "mudclient!b", name = "bD", descriptor = "[I") - public static int[] anIntArray143; + public static int[] prayerLevel; @OriginalMember(owner = "mudclient!b", name = "bE", descriptor = "[I") - public static int[] anIntArray144; + public static int[] prayerDrain; @OriginalMember(owner = "mudclient!b", name = "bH", descriptor = "I") public static int modelCount; @@ -412,340 +412,340 @@ public static void method359(@OriginalArg(0) byte[] src, @OriginalArg(1) boolean } } - anInt276 = g2(); - aStringArray7 = new String[anInt276]; - aStringArray8 = new String[anInt276]; - aStringArray9 = new String[anInt276]; - anIntArray106 = new int[anInt276]; - anIntArray107 = new int[anInt276]; - anIntArray108 = new int[anInt276]; - anIntArray109 = new int[anInt276]; - anIntArray110 = new int[anInt276]; - anIntArrayArray13 = new int[anInt276][12]; - anIntArray111 = new int[anInt276]; - anIntArray112 = new int[anInt276]; - anIntArray113 = new int[anInt276]; - anIntArray114 = new int[anInt276]; - anIntArray115 = new int[anInt276]; - anIntArray116 = new int[anInt276]; - anIntArray117 = new int[anInt276]; - anIntArray118 = new int[anInt276]; - anIntArray119 = new int[anInt276]; + npcCount = g2(); + npcName = new String[npcCount]; + npcDesc = new String[npcCount]; + npcOption = new String[npcCount]; + npcAttack = new int[npcCount]; + npcStrength = new int[npcCount]; + npcHits = new int[npcCount]; + npcDefense = new int[npcCount]; + npcAttackable = new int[npcCount]; + npcSprites = new int[npcCount][12]; + npcHairColor = new int[npcCount]; + npcTopColor = new int[npcCount]; + npcBottomColor = new int[npcCount]; + npcSkinColor = new int[npcCount]; + npcWidth = new int[npcCount]; + npcLength = new int[npcCount]; + npcWalkSpeed = new int[npcCount]; + npcCombatSpeed = new int[npcCount]; + npcCombatWidth = new int[npcCount]; - for (@Pc(298) int local298 = 0; local298 < anInt276; local298++) { - aStringArray7[local298] = gjstr(); + for (@Pc(298) int i = 0; i < npcCount; i++) { + npcName[i] = gjstr(); } - for (@Pc(310) int local310 = 0; local310 < anInt276; local310++) { - aStringArray8[local310] = gjstr(); + for (@Pc(310) int i = 0; i < npcCount; i++) { + npcDesc[i] = gjstr(); } - for (@Pc(322) int local322 = 0; local322 < anInt276; local322++) { - anIntArray106[local322] = g1(); + for (@Pc(322) int i = 0; i < npcCount; i++) { + npcAttack[i] = g1(); } - for (@Pc(334) int local334 = 0; local334 < anInt276; local334++) { - anIntArray107[local334] = g1(); + for (@Pc(334) int i = 0; i < npcCount; i++) { + npcStrength[i] = g1(); } - for (@Pc(346) int local346 = 0; local346 < anInt276; local346++) { - anIntArray108[local346] = g1(); + for (@Pc(346) int i = 0; i < npcCount; i++) { + npcHits[i] = g1(); } - for (@Pc(358) int local358 = 0; local358 < anInt276; local358++) { - anIntArray109[local358] = g1(); + for (@Pc(358) int i = 0; i < npcCount; i++) { + npcDefense[i] = g1(); } - for (@Pc(370) int local370 = 0; local370 < anInt276; local370++) { - anIntArray110[local370] = g1(); + for (@Pc(370) int i = 0; i < npcCount; i++) { + npcAttackable[i] = g1(); } - @Pc(386) int local386; - for (@Pc(382) int local382 = 0; local382 < anInt276; local382++) { - for (local386 = 0; local386 < 12; local386++) { - anIntArrayArray13[local382][local386] = g1(); - if (anIntArrayArray13[local382][local386] == 255) { - anIntArrayArray13[local382][local386] = -1; + for (@Pc(382) int i = 0; i < npcCount; i++) { + for (int j = 0; j < 12; j++) { + npcSprites[i][j] = g1(); + + if (npcSprites[i][j] == 255) { + npcSprites[i][j] = -1; } } } - for (local386 = 0; local386 < anInt276; local386++) { - anIntArray111[local386] = g4(); + for (int i = 0; i < npcCount; i++) { + npcHairColor[i] = g4(); } - for (@Pc(429) int local429 = 0; local429 < anInt276; local429++) { - anIntArray112[local429] = g4(); + for (@Pc(429) int i = 0; i < npcCount; i++) { + npcTopColor[i] = g4(); } - for (@Pc(441) int local441 = 0; local441 < anInt276; local441++) { - anIntArray113[local441] = g4(); + for (@Pc(441) int i = 0; i < npcCount; i++) { + npcBottomColor[i] = g4(); } - for (@Pc(453) int local453 = 0; local453 < anInt276; local453++) { - anIntArray114[local453] = g4(); + for (@Pc(453) int i = 0; i < npcCount; i++) { + npcSkinColor[i] = g4(); } - for (@Pc(465) int local465 = 0; local465 < anInt276; local465++) { - anIntArray115[local465] = g2(); + for (@Pc(465) int i = 0; i < npcCount; i++) { + npcWidth[i] = g2(); } - for (@Pc(477) int local477 = 0; local477 < anInt276; local477++) { - anIntArray116[local477] = g2(); + for (@Pc(477) int i = 0; i < npcCount; i++) { + npcLength[i] = g2(); } - for (@Pc(489) int local489 = 0; local489 < anInt276; local489++) { - anIntArray117[local489] = g1(); + for (@Pc(489) int i = 0; i < npcCount; i++) { + npcWalkSpeed[i] = g1(); } - for (@Pc(501) int local501 = 0; local501 < anInt276; local501++) { - anIntArray118[local501] = g1(); + for (@Pc(501) int i = 0; i < npcCount; i++) { + npcCombatSpeed[i] = g1(); } - for (@Pc(513) int local513 = 0; local513 < anInt276; local513++) { - anIntArray119[local513] = g1(); + for (@Pc(513) int i = 0; i < npcCount; i++) { + npcCombatWidth[i] = g1(); } - for (@Pc(525) int local525 = 0; local525 < anInt276; local525++) { - aStringArray9[local525] = gjstr(); + for (@Pc(525) int i = 0; i < npcCount; i++) { + npcOption[i] = gjstr(); } - anInt277 = g2(); - aStringArray10 = new String[anInt277]; - aStringArray11 = new String[anInt277]; + textureCount = g2(); + textureName = new String[textureCount]; + textureSubName = new String[textureCount]; - for (@Pc(545) int local545 = 0; local545 < anInt277; local545++) { - aStringArray10[local545] = gjstr(); + for (@Pc(545) int i = 0; i < textureCount; i++) { + textureName[i] = gjstr(); } - for (@Pc(557) int local557 = 0; local557 < anInt277; local557++) { - aStringArray11[local557] = gjstr(); + for (@Pc(557) int i = 0; i < textureCount; i++) { + textureSubName[i] = gjstr(); } - anInt278 = g2(); - aStringArray12 = new String[anInt278]; - anIntArray120 = new int[anInt278]; - anIntArray121 = new int[anInt278]; - anIntArray122 = new int[anInt278]; - anIntArray123 = new int[anInt278]; - anIntArray124 = new int[anInt278]; + animationCount = g2(); + animationName = new String[animationCount]; + animationColor = new int[animationCount]; + animationGender = new int[animationCount]; + animatonHasA = new int[animationCount]; + animationHasF = new int[animationCount]; + animationFileId = new int[animationCount]; - for (@Pc(589) int local589 = 0; local589 < anInt278; local589++) { - aStringArray12[local589] = gjstr(); + for (@Pc(589) int i = 0; i < animationCount; i++) { + animationName[i] = gjstr(); } - for (@Pc(601) int local601 = 0; local601 < anInt278; local601++) { - anIntArray120[local601] = g4(); + for (@Pc(601) int i = 0; i < animationCount; i++) { + animationColor[i] = g4(); } - for (@Pc(613) int local613 = 0; local613 < anInt278; local613++) { - anIntArray121[local613] = g1(); + for (@Pc(613) int i = 0; i < animationCount; i++) { + animationGender[i] = g1(); } - for (@Pc(625) int local625 = 0; local625 < anInt278; local625++) { - anIntArray122[local625] = g1(); + for (@Pc(625) int i = 0; i < animationCount; i++) { + animatonHasA[i] = g1(); } - for (@Pc(637) int local637 = 0; local637 < anInt278; local637++) { - anIntArray123[local637] = g1(); + for (@Pc(637) int i = 0; i < animationCount; i++) { + animationHasF[i] = g1(); } - for (@Pc(649) int local649 = 0; local649 < anInt278; local649++) { - anIntArray124[local649] = g1(); + for (@Pc(649) int i = 0; i < animationCount; i++) { + animationFileId[i] = g1(); } - anInt279 = g2(); - aStringArray13 = new String[anInt279]; - aStringArray14 = new String[anInt279]; - aStringArray15 = new String[anInt279]; - aStringArray16 = new String[anInt279]; - anIntArray125 = new int[anInt279]; - anIntArray126 = new int[anInt279]; - anIntArray127 = new int[anInt279]; - anIntArray128 = new int[anInt279]; - anIntArray129 = new int[anInt279]; + locCount = g2(); + locName = new String[locCount]; + locDesc = new String[locCount]; + locOption1 = new String[locCount]; + locOption2 = new String[locCount]; + locModel = new int[locCount]; + locWidth = new int[locCount]; + locLength = new int[locCount]; + locType = new int[locCount]; + locElevation = new int[locCount]; - for (@Pc(690) int local690 = 0; local690 < anInt279; local690++) { - aStringArray13[local690] = gjstr(); + for (@Pc(690) int i = 0; i < locCount; i++) { + locName[i] = gjstr(); } - for (@Pc(702) int local702 = 0; local702 < anInt279; local702++) { - aStringArray14[local702] = gjstr(); + for (@Pc(702) int i = 0; i < locCount; i++) { + locDesc[i] = gjstr(); } - for (@Pc(714) int local714 = 0; local714 < anInt279; local714++) { - aStringArray15[local714] = gjstr(); + for (@Pc(714) int i = 0; i < locCount; i++) { + locOption1[i] = gjstr(); } - for (@Pc(726) int local726 = 0; local726 < anInt279; local726++) { - aStringArray16[local726] = gjstr(); + for (@Pc(726) int i = 0; i < locCount; i++) { + locOption2[i] = gjstr(); } - for (@Pc(738) int local738 = 0; local738 < anInt279; local738++) { - anIntArray125[local738] = getModelId(gjstr()); + for (@Pc(738) int i = 0; i < locCount; i++) { + locModel[i] = getModelId(gjstr()); } - for (@Pc(751) int local751 = 0; local751 < anInt279; local751++) { - anIntArray126[local751] = g1(); + for (@Pc(751) int i = 0; i < locCount; i++) { + locWidth[i] = g1(); } - for (@Pc(763) int local763 = 0; local763 < anInt279; local763++) { - anIntArray127[local763] = g1(); + for (@Pc(763) int i = 0; i < locCount; i++) { + locLength[i] = g1(); } - for (@Pc(775) int local775 = 0; local775 < anInt279; local775++) { - anIntArray128[local775] = g1(); + for (@Pc(775) int i = 0; i < locCount; i++) { + locType[i] = g1(); } - for (@Pc(787) int local787 = 0; local787 < anInt279; local787++) { - anIntArray129[local787] = g1(); + for (@Pc(787) int i = 0; i < locCount; i++) { + locElevation[i] = g1(); } - anInt280 = g2(); - aStringArray17 = new String[anInt280]; - aStringArray18 = new String[anInt280]; - aStringArray19 = new String[anInt280]; - aStringArray20 = new String[anInt280]; - anIntArray130 = new int[anInt280]; - anIntArray131 = new int[anInt280]; - anIntArray132 = new int[anInt280]; - anIntArray133 = new int[anInt280]; - anIntArray134 = new int[anInt280]; + boundCount = g2(); + boundName = new String[boundCount]; + boundDesc = new String[boundCount]; + boundOption1 = new String[boundCount]; + boundOption2 = new String[boundCount]; + boundHeight = new int[boundCount]; + boundFrontMask = new int[boundCount]; + boundBackMask = new int[boundCount]; + boundBlockWalk = new int[boundCount]; + boundActive = new int[boundCount]; - for (@Pc(828) int local828 = 0; local828 < anInt280; local828++) { - aStringArray17[local828] = gjstr(); + for (@Pc(828) int i = 0; i < boundCount; i++) { + boundName[i] = gjstr(); } - for (@Pc(840) int local840 = 0; local840 < anInt280; local840++) { - aStringArray18[local840] = gjstr(); + for (@Pc(840) int i = 0; i < boundCount; i++) { + boundDesc[i] = gjstr(); } - for (@Pc(852) int local852 = 0; local852 < anInt280; local852++) { - aStringArray19[local852] = gjstr(); + for (@Pc(852) int i = 0; i < boundCount; i++) { + boundOption1[i] = gjstr(); } - for (@Pc(864) int local864 = 0; local864 < anInt280; local864++) { - aStringArray20[local864] = gjstr(); + for (@Pc(864) int i = 0; i < boundCount; i++) { + boundOption2[i] = gjstr(); } - for (@Pc(876) int local876 = 0; local876 < anInt280; local876++) { - anIntArray130[local876] = g2(); + for (@Pc(876) int i = 0; i < boundCount; i++) { + boundHeight[i] = g2(); } - for (@Pc(888) int local888 = 0; local888 < anInt280; local888++) { - anIntArray131[local888] = g4(); + for (@Pc(888) int i = 0; i < boundCount; i++) { + boundFrontMask[i] = g4(); } - for (@Pc(900) int local900 = 0; local900 < anInt280; local900++) { - anIntArray132[local900] = g4(); + for (@Pc(900) int i = 0; i < boundCount; i++) { + boundBackMask[i] = g4(); } - for (@Pc(912) int local912 = 0; local912 < anInt280; local912++) { - anIntArray133[local912] = g1(); + for (@Pc(912) int i = 0; i < boundCount; i++) { + boundBlockWalk[i] = g1(); } - for (@Pc(924) int local924 = 0; local924 < anInt280; local924++) { - anIntArray134[local924] = g1(); + for (@Pc(924) int i = 0; i < boundCount; i++) { + boundActive[i] = g1(); } - anInt281 = g2(); - anIntArray135 = new int[anInt281]; - anIntArray136 = new int[anInt281]; + roofCount = g2(); + roofHeight = new int[roofCount]; + roofFill = new int[roofCount]; - for (@Pc(944) int local944 = 0; local944 < anInt281; local944++) { - anIntArray135[local944] = g1(); + for (@Pc(944) int i = 0; i < roofCount; i++) { + roofHeight[i] = g1(); } - for (@Pc(956) int local956 = 0; local956 < anInt281; local956++) { - anIntArray136[local956] = g1(); + for (@Pc(956) int i = 0; i < roofCount; i++) { + roofFill[i] = g1(); } - anInt282 = g2(); - anIntArray137 = new int[anInt282]; - anIntArray138 = new int[anInt282]; - anIntArray139 = new int[anInt282]; + decorCount = g2(); + decorFill = new int[decorCount]; + decorType = new int[decorCount]; + decorBlockWalk = new int[decorCount]; - for (@Pc(979) int local979 = 0; local979 < anInt282; local979++) { - anIntArray137[local979] = g4(); + for (@Pc(979) int i = 0; i < decorCount; i++) { + decorFill[i] = g4(); } - for (@Pc(991) int local991 = 0; local991 < anInt282; local991++) { - anIntArray138[local991] = g1(); + for (@Pc(991) int i = 0; i < decorCount; i++) { + decorType[i] = g1(); } - for (@Pc(1003) int local1003 = 0; local1003 < anInt282; local1003++) { - anIntArray139[local1003] = g1(); + for (@Pc(1003) int i = 0; i < decorCount; i++) { + decorBlockWalk[i] = g1(); } - anInt283 = g2(); - anInt284 = g2(); - aStringArray21 = new String[anInt284]; - aStringArray22 = new String[anInt284]; - anIntArray140 = new int[anInt284]; - anIntArray141 = new int[anInt284]; - anIntArray142 = new int[anInt284]; - anIntArrayArray14 = new int[anInt284][]; - anIntArrayArray15 = new int[anInt284][]; + projectileSpriteCount = g2(); + + spellCount = g2(); + spellName = new String[spellCount]; + spellDesc = new String[spellCount]; + spellLevel = new int[spellCount]; + spellRunesRequired = new int[spellCount]; + spellType = new int[spellCount]; + spellRunes = new int[spellCount][]; + spellRunesCount = new int[spellCount][]; - for (@Pc(1040) int local1040 = 0; local1040 < anInt284; local1040++) { - aStringArray21[local1040] = gjstr(); + for (@Pc(1040) int i = 0; i < spellCount; i++) { + spellName[i] = gjstr(); } - for (@Pc(1052) int local1052 = 0; local1052 < anInt284; local1052++) { - aStringArray22[local1052] = gjstr(); + for (@Pc(1052) int i = 0; i < spellCount; i++) { + spellDesc[i] = gjstr(); } - for (@Pc(1064) int local1064 = 0; local1064 < anInt284; local1064++) { - anIntArray140[local1064] = g1(); + for (@Pc(1064) int i = 0; i < spellCount; i++) { + spellLevel[i] = g1(); } - for (@Pc(1076) int local1076 = 0; local1076 < anInt284; local1076++) { - anIntArray141[local1076] = g1(); + for (@Pc(1076) int i = 0; i < spellCount; i++) { + spellRunesRequired[i] = g1(); } - for (@Pc(1088) int local1088 = 0; local1088 < anInt284; local1088++) { - anIntArray142[local1088] = g1(); + for (@Pc(1088) int i = 0; i < spellCount; i++) { + spellType[i] = g1(); } - @Pc(1104) int local1104; - @Pc(1111) int local1111; - for (@Pc(1100) int local1100 = 0; local1100 < anInt284; local1100++) { - local1104 = g1(); - anIntArrayArray14[local1100] = new int[local1104]; - for (local1111 = 0; local1111 < local1104; local1111++) { - anIntArrayArray14[local1100][local1111] = g2(); + for (@Pc(1100) int i = 0; i < spellCount; i++) { + int count = g1(); + spellRunes[i] = new int[count]; + + for (int j = 0; j < count; j++) { + spellRunes[i][j] = g2(); } } - @Pc(1140) int local1140; - for (local1104 = 0; local1104 < anInt284; local1104++) { - local1111 = g1(); - anIntArrayArray15[local1104] = new int[local1111]; - for (local1140 = 0; local1140 < local1111; local1140++) { - anIntArrayArray15[local1104][local1140] = g1(); + for (int i = 0; i < spellCount; i++) { + int count = g1(); + spellRunesCount[i] = new int[count]; + + for (int j = 0; j < count; j++) { + spellRunesCount[i][j] = g1(); } } - anInt285 = g2(); - aStringArray23 = new String[anInt285]; - aStringArray24 = new String[anInt285]; - anIntArray143 = new int[anInt285]; - anIntArray144 = new int[anInt285]; + prayerCount = g2(); + prayerName = new String[prayerCount]; + prayerDesc = new String[prayerCount]; + prayerLevel = new int[prayerCount]; + prayerDrain = new int[prayerCount]; - for (local1111 = 0; local1111 < anInt285; local1111++) { - aStringArray23[local1111] = gjstr(); + for (int i = 0; i < prayerCount; i++) { + prayerName[i] = gjstr(); } - for (local1140 = 0; local1140 < anInt285; local1140++) { - aStringArray24[local1140] = gjstr(); + for (int i = 0; i < prayerCount; i++) { + prayerDesc[i] = gjstr(); } - for (@Pc(1196) int local1196 = 0; local1196 < anInt285; local1196++) { - anIntArray143[local1196] = g1(); + for (@Pc(1196) int i = 0; i < prayerCount; i++) { + prayerLevel[i] = g1(); } - for (@Pc(1208) int local1208 = 0; local1208 < anInt285; local1208++) { - anIntArray144[local1208] = g1(); + for (@Pc(1208) int i = 0; i < prayerCount; i++) { + prayerDrain[i] = g1(); } stringData = null; diff --git a/mudclient/src/main/java/MudClient.java b/mudclient/src/main/java/MudClient.java index 9281520..52b8472 100644 --- a/mudclient/src/main/java/MudClient.java +++ b/mudclient/src/main/java/MudClient.java @@ -1338,7 +1338,7 @@ private void method497() { this.drawArea.method377(this.anInt389, Tools.readJag("scrollbar.dat", 0, local15), local26, 2); this.drawArea.method377(this.anInt389 + 2, Tools.readJag("corners.dat", 0, local15), local26, 4); this.drawArea.method377(this.anInt389 + 6, Tools.readJag("arrows.dat", 0, local15), local26, 2); - this.drawArea.method377(this.anInt391, Tools.readJag("projectile.dat", 0, local15), local26, ClientConfig.anInt283); + this.drawArea.method377(this.anInt391, Tools.readJag("projectile.dat", 0, local15), local26, ClientConfig.projectileSpriteCount); @Pc(204) int local204 = ClientConfig.objSpriteCount; @Pc(206) int local206 = 1; @Pc(210) int local210; @@ -1356,7 +1356,7 @@ private void method497() { for (local210 = 11; local210 <= 26; local210++) { this.drawArea.method380(this.anInt388 + local210); } - for (@Pc(273) int local273 = 0; local273 < ClientConfig.anInt283; local273++) { + for (@Pc(273) int local273 = 0; local273 < ClientConfig.projectileSpriteCount; local273++) { this.drawArea.method380(this.anInt391 + local273); } for (@Pc(288) int local288 = 0; local288 < ClientConfig.objSpriteCount; local288++) { @@ -1385,11 +1385,11 @@ private void method498() { @Pc(64) int local64 = 0; this.anInt561 = 0; this.anInt562 = this.anInt561; - label77: for (@Pc(73) int local73 = 0; local73 < ClientConfig.anInt278; local73++) { - @Pc(79) String local79 = ClientConfig.aStringArray12[local73]; + label77: for (@Pc(73) int local73 = 0; local73 < ClientConfig.animationCount; local73++) { + @Pc(79) String local79 = ClientConfig.animationName[local73]; for (@Pc(81) int local81 = 0; local81 < local73; local81++) { - if (ClientConfig.aStringArray12[local81].equalsIgnoreCase(local79)) { - ClientConfig.anIntArray124[local73] = ClientConfig.anIntArray124[local81]; + if (ClientConfig.animationName[local81].equalsIgnoreCase(local79)) { + ClientConfig.animationFileId[local73] = ClientConfig.animationFileId[local81]; continue label77; } } @@ -1403,7 +1403,7 @@ private void method498() { this.drawArea.method377(this.anInt562, local113, local115, 15); local64 += 15; @Pc(162) byte[] local162; - if (ClientConfig.anIntArray122[local73] == 1) { + if (ClientConfig.animatonHasA[local73] == 1) { local162 = Tools.readJag(local79 + "a.dat", 0, local19); local115 = local30; if (local162 == null && this.worldMembers) { @@ -1413,7 +1413,7 @@ private void method498() { this.drawArea.method377(this.anInt562 + 15, local162, local115, 3); local64 += 3; } - if (ClientConfig.anIntArray123[local73] == 1) { + if (ClientConfig.animationHasF[local73] == 1) { local162 = Tools.readJag(local79 + "f.dat", 0, local19); local115 = local30; if (local162 == null && this.worldMembers) { @@ -1423,13 +1423,13 @@ private void method498() { this.drawArea.method377(this.anInt562 + 18, local162, local115, 9); local64 += 9; } - if (ClientConfig.anIntArray121[local73] != 0) { + if (ClientConfig.animationGender[local73] != 0) { for (@Pc(250) int local250 = this.anInt562; local250 < this.anInt562 + 27; local250++) { this.drawArea.method380(local250); } } } - ClientConfig.anIntArray124[local73] = this.anInt562; + ClientConfig.animationFileId[local73] = this.anInt562; this.anInt562 += 27; } System.out.println("Loaded: " + local64 + " frames of animation"); @@ -1443,15 +1443,15 @@ private void method499() { return; } @Pc(26) byte[] local26 = Tools.readJag("index.dat", 0, local15); - this.world3D.method232(ClientConfig.anInt277, 7, 11); - for (@Pc(34) int local34 = 0; local34 < ClientConfig.anInt277; local34++) { - @Pc(40) String local40 = ClientConfig.aStringArray10[local34]; + this.world3D.method232(ClientConfig.textureCount, 7, 11); + for (@Pc(34) int local34 = 0; local34 < ClientConfig.textureCount; local34++) { + @Pc(40) String local40 = ClientConfig.textureName[local34]; @Pc(52) byte[] local52 = Tools.readJag(local40 + ".dat", 0, local15); this.drawArea.method377(this.anInt392, local52, local26, 1); this.drawArea.method368(0, 0, 128, 128, 16711935); this.drawArea.method383(0, 0, this.anInt392); @Pc(82) int local82 = this.drawArea.anIntArray153[this.anInt392]; - @Pc(86) String local86 = ClientConfig.aStringArray11[local34]; + @Pc(86) String local86 = ClientConfig.textureSubName[local34]; if (local86 != null && local86.length() > 0) { local52 = Tools.readJag(local86 + ".dat", 0, local15); this.drawArea.method377(this.anInt392, local52, local26, 1); @@ -2174,15 +2174,15 @@ private void method517() { @Pc(13) byte local13 = 50; @Pc(14) int local14 = local11 + 116; @Pc(15) int local15 = local13 - 25; - this.drawArea.method387(local14 - 32 - 55, local15, 64, 102, ClientConfig.anIntArray124[this.anInt565], this.anIntArray242[this.anInt568]); - this.drawArea.method399(local14 - 32 - 55, local15, 64, 102, ClientConfig.anIntArray124[this.anInt564], this.anIntArray242[this.anInt567], this.anIntArray244[this.anInt569], 0, false); - this.drawArea.method399(local14 - 32 - 55, local15, 64, 102, ClientConfig.anIntArray124[this.anInt563], this.anIntArray243[this.anInt566], this.anIntArray244[this.anInt569], 0, false); - this.drawArea.method387(local14 - 32, local15, 64, 102, ClientConfig.anIntArray124[this.anInt565] + 6, this.anIntArray242[this.anInt568]); - this.drawArea.method399(local14 - 32, local15, 64, 102, ClientConfig.anIntArray124[this.anInt564] + 6, this.anIntArray242[this.anInt567], this.anIntArray244[this.anInt569], 0, false); - this.drawArea.method399(local14 - 32, local15, 64, 102, ClientConfig.anIntArray124[this.anInt563] + 6, this.anIntArray243[this.anInt566], this.anIntArray244[this.anInt569], 0, false); - this.drawArea.method387(local14 + 55 - 32, local15, 64, 102, ClientConfig.anIntArray124[this.anInt565] + 12, this.anIntArray242[this.anInt568]); - this.drawArea.method399(local14 + 55 - 32, local15, 64, 102, ClientConfig.anIntArray124[this.anInt564] + 12, this.anIntArray242[this.anInt567], this.anIntArray244[this.anInt569], 0, false); - this.drawArea.method399(local14 + 55 - 32, local15, 64, 102, ClientConfig.anIntArray124[this.anInt563] + 12, this.anIntArray243[this.anInt566], this.anIntArray244[this.anInt569], 0, false); + this.drawArea.method387(local14 - 32 - 55, local15, 64, 102, ClientConfig.animationFileId[this.anInt565], this.anIntArray242[this.anInt568]); + this.drawArea.method399(local14 - 32 - 55, local15, 64, 102, ClientConfig.animationFileId[this.anInt564], this.anIntArray242[this.anInt567], this.anIntArray244[this.anInt569], 0, false); + this.drawArea.method399(local14 - 32 - 55, local15, 64, 102, ClientConfig.animationFileId[this.anInt563], this.anIntArray243[this.anInt566], this.anIntArray244[this.anInt569], 0, false); + this.drawArea.method387(local14 - 32, local15, 64, 102, ClientConfig.animationFileId[this.anInt565] + 6, this.anIntArray242[this.anInt568]); + this.drawArea.method399(local14 - 32, local15, 64, 102, ClientConfig.animationFileId[this.anInt564] + 6, this.anIntArray242[this.anInt567], this.anIntArray244[this.anInt569], 0, false); + this.drawArea.method399(local14 - 32, local15, 64, 102, ClientConfig.animationFileId[this.anInt563] + 6, this.anIntArray243[this.anInt566], this.anIntArray244[this.anInt569], 0, false); + this.drawArea.method387(local14 + 55 - 32, local15, 64, 102, ClientConfig.animationFileId[this.anInt565] + 12, this.anIntArray242[this.anInt568]); + this.drawArea.method399(local14 + 55 - 32, local15, 64, 102, ClientConfig.animationFileId[this.anInt564] + 12, this.anIntArray242[this.anInt567], this.anIntArray244[this.anInt569], 0, false); + this.drawArea.method399(local14 + 55 - 32, local15, 64, 102, ClientConfig.animationFileId[this.anInt563] + 12, this.anIntArray243[this.anInt566], this.anIntArray244[this.anInt569], 0, false); this.drawArea.method383(0, this.anInt386, this.anInt388 + 22); this.drawArea.method363(this.aGraphics5, 0, 0); } @@ -2193,16 +2193,16 @@ private void method518() { if (this.aGui8.method73(this.anInt529)) { do { do { - this.anInt563 = (this.anInt563 + ClientConfig.anInt278 - 1) % ClientConfig.anInt278; - } while ((ClientConfig.anIntArray121[this.anInt563] & 0x3) != 1); - } while ((ClientConfig.anIntArray121[this.anInt563] & this.anInt570 * 4) == 0); + this.anInt563 = (this.anInt563 + ClientConfig.animationCount - 1) % ClientConfig.animationCount; + } while ((ClientConfig.animationGender[this.anInt563] & 0x3) != 1); + } while ((ClientConfig.animationGender[this.anInt563] & this.anInt570 * 4) == 0); } if (this.aGui8.method73(this.anInt530)) { do { do { - this.anInt563 = (this.anInt563 + 1) % ClientConfig.anInt278; - } while ((ClientConfig.anIntArray121[this.anInt563] & 0x3) != 1); - } while ((ClientConfig.anIntArray121[this.anInt563] & this.anInt570 * 4) == 0); + this.anInt563 = (this.anInt563 + 1) % ClientConfig.animationCount; + } while ((ClientConfig.animationGender[this.anInt563] & 0x3) != 1); + } while ((ClientConfig.animationGender[this.anInt563] & this.anInt570 * 4) == 0); } if (this.aGui8.method73(this.anInt531)) { this.anInt566 = (this.anInt566 + this.anIntArray243.length - 1) % this.anIntArray243.length; @@ -2212,11 +2212,11 @@ private void method518() { } if (this.aGui8.method73(this.anInt533) || this.aGui8.method73(this.anInt534)) { this.anInt570 = 3 - this.anInt570; - while ((ClientConfig.anIntArray121[this.anInt563] & 0x3) != 1 || (ClientConfig.anIntArray121[this.anInt563] & this.anInt570 * 4) == 0) { - this.anInt563 = (this.anInt563 + 1) % ClientConfig.anInt278; + while ((ClientConfig.animationGender[this.anInt563] & 0x3) != 1 || (ClientConfig.animationGender[this.anInt563] & this.anInt570 * 4) == 0) { + this.anInt563 = (this.anInt563 + 1) % ClientConfig.animationCount; } - while ((ClientConfig.anIntArray121[this.anInt564] & 0x3) != 2 || (ClientConfig.anIntArray121[this.anInt564] & this.anInt570 * 4) == 0) { - this.anInt564 = (this.anInt564 + 1) % ClientConfig.anInt278; + while ((ClientConfig.animationGender[this.anInt564] & 0x3) != 2 || (ClientConfig.animationGender[this.anInt564] & this.anInt570 * 4) == 0) { + this.anInt564 = (this.anInt564 + 1) % ClientConfig.animationCount; } } if (this.aGui8.method73(this.anInt535)) { @@ -3510,7 +3510,7 @@ protected void method492(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Or this.anIntArray176[this.anInt436] = 0; for (local76 = 0; local76 < this.anInt438; local76++) { if (this.anIntArray177[local76] == local46 && this.anIntArray178[local76] == local456) { - this.anIntArray176[this.anInt436] = ClientConfig.anIntArray129[this.anIntArray179[local76]]; + this.anIntArray176[this.anInt436] = ClientConfig.locElevation[this.anIntArray179[local76]]; break; } } @@ -3592,15 +3592,15 @@ protected void method492(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Or if (local34 != 60000) { local131 = this.world.method433(local46, local456); if (local131 == 0 || local131 == 4) { - local134 = ClientConfig.anIntArray126[local34]; - local294 = ClientConfig.anIntArray127[local34]; + local134 = ClientConfig.locWidth[local34]; + local294 = ClientConfig.locLength[local34]; } else { - local294 = ClientConfig.anIntArray126[local34]; - local134 = ClientConfig.anIntArray127[local34]; + local294 = ClientConfig.locWidth[local34]; + local134 = ClientConfig.locLength[local34]; } local148 = (local46 + local46 + local134) * this.anInt383 / 2; local156 = (local456 + local456 + local294) * this.anInt383 / 2; - local164 = ClientConfig.anIntArray125[local34]; + local164 = ClientConfig.locModel[local34]; @Pc(1033) Object3D local1033 = this.anObject3DArray5[local164].method141(); this.world3D.method198(local1033); local1033.anInt88 = this.anInt438; @@ -3904,7 +3904,7 @@ protected void method492(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Or local148 = (this.anInt429 + local131) * this.anInt383 + 64; local156 = Tools.gBit(arg2, local34, 10); local34 += 10; - if (local156 >= ClientConfig.anInt276) { + if (local156 >= ClientConfig.npcCount) { local156 = 24; } this.method526(local76, local294, local148, local134, local156); @@ -3930,7 +3930,7 @@ protected void method492(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Or local1214.anInt300 = 150; local1214.aString21 = local2263; if (local131 == this.localPlayer.anInt290) { - this.message("@yel@" + ClientConfig.aStringArray7[local1214.anInt294] + ": " + local1214.aString21, 5); + this.message("@yel@" + ClientConfig.npcName[local1214.anInt294] + ": " + local1214.aString21, 5); } } local34 += local2255; @@ -4733,7 +4733,7 @@ private void method530() { local756 = -this.world.method424(local652, local667) - 110; local759 = local718.anInt292; @Pc(762) int local762 = local718.anInt293; - @Pc(776) int local776 = -this.world.method424(local759, local762) - ClientConfig.anIntArray116[local718.anInt294] / 2; + @Pc(776) int local776 = -this.world.method424(local759, local762) - ClientConfig.npcLength[local718.anInt294] / 2; @Pc(792) int local792 = (local652 * local713.anInt315 + local759 * (this.anInt395 - local713.anInt315)) / this.anInt395; @Pc(808) int local808 = (local756 * local713.anInt315 + local776 * (this.anInt395 - local713.anInt315)) / this.anInt395; @Pc(824) int local824 = (local667 * local713.anInt315 + local762 * (this.anInt395 - local713.anInt315)) / this.anInt395; @@ -4747,7 +4747,7 @@ private void method530() { local652 = local718.anInt292; local667 = local718.anInt293; local756 = -this.world.method424(local652, local667); - local759 = this.world3D.method203(local642 + 20000, local652, local756, local667, ClientConfig.anIntArray115[local718.anInt294], ClientConfig.anIntArray116[local718.anInt294], local642 + 30000); + local759 = this.world3D.method203(local642 + 20000, local652, local756, local667, ClientConfig.npcWidth[local718.anInt294], ClientConfig.npcLength[local718.anInt294], local642 + 30000); this.anInt427++; if (local718.anInt296 == 8) { this.world3D.method205(local759, -30); @@ -4973,49 +4973,49 @@ public void method535(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi local22 = 1; local20 = true; } - @Pc(64) int local64 = local22 * 3 + this.anIntArray245[local6.anInt295 / ClientConfig.anIntArray117[local6.anInt294] % 4]; + @Pc(64) int local64 = local22 * 3 + this.anIntArray245[local6.anInt295 / ClientConfig.npcWalkSpeed[local6.anInt294] % 4]; if (local6.anInt296 == 8) { local22 = 5; local18 = 2; local20 = false; - arg0 -= ClientConfig.anIntArray119[local6.anInt294] * arg6 / 100; - local64 = local22 * 3 + this.anIntArray246[this.anInt372 / (ClientConfig.anIntArray118[local6.anInt294] - 1) % 8]; + arg0 -= ClientConfig.npcCombatWidth[local6.anInt294] * arg6 / 100; + local64 = local22 * 3 + this.anIntArray246[this.anInt372 / (ClientConfig.npcCombatSpeed[local6.anInt294] - 1) % 8]; } else if (local6.anInt296 == 9) { local22 = 5; local18 = 2; local20 = true; - arg0 += ClientConfig.anIntArray119[local6.anInt294] * arg6 / 100; - local64 = local22 * 3 + this.anIntArray247[this.anInt372 / ClientConfig.anIntArray118[local6.anInt294] % 8]; + arg0 += ClientConfig.npcCombatWidth[local6.anInt294] * arg6 / 100; + local64 = local22 * 3 + this.anIntArray247[this.anInt372 / ClientConfig.npcCombatSpeed[local6.anInt294] % 8]; } @Pc(155) int local155; @Pc(162) int local162; for (@Pc(146) int local146 = 0; local146 < 12; local146++) { local155 = this.anIntArrayArray22[local18][local146]; - local162 = ClientConfig.anIntArrayArray13[local6.anInt294][local155]; + local162 = ClientConfig.npcSprites[local6.anInt294][local155]; if (local162 >= 0) { @Pc(166) byte local166 = 0; @Pc(168) byte local168 = 0; @Pc(170) int local170 = local64; - if (local20 && local22 >= 1 && local22 <= 3 && ClientConfig.anIntArray123[local162] == 1) { + if (local20 && local22 >= 1 && local22 <= 3 && ClientConfig.animationHasF[local162] == 1) { local170 = local64 + 15; } - if (local22 != 5 || ClientConfig.anIntArray122[local162] == 1) { - @Pc(198) int local198 = local170 + ClientConfig.anIntArray124[local162]; + if (local22 != 5 || ClientConfig.animatonHasA[local162] == 1) { + @Pc(198) int local198 = local170 + ClientConfig.animationFileId[local162]; @Pc(208) int local208 = local166 * arg2 / this.drawArea.anIntArray153[local198]; @Pc(218) int local218 = local168 * arg3 / this.drawArea.anIntArray154[local198]; - @Pc(234) int local234 = arg2 * this.drawArea.anIntArray153[local198] / this.drawArea.anIntArray153[ClientConfig.anIntArray124[local162]]; + @Pc(234) int local234 = arg2 * this.drawArea.anIntArray153[local198] / this.drawArea.anIntArray153[ClientConfig.animationFileId[local162]]; @Pc(242) int local242 = local208 - (local234 - arg2) / 2; - @Pc(246) int local246 = ClientConfig.anIntArray120[local162]; + @Pc(246) int local246 = ClientConfig.animationColor[local162]; @Pc(248) int local248 = 0; if (local246 == 1) { - local246 = ClientConfig.anIntArray111[local6.anInt294]; - local248 = ClientConfig.anIntArray114[local6.anInt294]; + local246 = ClientConfig.npcHairColor[local6.anInt294]; + local248 = ClientConfig.npcSkinColor[local6.anInt294]; } else if (local246 == 2) { - local246 = ClientConfig.anIntArray112[local6.anInt294]; - local248 = ClientConfig.anIntArray114[local6.anInt294]; + local246 = ClientConfig.npcTopColor[local6.anInt294]; + local248 = ClientConfig.npcSkinColor[local6.anInt294]; } else if (local246 == 3) { - local246 = ClientConfig.anIntArray113[local6.anInt294]; - local248 = ClientConfig.anIntArray114[local6.anInt294]; + local246 = ClientConfig.npcBottomColor[local6.anInt294]; + local248 = ClientConfig.npcSkinColor[local6.anInt294]; } this.drawArea.method399(arg0 + local242, arg1 + local218, local234, arg3, local198, local246, local248, arg5, local20); } @@ -5103,7 +5103,7 @@ public void method536(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi @Pc(156) byte local156 = 0; @Pc(158) int local158 = local66; if (local25 && local27 >= 1 && local27 <= 3) { - if (ClientConfig.anIntArray123[local150] == 1) { + if (ClientConfig.animationHasF[local150] == 1) { local158 = local66 + 15; } else if (local143 == 4 && local27 == 1) { local154 = -22; @@ -5131,13 +5131,13 @@ public void method536(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi local158 = local27 * 3 + this.anIntArray245[(local6.anInt295 / 6 + 2) % 4]; } } - if (local27 != 5 || ClientConfig.anIntArray122[local150] == 1) { - @Pc(354) int local354 = local158 + ClientConfig.anIntArray124[local150]; + if (local27 != 5 || ClientConfig.animatonHasA[local150] == 1) { + @Pc(354) int local354 = local158 + ClientConfig.animationFileId[local150]; local364 = local154 * arg2 / this.drawArea.anIntArray153[local354]; @Pc(374) int local374 = local156 * arg3 / this.drawArea.anIntArray154[local354]; - @Pc(390) int local390 = arg2 * this.drawArea.anIntArray153[local354] / this.drawArea.anIntArray153[ClientConfig.anIntArray124[local150]]; + @Pc(390) int local390 = arg2 * this.drawArea.anIntArray153[local354] / this.drawArea.anIntArray153[ClientConfig.animationFileId[local150]]; @Pc(398) int local398 = local364 - (local390 - arg2) / 2; - @Pc(402) int local402 = ClientConfig.anIntArray120[local150]; + @Pc(402) int local402 = ClientConfig.animationColor[local150]; @Pc(408) int local408 = this.anIntArray244[local6.anInt311]; if (local402 == 1) { local402 = this.anIntArray243[local6.anInt308]; @@ -5319,13 +5319,13 @@ private void method544(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig @Pc(8) int local8; @Pc(12) int local12; if (arg2 == 0 || arg2 == 4) { - local8 = ClientConfig.anIntArray126[arg3]; - local12 = ClientConfig.anIntArray127[arg3]; + local8 = ClientConfig.locWidth[arg3]; + local12 = ClientConfig.locLength[arg3]; } else { - local12 = ClientConfig.anIntArray126[arg3]; - local8 = ClientConfig.anIntArray127[arg3]; + local12 = ClientConfig.locWidth[arg3]; + local8 = ClientConfig.locLength[arg3]; } - if (ClientConfig.anIntArray128[arg3] != 2 && ClientConfig.anIntArray128[arg3] != 3) { + if (ClientConfig.locType[arg3] != 2 && ClientConfig.locType[arg3] != 3) { this.method546(this.anInt428, this.anInt429, arg0, arg1, arg0 + local8 - 1, arg1 + local12 - 1, true, true); return; } @@ -5433,11 +5433,11 @@ private boolean method547(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { local207 = this.anIntArray180[local164]; @Pc(220) int local220; if (local207 == 0 || local207 == 4) { - local216 = ClientConfig.anIntArray126[local197]; - local220 = ClientConfig.anIntArray127[local197]; + local216 = ClientConfig.locWidth[local197]; + local220 = ClientConfig.locLength[local197]; } else { - local220 = ClientConfig.anIntArray126[local197]; - local216 = ClientConfig.anIntArray127[local197]; + local220 = ClientConfig.locWidth[local197]; + local216 = ClientConfig.locLength[local197]; } @Pc(241) int local241 = (local187 + local187 + local216) * this.anInt383 / 2; @Pc(252) int local252 = (local192 + local192 + local220) * this.anInt383 / 2; @@ -5503,9 +5503,9 @@ private Object3D method548(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @ @Pc(1) int local1 = arg0; @Pc(5) int local5 = arg0; @Pc(7) int local7 = arg1; - @Pc(11) int local11 = ClientConfig.anIntArray131[arg3]; - @Pc(15) int local15 = ClientConfig.anIntArray132[arg3]; - @Pc(19) int local19 = ClientConfig.anIntArray130[arg3]; + @Pc(11) int local11 = ClientConfig.boundFrontMask[arg3]; + @Pc(15) int local15 = ClientConfig.boundBackMask[arg3]; + @Pc(19) int local19 = ClientConfig.boundHeight[arg3]; @Pc(25) Object3D local25 = new Object3D(4, 1); if (arg2 == 0) { local5 = arg0 + 1; @@ -7330,8 +7330,8 @@ private void method566(@OriginalArg(0) boolean arg0) { this.menuAction[this.menuSize] = 3600; this.menuParamA[this.menuSize] = local225; this.menuSize++; - } else if (ClientConfig.anIntArray142[this.anInt453] == 3) { - this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.aStringArray21[this.anInt453] + " on"; + } else if (ClientConfig.spellType[this.anInt453] == 3) { + this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.spellName[this.anInt453] + " on"; this.menuOptionTarget[this.menuSize] = "@lre@" + ClientConfig.objName[local225]; this.menuAction[this.menuSize] = 600; this.menuParamA[this.menuSize] = local216; @@ -7575,33 +7575,33 @@ private void method569(@OriginalArg(0) boolean arg0) { this.aGui1.method100(this.anInt451); local177 = 0; @Pc(193) int local193; - for (local179 = 0; local179 < ClientConfig.anInt284; local179++) { + for (local179 = 0; local179 < ClientConfig.spellCount; local179++) { local183 = "@yel@"; - for (local185 = 0; local185 < ClientConfig.anIntArray141[local179]; local185++) { - local193 = ClientConfig.anIntArrayArray14[local179][local185]; - if (!this.method539(local193, ClientConfig.anIntArrayArray15[local179][local185])) { + for (local185 = 0; local185 < ClientConfig.spellRunesRequired[local179]; local185++) { + local193 = ClientConfig.spellRunes[local179][local185]; + if (!this.method539(local193, ClientConfig.spellRunesCount[local179][local185])) { local183 = "@whi@"; break; } } local193 = this.anIntArray189[6]; - if (ClientConfig.anIntArray140[local179] > local193) { + if (ClientConfig.spellLevel[local179] > local193) { local183 = "@bla@"; } - this.aGui1.method102(this.anInt451, local177++, local183 + "Level " + ClientConfig.anIntArray140[local179] + ": " + ClientConfig.aStringArray21[local179]); + this.aGui1.method102(this.anInt451, local177++, local183 + "Level " + ClientConfig.spellLevel[local179] + ": " + ClientConfig.spellName[local179]); } this.aGui1.method75(); local262 = this.aGui1.method110(this.anInt451); if (local262 == -1) { this.drawArea.drawStringTaggable("Point at a spell for a description", local7 + 2, local9 + 124, 1, 0); } else { - this.drawArea.drawStringTaggable("Level " + ClientConfig.anIntArray140[local262] + ": " + ClientConfig.aStringArray21[local262], local7 + 2, local9 + 124, 1, 16776960); - this.drawArea.drawStringTaggable(ClientConfig.aStringArray22[local262], local7 + 2, local9 + 136, 0, 16777215); - for (local185 = 0; local185 < ClientConfig.anIntArray141[local262]; local185++) { - local193 = ClientConfig.anIntArrayArray14[local262][local185]; + this.drawArea.drawStringTaggable("Level " + ClientConfig.spellLevel[local262] + ": " + ClientConfig.spellName[local262], local7 + 2, local9 + 124, 1, 16776960); + this.drawArea.drawStringTaggable(ClientConfig.spellDesc[local262], local7 + 2, local9 + 136, 0, 16777215); + for (local185 = 0; local185 < ClientConfig.spellRunesRequired[local262]; local185++) { + local193 = ClientConfig.spellRunes[local262][local185]; this.drawArea.method383(local7 + local185 * 44 + 2, local9 + 150, this.anInt390 + ClientConfig.objSprite[local193]); @Pc(338) int local338 = this.method538(local193); - @Pc(344) int local344 = ClientConfig.anIntArrayArray15[local262][local185]; + @Pc(344) int local344 = ClientConfig.spellRunesCount[local262][local185]; @Pc(346) String local346 = "@red@"; if (this.method539(local193, local344)) { local346 = "@gre@"; @@ -7613,24 +7613,24 @@ private void method569(@OriginalArg(0) boolean arg0) { if (this.anInt452 == 1) { this.aGui1.method100(this.anInt451); local177 = 0; - for (local179 = 0; local179 < ClientConfig.anInt285; local179++) { + for (local179 = 0; local179 < ClientConfig.prayerCount; local179++) { local183 = "@whi@"; - if (ClientConfig.anIntArray143[local179] > this.anIntArray190[5]) { + if (ClientConfig.prayerLevel[local179] > this.anIntArray190[5]) { local183 = "@bla@"; } if (this.aBooleanArray14[local179]) { local183 = "@gre@"; } - this.aGui1.method102(this.anInt451, local177++, local183 + "Level " + ClientConfig.anIntArray143[local179] + ": " + ClientConfig.aStringArray23[local179]); + this.aGui1.method102(this.anInt451, local177++, local183 + "Level " + ClientConfig.prayerLevel[local179] + ": " + ClientConfig.prayerName[local179]); } this.aGui1.method75(); local262 = this.aGui1.method110(this.anInt451); if (local262 == -1) { this.drawArea.drawStringTaggable("Point at a prayer for a description", local7 + 2, local9 + 124, 1, 0); } else { - this.drawArea.drawString("Level " + ClientConfig.anIntArray143[local262] + ": " + ClientConfig.aStringArray23[local262], local7 + local22 / 2, local9 + 130, 1, 16776960); - this.drawArea.drawString(ClientConfig.aStringArray24[local262], local7 + local22 / 2, local9 + 145, 0, 16777215); - this.drawArea.drawString("Drain rate: " + ClientConfig.anIntArray144[local262], local7 + local22 / 2, local9 + 160, 1, 0); + this.drawArea.drawString("Level " + ClientConfig.prayerLevel[local262] + ": " + ClientConfig.prayerName[local262], local7 + local22 / 2, local9 + 130, 1, 16776960); + this.drawArea.drawString(ClientConfig.prayerDesc[local262], local7 + local22 / 2, local9 + 145, 0, 16777215); + this.drawArea.drawString("Drain rate: " + ClientConfig.prayerDrain[local262], local7 + local22 / 2, local9 + 160, 1, 0); } } if (!arg0) { @@ -7655,18 +7655,18 @@ private void method569(@OriginalArg(0) boolean arg0) { local177 = this.aGui1.method110(this.anInt451); if (local177 != -1) { local179 = this.anIntArray189[6]; - if (ClientConfig.anIntArray140[local177] > local179) { + if (ClientConfig.spellLevel[local177] > local179) { this.message("Your magic ability is not high enough for this spell", 3); } else { - for (local262 = 0; local262 < ClientConfig.anIntArray141[local177]; local262++) { - local185 = ClientConfig.anIntArrayArray14[local177][local262]; - if (!this.method539(local185, ClientConfig.anIntArrayArray15[local177][local262])) { + for (local262 = 0; local262 < ClientConfig.spellRunesRequired[local177]; local262++) { + local185 = ClientConfig.spellRunes[local177][local262]; + if (!this.method539(local185, ClientConfig.spellRunesCount[local177][local262])) { this.message("You don't have all the reagents you need for this spell", 3); local262 = -1; break; } } - if (local262 == ClientConfig.anIntArray141[local177]) { + if (local262 == ClientConfig.spellRunesRequired[local177]) { this.anInt453 = local177; this.anInt444 = -1; } @@ -7677,7 +7677,7 @@ private void method569(@OriginalArg(0) boolean arg0) { local177 = this.aGui1.method110(this.anInt451); if (local177 != -1) { local179 = this.anIntArray190[5]; - if (ClientConfig.anIntArray143[local177] > local179) { + if (ClientConfig.prayerLevel[local177] > local179) { this.message("Your prayer ability is not high enough for this prayer", 3); } else if (this.anIntArray189[5] == 0) { this.message("You have run out of prayer points. Return to a church to recharge", 3); @@ -8066,8 +8066,8 @@ private void method572() { } local124 = " " + local124 + "(level-" + this.anEntityArray2[local112].combatLevel + ")"; if (this.anInt453 >= 0) { - if (ClientConfig.anIntArray142[this.anInt453] == 1 || ClientConfig.anIntArray142[this.anInt453] == 2) { - this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.aStringArray21[this.anInt453] + " on"; + if (ClientConfig.spellType[this.anInt453] == 1 || ClientConfig.spellType[this.anInt453] == 2) { + this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.spellName[this.anInt453] + " on"; this.menuOptionTarget[this.menuSize] = "@whi@" + this.anEntityArray2[local112].aString20 + local124; this.menuAction[this.menuSize] = 800; this.menuParamEntityA[this.menuSize] = this.anEntityArray2[local112].anInt292; @@ -8120,8 +8120,8 @@ private void method572() { } } else if (local119 == 2) { if (this.anInt453 >= 0) { - if (ClientConfig.anIntArray142[this.anInt453] == 3) { - this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.aStringArray21[this.anInt453] + " on"; + if (ClientConfig.spellType[this.anInt453] == 3) { + this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.spellName[this.anInt453] + " on"; this.menuOptionTarget[this.menuSize] = "@lre@" + ClientConfig.objName[this.anIntArray175[local112]]; this.menuAction[this.menuSize] = 200; this.menuParamEntityA[this.menuSize] = this.anIntArray173[local112]; @@ -8157,8 +8157,8 @@ private void method572() { local124 = ""; local126 = -1; @Pc(952) int local952 = this.anEntityArray5[local112].anInt294; - if (ClientConfig.anIntArray110[local952] > 0) { - @Pc(974) int local974 = (ClientConfig.anIntArray106[local952] + ClientConfig.anIntArray109[local952] + ClientConfig.anIntArray107[local952] + ClientConfig.anIntArray108[local952]) / 4; + if (ClientConfig.npcAttackable[local952] > 0) { + @Pc(974) int local974 = (ClientConfig.npcAttack[local952] + ClientConfig.npcDefense[local952] + ClientConfig.npcStrength[local952] + ClientConfig.npcHits[local952]) / 4; @Pc(998) int local998 = (this.anIntArray190[0] + this.anIntArray190[1] + this.anIntArray190[2] + this.anIntArray190[3] + 27) / 4; local126 = local998 - local974; local124 = "@yel@"; @@ -8189,9 +8189,9 @@ private void method572() { local124 = " " + local124 + "(level-" + local974 + ")"; } if (this.anInt453 >= 0) { - if (ClientConfig.anIntArray142[this.anInt453] == 2) { - this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.aStringArray21[this.anInt453] + " on"; - this.menuOptionTarget[this.menuSize] = "@yel@" + ClientConfig.aStringArray7[this.anEntityArray5[local112].anInt294]; + if (ClientConfig.spellType[this.anInt453] == 2) { + this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.spellName[this.anInt453] + " on"; + this.menuOptionTarget[this.menuSize] = "@yel@" + ClientConfig.npcName[this.anEntityArray5[local112].anInt294]; this.menuAction[this.menuSize] = 700; this.menuParamEntityA[this.menuSize] = this.anEntityArray5[local112].anInt292; this.menuParamEntityB[this.menuSize] = this.anEntityArray5[local112].anInt293; @@ -8201,7 +8201,7 @@ private void method572() { } } else if (this.anInt444 >= 0) { this.menuOptionType[this.menuSize] = "Use " + this.aString32 + " with"; - this.menuOptionTarget[this.menuSize] = "@yel@" + ClientConfig.aStringArray7[this.anEntityArray5[local112].anInt294]; + this.menuOptionTarget[this.menuSize] = "@yel@" + ClientConfig.npcName[this.anEntityArray5[local112].anInt294]; this.menuAction[this.menuSize] = 710; this.menuParamEntityA[this.menuSize] = this.anEntityArray5[local112].anInt292; this.menuParamEntityB[this.menuSize] = this.anEntityArray5[local112].anInt293; @@ -8209,9 +8209,9 @@ private void method572() { this.menuParamB[this.menuSize] = this.anInt444; this.menuSize++; } else { - if (ClientConfig.anIntArray110[local952] > 0) { + if (ClientConfig.npcAttackable[local952] > 0) { this.menuOptionType[this.menuSize] = "Attack"; - this.menuOptionTarget[this.menuSize] = "@yel@" + ClientConfig.aStringArray7[this.anEntityArray5[local112].anInt294] + local124; + this.menuOptionTarget[this.menuSize] = "@yel@" + ClientConfig.npcName[this.anEntityArray5[local112].anInt294] + local124; if (local126 >= 0) { this.menuAction[this.menuSize] = 715; } else { @@ -8223,15 +8223,15 @@ private void method572() { this.menuSize++; } this.menuOptionType[this.menuSize] = "Talk-to"; - this.menuOptionTarget[this.menuSize] = "@yel@" + ClientConfig.aStringArray7[this.anEntityArray5[local112].anInt294]; + this.menuOptionTarget[this.menuSize] = "@yel@" + ClientConfig.npcName[this.anEntityArray5[local112].anInt294]; this.menuAction[this.menuSize] = 720; this.menuParamEntityA[this.menuSize] = this.anEntityArray5[local112].anInt292; this.menuParamEntityB[this.menuSize] = this.anEntityArray5[local112].anInt293; this.menuParamA[this.menuSize] = this.anEntityArray5[local112].anInt290; this.menuSize++; - if (!ClientConfig.aStringArray9[local952].equals("")) { - this.menuOptionType[this.menuSize] = ClientConfig.aStringArray9[local952]; - this.menuOptionTarget[this.menuSize] = "@yel@" + ClientConfig.aStringArray7[this.anEntityArray5[local112].anInt294]; + if (!ClientConfig.npcOption[local952].equals("")) { + this.menuOptionType[this.menuSize] = ClientConfig.npcOption[local952]; + this.menuOptionTarget[this.menuSize] = "@yel@" + ClientConfig.npcName[this.anEntityArray5[local112].anInt294]; this.menuAction[this.menuSize] = 725; this.menuParamEntityA[this.menuSize] = this.anEntityArray5[local112].anInt292; this.menuParamEntityB[this.menuSize] = this.anEntityArray5[local112].anInt293; @@ -8239,7 +8239,7 @@ private void method572() { this.menuSize++; } this.menuOptionType[this.menuSize] = "Examine"; - this.menuOptionTarget[this.menuSize] = "@yel@" + ClientConfig.aStringArray7[this.anEntityArray5[local112].anInt294]; + this.menuOptionTarget[this.menuSize] = "@yel@" + ClientConfig.npcName[this.anEntityArray5[local112].anInt294]; this.menuAction[this.menuSize] = 3700; this.menuParamA[this.menuSize] = this.anEntityArray5[local112].anInt294; this.menuSize++; @@ -8250,9 +8250,9 @@ private void method572() { local119 = this.anIntArray184[local112]; if (!this.aBooleanArray12[local112]) { if (this.anInt453 >= 0) { - if (ClientConfig.anIntArray142[this.anInt453] == 4) { - this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.aStringArray21[this.anInt453] + " on"; - this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.aStringArray17[local119]; + if (ClientConfig.spellType[this.anInt453] == 4) { + this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.spellName[this.anInt453] + " on"; + this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.boundName[local119]; this.menuAction[this.menuSize] = 300; this.menuParamEntityA[this.menuSize] = this.anIntArray181[local112]; this.menuParamEntityB[this.menuSize] = this.anIntArray182[local112]; @@ -8262,7 +8262,7 @@ private void method572() { } } else if (this.anInt444 >= 0) { this.menuOptionType[this.menuSize] = "Use " + this.aString32 + " with"; - this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.aStringArray17[local119]; + this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.boundName[local119]; this.menuAction[this.menuSize] = 310; this.menuParamEntityA[this.menuSize] = this.anIntArray181[local112]; this.menuParamEntityB[this.menuSize] = this.anIntArray182[local112]; @@ -8270,18 +8270,18 @@ private void method572() { this.menuParamB[this.menuSize] = this.anInt444; this.menuSize++; } else { - if (!ClientConfig.aStringArray19[local119].equalsIgnoreCase("WalkTo")) { - this.menuOptionType[this.menuSize] = ClientConfig.aStringArray19[local119]; - this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.aStringArray17[local119]; + if (!ClientConfig.boundOption1[local119].equalsIgnoreCase("WalkTo")) { + this.menuOptionType[this.menuSize] = ClientConfig.boundOption1[local119]; + this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.boundName[local119]; this.menuAction[this.menuSize] = 320; this.menuParamEntityA[this.menuSize] = this.anIntArray181[local112]; this.menuParamEntityB[this.menuSize] = this.anIntArray182[local112]; this.menuParamA[this.menuSize] = this.anIntArray183[local112]; this.menuSize++; } - if (!ClientConfig.aStringArray20[local119].equalsIgnoreCase("Examine")) { - this.menuOptionType[this.menuSize] = ClientConfig.aStringArray20[local119]; - this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.aStringArray17[local119]; + if (!ClientConfig.boundOption2[local119].equalsIgnoreCase("Examine")) { + this.menuOptionType[this.menuSize] = ClientConfig.boundOption2[local119]; + this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.boundName[local119]; this.menuAction[this.menuSize] = 2300; this.menuParamEntityA[this.menuSize] = this.anIntArray181[local112]; this.menuParamEntityB[this.menuSize] = this.anIntArray182[local112]; @@ -8289,7 +8289,7 @@ private void method572() { this.menuSize++; } this.menuOptionType[this.menuSize] = "Examine"; - this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.aStringArray17[local119]; + this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.boundName[local119]; this.menuAction[this.menuSize] = 3300; this.menuParamA[this.menuSize] = local119; this.menuSize++; @@ -8308,9 +8308,9 @@ private void method572() { local119 = this.anIntArray179[local112]; if (!this.aBooleanArray11[local112]) { if (this.anInt453 >= 0) { - if (ClientConfig.anIntArray142[this.anInt453] == 5) { - this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.aStringArray21[this.anInt453] + " on"; - this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.aStringArray13[local119]; + if (ClientConfig.spellType[this.anInt453] == 5) { + this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.spellName[this.anInt453] + " on"; + this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.locName[local119]; this.menuAction[this.menuSize] = 400; this.menuParamEntityA[this.menuSize] = this.anIntArray177[local112]; this.menuParamEntityB[this.menuSize] = this.anIntArray178[local112]; @@ -8321,7 +8321,7 @@ private void method572() { } } else if (this.anInt444 >= 0) { this.menuOptionType[this.menuSize] = "Use " + this.aString32 + " with"; - this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.aStringArray13[local119]; + this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.locName[local119]; this.menuAction[this.menuSize] = 410; this.menuParamEntityA[this.menuSize] = this.anIntArray177[local112]; this.menuParamEntityB[this.menuSize] = this.anIntArray178[local112]; @@ -8330,9 +8330,9 @@ private void method572() { this.menuParamC[this.menuSize] = this.anInt444; this.menuSize++; } else { - if (!ClientConfig.aStringArray15[local119].equalsIgnoreCase("WalkTo")) { - this.menuOptionType[this.menuSize] = ClientConfig.aStringArray15[local119]; - this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.aStringArray13[local119]; + if (!ClientConfig.locOption1[local119].equalsIgnoreCase("WalkTo")) { + this.menuOptionType[this.menuSize] = ClientConfig.locOption1[local119]; + this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.locName[local119]; this.menuAction[this.menuSize] = 420; this.menuParamEntityA[this.menuSize] = this.anIntArray177[local112]; this.menuParamEntityB[this.menuSize] = this.anIntArray178[local112]; @@ -8340,9 +8340,9 @@ private void method572() { this.menuParamB[this.menuSize] = this.anIntArray179[local112]; this.menuSize++; } - if (!ClientConfig.aStringArray16[local119].equalsIgnoreCase("Examine")) { - this.menuOptionType[this.menuSize] = ClientConfig.aStringArray16[local119]; - this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.aStringArray13[local119]; + if (!ClientConfig.locOption2[local119].equalsIgnoreCase("Examine")) { + this.menuOptionType[this.menuSize] = ClientConfig.locOption2[local119]; + this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.locName[local119]; this.menuAction[this.menuSize] = 2400; this.menuParamEntityA[this.menuSize] = this.anIntArray177[local112]; this.menuParamEntityB[this.menuSize] = this.anIntArray178[local112]; @@ -8351,7 +8351,7 @@ private void method572() { this.menuSize++; } this.menuOptionType[this.menuSize] = "Examine"; - this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.aStringArray13[local119]; + this.menuOptionTarget[this.menuSize] = "@cya@" + ClientConfig.locName[local119]; this.menuAction[this.menuSize] = 3400; this.menuParamA[this.menuSize] = local119; this.menuSize++; @@ -8361,8 +8361,8 @@ private void method572() { } } } - if (this.anInt453 >= 0 && ClientConfig.anIntArray142[this.anInt453] <= 1) { - this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.aStringArray21[this.anInt453] + " on self"; + if (this.anInt453 >= 0 && ClientConfig.spellType[this.anInt453] <= 1) { + this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.spellName[this.anInt453] + " on self"; this.menuOptionTarget[this.menuSize] = ""; this.menuAction[this.menuSize] = 1000; this.menuParamA[this.menuSize] = this.anInt453; @@ -8372,8 +8372,8 @@ private void method572() { return; } if (this.anInt453 >= 0) { - if (ClientConfig.anIntArray142[this.anInt453] == 6) { - this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.aStringArray21[this.anInt453] + " on ground"; + if (ClientConfig.spellType[this.anInt453] == 6) { + this.menuOptionType[this.menuSize] = "Cast " + ClientConfig.spellName[this.anInt453] + " on ground"; this.menuOptionTarget[this.menuSize] = ""; this.menuAction[this.menuSize] = 900; this.menuParamEntityA[this.menuSize] = this.world.anIntArray164[local26]; @@ -8592,7 +8592,7 @@ private void method575(@OriginalArg(0) int arg0) { super.stream.encryptPacket(); } if (local29 == 3300) { - this.message(ClientConfig.aStringArray18[local14], 3); + this.message(ClientConfig.boundDesc[local14], 3); } if (local29 == 400) { this.method544(local4, local9, local14, local19); @@ -8627,7 +8627,7 @@ private void method575(@OriginalArg(0) int arg0) { super.stream.encryptPacket(); } if (local29 == 3400) { - this.message(ClientConfig.aStringArray14[local14], 3); + this.message(ClientConfig.locDesc[local14], 3); } if (local29 == 600) { super.stream.p1spooky(220, 567); @@ -8721,7 +8721,7 @@ private void method575(@OriginalArg(0) int arg0) { super.stream.encryptPacket(); } if (local29 == 3700) { - this.message(ClientConfig.aStringArray8[local14], 3); + this.message(ClientConfig.npcDesc[local14], 3); } if (local29 == 800) { local634 = (local4 - 64) / this.anInt383; diff --git a/mudclient/src/main/java/World.java b/mudclient/src/main/java/World.java index 96a2984..2ec4b8a 100644 --- a/mudclient/src/main/java/World.java +++ b/mudclient/src/main/java/World.java @@ -261,7 +261,7 @@ private void method415(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig @OriginalMember(owner = "mudclient!f", name = "a", descriptor = "(IIII)V") public void method416(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - if (arg0 < 0 || arg1 < 0 || arg0 >= this.anInt341 - 1 || arg1 >= this.anInt342 - 1 || ClientConfig.anIntArray133[arg3] != 1) { + if (arg0 < 0 || arg1 < 0 || arg0 >= this.anInt341 - 1 || arg1 >= this.anInt342 - 1 || ClientConfig.boundBlockWalk[arg3] != 1) { return; } if (arg2 == 0) { @@ -284,7 +284,7 @@ public void method416(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi @OriginalMember(owner = "mudclient!f", name = "b", descriptor = "(IIII)V") public void method417(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - if (arg0 < 0 || arg1 < 0 || arg0 >= this.anInt341 - 1 || arg1 >= this.anInt342 - 1 || ClientConfig.anIntArray133[arg3] != 1) { + if (arg0 < 0 || arg1 < 0 || arg0 >= this.anInt341 - 1 || arg1 >= this.anInt342 - 1 || ClientConfig.boundBlockWalk[arg3] != 1) { return; } if (arg2 == 0) { @@ -307,22 +307,22 @@ public void method417(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi @OriginalMember(owner = "mudclient!f", name = "c", descriptor = "(III)V") public void method418(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - if (arg0 < 0 || arg1 < 0 || arg0 >= this.anInt341 - 1 || arg1 >= this.anInt342 - 1 || ClientConfig.anIntArray128[arg2] != 1 && ClientConfig.anIntArray128[arg2] != 2) { + if (arg0 < 0 || arg1 < 0 || arg0 >= this.anInt341 - 1 || arg1 >= this.anInt342 - 1 || ClientConfig.locType[arg2] != 1 && ClientConfig.locType[arg2] != 2) { return; } @Pc(33) int local33 = this.method433(arg0, arg1); @Pc(42) int local42; @Pc(46) int local46; if (local33 == 0 || local33 == 4) { - local42 = ClientConfig.anIntArray126[arg2]; - local46 = ClientConfig.anIntArray127[arg2]; + local42 = ClientConfig.locWidth[arg2]; + local46 = ClientConfig.locLength[arg2]; } else { - local46 = ClientConfig.anIntArray126[arg2]; - local42 = ClientConfig.anIntArray127[arg2]; + local46 = ClientConfig.locWidth[arg2]; + local42 = ClientConfig.locLength[arg2]; } for (@Pc(58) int local58 = arg0; local58 < arg0 + local42; local58++) { for (@Pc(62) int local62 = arg1; local62 < arg1 + local46; local62++) { - if (ClientConfig.anIntArray128[arg2] == 1) { + if (ClientConfig.locType[arg2] == 1) { this.anIntArrayArray20[local58][local62] |= 0x40; } else if (local33 == 0) { this.anIntArrayArray20[local58][local62] |= 0x2; @@ -352,22 +352,22 @@ public void method418(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi @OriginalMember(owner = "mudclient!f", name = "d", descriptor = "(III)V") public void method419(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - if (arg0 < 0 || arg1 < 0 || arg0 >= this.anInt341 - 1 || arg1 >= this.anInt342 - 1 || ClientConfig.anIntArray128[arg2] != 1 && ClientConfig.anIntArray128[arg2] != 2) { + if (arg0 < 0 || arg1 < 0 || arg0 >= this.anInt341 - 1 || arg1 >= this.anInt342 - 1 || ClientConfig.locType[arg2] != 1 && ClientConfig.locType[arg2] != 2) { return; } @Pc(33) int local33 = this.method433(arg0, arg1); @Pc(42) int local42; @Pc(46) int local46; if (local33 == 0 || local33 == 4) { - local42 = ClientConfig.anIntArray126[arg2]; - local46 = ClientConfig.anIntArray127[arg2]; + local42 = ClientConfig.locWidth[arg2]; + local46 = ClientConfig.locLength[arg2]; } else { - local46 = ClientConfig.anIntArray126[arg2]; - local42 = ClientConfig.anIntArray127[arg2]; + local46 = ClientConfig.locWidth[arg2]; + local42 = ClientConfig.locLength[arg2]; } for (@Pc(58) int local58 = arg0; local58 < arg0 + local42; local58++) { for (@Pc(62) int local62 = arg1; local62 < arg1 + local46; local62++) { - if (ClientConfig.anIntArray128[arg2] == 1) { + if (ClientConfig.locType[arg2] == 1) { this.anIntArrayArray20[local58][local62] &= 0xFFBF; } else if (local33 == 0) { this.anIntArrayArray20[local58][local62] &= 0xFFFD; @@ -557,7 +557,7 @@ private int method429(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi if (local5 == 0) { return -1; } else { - @Pc(15) int local15 = ClientConfig.anIntArray138[local5 - 1]; + @Pc(15) int local15 = ClientConfig.decorType[local5 - 1]; return local15 == 2 ? 1 : 0; } } @@ -565,7 +565,7 @@ private int method429(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Origi @OriginalMember(owner = "mudclient!f", name = "d", descriptor = "(IIII)I") private int method430(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { @Pc(5) int local5 = this.method427(arg0, arg1, arg2); - return local5 == 0 ? arg3 : ClientConfig.anIntArray137[local5 - 1]; + return local5 == 0 ? arg3 : ClientConfig.decorFill[local5 - 1]; } @OriginalMember(owner = "mudclient!f", name = "e", descriptor = "(II)I") @@ -1000,16 +1000,16 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig for (local113 = 0; local113 < 96; local113++) { for (local117 = 0; local117 < 96; local117++) { local125 = -this.method425(local113, local117); - if (this.method427(local113, local117, arg2) > 0 && ClientConfig.anIntArray138[this.method427(local113, local117, arg2) - 1] == 4) { + if (this.method427(local113, local117, arg2) > 0 && ClientConfig.decorType[this.method427(local113, local117, arg2) - 1] == 4) { local125 = 0; } - if (this.method427(local113 - 1, local117, arg2) > 0 && ClientConfig.anIntArray138[this.method427(local113 - 1, local117, arg2) - 1] == 4) { + if (this.method427(local113 - 1, local117, arg2) > 0 && ClientConfig.decorType[this.method427(local113 - 1, local117, arg2) - 1] == 4) { local125 = 0; } - if (this.method427(local113, local117 - 1, arg2) > 0 && ClientConfig.anIntArray138[this.method427(local113, local117 - 1, arg2) - 1] == 4) { + if (this.method427(local113, local117 - 1, arg2) > 0 && ClientConfig.decorType[this.method427(local113, local117 - 1, arg2) - 1] == 4) { local125 = 0; } - if (this.method427(local113 - 1, local117 - 1, arg2) > 0 && ClientConfig.anIntArray138[this.method427(local113 - 1, local117 - 1, arg2) - 1] == 4) { + if (this.method427(local113 - 1, local117 - 1, arg2) > 0 && ClientConfig.decorType[this.method427(local113 - 1, local117 - 1, arg2) - 1] == 4) { local125 = 0; } local227 = local109.method117(local113 * 128, local125, local117 * 128); @@ -1032,9 +1032,9 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig } if (this.method427(local117, local125, arg2) > 0) { local294 = this.method427(local117, local125, arg2); - local227 = ClientConfig.anIntArray138[local294 - 1]; + local227 = ClientConfig.decorType[local294 - 1]; local306 = this.method429(local117, local125, arg2); - local234 = local266 = ClientConfig.anIntArray137[local294 - 1]; + local234 = local266 = ClientConfig.decorFill[local294 - 1]; if (local227 == 4) { local234 = 1; local266 = 1; @@ -1074,10 +1074,10 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig local270 = 1; } } - if (ClientConfig.anIntArray139[local294 - 1] != 0) { + if (ClientConfig.decorBlockWalk[local294 - 1] != 0) { this.anIntArrayArray20[local117][local125] |= 0x40; } - if (ClientConfig.anIntArray138[local294 - 1] == 2) { + if (ClientConfig.decorType[local294 - 1] == 2) { this.anIntArrayArray20[local117][local125] |= 0x80; } } @@ -1136,8 +1136,8 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig } for (local125 = 1; local125 < 95; local125++) { for (local227 = 1; local227 < 95; local227++) { - if (this.method427(local125, local227, arg2) > 0 && ClientConfig.anIntArray138[this.method427(local125, local227, arg2) - 1] == 4) { - local234 = ClientConfig.anIntArray137[this.method427(local125, local227, arg2) - 1]; + if (this.method427(local125, local227, arg2) > 0 && ClientConfig.decorType[this.method427(local125, local227, arg2) - 1] == 4) { + local234 = ClientConfig.decorFill[this.method427(local125, local227, arg2) - 1]; local266 = local109.method117(local125 * 128, -this.method425(local125, local227), local227 * 128); local268 = local109.method117((local125 + 1) * 128, -this.method425(local125 + 1, local227), local227 * 128); local1086 = local109.method117((local125 + 1) * 128, -this.method425(local125 + 1, local227 + 1), (local227 + 1) * 128); @@ -1148,9 +1148,9 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig this.anIntArray165[local972] = local227; local109.anIntArray29[local972] = local972 + 200000; this.method442(local125, local227, 0, local234, local234); - } else if (this.method427(local125, local227, arg2) == 0 || ClientConfig.anIntArray138[this.method427(local125, local227, arg2) - 1] != 3) { - if (this.method427(local125, local227 + 1, arg2) > 0 && ClientConfig.anIntArray138[this.method427(local125, local227 + 1, arg2) - 1] == 4) { - local234 = ClientConfig.anIntArray137[this.method427(local125, local227 + 1, arg2) - 1]; + } else if (this.method427(local125, local227, arg2) == 0 || ClientConfig.decorType[this.method427(local125, local227, arg2) - 1] != 3) { + if (this.method427(local125, local227 + 1, arg2) > 0 && ClientConfig.decorType[this.method427(local125, local227 + 1, arg2) - 1] == 4) { + local234 = ClientConfig.decorFill[this.method427(local125, local227 + 1, arg2) - 1]; local266 = local109.method117(local125 * 128, -this.method425(local125, local227), local227 * 128); local268 = local109.method117((local125 + 1) * 128, -this.method425(local125 + 1, local227), local227 * 128); local1086 = local109.method117((local125 + 1) * 128, -this.method425(local125 + 1, local227 + 1), (local227 + 1) * 128); @@ -1162,8 +1162,8 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig local109.anIntArray29[local972] = local972 + 200000; this.method442(local125, local227, 0, local234, local234); } - if (this.method427(local125, local227 - 1, arg2) > 0 && ClientConfig.anIntArray138[this.method427(local125, local227 - 1, arg2) - 1] == 4) { - local234 = ClientConfig.anIntArray137[this.method427(local125, local227 - 1, arg2) - 1]; + if (this.method427(local125, local227 - 1, arg2) > 0 && ClientConfig.decorType[this.method427(local125, local227 - 1, arg2) - 1] == 4) { + local234 = ClientConfig.decorFill[this.method427(local125, local227 - 1, arg2) - 1]; local266 = local109.method117(local125 * 128, -this.method425(local125, local227), local227 * 128); local268 = local109.method117((local125 + 1) * 128, -this.method425(local125 + 1, local227), local227 * 128); local1086 = local109.method117((local125 + 1) * 128, -this.method425(local125 + 1, local227 + 1), (local227 + 1) * 128); @@ -1175,8 +1175,8 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig local109.anIntArray29[local972] = local972 + 200000; this.method442(local125, local227, 0, local234, local234); } - if (this.method427(local125 + 1, local227, arg2) > 0 && ClientConfig.anIntArray138[this.method427(local125 + 1, local227, arg2) - 1] == 4) { - local234 = ClientConfig.anIntArray137[this.method427(local125 + 1, local227, arg2) - 1]; + if (this.method427(local125 + 1, local227, arg2) > 0 && ClientConfig.decorType[this.method427(local125 + 1, local227, arg2) - 1] == 4) { + local234 = ClientConfig.decorFill[this.method427(local125 + 1, local227, arg2) - 1]; local266 = local109.method117(local125 * 128, -this.method425(local125, local227), local227 * 128); local268 = local109.method117((local125 + 1) * 128, -this.method425(local125 + 1, local227), local227 * 128); local1086 = local109.method117((local125 + 1) * 128, -this.method425(local125 + 1, local227 + 1), (local227 + 1) * 128); @@ -1188,8 +1188,8 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig local109.anIntArray29[local972] = local972 + 200000; this.method442(local125, local227, 0, local234, local234); } - if (this.method427(local125 - 1, local227, arg2) > 0 && ClientConfig.anIntArray138[this.method427(local125 - 1, local227, arg2) - 1] == 4) { - local234 = ClientConfig.anIntArray137[this.method427(local125 - 1, local227, arg2) - 1]; + if (this.method427(local125 - 1, local227, arg2) > 0 && ClientConfig.decorType[this.method427(local125 - 1, local227, arg2) - 1] == 4) { + local234 = ClientConfig.decorFill[this.method427(local125 - 1, local227, arg2) - 1]; local266 = local109.method117(local125 * 128, -this.method425(local125, local227), local227 * 128); local268 = local109.method117((local125 + 1) * 128, -this.method425(local125 + 1, local227), local227 * 128); local1086 = local109.method117((local125 + 1) * 128, -this.method425(local125 + 1, local227 + 1), (local227 + 1) * 128); @@ -1220,9 +1220,9 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig for (local89 = 0; local89 < 95; local89++) { for (local113 = 0; local113 < 95; local113++) { local117 = this.method436(local89, local113); - if (local117 > 0 && (ClientConfig.anIntArray134[local117 - 1] == 0 || this.aBoolean53)) { + if (local117 > 0 && (ClientConfig.boundActive[local117 - 1] == 0 || this.aBoolean53)) { this.method445(this.anObject3D_3, local117 - 1, local89, local113, local89 + 1, local113); - if (arg3 && ClientConfig.anIntArray133[local117 - 1] != 0) { + if (arg3 && ClientConfig.boundBlockWalk[local117 - 1] != 0) { this.anIntArrayArray20[local89][local113] |= 0x1; if (local113 > 0) { this.method414(local89, local113 - 1, 4); @@ -1233,9 +1233,9 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig } } local117 = this.method437(local89, local113); - if (local117 > 0 && (ClientConfig.anIntArray134[local117 - 1] == 0 || this.aBoolean53)) { + if (local117 > 0 && (ClientConfig.boundActive[local117 - 1] == 0 || this.aBoolean53)) { this.method445(this.anObject3D_3, local117 - 1, local89, local113, local89, local113 + 1); - if (arg3 && ClientConfig.anIntArray133[local117 - 1] != 0) { + if (arg3 && ClientConfig.boundBlockWalk[local117 - 1] != 0) { this.anIntArrayArray20[local89][local113] |= 0x2; if (local89 > 0) { this.method414(local89 - 1, local113, 8); @@ -1246,9 +1246,9 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig } } local117 = this.method431(local89, local113); - if (local117 > 0 && local117 < 12000 && (ClientConfig.anIntArray134[local117 - 1] == 0 || this.aBoolean53)) { + if (local117 > 0 && local117 < 12000 && (ClientConfig.boundActive[local117 - 1] == 0 || this.aBoolean53)) { this.method445(this.anObject3D_3, local117 - 1, local89, local113, local89 + 1, local113 + 1); - if (arg3 && ClientConfig.anIntArray133[local117 - 1] != 0) { + if (arg3 && ClientConfig.boundBlockWalk[local117 - 1] != 0) { this.anIntArrayArray20[local89][local113] |= 0x20; } if (arg3) { @@ -1257,9 +1257,9 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig this.aPixMap_3.method372(local89 * 3 + 2, local113 * 3 + 2, local85); } } - if (local117 > 12000 && local117 < 24000 && (ClientConfig.anIntArray134[local117 - 12001] == 0 || this.aBoolean53)) { + if (local117 > 12000 && local117 < 24000 && (ClientConfig.boundActive[local117 - 12001] == 0 || this.aBoolean53)) { this.method445(this.anObject3D_3, local117 - 12001, local89 + 1, local113, local89, local113 + 1); - if (arg3 && ClientConfig.anIntArray133[local117 - 12001] != 0) { + if (arg3 && ClientConfig.boundBlockWalk[local117 - 12001] != 0) { this.anIntArrayArray20[local89][local113] |= 0x10; } if (arg3) { @@ -1386,7 +1386,7 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig @Pc(2650) int local2650 = this.anIntArrayArray21[local294][local234]; @Pc(2657) int local2657 = this.anIntArrayArray21[local972][local705]; @Pc(2664) int local2664 = this.anIntArrayArray21[local227][local2391]; - @Pc(2670) int local2670 = ClientConfig.anIntArray135[local266 - 1]; + @Pc(2670) int local2670 = ClientConfig.roofHeight[local266 - 1]; if (this.method435(local227, local234) && local2643 < 80000) { local2643 += local2670 + 80000; this.anIntArrayArray21[local227][local234] = local2643; @@ -1464,7 +1464,7 @@ private void method443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig if (!this.method434(local227, local2391 + 1)) { local2636 += local2784; } - local266 = ClientConfig.anIntArray136[local266 - 1]; + local266 = ClientConfig.roofFill[local266 - 1]; local2643 = -local2643; local2650 = -local2650; local2657 = -local2657; @@ -1540,14 +1540,14 @@ public void method444(@OriginalArg(0) Object3D[] arg0) { @Pc(42) int local42; @Pc(46) int local46; if (local33 == 0 || local33 == 4) { - local42 = ClientConfig.anIntArray126[local28]; - local46 = ClientConfig.anIntArray127[local28]; + local42 = ClientConfig.locWidth[local28]; + local46 = ClientConfig.locLength[local28]; } else { - local46 = ClientConfig.anIntArray126[local28]; - local42 = ClientConfig.anIntArray127[local28]; + local46 = ClientConfig.locWidth[local28]; + local42 = ClientConfig.locLength[local28]; } this.method418(local3, local7, local28); - @Pc(72) Object3D local72 = arg0[ClientConfig.anIntArray125[local28]].method142(false, true, false, false); + @Pc(72) Object3D local72 = arg0[ClientConfig.locModel[local28]].method142(false, true, false, false); @Pc(82) int local82 = (local3 + local3 + local42) * 128 / 2; @Pc(92) int local92 = (local7 + local7 + local46) * 128 / 2; local72.method128(local82, -this.method424(local82, local92), local92); @@ -1586,9 +1586,9 @@ public void method444(@OriginalArg(0) Object3D[] arg0) { private void method445(@OriginalArg(0) Object3D arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { this.method421(arg2, arg3, 40); this.method421(arg4, arg5, 40); - @Pc(13) int local13 = ClientConfig.anIntArray130[arg1]; - @Pc(17) int local17 = ClientConfig.anIntArray131[arg1]; - @Pc(21) int local21 = ClientConfig.anIntArray132[arg1]; + @Pc(13) int local13 = ClientConfig.boundHeight[arg1]; + @Pc(17) int local17 = ClientConfig.boundFrontMask[arg1]; + @Pc(21) int local21 = ClientConfig.boundBackMask[arg1]; @Pc(25) int local25 = arg2 * 128; @Pc(29) int local29 = arg3 * 128; @Pc(33) int local33 = arg4 * 128; @@ -1599,7 +1599,7 @@ private void method445(@OriginalArg(0) Object3D arg0, @OriginalArg(1) int arg1, @Pc(89) int local89 = arg0.method117(local33, -this.anIntArrayArray21[arg4][arg5], local37); @Pc(108) int[] local108 = new int[] { local49, local63, local77, local89 }; @Pc(115) int local115 = arg0.method119(4, local108, local17, local21); - if (ClientConfig.anIntArray134[arg1] == 5) { + if (ClientConfig.boundActive[arg1] == 5) { arg0.anIntArray29[local115] = arg1 + 30000; } else { arg0.anIntArray29[local115] = 0; @@ -1608,7 +1608,7 @@ private void method445(@OriginalArg(0) Object3D arg0, @OriginalArg(1) int arg1, @OriginalMember(owner = "mudclient!f", name = "c", descriptor = "(IIIII)V") private void method446(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - @Pc(3) int local3 = ClientConfig.anIntArray130[arg0]; + @Pc(3) int local3 = ClientConfig.boundHeight[arg0]; if (this.anIntArrayArray21[arg1][arg2] < 80000) { this.anIntArrayArray21[arg1][arg2] += local3 + 80000; }