diff --git a/landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_ELECT.java b/landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_ELECT.java index 20654fb..3854190 100644 --- a/landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_ELECT.java +++ b/landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_ELECT.java @@ -16,27 +16,54 @@ public class ClientEventListener_CODE_GAME_LANDLORD_ELECT extends ClientEventLis @Override public void call(Channel channel, String data) { Map map = MapHelper.parser(data); - int turnClientId = (int) map.get("nextClientId"); - + int turnClientId = (Integer)map.get("nextClientId"); + int highestScore = (Integer)map.get("highestScore"); if (map.containsKey("preClientNickname")) { - SimplePrinter.printNotice(map.get("preClientNickname") + " don't rob the landlord!"); + if (highestScore != 0 && map.get("preClientId") == map.get("currentLandlordId")) { + SimplePrinter.printNotice(map.get("preClientNickname") + " robs the landlord with " + highestScore + " score" + (highestScore == 1 ? "" : "s") + "!"); + } else { + SimplePrinter.printNotice(map.get("preClientNickname") + " don't rob the landlord!"); + } } - if(turnClientId == SimpleClient.id) { - SimplePrinter.printNotice("It's your turn. Do you want to rob the landlord? [Y/N] (enter [exit|e] to exit current room)"); - String line = SimpleWriter.write(User.INSTANCE.getNickname(), "Y/N"); - if (line.equalsIgnoreCase("exit") || line.equalsIgnoreCase("e")) { - pushToServer(channel, ServerEventCode.CODE_CLIENT_EXIT); - } else if (line.equalsIgnoreCase("Y")) { - pushToServer(channel, ServerEventCode.CODE_GAME_LANDLORD_ELECT, "TRUE"); - } else if (line.equalsIgnoreCase("N")) { - pushToServer(channel, ServerEventCode.CODE_GAME_LANDLORD_ELECT, "FALSE"); - } else { - SimplePrinter.printNotice("Invalid options"); - call(channel, data); - } - } else { + if (turnClientId != SimpleClient.id) { SimplePrinter.printNotice("It's " + map.get("nextClientNickname") + "'s turn. Please wait patiently for his/her confirmation !"); + } else { + String message = "It's your turn. What score do you want to rob the landlord? [0"; + + for(int i = highestScore + 1; i <= 3; ++i) { + message = message + "/" + i; + } + + message = message + "] (enter [exit|e] to exit current room)"; + SimplePrinter.printNotice(message); + String line = SimpleWriter.write("getScore"); + if (!line.equalsIgnoreCase("exit") && !line.equalsIgnoreCase("e")) { + try { + int currentScore = Integer.parseInt(line); + if (currentScore <= highestScore && currentScore != 0 || currentScore > 3) { + SimplePrinter.printNotice("Invalid options"); + this.call(channel, data); + return; + } + + String result; + if (currentScore > highestScore) { + result = MapHelper.newInstance().put("highestScore", currentScore).put("currentLandlordId", SimpleClient.id).json(); + } else if (map.containsKey("currentLandlordId")) { + result = MapHelper.newInstance().put("highestScore", highestScore).put("currentLandlordId", (Integer)map.get("currentLandlordId")).json(); + } else { + result = MapHelper.newInstance().put("highestScore", 0).json(); + } + + this.pushToServer(channel, ServerEventCode.CODE_GAME_LANDLORD_ELECT, result); + } catch (Exception e) { + SimplePrinter.printNotice("Invalid options"); + this.call(channel, data); + } + } else { + this.pushToServer(channel, ServerEventCode.CODE_CLIENT_EXIT); + } } } diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/SimpleClient$1.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/SimpleClient$1.class deleted file mode 100644 index a49013e..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/SimpleClient$1.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/SimpleClient.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/SimpleClient.class deleted file mode 100644 index 5b6a743..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/SimpleClient.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/entity/User.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/entity/User.class deleted file mode 100644 index 5ef96ee..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/entity/User.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener.class deleted file mode 100644 index ba8f1f8..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_CLIENT_CONNECT.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_CLIENT_CONNECT.class deleted file mode 100644 index 22158c6..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_CLIENT_CONNECT.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_CLIENT_EXIT.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_CLIENT_EXIT.class deleted file mode 100644 index 98d78af..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_CLIENT_EXIT.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_CLIENT_KICK.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_CLIENT_KICK.class deleted file mode 100644 index f6e43f7..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_CLIENT_KICK.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_CLIENT_NICKNAME_SET.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_CLIENT_NICKNAME_SET.class deleted file mode 100644 index 8c85f74..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_CLIENT_NICKNAME_SET.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_CONFIRM$1.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_CONFIRM$1.class deleted file mode 100644 index a4e3347..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_CONFIRM$1.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_CONFIRM.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_CONFIRM.class deleted file mode 100644 index c224f33..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_CONFIRM.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_CYCLE.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_CYCLE.class deleted file mode 100644 index 7605639..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_CYCLE.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_ELECT.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_ELECT.class deleted file mode 100644 index 4766f99..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_LANDLORD_ELECT.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_OVER$1.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_OVER$1.class deleted file mode 100644 index a00a21d..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_OVER$1.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_OVER$2.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_OVER$2.class deleted file mode 100644 index 9d3bcdc..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_OVER$2.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_OVER.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_OVER.class deleted file mode 100644 index a03b32b..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_OVER.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY$1.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY$1.class deleted file mode 100644 index 2d8167d..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY$1.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY$2.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY$2.class deleted file mode 100644 index 16600fb..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY$2.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY.class deleted file mode 100644 index 194f3ca..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_CANT_PASS.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_CANT_PASS.class deleted file mode 100644 index 9c66772..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_CANT_PASS.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_INVALID.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_INVALID.class deleted file mode 100644 index 7789517..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_INVALID.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_LESS.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_LESS.class deleted file mode 100644 index e5b387a..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_LESS.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_MISMATCH.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_MISMATCH.class deleted file mode 100644 index f19ed83..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_MISMATCH.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_ORDER_ERROR.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_ORDER_ERROR.class deleted file mode 100644 index 6ae766f..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_ORDER_ERROR.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_PASS.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_PASS.class deleted file mode 100644 index 3e62d74..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_PASS.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_REDIRECT.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_REDIRECT.class deleted file mode 100644 index 7a0bf22..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_REDIRECT.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_READY.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_READY.class deleted file mode 100644 index 7573e5b..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_READY.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_STARTING$1.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_STARTING$1.class deleted file mode 100644 index 446d502..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_STARTING$1.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_STARTING.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_STARTING.class deleted file mode 100644 index 66235ad..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_STARTING.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH$1.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH$1.class deleted file mode 100644 index 43785bd..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH$1.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH$2.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH$2.class deleted file mode 100644 index e25f605..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH$2.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH.class deleted file mode 100644 index de00bb1..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH_SUCCESSFUL.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH_SUCCESSFUL.class deleted file mode 100644 index 2dacdbe..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_WATCH_SUCCESSFUL.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_PVE_DIFFICULTY_NOT_SUPPORT.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_PVE_DIFFICULTY_NOT_SUPPORT.class deleted file mode 100644 index 9ebbf53..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_PVE_DIFFICULTY_NOT_SUPPORT.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_CREATE_SUCCESS.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_CREATE_SUCCESS.class deleted file mode 100644 index 71866c3..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_CREATE_SUCCESS.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_FAIL_BY_FULL.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_FAIL_BY_FULL.class deleted file mode 100644 index c9fe084..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_FAIL_BY_FULL.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_FAIL_BY_INEXIST.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_FAIL_BY_INEXIST.class deleted file mode 100644 index 519cf6b..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_FAIL_BY_INEXIST.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_SUCCESS.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_SUCCESS.class deleted file mode 100644 index 20bd5e0..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_SUCCESS.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_PLAY_FAIL_BY_INEXIST.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_PLAY_FAIL_BY_INEXIST.class deleted file mode 100644 index 23d45cb..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_PLAY_FAIL_BY_INEXIST.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_OPTIONS.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_OPTIONS.class deleted file mode 100644 index 54b8869..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_OPTIONS.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_OPTIONS_PVE.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_OPTIONS_PVE.class deleted file mode 100644 index 0a71865..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_OPTIONS_PVE.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_OPTIONS_PVP.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_OPTIONS_PVP.class deleted file mode 100644 index 7efa122..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_OPTIONS_PVP.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_OPTIONS_SETTING.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_OPTIONS_SETTING.class deleted file mode 100644 index 4c1b1de..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_OPTIONS_SETTING.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_POKERS$1.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_POKERS$1.class deleted file mode 100644 index d2f5588..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_POKERS$1.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_POKERS.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_POKERS.class deleted file mode 100644 index 0ca91b9..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_POKERS.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_ROOMS$1.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_ROOMS$1.class deleted file mode 100644 index ce1c2c0..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_ROOMS$1.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_ROOMS.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_ROOMS.class deleted file mode 100644 index 91d9cdf..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_SHOW_ROOMS.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/handler/ProtobufTransferHandler.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/handler/ProtobufTransferHandler.class deleted file mode 100644 index dd4d2ab..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/handler/ProtobufTransferHandler.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/handler/SecondProtobufCodec.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/handler/SecondProtobufCodec.class deleted file mode 100644 index 5f86d81..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/handler/SecondProtobufCodec.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/handler/WebsocketTransferHandler.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/handler/WebsocketTransferHandler.class deleted file mode 100644 index 6fdaf52..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/handler/WebsocketTransferHandler.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/ProtobufProxy$1.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/ProtobufProxy$1.class deleted file mode 100644 index b8ff912..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/ProtobufProxy$1.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/ProtobufProxy.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/ProtobufProxy.class deleted file mode 100644 index 5795587..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/ProtobufProxy.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/Proxy.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/Proxy.class deleted file mode 100644 index 22989ad..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/Proxy.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/WebsocketProxy$1.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/WebsocketProxy$1.class deleted file mode 100644 index e8691ed..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/WebsocketProxy$1.class and /dev/null differ diff --git a/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/WebsocketProxy.class b/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/WebsocketProxy.class deleted file mode 100644 index e35a89d..0000000 Binary files a/landlords-client/target/classes/org/nico/ratel/landlords/client/proxy/WebsocketProxy.class and /dev/null differ diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/entity/ClientSide.java b/landlords-common/src/main/java/org/nico/ratel/landlords/entity/ClientSide.java index e587d02..79719ea 100644 --- a/landlords-common/src/main/java/org/nico/ratel/landlords/entity/ClientSide.java +++ b/landlords-common/src/main/java/org/nico/ratel/landlords/entity/ClientSide.java @@ -18,6 +18,8 @@ public class ClientSide { private int scoreInc; + private int round; + private String nickname; private List pokers; @@ -54,6 +56,18 @@ public class ClientSide { score = 0; } + public final void resetRound() { + round = 0; + } + + public final int getRound() { + return round; + } + + public final void addRound() { + round += 1; + } + public final ClientRole getRole() { return role; } diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/robot/AbstractRobotDecisionMakers.java b/landlords-common/src/main/java/org/nico/ratel/landlords/robot/AbstractRobotDecisionMakers.java index 316a2c5..caae614 100644 --- a/landlords-common/src/main/java/org/nico/ratel/landlords/robot/AbstractRobotDecisionMakers.java +++ b/landlords-common/src/main/java/org/nico/ratel/landlords/robot/AbstractRobotDecisionMakers.java @@ -16,5 +16,5 @@ public abstract class AbstractRobotDecisionMakers { public abstract PokerSell howToPlayPokers(PokerSell lastPokerSell, ClientSide robot); - public abstract boolean howToChooseLandlord(List leftPokers, List rightPokers, List myPokers); + public abstract int getLandlordScore(List leftPokers, List rightPokers, List myPokers); } diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/robot/EasyRobotDecisionMakers.java b/landlords-common/src/main/java/org/nico/ratel/landlords/robot/EasyRobotDecisionMakers.java index 3bc18d5..2f6dfb4 100644 --- a/landlords-common/src/main/java/org/nico/ratel/landlords/robot/EasyRobotDecisionMakers.java +++ b/landlords-common/src/main/java/org/nico/ratel/landlords/robot/EasyRobotDecisionMakers.java @@ -51,10 +51,23 @@ public class EasyRobotDecisionMakers extends AbstractRobotDecisionMakers { } @Override - public boolean howToChooseLandlord(List leftPokers, List rightPokers, List myPokers) { + public int getLandlordScore(List leftPokers, List rightPokers, List myPokers) { List leftSells = PokerHelper.parsePokerSells(leftPokers); List mySells = PokerHelper.parsePokerSells(myPokers); List rightSells = PokerHelper.parsePokerSells(rightPokers); - return mySells.size() > leftSells.size() && mySells.size() > rightSells.size(); - } + int expectedScore = 0; + if (mySells.size() > leftSells.size()) { + ++expectedScore; + } + + if (mySells.size() > rightSells.size()) { + ++expectedScore; + } + + if (expectedScore != 0) { + ++expectedScore; + } + + return expectedScore; + } } diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/robot/MediumRobotDecisionMakers.java b/landlords-common/src/main/java/org/nico/ratel/landlords/robot/MediumRobotDecisionMakers.java index 959f497..c5f9864 100644 --- a/landlords-common/src/main/java/org/nico/ratel/landlords/robot/MediumRobotDecisionMakers.java +++ b/landlords-common/src/main/java/org/nico/ratel/landlords/robot/MediumRobotDecisionMakers.java @@ -129,11 +129,24 @@ public class MediumRobotDecisionMakers extends AbstractRobotDecisionMakers { } @Override - public boolean howToChooseLandlord(List leftPokers, List rightPokers, List myPokers) { + public int getLandlordScore(List leftPokers, List rightPokers, List myPokers) { int leftScore = PokerHelper.parsePokerColligationScore(leftPokers); int rightScore = PokerHelper.parsePokerColligationScore(rightPokers); int myScore = PokerHelper.parsePokerColligationScore(myPokers); - return myScore >= (leftScore + rightScore) / 2; + int expectedScore = 0; + if (myScore >= Math.min(leftScore, rightScore)) { + ++expectedScore; + } + + if (myScore * 2 >= leftScore + rightScore) { + ++expectedScore; + } + + if (myScore >= Math.max(leftScore, rightScore)) { + ++expectedScore; + } + + return expectedScore; } } diff --git a/landlords-common/src/main/java/org/nico/ratel/landlords/robot/RobotDecisionMakers.java b/landlords-common/src/main/java/org/nico/ratel/landlords/robot/RobotDecisionMakers.java index d96d167..3b9ddb4 100644 --- a/landlords-common/src/main/java/org/nico/ratel/landlords/robot/RobotDecisionMakers.java +++ b/landlords-common/src/main/java/org/nico/ratel/landlords/robot/RobotDecisionMakers.java @@ -30,8 +30,8 @@ public class RobotDecisionMakers { return decisionMakersMap.get(difficultyCoefficient).howToPlayPokers(lastPokerSell, robot); } - public static boolean howToChooseLandlord(int difficultyCoefficient, List leftPokers, List rightPokers, List myPokers) { - return decisionMakersMap.get(difficultyCoefficient).howToChooseLandlord(leftPokers, rightPokers, myPokers); + public static int getLandlordScore(int difficultyCoefficient, List leftPokers, List rightPokers, List myPokers) { + return decisionMakersMap.get(difficultyCoefficient).getLandlordScore(leftPokers, rightPokers, myPokers); } } diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/channel/ChannelUtils.class b/landlords-common/target/classes/org/nico/ratel/landlords/channel/ChannelUtils.class deleted file mode 100644 index 66fd80b..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/channel/ChannelUtils.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientSide.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientSide.class deleted file mode 100644 index 4cca190..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientSide.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$1.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$1.class deleted file mode 100644 index 874c13d..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$1.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$ClientTransferDataProtoc$1.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$ClientTransferDataProtoc$1.class deleted file mode 100644 index 4db681e..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$ClientTransferDataProtoc$1.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$ClientTransferDataProtoc$Builder.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$ClientTransferDataProtoc$Builder.class deleted file mode 100644 index 950ae8f..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$ClientTransferDataProtoc$Builder.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$ClientTransferDataProtoc.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$ClientTransferDataProtoc.class deleted file mode 100644 index fb14748..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$ClientTransferDataProtoc.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$ClientTransferDataProtocOrBuilder.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$ClientTransferDataProtocOrBuilder.class deleted file mode 100644 index 61b6e71..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData$ClientTransferDataProtocOrBuilder.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData.class deleted file mode 100644 index f811d97..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ClientTransferData.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/Msg.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/Msg.class deleted file mode 100644 index 4e7ab56..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/Msg.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/Poker.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/Poker.class deleted file mode 100644 index d6e5004..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/Poker.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/PokerSell.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/PokerSell.class deleted file mode 100644 index 6bbbcdb..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/PokerSell.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/Room.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/Room.class deleted file mode 100644 index ab778f4..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/Room.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$1.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$1.class deleted file mode 100644 index dada861..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$1.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$ServerTransferDataProtoc$1.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$ServerTransferDataProtoc$1.class deleted file mode 100644 index 05318fe..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$ServerTransferDataProtoc$1.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$ServerTransferDataProtoc$Builder.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$ServerTransferDataProtoc$Builder.class deleted file mode 100644 index 5ebc3d0..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$ServerTransferDataProtoc$Builder.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$ServerTransferDataProtoc.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$ServerTransferDataProtoc.class deleted file mode 100644 index 3894e16..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$ServerTransferDataProtoc.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$ServerTransferDataProtocOrBuilder.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$ServerTransferDataProtocOrBuilder.class deleted file mode 100644 index 7b2bec7..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData$ServerTransferDataProtocOrBuilder.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData.class b/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData.class deleted file mode 100644 index 86f8a4d..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/entity/ServerTransferData.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/enums/ClientEventCode.class b/landlords-common/target/classes/org/nico/ratel/landlords/enums/ClientEventCode.class deleted file mode 100644 index 8f7ee3d..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/enums/ClientEventCode.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/enums/ClientRole.class b/landlords-common/target/classes/org/nico/ratel/landlords/enums/ClientRole.class deleted file mode 100644 index 2b57426..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/enums/ClientRole.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/enums/ClientStatus.class b/landlords-common/target/classes/org/nico/ratel/landlords/enums/ClientStatus.class deleted file mode 100644 index a833db9..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/enums/ClientStatus.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/enums/ClientType.class b/landlords-common/target/classes/org/nico/ratel/landlords/enums/ClientType.class deleted file mode 100644 index f20fc95..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/enums/ClientType.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/enums/PokerLevel.class b/landlords-common/target/classes/org/nico/ratel/landlords/enums/PokerLevel.class deleted file mode 100644 index 10ddefd..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/enums/PokerLevel.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/enums/PokerType.class b/landlords-common/target/classes/org/nico/ratel/landlords/enums/PokerType.class deleted file mode 100644 index 1153e7b..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/enums/PokerType.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/enums/RoomStatus.class b/landlords-common/target/classes/org/nico/ratel/landlords/enums/RoomStatus.class deleted file mode 100644 index 5f1ca9b..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/enums/RoomStatus.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/enums/RoomType.class b/landlords-common/target/classes/org/nico/ratel/landlords/enums/RoomType.class deleted file mode 100644 index f11db0e..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/enums/RoomType.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/enums/SellType.class b/landlords-common/target/classes/org/nico/ratel/landlords/enums/SellType.class deleted file mode 100644 index 51141d6..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/enums/SellType.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/enums/ServerEventCode.class b/landlords-common/target/classes/org/nico/ratel/landlords/enums/ServerEventCode.class deleted file mode 100644 index f6e8344..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/enums/ServerEventCode.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/exception/LandlordException.class b/landlords-common/target/classes/org/nico/ratel/landlords/exception/LandlordException.class deleted file mode 100644 index 2d460db..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/exception/LandlordException.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/features/Features.class b/landlords-common/target/classes/org/nico/ratel/landlords/features/Features.class deleted file mode 100644 index 79bc330..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/features/Features.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/handler/DefaultDecoder.class b/landlords-common/target/classes/org/nico/ratel/landlords/handler/DefaultDecoder.class deleted file mode 100644 index 5461e71..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/handler/DefaultDecoder.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/helper/MapHelper.class b/landlords-common/target/classes/org/nico/ratel/landlords/helper/MapHelper.class deleted file mode 100644 index fb868fd..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/helper/MapHelper.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/helper/PokerHelper.class b/landlords-common/target/classes/org/nico/ratel/landlords/helper/PokerHelper.class deleted file mode 100644 index b3ac1e3..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/helper/PokerHelper.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/helper/TimeHelper.class b/landlords-common/target/classes/org/nico/ratel/landlords/helper/TimeHelper.class deleted file mode 100644 index b59d5fe..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/helper/TimeHelper.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/print/FormatPrinter.class b/landlords-common/target/classes/org/nico/ratel/landlords/print/FormatPrinter.class deleted file mode 100644 index 5a2a229..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/print/FormatPrinter.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/print/SimplePrinter.class b/landlords-common/target/classes/org/nico/ratel/landlords/print/SimplePrinter.class deleted file mode 100644 index a4eec7d..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/print/SimplePrinter.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/print/SimpleWriter.class b/landlords-common/target/classes/org/nico/ratel/landlords/print/SimpleWriter.class deleted file mode 100644 index fdde601..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/print/SimpleWriter.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/robot/AbstractRobotDecisionMakers.class b/landlords-common/target/classes/org/nico/ratel/landlords/robot/AbstractRobotDecisionMakers.class deleted file mode 100644 index ad710fd..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/robot/AbstractRobotDecisionMakers.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/robot/EasyRobotDecisionMakers.class b/landlords-common/target/classes/org/nico/ratel/landlords/robot/EasyRobotDecisionMakers.class deleted file mode 100644 index c18c191..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/robot/EasyRobotDecisionMakers.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/robot/MediumRobotDecisionMakers.class b/landlords-common/target/classes/org/nico/ratel/landlords/robot/MediumRobotDecisionMakers.class deleted file mode 100644 index a3cd8fe..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/robot/MediumRobotDecisionMakers.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/robot/RobotDecisionMakers.class b/landlords-common/target/classes/org/nico/ratel/landlords/robot/RobotDecisionMakers.class deleted file mode 100644 index dfa5ea1..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/robot/RobotDecisionMakers.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/transfer/ByteKit.class b/landlords-common/target/classes/org/nico/ratel/landlords/transfer/ByteKit.class deleted file mode 100644 index b3441d3..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/transfer/ByteKit.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/transfer/ByteLink$ByteNode.class b/landlords-common/target/classes/org/nico/ratel/landlords/transfer/ByteLink$ByteNode.class deleted file mode 100644 index 87b4029..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/transfer/ByteLink$ByteNode.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/transfer/ByteLink.class b/landlords-common/target/classes/org/nico/ratel/landlords/transfer/ByteLink.class deleted file mode 100644 index e01cb7f..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/transfer/ByteLink.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/transfer/TransferProtocolUtils.class b/landlords-common/target/classes/org/nico/ratel/landlords/transfer/TransferProtocolUtils.class deleted file mode 100644 index fbccc32..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/transfer/TransferProtocolUtils.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/utils/JsonUtils.class b/landlords-common/target/classes/org/nico/ratel/landlords/utils/JsonUtils.class deleted file mode 100644 index f9555be..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/utils/JsonUtils.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/utils/LastCardsUtils$1.class b/landlords-common/target/classes/org/nico/ratel/landlords/utils/LastCardsUtils$1.class deleted file mode 100644 index ec51f7b..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/utils/LastCardsUtils$1.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/utils/LastCardsUtils.class b/landlords-common/target/classes/org/nico/ratel/landlords/utils/LastCardsUtils.class deleted file mode 100644 index f4a61c3..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/utils/LastCardsUtils.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/utils/ListUtils.class b/landlords-common/target/classes/org/nico/ratel/landlords/utils/ListUtils.class deleted file mode 100644 index eb2e9fc..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/utils/ListUtils.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/utils/OptionsUtils.class b/landlords-common/target/classes/org/nico/ratel/landlords/utils/OptionsUtils.class deleted file mode 100644 index d2f9c94..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/utils/OptionsUtils.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/utils/RegxUtils.class b/landlords-common/target/classes/org/nico/ratel/landlords/utils/RegxUtils.class deleted file mode 100644 index 2ed3d1a..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/utils/RegxUtils.class and /dev/null differ diff --git a/landlords-common/target/classes/org/nico/ratel/landlords/utils/StreamUtils.class b/landlords-common/target/classes/org/nico/ratel/landlords/utils/StreamUtils.class deleted file mode 100644 index 642796f..0000000 Binary files a/landlords-common/target/classes/org/nico/ratel/landlords/utils/StreamUtils.class and /dev/null differ diff --git a/landlords-common/target/test-classes/org/nico/ratel/landlords/helper/tests/PokerHelperTest.class b/landlords-common/target/test-classes/org/nico/ratel/landlords/helper/tests/PokerHelperTest.class deleted file mode 100644 index 154d9e2..0000000 Binary files a/landlords-common/target/test-classes/org/nico/ratel/landlords/helper/tests/PokerHelperTest.class and /dev/null differ diff --git a/landlords-common/target/test-classes/org/nico/ratel/landlords/robot/tests/MediumRobotDecisionMakersTests.class b/landlords-common/target/test-classes/org/nico/ratel/landlords/robot/tests/MediumRobotDecisionMakersTests.class deleted file mode 100644 index 3efcbfe..0000000 Binary files a/landlords-common/target/test-classes/org/nico/ratel/landlords/robot/tests/MediumRobotDecisionMakersTests.class and /dev/null differ diff --git a/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.java b/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.java index d17ac5b..3dcc64c 100644 --- a/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.java +++ b/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.java @@ -20,6 +20,10 @@ public class ServerEventListener_CODE_CLIENT_OFFLINE implements ServerEventListe return; } + if (room.getWatcherList().contains(clientSide)) { + return; + } + String result = MapHelper.newInstance() .put("roomId", room.getId()) .put("exitClientId", clientSide.getId()) diff --git a/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_LANDLORD_ELECT.java b/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_LANDLORD_ELECT.java index d33141f..0a53c15 100644 --- a/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_LANDLORD_ELECT.java +++ b/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_LANDLORD_ELECT.java @@ -21,34 +21,64 @@ public class ServerEventListener_CODE_GAME_LANDLORD_ELECT implements ServerEvent public void call(ClientSide clientSide, String data) { Room room = ServerContains.getRoom(clientSide.getRoomId()); + Map map = MapHelper.parser(data); + int highestScore = (Integer)map.get("highestScore"); if (room == null) { return; } - if (Boolean.parseBoolean(data)) { + if (highestScore == 3) { + room.setBaseScore(highestScore); confirmLandlord(clientSide, room); return; } if (clientSide.getNext().getId() == room.getFirstSellClient()) { - for (ClientSide client : room.getClientSideList()) { - if (client.getRole() == ClientRole.PLAYER) { - ChannelUtils.pushToClient(client.getChannel(), ClientEventCode.CODE_GAME_LANDLORD_CYCLE, null); + if (highestScore == 0) { + for (ClientSide client : room.getClientSideList()) { + if (client.getRole() == ClientRole.PLAYER) { + ChannelUtils.pushToClient(client.getChannel(), ClientEventCode.CODE_GAME_LANDLORD_CYCLE, null); + } } + ServerEventListener.get(ServerEventCode.CODE_GAME_STARTING).call(clientSide, null); + return; + } else { + room.setBaseScore(highestScore); + int landlordId = (Integer)map.get("currentLandlordId"); + for (ClientSide client : room.getClientSideList()) + if (client.getId() == landlordId) { + confirmLandlord(client, room); + return; + } } - ServerEventListener.get(ServerEventCode.CODE_GAME_STARTING).call(clientSide, null); - return; + } ClientSide turnClientSide = clientSide.getNext(); room.setCurrentSellClient(turnClientSide.getId()); - String result = MapHelper.newInstance() + String result; + + if (highestScore != 0) { + result = MapHelper.newInstance() + .put("roomId", room.getId()) + .put("roomOwner", room.getRoomOwner()) + .put("roomClientCount", room.getClientSideList().size()) + .put("preClientNickname", clientSide.getNickname()) + .put("preClientId", clientSide.getId()) + .put("nextClientNickname", turnClientSide.getNickname()) + .put("nextClientId", turnClientSide.getId()) + .put("highestScore", highestScore) + .put("currentLandlordId", (Integer)map.get("currentLandlordId")) + .json(); + } else { + result = MapHelper.newInstance() .put("roomId", room.getId()) .put("roomOwner", room.getRoomOwner()) .put("roomClientCount", room.getClientSideList().size()) .put("preClientNickname", clientSide.getNickname()) .put("nextClientNickname", turnClientSide.getNickname()) .put("nextClientId", turnClientSide.getId()) + .put("highestScore", 0) .json(); - + } for (ClientSide client : room.getClientSideList()) { if (client.getRole() == ClientRole.PLAYER) { ChannelUtils.pushToClient(client.getChannel(), ClientEventCode.CODE_GAME_LANDLORD_ELECT, result); @@ -80,6 +110,7 @@ public class ServerEventListener_CODE_GAME_LANDLORD_ELECT implements ServerEvent .put("landlordId", clientSide.getId()) .put("additionalPokers", room.getLandlordPokers()) .json(); + client.resetRound(); if (client.getRole() == ClientRole.PLAYER) { ChannelUtils.pushToClient(client.getChannel(), ClientEventCode.CODE_GAME_LANDLORD_CONFIRM, result); diff --git a/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_POKER_PLAY.java b/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_POKER_PLAY.java index 1ee6c2e..c785e94 100644 --- a/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_POKER_PLAY.java +++ b/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_POKER_PLAY.java @@ -69,6 +69,8 @@ public class ServerEventListener_CODE_GAME_POKER_PLAY implements ServerEventList ClientSide next = clientSide.getNext(); + clientSide.addRound(); + if (currentPokerSell.getSellType() == SellType.BOMB || currentPokerSell.getSellType() == SellType.KING_BOMB) { // 炸弹积分翻倍 room.increaseRate(); @@ -190,13 +192,13 @@ public class ServerEventListener_CODE_GAME_POKER_PLAY implements ServerEventList private boolean isSpring(ClientSide winner, Room room) { boolean isSpring = true; for (ClientSide client: room.getClientSideList()) { - if (client.getId() == winner.getId()) { + if (client.getType() == winner.getType()) { continue; } - if (client.getType() == ClientType.PEASANT && client.getPokers().size() < 17) { + if (client.getType() == ClientType.PEASANT && client.getRound() > 0) { isSpring = false; } - if (client.getType() == ClientType.LANDLORD && client.getPokers().size() < 20) { + if (client.getType() == ClientType.LANDLORD && client.getRound() > 1) { isSpring = false; } } diff --git a/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_STARTING.java b/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_STARTING.java index 1372300..aa146b9 100644 --- a/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_STARTING.java +++ b/landlords-server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_STARTING.java @@ -54,6 +54,7 @@ public class ServerEventListener_CODE_GAME_STARTING implements ServerEventListen otherPokers.add(otherClient.getPokers()); } } + otherPokers.add(room.getLandlordPokers()); String lastCards = LastCardsUtils.getLastCards(otherPokers); otherPokers = new ArrayList<>(); String result = MapHelper.newInstance() @@ -64,6 +65,7 @@ public class ServerEventListener_CODE_GAME_STARTING implements ServerEventListen .put("nextClientId", startGrabClient.getId()) .put("pokers", client.getPokers()) .put("lastPokers",lastCards) + .put("highestScore", 0) .json(); if (client.getRole() == ClientRole.PLAYER) { diff --git a/landlords-server/src/main/java/org/nico/ratel/landlords/server/robot/RobotEventListener_CODE_GAME_LANDLORD_ELECT.java b/landlords-server/src/main/java/org/nico/ratel/landlords/server/robot/RobotEventListener_CODE_GAME_LANDLORD_ELECT.java index 73ea3c5..3bb092c 100644 --- a/landlords-server/src/main/java/org/nico/ratel/landlords/server/robot/RobotEventListener_CODE_GAME_LANDLORD_ELECT.java +++ b/landlords-server/src/main/java/org/nico/ratel/landlords/server/robot/RobotEventListener_CODE_GAME_LANDLORD_ELECT.java @@ -2,12 +2,14 @@ package org.nico.ratel.landlords.server.robot; import java.util.ArrayList; import java.util.List; +import java.util.Map; import org.nico.ratel.landlords.entity.ClientSide; import org.nico.ratel.landlords.entity.Poker; import org.nico.ratel.landlords.entity.Room; import org.nico.ratel.landlords.enums.ServerEventCode; import org.nico.ratel.landlords.helper.PokerHelper; +import org.nico.ratel.landlords.helper.MapHelper; import org.nico.ratel.landlords.helper.TimeHelper; import org.nico.ratel.landlords.robot.RobotDecisionMakers; import org.nico.ratel.landlords.server.ServerContains; @@ -36,7 +38,20 @@ public class RobotEventListener_CODE_GAME_LANDLORD_ELECT implements RobotEventLi TimeHelper.sleep(300); - ServerEventListener.get(ServerEventCode.CODE_GAME_LANDLORD_ELECT).call(robot, String.valueOf(RobotDecisionMakers.howToChooseLandlord(room.getDifficultyCoefficient(), leftPokers, rightPokers, landlordPokers))); + Map map = MapHelper.parser(data); + int expectedScore = RobotDecisionMakers.getLandlordScore(room.getDifficultyCoefficient(), leftPokers, rightPokers, landlordPokers); + int highestScore = (Integer)map.get("highestScore"); + String result; + if (expectedScore > highestScore) { + result = MapHelper.newInstance() + .put("highestScore", expectedScore) + .put("currentLandlordId", robot.getId()) + .json(); + } else { + result = data; + } + + ServerEventListener.get(ServerEventCode.CODE_GAME_LANDLORD_ELECT).call(robot, result); }); } diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/ServerContains.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/ServerContains.class deleted file mode 100644 index 63a9344..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/ServerContains.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/SimpleServer.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/SimpleServer.class deleted file mode 100644 index 771b7b7..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/SimpleServer.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener.class deleted file mode 100644 index b0469fe..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_EXIT.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_EXIT.class deleted file mode 100644 index 1dc3b47..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_EXIT.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_INFO_SET.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_INFO_SET.class deleted file mode 100644 index f471f62..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_INFO_SET.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_NICKNAME_SET.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_NICKNAME_SET.class deleted file mode 100644 index be272bc..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_NICKNAME_SET.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.class deleted file mode 100644 index 83cde79..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_LANDLORD_ELECT.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_LANDLORD_ELECT.class deleted file mode 100644 index 89e8f0b..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_LANDLORD_ELECT.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_POKER_PLAY.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_POKER_PLAY.class deleted file mode 100644 index 8d3edd7..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_POKER_PLAY.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_POKER_PLAY_PASS.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_POKER_PLAY_PASS.class deleted file mode 100644 index 86b9313..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_POKER_PLAY_PASS.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_POKER_PLAY_REDIRECT.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_POKER_PLAY_REDIRECT.class deleted file mode 100644 index b8c65ca..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_POKER_PLAY_REDIRECT.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_READY.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_READY.class deleted file mode 100644 index 444f47d..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_READY.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_STARTING.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_STARTING.class deleted file mode 100644 index 72f79cf..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_STARTING.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_WATCH.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_WATCH.class deleted file mode 100644 index 7108b6c..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_WATCH.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_WATCH_EXIT.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_WATCH_EXIT.class deleted file mode 100644 index e0f7f13..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_WATCH_EXIT.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GET_ROOMS.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GET_ROOMS.class deleted file mode 100644 index ac0d6df..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GET_ROOMS.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_CREATE.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_CREATE.class deleted file mode 100644 index 53c6a7b..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_CREATE.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_CREATE_PVE.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_CREATE_PVE.class deleted file mode 100644 index 41430e9..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_CREATE_PVE.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_JOIN.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_JOIN.class deleted file mode 100644 index 1a06984..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_JOIN.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/handler/ProtobufTransferHandler.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/handler/ProtobufTransferHandler.class deleted file mode 100644 index 9d2c4cc..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/handler/ProtobufTransferHandler.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/handler/SecondProtobufCodec.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/handler/SecondProtobufCodec.class deleted file mode 100644 index 21a5bd2..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/handler/SecondProtobufCodec.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/handler/WebsocketTransferHandler.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/handler/WebsocketTransferHandler.class deleted file mode 100644 index 745cc94..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/handler/WebsocketTransferHandler.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/ProtobufProxy$1.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/ProtobufProxy$1.class deleted file mode 100644 index 8630dad..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/ProtobufProxy$1.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/ProtobufProxy.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/ProtobufProxy.class deleted file mode 100644 index b23f1ca..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/ProtobufProxy.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/Proxy.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/Proxy.class deleted file mode 100644 index 29006ef..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/Proxy.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/WebsocketProxy$1.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/WebsocketProxy$1.class deleted file mode 100644 index dacb3c4..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/WebsocketProxy$1.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/WebsocketProxy.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/WebsocketProxy.class deleted file mode 100644 index 91b91c7..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/proxy/WebsocketProxy.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/robot/RobotEventListener.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/robot/RobotEventListener.class deleted file mode 100644 index ee2a9c3..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/robot/RobotEventListener.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/robot/RobotEventListener_CODE_GAME_LANDLORD_ELECT.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/robot/RobotEventListener_CODE_GAME_LANDLORD_ELECT.class deleted file mode 100644 index ebe9e3f..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/robot/RobotEventListener_CODE_GAME_LANDLORD_ELECT.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/robot/RobotEventListener_CODE_GAME_POKER_PLAY.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/robot/RobotEventListener_CODE_GAME_POKER_PLAY.class deleted file mode 100644 index 946caf3..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/robot/RobotEventListener_CODE_GAME_POKER_PLAY.class and /dev/null differ diff --git a/landlords-server/target/classes/org/nico/ratel/landlords/server/timer/RoomClearTask.class b/landlords-server/target/classes/org/nico/ratel/landlords/server/timer/RoomClearTask.class deleted file mode 100644 index 1a779b6..0000000 Binary files a/landlords-server/target/classes/org/nico/ratel/landlords/server/timer/RoomClearTask.class and /dev/null differ