diff --git a/core/src/fr/evolving/UI/Menu.java b/core/src/fr/evolving/UI/Menu.java index 6d74e0c..dccfb61 100644 --- a/core/src/fr/evolving/UI/Menu.java +++ b/core/src/fr/evolving/UI/Menu.java @@ -65,8 +65,9 @@ public void clear() public void setMenu(int x,int y,int tile) { Cell cell=((TiledMapTileLayer)map.getLayers().get(0)).getCell(x,y); - if (cell!=null) + if (cell!=null) { cell.setTile(AssetLoader.tileSet.getTile(tile)); + } } public int getMenu(int x,int y) diff --git a/core/src/fr/evolving/UI/TouchMaptiles.java b/core/src/fr/evolving/UI/TouchMaptiles.java index b421ed9..682642d 100644 --- a/core/src/fr/evolving/UI/TouchMaptiles.java +++ b/core/src/fr/evolving/UI/TouchMaptiles.java @@ -62,19 +62,20 @@ public Vector2 screentoworldsize(float x, float y) { } public void redraw(int tile) { + for (int x=0;x tiles=this.getTiles(); Iterator keySetIterator = tiles.keySet().iterator(); int Idrec=this.getMainTile(); - if (Id==Idrec) + if ((Id & 0xFFFF)==Idrec) return new Vector2(); + Transmuter.Angular oldrotation=this.getRotation(); + this.setRotation(Transmuter.Angular.values()[Id>>16]); while(keySetIterator.hasNext()){ Vector2 key = keySetIterator.next(); Idrec++; - if (Id==Idrec) - return new Vector2().sub(key); + if ((Id & 0xFFFF)==Idrec) { + this.setRotation(oldrotation); + return new Vector2().sub(key); + } } + this.setRotation(oldrotation); return null; } @@ -222,7 +227,6 @@ public abstract class Transmuter { } - public Angular getRotation() { return this.Rotation; } diff --git a/core/src/fr/evolving/screens/GameScreen.java b/core/src/fr/evolving/screens/GameScreen.java index d83fb2c..434791c 100644 --- a/core/src/fr/evolving/screens/GameScreen.java +++ b/core/src/fr/evolving/screens/GameScreen.java @@ -65,8 +65,7 @@ public class GameScreen implements Screen { private ImageButton[] Barre; private ImageTextButton cycle,temp,nrj,rayon,cout,tech; private ImageTextButton[] Barre2; - String[] tocreate={"run","stop","speed","separator","move","zoomp","zoomm","separator","raz","save","levels","tree","exits","separator","screen","sound","tuto","settings","separator","stat"}; - String[] tocreate2={"Structure","Charge","Direction","Selection","Création","Détection","Action","Scénario"}; + String[] tocreate={"run","stop","speed","separator","move","zoomp","zoomm","infos","separator","raz","save","levels","tree","exits","separator","screen","sound","tuto","settings","separator","stat"}; public Actor selected; public Transmuter selected_transmuter; private ButtonLevel buttonlevel; @@ -114,17 +113,18 @@ public class GameScreen implements Screen { Gdx.app.debug(getClass().getSimpleName(),"Création des barres"); Barre=new ImageButton[tocreate.length]; int i=0; + Gdx.app.debug(getClass().getSimpleName(),"Barre bas:"+Barre.length+" elements"); for (String tocreateitem: tocreate) { Barre[i]= new ImageButton(AssetLoader.Skin_level,tocreateitem); Barre[i++].setName(tocreateitem); } - Barre2=new ImageTextButton[tocreate2.length]; - i=0; - for (String tocreateitem: tocreate2) { - Barre2[i]= new ImageTextButton(tocreateitem,AssetLoader.Skin_level); - Barre2[i++].setName(tocreateitem); + Barre2=new ImageTextButton[Transmuter.Class.values().length]; + Gdx.app.debug(getClass().getSimpleName(),"Menu:"+Barre2.length+" elements"); + for (i=0;i99) { Transmuter transmuter=AssetLoader.getTransmuter(tile); @@ -539,9 +632,9 @@ public class GameScreen implements Screen { @Override public void show() { Gdx.app.log("*****","Affichage du niveau."); - for (int i=0;i