From f3f98d564f775a3ce650f11f79868a514820b74c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Hord=C3=A9?= Date: Mon, 4 Jan 2016 19:15:47 +0100 Subject: [PATCH] =?UTF-8?q?feat:=20impossible=20d'ajouter=20de=20la=20fibr?= =?UTF-8?q?e=20ou=20cuivre=20sur=20un=20transmuteur=20d=C3=A9j=C3=A0=20pos?= =?UTF-8?q?=C3=A9=20modification=20des=20positiveur=20ii=20et=20negativeur?= =?UTF-8?q?=20ii=20pour=20l'=C3=A9l=C3=A9ment=20fibre.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/fr/evolving/automata/Negativer_II.java | 2 +- core/src/fr/evolving/automata/Positiver_II.java | 2 +- core/src/fr/evolving/screens/GameScreen.java | 12 ++++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/core/src/fr/evolving/automata/Negativer_II.java b/core/src/fr/evolving/automata/Negativer_II.java index 6c6c461..dcab9c3 100644 --- a/core/src/fr/evolving/automata/Negativer_II.java +++ b/core/src/fr/evolving/automata/Negativer_II.java @@ -69,7 +69,7 @@ public class Negativer_II extends Transmuter { this.ActivationLevel=0; this.Tilestype= new OrderedMap(); this.Tilestype.put(new Vector2(0,0), CaseType.Cuivre); - this.Tilestype.put(new Vector2(1,0), CaseType.Fibre); + this.Tilestype.put(new Vector2(1,0), CaseType.Fibre_seul); this.Tilesid= new OrderedMap(); this.Tilesid.put(new Vector2(0,0), 109); this.Tilesid.put(new Vector2(1,0), 107); diff --git a/core/src/fr/evolving/automata/Positiver_II.java b/core/src/fr/evolving/automata/Positiver_II.java index f4580c8..7c0ccdb 100644 --- a/core/src/fr/evolving/automata/Positiver_II.java +++ b/core/src/fr/evolving/automata/Positiver_II.java @@ -69,7 +69,7 @@ public class Positiver_II extends Transmuter { this.ActivationLevel=0; this.Tilestype= new OrderedMap(); this.Tilestype.put(new Vector2(0,0), CaseType.Cuivre); - this.Tilestype.put(new Vector2(1,0), CaseType.Fibre); + this.Tilestype.put(new Vector2(1,0), CaseType.Fibre_seul); this.Tilesid= new OrderedMap(); this.Tilesid.put(new Vector2(0,0), 106); this.Tilesid.put(new Vector2(1,0), 107); diff --git a/core/src/fr/evolving/screens/GameScreen.java b/core/src/fr/evolving/screens/GameScreen.java index 7d0f743..d54d5af 100644 --- a/core/src/fr/evolving/screens/GameScreen.java +++ b/core/src/fr/evolving/screens/GameScreen.java @@ -475,7 +475,8 @@ public class GameScreen implements Screen { } void map_fiber_pen(float realx, float realy,int x, int y,boolean alone,int button,calling call) { - level.Grid.GetXY(x,y).Fiber=-1*level.Grid.GetXY(x,y).Fiber+1; + if (level.Grid.GetXY(x,y).Transmuter_calc==0) + level.Grid.GetXY(x,y).Fiber=-1*level.Grid.GetXY(x,y).Fiber+1; if (alone) { level.Grid.tiling_copper(); map.redraw(60); @@ -483,7 +484,8 @@ public class GameScreen implements Screen { } void map_fiber_brush(float realx, float realy,int x, int y,boolean alone,int button,calling call) { - level.Grid.GetXY(x,y).Fiber=1; + if (level.Grid.GetXY(x,y).Transmuter_calc==0) + level.Grid.GetXY(x,y).Fiber=1; if (alone) { level.Grid.tiling_copper(); map.redraw(60); @@ -501,7 +503,8 @@ public class GameScreen implements Screen { } void map_copper_pen(float realx, float realy,int x, int y,boolean alone,int button,calling call) { - level.Grid.GetXY(x,y).Copper=!level.Grid.GetXY(x,y).Copper; + if (level.Grid.GetXY(x,y).Transmuter_calc==0) + level.Grid.GetXY(x,y).Copper=!level.Grid.GetXY(x,y).Copper; if (alone) { level.Grid.tiling_copper(); map.redraw(60); @@ -509,7 +512,8 @@ public class GameScreen implements Screen { } void map_copper_brush(float realx, float realy,int x, int y,boolean alone,int button,calling call) { - level.Grid.GetXY(x,y).Copper=true; + if (level.Grid.GetXY(x,y).Transmuter_calc==0) + level.Grid.GetXY(x,y).Copper=true; if (alone) { level.Grid.tiling_copper(); map.redraw(60);