Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/main/java/dk/sdu/mmmi/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import dk.sdu.mmmi.modulemon.Collision.CollisionProcessing;
import dk.sdu.mmmi.modulemon.Game;
import dk.sdu.mmmi.modulemon.Interaction.InteractProcessing;
import dk.sdu.mmmi.modulemon.MCTSBattleAI.MCTSBattleAIFactory;
import dk.sdu.mmmi.modulemon.Map.MapView;
import dk.sdu.mmmi.modulemon.MapEntities.MapEntityPlugin;
import dk.sdu.mmmi.modulemon.Monster.BattleMonsterProcessor;
Expand All @@ -29,7 +30,8 @@ public static void main(String[] args) throws IOException, URISyntaxException {
var settings = new Settings();
var monsterRegistry = new MonsterRegistry();
var battleMonsterProcessor = new BattleMonsterProcessor();
var battleAI = new dk.sdu.mmmi.modulemon.BattleAI.BattleAIFactory();
var battleAI = new MCTSBattleAIFactory();
//var battleAI = new dk.sdu.mmmi.modulemon.BattleAI.BattleAIFactory();
// var battleAI = new dk.sdu.mmmi.modulemon.SimpleAI.BattleAIFactory(); // Uncomment for Simple AI

var battleSimulation = new BattleSimulation();
Expand Down
23 changes: 2 additions & 21 deletions src/main/java/dk/sdu/mmmi/modulemon/BattleAI/BattleAI.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import dk.sdu.mmmi.modulemon.CommonBattle.IBattleParticipant;
import dk.sdu.mmmi.modulemon.CommonBattleSimulation.IBattleSimulation;
import dk.sdu.mmmi.modulemon.CommonBattleSimulation.IBattleState;
import dk.sdu.mmmi.modulemon.CommonBattleSimulation.KnowledgeState;
import dk.sdu.mmmi.modulemon.CommonMonster.IMonster;
import dk.sdu.mmmi.modulemon.CommonMonster.IMonsterMove;
import dk.sdu.mmmi.modulemon.common.SettingsRegistry;
Expand Down Expand Up @@ -248,7 +249,7 @@ private boolean isTerminal(IBattleState battleState) {

// Check if all the opposing participant's (known) monster are dead
boolean allEnemyMonstersDead = enemy.getMonsterTeam().stream()
.filter(x -> knowledgeState.enemyMonsters.contains(x)) //only consider monsters we've seen
.filter(x -> knowledgeState.getEnemyMonsters().contains(x)) //only consider monsters we've seen
.allMatch(x -> x.getHitPoints()<=0);
if (allEnemyMonstersDead) return true;

Expand Down Expand Up @@ -326,24 +327,4 @@ private IBattleParticipant getActiveParticipant(IBattleState battleState) {
? battleState.getPlayer() // Return the player, if it is the player's turn
: battleState.getEnemy(); // Return the enemy, if it is the enemy's turn
}

private class KnowledgeState {
// Those of the enemy's monsters, the AI has seen
private List<IMonster> enemyMonsters;
// A map, mapping each of the enemy's monsters to a list of the moves, the AI has seen it use
private Map<IMonster, List<IMonsterMove>> monsterMoves;

public KnowledgeState() {
enemyMonsters = new ArrayList<>();
monsterMoves = new HashMap<>();
}

public List<IMonster> getEnemyMonsters() {
return enemyMonsters;
}

public Map<IMonster, List<IMonsterMove>> getMonsterMoves() {
return monsterMoves;
}
}
}
15 changes: 15 additions & 0 deletions src/main/java/dk/sdu/mmmi/modulemon/BattleScene/BattleView.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@
import dk.sdu.mmmi.modulemon.CommonBattleClient.IBattleCallback;
import dk.sdu.mmmi.modulemon.CommonBattleClient.IBattleView;
import dk.sdu.mmmi.modulemon.CommonBattleSimulation.BattleEvents.*;
import dk.sdu.mmmi.modulemon.CommonBattleSimulation.IBattleAIFactory;
import dk.sdu.mmmi.modulemon.CommonBattleSimulation.IBattleSimulation;
import dk.sdu.mmmi.modulemon.CommonBattleSimulation.IBattleState;
import dk.sdu.mmmi.modulemon.CommonMonster.IMonster;
import dk.sdu.mmmi.modulemon.CommonMonster.IMonsterMove;
import dk.sdu.mmmi.modulemon.CommonMonster.IMonsterRegistry;
import dk.sdu.mmmi.modulemon.MCTSBattleAI.MCTSBattleAIFactory;
import dk.sdu.mmmi.modulemon.common.AssetLoader;
import dk.sdu.mmmi.modulemon.common.SettingsRegistry;
import dk.sdu.mmmi.modulemon.common.animations.BaseAnimation;
Expand Down Expand Up @@ -124,6 +126,7 @@ public void startBattle(List<IMonster> playerMonsters, List<IMonster> enemyMonst
_battleMusic = loader.getMusicAsset("/music/battle_music_" + battleMusic_type.toLowerCase() + ".ogg", this.getClass());
_winSound = loader.getSoundAsset("/sounds/you_won.ogg", this.getClass());
_loseSound = loader.getSoundAsset("/sounds/you_lost.ogg", this.getClass());
setBattleAIFactory();
_battleSimulation.StartBattle(player, enemy);
_currentBattleState = _battleSimulation.getState().clone(); // Set an initial battle-state
_battleCallback = callback;
Expand All @@ -141,6 +144,18 @@ public void startBattle(List<IMonster> playerMonsters, List<IMonster> enemyMonst
_battleStarted = true;
}

private void setBattleAIFactory() {
IBattleAIFactory desiredAI;
if(settings.getSetting("AI").equals("MCTS")){
desiredAI = new MCTSBattleAIFactory();
} else if(settings.getSetting("AI").equals("Simple")){
desiredAI = new dk.sdu.mmmi.modulemon.SimpleAI.BattleAIFactory();
} else {
desiredAI = new dk.sdu.mmmi.modulemon.BattleAI.BattleAIFactory();
}
_battleSimulation.setAIFactory(desiredAI);
}

@Override
public IGameViewService getGameView() {
return this;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dk.sdu.mmmi.modulemon.CommonBattleClient;

import dk.sdu.mmmi.modulemon.CommonBattle.IBattleParticipant;
import dk.sdu.mmmi.modulemon.CommonBattleSimulation.IBattleAIFactory;
import dk.sdu.mmmi.modulemon.CommonMonster.IMonster;
import dk.sdu.mmmi.modulemon.common.services.IGameViewService;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@ public interface IBattleSimulation {
* Returns `null` if there is no more battle events
*/
IBattleEvent getNextBattleEvent();

void setAIFactory(IBattleAIFactory BattleAIFactory);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package dk.sdu.mmmi.modulemon.CommonBattleSimulation;

import dk.sdu.mmmi.modulemon.CommonMonster.IMonster;
import dk.sdu.mmmi.modulemon.CommonMonster.IMonsterMove;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class KnowledgeState {
// Those of the enemy's monsters, the AI has seen
private List<IMonster> enemyMonsters;
// A map, mapping each of the enemy's monsters to a list of the moves, the AI has seen it use
private Map<IMonster, List<IMonsterMove>> monsterMoves;

public KnowledgeState() {
enemyMonsters = new ArrayList<>();
monsterMoves = new HashMap<>();
}

public List<IMonster> getEnemyMonsters() {
return enemyMonsters;
}

public Map<IMonster, List<IMonsterMove>> getMonsterMoves() {
return monsterMoves;
}
}
Loading