Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
2026-06-06: Permanent Greenstacks
2026-05-28: New W7 sections: Dancing Coral, Coral Kid. Gstack autogenerated final tier.
2026-05-21: New W7 sections: Zenith Market and Research
2026-04-28: Updates from patch v2.503
Expand Down
44 changes: 30 additions & 14 deletions mysite/consts/consts_general.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
# World 7 part 1
'w7A1', 'w7A2', 'w7A3', 'w7A4', 'w7A5', 'w7A7', 'w7A8', 'w7A9', 'w7A10', 'w7A11', 'w7A12',
# World 7 part 2
'w7B1', 'w7B2', 'w7B3', 'w7B4', 'w7B5', 'w7B6', 'w7B7', 'w7B11',
'w7B1', 'w7B2', 'w7B3', 'w7B4', 'w7B5', 'w7B6', 'w7B7', 'w7B11', 'w7B12',
"Sewers3"
],
"Crystal Enemy Drops": [
Expand Down Expand Up @@ -316,7 +316,7 @@
'SpiA1', 'SpiA2', 'SpiA3', 'SpiA4', 'SpiA5', 'SpiB1', 'SpiB2', 'SpiB3', 'SpiB4', 'SpiC1', 'SpiC2', 'SpiD1', 'SpiD2', 'SpiD3', # W6
'w7A1', 'w7A2', 'w7A3', 'w7A4', 'w7A5', 'w7A7', 'w7A8', 'w7A9', 'w7A10', 'w7A11', 'w7A12',
# World 7 part 2
'w7B1', 'w7B2', 'w7B3', 'w7B4', 'w7B5', 'w7B6', 'w7B7', 'w7B11',
'w7B1', 'w7B2', 'w7B3', 'w7B4', 'w7B5', 'w7B6', 'w7B7', 'w7B11', 'w7B12',
'Sewers3', 'Quest15', 'Hgg' # Specialty Monster Materials
],
'Crystal Enemy Drops': [
Expand Down Expand Up @@ -374,6 +374,7 @@
# World 7 part 2
'Spelunking4', 'Spelunking5',
'Line13',
'ResetCompleted', 'ResetCompletedS',
],
'Vendor Shops': [
'FoodHealth1',
Expand All @@ -384,6 +385,7 @@
'FoodPotRe2', #Average Life Potion from W2 Shop + Gigafrogs
],
'Rare Drops': [
'JobApplication', # W1 Rare Drops
'FoodHealth2', 'FoodHealth3',
# TODO: Move Statues to their corresponding Crystals
'EquipmentStatues9', 'EquipmentStatues15', 'EquipmentStatues16', 'EquipmentStatues17', 'EquipmentStatues19',
Expand All @@ -401,30 +403,32 @@
'EfauntDrop1', 'EfauntDrop2', 'Chiz0', 'Chiz1', 'TrollPart', 'KrukPart2', # Basic Efaunt material
'SpiA2b', 'SpiB2b', 'Quest95', #W6 Rare Drops
'FoodG1', 'FoodG2', 'FoodG3', 'FoodG4', 'FoodG5', 'FoodG6', 'FoodG7', 'FoodG8', 'FoodG10', # Gold Foods
'FoodG11', 'FoodG12', 'FoodG13', 'FoodG14', 'FoodG15', 'ButterBar', # Gold Foods
'FoodG11', 'FoodG12', 'FoodG13', 'FoodG14', 'ButterBar', # Gold Foods
# World 7 part 1
'Coral1', 'Coral2', 'Coral3', 'w7A6',
# World 7 part 2
'Coral4', 'w7B1b', 'Quest110'
'Coral4', 'w7B1b', 'Quest110',
'FoodEvent5', 'FoodEvent6', 'FoodEvent7', 'FoodEvent8',
],
'Boss Drop': [
'BabaYagaETC',
'ExpBalloon1',
'Meatloaf', 'Quest17', 'Quest29',
'KrukPart', 'StoneA6', 'StoneW7', 'StoneT6', 'StoneHelm7'
],
'Cheater': [
'BabaYagaETC', 'JobApplication', # W1 Rare Drops
'EmpPart', # W6 Boss Material
'CraftMat2', # Crimson String
'OilBarrel1', 'OilBarrel3', 'OilBarrel4', 'OilBarrel5', # Oil Barrels
'PureWater2', # Alchemy Dense water
'Quest1', 'Quest2', 'Quest5', 'Quest6', 'Quest8', 'Quest10', 'Quest11', 'Quest16', 'Quest17', 'Quest20', 'Quest25',
'Quest26', 'Quest27', 'Quest28', 'Quest29', 'Quest30', 'Quest31', 'Quest33', 'Quest34', 'Quest36', 'Quest37', 'Quest38', 'Quest39', 'Quest40',
'Quest1', 'Quest2', 'Quest5', 'Quest6', 'Quest8', 'Quest10', 'Quest11', 'Quest16', 'Quest20', 'Quest25',
'Quest26', 'Quest27', 'Quest28', 'Quest30', 'Quest31', 'Quest33', 'Quest34', 'Quest36', 'Quest37', 'Quest38', 'Quest39', 'Quest40',
'Quest41', 'Quest42', 'Quest43', 'Quest44', 'Quest45', 'Quest46', 'Quest47', 'Quest48', 'Quest49', 'Quest50', 'Quest9',
'Mayo', 'Trash', 'Trash2', 'Trash3', # Treasure Hunt rewards
'Meatloaf', 'FoodHealth5', #Small quantity foods
'FoodHealth5', #Small quantity foods
'BobJoePickle', 'BallJoePickle', 'BoneJoePickle', #Pickles
'FoodPotYe1', 'FoodPotYe3', # EXP 1 and 3
'FoodEvent1', 'FoodEvent2', 'FoodEvent3', 'FoodEvent4', 'FoodEvent5', 'FoodEvent6', 'FoodEvent7', 'FoodEvent8', # Event Foods
'FoodEvent1', 'FoodEvent2', 'FoodEvent3', 'FoodEvent4', # Event Foods
'Pearl1', 'Pearl2', 'Pearl3', 'Pearl4', 'Pearl5', 'Pearl6', # Skilling Speed Pearls, EXP pearls
'Line1', 'Line2', 'Line5', 'Line6', 'Line7', 'Line9', 'Line10', 'Line11', 'Line14', # Fishing Lines
'ExpBalloon2', 'ExpBalloon3', # Experience Balloons
Expand All @@ -433,8 +437,8 @@
'Quest70', 'Quest71', 'Quest75', 'Gfoodcoupon', 'ItemsCoupon1', 'ItemsCoupon2', # Loot Bags
'FoodHealth8', 'Quest69', 'Quest74', # Unobtainables
'EquipmentStatues6', # Kachow
'ResetCompleted', 'ResetCompletedS', 'ClassSwap',
'ClassSwapB', 'ResetBox',
'ClassSwap', 'ClassSwapB', 'ResetBox',
'FoodG15',
]
}
greenstack_amount = 10 ** 7
Expand Down Expand Up @@ -490,7 +494,7 @@
"Events",
]

