kauron/DungeonManager
kauron/DungeonManager
Archived
1
0
Fork 0
Code Releases Activity

Imrpoved undo

Browse source
This commit is contained in:
Carlos Galindo 2015-03-04 23:51:47 +01:00
commit 06673bdcd0
16 changed files with 35 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/kauron/dungeonmanager/Introduction.java
View file

@ -64,6 +64,7 @@ public class Introduction extends ActionBarActivity {
@Override
public void onBackPressed() {
super.onBackPressed();
Toast.makeText(
getApplicationContext(),
R.string.message_no_back_button_intro,

21
app/src/main/java/com/kauron/dungeonmanager/MainActivity.java
View file

@ -57,7 +57,6 @@ public class MainActivity extends ActionBarActivity{
.setColorFilter(Color.parseColor("#62BACE"), PorterDuff.Mode.SRC_IN);
curativeEffortsBar.getProgressDrawable()
.setColorFilter(Color.parseColor("#FFD700"), PorterDuff.Mode.SRC_IN);
//TODO: use the negative PG bar, not curativeEfforts one
undo = false;
//begin
restoreData();
@ -77,7 +76,11 @@ public class MainActivity extends ActionBarActivity{
@Override
public boolean onPrepareOptionsMenu (Menu menu) {
menu.findItem(R.id.action_undo).setVisible(undo);
menu.findItem(R.id.action_undo).setEnabled(undo);
if (undo)
menu.findItem(R.id.action_undo).getIcon().setAlpha(255);
else
menu.findItem(R.id.action_undo).getIcon().setAlpha(128);
return true;
}
@ -120,7 +123,6 @@ public class MainActivity extends ActionBarActivity{
//levelUp
//TODO: update defenses
//TODO: add attack points when necessary
//TODO: update currentPg button
//TODO: improve leveling up
player.setMaxPgOnLevelUp();
lvl.setText(
@ -496,11 +498,13 @@ public class MainActivity extends ActionBarActivity{
undoObject = NULL;
message = getString(R.string.action_undo_current_pg);
}
Toast.makeText(
getApplicationContext(),
message,
Toast.LENGTH_LONG
).show();
if (!message.isEmpty()) {
Toast.makeText(
getApplicationContext(),
message,
Toast.LENGTH_LONG
).show();
}
pgUpdate();
undo = false;
invalidateOptionsMenu();
@ -599,7 +603,6 @@ public class MainActivity extends ActionBarActivity{
}
//TODO: show on screen the max pg's
// if(progressBar.getId() == R.id.pgBar) {
// double rate = (double)current / progressBar.getMax() * (negative ? -1:1);
// if (rate <= 0) {

2
app/src/main/java/com/kauron/dungeonmanager/Player.java
View file

@ -217,7 +217,7 @@ public class Player {
public void setRaceInt(int raceInt) {this.raceInt= raceInt;}
public int getRaceInt() {return raceInt;}
//TODO: implement time in the app
//TODO: implement turns (for bonuses and continuous damage in the app
public void rest(boolean isLong) {
if(isLong) {
pg = maxPg;