Merge branch 'master' into 'master'

Add: Taverley Druid Update

See merge request 2009scape/2009scape!325

CHANGELOG

@@ -2,3 +2,30 @@
 - Diseased trees can be cured with secateurs.
 - Willow branches can be harvested from willow trees.
 - Giant ent improves yields of certain patch types by 50%.
+- Replaced all Druids with their RSHD counterparts, released the same time as Summoning and the Taverley Graphical Update.
+- This also means the Druidess is now correctly added to the game, and can be attacked.
+- Druid and Druidess added to Druid's Cricle (5 Druid/Druidess)
+- All HD Druids/Druidess' now have the right drop table assigned (all have identical drops to the original Druid NPC)
+- All Druid and Druidess NPCs animations corrected
+- All Druid and Druidess NPCs attack speed corrected
+- All Druid and Druidess NPCs stats corrected
+- All Druid and Druidess NPCs correct respawn rate of 25 ticks (15 seconds)
+- Pen (Taverley/Yanille Pet Shop) (ID 28341) examine added
+- Counter (Taverley/Yanille Pet Shop) (IDs 28357,28358,28364) examine added
+- The puppy spawns wandering inside the Yanille Pet Shop's pen have been corrected to the right NPCs
+- The puppy spawns wandering isnide the Taverley Pet Shop's pen have been corrected to the right NPCs
+- Gaius' Two Handed Shop (Taverley) name correction
+- Gaius' Two Handed Shop (Taverley) stock correction
+- Relocated Bernald (Burthorpe Vineyard) to his grapevines
+- Bernald (NPC ID 2580) examine added
+- Sanfew (NPC ID 454) examine added
+- Jatix (NPC ID 587) examine added
+- Kaqemeex (NPC ID 455) examine added
+- Pikkupstix (NPC ID 6971) examine added
+- Gaius (NPC ID 586) examine added
+- Sylas (NPC ID 5987) examine added
+- Druid's robe bottom (ID 538) examine corrected
+- Druid's robe top (ID 540) examine corrected
+- removed erroneous runite items from Ice Warrior droptable
+- relocated one Imp spawn near Ardougne Monastery a few tiles to resolve a poor pathing issue
+- removed [REDACTED] trapdoor

Server/data/configs/drop_tables.json

@@ -9729,24 +9729,6 @@
         "id": "1181",
         "maxAmount": "1"
       },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "1303",
-        "maxAmount": "1"
-      },
-      {
-        "minAmount": "2",
-        "weight": "5.0",
-        "id": "892",
-        "maxAmount": "2"
-      },
-      {
-        "minAmount": "1",
-        "weight": "5.0",
-        "id": "9185",
-        "maxAmount": "1"
-      },
       {
         "minAmount": "2",
         "weight": "50.0",
@@ -64338,8 +64320,8 @@
       }
     ],
     "charm": [],
