Commit Graph

36 Commits

Author SHA1 Message Date
CuriousJorge
01d05b5cee Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system 2022-04-03 01:14:13 -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
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
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
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
02cb0a3f43 Refactored quest state system seems to work! 2022-02-17 13:22:18 -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
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
68a2685cf1 Man0u0 wip progress. 2022-02-06 12:36:15 -05:00
CuriousJorge
2cbb48621b Merge branch 'ioncannon/quest_system' into Jorge/quest_system 2022-02-05 18:26:03 -05:00
Filip Maj
8d647ae6b0 This script was missing for some reason 2022-02-05 18:17:14 -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
Filip Maj
563118372a Refactored how zones work. Cleaned out a lot of duplciations and smoothed out how Zones/PrivateAreas work. 2022-02-05 14:05:32 -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
ff074c8394 Bunch of shop scripts added (by Jorge) 2022-01-29 10:01:31 -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
CuriousJorge
bbf49123b6 Follow-up to prior commit with script changes I forgot to commit. 2020-09-25 18:23:09 -04:00
CuriousJorge
48d996bd4f SetPushEventConditionWithTriggerBox & EventList.cs - Made changes to PushBoxEventCondition so it can function ingame if provided the correct parameters in the eventConditions in the gamedata_actor_class SQL. These are used for the Market Wards entrances in each city
MarketEntrance.lua       - Script mostly laid out and documented.  Some debugging info left in while various warp locations and PrivateAreas still need finishing up.

CraftCommand.lua  - WIP on crafting menu + minigame.  Menu flow worked out for the most part, it's just a matter of plugging in various data for them to replace the debugging values I set currently.
DummyCommand.lua - WIP on Mining minigame.  Still lots missing but it's a start.  Cannot use mining nodes ingame currently without modifying KickEventPacket.cs

Removed orphaned individual ShopSalesman scripts since their info was tabled into a single script awhile back.
2020-09-25 18:15:54 -04:00
Filip Maj
47a2eddaf0 Adding NPCs in fields from captures. Updated Shop script.
The captures we have are full of npcs that were never imported; finally did so. Updated shop script with Jorge's work.
2020-03-15 01:05:43 -04:00
Filip Maj
42f0046ee7 Reimplemented dream packets. Fixed instance update bug that was locking up client when waking up. When going to sleep the proper position is saved. Still need to handle if the player logs out in the inn vs sleeping. 2019-07-27 21:55:07 -04:00
Filip Maj
02e41f6103 Bugfix. 2019-07-25 19:51:11 -04:00
Filip Maj
b627ecf0fe Finished filling out lua script for rentals/summons/new chocos. 2019-07-25 19:46:05 -04:00
Filip Maj
91549bff7a Updated Map Server namespace. Moved all other data folders (www and sql) to data folder. Renamed boot name to Project Meteor. 2019-06-19 01:10:15 -04:00