incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/upstream-master-20260614

Browse Source 
# Conflicts:
#	src/Client.cc
#	src/IPStackSimulator.cc
#	src/ReceiveCommands.cc
#	src/ReceiveSubcommands.cc
#	src/SendCommands.cc
#	src/ServerState.cc
#	src/ServerState.hh
This commit is contained in:
Your Name
2026-06-14 18:30:38 -04:00
parent ce39dfc66a 3cdb5e91a8
commit 9150e85442
47 changed files with 3754 additions and 3467 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/config.example.json
+22 -22
View File
@@ -1339,35 +1339,35 @@
// doesn't have direct access to the client's quest flags from their save file.
// If you use an expression, the format is the same as the AvailableIf and EnabledIf fields in quest JSONs (see
// system/quests/retrieval/q058.json for details). Note that the expression is only evaluated at the time the game is
// created, and the player-specific tokens like C_EpX_YY refer to the player who created the game.
// created, and the player-specific tokens like CC_EpX_YY refer to the player who created the game.
// The UnlockAllAreas option is now gone; if you want the same behavior as if it were enabled, uncomment all the
// "area unlocks" lines below. Note that some late PSOBB client versions (for example, the Tethealla client) open all
// "area unlock" lines below. Note that some late PSOBB client versions (for example, the Tethealla client) open all
// areas by default, so the area unlock flags have no effect for them.
"QuestFlagRewritesV1V2": {
// "F_0017": true, // Ep1 area unlocks
// "F_0020": true, // Ep1 area unlocks
// "F_002A": true, // Ep1 area unlocks
// "F_0017": true, // Ep1 area unlock (Caves)
// "F_0020": true, // Ep1 area unlock (Mines)
// "F_002A": true, // Ep1 area unlock (Ruins)
},
"QuestFlagRewritesV3": {
// "F_0017": true, // Ep1 area unlocks
// "F_0020": true, // Ep1 area unlocks
// "F_002A": true, // Ep1 area unlocks
// "F_004C": true, // Ep2 area unlocks
// "F_004F": true, // Ep2 area unlocks
// "F_0052": true, // Ep2 area unlocks
// "F_0017": true, // Ep1 area unlock (Caves)
// "F_0020": true, // Ep1 area unlock (Mines)
// "F_002A": true, // Ep1 area unlock (Ruins)
// "F_004C": true, // Ep2 area unlock (VR Spaceship)
// "F_004F": true, // Ep2 area unlock (CCA)
// "F_0052": true, // Ep2 area unlock (Seabed)
},
"QuestFlagRewritesV4": {
// "F_01F9": true, // Ep1 area unlocks
// "F_0201": true, // Ep1 area unlocks
// "F_0207": true, // Ep1 area unlocks
// "F_021B": true, // Ep2 area unlocks
// "F_0225": true, // Ep2 area unlocks
// "F_022F": true, // Ep2 area unlocks
// "F_02BD": true, // Ep4 area unlocks
// "F_02BE": true, // Ep4 area unlocks
// "F_02BF": true, // Ep4 area unlocks
// "F_02C0": true, // Ep4 area unlocks
// "F_02C1": true, // Ep4 area unlocks
// "F_01F9": true, // Ep1 area unlock (Caves)
// "F_0201": true, // Ep1 area unlock (Mines)
// "F_0207": true, // Ep1 area unlock (Ruins)
// "F_021B": true, // Ep2 area unlock (VR Spaceship)
// "F_0225": true, // Ep2 area unlock (CCA)
// "F_022F": true, // Ep2 area unlock (Seabed)
// "F_02BD": true, // Ep4 area unlock (Crater West)
// "F_02BE": true, // Ep4 area unlock (Crater South)
// "F_02BF": true, // Ep4 area unlock (Crater North)
// "F_02C0": true, // Ep4 area unlock (Crater Interior)
// "F_02C1": true, // Ep4 area unlock (Desert)
"F_0046": false, // Ep2 CCA door lock fix
"F_0047": false, // Ep2 CCA door lock fix
"F_0048": false, // Ep2 CCA door lock fix