-    "ids": "14",
-    "description": "",
+    "ids": "14,6972,6973,6974,6975,6976,6977,6978,6979,6980,6981,6982,6983,6984,6985,6986,6987",
+    "description": "Druid and Druidess (Taverley)",
     "main": [
       {
         "minAmount": "27",

Server/data/configs/item_configs.json

@@ -5383,7 +5383,7 @@
   },
   {
     "ge_buy_limit": "100",
-    "examine": "When the druids and Taverley as a whole were first graphically updated, the Druid robes themselves did not receive a graphical update, nor were they updated when the Troll Warzone update was released.",
+    "examine": "Keeps a druid's knees nice and warm.",
     "grand_exchange_price": "168",
     "durability": null,
     "name": "Druid's robe",
@@ -5406,7 +5406,7 @@
   },
   {
     "ge_buy_limit": "100",
-    "examine": "When the druids and Taverley as a whole were first graphically updated, the Druid robes themselves did not receive a graphical update, nor were they updated when the Troll Warzone update was released.",
+    "examine": "I feel closer to the gods when I am wearing this.",
     "durability": null,
     "low_alchemy": "16",
     "high_alchemy": "24",

Server/data/configs/npc_spawns.json

@@ -49,7 +49,7 @@
   },
   {
     "npc_id": "14",
-    "loc_data": "{2890,3443,0,1,1}-{2897,3444,0,1,3}-{2897,3435,0,1,2}-{2899,3438,0,1,0}-{2904,3441,0,1,5}-{2899,3449,0,1,3}-{2913,3450,0,1,4}-{2888,3447,0,1,6}-{2886,3421,0,1,1}-{2892,3414,0,1,7}-{2896,3421,0,1,3}-{2900,3428,0,1,3}-{2883,3431,0,1,4}-{2885,3436,0,1,1}-{2914,3444,0,1,3}"
+    "loc_data": "{2914,3444,0,1,3}-{2905,3450,1,1,0}"
   },
   {
     "npc_id": "15",
@@ -1865,7 +1865,7 @@
   },
   {
     "npc_id": "708",
-    "loc_data": "{3215,3282,0,1,1}-{3242,3306,0,1,1}-{3208,3357,0,1,3}-{3240,3393,0,1,3}-{3219,3221,0,1,4}-{3162,3410,0,1,2}-{2962,3424,0,1,6}-{3011,3513,0,1,1}-{2980,3337,0,1,6}-{2997,3300,0,1,3}-{3031,3322,0,1,1}-{2957,3308,0,1,0}-{2935,3343,0,1,1}-{2942,3247,0,1,7}-{2976,3176,0,1,6}-{3239,3523,0,1,4}-{3262,3523,0,1,2}-{2865,3175,0,1,0}-{2855,3188,0,1,1}-{2838,3194,0,1,3}-{2806,3181,0,1,3}-{2827,3170,0,1,5}-{2788,3179,0,1,3}-{2753,3178,0,1,3}-{2759,3155,0,1,0}-{2603,3221,0,1,7}-{2604,3212,0,1,3}-{2614,3230,0,1,1}-{2611,3204,0,1,7}-{2544,3184,0,1,3}-{2627,3231,0,1,4}-{2595,3125,0,1,1}-{2598,3145,0,1,1}-{2588,3145,0,1,7}-{2601,3135,0,1,3}-{2598,3120,0,1,6}-{2615,3120,0,1,4}-{2598,3108,0,1,4}-{2733,3459,0,1,3}-{2732,3457,0,1,6}-{2715,3451,0,1,4}-{2715,3436,0,1,3}-{2977,3377,0,0,3}-{2941,3356,0,0,7}-{2932,3322,0,0,5}-{2934,3301,0,1,5}-{2934,3301,0,1,3}-{2973,3274,0,1,3}-{2994,3270,0,1,0}-{3010,3271,0,1,6}-{2977,3202,0,1,7}-{3068,3251,0,1,6}-{3189,3503,0,1,6}"
+    "loc_data": "{3215,3282,0,1,1}-{3242,3306,0,1,1}-{3208,3357,0,1,3}-{3240,3393,0,1,3}-{3219,3221,0,1,4}-{3162,3410,0,1,2}-{2962,3424,0,1,6}-{3011,3513,0,1,1}-{2980,3337,0,1,6}-{2997,3300,0,1,3}-{3031,3322,0,1,1}-{2957,3308,0,1,0}-{2935,3343,0,1,1}-{2942,3247,0,1,7}-{2976,3176,0,1,6}-{3239,3523,0,1,4}-{3262,3523,0,1,2}-{2865,3175,0,1,0}-{2855,3188,0,1,1}-{2838,3194,0,1,3}-{2806,3181,0,1,3}-{2827,3170,0,1,5}-{2788,3179,0,1,3}-{2753,3178,0,1,3}-{2759,3155,0,1,0}-{2603,3221,0,1,7}-{2604,3212,0,1,3}-{2612,3230,0,1,0}-{2611,3204,0,1,7}-{2544,3184,0,1,3}-{2627,3231,0,1,4}-{2595,3125,0,1,1}-{2598,3145,0,1,1}-{2588,3145,0,1,7}-{2601,3135,0,1,3}-{2598,3120,0,1,6}-{2615,3120,0,1,4}-{2598,3108,0,1,4}-{2733,3459,0,1,3}-{2732,3457,0,1,6}-{2715,3451,0,1,4}-{2715,3436,0,1,3}-{2977,3377,0,0,3}-{2941,3356,0,0,7}-{2932,3322,0,0,5}-{2934,3301,0,1,5}-{2934,3301,0,1,3}-{2973,3274,0,1,3}-{2994,3270,0,1,0}-{3010,3271,0,1,6}-{2977,3202,0,1,7}-{3068,3251,0,1,6}-{3189,3503,0,1,6}"
   },
   {
     "npc_id": "711",
@@ -4753,7 +4753,7 @@
   },
   {
     "npc_id": "2580",
-    "loc_data": "{2889,3436,0,0,0}"
+    "loc_data": "{2918,3535,0,1,0}"
   },
   {
     "npc_id": "2591",
@@ -9383,6 +9383,22 @@
     "npc_id": "6893",
     "loc_data": "{2926,3435,0,1,2}"
   },
+  {
+    "npc_id": "6894",
+    "loc_data": "{2928,3432,0,1,0}"
+  },
+  {
+    "npc_id": "6895",
+    "loc_data": "{2927,3431,0,1,0}"
+  },   
+  {
+    "npc_id": "6896",
+    "loc_data": "{2573,3082,0,1,2}"
+  }, 
+  {
+    "npc_id": "6897",
+    "loc_data": "{2574,3083,0,1,0}"
+  },   
   {
     "npc_id": "6917",
     "loc_data": "{2916,3082,0,0,0}-{2917,3089,0,0,0}-{2912,3090,0,0,0}"
@@ -9403,22 +9419,70 @@
     "npc_id": "6944",
     "loc_data": "{2855,3028,0,0,0}-{2841,3039,0,0,0}-{2838,3031,0,0,0}-{2836,3014,0,0,0}-{2839,3022,0,0,0}"
   },
-  {
-    "npc_id": "6958",
-    "loc_data": "{2574,3082,0,1,4}"
-  },
   {
     "npc_id": "6962",
     "loc_data": "{2842,5222,0,1,6}"
   },
-  {
-    "npc_id": "6966",
-    "loc_data": "{2927,3431,0,1,1}"
-  },
   {
     "npc_id": "6971",
     "loc_data": "{2926,3443,0,0,5}"
   },
+  {
+    "npc_id": "6972",
+    "loc_data": "{2922,3482,0,1,0}"
+  },
+  {
+    "npc_id": "6973",
+    "loc_data": "{2893,3419,0,1,0}"
+  },  
+  {
+    "npc_id": "6974",
+    "loc_data": "{2897,3419,0,1,0}"
+  },   
+  {
+    "npc_id": "6975",
+    "loc_data": "{2928,3480,0,1,0}-{2932,3485,0,1,0}"
+  },
+  {
+    "npc_id": "6976",
+    "loc_data": "{2897,3432,1,1,0}-{2884,3418,0,1,0}-{2884,3434,0,1,0}-{2902,3449,0,1,0}"
+  },  
+  {
+    "npc_id": "6977",
+    "loc_data": "{2890,3435,0,1,0}"
+  },
+  {
+    "npc_id": "6978",
+    "loc_data": "{2896,3437,0,1,0}-{2917,3446,0,1,0}"
+  },  
+  {
+    "npc_id": "6979",
+    "loc_data": "{2888,3448,0,1,0}"
+  },
+  {
+    "npc_id": "6981",
+    "loc_data": "{2883,3431,0,1,0}-{2900,3449,0,1,0}"
+  },  
+  {
+    "npc_id": "6982",
+    "loc_data": "{2918,3485,0,1,0}-{2896,3429,0,1,0}"
+  },
+  {
+    "npc_id": "6983",
+    "loc_data": "{2926,3488,0,1,0}-{2908,3441,0,1,0}"
+  },  
+  {
+    "npc_id": "6985",
+    "loc_data": "{2894,3438,0,1,0}-{2913,3451,0,1,0}"
+  },
+  {
+    "npc_id": "6986",
+    "loc_data": "{2887,3441,0,1,0}"
+  },    
+  {
+    "npc_id": "6987",
+    "loc_data": "{2894,3445,0,1,0}"
+  },   
   {
     "npc_id": "6997",
     "loc_data": "{3002,3257,0,0,0}-{3058,3429,0,0,0}-{3059,3420,0,0,0}-{3059,3425,0,0,0}-{3049,3429,0,0,0}-{3007,3261,0,0,0}"
@@ -9851,14 +9915,6 @@
     "npc_id": "7236",
     "loc_data": "{2799,3005,0,0,0}-{2801,2995,0,0,0}-{2804,3001,0,0,0}-{2803,2986,0,0,0}-{2811,2999,0,0,0}"
   },
-  {
-    "npc_id": "7237",
-    "loc_data": "{2927,3432,0,1,4}"
-  },
-  {
-    "npc_id": "7251",
-    "loc_data": "{2574,3082,0,1,1}"
-  },
   {
     "npc_id": "7275",
     "loc_data": "{2995,3252,0,0,0}-{2996,3259,0,0,0}-{2993,3250,0,0,0}-{3000,3258,0,0,0}"

Server/data/configs/object_configs.json

@@ -20597,6 +20597,10 @@
   },
   {
     "examine": "There are a lot of pet supplies here.",
-    "ids": "28363"
+    "ids": "28357,28358,28363,28364"
+  },
+  {
+    "examine": "Keeps the puppies out of trouble.",
+    "ids": "28341"
   }
 ]

