mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 06:27:45 +00:00
Code Activity
6138 commits 10 branches 14 tags 26 MiB
Commit graph

61 commits

Author SHA1 Message Date
Mordred
296dbb9904 GiveQuestRewards is no longer used in quests, but called automatically on finish 2021-12-21 01:05:08 +01:00
Mordred
7e953ad695 Fixed a bug with SubFst001 2021-12-20 02:46:15 +01:00
Mordred
90018d0137 Fixed quest state breaking on zoning, fixed some formatting issues in some quests, more are still messed up though 2021-12-20 00:06:52 +01:00
Mordred
4baf4314d3 onEventItem in scripts can now be implemented 2021-12-17 23:13:27 +01:00
dude22072
454e7506cf Backport quests that dont require onBnpcKill or onEobjHit 2021-12-14 20:51:26 -06:00
Mordred
11b0683e7e Added script generation for onEventItem, event not yet called from the server. 2021-12-15 00:36:41 +01:00
Rushi
9da566f19b Fix formatting and remove unnecessary header 2021-12-01 21:42:54 +01:00
Rushi
763657c435 Update ManWil002 (Close to Home) 2021-12-01 20:42:50 +01:00
Mordred
48ed9da414 Initial commit of Sapphire for FFXIV 3.0 "light rewrite" 2021-11-27 00:53:57 +01:00
Mordred
dceff7eed6 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 
# Conflicts:
#	.appveyor.yml
#	.gitmodules
#	.travis.yml
#	CMakeLists.txt
#	CMakeSettings.json
#	README.md
#	cmake/FindMySQL.cmake
#	cmake/paths.cmake
#	deps/datReader/Dat.cpp
#	deps/datReader/Dat.h
#	deps/datReader/DatCat.cpp
#	deps/datReader/DatCat.h
#	deps/datReader/DatCategories/bg/lgb.h
#	deps/datReader/DatCategories/bg/sgb.h
#	deps/datReader/Exd.cpp
#	deps/datReader/Exd.h
#	deps/datReader/ExdCat.cpp
#	deps/datReader/ExdCat.h
#	deps/datReader/ExdData.cpp
#	deps/datReader/ExdData.h
#	deps/datReader/Exh.cpp
#	deps/datReader/Exh.h
#	deps/datReader/File.cpp
#	deps/datReader/File.h
#	deps/datReader/GameData.cpp
#	deps/datReader/GameData.h
#	deps/datReader/Index.cpp
#	deps/datReader/Index.h
#	deps/datReader/SqPack.cpp
#	deps/datReader/SqPack.h
#	deps/datReader/bparse.cpp
#	deps/datReader/bparse.h
#	deps/datReader/conv.cpp
#	deps/datReader/conv.h
#	deps/datReader/crc32.cpp
#	deps/datReader/crc32.h
#	deps/datReader/stream.cpp
#	deps/datReader/stream.h
#	deps/datReader/zlib.cpp
#	deps/datReader/zlib.h
#	deps/mysqlConnector/Connection.cpp
#	deps/mysqlConnector/Connection.h
#	deps/watchdog/Watchdog.h
#	sql/schema/inserts.sql
#	sql/schema/schema.sql
#	src/api/PlayerMinimal.h
#	src/api/SapphireApi.cpp
#	src/api/main.cpp
#	src/common/Common.h
#	src/common/CommonGen.h
#	src/common/Config/ConfigMgr.cpp
#	src/common/Database/DbCommon.h
#	src/common/Database/DbConnection.cpp
#	src/common/Database/DbWorkerPool.cpp
#	src/common/Exd/ExdDataGenerated.cpp
#	src/common/Exd/ExdDataGenerated.h
#	src/common/Logging/Logger.cpp
#	src/common/Network/CommonActorControl.h
#	src/common/Network/Connection.cpp
#	src/common/Network/Connection.h
#	src/common/Network/PacketDef/Ipcs.h
#	src/common/Network/PacketDef/Zone/ClientZoneDef.h
#	src/common/Network/PacketDef/Zone/ServerZoneDef.h
#	src/common/Util/Util.cpp
#	src/common/Util/UtilMath.cpp
#	src/common/Util/UtilMath.h
#	src/dbm/DbManager.cpp
#	src/dbm/main.cpp
#	src/lobby/Forwards.h
#	src/lobby/GameConnection.cpp
#	src/lobby/GameConnection.h
#	src/lobby/ServerLobby.cpp
#	src/lobby/mainLobbyServer.cpp
#	src/scripts/action/common/ActionSprint3.cpp
#	src/scripts/common/CmnDefCutSceneReplay.cpp
#	src/scripts/common/GilShop.cpp
#	src/scripts/common/aethernet/Aetheryte.cpp
#	src/scripts/common/aethernet/HousingAethernet.cpp
#	src/scripts/common/eobj/HousingEstateEntrance.cpp
#	src/scripts/common/housing/CmnDefHousingSignboard.cpp
#	src/scripts/common/warptaxi/WarpTaxi.cpp
#	src/scripts/instances/questbattles/ChasingShadows.cpp
#	src/scripts/quest/ManFst001.cpp
#	src/scripts/quest/ManFst002.cpp
#	src/scripts/quest/ManFst003.cpp
#	src/scripts/quest/ManFst004.cpp
#	src/scripts/quest/ManFst005.cpp
#	src/scripts/quest/ManSea001.cpp
#	src/scripts/quest/ManSea002.cpp
#	src/scripts/quest/ManSea003.cpp
#	src/scripts/quest/ManWil001.cpp
#	src/scripts/quest/ManWil002.cpp
#	src/scripts/quest/ManWil003.cpp
#	src/scripts/quest/ManWil004.cpp
#	src/scripts/quest/subquest/gridania/SubFst001.cpp
#	src/scripts/quest/subquest/gridania/SubFst002.cpp
#	src/scripts/quest/subquest/gridania/SubFst003.cpp
#	src/scripts/quest/subquest/gridania/SubFst004.cpp
#	src/scripts/quest/subquest/gridania/SubFst005.cpp
#	src/scripts/quest/subquest/gridania/SubFst008.cpp
#	src/scripts/quest/subquest/gridania/SubFst009.cpp
#	src/scripts/quest/subquest/gridania/SubFst010.cpp
#	src/scripts/quest/subquest/gridania/SubFst011.cpp
#	src/scripts/quest/subquest/gridania/SubFst013.cpp
#	src/scripts/quest/subquest/gridania/SubFst014.cpp
#	src/scripts/quest/subquest/gridania/SubFst015.cpp
#	src/scripts/quest/subquest/gridania/SubFst019.cpp
#	src/scripts/quest/subquest/gridania/SubFst026.cpp
#	src/scripts/quest/subquest/gridania/SubFst029.cpp
#	src/scripts/quest/subquest/gridania/SubFst030.cpp
#	src/scripts/quest/subquest/gridania/SubFst034.cpp
#	src/scripts/quest/subquest/gridania/SubFst039.cpp
#	src/scripts/quest/subquest/gridania/SubFst041.cpp
#	src/scripts/quest/subquest/gridania/SubFst045.cpp
#	src/scripts/quest/subquest/limsa/SubSea001.cpp
#	src/scripts/quest/subquest/limsa/SubSea012.cpp
#	src/scripts/quest/subquest/uldah/SubWil000.cpp
#	src/scripts/quest/subquest/uldah/SubWil001.cpp
#	src/scripts/quest/subquest/uldah/SubWil002.cpp
#	src/scripts/quest/subquest/uldah/SubWil004.cpp
#	src/scripts/quest/subquest/uldah/SubWil006.cpp
#	src/scripts/quest/subquest/uldah/SubWil007.cpp
#	src/scripts/quest/subquest/uldah/SubWil018.cpp
#	src/scripts/quest/subquest/uldah/SubWil019.cpp
#	src/scripts/quest/subquest/uldah/SubWil020.cpp
#	src/scripts/quest/subquest/uldah/SubWil021.cpp
#	src/scripts/quest/subquest/uldah/SubWil022.cpp
#	src/scripts/quest/subquest/uldah/SubWil027.cpp
#	src/scripts/quest/subquest/uldah/SubWil028.cpp
#	src/scripts/quest/subquest/uldah/SubWil029.cpp
#	src/tools/action_parse/main.cpp
#	src/tools/discovery_parser/main.cpp
#	src/tools/event_object_parser/instance.tmpl
#	src/tools/event_object_parser/main.cpp
#	src/tools/event_object_parser/questbattle.tmpl
#	src/tools/exd_common_gen/main.cpp
#	src/tools/exd_struct_gen/ExdData.cpp.tmpl
#	src/tools/exd_struct_gen/ExdData.h.tmpl
#	src/tools/exd_struct_gen/main.cpp
#	src/tools/exd_struct_test/main.cpp
#	src/tools/mob_parse/main.cpp
#	src/tools/nav_export/lgb.h
#	src/tools/nav_export/main.cpp
#	src/tools/nav_export/nav/TiledNavmeshGenerator.cpp
#	src/tools/nav_export/navmesh_exporter.h
#	src/tools/nav_export/obj_exporter.h
#	src/tools/pcb_reader/lgb.h
#	src/tools/pcb_reader/main.cpp
#	src/tools/pcb_reader/nav/TiledNavmeshGenerator.cpp
#	src/tools/pcb_reader/navmesh_exporter.h
#	src/tools/pcb_reader/obj_exporter.h
#	src/tools/quest_parser/main.cpp
#	src/tools/questbattle_bruteforce/main.cpp
#	src/world/Action/Action.cpp
#	src/world/Action/Action.h
#	src/world/Action/ActionLut.h
#	src/world/Action/ActionLutData.cpp
#	src/world/Action/EffectBuilder.cpp
#	src/world/Action/EffectBuilder.h
#	src/world/Action/EffectResult.cpp
#	src/world/Action/EffectResult.h
#	src/world/Action/EventAction.cpp
#	src/world/Action/EventAction.h
#	src/world/Action/ItemAction.cpp
#	src/world/Action/ItemAction.h
#	src/world/Actor/Actor.cpp
#	src/world/Actor/Actor.h
#	src/world/Actor/BNpc.cpp
#	src/world/Actor/BNpc.h
#	src/world/Actor/Chara.cpp
#	src/world/Actor/Chara.h
#	src/world/Actor/EventObject.cpp
#	src/world/Actor/EventObject.h
#	src/world/Actor/Npc.cpp
#	src/world/Actor/Npc.h
#	src/world/Actor/Player.cpp
#	src/world/Actor/Player.h
#	src/world/Actor/PlayerEvent.cpp
#	src/world/Actor/PlayerInventory.cpp
#	src/world/Actor/PlayerQuest.cpp
#	src/world/Actor/PlayerSql.cpp
#	src/world/Event/Director.cpp
#	src/world/Event/Director.h
#	src/world/Event/EventHandler.h
#	src/world/ForwardsZone.h
#	src/world/Inventory/HousingItem.cpp
#	src/world/Inventory/HousingItem.h
#	src/world/Inventory/Item.cpp
#	src/world/Inventory/Item.h
#	src/world/Inventory/ItemContainer.cpp
#	src/world/Inventory/ItemContainer.h
#	src/world/Linkshell/Linkshell.h
#	src/world/Manager/ActionMgr.cpp
#	src/world/Manager/ActionMgr.h
#	src/world/Manager/DebugCommandMgr.cpp
#	src/world/Manager/DebugCommandMgr.h
#	src/world/Manager/EventMgr.cpp
#	src/world/Manager/EventMgr.h
#	src/world/Manager/HousingMgr.cpp
#	src/world/Manager/HousingMgr.h
#	src/world/Manager/InventoryMgr.cpp
#	src/world/Manager/InventoryMgr.h
#	src/world/Manager/ItemMgr.cpp
#	src/world/Manager/ItemMgr.h
#	src/world/Manager/LinkshellMgr.cpp
#	src/world/Manager/LinkshellMgr.h
#	src/world/Manager/MarketMgr.cpp
#	src/world/Manager/MarketMgr.h
#	src/world/Manager/NaviMgr.cpp
#	src/world/Manager/NaviMgr.h
#	src/world/Manager/PlayerMgr.cpp
#	src/world/Manager/PlayerMgr.h
#	src/world/Manager/RNGMgr.cpp
#	src/world/Manager/RNGMgr.h
#	src/world/Manager/ShopMgr.cpp
#	src/world/Manager/ShopMgr.h
#	src/world/Manager/TerritoryMgr.cpp
#	src/world/Manager/TerritoryMgr.h
#	src/world/Math/CalcBattle.cpp
#	src/world/Math/CalcStats.cpp
#	src/world/Math/CalcStats.h
#	src/world/Navi/NaviProvider.cpp
#	src/world/Navi/NaviProvider.h
#	src/world/Network/GameConnection.cpp
#	src/world/Network/GameConnection.h
#	src/world/Network/Handlers/ActionHandler.cpp
#	src/world/Network/Handlers/CFHandlers.cpp
#	src/world/Network/Handlers/ClientTriggerHandler.cpp
#	src/world/Network/Handlers/EventHandlers.cpp
#	src/world/Network/Handlers/GMCommandHandlers.cpp
#	src/world/Network/Handlers/InventoryHandler.cpp
#	src/world/Network/Handlers/PacketHandlers.cpp
#	src/world/Network/PacketWrappers/ActorControlSelfPacket.h
#	src/world/Network/PacketWrappers/EffectPacket.h
#	src/world/Network/PacketWrappers/ExaminePacket.h
#	src/world/Network/PacketWrappers/NpcSpawnPacket.h
#	src/world/Network/PacketWrappers/PlayerSetupPacket.h
#	src/world/Network/PacketWrappers/PlayerSpawnPacket.h
#	src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
#	src/world/Script/NativeScriptApi.cpp
#	src/world/Script/NativeScriptApi.h
#	src/world/Script/NativeScriptMgr.cpp
#	src/world/Script/NativeScriptMgr.h
#	src/world/Script/ScriptLoader.cpp
#	src/world/Script/ScriptMgr.cpp
#	src/world/Script/ScriptMgr.h
#	src/world/ServerMgr.cpp
#	src/world/ServerMgr.h
#	src/world/Session.cpp
#	src/world/Session.h
#	src/world/StatusEffect/StatusEffect.cpp
#	src/world/StatusEffect/StatusEffect.h
#	src/world/Territory/Cell.cpp
#	src/world/Territory/House.cpp
#	src/world/Territory/House.h
#	src/world/Territory/Housing/HousingInteriorTerritory.cpp
#	src/world/Territory/Housing/HousingInteriorTerritory.h
#	src/world/Territory/HousingZone.cpp
#	src/world/Territory/HousingZone.h
#	src/world/Territory/InstanceContent.cpp
#	src/world/Territory/InstanceContent.h
#	src/world/Territory/Land.cpp
#	src/world/Territory/Land.h
#	src/world/Territory/QuestBattle.cpp
#	src/world/Territory/QuestBattle.h
#	src/world/Territory/Territory.cpp
#	src/world/Territory/Territory.h
#	src/world/mainGameServer.cpp
 2021-11-22 23:29:45 +01:00
