Commit Graph
44 Commits
Author SHA1 Message Date
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
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
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
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
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
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
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
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
CuriousJorge 594e08f990 Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system 2022-02-20 15:10:49 -05:00
CuriousJorge 89287844f7 Player.lua - Added fallback for second half of the man0u0 tutorial to get an onNotice kicked, so it can eventually handle it and resume gameplay from a disconnect. 2022-02-20 15:06:17 -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
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
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
CuriousJorge 0465bf6b8d Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system 2022-02-06 23:18:59 -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
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
CuriousJorge 2cbb48621b Merge branch 'ioncannon/quest_system' into Jorge/quest_system 2022-02-05 18:26:03 -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
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
CuriousJorge 6e1f13d17a Merged in CuriousJorge/ffxiv-classic-server/dev_local (pull request #72)
Approved-by: Elise <[email protected]>
Approved-by: Filip Maj <[email protected]>
2020-10-03 16:41:40 +00: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
CuriousJorge 8ddcd24704 Merged Ioncannon/project-meteor-server:develop into master 2020-09-25 16:19:02 -04:00
CuriousJorge f30360f245 Merged in CuriousJorge/ffxiv-classic-server/develop (pull request #50)
Actor script fixes, documented populace classes and misc things

Approved-by: Filip Maj <[email protected]>
2018-02-08 18:00:47 +00:00
CuriousJorge 359ea8a40e Actor script fixes, documented populace classes and misc things
Base
        - gcseals.lua
            Helper functions for GC seals.  Tables the seal caps per rank and checks against it when adding seals.

    Commands
        - PartyTargetCommand.lua :
            Handles markers above head.  Basic documentation, only works on self. "Heart" doesn't work, client bug?
            Eventually will need an object in the party class to handle tracking marked players/targets for the group.

    Class Scripts
        - PopulaceCaravanAdviser.lua
            Documented.  Can purchase gysahl greens from them, unsure what else their use is.
        - PopulaceCaravanGuide.lua
            Documented the Caravan Guide NPC, who escorts the chocobos with you.
        - PopulaceCaravanManager.lua
            NPC who handles signing up for Caravan escort, among other functions.
        - PopulaceSpecialEventCryer.lua
            Covers three NPCs for the Foundation Event.  They handle trading specific items in exchange for GC seals.

    Unique ID Script fixes
        - flame_private_sisimuza_tetemuza.lua
            Foundation Event NPC functions laid out.
        - flame_sergeant_mimio_mio.lua
            Foundation Event NPC functions laid out.
        - serpent_lieutenant_marette.lua
            Foundation Event NPC functions laid out.
        - serpent_private_tristelle.lua
            Foundation Event NPC functions laid out.
        - serpent_sergeant_frilaix.lua
            Foundation Event NPC functions laid out.
        - serpent_sergeant_nelhah.lua
            Removed unique script. PopulaceSpecialEventCryer handles it.
        - ansgor.lua
            Had incorrect defaultTalk value
        - ne_of_eshtaimes.lua
            Door @ !warp 209 -139 206.113 195   Had incorrect mapObj value.
2017-12-13 15:09:10 -05:00
CuriousJorge 4323eb5385 Merged in CuriousJorge/ffxiv-classic-server/develop (pull request #49)
Inventory fixes + Scripts added

Approved-by: Filip Maj <[email protected]>
2017-10-10 14:14:08 +00:00
CuriousJorge 324ebab2d2 Inventory.cs - GetItemQuantity() added
- AddItem functions to cast INV_ERROR to INT for LUA
             - Fixed unique item check.  It was checking for Rare flag, not EX

Scripts :
        Base
            - shop.lua  : Functions for buying/selling from a variety of shop scripts

        Commands
            - EmoteStandardCommand.lua fixed not being able to use emotes when sitting
            - DiceCommand.lua fixed.  No arguments sets default value of 100 as per the ingame description.
                                      Max value raised from 999 to 1000.

        GM Commands
            - speed.lua fixed when using single argument
            - nudge.lua fixed sanitizing.  Made arguments reversible to allow !nudge up 10 & !nudge 10 up
            - giveitem.lua added inv_error handling.  Need to do to rest of item commands at some point
            - givecurrency.lua changed to have you enter a regex'd name of item rather than item ID.
                               Eg. "!givecurrency fire_crystal 10". Added inv_error handling to it.
            - warpplayer.lua added.  Moves yourself to name of player, or moves first player to second player
            - warpid.lua added. For warping to the first instance of an actor's uniqueId the server comes across.
            - quest.lua added.  For adding/adjusting quests for debugging them.

        Class Scripts
            - PopulaceBlackMarketeer.lua updated to utilize shop.lua
            - PopulaceShopSalesman.lua updated to utilize shop.lua
            - PopulaceCompanyShop.lua updated to utilize shop.lua
            - PopulaceCompanyBuffer.lua added and documented along with menu layout.  Needs working status effect to finish.
            - PopulaceCompanyGLPublisher.lua added.  Mostly documented, barely functional.
            - PopulaceCompanyGuide.lua added. Documented, fully functional.
            - PopulaceCompanyOfficer.lua added. Documented.  Menus work.  Needs GC rank table at some point
                                                for documenting GC ranks/seal caps.
            - PopulaceCompanySupply.lua added and mostly documented.  Read-only basic menu flow, static LUA tables
                                         used to set it up, will need SQL tables at some point to replace them with.
                                         Some guesswork on what menus show since no video reference could be found.
            - PopulaceGuildShop.lua updated. Mostly documented.  Read-only shop menus.
2017-10-09 23:40:38 -04:00
CuriousJorge 5ccc2435b0 Merged Ioncannon/ffxiv-classic-server into master 2017-10-09 21:11:07 -04:00
CuriousJorge fdf30b4615 Merged in CuriousJorge/ffxiv-classic-server/develop (pull request #45)
Applying bugfix from Master to Develop.
2017-06-15 01:59:00 +00:00
CuriousJorge cfb3a473c1 Applying bugfix from Master to Develop.
Fixes the issue where actors are spawning in with default movement speed instead of their current.
2017-06-06 17:33:02 -04:00
CuriousJorge 3d4bf3465b Merged in CuriousJorge/ffxiv-classic-server/develop (pull request #41)
"Seeing the Seers" quest etc3g0 scripted + minor fixes
2017-04-09 15:32:54 +00:00
CuriousJorge 3145ec5663 "Seeing the Seers" quest etc3g0 scripted, no reward handling currently. Requires actor "Nellaure" (http://ffxiv.gamerescape.com/w/index.php?title=Nellaure) to be added in. Hangs out in back-right corner of Carpenter's Guild.
Added a quest completion check to etc5g0.lua to prevent it showing "!" on quest-givers' head when you've cleared the quest already.
Fixed regression on select GM commands, !warp instant-warps within same zone again, !mypos reports to the thousandths place, !speed command works with one argument again.
2017-04-05 18:39:04 -04:00
CuriousJorge 4f48643c5c Limsa/Gridania NPC fixed scripts. Scripts still needed for Aubrenard & Gridania Aetheryte.
Some required changes to the database:

Task Board - Change 1200195 in gamedata_actor_class to /Chara/Npc/Object/TaskBoard
Serpent_Private_White - Change 1500324 in gamedata_actor_class to /Chara/Npc/Populace/PopulaceCompanyWarp
Beaudonet - Adjust 1001708 in gamedata_actor_class.  There is a linebreak in there causing problems
2016-08-17 23:27:31 -04:00