feat: gestion des boutons play, stop, pause et speed création de la classe particule ajout dans grille de la gestion des cycles

core/src/fr/evolving/UI/HorizBarre.java

@@ -12,6 +12,8 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.Touchable;
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.ButtonGroup;
 import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup;
 import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
 import com.badlogic.gdx.scenes.scene2d.ui.Tooltip;
@@ -26,6 +28,7 @@ import fr.evolving.screens.GameScreen.calling;
 
 public class HorizBarre extends Actor {
 	private ImageButton[] Barre;
+	private ButtonGroup<Button> Group;
 	private HorizontalGroup table;
 	private java.lang.reflect.Method method;
 	private TextureRegion oneselection;
@@ -62,16 +65,25 @@ public class HorizBarre extends Actor {
 			}
 		};
 		RotateTimer.scheduleAtFixedRate(RotateTask, 0, 30);
-
+		Group=new ButtonGroup<Button>();
+		Group.setMaxCheckCount(1);
+		Group.setMinCheckCount(1);
+		Group.setUncheckLast(true);
 		this.setBounds(0, 0, 1920, 80);
 		Barre = new ImageButton[tocreate.length];
 		int i = 0;
 		Gdx.app.debug("wirechem-HorizBarre", "Barre bas:" + Barre.length + " elements");
 		for (String item : tocreate) {
-			final String itemtocreate=item.replace("#", "");
+			final String itemtocreate=item.replace("#", "").replace("@", "").replace("*", "");
 			Barre[i] = new ImageButton(AssetLoader.Skin_level, itemtocreate);
 			Barre[i].setTouchable(Touchable.enabled);
 			Barre[i].setName(itemtocreate);
+			if (item.contains("@")) {
+				Group.add(Barre[i]);
+			}
+			if (item.contains("*")) {
+				Barre[i].setChecked(true);
+			}
 			if (item.contains("#"))
 			{
 				Barre[i++].addListener(new ClickListener() {

core/src/fr/evolving/UI/TouchMaptiles.java

@@ -161,6 +161,14 @@ public class TouchMaptiles extends Actor implements GestureListener,InputProcess
 			}
 	}
 
+	//Calques : 
+	// 0 Grille ou Fibres
+	// 1 Cuivre
+	// 2 Transmuteurs
+	// 3 Surtile Transmuteur | Particules
+	// 4 Surtile Fond du transmuteur | Effets 
+	// 5 Verrouillage | Jauge activation
+	// 6 Gratuité	
 	public void redraw() {
 		for (int x = 0; x < level.Grid.sizeX; x++)
 			for (int y = 0; y < level.Grid.sizeY; y++) {

core/src/fr/evolving/automata/Cell.java

@@ -10,7 +10,6 @@ public class Cell implements Serializable,Cloneable {
 	public boolean Free;
 
 	public transient int Copper_calc;
-	public transient int Fiber_old;
 	public transient int Transmuter_calc;
 	public transient int Transmuter_movex;
 	public transient int Transmuter_movey;
@@ -20,7 +19,6 @@ public class Cell implements Serializable,Cloneable {
 		this.Copper = false;
 		this.Locked = false;
 		this.Free = false;
-		this.Fiber_old = 0;
 		this.Transmuter = null;
 		this.Transmuter_calc = 0;
 		this.Transmuter_movex = 0;

core/src/fr/evolving/automata/Grid.java

@@ -5,13 +5,17 @@ import java.util.Iterator;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.ObjectMap.Entry;
 
 public class Grid implements Serializable,Cloneable {
-	public Cell[][] Cells;
+	protected Cell[][] Cells;
 	public Integer sizeX, sizeY;
 	
+	public transient Array<Particle> particles;
+	
 	public Grid(Integer X, Integer Y) {
+		particles=new Array<Particle>();
 		this.sizeX = X;
 		this.sizeY = Y;
 		this.Cells = new Cell[this.sizeX][this.sizeY];
@@ -22,6 +26,24 @@ public class Grid implements Serializable,Cloneable {
 		}
 	}
 	
+	//Réalise un cycle de simulation dans la grille
+	public void Cycle() {
+		
+	}
+	
+	//Affiche le cycle en cours à l'écran
+	public void tiling_particle() {
+		for(Particle particle: particles) {
+			
+		}
+	}
+	
+	//Initialise la simulation pour permettre ensuite de faire des cycles
+	public void Initialize() {
+		
+	}
+
+	//Genère des tiles qui correspondent aux transmuteurs sur la grille
 	public int tiling_transmuter() {
 		int result=0;
 		for (int x = 0; x < this.sizeX; x++)
@@ -71,6 +93,7 @@ public class Grid implements Serializable,Cloneable {
 		return result;
 	}
 
+	//
 	public int tiling_copper() {
 		int result=0;
 		for (int x = 0; x < this.sizeX; x++)

core/src/fr/evolving/automata/Particle.java

@@ -0,0 +1,90 @@
+package fr.evolving.automata;
+
+public class Particle {
+	public enum Type {
+		Electron, Photon, Proton, Neutron
+	}
+	public enum Orientation {
+		Nord, Sud, Est, Ouest
+	};
+	public enum Size {
+		Gros, Petit
+	};
+	public enum Charge {
+		Positif, Negatif, Neutre
+	};
+	
+	protected Orientation orientation;
+	protected Size size;
+	protected Charge charge;
+	protected int coordX;
+	protected int coordY;
+	
+	static protected Grid grid;
+	
+	public Particle(Grid grid) {
+		this.orientation=Orientation.Est;
+		this.size=Size.Petit;
+		this.charge=Charge.Neutre;
+		this.coordX=0;
+		this.coordY=0;
+		Particle.grid=grid;
+	}
+	
+	public Orientation getOrientation() {
+		return this.orientation;
+	}
+	
+	public Size getSize() {
+		return this.size;
+	}
+	
+	public Charge getCharge() {
+		return this.charge;
+	}
+	
+	public void setOrientation(Orientation orientation) {
+		this.orientation=orientation;
+	}
+	
+	public void setCharge(Charge charge) {
+		this.charge=charge;
+	}
+	
+	public void setSize(Size size) {
+		this.size=size;
+	}
+	
+	public void SizeGrow() {
+		this.size=Size.Gros;
+	}
+	
+	public void SizeMinimize() {
+		this.size=Size.Gros;
+	}
+	
+	public void ChargeNeutralize() {
+		this.charge=Charge.Neutre;
+	}
+	
+	public void ChargePositive() {
+		this.charge=Charge.Positif;
+	}
+	
+	public void ChargeNegative() {
+		this.charge=Charge.Negatif;
+	}
+	
+	public void ChargeInvert() {
+		if (this.charge==Charge.Negatif)
+			this.charge=Charge.Positif;
+		else if (this.charge==Charge.Positif)
+			this.charge=Charge.Negatif;
+	}
+	
+	public void Next() {
+		
+	}
+	
+
+}

core/src/fr/evolving/screens/GameScreen.java

@@ -1,9 +1,6 @@
 package fr.evolving.screens;
 
 import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Timer;
-import java.util.TimerTask;
 
 import com.badlogic.gdx.Application;
 import com.badlogic.gdx.Application.ApplicationType;
@@ -54,6 +51,8 @@ import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.ObjectMap.Entries;
 import com.badlogic.gdx.utils.ObjectMap.Entry;
 import com.badlogic.gdx.utils.OrderedMap;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
 
 import fr.evolving.UI.ButtonLevel;
 import fr.evolving.UI.HorizBarre;
@@ -81,8 +80,12 @@ import fr.evolving.renderers.GameRenderer;
 public class GameScreen implements Screen {
 	private InputMultiplexer multiplexer;
 	private Array<InputProcessor> processors;
-
+	private float[] speed;
+	private int speedindex;
+	boolean start;
 	private Stage stage, stage_info, stage_tooltip;
+	private Timer RunTimer;
+	private Task RunTask;
 	private GameRenderer Renderer;
 	private float runTime;
 	public Level level;
@@ -201,16 +204,30 @@ public class GameScreen implements Screen {
 
 	// This is the constructor, not the class declaration
 	public GameScreen(Worlds aworlds) {
+		Gdx.app.debug("wirechem-GameScreen","Préparation du timer");
+		RunTimer = new Timer();
+		RunTask = new Task() {
+			@Override
+			public void run() {
+				Gdx.app.debug("wirechem-GameScreen", "Cycle particule...");
+				worlds.getLevelData().Grid.Cycle();
+			}
+		};
+		start=false;
+		speed=new float[] {4,2,1,0.5f,0.25f,0.125f,0.0625f};
+		speedindex=2;
+		RunTimer.stop();
+		RunTimer.scheduleTask(RunTask, 0, speed[speedindex]);
 		Gdx.app.debug("wirechem-GameScreen","Préparation du screen");
 		this.worlds = aworlds;
 		this.worlds.prepareLevel(false);
 		this.level=worlds.getLevelData();
 		if (worlds.isDebug())
-			tocreate = new String[] { "run", "stop", "speed", "separator", "move#", "zoomp#","zoomm#", "infos#", "separator", "raz", "save", "levels", "tree",	"exits", "separator", "screen", "sound", "tuto", "grid", "settings", "separator", "stat","separator","unlocked","delrow","delcol","addrow","addcol","database" };
+			tocreate = new String[] { "run@", "pause@", "stop@*", "speed", "separator", "move#", "zoomp#","zoomm#", "infos#", "separator", "raz", "save", "levels", "tree",	"exits", "separator", "screen", "sound", "tuto", "grid", "settings", "separator", "stat","separator","delrow","delcol","addrow","addcol","database" };
 		else if (level.Tech<1)
-			tocreate = new String[] { "run", "stop", "speed", "separator", "move#", "zoomp#","zoomm#", "separator", "levels", "exits", "separator", "screen", "sound", "settings" };
+			tocreate = new String[] { "run@", "pause@", "stop@*", "speed", "separator", "move#", "zoomp#","zoomm#", "separator", "levels", "exits", "separator", "screen", "sound", "settings" };
 		else if (level.aWorld<1)
-			tocreate = new String[] { "run", "stop", "speed", "separator", "move#", "zoomp#","zoomm#", "infos#", "separator", "raz", "save", "levels", "exits", "separator", "screen", "sound", "grid", "settings" };
+			tocreate = new String[] { "run@", "pause@", "stop@*", "speed", "separator", "move#", "zoomp#","zoomm#", "infos#", "separator", "raz", "save", "levels", "exits", "separator", "screen", "sound", "grid", "settings" };
 		else
 			tocreate = new String[] { "run", "stop", "speed", "separator", "move#", "zoomp#","zoomm#", "infos#", "separator", "raz", "save", "levels", "tree",	"exits", "separator", "screen", "sound", "tuto", "grid", "settings", "separator", "stat" };
 		Gdx.app.debug("wirechem-GameScreen","Création des Barres verticales & horizontales.");
@@ -582,7 +599,7 @@ public class GameScreen implements Screen {
 						+ level.Grid.GetXY(x, y).Transmuter_movex, y
 						+ level.Grid.GetXY(x, y).Transmuter_movey));
 				map.tempclear();
-				map.tempdraw(x, y, 1069, 0, 0);
+				map.tempdraw(x+level.Grid.GetXY(x, y).Transmuter_movex, y+level.Grid.GetXY(x, y).Transmuter_movey, 1069, 0, 0);
 			}
 		}
 
@@ -841,26 +858,64 @@ public class GameScreen implements Screen {
 		preparemenu(0);
 	}
 	
+	public void run_mode() {
+		if (start==false) {
+			Gdx.app.log("wirechem-GameScreen", "***** Mode run.");
+			worlds.getLevelData().Grid.Initialize();
+			worlds.getLevelData().Grid.tiling_particle();
+		}
+		start=true;
+		RunTimer.start();
+	}
+	
+	public void stop_mode() {
+		Gdx.app.log("wirechem-GameScreen", "***** Mode stop.");
+		worlds.getLevelData().Grid.Initialize();
+		worlds.getLevelData().Grid.tiling_particle();
+		RunTimer.stop();
+		start=false;
+	}
+	
+	public void pause_mode() {
+		Gdx.app.log("wirechem-GameScreen", "***** Mode pause" +
+				".");
+		if (start==false) {
+			run_mode();
+		}
+		RunTimer.stop();
+	}
+
 	public void preparebarre(String caller, int count) {
 		map.tempclear();
 		menu.EraseSurtile();
+		if (caller.contentEquals("run")) {
+			run_mode();
+		} else if (caller.contentEquals("stop")) {
+			stop_mode();
+		} else if (caller.contentEquals("pause")) {
+			pause_mode();
+		} else if (caller.contentEquals("speed")) {
+			speedindex=(speedindex+1)%speed.length;
+			Gdx.app.debug("wirechem-GameScreen", "Reglage de la vitesse."+speed[speedindex]);
+			RunTimer.clear();
+			RunTimer.scheduleTask(RunTask, 0, speed[speedindex]);
+		} 
 		hideInfo();
-		if (caller == "run") {
+		
-		} else if (caller == "stop") {
+		
-		} else if (caller == "speed") {
+		if (caller.contentEquals("move")) {
-		} else if (caller == "move") {
 			if (count >= 2)
 				map.initzoom();
-		} else if (caller == "zoomp") {
+		} else if (caller.contentEquals("zoomp")) {
 			if (count >= 2)
 				map.initzoom();
-		} else if (caller == "zoomm") {
+		} else if (caller.contentEquals("zoomm")) {
 			if (count >= 2)
 				map.initzoom();
-		} else if (caller == "infos") {
+		} else if (caller.contentEquals("infos")) {
 			if (count >= 2)
 				map.initzoom();
-		} else if (caller == "raz") {
+		} else if (caller.contentEquals("raz")) {
 			winOptions.setVisible(false);
 			winSave.setVisible(!winSave.isVisible());
 			if (winSave.isVisible())
@@ -869,15 +924,15 @@ public class GameScreen implements Screen {
 			Gdx.app.debug("wirechem-GameScreen", "Barre | Sauvegarde de la grille.");	
 			worlds.SaveGrid();
 			winSave.refresh();
-		} else if (caller == "levels") {
+		} else if (caller.contentEquals("levels")) {
 			Gdx.app.debug("wirechem-GameScreen", "Barre | Affichage des niveaux.");
 			exit();
 			((Game) Gdx.app.getApplicationListener()).setScreen(new LevelScreen(worlds));
-		} else if (caller == "tree") {
+		} else if (caller.contentEquals("tree")) {
-		} else if (caller == "exits") {
+		} else if (caller.contentEquals("exits")) {
 			exit();
 			Gdx.app.exit();
-		} else if (caller == "screen") {
+		} else if (caller.contentEquals("screen")) {
 			DisplayMode currentMode = Gdx.graphics.getDesktopDisplayMode();
 			if (Gdx.graphics.isFullscreen()) {
 				Gdx.app.debug("wirechem-GameScreen", "Barre | vers fenetre.");
@@ -888,7 +943,7 @@ public class GameScreen implements Screen {
 				Gdx.graphics.setDisplayMode(currentMode.width,
 						currentMode.height, true);
 			}
-		} else if (caller == "sound") {
+		} else if (caller.contentEquals("sound")) {
 			if (AssetLoader.intro.getVolume() > 0) {
 				Gdx.app.debug("wirechem-GameScreen", "Barre | arret son.");
 				AssetLoader.intro.setVolume(0f);
@@ -896,7 +951,7 @@ public class GameScreen implements Screen {
 				Gdx.app.debug("wirechem-GameScreen", "Barre | marche son.");
 				AssetLoader.intro.setVolume(1f);
 			}
-		} else if (caller == "tuto") {
+		} else if (caller.contentEquals("tuto")) {
 			if (AssetLoader.Tooltipmanager.enabled) {
 				Gdx.app.debug("wirechem-GameScreen", "Barre | arret tuto.");
 				AssetLoader.Tooltipmanager.enabled = false;
@@ -904,7 +959,7 @@ public class GameScreen implements Screen {
 				Gdx.app.debug("wirechem-GameScreen", "Barre | marche tuto.");
 				AssetLoader.Tooltipmanager.enabled = true;
 			}
-		} else if (caller=="grid") {
+		} else if (caller.contentEquals("grid")) {
 			if (map.getClearsprite()==53)
 			{
 				map.fillempty(60);
@@ -915,12 +970,12 @@ public class GameScreen implements Screen {
 				map.fillempty(53);
 				map.setClearsprite(53);
 				}
-		} else if (caller == "settings") {
+		} else if (caller.contentEquals("settings")) {
 			winOptions.setVisible(!winOptions.isVisible());
 			winSave.setVisible(false);
 			if (winOptions.isVisible())
 				winOptions.refresh();
-		} else if (caller == "flag") {
+		} else if (caller.contentEquals("flag")) {
 			if (AssetLoader.language.getLocale().getDisplayName()
 					.contains("français")) {
 				Gdx.app.debug("wirechem-GameScreen", "Barre | Langue USA");
@@ -929,23 +984,23 @@ public class GameScreen implements Screen {
 				Gdx.app.debug("wirechem-GameScreen", "Barre | Langue FR");
 				AssetLoader.language = AssetLoader.french;
 			}
-		} else if (caller == "stat") {
+		} else if (caller.contentEquals("stat")) {
-		} else if (caller == "unlocked") {
+		} else if (caller.contentEquals("unlocked")) {
 			level.Locked=false;
 			buttonlevel.setDisabled(false);
 			worlds.unLockLevel();
-		} else if (caller == "database") {
+		} else if (caller.contentEquals("database")) {
 			worlds.origLevel();
-		} else if (caller == "delcol") {
+		} else if (caller.contentEquals("delcol")) {
 			level.Grid=(Grid) level.Grid.clone(level.Grid.sizeX-1, level.Grid.sizeY);
 			map.resize();
-		} else if (caller == "delrow") {
+		} else if (caller.contentEquals("delrow")) {
 			level.Grid=(Grid) level.Grid.clone(level.Grid.sizeX, level.Grid.sizeY-1);
 			map.resize();
-		} else if (caller == "addcol") {
+		} else if (caller.contentEquals("addcol")) {
 			level.Grid=(Grid) level.Grid.clone(level.Grid.sizeX+1, level.Grid.sizeY);
 			map.resize();
-		} else if (caller == "addrow") {
+		} else if (caller.contentEquals("addrow")) {
 			level.Grid=(Grid) level.Grid.clone(level.Grid.sizeX, level.Grid.sizeY+1);
 			map.resize();
 		}
@@ -1004,12 +1059,22 @@ public class GameScreen implements Screen {
 	}
 
 	public void hideInfo() {
-		info_upgrade.setVisible(false);
+		if (start) {
-		info_choose.setVisible(false);
+			menu.setVisible(false);
+			vertibar.setVisible(false);
+			nextpage.setVisible(false);
+			previouspage.setVisible(false);
+		}
+		else
+		{
+
 			menu.setVisible(true);
 			vertibar.setVisible(true);
 			nextpage.setVisible(true);
 			previouspage.setVisible(true);
+		}
+		info_upgrade.setVisible(false);
+		info_choose.setVisible(false);
 		unroll = false;
 	}
 

core/src/fr/evolving/screens/LevelScreen.java

@@ -77,7 +77,7 @@ public class LevelScreen implements Screen {
 	private TextArea TextDescriptive;
 	public Worlds worlds;
 	private Objectives Victory;
-	private VerticalGroup vertibarmod;
+	private VerticalGroup vertibarmod, vertibarmod2;
 	private HorizontalGroup vertibar;
 	public ButtonLevel selected;
 	public int addervalue;
@@ -913,6 +913,7 @@ public class LevelScreen implements Screen {
 					group_base.setVisible(false);
 					selectnoone();
 					vertibarmod.setVisible(false);
+					vertibarmod2.setVisible(false);
 					moveit.setChecked(true);
 				}
 				else {
@@ -1022,6 +1023,7 @@ public class LevelScreen implements Screen {
 			@Override
 			public void clicked(InputEvent event, float x, float y) {
 				vertibarmod.setVisible(false);
+				vertibarmod2.setVisible(false);
 				ResetDragDrog();
 				selectnoone();
 			}
@@ -1031,6 +1033,7 @@ public class LevelScreen implements Screen {
 			@Override
 			public void clicked(InputEvent event, float x, float y) {
 				vertibarmod.setVisible(true);
+				vertibarmod2.setVisible(true);
 				ResetDragDrog();
 				selectone();
 			}
@@ -1040,6 +1043,7 @@ public class LevelScreen implements Screen {
 			@Override
 			public void clicked(InputEvent event, float x, float y) {
 				vertibarmod.setVisible(false);
+				vertibarmod2.setVisible(false);
 				initDragDrop();
 				selectnoone();
 			}
@@ -1049,6 +1053,7 @@ public class LevelScreen implements Screen {
 			@Override
 			public void clicked(InputEvent event, float x, float y) {
 				vertibarmod.setVisible(false);
+				vertibarmod2.setVisible(false);
 				initDragDrop();
 				selectnoone();
 			}
@@ -1172,12 +1177,18 @@ public class LevelScreen implements Screen {
 		vertibarmod.space(20f);
 		vertibarmod.addActor(unlocked);
 		vertibarmod.addActor(finisher);
-		vertibarmod.addActor(deletebutton);	
-		vertibarmod.addActor(duplicate);
-		vertibarmod.addActor(deletelinker);
 		vertibarmod.addActor(script);
 		vertibarmod.setVisible(false);
 		
+		vertibarmod2=new VerticalGroup();
+		vertibarmod2.setPosition(1800, AssetLoader.height-100);
+		vertibarmod2.center();
+		vertibarmod2.space(20f);
+		vertibarmod2.addActor(deletebutton);	
+		vertibarmod2.addActor(duplicate);
+		vertibarmod2.addActor(deletelinker);
+		vertibarmod2.setVisible(false);
+		
 		vertibar=new HorizontalGroup();
 		vertibar.setPosition(1565, 215);
 		vertibar.center();
@@ -1198,6 +1209,7 @@ public class LevelScreen implements Screen {
 		group_debug=new Group();
 		group_debug.addActor(vertibar);
 		group_debug.addActor(vertibarmod);
+		group_debug.addActor(vertibarmod2);
 		group_debug.addActor(adder);
 		group_debug.addActor(signer);
 		group_debug.addActor(databaseSave);