1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-22 12:47:46 +00:00
Commit graph

127 commits

Author SHA1 Message Date
Filip Maj
16c62a08d8 Added missing npcs 2022-04-15 12:34:07 -04:00
Filip Maj
6cb107870f Merged dbs 2022-04-13 21:43:43 -04:00
Filip Maj
9a2f8ef89a Merge branch 'Jorge/quest_system' into ioncannon/quest_system 2022-04-13 20:12:38 -04:00
Filip Maj
5c0d2c1d7f Fixed up some lua scripts. Fleshed out the dream stuff for Hildie quests. NOTE: Finish player.lua as it has pseudo code. 2022-04-13 20:03:46 -04:00
CuriousJorge
a7b1b79461 Hildibrand series of quests all in. Requires inn dream handling and some retail accuracy double-checking to finish it off. Misc script fixes also.
===============================
Nudgenpc.lua    - Added a command variation
Testmapobj.lua - Added !help documentation
DftWil.lua            - Corrected an npc name/function
Player.cs             - Changed Dalamud packet to default to 7, not 0.  Fixes the moon not displaying in a specific Hildibrand cutscene
Etc5g0.lua          - Made quest accepting retail-accurate with how it displayed messages/ended the TalkEvent
Etc5g1.lua          - Added Bed !.  Kinda kludged in atm since it's a pre-accepted quest state.
Etc5u1.lua          - Same as above
Etc5l1.lua           - Quest "Private Eyes" scripted.
Etc5l2.lua           - Quest "Mysteries of the Red Moon" scripted
Etc5l3.lua           - Quest "Prophecy Inspection" scripted
2022-04-13 11:45:49 -04:00
Filip Maj
c3b4735cc5 Added missing dialog to some npcs in Legends Adrift. Finished Never Shall the Twain Meet. 2022-04-12 01:07:17 -04:00
Filip Maj
ac22637b4f Got Fade to White 99% scripted out. Got Path Companion data all setup and saving/loading. Fixed the BgKeepouts and they properly show their msgs. Added quests to MarketEntrances. Fixed MarketEntrances. Hooked cutscene book to the Patch Companion you use. 2022-04-12 01:06:12 -04:00
CuriousJorge
01d05b5cee Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system 2022-04-03 01:14:13 -04:00
CuriousJorge
d50bfef2e5 Minor script revision + new quest
warp.lua - Switched to warp type 0x16 for flipping between city zones.  Zero gameplay interruption with this type.
etc5u1 - Added in a spawn location for privateArea
etc5g1 - Scripted, aside from the means of accepting the quest which requires special handling to trigger the intro CS for it.
2022-04-03 00:57:24 -04:00
Filip Maj
a5a039ce3d Added the other two Shposhae quests; A Slippery Stone and Cutthroat Prices. Also modified the PopFlyingShip script to move the quest along. 2022-04-02 13:34:32 -04:00
Filip Maj
514610f006 Minor fix to Call of Booty. 2022-04-02 12:47:19 -04:00
Filip Maj
159242068d Added Call of Booty ( ͡° ͜ʖ ͡°) 2022-04-02 12:45:53 -04:00
Filip Maj
a6ee42094c Finished 'What a Pirate Wants' (lol what a Pirate Needs, what a Pirate, whatever keeps rum in my arms and I'm thanking you for giving it to me.) 2022-04-02 12:26:18 -04:00
Filip Maj
6bbe272d48 Added a buttload of side quests. This should mean all talky quests and 'kill x things' quests are done. Also updated the attention messages as they were using the wrong one for getting items or killing mobs. Fixed some journal issues on various quests as well. 2022-04-02 11:52:32 -04:00
Filip Maj
938cca0298 Added An Inconvenient Dodo and Besmitten and Besmirched. 2022-03-30 00:59:56 -04:00
Filip Maj
e53e54b4bf Fixed more quests 2022-03-30 00:17:59 -04:00
Filip Maj
f6ff56299f Fixed up some more quests! 2022-03-29 23:56:08 -04:00
Filip Maj
a1bb84e80d Fixed up Food for Thought (emotes work now) and Have You Seen my Son (bnpc works). 2022-03-29 22:57:02 -04:00
Filip Maj
4d2c80a8ee testbnpckill was missing it's extension 2022-03-29 22:01:03 -04:00
Filip Maj
c2169576c2 Fixed Til Death Do Us Part and Beryl Overboard so that the proper attention msgs appear. Also added missing params to the funcs defining the objective quantity. 2022-03-29 22:00:18 -04:00
Filip Maj
4d424e57f9 Adding the rest of the wld quests: Sanguine Studies, Secrets Unearthed, and Rustproof. 2022-03-29 21:19:35 -04:00
CuriousJorge
4494b30285 Quest fixes
Etc5u1 & Etc5g1 - Added handling for the Ul'dah Inn NPC to re-issue an item as needed, otherwise play his other dialog.
Music - Made it play current zone's music if no id present.
2022-03-16 18:52:02 -04:00
CuriousJorge
74713f3dd6 Misc GM command fixes + ChangeJobCommand.lua
Anim - Cleaned up some.  It had old code sitting in it for whatever reason despite not affecting anything.
Setstate, Warpplayer & Yolo - Fixed them up so they function again
ChangeJobCommand - Just the script filled out to handle the equipping/dequipping of job stones, but it can cause issues, particularly with how the server handles a 'job' vs. a class, along with checking against skill compatibility.
2022-03-13 20:35:29 -04:00
CuriousJorge
b08827568c Chocobo stuff:
PopulaceChocoboLender - Made rental time 10 minutes again (as retail had it).  Added Vesper Bay NPC's rental location as close as I could get it from a blurry source.
ChocoboRideCommand - Fixed the method used to pull a zone's music so the script doesn't fail.
2022-03-13 18:26:20 -04:00
CuriousJorge
b34f214e67 Quests + Minor fixes
MarketEntrance - Adjusted events parameter so it works again
Warp - Added shortcut for switching between a given town's zones so I can stop having to look up the right zone id
Weather - Added shortcut for weather ids to +8000 to the value if the're within a certain range.
DftSea - Inn NPC check
etc5u0 - Used a constant in place of a value, updated a constant's name.
etc5l0 -  Fully scripted.
etc5u1 - Mostly scripted.  Requires Dream handling and privArea + NPC placement.
etc5g1 - Mostly scripted.  Requires Dream handling and privArea + NPC placement.
2022-03-13 17:45:10 -04:00
CuriousJorge
e94c037fb5 Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system
# Conflicts:
#	Data/scripts/commands/EmoteSitCommand.lua  - Resolved using Theirs
2022-03-11 19:21:42 -05:00
Filip Maj
65ee91e49c Finished Treasures of the Main and Legends Adrift. Fixed quests appearing in private areas (echos). Fixed other bugs. Implemented NPC Linkshells. Added more options to nudge command. Added nudgenpc command. Added testbnpckill command. 2022-03-11 02:17:46 -05:00
CuriousJorge
01ec313ffb DftFst.lua - about as documented as I can get it for now. Will finalize some NPC argument checks next time.
quest.lua - Script refactored.  Moved as much as possible out of the main function to tidy it up.  Folded in a complete-quest function from another script.  Only works with quest id numbers for now.  String support (eg. Man0u0) to come in another commit.
ObjectInnDoor.lua - Fixed it to handle events again with the current system.
2022-03-09 22:23:10 -05:00
Filip Maj
ebba56602c Removed automatic Left Instance msg, as it only happens when running out of a PrivateArea_Exit. More M0l1 work. 2022-03-05 01:28:28 -05:00
Filip Maj
49c6fdbd51 Added functionality to handle NPC LSes in quests. Linked the rest of the sequences up for Man0l1. 2022-03-05 01:02:41 -05:00
CuriousJorge
08557f41fb Minor fixes
- InstanceRaid Guide : Added DefaultTalk handling for the npcs we have currently.  Included a couple commented-out client functions for two of the raids.
- EmoteSitCommand : Added eventType to the function so sitting on environment objects works again.
- Man0u0 : SourceTree added hunk-change garbage during a conflict resolving during the last merge. I just replaced it with the raw of that commit so it matches what it should have been.
- DftFst : Added the Gridania InstanceRaidGuide NPCs to the list for documentation sake, even though it'd never be called from that script with how things are currently set up.
2022-03-04 23:12:28 -05:00
Filip Maj
a618e69dbd Fixed args on commands due to triggername becoming eventType and eventName 2022-03-04 22:55:30 -05:00
CuriousJorge
02fe9e070d Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system
# Conflicts:
#	Data/scripts/commands/EmoteStandardCommand.lua
#	Data/scripts/quests/man/man0g0.lua
#	Data/scripts/quests/man/man0g1.lua
#	Data/scripts/quests/man/man0u0.lua

Resolved using Theirs.
2022-03-04 21:04:17 -05:00
Filip Maj
bf20993e58 Finished sequences 55, 60, 65 for Treasures of the Main. 2022-03-04 20:33:02 -05:00
Filip Maj
2817560217 Got the emote sequence for Treasures of the Main working. Got the duty started but there are issues on zoning. 2022-03-04 02:20:56 -05:00
Filip Maj
765cf194c5 Removed more dead scripts. Exported missing sql files. 2022-03-03 23:33:55 -05:00
Filip Maj
b57f91470a Deleting more useless scripts. Moved all the elevator scripts into 1 base script. 2022-03-03 20:03:36 -05:00
Filip Maj
2cb6a9f6bd Added back loading defaulttalk npcs through script. Should speed up warps now! Added loading mapobj ifno through a db table, removing the need for unique scripts. Deleted ported mapobj scripts. 2022-03-03 19:34:33 -05:00
Filip Maj
b773098abf Added the PGL200 quest The House Always Wins. Fixed quest instances not being set on spawn. Fixed PrivateAreaPast. Added You have left the instance messages when leaving a PrivateArea. Fixed EmoteEvents. DefaultTalk has been disabled temporarily to speed up warps. 2022-03-03 01:59:13 -05:00
Filip Maj
f491c63b98 The journal update msg shows even when completing quests now. Added Revenge on the Reavers, Till Death Do Us Part, Beryl Overboard, Have You Seen My Son, and Food for Thought. 2022-03-01 14:29:59 -05:00
CuriousJorge
023527efa3 Further work on DefaultTalks
- DftFst - Every uniqueId script covered from the previous system.  Still a lot of functions to still map and actors to pose & position for them.
- AfterQuestWarpDirector - Added Man0g1 as a check.
- Nuked PopulaceStandard uId scripts for Forest region since unneeded now.
2022-02-26 23:15:20 -05:00
Filip Maj
96f9119cca Fixed Waste Not Want Not now that the quest system is final. 2022-02-24 22:59:06 -05:00
Filip Maj
f84899ff2e Added Assessin the Damage 2022-02-24 22:48:55 -05:00
CuriousJorge
a87244d13b - man0g0 - Majority of the work ported from the old quest system. Still polish to be had and fringe cases to deal with (especially relogging)
- man0g1 - Initial privateArea mostly scripted.
- SimpleContent30010 - Fixed Yda/Papalymo Id being backwards, added Active states to match retail
- QuestDirectorMan0g001-  Updated to play itself out (this is a mess to wrap my head around).  Mostly sorta kinda working on both DoW & DoM tutorials.  End cutscene on DoW not firing currently, will fix later.
2022-02-24 22:24:08 -05:00
Filip Maj
c5198783a1 Adding Sleepless in Eorzea, Bridging the Gap, and The Search for Sicksa. 2022-02-24 20:31:05 -05:00
Filip Maj
b9ab842fdd Added Spores on the Brain 2022-02-24 19:31:32 -05:00
Filip Maj
e8ee907477 Added A Bitter Oil to Swallow 2022-02-24 19:23:11 -05:00
Filip Maj
b4227cdc44 Added Sour Grapes 2022-02-24 19:07:09 -05:00
Filip Maj
59f4e4bbd5 Fixed bug in Hearing Confessions. Added Letting Out Orions Belt and Sniff Out a Profit. The former still needs the correct attention message though when talking to a NPC. 2022-02-24 18:46:55 -05:00
Filip Maj
c9f18f5415 Added Of Archons and Muses 2022-02-24 12:40:59 -05:00