revert: Keep 3 GameClient files in Generals/MD to avoid PR conflicts

Reverting unification to avoid conflicts with:
- PR TheSuperHackers#654 (tomsons26): Cleans up inconsistencies
- PR TheSuperHackers#688 (tomsons26): Backports various things from ZH

Files reverted: Color.h, Mouse.h, Color.cpp

Author: bobtista

ANALYSIS_METHODOLOGY.md

@@ -0,0 +1,280 @@
+# Conflict Analysis Methodology
+
+## Overview
+
+This document explains how the PR conflict analysis was performed and how to reproduce it.
+
+## Tools Used
+
+1. **GitHub CLI (`gh`)** - For fetching PR data from GitHub API
+2. **Git** - For comparing branch differences  
+3. **Python 3** - For data processing and analysis
+
+## Analysis Process
+
+### Step 1: Fetch Open PRs
+
+```bash
+gh pr list --limit 25 --json number,title,state,files,author --repo TheSuperHackers/GeneralsGameCode
+```
+
+This fetches:
+- PR number and title
+- List of all files changed in each PR
+- Author information
+- Current state (open/closed)
+
+### Step 2: Get Files Changed in Unification Branches
+
+For each unification branch:
+
+```bash
+git diff --name-only main..bobtista/unify-common
+git diff --name-only main..bobtista/unify-gameclient
+git diff --name-only main..bobtista/unify-gamelogic
+git diff --name-only main..bobtista/unify-network
+```
+
+This gives us the complete list of files being moved/changed in each unification effort.
+
+### Step 3: Find Overlapping Files
+
+For each unification branch, find files that appear in BOTH:
+- The unification branch changes
+- Any open PR's changes
+
+If a file appears in both, it's a **potential conflict**.
+
+### Step 4: Categorize by Risk Level
+
+**🟢 Low Risk**: Only `CMakeLists.txt` files conflict
+- These are routine build configuration conflicts
+- Easy to merge by combining both sets of changes
+
+**🟡 Medium Risk**: 1-3 files conflict
+- Usually straightforward to resolve
+- May require reviewing the specific changes
+
+**🔴 High Risk**: 4+ files conflict  
+- Significant overlap with other work
+- Requires coordination with PR author
+- May need to merge one PR first, then rebase the other
+
+## How to Reproduce
+
+### Prerequisites
+
+```bash
+# Install GitHub CLI (macOS)
+brew install gh
+
+# Login to GitHub
+gh auth login
+
+# Clone the repository
+git clone https://github.com/TheSuperHackers/GeneralsGameCode.git
+cd GeneralsGameCode
+
+# Fetch all branches
+git fetch --all
+```
+
+### Run the Analysis
+
+```bash
+# Option 1: Use the provided script
+python3 scripts/analyze_pr_conflicts.py
+
+# Option 2: Manual step-by-step
+# See "Manual Analysis" section below
+```
+
+### Script Output
+
+The script produces:
+1. **Console output**: Formatted report with statistics and details
+2. **JSON file**: `pr_conflict_analysis.json` with complete data for further processing
+
+## Manual Analysis (Without Script)
+
+If you want to manually check conflicts:
+
+### 1. Get Open PRs
+
+```bash
+gh pr list --limit 25 --json number,title,files --repo TheSuperHackers/GeneralsGameCode > prs.json
+```
+
+### 2. Check Specific File Conflicts
+
+```bash
+# See which PRs touch a specific file
+cat prs.json | jq '.[] | select(.files[].path | contains("Language.h")) | {number, title}'
+
+# See all files in a specific PR
+gh pr view 1703 --json files --jq '.files[].path'
+```
+
+### 3. Compare Your Branch
+
+```bash
+# See what files your branch changes
+git diff --name-only main..bobtista/unify-common
+
+# Check if a specific file conflicts with open PRs
+FILE="Generals/Code/GameEngine/Include/Common/Language.h"
+git diff --name-only main..bobtista/unify-common | grep "$FILE" && echo "File in your branch"
+gh pr list --json number,files --jq ".[] | select(.files[].path == \"$FILE\") | .number"
+```
+
+## Understanding the Results
+
+### Example Conflict
+
+```
+Branch: bobtista/unify-common
+PR #1739: refactor(language.h): remove unused and redundant defines
+Conflicting files (1):
+  - Generals/Code/GameEngine/Include/Common/Language.h
+```
+
+**Interpretation:**
+- Your `unify-common` branch moves/modifies `Language.h`
+- PR #1739 also modifies `Language.h`
+- If both merge, there WILL be a conflict
+
+**Resolution Options:**
+1. Merge PR #1739 first, then rebase your branch
+2. Exclude `Language.h` from your unification
+3. Coordinate with PR author to merge yours first, they rebase theirs
+
+### CMakeLists.txt Conflicts
+
+```
+PR #1594: feat(crashdump): Add crash dump functionality
+Conflicting files (1):
+  - Core/GameEngine/CMakeLists.txt
+```
+
+**Why low risk:**
+- CMakeLists.txt conflicts happen because both PRs add new files/dependencies
+- Resolution is simple: Keep both changes
+- No code logic conflicts
+
+## Limitations
+
+### What This Analysis Catches
+
+✅ File-level conflicts (same file modified in both)  
+✅ Moved/renamed files  
+✅ Added/deleted files
+
+### What This Analysis Misses
+
+❌ Semantic conflicts (code logic that breaks across files)  
+❌ Build dependency conflicts  
+❌ Header include path changes  
+❌ API/interface changes that affect other code
+
+### False Positives
+
+Some "conflicts" might not actually conflict:
+- Changes to different parts of the same file
+- Changes that are compatible/complementary
+- One PR adds code, other removes different code
+
+**Always review the actual changes, not just file names!**
+
+## Recommendations for Use
+
+### Before Creating a Large Refactor/Unification PR
+
+1. Run this analysis
+2. Identify high-risk conflicts
+3. Coordinate with those PR authors
+4. Consider excluding conflicting files temporarily
+
+### After Running Analysis
+
+1. **Post results** in your PR description
+2. **Tag affected authors** in comments
+3. **Propose a merge order** to maintainers
+4. **Offer to help** with rebasing
+
+### For Maintainers
+
+1. Use this to plan merge order
+2. Prioritize by:
+   - Bug fixes (highest priority)
+   - Features (merge or delay?)
+   - Refactors (can usually wait)
+3. Batch similar PRs together
+
+## Example Workflow
+
+```bash
+# 1. Create your unification branch
+git checkout -b unify-my-feature
+
+# 2. Before making changes, run analysis
+python3 scripts/analyze_pr_conflicts.py
+
+# 3. Review conflicts in your area
+# - If few/no conflicts: Proceed
+# - If many conflicts: Coordinate with team
+
+# 4. Make your changes, excluding problem files
+
+# 5. Create PR with analysis in description
+
+# 6. Update PR as other PRs merge
+git fetch --all
+git rebase origin/main
+python3 scripts/analyze_pr_conflicts.py  # Re-run to see new state
+```
+
+## Data Storage
+
+The script saves detailed JSON output:
+
+```json
+{
+  "branches": {
+    "bobtista/unify-common": ["file1.h", "file2.cpp", ...]
+  },
+  "conflicts": {
+    "bobtista/unify-common": {
+      "1739": {
+        "title": "refactor(language.h): ...",
+        "author": "Skyaero42",
+        "files": ["Generals/Code/GameEngine/Include/Common/Language.h"]
+      }
+    }
+  },
+  "risk_categories": {
+    "low": [...],
+    "medium": [...],
+    "high": [...]
+  }
+}
+```
+
+You can use this JSON for:
+- Custom analysis
+- Integration with CI/CD
+- Tracking over time
+- Automated notifications
+
+## Questions?
+
+If you have questions about the methodology:
+1. Read the script source: `scripts/analyze_pr_conflicts.py`
+2. Check the GitHub CLI docs: https://cli.github.com/manual/
+3. Ask in the PR discussion
+
+## Credits
+
+Analysis methodology developed by @bobtista for PR #1736.
+
+
+

