1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-24 21:57:44 +00:00
Commit graph

49 commits

Author SHA1 Message Date
Mordred
bf14348e13
Merge pull request #849 from dude22072/ClassQuestWork
[3.0] Miner Questline (ARR+HW)
2023-01-24 08:05:45 +01:00
dude22072
e8068164d3 Miner Questline (ARR+HW) 2023-01-23 17:39:13 -06:00
Adam
297a536951
Merge pull request #834 from dude22072/ClassQuestWork
[3.0] Fix some WHM Questline stuff
2023-01-19 13:33:05 +11:00
Mordred
920da4de3b Tiny cleanup 2023-01-18 21:44:26 +01:00
dude22072
0926f25fc5 linux please 2023-01-17 17:48:01 -06:00
dude22072
83428a56d0 linux are you happy yet 2023-01-17 17:34:04 -06:00
dude22072
1db2c0a14e Fix semicolon that made linux build unhappy 2023-01-17 17:03:55 -06:00
dude22072
4f954ba328 Fix LogMessage stuff 2023-01-17 17:03:24 -06:00
Mordred
cb6672b770
Merge pull request #833 from dude22072/ClassQuestWork
[3.0] WHM ARR Questline
2023-01-17 22:20:08 +01:00
dude22072
0cabc03c21 WHM ARR Questline 2023-01-17 15:16:55 -06:00
Mordred
207f44294b
Merge pull request #831 from dude22072/ClassQuestWork
[3.0] WHM ARR Relic Quest (w/ Psuedocode)
2023-01-17 08:30:24 +01:00
dude22072
50b288f8c9 Update JobWhm001.cpp 2023-01-17 00:24:25 -06:00
dude22072
c536b0e7cf WHM ARR Relic Quest 2023-01-17 00:22:24 -06:00
Mordred
50fbdbfa12 renamed setSystemActionUnlock to setRewardFlag 2022-02-28 08:40:57 +01:00
Mordred
bb6381d15c onBNpcKill now takes a bnpc ref 2022-02-23 08:36:23 +01:00
Mordred
a37046f0ec Renamed bnpc create and retrieve functions 2022-02-22 21:46:36 +01:00
dude22072
de6a3b3128 BTN questline 2022-02-19 21:50:01 -06:00
Mordred
198e641420 Helper function in QuestScript to get a terriMgr reference 2022-01-24 10:10:33 +01:00
dude22072
0cc2a497dd DelayedEmnityTask and BNpc additions 2022-01-24 02:39:21 -06:00
Mordred
f8303be9e8 Fixed issues with using copies instead of references 2022-01-24 09:20:34 +01:00
Mordred
4cef7cdab9 Map previously unmapped eobj and enpc 2022-01-23 23:00:50 +01:00
dude22072
1da2cce4da ARC clang cleanup 2022-01-19 13:53:00 -06:00
Mordred
125c02d127 Very very simplistic mob exp 2022-01-19 17:22:56 +01:00
dude22072
588a692c73 Remove unneeded ampersands 2022-01-18 19:00:54 -06:00
dude22072
f89a677bd3 CNJ reference formatting fix 2022-01-18 18:53:16 -06:00
dude22072
8f6e76dc55 CNJ Quests 2022-01-18 00:07:49 -06:00
dude22072
8ff1faf666 Fix ClsArc004 2022-01-17 20:33:05 -06:00
dude22072
026059ee15 More ARC cleanup
Oh hey I have to make the sequence completion text show up myself.
2022-01-15 22:10:42 -06:00
Mordred
79981909de Various smaller cleanups 2022-01-15 22:48:27 +01:00
Rushi
3063174652 Fix unlock quest for Archer 2022-01-14 19:07:38 +01:00
dude22072
cfcc29acbd More ARC formatting 2022-01-14 01:44:35 -06:00
dude22072
55d212ddf6 ARC quests formatting 2022-01-14 01:26:54 -06:00
dude22072
d78523a072 Implement ARC questline 2022-01-13 23:18:53 -06:00
Mordred
9f83094c43 sendEventNotice has been moved from player to eventMgr, reformatted scripts 2021-12-21 13:48:24 +01:00
Mordred
296dbb9904 GiveQuestRewards is no longer used in quests, but called automatically on finish 2021-12-21 01:05:08 +01:00
dude22072
454e7506cf Backport quests that dont require onBnpcKill or onEobjHit 2021-12-14 20:51:26 -06: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
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
ca102697f4 move to new service locator 2020-03-01 11:58:26 +11: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