# `CardStuff` in source. Last updated in v2.43 Nov 10
# `CardStuff` in source. Last updated in v2.507
card_raw_data = [
[
["mushG", "A0", "5", "+{_Base_HP", "12"],
Expand Down Expand Up @@ -718,11 +722,15 @@
["w7b9", "J21", "20000000", "+{%_Drop_Rate_Multi", "1"],
["w7b10", "J22", "30000000", "+{%_Drop_Rate_Multi", "1"],
["w7b11", "J23", "20000000", "+{%_Research_AFK_gain_(Passive)", "1"],
["w7b12", "J24", "100000000", "+{%_Drop_Rate_Multi", "1"],
["w7b12", "J24", "40000000", "+{%_Spelunk_Amber_(Passive)", "10"],
["Crystal6", "J99", "2500000", "+{%_Damage_Multi_(Passive)", "1.5"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
],
[
["frogP", "X0", "1.5", "+{_Base_Dungeon_MP", "2"],
Expand Down Expand Up @@ -808,7 +816,15 @@
["cropfallEvent1", "Y20", "6", "+{%_Gold_Food_Effect_(Passive)", "4"],
["xmasEvent4", "Y21", "1", "+{%_Catching_Away_Gains", "2"],
["luckEvent1", "Y22", "5", "+{%_Drop_Rate_(Passive)", "3"],
["luckEvent2", "Y23", "5", "+{%_Money_from_Monsters", "4"]
["luckEvent2", "Y23", "5", "+{%_Money_from_Monsters", "4"],
["anni5Event1", "Y24", "6", "+{%_Gold_Food_Effect_(Passive)", "5"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
["Blank", "A0", "10", "+{%_Base_HP", "3"],
]
]

Expand Down
4 changes: 2 additions & 2 deletions mysite/consts/consts_item_data.py

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mysite/consts/consts_monster_data.py

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion mysite/consts/generated/monster_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,9 @@
"poppy": {
"Name": "Poppy"
},
"fm_frog": {
"Name": "Abacus Frog"
},
"T1a": {
"Name": "Bronze Champion Ram"
},
Expand All @@ -794,6 +797,15 @@
"T1c": {
"Name": "Gold Champion Ram"
},
"T2a": {
"Name": "Bronze Champion Troll"
},
"T2b": {
"Name": "Silver Champion Troll"
},
"T2c": {
"Name": "Gold Champion Troll"
},
"Copper": {
"Name": "Copper"
},
Expand Down Expand Up @@ -1199,5 +1211,5 @@
"Wisdom_Monument": {
"Name": "Wisdom"
},
"_hash": "0af483c00457aa6c61d6e46a0647d1734b653baa647b40dd65763f6551e8d2aa"
"_hash": "e57aac19907cae70be0b995c134a74cc1e05975db67f1559b7a8427f18a02c5f"
}
82 changes: 80 additions & 2 deletions mysite/consts/generated/raw_item_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -16920,9 +16920,18 @@
"Code (Type)": "bCraft",
"Type": "MONSTER_DROP",
"Level Required (Craft)": 15,
"Description": "The penultimate emblem given to legendary pirates, signifying their leadership of the pirate crew.",
"Description": "The ultimate emblem given to legendary pirates, signifying their leadership of the pirate crew.",
"Code (Name)": "w7B12"
},
"w7B12b": {
"Name": "Pirate Ship Figurine",
"Sell Price": 150000,
"Code (Type)": "bCraft",
"Type": "MONSTER_DROP",
"Level Required (Craft)": 15,
"Description": "Wait, are these guys captains of the sunken ship or THIS ship??",
"Code (Name)": "w7B12b"
},
"GemP35": {
"Name": "Hyper Obol Stack Square Edition",
"Sell Price": 1,
Expand Down Expand Up @@ -35691,6 +35700,75 @@
"Upgrade Slots Left": 0,
"Code (Name)": "EquipmentNametagReplica37"
},
"EquipmentNametagReplica38": {
"Name": "Bronze Tournament Border Nametag",
"Sell Price": 1,
"Code (Type)": "aNametag",
"Type": "REPLICA_NAMETAG",
"Level Required (Craft)": 55,
"Level Required (Equip)": 1,
"Class": "ALL",
"Speed": 0,
"Reach": 0,
"Weapon Power": 0,
"STR": 0,
"AGI": 0,
"WIS": 0,
"LUK": 0,
"Defence": 0,
"Misc 1 (Text)": "0",
"Misc 1 (Value)": 0,
"Misc 2 (Text)": "0",
"Misc 2 (Value)": 0,
"Upgrade Slots Left": 0,
"Code (Name)": "EquipmentNametagReplica38"
},
"EquipmentNametagReplica39": {
"Name": "Silver Tournament Border Nametag",
"Sell Price": 1,
"Code (Type)": "aNametag",
"Type": "REPLICA_NAMETAG",
"Level Required (Craft)": 55,
"Level Required (Equip)": 1,
"Class": "ALL",
"Speed": 0,
"Reach": 0,
"Weapon Power": 0,
"STR": 0,
"AGI": 0,
"WIS": 0,
"LUK": 0,
"Defence": 0,
"Misc 1 (Text)": "0",
"Misc 1 (Value)": 0,
"Misc 2 (Text)": "0",
"Misc 2 (Value)": 0,
"Upgrade Slots Left": 0,
"Code (Name)": "EquipmentNametagReplica39"
},
"EquipmentNametagReplica40": {
"Name": "Gold Tournament Border Nametag",
"Sell Price": 1,
"Code (Type)": "aNametag",
"Type": "REPLICA_NAMETAG",
"Level Required (Craft)": 55,
"Level Required (Equip)": 1,
"Class": "ALL",
"Speed": 0,
"Reach": 0,
"Weapon Power": 0,
"STR": 0,
"AGI": 0,
"WIS": 0,
"LUK": 0,
"Defence": 0,
"Misc 1 (Text)": "0",
"Misc 1 (Value)": 0,
"Misc 2 (Text)": "0",
"Misc 2 (Value)": 0,
"Upgrade Slots Left": 0,
"Code (Name)": "EquipmentNametagReplica40"
},
"EquipmentHats31": {
"Name": "Smitty's Bubble Blowing Hat",
"Sell Price": 1,
Expand Down Expand Up @@ -39803,5 +39881,5 @@
"Description": "slimeB",
"Code (Name)": "CardsZ26"
},
"_hash": "db53dc8ad5d0dab558dbb4ce2c60cae324ae1fdde06465a88fef338ec4c03b3e"
"_hash": "673382c68cd7829c637d7516f90214a174b945b7fb9e76b266c02f639edc2b87"
}
Loading
Loading