diff --git a/CHANGELOG b/CHANGELOG index 33e88aa7a..fc90ff6ad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -81,3 +81,5 @@ - Add mort myre stems and pears to bloom's effect, and add the sound effect for bloom. - Add proper sound effects for the explorer's ring and fix leaf-bladed sword's sound effects. - Fix wine of zamorak pickup interaction. +- Static clue drop ids replaced with their level appropriate proxy values +- Fix a bug where clue scrolls were rerolled to easy for most NPCs \ No newline at end of file diff --git a/Server/data/configs/drop_tables.json b/Server/data/configs/drop_tables.json index c4ed75cca..e03f3f90c 100644 --- a/Server/data/configs/drop_tables.json +++ b/Server/data/configs/drop_tables.json @@ -196,7 +196,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2699", + "id": "5733", "maxAmount": "1" } ] @@ -385,7 +385,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2703", + "id": "1", "maxAmount": "1" } ] @@ -574,7 +574,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2678", + "id": "5733", "maxAmount": "1" }, { @@ -733,7 +733,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2747", + "id": "5733", "maxAmount": "1" }, { @@ -1197,7 +1197,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2677", + "id": "5733", "maxAmount": "1" }, { @@ -2029,7 +2029,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2833", + "id": "5733", "maxAmount": "1" }, { @@ -2119,7 +2119,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2703", + "id": "1", "maxAmount": "1" } ] @@ -3724,13 +3724,13 @@ { "minAmount": "1", "weight": "5.0", - "id": "2689", + "id": "1", "maxAmount": "1" }, { "minAmount": "1", "weight": "5.0", - "id": "2731", + "id": "1", "maxAmount": "1" } ] @@ -4347,7 +4347,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2831", + "id": "12070", "maxAmount": "1" }, { @@ -4501,7 +4501,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2733", + "id": "1", "maxAmount": "1" }, { @@ -5123,7 +5123,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2853", + "id": "5733", "maxAmount": "1" }, { @@ -6511,7 +6511,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2829", + "id": "5733", "maxAmount": "1" }, { @@ -7251,7 +7251,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2843", + "id": "12070", "maxAmount": "1" }, { @@ -8168,7 +8168,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2737", + "id": "1", "maxAmount": "1" }, { @@ -10002,7 +10002,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2853", + "id": "5733", "maxAmount": "1" }, { @@ -10433,7 +10433,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2843", + "id": "12070", "maxAmount": "1" }, { @@ -10957,7 +10957,7 @@ { "minAmount": "1", "weight": "50.0", - "id": "2677", + "id": "5733", "maxAmount": "1" }, { @@ -11239,7 +11239,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2807", + "id": "5733", "maxAmount": "1" }, { @@ -11631,7 +11631,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2705", + "id": "5733", "maxAmount": "1" } ] @@ -12496,7 +12496,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2677", + "id": "5733", "maxAmount": "1" }, { @@ -12703,7 +12703,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2699", + "id": "5733", "maxAmount": "1" }, { @@ -12885,7 +12885,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2829", + "id": "5733", "maxAmount": "1" }, { @@ -13605,7 +13605,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2851", + "id": "5733", "maxAmount": "1" }, { @@ -13680,7 +13680,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2696", + "id": "1", "maxAmount": "1" }, { @@ -13814,7 +13814,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2857", + "id": "5733", "maxAmount": "1" }, { @@ -14685,7 +14685,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2835", + "id": "12070", "maxAmount": "1" }, { @@ -15337,7 +15337,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2827", + "id": "5733", "maxAmount": "1" } ] @@ -15573,7 +15573,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2819", + "id": "5733", "maxAmount": "1" } ] @@ -15737,7 +15737,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2823", + "id": "5733", "maxAmount": "1" }, { @@ -16033,7 +16033,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2849", + "id": "5733", "maxAmount": "1" }, { @@ -16652,7 +16652,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2739", + "id": "5733", "maxAmount": "1" }, { @@ -22005,7 +22005,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2747", + "id": "5733", "maxAmount": "1" }, { @@ -22316,7 +22316,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2733", + "id": "1", "maxAmount": "1" }, { @@ -22431,7 +22431,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2827", + "id": "5733", "maxAmount": "1" }, { @@ -23255,7 +23255,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2678", + "id": "5733", "maxAmount": "1" }, { @@ -23402,7 +23402,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2700", + "id": "5733", "maxAmount": "1" }, { @@ -23560,7 +23560,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2680", + "id": "1", "maxAmount": "1" }, { @@ -23779,7 +23779,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2716", + "id": "1", "maxAmount": "1" }, { @@ -24377,7 +24377,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2747", + "id": "5733", "maxAmount": "1" }, { @@ -24936,7 +24936,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2735", + "id": "1", "maxAmount": "1" }, { @@ -25156,7 +25156,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2729", + "id": "1", "maxAmount": "1" }, { @@ -25938,7 +25938,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2729", + "id": "1", "maxAmount": "1" }, { @@ -26266,7 +26266,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2729", + "id": "1", "maxAmount": "1" }, { @@ -26437,7 +26437,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2737", + "id": "1", "maxAmount": "1" }, { @@ -26596,7 +26596,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2731", + "id": "1", "maxAmount": "1" }, { @@ -26839,7 +26839,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2713", + "id": "12070", "maxAmount": "1" }, { @@ -27547,7 +27547,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2813", + "id": "5733", "maxAmount": "1" }, { @@ -27797,7 +27797,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2677", + "id": "5733", "maxAmount": "1" }, { @@ -28095,7 +28095,7 @@ { "minAmount": "1", "weight": "25.0", - "id": "2851", + "id": "5733", "maxAmount": "1" }, { @@ -28969,7 +28969,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2809", + "id": "5733", "maxAmount": "1" }, { @@ -29116,7 +29116,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2729", + "id": "1", "maxAmount": "1" }, { @@ -29306,7 +29306,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2725", + "id": "1", "maxAmount": "1" }, { @@ -29674,7 +29674,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2839", + "id": "5733", "maxAmount": "1" }, { @@ -30207,7 +30207,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2716", + "id": "1", "maxAmount": "1" }, { @@ -30281,7 +30281,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2677", + "id": "5733", "maxAmount": "1" } ] @@ -30481,7 +30481,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2677", + "id": "5733", "maxAmount": "1" } ] @@ -30851,7 +30851,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2698", + "id": "1", "maxAmount": "1" }, { @@ -31289,7 +31289,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2691", + "id": "1", "maxAmount": "1" }, { @@ -31568,7 +31568,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2692", + "id": "5733", "maxAmount": "1" }, { @@ -32058,7 +32058,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2827", + "id": "5733", "maxAmount": "1" }, { @@ -32455,7 +32455,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2696", + "id": "1", "maxAmount": "1" }, { @@ -32880,7 +32880,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2737", + "id": "1", "maxAmount": "1" } ] @@ -33022,7 +33022,7 @@ { "minAmount": "1", "weight": "25.0", - "id": "2841", + "id": "5733", "maxAmount": "1" }, { @@ -33139,7 +33139,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2805", + "id": "1", "maxAmount": "1" }, { @@ -34175,7 +34175,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2817", + "id": "5733", "maxAmount": "1" }, { @@ -34250,7 +34250,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2678", + "id": "5733", "maxAmount": "1" }, { @@ -34626,7 +34626,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2839", + "id": "5733", "maxAmount": "1" }, { @@ -35227,7 +35227,7 @@ { "minAmount": "1", "weight": "25.0", - "id": "2701", + "id": "12070", "maxAmount": "1" } ] @@ -35392,7 +35392,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2691", + "id": "1", "maxAmount": "1" } ] @@ -37583,7 +37583,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2725", + "id": "1", "maxAmount": "1" }, { @@ -37748,7 +37748,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2739", + "id": "5733", "maxAmount": "1" }, { @@ -38057,7 +38057,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2739", + "id": "5733", "maxAmount": "1" }, { @@ -38324,7 +38324,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2819", + "id": "5733", "maxAmount": "1" }, { @@ -38604,7 +38604,7 @@ { "minAmount": "1", "weight": "25.0", - "id": "2733", + "id": "1", "maxAmount": "1" }, { @@ -38769,7 +38769,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2815", + "id": "5733", "maxAmount": "1" }, { @@ -38795,7 +38795,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2739", + "id": "5733", "maxAmount": "1" }, { @@ -39348,7 +39348,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2702", + "id": "1", "maxAmount": "1" } ] @@ -39701,7 +39701,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2707", + "id": "1", "maxAmount": "1" } ] @@ -39878,7 +39878,7 @@ { "minAmount": "1", "weight": "25.0", - "id": "2680", + "id": "1", "maxAmount": "1" } ] @@ -40006,7 +40006,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2684", + "id": "1", "maxAmount": "1" } ] @@ -40238,7 +40238,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2735", + "id": "1", "maxAmount": "1" }, { @@ -40879,7 +40879,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2700", + "id": "5733", "maxAmount": "1" }, { @@ -42880,7 +42880,7 @@ { "minAmount": "1", "weight": "25.0", - "id": "2704", + "id": "5733", "maxAmount": "1" }, { @@ -43172,7 +43172,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2811", + "id": "5733", "maxAmount": "1" }, { @@ -43500,7 +43500,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2743", + "id": "5733", "maxAmount": "1" }, { @@ -44309,7 +44309,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2849", + "id": "5733", "maxAmount": "1" }, { @@ -44638,7 +44638,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2737", + "id": "1", "maxAmount": "1" }, { @@ -44827,13 +44827,13 @@ { "minAmount": "1", "weight": "5.0", - "id": "2684", + "id": "1", "maxAmount": "1" }, { "minAmount": "1", "weight": "5.0", - "id": "2731", + "id": "1", "maxAmount": "1" } ] @@ -46179,7 +46179,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2737", + "id": "1", "maxAmount": "1" }, { @@ -46465,7 +46465,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2725", + "id": "1", "maxAmount": "1" }, { @@ -46957,7 +46957,7 @@ { "minAmount": "1", "weight": "25.0", - "id": "2725", + "id": "1", "maxAmount": "1" }, { @@ -48319,7 +48319,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2677", + "id": "5733", "maxAmount": "1" } ] @@ -48486,7 +48486,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2677", + "id": "5733", "maxAmount": "1" } ] @@ -48500,7 +48500,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2677", + "id": "5733", "maxAmount": "1" } ] @@ -48617,7 +48617,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2725", + "id": "1", "maxAmount": "1" }, { @@ -48900,7 +48900,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2733", + "id": "1", "maxAmount": "1" }, { @@ -49249,7 +49249,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2851", + "id": "5733", "maxAmount": "1" }, { @@ -49498,7 +49498,7 @@ { "minAmount": "1", "weight": "25.0", - "id": "2809", + "id": "5733", "maxAmount": "1" }, { @@ -49650,7 +49650,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2821", + "id": "5733", "maxAmount": "1" }, { @@ -49809,7 +49809,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2839", + "id": "5733", "maxAmount": "1" }, { @@ -50082,7 +50082,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2841", + "id": "5733", "maxAmount": "1" }, { @@ -50383,7 +50383,7 @@ { "minAmount": "1", "weight": "250.0", - "id": "2747", + "id": "5733", "maxAmount": "1" }, { @@ -50494,7 +50494,7 @@ { "minAmount": "1", "weight": "50.0", - "id": "2747", + "id": "5733", "maxAmount": "1" }, { @@ -50593,7 +50593,7 @@ { "minAmount": "1", "weight": "250.0", - "id": "2731", + "id": "1", "maxAmount": "1" } ] @@ -50727,7 +50727,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2747", + "id": "5733", "maxAmount": "1" }, { @@ -50843,7 +50843,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2729", + "id": "1", "maxAmount": "1" } ] @@ -51289,7 +51289,7 @@ { "minAmount": "1", "weight": "50.0", - "id": "2733", + "id": "1", "maxAmount": "1" }, { @@ -51444,7 +51444,7 @@ { "minAmount": "1", "weight": "250.0", - "id": "2725", + "id": "1", "maxAmount": "1" }, { @@ -51639,7 +51639,7 @@ { "minAmount": "1", "weight": "25.0", - "id": "2729", + "id": "1", "maxAmount": "1" }, { @@ -51922,7 +51922,7 @@ { "minAmount": "1", "weight": "250.0", - "id": "2745", + "id": "1", "maxAmount": "1" } ] @@ -52078,7 +52078,7 @@ { "minAmount": "1", "weight": "250.0", - "id": "2735", + "id": "1", "maxAmount": "1" } ] @@ -52094,7 +52094,7 @@ { "minAmount": "1", "weight": "100.0", - "id": "2747", + "id": "5733", "maxAmount": "1" } ], @@ -52150,7 +52150,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2747", + "id": "5733", "maxAmount": "1" }, { @@ -52346,7 +52346,7 @@ { "minAmount": "1", "weight": "25.0", - "id": "2741", + "id": "12070", "maxAmount": "1" }, { @@ -52469,7 +52469,7 @@ { "minAmount": "1", "weight": "50.0", - "id": "2735", + "id": "1", "maxAmount": "1" } ] @@ -52592,7 +52592,7 @@ { "minAmount": "1", "weight": "50.0", - "id": "2733", + "id": "1", "maxAmount": "1" } ] @@ -52703,7 +52703,7 @@ { "minAmount": "1", "weight": "50.0", - "id": "2741", + "id": "12070", "maxAmount": "1" } ] @@ -53338,7 +53338,7 @@ { "minAmount": "1", "weight": "25.0", - "id": "2747", + "id": "5733", "maxAmount": "1" }, { @@ -53556,7 +53556,7 @@ { "minAmount": "1", "weight": "25.0", - "id": "2823", + "id": "5733", "maxAmount": "1" }, { @@ -53847,7 +53847,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2817", + "id": "5733", "maxAmount": "1" }, { @@ -54005,7 +54005,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2815", + "id": "5733", "maxAmount": "1" }, { @@ -59274,7 +59274,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2831", + "id": "12070", "maxAmount": "1" }, { @@ -59551,7 +59551,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2735", + "id": "1", "maxAmount": "1" }, { @@ -59788,7 +59788,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2733", + "id": "1", "maxAmount": "1" }, { @@ -60503,7 +60503,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2745", + "id": "1", "maxAmount": "1" }, { @@ -60669,7 +60669,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2741", + "id": "12070", "maxAmount": "1" }, { @@ -60720,7 +60720,7 @@ { "minAmount": "1", "weight": "5.0", - "id": "2739", + "id": "5733", "maxAmount": "1" }, { diff --git a/Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java b/Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java index f70aed69b..6d974c172 100644 --- a/Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java +++ b/Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java @@ -137,7 +137,7 @@ public final class TreasureTrailPlugin extends OptionHandler { @Override public Item getItem(Item item, NPC npc) { - return ClueScrollPlugin.getClue(npc.getDefinition().getConfiguration(NPCConfigParser.CLUE_LEVEL, ClueLevel.EASY)).copy(); + return item; } /**