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

fix: réelle gestion de déblocage des niveaux le mode "debogue" permet d'accéder à tout les niveaux ou monde même bloqués

This commit is contained in:
Nicolas Hordé 2016-02-02 21:09:32 +01:00
parent 7efec490f4
commit cc9bdbc746
6 changed files with 108 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/fr/evolving/UI/ButtonLevel.java
View File

@ -24,15 +24,14 @@ public class ButtonLevel extends ImageTextButton {
public ButtonLevel(Level level, float ratio, boolean modifyxy) {
super(level.Name, AssetLoader.Skin_level, "world"
+ String.valueOf(level.aWorld));
Locked = AssetLoader.Skin_level.getAtlas().findRegion("locked");
Finalled = AssetLoader.Skin_level.getAtlas().findRegion("boss");
this.modifyxy=modifyxy;
this.level = level;
this.ratio = ratio;
if (level.Special == true) {
Finalled = AssetLoader.Skin_level.getAtlas().findRegion("boss");
}
if (level.Locked == false) {
if (level.Locked) {
this.setDisabled(true);
Locked = AssetLoader.Skin_level.getAtlas().findRegion("locked");
}
this.setColor(1f, 0.47f + (float) level.X / 1024f * 0.529f,
0.607f + (float) level.X / 768f * 0.392f, 1f);
@ -88,7 +87,7 @@ public class ButtonLevel extends ImageTextButton {
Finalled.getRegionWidth() * scale,
Finalled.getRegionHeight() * scale);
}
if (!level.Locked) {
if (level.Locked) {
batch.draw(
Locked,
getX() + this.getWidth() - Locked.getRegionWidth(),

1
core/src/fr/evolving/automata/Level.java
View File

@ -35,6 +35,7 @@ public class Level implements Serializable {
public transient int Rayon;
public transient int Nrj;
public transient boolean Locked;
public transient boolean Locked_old;
public Level(int aWorld, int aLevel, int id, String Name,
String Description, String Element, int[] Current, int[] Victory,

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

@ -134,9 +134,7 @@ public class Worlds extends Actor {
if (level!=null && level.aWorld==usedworld)
{
if (level.aLevel==0)
level.Locked=true;
else
level.Locked=AssetLoader.Datahandler.user().getLevellock(0, level.aLevel);
level.Locked=false;
tempworld.add(level);
}
return tempworld;
@ -145,6 +143,12 @@ public class Worlds extends Actor {
return null;
}
public void updateUnlockLevels() {
for(Level level:levels)
if (level!=null)
level.Locked=AssetLoader.Datahandler.user().getLevellock(0, level.id);
}
public State getState() {
return state;
}
@ -183,6 +187,24 @@ public class Worlds extends Actor {
}
}
public void setMaxWorldLevel() {
usedworld=getMaxUnlockWorlds();
usedlevel=getMaxUnlockLevel();
}
public boolean isFirstWorld() {
return (usedworld==0);
}
public boolean isLastWorld() {
return (usedworld==getMaxUnlockWorlds());
}
public boolean isRealLastWorld() {
return (usedworld==getMaxWorlds());
}
public void NextWorld() {
if (state!=State.notloaded)
if (usedworld<getMaxWorlds()) {
@ -218,6 +240,7 @@ public class Worlds extends Actor {
public void load(String campaign) {
Gdx.app.log("*****", "Chargement de la compagne "+campaign);
levels=AssetLoader.Datahandler.game().getCampaign(campaign);
updateUnlockLevels();
name=campaign;
if (levels==null)
state=State.notloaded;
@ -257,6 +280,26 @@ public class Worlds extends Actor {
return max;
}
public int getMaxUnlockWorlds() {
int maxworld=0;
for (Level level : levels)
if (!level.Locked && level.aWorld>maxworld)
maxworld=level.aWorld;
return maxworld;
}
public Level getMaxUnlockLevel() {
Array<Level> tempworld=getLevels();
int maxlevel=0;
Level themaxlevel=null;
for (Level level : tempworld)
if (!level.Locked && level.aLevel>maxlevel) {
maxlevel=level.aLevel;
themaxlevel=level;
}
return themaxlevel;
}
public String getName() {
return this.name;
}

4
core/src/fr/evolving/database/LocalBase.java
View File

@ -178,9 +178,9 @@ public class LocalBase extends Base {
return false;
}
if (cursor.next())
return true;
else
return false;
else
return true;
}
public boolean setLevelunlock(int user, int level) {

4
core/src/fr/evolving/renderers/LevelRenderer.java
View File

@ -146,7 +146,7 @@ public class LevelRenderer {
* AssetLoader.ratio,
10,
0.5f,
LevelScreen.buttonLevels[i].level.Locked,
!LevelScreen.buttonLevels[i].level.Locked,
LevelScreen.buttonLevels[i]
.getLevelcolor(),
LevelScreen.buttonLevels[found]
@ -162,7 +162,7 @@ public class LevelRenderer {
* AssetLoader.ratio,
10,
0.5f,
LevelScreen.buttonLevels[i].level.Locked,
!LevelScreen.buttonLevels[i].level.Locked,
LevelScreen.buttonLevels[i]
.getLevelcolor(),
LevelScreen.buttonLevels[found]

89
core/src/fr/evolving/screens/LevelScreen.java
View File

@ -51,7 +51,7 @@ public class LevelScreen implements Screen {
public Image MenuSolo, MenuMulti, MenuScenario;
private ImageTextButton cout, tech, cycle, temp, rayon, nrj;
private TextButton buttonConnect, buttonPlay, buttonStat, buttonSave,
buttonApply, buttonPlaythis;
buttonApply, buttonPlaythis;
private ServerList Statdata, Userdata, Gamedata;
private Worldlist Worlddata;
private Label Statdatalabel, Userdatalabel, Gamedatalabel, Worlddatalabel;
@ -63,9 +63,9 @@ public class LevelScreen implements Screen {
public void play() {
if (worlds.getState()!=State.notloaded && worlds.getState()!=State.databasefailed) {
Gdx.app.debug(getClass().getSimpleName(),"Afficher le monde 0");
if (worlds.getWorld() < 0)
worlds.setWorld(0);
worlds.setMaxWorldLevel();
Gdx.app.debug(getClass().getSimpleName(),"Afficher derniere réalisation, monde :"+worlds.getWorld()+" niveau:"+worlds.getLevel());
worlds.Forcereload();
}
}
@ -208,17 +208,16 @@ public class LevelScreen implements Screen {
if (level.Description.isEmpty())
level.Description=AssetLoader.language.get("[level"+(level.aWorld+1)+"/"+(level.aLevel+1)+"-desc]");
buttonLevels[i] = new ButtonLevel(level, AssetLoader.ratio, true);
Gdx.app.debug(getClass().getSimpleName(), "Ajout du niveau :"
+ level.Name + " N°" + String.valueOf(level.aLevel));
if (worlds.isDebug()) buttonLevels[i].setDisabled(false);
Gdx.app.debug(getClass().getSimpleName(), "Ajout du niveau :"+ level.Name + " N°" + String.valueOf(level.aLevel));
buttonLevels[i++].addListener(new ClickListener() {
@Override
public void enter(InputEvent event, float x, float y,
int pointer, Actor fromActor) {
ButtonLevel abutton = (ButtonLevel) event
.getListenerActor();
Gdx.app.debug(event.getListenerActor().toString(),
"Enter button ");
if (!abutton.isChecked())
Gdx.app.debug(event.getListenerActor().toString(),"Enter button ");
if (!abutton.isChecked() && (!abutton.level.Locked || worlds.isDebug()))
showlevel(abutton);
}
@ -226,19 +225,16 @@ public class LevelScreen implements Screen {
int pointer, Actor fromActor) {
ButtonLevel abutton = (ButtonLevel) event
.getListenerActor();
Gdx.app.debug(event.getListenerActor().toString(),
"Enter button ");
if (!abutton.isChecked())
Gdx.app.debug(event.getListenerActor().toString(),"Enter button ");
if (!abutton.isChecked() && (!abutton.level.Locked || worlds.isDebug()))
showlevel(abutton);
}
public void touchDragged(InputEvent event, float x,
float y, int pointer) {
ButtonLevel abutton = (ButtonLevel) event
.getListenerActor();
ButtonLevel abutton = (ButtonLevel) event.getListenerActor();
if (worlds.isDebug()) {
abutton.setPosition(event.getStageX() - 56,
event.getStageY() - 20);
abutton.setPosition(event.getStageX() - 56, event.getStageY() - 20);
}
}
});
@ -277,8 +273,11 @@ public class LevelScreen implements Screen {
selected=buttonLevels[0];
selected.setChecked(true);
showlevel(selected);
Previous.setVisible(true);
Next.setVisible(true);
Previous.setVisible(!worlds.isFirstWorld());
if (worlds.isDebug())
Next.setVisible(!worlds.isRealLastWorld());
else
Next.setVisible(!worlds.isLastWorld());
buttonPlay.setVisible(true);
TextDescriptive.setVisible(true);
}
@ -290,8 +289,7 @@ public class LevelScreen implements Screen {
}
}
});
Gdx.app.debug(getClass().getSimpleName(),
"Création des elements primordiaux du screen (stage, renderer, table)");
Gdx.app.debug(getClass().getSimpleName(),"Création des elements primordiaux du screen (stage, renderer, table)");
stage = new Stage(AssetLoader.viewport);
table = new Table();
Renderer = new LevelRenderer(this);
@ -315,16 +313,16 @@ public class LevelScreen implements Screen {
MenuSolo.addAction(Actions.sequence(
Actions.parallel(Actions.rotateBy(640, 0.5f),
Actions.scaleTo(0.05f, 0.05f, 0.5f)),
Actions.run(new Runnable() {
public void run() {
level();
}
})));
Actions.run(new Runnable() {
public void run() {
level();
}
})));
}
});
MenuMulti = new Image(AssetLoader.Skin_level, "menu2");
MenuMulti
.setOrigin(MenuMulti.getWidth() / 2, MenuMulti.getHeight() / 2);
.setOrigin(MenuMulti.getWidth() / 2, MenuMulti.getHeight() / 2);
MenuMulti.addListener(new ClickListener() {
public void clicked(InputEvent event, float x, float y) {
MenuSolo.addAction(Actions.fadeOut(0.5f));
@ -332,11 +330,11 @@ public class LevelScreen implements Screen {
MenuMulti.addAction(Actions.sequence(
Actions.parallel(Actions.rotateBy(640, 0.5f),
Actions.scaleTo(0.05f, 0.05f, 0.5f)),
Actions.run(new Runnable() {
public void run() {
level();
}
})));
Actions.run(new Runnable() {
public void run() {
level();
}
})));
}
});
MenuScenario = new Image(AssetLoader.Skin_level, "menu3");
@ -349,11 +347,11 @@ public class LevelScreen implements Screen {
MenuScenario.addAction(Actions.sequence(
Actions.parallel(Actions.rotateBy(640, 0.5f),
Actions.scaleTo(0.05f, 0.05f, 0.5f)),
Actions.run(new Runnable() {
public void run() {
level();
}
})));
Actions.run(new Runnable() {
public void run() {
level();
}
})));
}
});
Gdx.app.debug(getClass().getSimpleName(), "Création des boutons.");
@ -362,10 +360,27 @@ public class LevelScreen implements Screen {
logosmall.setChecked(worlds.isDebug());
logosmall.addListener(new ClickListener() {
public void clicked(InputEvent event, float x, float y) {
if (logosmall.isChecked())
if (logosmall.isChecked()) {
if (buttonLevels != null)
for (int j = 0; j < 10; j++) {
if (buttonLevels[j] != null)
buttonLevels[j].setDisabled(false);
}
worlds.ActivateDebug();
else
Next.setVisible(!worlds.isRealLastWorld());
}
else {
if (buttonLevels != null)
for (int j = 0; j < 10; j++) {
if (buttonLevels[j] != null)
buttonLevels[j].setDisabled(buttonLevels[j].level.Locked);
}
worlds.DesactivateDebug();
worlds.updateUnlockLevels();
worlds.setMaxWorldLevel();
loadWorld();
}
}
});
TextDescriptive = new TextArea("Descriptif", AssetLoader.Skin_level,