Merge 2009scape updates #19

Open
randy wants to merge 204 commits from 2009Scape:master into upstream
Owner
No description provided.
randy added 204 commits 2026-06-08 08:18:06 -06:00
Spam clicking maze shrine now handled
Refactored both item and double item dialogues
Fixed ToG quest point requirements
Implemented Harmony Island Allotment Patch. Patch is still unreachable without The Great Brain Robbery
Fixed too high health for leech
Removed inauthentic aviansie assignments
Fixed GWD beacon not being repairable
Surprise exam is no longer optional
Fixed level checks for All Fired Up beacon repair
White Berry Bushes can now be protected
Giant Ent properly increases Belladonna yield
Mushrooms now disease properly
Fixed various bush bugs
Fruit Trees can now be chopped
Fixed Scarecrow needing to grow to work
Mushrooms should now visually update as each mushroom is picked from the patch
Poison Ivy Bushes are now disease immune
Poison Ivy Berries picked in the Champion's Guild Patch now finishes a Varrock Diary task
All Barbarian Mixes can now be consumed with appropriate effects
Corrected healing for caviar Barbarian Mixes
Created a new command, ::petrate, for testing pet growth. ::petrate 0 is for pausing growth, 1 for 1x rate, and 2 uses the dev rate of growth (100x normal)
Adult and overgrown cats will not grow hungry
Removed several pets inauthentic to 2009
Dogs no longer can turn into minotaurs
Wolpertingers now double yield and experience from bushes
Geoffrey in Seers' Village should give the correct amount of noted flax every day
Implemented Draynor Manor chair NPCs (The ones that follow you around the house)
Fixed Thormac staff enchantment
Essence miner bot will now sell the acquired pure essence on the GE after it reaches at least 500
Added the missing music definition for the eastern half of Damis's cave
Buffed Kamil's ice barrage attack to always hit two 5s
Fixed a bug where Fareed's weapon unequip message would fire even if you did not have a weapon equipped
Removed option to obtain inauthentic TzRek-Jad pet
Updated README for docker
Cleaned up run and build bash scripts
Fixed multihit spells incorrectly being limited to exclusively players or exclusively NPCs per cast
Fixed saradomin bracers requiring 70 defense
Added missing animations and sounds to blessed axe
Fixed bug where All Fired Up beacons would consider boosted/dynamic skill level instead of actual skill level
Removed random inauthentic needle break when repairing All Fired Up beacon
::poison command (admin) will now automatically remove poison immunity timers for faster testing
Poison will no longer give an inauthentic warning when it is about to expire
Newly applied poison timers will only overwrite old poison timers if they are greater in severity
Fixed up some logic for monster examine checking poison immunity
Fixed numerous poison stats
Fixed 3 spawns in Kalphite Lair first floor
Fixed 5 spawns in Kalphite Lair bottom floor
Fixed charter boat exception
Fixed Mos Le'Harmless charter boat discount and prices
Implemented admin ::instachop command
Checking the health of a fruit tree in Brimhaven now finishes the appropriate Karamja task
Somewhat improved sending of tab configurations and free space
Added Solihib npc spawn
Implemented Solihib's store
Barrows equipment now breaks and drops on non-grave deaths (instead of converting to coins)
Rewrote Bob handlers
Accessibility to second bank is now locked behind server config toggle second_bank
Eniola, Arnold Lydspor, and Emerald Benedict now offer access to second bank
Locked the backported ability to charge our ring of wealth with GE teleports behind server config toggle ring_of_wealth_teleport
Corrected enchant spells to always yield uncharged dragonstone items, rather than fully charged ones
Fixed inauthentic jewellery UI
Locked the availability of our inauthentic player commands behind server config toggle player_commands. Admins are immune to this and still always have all commands available. Note that this includes ::confirmrules, so be sure not to set your server to show rules and info, but not allow commands
Boots of lightness now work as expected
Removed the ironman_icons server config setting, locking it behind ironman instead
Removed the default_xp_rate server config setting and hardcoded the default xp rate to 1x
Changed a bunch of server config defaults for inauthentic features to disabled
Added enable_global_chat to the worldprops default config. Note the change from enable_globalchat to enable_global_chat
Removed the allow_slayer_rerolls worldprops config option
Large number of tutorial island improvements and authenticity enhancements
Also corrected various mining messages across many rock types to be authentic
Rewrote home teleport
Corrected shades and zombies to only multiply xp by 1/16 if they were random events
Unified non-hostile random event chat mechanics
Fixed random events repeating their opening message and/or saying their timeout message prematurely
Genie will now authentically address female players as 'Mistress'
Fixed hostile randoms wrongly teleporting the player after 3 minutes
Made quizmaster dialogues unclosable and added a hook to restart them if you lose it
Made the pillory dialog unclosable
Implemented rock golem switch between ranged and melee
Replaced sandwich lady chat lines with authentic quotes
Added authentic dialogue for interacting with another player's sandwich lady
Added a teleport block for the surprise exam random event
Fixed a bug that caused the prayer-recharge jingle to be played over the death jingle when the player died
Fixed redundant overload checks
Fixed lunar spells consuming double runes when a previous cast attempt failed
Fixed HP on halloween random-event spiders
Corrected the Dream spell logic
Corrected dialogue to authentic source
Fixed a typo when attempting to sell an item on the GE that is blacklisted
Implemented grinding of suqah teeth
Fixed ice barrage animations
Players who get successfully frozen by an ice spell now receive the message "You have been frozen!"
Global news announcements are now locked behind the enable_global_chat server config setting
PvP and brawler drops from the Chaos Elemental now refer to it as "the Chaos Elemental", rather than "a Chaos Elemental"
PvP and brawler drops from revenants now lowercase the revenant's name
Tortoises have corrected HP (101 for level 79, 121 for level 92)
Added stats and animations for Gnome Driver, Gnome Mage, and Gnome Archer
Gnome-Mounted Tortoise now attacks with its mounted gnomes, and the gnomes spawn on the ground upon tortoise death
Can now add milk to teas
Nettle tea now heals
Refactor of Beer Barrels, Larder, and Shelves
Checks are now made to ensure that the player cannot take Tea/Beer related items out from the POH
A few useless items (Bowl of Hot Water, Cup of Hot Water) have been implemented
Corrected bush snakes implementation
Added knife to the Tool Store 2 item list
Added the effect of Spirit Graahk's scroll, Goad
Added Spirit Graahk's dialogue
Added Spirit Graahk's Baroo!-isms
Fixed amulet of glory destination spelling
Mounted amulet of glory fixes
Fixed some examine texts
Fixed POH portal build requirements
Fixed some related typos
Corrected teleport location for Draynor Village
Fixed bug where random events could interrupt teleports
Enabled the Burgh de Rott star location
Rewrote enchanted jewellery teleports
Improved replacement of spent slayer rings
Implemented ::buryitem <id> <true|false> [msg]
Implemented ::burymessage <msg>
Implemented passive combat buffs for the following familiars:
Geyser Titan (ranged offence +1 +3% of player level rounded up)
Wolpertinger (magic defence +5%)
Iron Titan (melee defence +10%)
Steel Titan (melee defence +15%)
Fixed ice smash
Implemented ring of forging "operate" to check remaining charges
Implemented ::ifaces commmand
Implemented ::pohstorableitems command to fetch all storable items
Implemented storing books in house
POH now included in item checks
Feeding of stray dog now supports more meats
Corrected spellbook swap spell selection timeout
Added missing 6th colour variant of kitten/cat
Fixed duplicated interaction implementations
1 combo rune can count for 2 elemental runes if the spell requires both
Fixed Zombie animations in Ardy sewers
Fixed Ghost combat animations in Draynor Manor
Fixed potion drinking animation and add two tick potion text delay
Fixed Gnome death animation in Khazard Battlefield
Fixed Gnome animations in Tree Gnome Village
Removed inauthentic + broken Vinesweeper teleport animation
Fixed an inauthentic typo in Matthias's falconry dialog
Corrected Entrana Penguin to a Barrel
Corrected Observatory Penguin to Crate
Implemented admin command to reset full penguins ::renewpenguins
Implemented admin command to spawn individual penguin ::spawnpenguin
This pull request has changes conflicting with the target branch.
  • Server/src/main/content/global/dialogue/BankerDialogue.kt
  • Server/src/main/content/global/handlers/iface/MagicBookInterface.java
  • Server/src/main/content/global/handlers/item/EnchantJewelleryTabListener.kt
  • Server/src/main/content/global/skill/farming/CropHarvester.kt
  • Server/src/main/content/global/skill/fletching/Fletching.java
  • Server/src/main/content/global/skill/fletching/FletchingPulse.java
  • Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt
  • Server/src/main/content/global/skill/magic/SpellUtils.kt
  • Server/src/main/content/global/skill/magic/ancient/AncientTeleportPlugin.java
  • Server/src/main/content/global/skill/magic/lunar/LunarListeners.kt
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u master:2009Scape-master
git checkout 2009Scape-master

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout upstream
git merge --no-ff 2009Scape-master
git checkout 2009Scape-master
git rebase upstream
git checkout upstream
git merge --ff-only 2009Scape-master
git checkout 2009Scape-master
git rebase upstream
git checkout upstream
git merge --no-ff 2009Scape-master
git checkout upstream
git merge --squash 2009Scape-master
git checkout upstream
git merge --ff-only 2009Scape-master
git checkout upstream
git merge 2009Scape-master
git push origin upstream
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Snowscape/Server#19
No description provided.