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

Bug fixing and further development

Browse source
This commit is contained in:
Carlos Galindo 2015-02-21 00:13:39 +01:00
commit 91e8eed8b0
8 changed files with 53 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -95,6 +95,8 @@ public class MainActivity extends ActionBarActivity
startActivity(intent);
} else if (id == R.id.action_save) {
saveData();
} else if (id == R.id.action_load) {
restoreData();
}
return super.onOptionsItemSelected(item);
@ -122,7 +124,6 @@ public class MainActivity extends ActionBarActivity
protected void onStop() {
super.onStop();
Log.e("UTIL", "stop");
saveData();
}
@Override
@ -149,6 +150,13 @@ public class MainActivity extends ActionBarActivity
Toast.LENGTH_LONG
).show();
}
((TextView) findViewById(R.id.curativeEffortsText)).setText(
getString(R.string.curative_display_text1) + " " +
player.getCurativeEfforts() + " " +
getString(R.string.curative_display_text2) + " " +
player.getMaxCurativeEfforts() + " " +
getString(R.string.curative_display_text3)
);
healthStatusCheck();
}
}
@ -162,7 +170,6 @@ public class MainActivity extends ActionBarActivity
input.setInputType(InputType.TYPE_CLASS_NUMBER);
input.setHint(R.string.suffer_damage_hint);
alert.setView(input);
alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
@ -199,7 +206,13 @@ public class MainActivity extends ActionBarActivity
Button pg = (Button) findViewById(R.id.pgCurrent);
pg.setText(String.valueOf(player.getPg()));
if (status == Player.MUERTO) {
pg.setText("");
pg.setTextColor(Color.BLACK);
pg.setBackgroundColor(Color.RED);
Toast.makeText(
getApplicationContext(),
R.string.message_death,
Toast.LENGTH_LONG
).show();
} else if (status == Player.DEBILITADO)
pg.setTextColor(Color.RED);
else if (status == Player.MALHERIDO)
@ -233,7 +246,7 @@ public class MainActivity extends ActionBarActivity
((TextView) findViewById(R.id.raceText)).setText(player.getRaceName());
((TextView) findViewById(R.id.classText)).setText(player.getClassName());
((TextView) findViewById(R.id.lvl)).setText(String.valueOf(player.getLevel()));
((Button) findViewById(R.id.pgCurrent)).setText(String.valueOf(player.getMaxPg()));
((Button) findViewById(R.id.pgCurrent)).setText(String.valueOf(player.getPg()));
}
private void saveData() {

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

@ -80,7 +80,7 @@ public class Player {
if(recovered == USE_CURATIVE_EFFORT){
if(uses && curativeEfforts <= 0) return NOT_CURED;
else {
if(uses) curativeEfforts--;
if(uses && pg < maxPg) curativeEfforts--;
pg += maxPg / 4;
}
} else {