Skip to content

Commit efdeb12

Browse files
osrsboxosrsbox
committed
Weekly update (2021-02-03)
1 parent 2afe4a9 commit efdeb12

File tree

223 files changed

+7832
-2542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+7832
-2542
lines changed

‎builders/items/build_item.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -466,13 +466,14 @@ def populate_from_wiki_data_equipment(self) -> bool:
466466
self.item_dict["incomplete"] = True
467467

468468
# Slot
469+
slot = None
469470
if self.infobox_version_number is not None:
470471
key = "slot" + str(self.infobox_version_number)
471-
value = self.extract_infobox_value(bonuses_template, key)
472-
if value is None:
473-
value = self.extract_infobox_value(bonuses_template, "slot")
474-
if value is not None:
475-
self.item_dict["equipment"]["slot"] = infobox_cleaner.caller(value, "slot")
472+
slot = self.extract_infobox_value(bonuses_template, key)
473+
if slot is None:
474+
slot = self.extract_infobox_value(bonuses_template, "slot")
475+
if slot is not None:
476+
self.item_dict["equipment"]["slot"] = infobox_cleaner.caller(slot, "slot")
476477
else:
477478
print(">>> populate_from_wiki_data_equipment: No slot")
478479
exit(1)
@@ -494,13 +495,14 @@ def populate_from_wiki_data_equipment(self) -> bool:
494495
self.item_dict["weapon"] = dict()
495496

496497
# Attack speed
498+
attack_speed = None
497499
if self.infobox_version_number is not None:
498500
key = "speed" + str(self.infobox_version_number)
499-
value = self.extract_infobox_value(bonuses_template, key)
500-
if value is None:
501-
value = self.extract_infobox_value(bonuses_template, "speed")
502-
if value is not None:
503-
self.item_dict["weapon"]["attack_speed"] = infobox_cleaner.caller(value, "speed")
501+
attack_speed = self.extract_infobox_value(bonuses_template, key)
502+
if attack_speed is None:
503+
attack_speed = self.extract_infobox_value(bonuses_template, "speed")
504+
if attack_speed is not None:
505+
self.item_dict["weapon"]["attack_speed"] = infobox_cleaner.caller(attack_speed, "speed")
504506
else:
505507
print(">>> populate_from_wiki_data_equipment: No attack_speed")
506508
exit(1)

‎data/cache/osrs-cache

