Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maintained fork #236

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Maintained fork #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ef981c
Update 2022-01-28
AntonyGarand Jan 29, 2022
0829f2f
Fix - Missing items
AntonyGarand Jan 29, 2022
76d9ca4
WIP: Added more missing items
AntonyGarand Jan 30, 2022
ebbcaad
Updated items
AntonyGarand Jan 30, 2022
f08d0db
Update end of shaterred leagues
AntonyGarand Mar 19, 2022
730b40d
Update 2022-04-20
AntonyGarand Apr 20, 2022
6d99ab4
2022-06-18 update
AntonyGarand Jun 18, 2022
147e601
2022-08-06 update
AntonyGarand Aug 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 7 additions & 1 deletion builders/items/build_item.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,8 @@ def populate_from_wiki_data_equipment(self) -> bool:
has_infobox = infobox_bonuses_parser.extract_infobox("infobox_bonuses")
if not has_infobox:
# No infobox bonuses found for the item!
print("populate_from_wiki_data_equipment: No infobox bonuses")
print("populate_from_wiki_data_equipment: No infobox bonuses. To add to infobox_cleaner?")
print(self.item_id + " " + self.item_name)
exit(1)

# Set the infobox bonuses template
Expand Down Expand Up @@ -524,10 +525,15 @@ def populate_from_wiki_data_equipment(self) -> bool:
combat_template = infobox_combat_parser.template
weapon_type = infobox_cleaner.caller(combat_template, "weapon_type")
weapon_type = weapon_type.lower()
# Keris partisan patch
if weapon_type == 'partisan':
weapon_type = 'stab_sword'

self.item_dict["weapon"]["weapon_type"] = weapon_type
try:
self.item_dict["weapon"]["stances"] = self.weapon_stances[weapon_type]
except KeyError:
print("Missing weapon type: " + weapon_type)
print("populate_from_wiki_data_equipment: Weapon type error 1")
exit(1)

Expand Down
4 changes: 2 additions & 2 deletions builders/items/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def run(self):
# Start processing every item!
for item_id in self.all_items_cache_data:

# if int(item_id) < 25800:
# if int(item_id) < 26000:
# continue

# Skip any beta items
Expand Down Expand Up @@ -142,7 +142,7 @@ def test(self):
# Start processing every item!
for item_id in self.all_items_cache_data:

# if int(item_id) < 25800:
# if int(item_id) < 26000:
# continue

# Skip any beta items
Expand Down
34 changes: 33 additions & 1 deletion builders/items/infobox_cleaner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,38 @@
25243, # Red icon
25987, # Tumeken's heka
25989, # Tumeken's heka (uncharged)
26184, # Blue icon
26185, # Blue icon
26186, # Blue icon
26187, # Blue icon
26188, # Blue icon
26189, # Blue icon
26190, # Blue icon
26191, # Blue icon
26192, # Blue icon
26193, # Blue icon
26194, # Blue icon
26195, # Blue icon
26196, # Blue icon
26197, # Blue icon
26198, # Blue icon
26199, # Blue icon
26200, # Red icon
26201, # Red icon
26202, # Red icon
26203, # Red icon
26204, # Red icon
26205, # Red icon
26206, # Red icon
26207, # Red icon
26208, # Red icon
26209, # Red icon
26210, # Red icon
26211, # Red icon
26212, # Red icon
26213, # Red icon
26214, # Red icon
26215, # Red icon
]


Expand Down Expand Up @@ -372,7 +404,7 @@ def release_date(value: str) -> str:
try:
release_date = dateparser.parse(release_date)
release_date = release_date.date().isoformat()
except (ValueError, TypeError, AttributeError):
except:
return None