Server/data/configs/shops.json

@@ -1301,8 +1301,8 @@
     "currency": "995",
     "general_store": "false",
     "id": "147",
-    "title": "Gaiu's Two Handed Shop",
-    "stock": "{1307,10}-{1309,10}-{1311,10}-{1313,10}-{1315,10}-{1317,10}"
+    "title": "Gaius' Two Handed Shop.",
+    "stock": "{1307,4}-{1309,3}-{1311,2}-{1313,1}-{1315,1}-{1317,1}"
   },
   {
     "npcs": "602",

Server/src/main/java/core/game/content/global/action/SpecialLadders.java

@@ -47,7 +47,6 @@ public enum SpecialLadders implements LadderAchievementCheck {
     SEERS_VILLAGE_SPINNING_HOUSE_ROOFTOP_DOWN(new Location(2715,3472,3), new Location(2714,3472,1)),
     ELEMENTAL_WORKSHOP_STAIRS_DOWN(Location.create(2710,3497, 0), Location.create(2713,9887, 0)),
     ELEMENTAL_WORKSHOP_STAIRS_UP(Location.create(2714,9887, 0), Location.create(2709,3498, 0)),
-    TORMENTED_DEMONS_ENTER(Location.create(3353,3951,0),Location.create(3218, 9532, 2));
 
     private static HashMap<Location,Location> destinationMap = new HashMap<>();
     private static HashMap<Location,SpecialLadders> ladderMap = new HashMap<>();