diff --git a/AndorsTrail/res/layout/monsterinfo.xml b/AndorsTrail/res/layout/monsterinfo.xml index 58fc47dcb..9e3b0b83c 100644 --- a/AndorsTrail/res/layout/monsterinfo.xml +++ b/AndorsTrail/res/layout/monsterinfo.xml @@ -67,6 +67,11 @@ + + + + + 60% 70% + + + + Previous kills + \ No newline at end of file diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java index 5de716a9b..e696b9c9e 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java @@ -31,6 +31,7 @@ public final class MonsterInfoActivity extends AndorsTrailBaseActivity { private RangeBar hp; private ViewGroup monsterinfo_container; private TextView monsterinfo_max_ap; + private TextView monsterinfo_killcount; @Override @@ -48,6 +49,7 @@ public final class MonsterInfoActivity extends AndorsTrailBaseActivity { monsterinfo_title = (TextView) findViewById(R.id.monsterinfo_title); monsterinfo_difficulty = (TextView) findViewById(R.id.monsterinfo_difficulty); monsterinfo_max_ap = (TextView) findViewById(R.id.monsterinfo_max_ap); + monsterinfo_killcount = (TextView) findViewById(R.id.monsterinfo_killcount); Button b = (Button) findViewById(R.id.monsterinfo_close); b.setOnClickListener(new OnClickListener() { @@ -95,6 +97,7 @@ public final class MonsterInfoActivity extends AndorsTrailBaseActivity { false); hp.update(monster.getMaxHP(), monster.getCurrentHP()); monsterinfo_max_ap.setText(Integer.toString(monster.getMaxAP())); + monsterinfo_killcount.setText(Integer.toString(world.model.statistics.getNumberOfKillsForMonsterName(monster.getName()) )); } public static int getMonsterDifficultyResource(ControllerContext controllerContext, Monster monster) { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java index 29fe694f5..938a949e9 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java @@ -78,12 +78,12 @@ public final class GameStatistics { return v; } - /*public int getNumberOfKillsForMonsterName(String monsterName) { + public int getNumberOfKillsForMonsterName(String monsterName) { Integer v = killedMonstersByName.get(monsterName); if (v == null) return 0; return v; } -*/ + public String getTop5MostCommonlyKilledMonsters(WorldContext world, Resources res) { if (killedMonstersByTypeID.isEmpty()) return null; List> entries = new ArrayList>(killedMonstersByName.entrySet());