Merge remote-tracking branch 'runelite/master'

2021-09-15 15:34:42 +02:00
parent 3243a8679e b7e1496bff
commit b8db5fc00e
105 changed files with 325 additions and 48 deletions
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/back_30px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/back_30px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/back_90px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/back_90px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/blue_back_50px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/blue_back_50px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/blue_front_50px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/blue_front_50px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cox_blue.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cox_blue.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cox_green.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cox_green.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cox_red.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cox_red.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cox_yellow.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cox_yellow.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_100px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_100px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_120px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_120px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_140px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_140px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_160px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_160px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_40px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_40px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_50px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_50px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_60px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_60px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_70px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_70px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_80px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_back_80px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_100px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_100px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_120px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_120px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_140px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_140px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_160px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_160px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_40px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_40px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_50px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_50px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_60px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_60px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_70px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_70px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_80px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/cyan_front_80px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_100px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_100px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_120px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_120px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_140px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_140px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_160px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_160px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_40px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_40px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_50px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_50px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_60px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_60px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_70px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_70px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_80px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_back_80px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_100px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_100px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_120px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_120px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_140px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_140px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_160px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_160px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_40px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_40px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_50px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_50px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_60px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_60px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_70px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_70px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_80px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_80px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/front_30px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/front_30px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/front_90px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/front_90px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_100px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_100px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_120px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_120px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_140px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_140px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_160px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_160px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_40px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_40px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_50px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_50px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_60px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_60px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_70px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_70px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_80px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_back_80px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_100px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_100px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_120px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_120px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_140px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_140px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_160px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_160px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_40px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_40px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_50px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_50px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_60px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_60px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_70px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_70px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_80px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/orange_front_80px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_100px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_100px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_120px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_120px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_140px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_140px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_160px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_160px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_40px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_40px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_50px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_50px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_60px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_60px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_70px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_70px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_80px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_back_80px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_100px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_100px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_120px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_120px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_140px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_140px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_160px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_160px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_40px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_40px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_50px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_50px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_60px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_60px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_70px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_70px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_80px.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/yellow_front_80px.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/prayer/back.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/prayer/back.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/prayer/front.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/prayer/front.png
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/roofremoval/overrides.jsonc
@@ -3270,5 +3270,33 @@
      "z1": 0,
      "z2": 0
    }
+  ],
+  "12597": [ // Varrock West
+    {
+      "rx1": 19,
+      "ry1": 33,
+      "rx2": 25,
+      "ry2": 34,
+      "z1": 0,
+      "z2": 0
+    },
+    {
+      "rx1": 29,
+      "ry1": 38,
+      "rx2": 30,
+      "ry2": 44,
+      "z1": 0,
+      "z2": 0
+    }
+  ],
+  "12341": [ // Barbarian Village
+     {
+       "rx1": 22,
+       "ry1": 35,
+       "rx2": 27,
+       "ry2": 38,
+       "z1": 1,
+       "z2": 1
+     }
  ]
 }