feat: Tutorial Island Master Chef and Quest Guide #346
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…l messages to cooking.
Pazaz
changed the title
Pazaz
added a commit
that referenced
this pull request
Mar 23, 2024
* refactor: Renamed attack style components * fix: Remove trim from TextEncoder * fix: equipping/unequipping of stackable objs properly (#343) fix: equipping of stackable objs properly * feat: Misc fixes, content additions and whatnot (#344) * fix: Corrected Black Demon droptable. * feat: Red Dragon droptable. * fix: XP Lamp looked for wrong varp. * fix: Move file to right place. * feat: Black Dragon droptable. * fix: accuracy improvements for levelup rewards (#347) fix: accuracy improvements to the levelup rewards * test: CollisionManager, JString, Jagfile & WordPack & refactor (#345) * test: CollisionManager, JString & WordPack & refactor * fix: coord for test because zone * refactor: improve the collision loading * fix: remove useless promises * feat: Tutorial Ssland Master Chef and Quest Guide (#346) * Temporary Alpha disclosure login text * Happy Path Master Chef * Hint updates * Tutorial happy path for cook fixes, and quest guide * I can't spell. * Added more sources, and recap dialogue will need updates matching the 2012 source. * Finished Master Chef dialogue. * Updated Survival Guide recaps, master chef typos, and added additional messages to cooking. * Added some more Tree locs for woodcutting. * Stairs in the Quest Guide's House * Tutorial Island Gate works and tutorial completes in Quest Guide's house. * Undoing my shame and just stole the Fishing Competition Gate code... * Swap run to off when switching to the player controls tab. * refactor!: Starting on zone rework - moving logic to Zone.ts !! Breaking change so stay on last commit, future events being reworked currently !! * refactor: Store locs in a packed collection * refactor: Start of computing shared buffer * refactor: Differentiate newly tracked zones * refactor: Zone loc timers * refactor: getZoneLocs with new collection * fix: Hero points uid null check * fix: Tweaked a couple bits on the website * feat: Edit website posts on website directly * fix: Cloudflare IP header * fix: Post preview text alignment * fix: Clarify some details on the website, title SEO * chore: Updated disclaimer footer * feat: Holy Grail quest (#348) * start of grail quest * rest of the grail quest * p_teleport fix and grail fixes * fixes/changes based off main * change round to bitwise OR for the p_teleport fix * move if_close to before p_finduid in death queues * remove extra indent * ci: Add job for running tsc * feat: Adding Dev Container and startup script (#349) * Adding devcontainer * setup * mount * Adding extensions * Update devcontainer.json * feat: Adding a Dev Container and startup script (#1) * feat: Verify client cache checksums * feat: Recreated behavior where loc packs debugname automatically * fix: Renamed walloff opcode to wallwidth * chore: A few official RC loc names When mysterious ruins were converted to multiloc they also came with the original names. These names were removed around the start of 2006. * feat: Use debugname as NPC name if missing * fix: Magic autocast fix (#352) * feat: P_OPNPCT command * fix: require pointers for p_opnpct * fix: magic autocast delay, using manual spells during action delayed * fix: No trigger message for opnpct * fix: continue to autocast after manual casting uses autocast spell --------- Co-authored-by: tannerdino <tannerdino@gmail.com> * feat: patrol mode support + couple fixes (#354) patrol mode support + couple fixes * feat: Random events, and various fixes (#350) * refactor: antimacro npc's in their respective folder * refactor: remove some double ;;'s * feat: macro events timer and enum * refactor: rename anti macro npcs * feat: base line for random event spawning, softtimer for now * fix: playerfollow npc mode faces player now * refactor: each random event gets its own file * refactor: change varp 78 to macro_event * feat: mysterious old man baseline * feat: fail teleports for random events * refactor: remove debug code * feat: mysterious old man random event * feat: genie random event, mysterious old man changes * fix: change random events to normal timer instead of soft * feat: drunken dwarf random event * feat: poison * refactor: rename varp_102 to poison * feat: .npc_delay command * feat: strange plant stats * feat: extra macro event constants * refactor: remove macro_event_spawn label * feat: xp multiplier and maxdealt logic for combats * feat: strange plant * feat: strange plant changes to match osrs * fix: correct genie dialogue * feat: strange fruit * fix: random events delayed when leaving * fix: combat related queues arent called if death queue is active * feat: swarm random event * fix: p2p random events are seperated now * fix: mysterious old man gives casket * refactor: renamed macro event related varps, files, labels, npcs * refactor: renamed some more macro event npcs * refactor: move and rename fishing random events to antimacro.npc * feat: ~player_combat_level and ~macro_event_combat_level * feat: macro event zombie * feat: macro event categories and correct stats * fix: change type for strange plant, finduid checks for each random event * feat: antipoison, and poison fixes * feat: shade macro event * feat: kebab * fix: wrong dialogue for oziach if havent started drag slay * fix: .npc_add sets .active_npc * feat: coord_lineofwalk_radius2 proc * feat: big fish random event * feat: big fish sounds * refactor: change name of strange plant -> triffid * fix: change name of fishing troll to river troll * feat: river troll random event * feat: fishing refactor and whirlpools * fix: remove labels within fishing procs * refactor: renamed and organized macro_gas locs for mining random events * fix: updated genie dialogue * refactor: rename magic spell spot anims * feat: macro gas * feat: rock golem * feat: lost pickaxe random event * feat: dryad random event * feat: ent random event * feat: flying axe head random event * feat: watchman randomevent * feat: poisonous gas random event * fix: rename macro gas for thieving, also check on login and use varp for loc coord * fix: random event wanderrange and maxrange approximations * fix: drop tables for shade and dryad having f2p checks for p2p drops * fix: triffid attacks player properly now * fix: fail safe for spawning multiple npcs that check %macro_event . Macro event labels are turned into procs. Failing random events dont queue anymore * feat: add 3 confirmed teleports * fix: remove macro_even_uid varp. Decided to just make it so no general random events can spawn if ones already spawned * refactor: fixed up the general macro events timer code * feat: trigger spawning general events during various ingame actions * feat: add in proper afk_event checks for each activity * feat: macro_event debug proc and fixed timing for macro events disappearing when it cant find player * fix: change ents to last for 60 ticks instead of 200 * fix: remove debug code --------- Co-authored-by: tannerdino <tannerdino@gmail.com> Co-authored-by: Pazaz <pazaz@itspazaz.com> * fix: Some eslint/tsc issues * ci: Run workflows on normal pushes * misc: Fixes all around, droptables and whatnot (#351) * feat: Scorpions don't drop bones. * feat: `npc_120` (Dwarf) droptable added. fix: Formatting in `man.rs2`. * chore: Clean up a comment. * fix: Correct Watchtower Teleport. * fix: Shantay Pass loc check corrected. * fix: Apothecary no longer worked through charity. * Revert "fix: Correct Watchtower Teleport." This reverts commit d7717fa. * fix: check_spell_requirements returns a boolean * feat: bzip2-wasm, incremental client packing * fix: Disable Jagfile test for now since bzip2-wasm requires top-level await * chore: Officially removed reliance on JagCompress * ci: Validate both client/server caches * feat: Cache readdir in a few places * refactor: Improved pack time * feat: Auto reload on script/config changes * fix: Corrected afkEventReady rate * feat: Auto-generate obj names, some jagex names for dummyitems I think this is how it must've worked - and the CRC still matches! * feat: multiway logic (#355) * fix: missing multiway coord pairs for some floors * fix: uncomment out "Someone else is fighting that." check for opnpc2's * fix: change from allowing singles after 10 ticks of out of combat to 8 ticks of out of combat * feat: singles and multi logic for attacking npcs * feat: npc's attacking the player respecting single combat rules * feat: singles checks for attacking npc's when in combat --------- Co-authored-by: tannerdino <tannerdino@gmail.com> * fix: loc_change not interacting over static loc, jtele command error * feat: Send static obj spawn events * fix: getInventory error * fix: loc_change not always changing collision back after * feat: Misc content. (#356) * feat: Start of clue expansion. * feat: Further work on clues. * feat: Shop keeper in Combat Training Camp. * feat: Combat Training Camp Guards * feat: Dialogue for Roachey in the Fishing Guild. * feat: A lot of OBJ renaming. fix: Ranger Boots now have a level requirement of 40. * feat: Name for `obj_2`, `mcannonball`. * feat: pvp, simplified singles & multi logic (#357) * feat: Witches house quest (#358) * base for ball quest * quest_ball up to experiement fight * last stage + few bug fixes * change house door to not lock inside * change fishingcompo gates to use loc_change, some doors to use new proc * fix: Update lots of broken Loc Del/Loc Add to be Loc Change (#359) * Temporary Alpha disclosure login text * Updated a lot of broken loc_del/loc_add to loc_change. * fix: Member OBJs only spawn in member worlds. (#360) * chore: Renamed visonmap property to minimap (real name) * fix: mining typos (#361) * fix: 'anymore' -> 'any more' when your inventory is too full during mining * fix: proper prospecting message for rune essence --------- Co-authored-by: tannerdino <tannerdino@gmail.com> * feat: dragon fire for dragons and other small fixes (#362) * fix: correct changes for elvarg switching between ap and op. Provided by ash * feat: antipoison and antifire remembered on login? * feat: npc_default_retaliate_ap proc for ap attacking monsters * feat: dragon fire for colored dragons * fix: remove debug messages * feat: elvarg prayer drain * fix: set dragon opplayer2 to default attack * refactor: added a comment for elvarg kill credit --------- Co-authored-by: tannerdino <tannerdino@gmail.com> * feat: added poison_severity params for npc's that poison (#363) Co-authored-by: tannerdino <tannerdino@gmail.com> * feat: Murder mystery quest (#364) * totem changes and start of murder mystery * fingerprints and thread proof * end of murder mystery quest, some fixes * pungent pot -> flour barrel interaction * couple linebreak fixes: * feat: mage arena and slight magic combat rewrite (#365) * feat: sparkling pool * chore: rename some mage arena npc's * feat: kolodion dialogue * feat: armour and weapons check for mage arena * refactor: rename mage arena npc's * feat: mage arena boss first stage * feat: Random events, and various fixes (#350) * refactor: antimacro npc's in their respective folder * refactor: remove some double ;;'s * feat: macro events timer and enum * refactor: rename anti macro npcs * feat: base line for random event spawning, softtimer for now * fix: playerfollow npc mode faces player now * refactor: each random event gets its own file * refactor: change varp 78 to macro_event * feat: mysterious old man baseline * feat: fail teleports for random events * refactor: remove debug code * feat: mysterious old man random event * feat: genie random event, mysterious old man changes * fix: change random events to normal timer instead of soft * feat: drunken dwarf random event * feat: poison * refactor: rename varp_102 to poison * feat: .npc_delay command * feat: strange plant stats * feat: extra macro event constants * refactor: remove macro_event_spawn label * feat: xp multiplier and maxdealt logic for combats * feat: strange plant * feat: strange plant changes to match osrs * fix: correct genie dialogue * feat: strange fruit * fix: random events delayed when leaving * fix: combat related queues arent called if death queue is active * feat: swarm random event * fix: p2p random events are seperated now * fix: mysterious old man gives casket * refactor: renamed macro event related varps, files, labels, npcs * refactor: renamed some more macro event npcs * refactor: move and rename fishing random events to antimacro.npc * feat: ~player_combat_level and ~macro_event_combat_level * feat: macro event zombie * feat: macro event categories and correct stats * fix: change type for strange plant, finduid checks for each random event * feat: antipoison, and poison fixes * feat: shade macro event * feat: kebab * fix: wrong dialogue for oziach if havent started drag slay * fix: .npc_add sets .active_npc * feat: coord_lineofwalk_radius2 proc * feat: big fish random event * feat: big fish sounds * refactor: change name of strange plant -> triffid * fix: change name of fishing troll to river troll * feat: river troll random event * feat: fishing refactor and whirlpools * fix: remove labels within fishing procs * refactor: renamed and organized macro_gas locs for mining random events * fix: updated genie dialogue * refactor: rename magic spell spot anims * feat: macro gas * feat: rock golem * feat: lost pickaxe random event * feat: dryad random event * feat: ent random event * feat: flying axe head random event * feat: watchman randomevent * feat: poisonous gas random event * fix: rename macro gas for thieving, also check on login and use varp for loc coord * fix: random event wanderrange and maxrange approximations * fix: drop tables for shade and dryad having f2p checks for p2p drops * fix: triffid attacks player properly now * fix: fail safe for spawning multiple npcs that check %macro_event . Macro event labels are turned into procs. Failing random events dont queue anymore * feat: add 3 confirmed teleports * fix: remove macro_even_uid varp. Decided to just make it so no general random events can spawn if ones already spawned * refactor: fixed up the general macro events timer code * feat: trigger spawning general events during various ingame actions * feat: add in proper afk_event checks for each activity * feat: macro_event debug proc and fixed timing for macro events disappearing when it cant find player * fix: change ents to last for 60 ticks instead of 200 * fix: remove debug code --------- Co-authored-by: tannerdino <tannerdino@gmail.com> Co-authored-by: Pazaz <pazaz@itspazaz.com> * feat: multiway logic (#355) * fix: missing multiway coord pairs for some floors * fix: uncomment out "Someone else is fighting that." check for opnpc2's * fix: change from allowing singles after 10 ticks of out of combat to 8 ticks of out of combat * feat: singles and multi logic for attacking npcs * feat: npc's attacking the player respecting single combat rules * feat: singles checks for attacking npc's when in combat --------- Co-authored-by: tannerdino <tannerdino@gmail.com> * feat: pvp, simplified singles & multi logic (#357) * chore: rename more mage arena npcs * fix: Magic autocast fix (#352) * feat: P_OPNPCT command * fix: require pointers for p_opnpct * fix: magic autocast delay, using manual spells during action delayed * fix: No trigger message for opnpct * fix: continue to autocast after manual casting uses autocast spell --------- Co-authored-by: tannerdino <tannerdino@gmail.com> * fix: pass check for check spell requirements * feat: kolodion stage 2 * feat: all kolodion stages done, sparkling pool fully implimented * feat: chambers, and remaining dialogue * feat: returning to boss at different stages * feat: coord pairs for mage arena, delete boss duplicates when starting mage arena * feat: mage arena spells * fix: final stage timing fixes and battle mages * feat: charge spell * feat: prevent non magic attacks in the arena. Prevent attacking boss stages not assigned to you * feat: change ai_queue1 for mage arena npc's to retaliate with ap * chore: rename mage arena npc's and obj's * feat: lose god cape on death and drop * feat: god spell debuffs * feat: rewrite pvp magic combat * feat: pvm magic rewrite * fix: adjust coord for ethereal spawn --------- Co-authored-by: tannerdino <tannerdino@gmail.com> Co-authored-by: Pazaz <pazaz@itspazaz.com> * fix: Moving zone rework to feature branch, reverted code in this branch --------- Co-authored-by: Jordan <personal.jordanabraham@gmail.com> Co-authored-by: FlenarnTemp <68670981+FlenarnTemp@users.noreply.github.com> Co-authored-by: boogie-nights <54244688+boogie-nights@users.noreply.github.com> Co-authored-by: Indio <144697121+Indio3@users.noreply.github.com> Co-authored-by: Eric Bartusch <ericbartusch8@gmail.com> Co-authored-by: tannerdino <61213166+tannerdino@users.noreply.github.com> Co-authored-by: tannerdino <tannerdino@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds a couple of fixes to the previous tutorial island PR as well as the Master Chef and Quest Guide portions of it. I've also linked more sources in the tutorial.rs2 file.
Fixes:
New Additions: