Update AA synchronization, CW progression and diagnostics

internal/gameserver/handlers_challenge.go

@@ -90,6 +90,17 @@ func getChallengeData() *ChallengeDataConfig {
 			Log("Failed to parse challenge_data.json: " + err.Error())
 			challengeData = ChallengeDataConfig{}
 		}
+		// The imported catalog stores Peak rows under peak.stages; the flat
+		// resource overlays below add Client-specific placement/group data.
+		// Do not turn the section names "stages" and "groups" into fake PeakIDs.
+		var imported struct {
+			Peak struct {
+				Stages map[string]PeakStageData `json:"stages"`
+			} `json:"peak"`
+		}
+		if json.Unmarshal(raw, &imported) == nil && len(imported.Peak.Stages) != 0 {
+			challengeData.Peak = imported.Peak.Stages
+		}
 		challengeData.Countdowns = map[uint32]uint32{}
 		challengeData.TargetRules = map[uint32]ChallengeTargetRule{}
 		if raw, err := common.ReadResourceFile("resources/ChallengeTargetConfig.json"); err == nil {