mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-22 12:47:46 +00:00
Code Activity
1103 commits 4 branches 2 tags 22 MiB
Commit graph

59 commits

Author SHA1 Message Date
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
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
Filip Maj
495bdf4ba6 Added Hearing Confessions. 2022-02-24 02:16:28 -05:00
Filip Maj
b46160763c Finished In the Name of Science 2022-02-24 01:34:26 -05:00
Filip Maj
3393eb4c9d Trading Tongueflaps is done! 2022-02-24 00:54:03 -05:00
Filip Maj
7de153dde1 Fixed markers in etc3u0 2022-02-24 00:03:16 -05:00
Filip Maj
0faa056589 Added A Call to Arms. Fixed up Seeking the Seers. 2022-02-24 00:00:58 -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
8c70d0ddb6 - man0u0 : Updated script to work with the recent changes in how quest data is requested. 2022-02-20 23:32:47 -05:00
CuriousJorge
d2e814b4ee Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system 2022-02-20 23:05:49 -05:00
Filip Maj
0cdeb5d9ac Got tutorial quests working again. Integrated Jorges DftSea work, thanks! 2022-02-20 23:03:16 -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
CuriousJorge
d06152be07 Commiting more work before merging in another branch. 
- DftFst - More actors added
- Trl0g1/Trl0l1 - Removed a stray ] causing the script to not function.
 2022-02-20 22:54:31 -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
CuriousJorge
696d355ae9 Commit work on DftFst before merging in some fixes unrelated issues. 2022-02-20 21:32:43 -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
306f4ef346 Got aetheryte map and completed quest work values... working. 2022-02-19 01:17:50 -05:00
CuriousJorge
7e5ca6e013 Added Foundation Day 2012 actors to DftWil for now just so they can talk. 
Added a Chocobo to it also that we already had spawned, unsure if authentic or not, added a comment reflecting that.
Cleaned up more orphaned scripts from Wil region.
 2022-02-17 20:03:15 -05:00
Filip Maj
02cb0a3f43 Refactored quest state system seems to work! 2022-02-17 13:22:18 -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
1523ae200b Finished quest state system idea 2022-02-16 15:32:54 -05:00
Filip Maj
cfe6ef2e5e Merge branch 'Jorge/quest_system' into ioncannon/quest_system 2022-02-13 18:57:08 -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
acf953e909 DftFst: Added a param handling to Kinnison on DftFst since it'd crash the client otherwise. 
Etc3g0: Polished up the script, made it as authentic to retail as I could get it barring reward hand-out and starting the quest
Etc5g0: Ported the quest over from the old scripting setup.
Man0u1: Still very early wip.
 2022-02-10 19:35:04 -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
e6d5d5a530 Merge branch 'ioncannon/quest_system' of https://bitbucket.org/Ioncannon/project-meteor-server into Jorge/quest_system 2022-02-06 20:40:25 -05:00
Filip Maj
335efcc81e Fixed Quest ENPC bug and converted over Man0l1 2022-02-06 20:08:53 -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
CuriousJorge
68a2685cf1 Man0u0 wip progress. 2022-02-06 12:36:15 -05:00