Core/GameEngine/CMakeLists.txt

@@ -146,7 +146,7 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/ChallengeGenerals.h
 #    Include/GameClient/ClientInstance.h
     Include/GameClient/ClientRandomValue.h
-    Include/GameClient/Color.h
+    #Include/GameClient/Color.h
 #    Include/GameClient/CommandXlat.h
 #    Include/GameClient/ControlBar.h
     Include/GameClient/ControlBarResizer.h
@@ -208,7 +208,7 @@ set(GAMEENGINE_SRC
     Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
     Include/GameClient/Module/BeaconClientUpdate.h
     Include/GameClient/Module/SwayClientUpdate.h
-    Include/GameClient/Mouse.h
+    #Include/GameClient/Mouse.h
 #    Include/GameClient/ParabolicEase.h
 #    Include/GameClient/ParticleSys.h
 #    Include/GameClient/PlaceEventTranslator.h
@@ -687,7 +687,7 @@ set(GAMEENGINE_SRC
 #    Source/Common/version.cpp
     Source/Common/WorkerProcess.cpp
 #    Source/GameClient/ClientInstance.cpp
-    Source/GameClient/Color.cpp
+    #Source/GameClient/Color.cpp
 #    Source/GameClient/Credits.cpp
 #    Source/GameClient/Display.cpp
 #    Source/GameClient/DisplayString.cpp

FILES_TO_REVERT.md

@@ -0,0 +1,68 @@
+# Files to Revert from Unification PRs
+
+This document lists files that need to be reverted from the unification PRs to avoid conflicts with active external PRs.
+
+## Summary
+
+**Total files to revert: 21**
+- From `bobtista/unify-common`: 12 files
+- From `bobtista/unify-gameclient`: 3 files  
+- From `bobtista/unify-gamelogic`: 1 file
+- From `bobtista/unify-network`: 5 files
+
+## Files to Revert
+
+### From bobtista/unify-common (12 files)
+
+**Conflicting PRs:** #654 (tomsons26), #670 (zzambers), #688 (tomsons26), #1066 (xezon), #1703 (Stubbjax), #1741 (Skyaero42)
+
+1. Generals/Code/GameEngine/Include/Common/BitFlagsIO.h
+2. Generals/Code/GameEngine/Include/Common/DataChunk.h
+3. Generals/Code/GameEngine/Include/Common/GameType.h
+4. Generals/Code/GameEngine/Include/Common/List.h
+5. Generals/Code/GameEngine/Include/Common/Money.h
+6. Generals/Code/GameEngine/Include/Common/Radar.h
+7. Generals/Code/GameEngine/Include/Common/Recorder.h
+8. Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h
+9. Generals/Code/GameEngine/Include/Common/StackDump.h
+10. Generals/Code/GameEngine/Source/Common/NameKeyGenerator.cpp
+11. Generals/Code/GameEngine/Source/Common/System/GameCommon.cpp
+12. Generals/Code/GameEngine/Source/Common/System/StackDump.cpp
+
+### From bobtista/unify-gameclient (3 files)
+
+**Conflicting PRs:** #654 (tomsons26), #688 (tomsons26)
+
+1. Generals/Code/GameEngine/Include/GameClient/Color.h
+2. Generals/Code/GameEngine/Include/GameClient/Mouse.h
+3. Generals/Code/GameEngine/Source/GameClient/Color.cpp
+
+### From bobtista/unify-gamelogic (1 file)
+
+**Conflicting PRs:** #654 (tomsons26)
+
+1. Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h
+
+### From bobtista/unify-network (5 files)
+
+**Conflicting PRs:** #688 (tomsons26), #1049 (Caball009), #1668 (jbremer)
+
+1. Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h
+2. Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
+3. Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h
+4. Generals/Code/GameEngine/Include/GameNetwork/networkutil.h
+5. Generals/Code/GameEngine/Source/GameNetwork/NetPacket.cpp
+
+## Notes
+
+- All CMakeLists.txt conflicts are acceptable and easy to resolve
+- All conflicts with your own PRs (#1675, #1680, #1682, #1683, #1733, #1734, #1736, #1737, #1738) can be managed as they're yours
+- slurmlord's PR #1594 only conflicts with CMakeLists.txt, which is fine
+
+## Next Steps
+
+1. Checkout each unification branch
+2. Revert the moves for these 3 files
+3. Update CMakeLists.txt to not include these files in Core
+4. Force push the updated branches
+