Merge remote-tracking branch 'upstream/main'

Author: DB-009

js/GameScene.js

@@ -52,7 +52,6 @@ class GameScene extends Phaser.Scene {
         this.createEnvironment();
         this.createPlayerEntities();
         this.createUI();
-        //this.setupInput();
 
         this.selectionPointer = this.add.image(0, 0, 'UI_Pointer_white');
         this.selectionPointer.setOrigin(0.5, 1);
@@ -506,10 +505,7 @@ getClickedFloorIndex(y) {
         const top = fy - halfHeight;
         const bottom = fy + halfHeight;
 
-        //console.log(`Checking floor ${i}: y=${y}, top=${top}, bottom=${bottom}`);
-
         if (y >= top && y <= bottom) {
-            //console.log(`→ Clicked floor ${i}`);
             return i;
         }
     }

js/components/Sidebar.js

@@ -85,13 +85,7 @@ class Sidebar {
         const controlsY = GameConfig.SIDEBAR_CONTROLS_Y + 25;
 
         // Left click control
-        this.leftClickIcon = this.scene.add.graphics();
-        this.leftClickIcon.fillStyle(0x94a3b8, 1);  // Light gray for mouse body
-        this.leftClickIcon.fillRoundedRect(GameConfig.SIDEBAR_MARGIN, controlsY, 18, 20, 3);
-        this.leftClickIcon.fillStyle(0x64b5f6, 1);  // Accent blue for left button
-        this.leftClickIcon.fillRect(GameConfig.SIDEBAR_MARGIN + 2, controlsY + 2, 7, 10);
-        this.leftClickIcon.lineStyle(1, 0x2196f3, 1);  // Blue border
-        this.leftClickIcon.strokeRect(GameConfig.SIDEBAR_MARGIN + 2, controlsY + 2, 7, 10);
+        this.leftClickIcon = this.createMouseButton(controlsY, true);
         this.elements.push(this.leftClickIcon);
 
         this.leftClickText = this.scene.add.text(
@@ -104,13 +98,7 @@ class Sidebar {
 
         // Right click control
         const rightClickY = controlsY + 30;
-        this.rightClickIcon = this.scene.add.graphics();
-        this.rightClickIcon.fillStyle(0x94a3b8, 1);  // Light gray for mouse body
-        this.rightClickIcon.fillRoundedRect(GameConfig.SIDEBAR_MARGIN, rightClickY, 18, 20, 3);
-        this.rightClickIcon.fillStyle(0x64b5f6, 1);  // Accent blue for right button
-        this.rightClickIcon.fillRect(GameConfig.SIDEBAR_MARGIN + 9, rightClickY + 2, 7, 10);
-        this.rightClickIcon.lineStyle(1, 0x2196f3, 1);  // Blue border
-        this.rightClickIcon.strokeRect(GameConfig.SIDEBAR_MARGIN + 9, rightClickY + 2, 7, 10);
+        this.rightClickIcon = this.createMouseButton(rightClickY, false);
         this.elements.push(this.rightClickIcon);
 
         this.rightClickText = this.scene.add.text(
@@ -122,7 +110,19 @@ class Sidebar {
         this.elements.push(this.rightClickText);
     }
 
-
+    createMouseButton(yPosition, isLeftButton) {
+        const mouseIcon = this.scene.add.graphics();
+        mouseIcon.fillStyle(0x94a3b8, 1);  // Light gray for mouse body
+        mouseIcon.fillRoundedRect(GameConfig.SIDEBAR_MARGIN, yPosition, 18, 20, 3);
+        mouseIcon.fillStyle(0x64b5f6, 1);  // Accent blue for active button
+        
+        const buttonX = isLeftButton ? GameConfig.SIDEBAR_MARGIN + 2 : GameConfig.SIDEBAR_MARGIN + 9;
+        mouseIcon.fillRect(buttonX, yPosition + 2, 7, 10);
+        mouseIcon.lineStyle(1, 0x2196f3, 1);  // Blue border
+        mouseIcon.strokeRect(buttonX, yPosition + 2, 7, 10);
+        
+        return mouseIcon;
+    }
 
     updatePlayer(_player)
     {

js/managers/ElevatorManager.js

@@ -191,7 +191,6 @@ class ElevatorManager {
                 if (Math.abs(dx) < 2) {
                     player.x = targetX;
                     player.vx = 0;
-                    //player.spriteRef.setVisible(false);
                     player.spriteRef.setDepth(0); // Behind the elevator door
                     player.inElevator = true;
                     player.waitingForElevator = false;
@@ -223,7 +222,6 @@ class ElevatorManager {
             player.targetFloor = null;
             player.waitingForElevator = false;
             player.inElevator = false;
-            //player.spriteRef.setVisible(true);
             player.spriteRef.setDepth(20); // Return to default front layer
             if (player.deferredTargetX !== undefined) {
                 player.targetX = player.deferredTargetX;

todo.md

@@ -0,0 +1,60 @@
+# TODO: Code Refactoring Checklist
+
+## Duplicate Code Refactoring
+
+### High Priority
+- [ ] **Floor Y Position Calculations**
+  - [ ] Create a centralized `PositionUtils` class for floor calculations
+  - [ ] Refactor `GameScene.js:262-266` getFloorY()
+  - [ ] Refactor `BuildingManager.js:38-44` calculateFloorPosition()
+  - [ ] Update `DoorManager.js:7` floor position calculation
+  - [ ] Update `ElevatorManager.js` lines 16, 46, 106, 286
+
+### Medium Priority
+- [ ] **Idle State Reset Pattern**
+  - [ ] Create `IdleStateManager` or helper method
+  - [ ] Refactor 6 instances in GameScene.js (lines 337-340, 344-346, 428-431, 442-445, 450-452, 488-491)
+
+- [ ] **Proximity/Distance Checks**
+  - [ ] Create `ProximityUtils.isWithinDistance(obj1, obj2, threshold)`
+  - [ ] Replace distance checks in:
+    - [ ] `GameScene.js:297` (elevator proximity)
+    - [ ] `Player.js:45` (movement threshold)
+    - [ ] `DoorManager.js:41` (door proximity)
+
+- [ ] **Sequential Processing Pattern**
+  - [ ] Create base class or utility for sequential operations
+  - [ ] Refactor `ElevatorManager.sequentialBoarding()`
+  - [ ] Refactor `ElevatorManager.sequentialExiting()`
+
+### Low Priority
+- [ ] **Animation Key Generation**
+  - [ ] Create `AnimationUtils.getAnimationKey(action, spriteKey)`
+  - [ ] Update `PlayerSprite.js:20-21`
+  - [ ] Update `AnimationManager.js:7-8`
+
+- [ ] **Sprite Loading Pattern**
+  - [ ] Create sprite configuration array
+  - [ ] Loop through configuration in `GameScene.preload()`
+  - [ ] Remove repetitive sprite loading code
+
+- [ ] **Door Creation Pattern**
+  - [ ] Create door configuration array with positions
+  - [ ] Loop through configuration in `GameScene.createEnvironment()`
+  - [ ] Remove repetitive door.addDoor() calls
+
+- [ ] **Rectangle Creation Pattern**
+  - [ ] Create helper method in EnvironmentManager
+  - [ ] Refactor createSky(), createGround(), createBackground()
+
+## Additional Refactoring Tasks
+
+### Code Style Standardization
+- [ ] Convert `DoorManager` from prototype to ES6 class
+- [ ] Extract magic numbers to `GameConfig.js`
+- [ ] Remove active console.log statements (lines 99, 517 in GameScene.js)
+
+### Architecture Improvements
+- [ ] Split `GameScene.js` (521 lines) into smaller managers
+- [ ] Implement proper state management for Player
+- [ ] Create event system for loose coupling between components