Skip to content

Fix omok searchCombo logic #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FongMi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix omok searchCombo logic #294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 33 additions & 67 deletions src/main/java/server/maps/MiniGame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import tools.PacketCreator;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

Expand Down Expand Up @@ -195,7 +196,7 @@ private synchronized boolean minigameMatchFinish() {

private void minigameMatchFinished() {
updateMiniGameBox();

Arrays.fill(piece, 0);
if (ownerquit) {
owner.closeMiniGame(true);
} else if (visitorquit) {
Expand Down Expand Up @@ -433,86 +434,51 @@ public void setPiece(int move1, int move2, int type, Character chr) {
if (piece[slot] == 0) {
piece[slot] = type;
this.broadcast(PacketCreator.getMiniGameMoveOmok(this, move1, move2, type));
for (int y = 0; y < 15; y++) {
for (int x = 0; x < 11; x++) {
if (searchCombo(x, y, type)) {
if (this.isOwner(chr)) {
this.minigameMatchOwnerWins(false);
this.setLoser(0);
} else {
this.minigameMatchVisitorWins(false);
this.setLoser(1);
}
for (int y2 = 0; y2 < 15; y2++) {
for (int x2 = 0; x2 < 15; x2++) {
int slot2 = (y2 * 15 + x2 + 1);
piece[slot2] = 0;
}
boolean gameWon = false;
for (int y = 0; y < 15 && !gameWon; y++) {
for (int x = 0; x < 15 && !gameWon; x++) {
for (int d = 0; d < 4; d++) {
if (searchCombo(x, y, type, d)) {
gameWon = true;
break;
}
}
}
}
for (int y = 0; y < 15; y++) {
for (int x = 4; x < 15; x++) {
if (searchCombo2(x, y, type)) {
if (this.isOwner(chr)) {
this.minigameMatchOwnerWins(false);
this.setLoser(0);
} else {
this.minigameMatchVisitorWins(false);
this.setLoser(1);
}
for (int y2 = 0; y2 < 15; y2++) {
for (int x2 = 0; x2 < 15; x2++) {
int slot2 = (y2 * 15 + x2 + 1);
piece[slot2] = 0;
}
}
}
if (gameWon) {
if (this.isOwner(chr)) {
this.minigameMatchOwnerWins(false);
this.setLoser(0);
} else {
this.minigameMatchVisitorWins(false);
this.setLoser(1);
}
}
}
}

private boolean searchCombo(int x, int y, int type) {
private boolean searchCombo(int x, int y, int type, int direction) {
int slot = y * 15 + x + 1;
for (int i = 0; i < 5; i++) {
if (piece[slot + i] == type) {
if (i == 4) {
return true;
}
} else {
break;
}
int dx, dy;
switch (direction) {
case 0: dx = 1; dy = 0; break;
case 1: dx = 0; dy = 1; break;
case 2: dx = 1; dy = 1; break;
case 3: dx = -1; dy = 1; break;
default: return false;
}
for (int j = 15; j < 17; j++) {
for (int i = 0; i < 5; i++) {
if (piece[slot + i * j] == type) {
if (i == 4) {
return true;
}
} else {
break;
}
}
int nx = x + (4 * dx);
int ny = y + (4 * dy);
if (nx < 0 || nx >= 15 || ny < 0 || ny >= 15) {
return false;
}
return false;
}

private boolean searchCombo2(int x, int y, int type) {
int slot = y * 15 + x + 1;
for (int j = 14; j < 15; j++) {
for (int i = 0; i < 5; i++) {
if (piece[slot + i * j] == type) {
if (i == 4) {
return true;
}
} else {
break;
}
for (int i = 0; i < 5; i++) {
int checkSlot = slot + (i * dx) + (i * dy * 15);
if (piece[checkSlot] != type) {
return false;
}
}
return false;
return true;
}

public String getDescription() {
Expand Down