mirror of
				https://github.com/inf112-v20/Fiasko.git
				synced 2025-11-04 03:33:45 +01:00 
			
		
		
		
	Byttet pakkenavn.
This commit is contained in:
		@@ -2,7 +2,7 @@ package inf112.fiasko.roborally;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
 | 
					import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
 | 
				
			||||||
import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
 | 
					import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
 | 
					import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class Main {
 | 
					public class Main {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.element_properties;
 | 
					package inf112.fiasko.roborally.elementproperties;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This enum represents an action on a programming card
 | 
					 * This enum represents an action on a programming card
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.element_properties;
 | 
					package inf112.fiasko.roborally.elementproperties;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This enum represents all possible directions for an element on the board
 | 
					 * This enum represents all possible directions for an element on the board
 | 
				
			||||||
@@ -1,8 +1,10 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.element_properties;
 | 
					package inf112.fiasko.roborally.elementproperties;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public enum GameState {
 | 
					public enum GameState {
 | 
				
			||||||
    //Indicates that the server is waiting for something
 | 
					    //Indicates that the server is waiting for something
 | 
				
			||||||
    WAITING,
 | 
					    WAITING,
 | 
				
			||||||
 | 
					    //Gives the game Access to the client and server
 | 
				
			||||||
 | 
					    BEGINNING_OF_GAME,
 | 
				
			||||||
    //Indicates that the users' input is being run. The board should be shown
 | 
					    //Indicates that the users' input is being run. The board should be shown
 | 
				
			||||||
    RUNNING_PROGRAMS,
 | 
					    RUNNING_PROGRAMS,
 | 
				
			||||||
    //Indicates that
 | 
					    //Indicates that
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.element_properties;
 | 
					package inf112.fiasko.roborally.elementproperties;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public enum ParticleType {
 | 
					public enum ParticleType {
 | 
				
			||||||
    LASER_BEAM_SINGLE (1),
 | 
					    LASER_BEAM_SINGLE (1),
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.element_properties;
 | 
					package inf112.fiasko.roborally.elementproperties;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This class represent a position on the board
 | 
					 * This class represent a position on the board
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.element_properties;
 | 
					package inf112.fiasko.roborally.elementproperties;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This class represents an id for marking specific robots
 | 
					 * This class represents an id for marking specific robots
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.element_properties;
 | 
					package inf112.fiasko.roborally.elementproperties;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This enum represents all possible tile types
 | 
					 * This enum represents all possible tile types
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.element_properties;
 | 
					package inf112.fiasko.roborally.elementproperties;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This enum represents all possible wall types
 | 
					 * This enum represents all possible wall types
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.game_wrapper;
 | 
					package inf112.fiasko.roborally.gamewrapper;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.badlogic.gdx.Game;
 | 
					import com.badlogic.gdx.Game;
 | 
				
			||||||
import com.badlogic.gdx.Gdx;
 | 
					import com.badlogic.gdx.Gdx;
 | 
				
			||||||
@@ -1,14 +1,13 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.game_wrapper;
 | 
					package inf112.fiasko.roborally.gamewrapper;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.screens.BoardActiveScreen;
 | 
					import inf112.fiasko.roborally.gamewrapper.screens.BoardActiveScreen;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.screens.CardChoiceScreen;
 | 
					import inf112.fiasko.roborally.gamewrapper.screens.LoadingScreen;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.screens.LoadingScreen;
 | 
					import inf112.fiasko.roborally.gamewrapper.screens.PowerDownScreen;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.screens.PowerDownScreen;
 | 
					import inf112.fiasko.roborally.gamewrapper.screens.UsernameScreen;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.screens.UsernameScreen;
 | 
					import inf112.fiasko.roborally.gamewrapper.screens.IPAddressScreen;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.screens.IPAddressScreen;
 | 
					import inf112.fiasko.roborally.gamewrapper.screens.LobbyScreen;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.screens.LobbyScreen;
 | 
					import inf112.fiasko.roborally.gamewrapper.screens.StartMenuScreen;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.screens.StartMenuScreen;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * Keeps track of screen instances
 | 
					 * Keeps track of screen instances
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.game_wrapper;
 | 
					package inf112.fiasko.roborally.gamewrapper;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.badlogic.gdx.Gdx;
 | 
					import com.badlogic.gdx.Gdx;
 | 
				
			||||||
import com.badlogic.gdx.graphics.g2d.BitmapFont;
 | 
					import com.badlogic.gdx.graphics.g2d.BitmapFont;
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.game_wrapper.screens;
 | 
					package inf112.fiasko.roborally.gamewrapper.screens;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.badlogic.gdx.Screen;
 | 
					import com.badlogic.gdx.Screen;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.game_wrapper.screens;
 | 
					package inf112.fiasko.roborally.gamewrapper.screens;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.badlogic.gdx.Gdx;
 | 
					import com.badlogic.gdx.Gdx;
 | 
				
			||||||
import com.badlogic.gdx.Input;
 | 
					import com.badlogic.gdx.Input;
 | 
				
			||||||
@@ -12,7 +12,7 @@ import com.badlogic.gdx.math.Vector3;
 | 
				
			|||||||
import com.badlogic.gdx.utils.Disposable;
 | 
					import com.badlogic.gdx.utils.Disposable;
 | 
				
			||||||
import com.badlogic.gdx.utils.viewport.ExtendViewport;
 | 
					import com.badlogic.gdx.utils.viewport.ExtendViewport;
 | 
				
			||||||
import com.badlogic.gdx.utils.viewport.Viewport;
 | 
					import com.badlogic.gdx.utils.viewport.Viewport;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
 | 
					import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.IDrawableGame;
 | 
					import inf112.fiasko.roborally.objects.IDrawableGame;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.IDrawableObject;
 | 
					import inf112.fiasko.roborally.objects.IDrawableObject;
 | 
				
			||||||
import inf112.fiasko.roborally.utility.IOUtil;
 | 
					import inf112.fiasko.roborally.utility.IOUtil;
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.game_wrapper.screens;
 | 
					package inf112.fiasko.roborally.gamewrapper.screens;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.badlogic.gdx.Gdx;
 | 
					import com.badlogic.gdx.Gdx;
 | 
				
			||||||
import com.badlogic.gdx.graphics.GL20;
 | 
					import com.badlogic.gdx.graphics.GL20;
 | 
				
			||||||
@@ -11,7 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextField;
 | 
				
			|||||||
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 | 
					import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 | 
				
			||||||
import com.badlogic.gdx.utils.viewport.FitViewport;
 | 
					import com.badlogic.gdx.utils.viewport.FitViewport;
 | 
				
			||||||
import com.badlogic.gdx.utils.viewport.Viewport;
 | 
					import com.badlogic.gdx.utils.viewport.Viewport;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
 | 
					import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
 | 
				
			||||||
import inf112.fiasko.roborally.networking.RoboRallyClient;
 | 
					import inf112.fiasko.roborally.networking.RoboRallyClient;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.game_wrapper.screens;
 | 
					package inf112.fiasko.roborally.gamewrapper.screens;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.badlogic.gdx.Gdx;
 | 
					import com.badlogic.gdx.Gdx;
 | 
				
			||||||
import com.badlogic.gdx.graphics.GL20;
 | 
					import com.badlogic.gdx.graphics.GL20;
 | 
				
			||||||
@@ -9,8 +9,8 @@ import com.badlogic.gdx.scenes.scene2d.Stage;
 | 
				
			|||||||
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 | 
					import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 | 
				
			||||||
import com.badlogic.gdx.utils.viewport.FitViewport;
 | 
					import com.badlogic.gdx.utils.viewport.FitViewport;
 | 
				
			||||||
import com.badlogic.gdx.utils.viewport.Viewport;
 | 
					import com.badlogic.gdx.utils.viewport.Viewport;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
 | 
					import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.SimpleButton;
 | 
					import inf112.fiasko.roborally.gamewrapper.SimpleButton;
 | 
				
			||||||
import inf112.fiasko.roborally.networking.containers.GameStartInfo;
 | 
					import inf112.fiasko.roborally.networking.containers.GameStartInfo;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.Player;
 | 
					import inf112.fiasko.roborally.objects.Player;
 | 
				
			||||||
import inf112.fiasko.roborally.utility.IOUtil;
 | 
					import inf112.fiasko.roborally.utility.IOUtil;
 | 
				
			||||||
@@ -54,7 +54,7 @@ public class LobbyScreen extends AbstractScreen {
 | 
				
			|||||||
                            ,playerlist,playernames.get(connection)));
 | 
					                            ,playerlist,playernames.get(connection)));
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getLoadingScreen(roboRallyWrapper));
 | 
					                roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getLoadingScreen(roboRallyWrapper));
 | 
				
			||||||
                return true;//her we do stuff
 | 
					                return true;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
        stage.setViewport(viewport);
 | 
					        stage.setViewport(viewport);
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.game_wrapper.screens;
 | 
					package inf112.fiasko.roborally.gamewrapper.screens;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.badlogic.gdx.Gdx;
 | 
					import com.badlogic.gdx.Gdx;
 | 
				
			||||||
import com.badlogic.gdx.graphics.GL20;
 | 
					import com.badlogic.gdx.graphics.GL20;
 | 
				
			||||||
@@ -9,8 +9,8 @@ import com.badlogic.gdx.scenes.scene2d.Stage;
 | 
				
			|||||||
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 | 
					import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 | 
				
			||||||
import com.badlogic.gdx.utils.viewport.FitViewport;
 | 
					import com.badlogic.gdx.utils.viewport.FitViewport;
 | 
				
			||||||
import com.badlogic.gdx.utils.viewport.Viewport;
 | 
					import com.badlogic.gdx.utils.viewport.Viewport;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
 | 
					import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.SimpleButton;
 | 
					import inf112.fiasko.roborally.gamewrapper.SimpleButton;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This screen is used for asking players whether they want to power down
 | 
					 * This screen is used for asking players whether they want to power down
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.game_wrapper.screens;
 | 
					package inf112.fiasko.roborally.gamewrapper.screens;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.badlogic.gdx.Gdx;
 | 
					import com.badlogic.gdx.Gdx;
 | 
				
			||||||
import com.badlogic.gdx.graphics.GL20;
 | 
					import com.badlogic.gdx.graphics.GL20;
 | 
				
			||||||
@@ -9,8 +9,8 @@ import com.badlogic.gdx.scenes.scene2d.Stage;
 | 
				
			|||||||
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 | 
					import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 | 
				
			||||||
import com.badlogic.gdx.utils.viewport.FitViewport;
 | 
					import com.badlogic.gdx.utils.viewport.FitViewport;
 | 
				
			||||||
import com.badlogic.gdx.utils.viewport.Viewport;
 | 
					import com.badlogic.gdx.utils.viewport.Viewport;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
 | 
					import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.SimpleButton;
 | 
					import inf112.fiasko.roborally.gamewrapper.SimpleButton;
 | 
				
			||||||
import inf112.fiasko.roborally.networking.RoboRallyClient;
 | 
					import inf112.fiasko.roborally.networking.RoboRallyClient;
 | 
				
			||||||
import inf112.fiasko.roborally.networking.RoboRallyServer;
 | 
					import inf112.fiasko.roborally.networking.RoboRallyServer;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.game_wrapper.screens;
 | 
					package inf112.fiasko.roborally.gamewrapper.screens;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.badlogic.gdx.Gdx;
 | 
					import com.badlogic.gdx.Gdx;
 | 
				
			||||||
import com.badlogic.gdx.graphics.GL20;
 | 
					import com.badlogic.gdx.graphics.GL20;
 | 
				
			||||||
@@ -11,7 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextField;
 | 
				
			|||||||
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 | 
					import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 | 
				
			||||||
import com.badlogic.gdx.utils.viewport.FitViewport;
 | 
					import com.badlogic.gdx.utils.viewport.FitViewport;
 | 
				
			||||||
import com.badlogic.gdx.utils.viewport.Viewport;
 | 
					import com.badlogic.gdx.utils.viewport.Viewport;
 | 
				
			||||||
import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
 | 
					import inf112.fiasko.roborally.gamewrapper.RoboRallyWrapper;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This screen allows a user to choose their player name
 | 
					 * This screen allows a user to choose their player name
 | 
				
			||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Position;
 | 
					import inf112.fiasko.roborally.elementproperties.Position;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This class represents a board element and its position
 | 
					 * This class represents a board element and its position
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.GameState;
 | 
					import inf112.fiasko.roborally.elementproperties.GameState;
 | 
				
			||||||
import inf112.fiasko.roborally.networking.RoboRallyClient;
 | 
					import inf112.fiasko.roborally.networking.RoboRallyClient;
 | 
				
			||||||
import inf112.fiasko.roborally.networking.RoboRallyServer;
 | 
					import inf112.fiasko.roborally.networking.RoboRallyServer;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.ParticleType;
 | 
					import inf112.fiasko.roborally.elementproperties.ParticleType;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This class represents a particle
 | 
					 * This class represents a particle
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.RobotID;
 | 
					import inf112.fiasko.roborally.elementproperties.RobotID;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.util.ArrayList;
 | 
					import java.util.ArrayList;
 | 
				
			||||||
import java.util.List;
 | 
					import java.util.List;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Action;
 | 
					import inf112.fiasko.roborally.elementproperties.Action;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This class represents a programming card
 | 
					 * This class represents a programming card
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,8 +1,8 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Position;
 | 
					import inf112.fiasko.roborally.elementproperties.Position;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.RobotID;
 | 
					import inf112.fiasko.roborally.elementproperties.RobotID;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This class represents a robot
 | 
					 * This class represents a robot
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.TileType;
 | 
					import inf112.fiasko.roborally.elementproperties.TileType;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This class represents a simple tile
 | 
					 * This class represents a simple tile
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.WallType;
 | 
					import inf112.fiasko.roborally.elementproperties.WallType;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This class represents a wall
 | 
					 * This class represents a wall
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,8 +1,8 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.utility;
 | 
					package inf112.fiasko.roborally.utility;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.TileType;
 | 
					import inf112.fiasko.roborally.elementproperties.TileType;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.WallType;
 | 
					import inf112.fiasko.roborally.elementproperties.WallType;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.Board;
 | 
					import inf112.fiasko.roborally.objects.Board;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.IGrid;
 | 
					import inf112.fiasko.roborally.objects.IGrid;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.Robot;
 | 
					import inf112.fiasko.roborally.objects.Robot;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.utility;
 | 
					package inf112.fiasko.roborally.utility;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Action;
 | 
					import inf112.fiasko.roborally.elementproperties.Action;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.ProgrammingCard;
 | 
					import inf112.fiasko.roborally.objects.ProgrammingCard;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.ProgrammingCardDeck;
 | 
					import inf112.fiasko.roborally.objects.ProgrammingCardDeck;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,9 +1,9 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.utility;
 | 
					package inf112.fiasko.roborally.utility;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.badlogic.gdx.graphics.g2d.TextureRegion;
 | 
					import com.badlogic.gdx.graphics.g2d.TextureRegion;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Position;
 | 
					import inf112.fiasko.roborally.elementproperties.Position;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.RobotID;
 | 
					import inf112.fiasko.roborally.elementproperties.RobotID;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.Player;
 | 
					import inf112.fiasko.roborally.objects.Player;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.IDrawableObject;
 | 
					import inf112.fiasko.roborally.objects.IDrawableObject;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.Tile;
 | 
					import inf112.fiasko.roborally.objects.Tile;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.utility;
 | 
					package inf112.fiasko.roborally.utility;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.esotericsoftware.kryo.Kryo;
 | 
					import com.esotericsoftware.kryo.Kryo;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.RobotID;
 | 
					import inf112.fiasko.roborally.elementproperties.RobotID;
 | 
				
			||||||
import inf112.fiasko.roborally.networking.containers.ErrorResponse;
 | 
					import inf112.fiasko.roborally.networking.containers.ErrorResponse;
 | 
				
			||||||
import inf112.fiasko.roborally.networking.containers.GameStartInfo;
 | 
					import inf112.fiasko.roborally.networking.containers.GameStartInfo;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.IDeck;
 | 
					import inf112.fiasko.roborally.objects.IDeck;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,11 +4,11 @@ import com.badlogic.gdx.Gdx;
 | 
				
			|||||||
import com.badlogic.gdx.graphics.Texture;
 | 
					import com.badlogic.gdx.graphics.Texture;
 | 
				
			||||||
import com.badlogic.gdx.graphics.g2d.TextureRegion;
 | 
					import com.badlogic.gdx.graphics.g2d.TextureRegion;
 | 
				
			||||||
import com.badlogic.gdx.utils.Disposable;
 | 
					import com.badlogic.gdx.utils.Disposable;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.ParticleType;
 | 
					import inf112.fiasko.roborally.elementproperties.ParticleType;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.RobotID;
 | 
					import inf112.fiasko.roborally.elementproperties.RobotID;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.TileType;
 | 
					import inf112.fiasko.roborally.elementproperties.TileType;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.WallType;
 | 
					import inf112.fiasko.roborally.elementproperties.WallType;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.Particle;
 | 
					import inf112.fiasko.roborally.objects.Particle;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.Robot;
 | 
					import inf112.fiasko.roborally.objects.Robot;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.Tile;
 | 
					import inf112.fiasko.roborally.objects.Tile;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.element_properties;
 | 
					package inf112.fiasko.roborally.elementproperties;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.element_properties;
 | 
					package inf112.fiasko.roborally.elementproperties;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.element_properties;
 | 
					package inf112.fiasko.roborally.elementproperties;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import org.junit.Before;
 | 
					import org.junit.Before;
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.element_properties;
 | 
					package inf112.fiasko.roborally.elementproperties;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.element_properties;
 | 
					package inf112.fiasko.roborally.elementproperties;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.objects.Wall;
 | 
					import inf112.fiasko.roborally.objects.Wall;
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
@@ -1,8 +1,8 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Position;
 | 
					import inf112.fiasko.roborally.elementproperties.Position;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.TileType;
 | 
					import inf112.fiasko.roborally.elementproperties.TileType;
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import static org.junit.Assert.assertEquals;
 | 
					import static org.junit.Assert.assertEquals;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,10 +1,10 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Position;
 | 
					import inf112.fiasko.roborally.elementproperties.Position;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.RobotID;
 | 
					import inf112.fiasko.roborally.elementproperties.RobotID;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.TileType;
 | 
					import inf112.fiasko.roborally.elementproperties.TileType;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.WallType;
 | 
					import inf112.fiasko.roborally.elementproperties.WallType;
 | 
				
			||||||
import org.junit.Before;
 | 
					import org.junit.Before;
 | 
				
			||||||
import org.junit.BeforeClass;
 | 
					import org.junit.BeforeClass;
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.TileType;
 | 
					import inf112.fiasko.roborally.elementproperties.TileType;
 | 
				
			||||||
import org.junit.Before;
 | 
					import org.junit.Before;
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.ParticleType;
 | 
					import inf112.fiasko.roborally.elementproperties.ParticleType;
 | 
				
			||||||
import org.junit.Before;
 | 
					import org.junit.Before;
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Action;
 | 
					import inf112.fiasko.roborally.elementproperties.Action;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.RobotID;
 | 
					import inf112.fiasko.roborally.elementproperties.RobotID;
 | 
				
			||||||
import org.junit.Before;
 | 
					import org.junit.Before;
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Action;
 | 
					import inf112.fiasko.roborally.elementproperties.Action;
 | 
				
			||||||
import inf112.fiasko.roborally.utility.DeckLoaderUtil;
 | 
					import inf112.fiasko.roborally.utility.DeckLoaderUtil;
 | 
				
			||||||
import org.junit.Before;
 | 
					import org.junit.Before;
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Action;
 | 
					import inf112.fiasko.roborally.elementproperties.Action;
 | 
				
			||||||
import static org.junit.Assert.assertEquals;
 | 
					import static org.junit.Assert.assertEquals;
 | 
				
			||||||
import org.junit.Before;
 | 
					import org.junit.Before;
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,7 @@ public class RoboRallyGameTest {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    @Before
 | 
					    @Before
 | 
				
			||||||
    public void setUp() {
 | 
					    public void setUp() {
 | 
				
			||||||
        game = new RoboRallyGame(new ArrayList<>(),"Checkmate.txt",false);
 | 
					        game = new RoboRallyGame(new ArrayList<>(),"Checkmate.txt",false, "Player1");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Test
 | 
					    @Test
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,9 +1,9 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Position;
 | 
					import inf112.fiasko.roborally.elementproperties.Position;
 | 
				
			||||||
import static org.junit.Assert.assertEquals;
 | 
					import static org.junit.Assert.assertEquals;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.RobotID;
 | 
					import inf112.fiasko.roborally.elementproperties.RobotID;
 | 
				
			||||||
import org.junit.Before;
 | 
					import org.junit.Before;
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.TileType;
 | 
					import inf112.fiasko.roborally.elementproperties.TileType;
 | 
				
			||||||
import org.junit.Before;
 | 
					import org.junit.Before;
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
package inf112.fiasko.roborally.objects;
 | 
					package inf112.fiasko.roborally.objects;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.WallType;
 | 
					import inf112.fiasko.roborally.elementproperties.WallType;
 | 
				
			||||||
import static org.junit.Assert.assertEquals;
 | 
					import static org.junit.Assert.assertEquals;
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,8 +2,8 @@ package inf112.fiasko.roborally.utility;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import com.badlogic.gdx.graphics.g2d.TextureRegion;
 | 
					import com.badlogic.gdx.graphics.g2d.TextureRegion;
 | 
				
			||||||
import inf112.fiasko.roborally.GdxTestRunner;
 | 
					import inf112.fiasko.roborally.GdxTestRunner;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.Direction;
 | 
					import inf112.fiasko.roborally.elementproperties.Direction;
 | 
				
			||||||
import inf112.fiasko.roborally.element_properties.TileType;
 | 
					import inf112.fiasko.roborally.elementproperties.TileType;
 | 
				
			||||||
import inf112.fiasko.roborally.objects.Tile;
 | 
					import inf112.fiasko.roborally.objects.Tile;
 | 
				
			||||||
import org.junit.Before;
 | 
					import org.junit.Before;
 | 
				
			||||||
import org.junit.Test;
 | 
					import org.junit.Test;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user