collett
301bd61180 update to 5.55 hotfix 
Co-authored-by: Jeido Uran <tourais.q@gmail.com>
 2021-07-27 07:33:55 +09:00
DantestyleXD
7f7e2fa005 [ Subquests ] SubFst025, SubFst037, SubFst042, SubFst043, SubFst046, SubFst048 added 2020-06-28 03:52:45 +02:00
DantestyleXD
535b9f55b7 [ Subquests ] SubFst026 and SubFst041 adjust 2020-06-28 03:23:22 +02:00
DantestyleXD
acc2c18c95 [ Subquests ] SubFst002, SubFst008, SubFst011, SubFst014 adjust - SubFst008 and SubFst021 add 2020-06-28 03:19:22 +02:00
DantestyleXD
5f99c481d1 move to a better folder 2020-06-28 01:33:19 +02:00
DantestyleXD
9aaa58dada [ Class Quest ] ClsArc006 is Fixed ( Will need a revision ) 2020-06-20 03:25:22 +02:00
DantestyleXD
7c00f1ae7f [ Class Quest ] ClsArc005 is Fixed ( Will need a revision ) 2020-06-20 03:24:54 +02:00
DantestyleXD
16bf0f822c [ Class Quest ] ClsArc004 is Fixed ( Will need a revision ) 2020-06-20 03:24:20 +02:00
DantestyleXD
8b038147b4 [ Class Quest ] ClsArc003 is Fixed (Will need a revision) 2020-06-20 03:23:48 +02:00
DantestyleXD
a12e8e9656 [ Class Quest ] ClsArc002 is Fixed 2020-06-20 02:20:22 +02:00
DantestyleXD
92e0935ff2 [ Class Quest ] ClsArc001 fixed 2020-06-20 02:13:09 +02:00
DantestyleXD
928e029480 [ Class Quest ] ClsArc000 fixed 2020-06-20 02:11:20 +02:00
NotAdam
894c1016af fix quest_parser to use new service locator 2020-03-01 11:58:26 +11:00
NotAdam
ca102697f4 move to new service locator 2020-03-01 11:58:26 +11:00
NotAdam
a70f381e68 fix some warnings & world shouldn't crash when warming up object cache 2020-01-11 18:20:06 +11:00
Mordred
13ce1b47d0 QuestBattles can now be started from scripts, see ManFst005 2019-04-11 00:16:04 +02:00
Mordred
cfd4352ff6 QuestBattles can now be started from scripts, see ManFst005 2019-04-11 00:16:04 +02:00
Mordred
022cf1d439 Added two more gridania main story quests 2019-04-10 23:49:50 +02:00
Mordred
1f51299ccf Added two more gridania main story quests 2019-04-10 23:49:50 +02:00
Mordred
4fd49a1dae Show svent on questbattle completion, remove inactive questbattle instances 2019-04-07 16:01:53 +02:00
Mordred
e4b919e319 Show svent on questbattle completion, remove inactive questbattle instances 2019-04-07 16:01:53 +02:00
Mordred
42affff662 Updated exd data, added questbattle info. Added first part of ManFst005 ( Chasing Shadows ) 2019-03-30 18:57:18 +01:00
Mordred
5d865cef31 Updated exd data, added questbattle info. Added first part of ManFst005 ( Chasing Shadows ) 2019-03-30 18:57:18 +01:00
Mordred
8d7bb478d6 Added lancer classquest for unlocking hunting log, fixed population control 2019-03-24 21:42:06 +01:00
Mordred
3b2225b0a1 Added lancer classquest for unlocking hunting log, fixed population control 2019-03-24 21:42:06 +01:00
Mordred
67a9b3cc5a Added SubWil020 
Changed the way QuestFlags are indexed to directly mimic retail.
This should make implementing new quests more straight forward as
indices can be used as they appear in the decompiled scripts.
 2019-03-17 22:25:52 +01:00
