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

59 commits

Author SHA1 Message Date
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
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
4d2c80a8ee testbnpckill was missing it's extension 2022-03-29 22:01:03 -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
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
765cf194c5 Removed more dead scripts. Exported missing sql files. 2022-03-03 23:33:55 -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
90115f7c83 Added Tug of the Whorl. Fixed up prereqs not working when using debug command. Fixed giveexp command. Added seq constants. 2022-02-23 23:10:11 -05:00
CuriousJorge
682ddd9cae - Fixed !anim targeting the incorrect actor.
- Etc5u0 scripted start to finish.  Ul'dah Inn quest.
- DftWil - Added quest checks to the Inn NPCs.
- DfFst - Commiting what's been done thus far.  fst0Town01 zone nearly done.  Still have 100 something fst0Town01a & field npcs to add.
- Removed some fst0Town01 uniqueId scripts
2022-02-23 20:52:25 -05:00
CuriousJorge
fac8f269e7 Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system
# Conflicts:
#	Data/scripts/player.lua  - Resolved.  Using theirs.
2022-02-20 22:57:01 -05:00
Filip Maj
0b67f8e436 Fixed bugs and edited scripts causing the limsa intro to fail. 2022-02-20 22:40:35 -05:00
CuriousJorge
7fea45e1f8 Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system 2022-02-20 21:33:50 -05:00
Filip Maj
bbbab356af Fixed a bunch of bugs Jorge found. Readded tutorial quests back. 2022-02-20 21:30:09 -05:00
CuriousJorge
594e08f990 Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system 2022-02-20 15:10:49 -05:00
Filip Maj
25f1b0fd95 Added debug script for setting quest completion 2022-02-20 12:39:34 -05:00
Filip Maj
c677479a03 Added completed quest sendback. 2022-02-20 12:06:48 -05:00
CuriousJorge
dc1458c52d - Player.lua - Fixed typo on ClearData() for Ul'dah intro
- DftSea - 96% finished
- DftWil - minor comment addition
- EmoteStandardCommand - Added the new event params so the script functions again
- Mass deletion of all PplStd & PplShopSalesman for La Noscea NPCs.  No longer needed
2022-02-17 02:49:59 -05:00
Filip Maj
cfe6ef2e5e Merge branch 'Jorge/quest_system' into ioncannon/quest_system 2022-02-13 18:57:08 -05:00
Filip Maj
8d5f4465e3 New test gm scripts to help with positioning populace npcs 2022-02-13 18:50:48 -05:00
Filip Maj
214d730a58 Added warp to public and private areas shortcut. Fixed counter printout bug. Fixed some commands. Fixed handling of the chocobo lender at the ferry docks. 2022-02-13 18:48:22 -05:00
CuriousJorge
b6c9825b2d - Man0u0 about as polished as one can get the Talking sections for now, minus some very specific retail quirks that need replicating at some point (all revolving around the starting 15 seconds of the forced tutorial)
- Man0u1 barely started.  Just enough there to get the player out of the PrivateArea and into the public zone.
- All of the old Populace uniqueId scripts for both quests nuked into high orbit.
- DftSea:  Master list of function names and argument counts added to the list.  Will be whittling away at this over the coming week.
- GM Warp: For whatever reason using "" to compare against a nil wasn't working anymore.  Set it to nil instead.
2022-02-13 13:18:20 -05:00
CuriousJorge
4fe8f77887 Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system 2022-02-08 21:41:22 -05:00
CuriousJorge
96cb8070be Man0u0 & Man0u1 work progress.
Man0u0 nearly finished.  Needs some misc. background actors Id'd and placed, and some additional bug-testing.
Man0u1 still very early.  Initial area's actors mostly scripted.
2022-02-08 17:35:29 -05:00
Filip Maj
9f077190a3 Renamed some funcs, and fleshed out a ton on man0l1. Various related things were also added. 2022-02-07 05:13:34 -05:00
CuriousJorge
0465bf6b8d Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system 2022-02-06 23:18:59 -05:00
Filip Maj
0ac53e23ad Fixed warp to allow private areas 2022-02-06 23:17:59 -05:00
CuriousJorge
fb9d4026a5 Merge branch 'ioncannon/quest_system' of https://bitbucket.org/Ioncannon/project-meteor-server into Jorge/quest_system 2022-02-06 14:49:31 -05:00
Filip Maj
8b3431e557 Changed how Quest ENPCs work. They should now automatically update themselves whenever data is update for immediate effect changes. Fixed wrong map qflag value. Fixed quest gm command. Fixed Director actorId clobbering areaMasters. 2022-02-06 12:12:26 -05:00
CuriousJorge
2cbb48621b Merge branch 'ioncannon/quest_system' into Jorge/quest_system 2022-02-05 18:26:03 -05:00
Filip Maj
f374ee3be9 More changes 2022-02-05 18:14:23 -05:00
Filip Maj
37d04344ae Forgot file 2022-02-05 18:01:16 -05:00
Filip Maj
68e55a1c76 Added changes to how zones/areas are accessed in the lua scripts too. 2022-02-05 18:00:09 -05:00
CuriousJorge
4e5a07afa4 Merge branch 'ioncannon/quest_system' into Jorge/quest_system 2022-02-05 14:21:57 -05:00
CuriousJorge
4fc5762d41 Teleport command touch-ups.
PopulaceCompanyWarp made to look more retail authentic.  Can't figure out how to make it not play the 'npc untargeted' sound though like retail.
Music command has second argument for transition type.  Added an overloaded function in Player.cs to support this.
Setappearance adjusted to work again on player targets.
DftWil updated to cover near everything.
Re-added shop-related luas that were removed for some reason.
2022-02-05 13:56:58 -05:00
Filip Maj
3ad30460d8 Removed spawn locations warping. Fixed event packet str len. Fixed some scripts. Fixed doors not working. 2022-02-05 09:55:18 -05:00
CuriousJorge
bad51717c2 Minor script fixes
=============
ChocoboRideCommand - Fixed the mount speed to be retail accurate.
TeleportCommand            - Added anima costs, mount check, and placeholder for Favoured destinations
nudge/spawn/warpid        - Plus 1 to GetPos() arrays
2022-01-28 02:29:45 -05:00
Filip Maj
26fd79bea5 Removed all the unique talk defaults for Wil region (thx Jorge). Got most of man0l0 working with the new system. Fixed nullterm str parsing. 2022-01-27 17:38:15 -05:00
Filip Maj
958a87edf2 Updated Scripts, removed all the old unique ones for the opening quest. 2022-01-25 22:54:44 -05:00