Expand Down
4 changes: 3 additions & 1 deletion builders/monsters/infobox_cleaner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ def members(value: str) -> bool:
:param value: Template value extracted from raw wikitext.
:return value: Template value converted into a boolean.
"""
if not value:
return False
if value.lower() in ["true", "yes"]:
return True
else:
Expand All @@ -91,7 +93,7 @@ def release_date(value: str) -> str:

try:
return dateparser.parse(value).date().isoformat()
except (ValueError, AttributeError):
except:
return None


Expand Down
2 changes: 1 addition & 1 deletion data/cache/osrs-cache
Open in desktop
Submodule osrs-cache updated 21 files
+7,917 −739 0.flatcache
+6,284 −5,927 1.flatcache
+8 −8 10.flatcache
+39 −4 11.flatcache
+12,093 −2,370 12.flatcache
+17 −17 13.flatcache
+163 −2 14.flatcache
+22 −1 15.flatcache
+58 −47 16.flatcache
+679 −193 18.flatcache
+24 −14 19.flatcache
+11,151 −576 2.flatcache
+457 −121 20.flatcache
+228 −0 21.flatcache
+2,326 −687 3.flatcache
+3,645 −5 4.flatcache
+2,778 −552 5.flatcache
+243 −54 6.flatcache
+145,089 −129,143 7.flatcache
+8,710 −1,402 8.flatcache
+11 −4 9.flatcache
2 changes: 1 addition & 1 deletion data/cache/osrs-flatcache
Open in desktop
Submodule osrs-flatcache updated 3 files
+1 −1 packer/pom.xml
+83 −4 packer/src/main/java/net/runelite/cache/fs/flat/Dumper.java
+1 −1 pom.xml
249 changes: 249 additions & 0 deletions data/icons/icons-items-complete.json
View file
Open in desktop

Large diffs are not rendered by default.

37 changes: 33 additions & 4 deletions data/items/items-buylimits.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"%LAST_UPDATE%": 1632974472,
"%LAST_UPDATE%": 1659810444,
"3rd age amulet": 8,
"3rd age axe": 40,
"3rd age bow": 8,
Expand All @@ -24,6 +24,7 @@
"3rd age vambraces": 8,
"3rd age wand": 8,
"A powdered wig": 4,
"Abyssal ashes": 7500,
"Abyssal bludgeon": 8,
"Abyssal bracelet(5)": 10000,
"Abyssal dagger (p)": 8,
Expand Down Expand Up @@ -204,6 +205,12 @@
"Anchovy pizza": 10000,
"Ancient blessing": 5,
"Ancient bracers": 8,
"Ancient brew(4)": 2000,
"Ancient ceremonial boots": 8,
"Ancient ceremonial gloves": 8,
"Ancient ceremonial legs": 8,
"Ancient ceremonial mask": 8,
"Ancient ceremonial top": 8,
"Ancient chaps": 8,
"Ancient cloak": 8,
"Ancient coif": 8,
Expand Down Expand Up @@ -578,6 +585,7 @@
"Black wizard robe (g)": 4,
"Black wizard robe (t)": 4,
"Blacksmith's helm": 125,
"Blade of saeldor (inactive)": 8,
"Blamish bark shell": 13000,
"Blamish blue shell (pointed)": 13000,
"Blamish blue shell (round)": 13000,
Expand All @@ -589,8 +597,14 @@
"Blamish red shell (round)": 13000,
"Blessed spirit shield": 8,
"Blighted ancient ice sack": 10000,
"Blighted bind sack": 10000,
"Blighted entangle sack": 10000,
"Blighted manta ray": 12000,
"Blighted snare sack": 10000,
"Blighted super restore(4)": 2000,
"Blighted teleport spell sack": 10000,
"Blighted vengeance sack": 10000,
"Blood essence": 500,
"Blood pint": 2000,
"Blood rune": 25000,
"Blood shard": 8,
Expand Down Expand Up @@ -848,6 +862,8 @@
"Casket": 50,
"Castle wars bracelet(3)": 10000,
"Cat mask": 4,
"Catalytic talisman": 40,
"Catalytic tiara": 40,
"Catherby teleport (tablet)": 10000,
"Cavalier mask": 150,
"Cave eel": 10000,
Expand Down Expand Up @@ -963,6 +979,7 @@
"Crystal ball (flatpack)": 500,
"Crystal key": 11000,
"Crystal of power (flatpack)": 500,
"Crystal tool seed": 100,
"Crystal weapon seed": 70,
"Cup of hot water": 13000,
"Cup of tea": 2000,
Expand Down Expand Up @@ -1221,11 +1238,13 @@
"Elder chaos robe": 8,
"Elder chaos top": 8,
"Elder maul": 8,
"Eldritch orb": 8,
"Elemental helmet": 70,
"Elemental shield": 70,
"Elemental sphere (flatpack)": 500,
"Elemental talisman": 40,
"Elven boots": 125,
"Elven signet": 5,
"Elysian sigil": 5,
"Elysian spirit shield": 8,
"Emerald amulet (u)": 10000,
Expand Down Expand Up @@ -1620,6 +1639,7 @@
"Hard leather shield": 125,
"Hard leather": 13000,
"Hardleather body": 125,
"Harmonised orb": 8,
"Harmony island teleport (tablet)": 10000,
"Harpoon": 40,
"Harralander potion (unf)": 10000,
Expand Down Expand Up @@ -1664,6 +1684,7 @@
"Impling jar": 13000,
"Incomplete heavy ballista": 8,
"Incomplete light ballista": 8,
"Infernal ashes": 7500,
"Infinity boots": 125,
"Infinity bottoms": 125,
"Infinity gloves": 125,
Expand Down Expand Up @@ -2219,6 +2240,7 @@
"Needle": 40,
"Neitiznot shield": 70,
"Nice hedge (bagged)": 10000,
"Nightmare staff": 8,
"Ninja impling jar": 18000,
"Noose wand": 40,
"Nose peg": 70,
Expand Down Expand Up @@ -2323,6 +2345,7 @@
"Orange": 13000,
"Oranges(5)": 600,
"Ornate maul handle": 50,
"Osman's report": 0,
"Ourania teleport (tablet)": 10000,
"Ourg bones": 7500,
"Oyster pearl": 11000,
Expand Down Expand Up @@ -2351,8 +2374,6 @@
"Penguin mask": 4,
"Pest control teleport": 10000,
"Pestle and mortar": 40,
"Pharaoh's sceptre (3)": 50,
"Pharaoh's sceptre": 10000,
"Phoenix necklace": 10000,
"Phrin remains": 7500,
"Pie dish": 500,
Expand Down Expand Up @@ -2864,6 +2885,10 @@
"Shaman mask": 125,
"Shantay pass (item)": 18000,
"Shark": 10000,
"Shattered cannon ornament kit": 5,
"Shattered relics mystic ornament kit": 5,
"Shattered relics variety ornament kit": 5,
"Shattered relics void ornament kit": 5,
"Shaving stand (flatpack)": 500,
"Shayzien banner": 4,
"Shayzien hood": 4,
Expand Down Expand Up @@ -2997,9 +3022,10 @@
"Snape grass seed": 200,
"Snape grass": 13000,
"Snowy knight (item)": 125,
"Soaked page": 11000,
"Soda ash": 13000,
"Soft clay": 13000,
"Soul rune": 10000,
"Soul rune": 25000,
"Spade": 40,
"Spatula": 50,
"Spectral sigil": 5,
Expand Down Expand Up @@ -3321,6 +3347,7 @@
"Team-8 cape": 150,
"Team-9 cape": 150,
"Teasing stick": 40,
"Teleport card": 500,
"Teleport to house (tablet)": 10000,
"Thammaron's sceptre (u)": 8,
"Thatch spar dense": 100,
Expand Down Expand Up @@ -3529,6 +3556,7 @@
"Vial of water": 13000,
"Vial": 13000,
"Viggora's chainmace (u)": 8,
"Vile ashes": 150,
"Villager armband (blue)": 150,
"Villager armband (brown)": 150,
"Villager armband (pink)": 150,
Expand All @@ -3546,6 +3574,7 @@
"Villager sandals (pink)": 150,
"Villager sandals (yellow)": 150,
"Vodka": 13000,
"Volatile orb": 8,
"Volcanic ash": 13000,
"Volcanic whip mix": 4,
"Vyrewatch legs": 150,
Expand Down
Loading