perso
/
WireChem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: gestion de l'argent, blocage en mode "normal" mode "debogue" possibilité de debloquer arbitrairement un monde

This commit is contained in:
Nicolas Hordé 2016-02-05 11:08:36 +01:00
parent 007e3ed16e
commit 16cfe33549
2 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/fr/evolving/automata/Worlds.java
View File

@ -257,6 +257,10 @@ public class Worlds extends Actor {
return -1; return -1;
} }
public void unLockLevel() {
AssetLoader.Datahandler.user().setLevelunlock(0, usedlevel.id);
}
public void set(String campaign) { public void set(String campaign) {
Gdx.app.log("*****", "Définition de la compagne "+campaign); Gdx.app.log("*****", "Définition de la compagne "+campaign);
Preference.prefs.putString("world", campaign); Preference.prefs.putString("world", campaign);

54
core/src/fr/evolving/screens/GameScreen.java
View File

@ -205,7 +205,9 @@ public class GameScreen implements Screen {
this.worlds = aworlds; this.worlds = aworlds;
this.worlds.prepareLevel(false); this.worlds.prepareLevel(false);
this.level=worlds.getInformations(); this.level=worlds.getInformations();
if (level.Tech<1) 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" };
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", "stop", "speed", "separator", "move#", "zoomp#","zoomm#", "separator", "levels", "exits", "separator", "screen", "sound", "settings" };
else if (level.aWorld<1) 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", "stop", "speed", "separator", "move#", "zoomp#","zoomm#", "infos#", "separator", "raz", "save", "levels", "exits", "separator", "screen", "sound", "grid", "settings" };
@ -231,7 +233,7 @@ public class GameScreen implements Screen {
processors = new Array<InputProcessor>(); processors = new Array<InputProcessor>();
stage = new Stage(AssetLoader.viewport); stage = new Stage(AssetLoader.viewport);
stage_info = new Stage(AssetLoader.viewport); stage_info = new Stage(AssetLoader.viewport);
//stage_tooltip = new Stage(AssetLoader.viewport); stage_tooltip = new Stage(AssetLoader.viewport);
oldx = 0; oldx = 0;
oldy = 0; oldy = 0;
unroll = false; unroll = false;
@ -250,6 +252,7 @@ public class GameScreen implements Screen {
nrj.setPosition(610, AssetLoader.height - 74); nrj.setPosition(610, AssetLoader.height - 74);
tech = new IconValue(Icon.tech,worlds, AssetLoader.Skin_level); tech = new IconValue(Icon.tech,worlds, AssetLoader.Skin_level);
tech.setPosition(1345, AssetLoader.height - 74); tech.setPosition(1345, AssetLoader.height - 74);
tech.addListener(new Tooltip(tooltip,AssetLoader.Tooltipmanager));
cout = new IconValue(Icon.cout,worlds, AssetLoader.Skin_level); cout = new IconValue(Icon.cout,worlds, AssetLoader.Skin_level);
cout.setPosition(1445, AssetLoader.height - 74); cout.setPosition(1445, AssetLoader.height - 74);
research = new IconValue(Icon.research,worlds, AssetLoader.Skin_level); research = new IconValue(Icon.research,worlds, AssetLoader.Skin_level);
@ -265,8 +268,7 @@ public class GameScreen implements Screen {
public void clicked(InputEvent event, float x, float y) { public void clicked(InputEvent event, float x, float y) {
Gdx.app.debug(getClass().getSimpleName(),"Remise à zéro du monde"); Gdx.app.debug(getClass().getSimpleName(),"Remise à zéro du monde");
worlds.prepareLevel(true); worlds.prepareLevel(true);
map.redraw(); prepare();
buttonlevel.setChecked(false);
} }
}); });
Gdx.app.debug(getClass().getSimpleName(), Gdx.app.debug(getClass().getSimpleName(),
@ -378,6 +380,7 @@ public class GameScreen implements Screen {
map.setSelected(getselected()); map.setSelected(getselected());
} }
}); });
prepare();
} }
public String getselected() { public String getselected() {
@ -391,8 +394,9 @@ public class GameScreen implements Screen {
} }
public void map_transmuter(float realx, float realy, int x, int y, boolean alone, public void map_transmuter(float realx, float realy, int x, int y, boolean alone,int button, calling call) {
int button, calling call) { if (!worlds.isDebug() && level.Cout<menu.getTransmuter().getPrice())
return;
if (call == calling.taptap && button == 0 if (call == calling.taptap && button == 0
|| (call == calling.mouseclick && button == 1)) { || (call == calling.mouseclick && button == 1)) {
Angular angle = menu.getTransmuter().getRotation(); Angular angle = menu.getTransmuter().getRotation();
@ -563,6 +567,8 @@ public class GameScreen implements Screen {
public void map_fiber_pen(float realx, float realy, int x, int y, boolean alone, public void map_fiber_pen(float realx, float realy, int x, int y, boolean alone,
int button, calling call) { int button, calling call) {
if (!worlds.isDebug() && level.Cout<5)
return;
if (level.Grid.GetXY(x, y).Transmuter_calc == 0) if (level.Grid.GetXY(x, y).Transmuter_calc == 0)
level.Grid.GetXY(x, y).Fiber = -1 * level.Grid.GetXY(x, y).Fiber level.Grid.GetXY(x, y).Fiber = -1 * level.Grid.GetXY(x, y).Fiber
+ 1; + 1;
@ -574,6 +580,8 @@ public class GameScreen implements Screen {
public void map_fiber_brush(float realx, float realy, int x, int y, boolean alone, public void map_fiber_brush(float realx, float realy, int x, int y, boolean alone,
int button, calling call) { int button, calling call) {
if (!worlds.isDebug() && level.Cout<5)
return;
if (level.Grid.GetXY(x, y).Transmuter_calc == 0) 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) { if (alone) {
@ -595,6 +603,8 @@ public class GameScreen implements Screen {
public void map_copper_pen(float realx, float realy, int x, int y, boolean alone, public void map_copper_pen(float realx, float realy, int x, int y, boolean alone,
int button, calling call) { int button, calling call) {
if (!worlds.isDebug() && level.Cout<1)
return;
if (level.Grid.GetXY(x, y).Transmuter_calc == 0) if (level.Grid.GetXY(x, y).Transmuter_calc == 0)
level.Grid.GetXY(x, y).Copper = !level.Grid.GetXY(x, y).Copper; level.Grid.GetXY(x, y).Copper = !level.Grid.GetXY(x, y).Copper;
if (alone) { if (alone) {
@ -603,8 +613,9 @@ public class GameScreen implements Screen {
} }
} }
public void map_copper_brush(float realx, float realy, int x, int y, public void map_copper_brush(float realx, float realy, int x, int y,boolean alone, int button, calling call) {
boolean alone, int button, calling call) { if (!worlds.isDebug() && level.Cout<1)
return;
if (level.Grid.GetXY(x, y).Transmuter_calc == 0) if (level.Grid.GetXY(x, y).Transmuter_calc == 0)
level.Grid.GetXY(x, y).Copper = true; level.Grid.GetXY(x, y).Copper = true;
if (alone) { if (alone) {
@ -620,6 +631,14 @@ public class GameScreen implements Screen {
worlds.SaveResearch(); worlds.SaveResearch();
} }
public void prepare() {
level.Cout_copperfiber=level.Grid.tiling_copper();
level.Cout_transmuter=level.Grid.tiling_transmuter();
map.redraw();
map.tempclear();
hideInfo();
}
@Override @Override
public void render(float delta) { public void render(float delta) {
stage.act(); stage.act();
@ -632,7 +651,7 @@ public class GameScreen implements Screen {
if (unroll) if (unroll)
stage_info.draw(); stage_info.draw();
Renderer.render(delta, runTime, 2); Renderer.render(delta, runTime, 2);
//stage_tooltip.draw(); stage_tooltip.draw();
} }
@Override @Override
@ -664,7 +683,7 @@ public class GameScreen implements Screen {
stage_info.addActor(info_cout); stage_info.addActor(info_cout);
stage_info.addActor(info_up); stage_info.addActor(info_up);
stage_info.addActor(info_desc); stage_info.addActor(info_desc);
//stage_tooltip.addActor(tooltip); stage_tooltip.addActor(tooltip);
stage.addActor(horizbar); stage.addActor(horizbar);
if (worlds.getInformations().Cout>0 || worlds.getInformations().Tech>=1 ) { if (worlds.getInformations().Cout>0 || worlds.getInformations().Tech>=1 ) {
stage.addActor(vertibar); stage.addActor(vertibar);
@ -684,7 +703,7 @@ public class GameScreen implements Screen {
stage.addActor(cout); stage.addActor(cout);
stage.addActor(research); stage.addActor(research);
gesturedetector=new GestureDetector(map); gesturedetector=new GestureDetector(map);
//processors.add(stage_tooltip); processors.add(stage_tooltip);
processors.add(stage_info); processors.add(stage_info);
processors.add(stage); processors.add(stage);
processors.add(map); processors.add(map);
@ -783,6 +802,10 @@ public class GameScreen implements Screen {
AssetLoader.language = AssetLoader.french; AssetLoader.language = AssetLoader.french;
} }
} else if (caller == "stat") { } else if (caller == "stat") {
} else if (caller == "unlocked") {
level.Locked=false;
buttonlevel.setDisabled(false);
worlds.unLockLevel();
} }
} }
@ -874,13 +897,10 @@ public class GameScreen implements Screen {
selSaved = new List(AssetLoader.Skin_ui); selSaved = new List(AssetLoader.Skin_ui);
selSaved.addListener(new ClickListener() { selSaved.addListener(new ClickListener() {
public void clicked(InputEvent event, float x, float y) { public void clicked(InputEvent event, float x, float y) {
if (this.getTapCount() > 1) if (this.getTapCount() > 1) {
worlds.ReadGrid(selSaved.getSelectedIndex()); worlds.ReadGrid(selSaved.getSelectedIndex());
level.Cout_copperfiber=level.Grid.tiling_copper(); prepare();
level.Cout_transmuter=level.Grid.tiling_transmuter(); }
map.redraw();
map.tempclear();
hideInfo();
} }
}); });
ScrollPane scroll = new ScrollPane(selSaved); ScrollPane scroll = new ScrollPane(selSaved);