‎data/icons/icons-items-complete.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24341,5 +24341,7 @@
2434124341
"25494": "iVBORw0KGgoAAAANSUhEUgAAACQAAAAgCAYAAAB6kdqOAAABAElEQVR4Xu2U0QqDMAxF20/wYSB78lmGyHDIZLD//6qO6qoxVZNWbTfogYtCQ3Joq0IkEkGRakp0pLpk2ZjIYnMZWyw460KRdmtb6EQxeGlhY57QwWL2UCyI16nsEKOHcWrW4iFGD+PUUHEQ2z+MyjXP1att1bNpOFLnC2kR87xXFSXlJuRa/6hrcFxD6qLog02+uA3Qgc3xGg4UgMEWALrpUsygNTF9PLeyBHVs7GbcDDJCQDEcxo4s4S717ro+RkqDj8VTxsCX0p+wEdLvUOpgaKnpXyJHIeb/xZdtqfm92H1XuNhS8Hjg4APuCpdJKuBOUMwlIssM/IREIvGvfABQs+ZqBR9FPwAAAABJRU5ErkJggg==",
2434224342
"25495": "iVBORw0KGgoAAAANSUhEUgAAACQAAAAgCAYAAAB6kdqOAAADF0lEQVR4Xu2XXUtUURSG3T/Bi26CQLzwQiRE8MIoEsEoQSgRBbEozSQT0xSxTDNzMC3RMi3RzFLEzBQ1DRU1GSuxtISkDyLwqp+x4lmnrTNDl3PO3LRgM3POEc4z73rXu7dRUf/L1TISeieCZeRidZMEQ0UM0MitB0OSX1ypQIkxMfrZNjAVAuhZGfE9HJHM3IIgoL7xZbl5f9BrKCPtT6eluWdUjqRnBgDtPatq6vQSykjH4IwCJSSlBCnU/XxB7vZPaDsvVDV6AeW0pb79iQLlFVX8famzfF3DUnunV8rr26SwvE5yCy+7CWVkdO693Bt6rf4pu94qDR0D2p5LNT6FrPZ16X3UOV1SLTnnSkNaGrYyMrf6WYZercrA5IpOU01ztxRduaGjX9nYoav02m0F4j5A2WdK3AOaWdmUsfk1VQkP0RpejBp2cX22tEZhiISs/GI3gIwsr2/L0toXebmwrlC0ra7tsXoFhQrKatVPeIYFyMm88yGxELYysrH9S/wbX2Vi8YNCdQ7PqY9oWygUMCey8iU9M2cXJoxARra+7+ha2/qhKgHVNbKgPsLUQFU0tAdBkU+px0+5ow7tWt38pgqxJpc+qrlRidH/F1TK0WMSHb3PHSBMjCJkzPy7LTU3k0YiE4ItvWO6GHsmDXMnJh+W/Qdi3QHqn1hRA5M1XKMQ4fjoxaJe28XfMPZMWfzBZImNS3AHiNbwy+3EBK49wxq52tKj0HgoKSU1ZFsJWxlp7RvXX0/gkS97LwmGs1nE90NpGQrlChAGxrgogFKAcX/W/0mm32xoLj2b8uu4E4w8S8vIVihXgBh3FGKfInMCYTA8E8ZkkcwYm+fkkIUJO9DPnd/qI8baKgAMxuaYgWLsWezuHD9sC12AoRyg3rElfbHdmwBiP6ONVh17KLMgLsDYMjI8+1aB7AkRIEKRexwxUMdFVULLAcDQcfGJ+mKCEl8BwuTZjPIAxpYTfAQe5yISGkB2djt1Hqljy+yeofET/1kAgtEjAEM5B3v2KPYwgIiBCMHYCk7mCMM4FTjSEYfxqv4AuEwmrUAzxGMAAAAASUVORK5CYII=",
2434324343
"25496": "iVBORw0KGgoAAAANSUhEUgAAACQAAAAgCAYAAAB6kdqOAAAEBElEQVR4Xu2W/0+NcRTHPX+AH1kMi2HWD83CotXC3dIqUqN8bxURKeFSpKKQL5FUaESrbmmSLwm7ZmuYLz/7f45e5/rcnue5qfvMlx+ss53dep7POed93ufL55k1a0b+P7EkpNGK1/OexJJrnYNS1XTnZ5DpdVfJcckvKv9boCzpGXotlzoC4m9olcKj1ZK5vUCWJ66TFcnJEpe6XuJ9PlmZli4HjtdJUUWNFBypkqQNGQpoZWzsnwQ1kfXAi3dyvrVHKuuaNaAb0OGqy1J6ulFBrU3dJIuXxbmY+22xJCEjSwMS/NGTUbnb90Jqb3QpqOLKWgc7ZWeaVClVSlq2xMWv1udLElbL7JgYr6Ai+yAxJ1cdGkCdgZfS0jUkTXf6pb6lW8sHI5wpr7kqFbXXVemftOwdkpCYIsn5O8Kg5ixcGBHjlyCv3BuQs9c6NcN9pX4pOXlencMCGdMzsNPRMyytj4a0dDBFo3PuxIUWtcVu5/5jkpG7V8tG31XW31SfPFuVtEF7y5eZK+k5uyR7Z/HkoPpHP0hDW5/4L7apAq76yj3tBwJk5RfK5soTDq1pfqCAYAqGDvkbZM3mLVpCGI2Nj1fw+IJJk5gBsq2gVMHQ9JM0viXdz8Y0I0rCb2N7n/YKJcCBHUxGWXkYEM0MmKTteY4yU6auxyPh6YQ9JpQE8TkFGCPjoJ6PSfP9Qd07lBG2KJsdUFbFMUk/fEQ2FhZpOWDAAELtLMUsXar+YJuyGiZZDQaQG4VLLBkOfg03cN3Nh+qEjOzspJUc1CD0DY1LP3HOzhIrAX8AMpNJ6UgwCnbsYikLvuIDkrJ7TzgAIHgGMyYAz2GEc5SaZ6wKM1n4cvvxCAaxNLjbiSkV71AAwCBnmDp6CrZMycxYc3b93n3KngHpAQxiaWCc2AGhebX1klt9Vrae9EvOqSotLZNEvwEY9rCxA+K8YdzsIs+AMCZb6J9wEHIOGPqo9+mbsAKKtVF/u1cB0dBuQDBugHoAZGkwd6YGEKzg3DDT1v1US8Lf9BXjTcnYQXY7GKdk9h5yR/6FhIwBhAM3INjhTgMA0wN4Jo/nMMRO4uJl3O12gI5kPCpxAnJmZEn/s6BeITBjGpxfgLG72Et5hWUyd96iCECUDPbmrzBfAVGJJb0jH+VW7+vQp8Z4ALvjh4OvtFwAMIDoN5T/2U3cW8m+TIddYPSTtPS8knPjk1h6qtELS5YMvv0s7QNBudgeCBsax5Trfv+IYwWY3YSyBrgiFixa7AA0FPwmtwNvNUmWqSdAGHc8Dqqx0zD05WiuDzdLrAmUje1O5P2X79I1PKZJOlmPSia+VSacRr6bSqezi3w/jRiDyYzs76bS6ezc72dkRmbkX8oPsslIhVitGo8AAAAASUVORK5CYII=",
24344-
"25497": "iVBORw0KGgoAAAANSUhEUgAAACQAAAAgCAYAAAB6kdqOAAACOUlEQVR4Xu2X72tSYRTHd/+L6NWIEWMvhkghE0XxcsU0S8Vf68656ZbTDeemLk2dmbVcazlkbThyBWO1Igt63f/2becMF0hve54X+YUDz4F7uR/O+T7Pc+7Y2Ej/hxT8PaRIQfHlIda332Cl2ER8tYRIIouHs0lZUAp2jj6heXiORucM2eprBrKoHgYyjI+LhFJwdPYD9fYHFJsdRGIxJDIZbL89RTCelgN08fMXVyYQjSKk63i0sIjd7gW3TwpQOpfDQioFPZFkKAqC8gaDcoDWCkU8zma5XRQE5guHr+EEG1tBdusJV4k+7vb7uVou7wMOygVXScFmpcJVoRbZNY2rRV6itepyiQfaqtex8azNAFaHA6ubeeSfH8BksXAuHKjUaGDv5Cusmhdmmw25Uhmt48/QvGGGEg5UqNV426ueAAMQEOU+fRnTBqN4oHbvG8q7XXhCccytFNjgdDDqqfw1jFCgg9M+fMklmO+5+crofOwjmM5Au9z6gqszkAJzKIwpmx0zTieS1Rrnk+L9M5ACSyQKg9OFW8Y7cCwmYI/NywWy6nOYVlXcnJyCmlzm/LZpBjcmJhhq+I1/rCtj0zxkd/l5TePI7FJOhqlJCu+ytactzKeLKLWOkSm94rW0llX2TngwIy9V93vYqO+zsaUB0blDECZ/AK3edx7WjO778oBoYiRT37284UOVGreQcmlArfd9Bnjx7hyBcgU73S9sbElApOHfn6uQsMP+aPDx4Rh+bqSRROs3zGCr6qPK+WkAAAAASUVORK5CYII="
24344+
"25497": "iVBORw0KGgoAAAANSUhEUgAAACQAAAAgCAYAAAB6kdqOAAACOUlEQVR4Xu2X72tSYRTHd/+L6NWIEWMvhkghE0XxcsU0S8Vf68656ZbTDeemLk2dmbVcazlkbThyBWO1Igt63f/2becMF0hve54X+YUDz4F7uR/O+T7Pc+7Y2Ej/hxT8PaRIQfHlIda332Cl2ER8tYRIIouHs0lZUAp2jj6heXiORucM2eprBrKoHgYyjI+LhFJwdPYD9fYHFJsdRGIxJDIZbL89RTCelgN08fMXVyYQjSKk63i0sIjd7gW3TwpQOpfDQioFPZFkKAqC8gaDcoDWCkU8zma5XRQE5guHr+EEG1tBdusJV4k+7vb7uVou7wMOygVXScFmpcJVoRbZNY2rRV6itepyiQfaqtex8azNAFaHA6ubeeSfH8BksXAuHKjUaGDv5Cusmhdmmw25Uhmt48/QvGGGEg5UqNV426ueAAMQEOU+fRnTBqN4oHbvG8q7XXhCccytFNjgdDDqqfw1jFCgg9M+fMklmO+5+crofOwjmM5Au9z6gqszkAJzKIwpmx0zTieS1Rrnk+L9M5ACSyQKg9OFW8Y7cCwmYI/NywWy6nOYVlXcnJyCmlzm/LZpBjcmJhhq+I1/rCtj0zxkd/l5TePI7FJOhqlJCu+ytactzKeLKLWOkSm94rW0llX2TngwIy9V93vYqO+zsaUB0blDECZ/AK3edx7WjO778oBoYiRT37284UOVGreQcmlArfd9Bnjx7hyBcgU73S9sbElApOHfn6uQsMP+aPDx4Rh+bqSRROs3zGCr6qPK+WkAAAAASUVORK5CYII=",
24345+
"25498": "iVBORw0KGgoAAAANSUhEUgAAACQAAAAgCAYAAAB6kdqOAAAC3UlEQVR4Xt2WzWsTURTF85ZdZNFFoAwEBikiRUoXQjcWpQHRYksr0YJpQ0l1o1hqUUtplRBSQkNoFL+QghSLHyAiuhEEd+78J9z5Z1w993Ff3ryZhGljMuKFw6TN3De/OfedyaRS/08p0kq0BELRrx9Z+vndSxJK0cvtq/SsfJm1kPPp60GGgcZ8v99Qil7VF2ivOs862L5Ib2rT9L4xQ+XVdBIuKdqvFdgZAAHmXX2avMEB41CfXVLGnQBQpgXkdvS4FL2oXDFALkx8oL+WTGXGhY0NoEebl+jJ/bxJndsRLsWpXD5/Mub5basFA2EjQ4B5Wr1u1B5M/x+plGRKOt0zY1RwVAIj7nzZydCnPa3HlWVWC0zrY3OOHd2vTnEfJMmMP2pTYXcqKxeMO99eDzEMjtDDcikgwKAHjwn0iJDYIwBFu9NYnzXuCAiEvwHRfLDEwrkfdmc5kfIwbW7M8Vpvd4v0+bmMOVYpttaFqd/V45IxychwhGwYEfpxY+gDFB6w967ljEMxXNKzxyJIFCSL4w4xKgGScbnOiKQfjgIIn2X92DC4qCwkEbdHhY3bDqaxWQzBwBX04QZtkFgwaMaGEwFGgHCHkiTZtACKghEggcHxEK6gFN0pTfJ8RVhUgOCaDSKuCBBgotyxH56HgEEpWlmcoNtLZ2hq3ON0CExtTUfWhbGdiYKRfXMEGClF5eIo3Zw5TuMnBmnET3OqoE4g0M7GYmhUcBUSIPdqMUrxCObP+pSfyNLosQxvZKgTiAsjo0JfV+4A4NTwEG3dStNqKc0uSURtCBfGBUKauoSR0hfHS1f4xUt/Z0NAtfUC/yxgzyGVAoQxdzGqVtkXd+/O/g4grDX9KusCRfV3VZ0WC4D9AYKQzCggt7enJWCFyRHKn9bJHPYGkgPSFUzm1o1zSQIpyo1lA8nErzgergkBoRS/7COVWS9l9lanPdiHar2uCkiCMLr+GZBe1G/oJebMZpTorQAAAABJRU5ErkJggg==",
24346+
"25499": "iVBORw0KGgoAAAANSUhEUgAAACQAAAAgCAYAAAB6kdqOAAAC3UlEQVR4Xt2WzWsTURTF85ZdZNFFoAwEBikiRUoXQjcWpQHRYksr0YJpQ0l1o1hqUUtplRBSQkNoFL+QghSLHyAiuhEEd+78J9z5Z1w993Ff3ryZhGljMuKFw6TN3De/OfedyaRS/08p0kq0BELRrx9Z+vndSxJK0cvtq/SsfJm1kPPp60GGgcZ8v99Qil7VF2ivOs862L5Ib2rT9L4xQ+XVdBIuKdqvFdgZAAHmXX2avMEB41CfXVLGnQBQpgXkdvS4FL2oXDFALkx8oL+WTGXGhY0NoEebl+jJ/bxJndsRLsWpXD5/Mub5basFA2EjQ4B5Wr1u1B5M/x+plGRKOt0zY1RwVAIj7nzZydCnPa3HlWVWC0zrY3OOHd2vTnEfJMmMP2pTYXcqKxeMO99eDzEMjtDDcikgwKAHjwn0iJDYIwBFu9NYnzXuCAiEvwHRfLDEwrkfdmc5kfIwbW7M8Vpvd4v0+bmMOVYpttaFqd/V45IxychwhGwYEfpxY+gDFB6w967ljEMxXNKzxyJIFCSL4w4xKgGScbnOiKQfjgIIn2X92DC4qCwkEbdHhY3bDqaxWQzBwBX04QZtkFgwaMaGEwFGgHCHkiTZtACKghEggcHxEK6gFN0pTfJ8RVhUgOCaDSKuCBBgotyxH56HgEEpWlmcoNtLZ2hq3ON0CExtTUfWhbGdiYKRfXMEGClF5eIo3Zw5TuMnBmnET3OqoE4g0M7GYmhUcBUSIPdqMUrxCObP+pSfyNLosQxvZKgTiAsjo0JfV+4A4NTwEG3dStNqKc0uSURtCBfGBUKauoSR0hfHS1f4xUt/Z0NAtfUC/yxgzyGVAoQxdzGqVtkXd+/O/g4grDX9KusCRfV3VZ0WC4D9AYKQzCggt7enJWCFyRHKn9bJHPYGkgPSFUzm1o1zSQIpyo1lA8nErzgergkBoRS/7COVWS9l9lanPdiHar2uCkiCMLr+GZBe1G/oJebMZpTorQAAAABJRU5ErkJggg=="
2434524347
}

