mirror of
https://github.com/Sheldan/abstracto.git
synced 2026-04-14 19:56:29 +00:00
[AB-66] adding mines game
fixing suggestion evaluation job not getting the correct parameters adding feature dependent parameters
This commit is contained in:
@@ -5,7 +5,7 @@ import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public enum EntertainmentFeatureDefinition implements FeatureDefinition {
|
||||
ENTERTAINMENT("entertainment"), ECONOMY("economy");
|
||||
ENTERTAINMENT("entertainment"), ECONOMY("economy"), GAMES("games");
|
||||
|
||||
private String key;
|
||||
|
||||
|
||||
@@ -4,4 +4,5 @@ public class EntertainmentSlashCommandNames {
|
||||
public static final String ENTERTAINMENT = "entertainment";
|
||||
public static final String UTILITY = "utility";
|
||||
public static final String ECONOMY = "economy";
|
||||
public static final String GAME = "game";
|
||||
}
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
package dev.sheldan.abstracto.entertainment.config;
|
||||
|
||||
import dev.sheldan.abstracto.core.config.FeatureConfig;
|
||||
import dev.sheldan.abstracto.core.config.FeatureDefinition;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
@Component
|
||||
public class GamesFeatureConfig implements FeatureConfig {
|
||||
|
||||
public static final String MINES_CREDITS_FACTOR = "minesCreditsFactor";
|
||||
|
||||
@Override
|
||||
public FeatureDefinition getFeature() {
|
||||
return EntertainmentFeatureDefinition.GAMES;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getRequiredSystemConfigKeys() {
|
||||
return Arrays.asList(MINES_CREDITS_FACTOR);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package dev.sheldan.abstracto.entertainment.exception;
|
||||
|
||||
import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException;
|
||||
|
||||
public class InvalidGameBoardException extends AbstractoTemplatableException {
|
||||
@Override
|
||||
public String getTemplateName() {
|
||||
return "invalid_mine_board_config_exception";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getTemplateModel() {
|
||||
return new Object();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package dev.sheldan.abstracto.entertainment.model.command.games;
|
||||
|
||||
import dev.sheldan.abstracto.entertainment.service.GameService;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@Builder
|
||||
public class MineBoard {
|
||||
private String boardId;
|
||||
private Long userId;
|
||||
private Long serverId;
|
||||
private Long messageId;
|
||||
private Long channelId;
|
||||
private Integer rowCount;
|
||||
private Integer columnCount;
|
||||
private Integer credits;
|
||||
private Long creditChange;
|
||||
private boolean creditsEnabled;
|
||||
private Integer mineCount;
|
||||
private List<MineBoardRow> rows;
|
||||
private GameService.MineResult state;
|
||||
|
||||
public MineBoardField getField(int x, int y) {
|
||||
if(x > columnCount || y > rowCount) {
|
||||
throw new IllegalArgumentException("Out of bounds access to board.");
|
||||
}
|
||||
MineBoardRow mineBoardRow = rows.get(y);
|
||||
return mineBoardRow.getFields().get(x);
|
||||
}
|
||||
|
||||
public List<MineBoardField> getFields() {
|
||||
List<MineBoardField> fields = new ArrayList<>();
|
||||
rows.forEach(mineBoardRow -> fields.addAll(mineBoardRow.getFields()));
|
||||
return fields;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package dev.sheldan.abstracto.entertainment.model.command.games;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Builder
|
||||
@Setter
|
||||
public class MineBoardField {
|
||||
private MineBoardField.MineBoardFieldType type;
|
||||
private Integer x;
|
||||
private Integer y;
|
||||
private Integer counterValue;
|
||||
|
||||
public enum MineBoardFieldType {
|
||||
MINE, UNCOVERED, COVERED, EXPLODED
|
||||
}
|
||||
|
||||
public static boolean canInteract(MineBoardFieldType currentType) {
|
||||
return currentType != MineBoardFieldType.UNCOVERED && currentType != MineBoardFieldType.EXPLODED;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
package dev.sheldan.abstracto.entertainment.model.command.games;
|
||||
|
||||
import dev.sheldan.abstracto.core.interaction.button.ButtonPayload;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Builder
|
||||
@Setter
|
||||
public class MineBoardPayload implements ButtonPayload {
|
||||
private MineBoard mineBoard;
|
||||
private Integer x;
|
||||
private Integer y;
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package dev.sheldan.abstracto.entertainment.model.command.games;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Builder
|
||||
public class MineBoardRow {
|
||||
private List<MineBoardField> fields;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package dev.sheldan.abstracto.entertainment.service;
|
||||
|
||||
import dev.sheldan.abstracto.entertainment.model.command.games.MineBoard;
|
||||
import net.dv8tion.jda.api.entities.Message;
|
||||
|
||||
public interface GameService {
|
||||
MineBoard createBoard(Integer width, Integer height, Integer mines);
|
||||
void persistMineBoardMessage(MineBoard mineBoard, Message message);
|
||||
void updateMineBoard(MineBoard mineBoard);
|
||||
void uncoverBoard(MineBoard mineBoard);
|
||||
void evaluateCreditChanges(MineBoard mineBoard);
|
||||
MineResult uncoverField(MineBoard board, Integer x, Integer y);
|
||||
|
||||
|
||||
enum MineResult {
|
||||
WON, LOST, CONTINUE
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package dev.sheldan.abstracto.entertainment.service.management;
|
||||
|
||||
import dev.sheldan.abstracto.core.models.ServerUser;
|
||||
import dev.sheldan.abstracto.core.models.database.AServer;
|
||||
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
|
||||
import dev.sheldan.abstracto.entertainment.model.database.EconomyLeaderboardResult;
|
||||
@@ -11,6 +12,7 @@ import java.util.Optional;
|
||||
public interface EconomyUserManagementService {
|
||||
EconomyUser createUser(AUserInAServer aUserInAServer);
|
||||
Optional<EconomyUser> getUser(AUserInAServer aUserInAServer);
|
||||
Optional<EconomyUser> getUser(ServerUser serverUser);
|
||||
EconomyLeaderboardResult getRankOfUserInServer(AUserInAServer aUserInAServer);
|
||||
List<EconomyUser> getRanksInServer(AServer server, Integer page, Integer size);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user