Yandrik/Gamelib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: resolve various issues with ai, cloning and turn order handling

Browse Source
This commit is contained in:
punchready 2021-06-05 04:00:25 +02:00
parent cd992b0fa6
commit f2a961d159
6 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/uulm/teamname/marvelous/gamelibrary/entities/Inventory.java
View File

@ -1,9 +1,6 @@
package uulm.teamname.marvelous.gamelibrary.entities;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Objects;
import java.util.*;
/** Represents an inventory of 6 slots of {@link StoneType StoneTypes} that can be manipulated. */
public class Inventory implements Iterable<StoneType> {
@ -85,12 +82,12 @@ public class Inventory implements Iterable<StoneType> {
* @return The array of stones the inventory has
*/
public StoneType[] getStonesAsArray() {
var toReturn = new StoneType[content.size()];
var iterator = content.iterator();
for (int i = 0; i < content.size(); i++) {
toReturn[i] = iterator.next();
StoneType[] result = new StoneType[content.size()];
int i = 0;
for(StoneType stone: content) {
result[i++] = stone;
}
return toReturn;
return result;
}
/**

13
src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/EntityManager.java
View File

@ -60,7 +60,7 @@ public class EntityManager {
if(entity.id.isSameType(EntityType.Rocks)) {
usedRockSlots.add(entity.id.id);
}
entities.add(entity);
entities.add(entity.clone());
}
/**
@ -69,7 +69,7 @@ public class EntityManager {
*/
void addEntities(Entity... entities) {
for(Entity e: entities) {
this.addEntity(e);
this.addEntity(e.clone());
}
}
@ -89,18 +89,13 @@ public class EntityManager {
* @param entityid The {@link EntityID} of the {@link Entity} to remove
*/
boolean removeEntity(EntityID entityid) {
Entity entity = findEntity(entityid);
if(entity != null) {
return entities.remove(entity);
}else {
return false;
}
return entities.removeIf(e -> e.id.equals(entityid));
}
/**
* Finds an entity with an {@link EntityID}.
* @param id The id to search for
* @return The found {@link Entity} or null if none found
* @return The found {@link Entity} or {@code null} if none found
*/
public Entity findEntity(EntityID id) {
for(Entity entity: entities) {

41
src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java
View File

@ -1,5 +1,6 @@
package uulm.teamname.marvelous.gamelibrary.gamelogic;
import org.tinylog.Logger;
import uulm.teamname.marvelous.gamelibrary.ArrayTools;
import uulm.teamname.marvelous.gamelibrary.IntVector2;
import uulm.teamname.marvelous.gamelibrary.config.FieldType;
@ -187,7 +188,7 @@ public class GameLogic {
}
}
}catch(InvalidRequestException exception) {
System.out.println("Request denied: " + exception.getMessage());
Logger.debug("Request denied: " + exception.getMessage());
return false;
}catch(Exception ignored) {
return false;
@ -332,7 +333,6 @@ public class GameLogic {
if(target.hp.getValue() <= data.value) {
List<StoneType> stones = Arrays.asList(target.inventory.getStonesAsArray());
target.inventory.clear();
Collections.shuffle(stones); // required by documents
for(StoneType stone: stones) {
@ -504,6 +504,7 @@ public class GameLogic {
EntityType opposing = target.id.type == EntityType.P1 ? EntityType.P2 : EntityType.P1;
state.winConditions.increaseValue(opposing, WinCondition.TotalDamage, data.amount);
if(!target.isAlive()) {
target.inventory.clear();
state.winConditions.increaseValue(opposing, WinCondition.TotalKnockouts, 1);
}
@ -716,7 +717,7 @@ public class GameLogic {
* @return The list of resulting {@link Event Events}
*/
protected static ArrayList<Event> startGame(GameState state, ArrayList<Integer> selectedCharacters1, ArrayList<Integer> selectedCharacters2) {
System.out.println("Starting game");
Logger.trace("Starting game");
ArrayList<Event> result = new ArrayList<>();
@ -823,7 +824,11 @@ public class GameLogic {
continue;
}
Character character = ((Character)state.entities.findEntity(id));
Entity found = state.entities.findEntity(id);
if(found == null) {
continue;
}
Character character = ((Character)found);
if(character.isAlive()){
anyAlive = true;
@ -868,8 +873,6 @@ public class GameLogic {
* @return The list of resulting {@link Event Events}
*/
private static ArrayList<Event> handleRoundStart(GameState state) {
System.out.println("Starting round " + (state.roundNumber + 1));
ArrayList<Event> result = new ArrayList<>();
state.roundNumber++;
@ -898,7 +901,11 @@ public class GameLogic {
Collections.shuffle(state.turnOrder);
for (EntityID id: state.turnOrder) {
if(id.type == EntityType.NPC || revived.contains(id) || ((Character)state.entities.findEntity(id)).isAlive()){
Entity found = state.entities.findEntity(id);
if(found == null) {
continue;
}
if(id.type == EntityType.NPC || revived.contains(id) || ((Character)found).isAlive()){
state.activeCharacter = id;
break;
}else { // again send empty turns for knocked out characters
@ -973,6 +980,9 @@ public class GameLogic {
ArrayList<IntVector2> targetOptions = new ArrayList<>();
int lowest = -1;
for(EntityID id: state.turnOrder) {
if(id.type == EntityType.NPC) {
continue;
}
Character character = (Character)state.entities.findEntity(id);
characters.add(character);
@ -1037,6 +1047,9 @@ public class GameLogic {
int maxMP = -1;
for(EntityID id: state.turnOrder) {
if(id.type == EntityType.NPC) {
continue;
}
Character character = (Character)state.entities.findEntity(id);
if(character.mp.getMax() > maxMP) {
@ -1095,7 +1108,7 @@ public class GameLogic {
ArrayList<IntVector2> path = GameLogic.Bresenham4Connected(thanos.getPosition(), picked);
int mp = thanos.mp.getValue();
int mp = thanos.mp.getMax();
if(mp <= 0) {
return result;
@ -1145,6 +1158,10 @@ public class GameLogic {
break;
}
if(entity instanceof InfinityStone) {
result.add(new EventBuilder(EventType.DestroyedEntityEvent)
.withTargetEntity(entity.id)
.withTargetField(pos)
.buildEntityEvent());
break;
}
}
@ -1162,10 +1179,14 @@ public class GameLogic {
if(id.type == EntityType.NPC) {
continue;
}
Entity found = state.entities.findEntity(id);
if(found == null) {
continue;
}
if(rand.nextBoolean()) {
result.add(new EventBuilder(EventType.DestroyedEntityEvent)
.withTargetEntity(id)
.withTargetField(state.entities.findEntity(id).getPosition())
.withTargetField(found.getPosition())
.buildEntityEvent());
}
}
@ -1204,7 +1225,7 @@ public class GameLogic {
* @return The list of resulting {@link Event Events}
*/
private static ArrayList<Event> handlePlayerWin(GameState state, EntityType winner) {
System.out.println("Player " + winner + " won");
Logger.trace("Player " + winner + " won");
ArrayList<Event> result = new ArrayList<>();

2
src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameState.java
View File

@ -142,6 +142,7 @@ class GameState {
sb.append("T");
}
}
sb.append(entities.get(0).id.equals(activeCharacter) ? "'" : " ");
}
case P1, P2 -> {
if(((Character)entities.get(0)).isAlive()) {
@ -149,6 +150,7 @@ class GameState {
}else {
sb.append("x");
}
sb.append(entities.get(0).id.equals(activeCharacter) ? "'" : " ");
}
case Rocks -> {
sb.append("O ");

4
src/test/java/uulm/teamname/marvelous/gamelibrary/gamelogic/AITest.java
View File

@ -39,9 +39,7 @@ class AITest extends BaseGameLogicTest {
void main() throws InterruptedException {
serverSend(server.startGame(player1Selection, player2Selection).toArray(new Event[0]));
Thread.sleep(1000);
System.out.println(server.toString());
Thread.sleep(10000);
}
private void clientSend(Request[] requests) {

2
src/test/java/uulm/teamname/marvelous/gamelibrary/gamelogic/BaseGameLogicTest.java
View File

@ -17,7 +17,7 @@ public class BaseGameLogicTest {
protected static final ArrayList<Integer> player2Selection = new ArrayList<>();
protected static void generate() {
partyConfig.maxRounds = 100;
partyConfig.maxRounds = 50;
partyConfig.mindStoneCD = 2;
partyConfig.powerStoneCD = 3;
partyConfig.realityStoneCD = 4;