‎data/items/items-buylimits.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"%LAST_UPDATE%": 1611749125,
2+
"%LAST_UPDATE%": 1612362870,
33
"3rd age amulet": 8,
44
"3rd age axe": 40,
55
"3rd age bow": 8,

‎data/items/items-cache-data.json

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -429841,7 +429841,7 @@
429841429841
},
429842429842
"25244": {
429843429843
"id": 25244,
429844-
"name": "Old key",
429844+
"name": "Dark key",
429845429845
"tradeable_on_ge": false,
429846429846
"members": true,
429847429847
"linked_id_item": null,
@@ -429852,14 +429852,14 @@
429852429852
"placeholder": false,
429853429853
"stackable": true,
429854429854
"equipable": false,
429855-
"cost": 1,
429856-
"lowalch": 0,
429857-
"highalch": 0,
429855+
"cost": 15000,
429856+
"lowalch": 6000,
429857+
"highalch": 9000,
429858429858
"stacked": null
429859429859
},
429860429860
"25245": {
429861429861
"id": 25245,
429862-
"name": "Old key",
429862+
"name": "Dark key",
429863429863
"tradeable_on_ge": false,
429864429864
"members": false,
429865429865
"linked_id_item": 25244,
@@ -433924,5 +433924,41 @@
433924433924
"lowalch": 400,
433925433925
"highalch": 600,
433926433926
"stacked": null
433927+
},
433928+
"25498": {
433929+
"id": 25498,
433930+
"name": "Clue scroll (elite)",
433931+
"tradeable_on_ge": false,
433932+
"members": true,
433933+
"linked_id_item": null,
433934+
"linked_id_noted": null,
433935+
"linked_id_placeholder": null,
433936+
"noted": false,
433937+
"noteable": false,
433938+
"placeholder": false,
433939+
"stackable": false,
433940+
"equipable": false,
433941+
"cost": 20,
433942+
"lowalch": 8,
433943+
"highalch": 12,
433944+
"stacked": null
433945+
},
433946+
"25499": {
433947+
"id": 25499,
433948+
"name": "Clue scroll (elite)",
433949+
"tradeable_on_ge": false,
433950+
"members": true,
433951+
"linked_id_item": null,
433952+
"linked_id_noted": null,
433953+
"linked_id_placeholder": null,
433954+
"noted": false,
433955+
"noteable": false,
433956+
"placeholder": false,
433957+
"stackable": false,
433958+
"equipable": false,
433959+
"cost": 20,
433960+
"lowalch": 8,
433961+
"highalch": 12,
433962+
"stacked": null
433927433963
}
433928433964
}

‎data/items/items-unalchable.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@
202202
"Crone-made amulet": null,
203203
"Crunchy chocolate mix": null,
204204
"Crunchy easter egg": null,
205-
"Crystal acorn": null,
206205
"Crystal axe (The Gauntlet)": null,
207206
"Crystal body": null,
208207
"Crystal body (attuned)": null,
@@ -259,6 +258,7 @@
259258
"Damp sticks": null,
260259
"Dark altar (unobtainable item)": null,
261260
"Dark dye": null,
261+
"Dark key": null,
262262
"Dawnbringer": null,
263263
"Deadman starter pack": null,
264264
"Deadman teleport tablet": null,

0 commit comments

Comments
 (0)