Mordred
11e06540b2 Added SubWil020 
Changed the way QuestFlags are indexed to directly mimic retail.
This should make implementing new quests more straight forward as
indices can be used as they appear in the decompiled scripts.
 2019-03-17 22:25:52 +01:00
NotAdam
666b548a45 Merge branch 'develop' into action_rewrite 2019-02-20 23:26:47 +11:00
NotAdam
35dfef2079 Merge branch 'develop' into action_rewrite 2019-02-20 23:26:47 +11:00
NotAdam
966f51b76a move all scripts over, adds EXPOSE_SCRIPT( classname ) to each script 2019-02-20 17:38:03 +11:00
NotAdam
f7f25e61cc move all scripts over, adds EXPOSE_SCRIPT( classname ) to each script 2019-02-20 17:38:03 +11:00
DanteMccloud
c7f935b841
Add files via upload 2019-02-17 11:35:16 -07:00
DanteMccloud
92e9a14877 Add files via upload 2019-02-17 11:35:16 -07:00
NotAdam
6b41b8eb85 remove scriptloader files from git 2019-02-09 16:50:04 +11:00
NotAdam
f0efe62e65 remove scriptloader files from git 2019-02-09 16:50:04 +11:00
Glenn
cde7678cc0 Scripts/Quest (#520) 
* Scripts/Quest

Add quest Subsea0012 (Quest Glory Days)

* Scripts/Quests

changes to avoid Travis warnings

* Scripts/Quests

added style changes

* Scripts/Quests

more style changes

* Update src/scripts/quest/subquest/limsa/SubSea012.cpp

Co-Authored-By: AussieGlenn <glenn_brisbane@hotmail.com>

* Update src/scripts/quest/subquest/limsa/SubSea012.cpp

Co-Authored-By: AussieGlenn <glenn_brisbane@hotmail.com>

* Scripts/Quests

extra style changes

* Scripts/Quests

style changes

* Scripts/Quests

style changes

* Scripts/Quests

more style changes

* Scripts/Quests

style changes

* Update SubSea012.cpp

* Scripts/Quest

delete unwanted file
 2019-02-03 18:29:17 +11:00
Glenn
0f6eb529c1 Scripts/Quest (#520) 
* Scripts/Quest

Add quest Subsea0012 (Quest Glory Days)

* Scripts/Quests

changes to avoid Travis warnings

* Scripts/Quests

added style changes

* Scripts/Quests

more style changes

* Update src/scripts/quest/subquest/limsa/SubSea012.cpp

Co-Authored-By: AussieGlenn <glenn_brisbane@hotmail.com>

* Update src/scripts/quest/subquest/limsa/SubSea012.cpp

Co-Authored-By: AussieGlenn <glenn_brisbane@hotmail.com>

* Scripts/Quests

extra style changes

* Scripts/Quests

style changes

* Scripts/Quests

style changes

* Scripts/Quests

more style changes

* Scripts/Quests

style changes

* Update SubSea012.cpp

* Scripts/Quest

delete unwanted file
 2019-02-03 18:29:17 +11:00
NotAdam
9f2dee403c fix name inconsistency with bnpc kill script callbacks 2019-02-02 23:32:36 +11:00
NotAdam
5d965493e9 fix name inconsistency with bnpc kill script callbacks 2019-02-02 23:32:36 +11:00
Mordred
2761a9029a Simplified some cmake logic 2018-12-31 17:30:45 +01:00