Skip to content

Commit a1dc155

Browse files
Yuta12342Yuta12342
committed
e
1 parent 803cdc4 commit a1dc155

File tree

4 files changed

+30
-31
lines changed

4 files changed

+30
-31
lines changed

‎source/archipelago/APPlayState.hx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ class APPlayState extends PlayState {
176176
songNotUnlocked = true;
177177
// Show info panel immediately
178178
showUnlockInfoPanel();
179-
return;
180179
}
181180
}
182181

‎source/games/uno/HandSwapSubstate.hx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,25 @@ class HandSwapSubstate extends MusicBeatSubstate {
5757
} catch(e:Dynamic) {
5858
trace("Error in setupBackground: " + e);
5959
}
60-
60+
6161
try {
6262
setupUI();
6363
} catch(e:Dynamic) {
6464
trace("Error in setupUI: " + e);
6565
}
66-
66+
6767
try {
6868
setupPlayerOptions();
6969
} catch(e:Dynamic) {
7070
trace("Error in setupPlayerOptions: " + e);
7171
}
72-
72+
7373
try {
7474
setupParticles();
7575
} catch(e:Dynamic) {
7676
trace("Error in setupParticles: " + e);
7777
}
78-
78+
7979
try {
8080
animateIn();
8181
} catch(e:Dynamic) {
@@ -122,7 +122,7 @@ class HandSwapSubstate extends MusicBeatSubstate {
122122
trace("Error in immediate CPU fallback: " + e2);
123123
}
124124
}
125-
125+
126126
try {
127127
Cursor.hide();
128128
} catch(e:Dynamic) {
@@ -313,7 +313,7 @@ class HandSwapSubstate extends MusicBeatSubstate {
313313
for (i in 0...playerButtons.length) {
314314
try {
315315
var button = null, text = null, cards = null;
316-
316+
317317
// Safely get elements
318318
try { button = (i < playerButtons.members.length) ? playerButtons.members[i] : null; } catch(e:Dynamic) button = null;
319319
try { text = (i < playerTexts.members.length) ? playerTexts.members[i] : null; } catch(e:Dynamic) text = null;
@@ -431,7 +431,7 @@ class HandSwapSubstate extends MusicBeatSubstate {
431431
try {
432432
var selectedPlayer = availablePlayers[index];
433433
var button = null;
434-
434+
435435
// Safely get the button with error handling
436436
try {
437437
button = (index < playerButtons.members.length) ? playerButtons.members[index] : null;
@@ -549,7 +549,7 @@ class HandSwapSubstate extends MusicBeatSubstate {
549549
trace("Error: No available players for CPU selection");
550550
return;
551551
}
552-
552+
553553
var bestChoice = availablePlayers[0];
554554
try {
555555
for (player in availablePlayers) {
@@ -562,7 +562,7 @@ class HandSwapSubstate extends MusicBeatSubstate {
562562
// Use first available player as fallback
563563
bestChoice = availablePlayers[0];
564564
}
565-
565+
566566
try {
567567
var bestIndex = availablePlayers.indexOf(bestChoice);
568568
if (bestIndex >= 0) {
@@ -636,7 +636,7 @@ class HandSwapSubstate extends MusicBeatSubstate {
636636
} catch(e:Dynamic) {
637637
trace("Error getting previous button: " + e);
638638
}
639-
639+
640640
if (prevButton != null) {
641641
try {
642642
FlxTween.cancelTweensOf(prevButton);
@@ -645,7 +645,7 @@ class HandSwapSubstate extends MusicBeatSubstate {
645645
trace("Error removing hover effect: " + e);
646646
}
647647
}
648-
648+
649649
try {
650650
if (glowEffect != null) {
651651
glowEffect.visible = false;
@@ -669,7 +669,7 @@ class HandSwapSubstate extends MusicBeatSubstate {
669669
} catch(e:Dynamic) {
670670
trace("Error getting new button: " + e);
671671
}
672-
672+
673673
if (button != null) {
674674
try {
675675
FlxTween.cancelTweensOf(button);

‎source/games/uno/UnoTestState.hx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -376,26 +376,26 @@ class UnoTestState extends MusicBeatState {
376376
trace("Hand swap already in progress, ignoring additional request");
377377
return;
378378
}
379-
379+
380380
// Prevent rapid successive hand swaps (within 1 second)
381381
var currentTime = haxe.Timer.stamp();
382382
if (currentTime - lastHandSwapTime < 1.0) {
383383
trace("Hand swap called too soon after previous one, ignoring");
384384
return;
385385
}
386386
lastHandSwapTime = currentTime;
387-
387+
388388
// Set waiting flag to prevent turn advancement
389389
waitingForHandSwap = true;
390-
390+
391391
// Open the hand swap substate for player selection
392392
var handSwapSubstate = new HandSwapSubstate(currentPlayer, availablePlayers, function(selectedPlayer:UnoPlayer) {
393393
// Reset waiting flag first
394394
waitingForHandSwap = false;
395-
395+
396396
// Perform the actual hand swap through the rules system
397397
performHandSwap(selectedPlayer);
398-
398+
399399
// Update UI after swap is complete
400400
if (selectedPlayer != null) {
401401
updateInstructionText('${currentPlayer.name} swapped hands with ${selectedPlayer.name}!', true);
@@ -948,7 +948,7 @@ class UnoTestState extends MusicBeatState {
948948
// Store the selected card and index
949949
selectedCardIndex = cardIndex;
950950
selectedCard = card;
951-
951+
952952
// Immediately stop hover effects and clear selection states
953953
isPlayingCard = true;
954954
resetCardSelection();
@@ -1157,14 +1157,14 @@ class UnoTestState extends MusicBeatState {
11571157
}
11581158

11591159
waitingForColorChoice = true;
1160-
1160+
11611161
// Get available colors
11621162
availableColors = (unoGame.customColors != null && unoGame.customColors.length > 0 ? unoGame.customColors : UnoCard.getStandardColors());
11631163

11641164
// Open the stylish color choice substate
11651165
var colorChoiceSubstate = new ColorChoiceSubstate(unoGame.turnManager.getCurrentPlayer(), availableColors, function(selectedColor:UnoColor) {
11661166
waitingForColorChoice = false;
1167-
1167+
11681168
if (selectedColor != null) {
11691169
// Play the selected card with the chosen color
11701170
playSelectedCard(selectedColor);
@@ -1203,7 +1203,7 @@ class UnoTestState extends MusicBeatState {
12031203
break;
12041204
}
12051205
}
1206-
1206+
12071207
if (currentCardIndex == -1) {
12081208
trace("Selected card no longer in hand");
12091209
selectedCardIndex = -1;
@@ -1216,7 +1216,7 @@ class UnoTestState extends MusicBeatState {
12161216

12171217
// Get the card sprite for animation
12181218
var cardSprite = (currentCardIndex < playerHandGroup.length) ? playerHandGroup.members[currentCardIndex] : null;
1219-
1219+
12201220
if (cardSprite != null) {
12211221
// Cancel any existing animations on this sprite
12221222
if (cardAnimations.exists(cardSprite)) {
@@ -1238,7 +1238,7 @@ class UnoTestState extends MusicBeatState {
12381238
case CUSTOM(color, _): color;
12391239
case _: FlxColor.WHITE;
12401240
};
1241-
1241+
12421242
// Animate color change before playing
12431243
FlxTween.color(cardSprite, 0.2, FlxColor.WHITE, targetColor, {
12441244
ease: FlxEase.sineOut,

‎source/games/uno/backend/UnoRules.hx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,30 +168,30 @@ class UnoRules {
168168
if (onSevenRuleHandSwap != null) {
169169
var currentPlayer = players[currentPlayerIndex];
170170
var availablePlayers = players.filter(p -> p != currentPlayer);
171-
171+
172172
// Create a callback that performs the actual swap
173173
var doHandSwap = function(selectedPlayer:UnoPlayer):Void {
174174
if (selectedPlayer != null && availablePlayers.contains(selectedPlayer)) {
175175
trace('Performing hand swap between ${currentPlayer.name} and ${selectedPlayer.name}');
176-
176+
177177
// Perform the hand swap
178178
var currentHand = currentPlayer.hand.getCards().copy();
179179
var selectedHand = selectedPlayer.hand.getCards().copy();
180-
180+
181181
trace('Before swap: ${currentPlayer.name} has ${currentHand.length} cards, ${selectedPlayer.name} has ${selectedHand.length} cards');
182-
182+
183183
currentPlayer.hand.clear();
184184
selectedPlayer.hand.clear();
185-
185+
186186
currentPlayer.hand.addCards(selectedHand);
187187
selectedPlayer.hand.addCards(currentHand);
188-
188+
189189
trace('After swap: ${currentPlayer.name} has ${currentPlayer.hand.getCards().length} cards, ${selectedPlayer.name} has ${selectedPlayer.hand.getCards().length} cards');
190190
} else {
191191
trace('Hand swap cancelled or invalid selection');
192192
}
193193
};
194-
194+
195195
// Call the UI callback with our swap function
196196
onSevenRuleHandSwap(currentPlayer, availablePlayers, doHandSwap);
197197
}

0 commit comments

Comments
 (0)