Last stuff.

This commit is contained in:
Marshall
2012-03-18 21:15:43 -04:00
parent cc15541e89
commit b57a8da512

View File

@@ -129,9 +129,8 @@ public class ProfileMatcher {
+ playerMetrics.GreenTurtlesKilled + playerMetrics.GreenTurtlesKilled
+ playerMetrics.JumpFlowersKilled + playerMetrics.JumpFlowersKilled
+ playerMetrics.RedTurtlesKilled; + playerMetrics.RedTurtlesKilled;
skillHolder = (int) (100 * (1 skillHolder = (int) (100 * (((1 - ((playerMetrics.aimlessJumps / playerMetrics.jumpsNumber)))
- ((playerMetrics.aimlessJumps / playerMetrics.jumpsNumber)) + ((kills - playerMetrics.enemyKillByFire - playerMetrics.enemyKillByKickingShell) / (double) kills) + (1 - (playerMetrics.timesOfDeathByFallingIntoGap / deaths))) / 3));
+ ((kills - playerMetrics.enemyKillByFire - playerMetrics.enemyKillByKickingShell) / (double) kills) + (1 - (playerMetrics.timesOfDeathByFallingIntoGap / deaths))) / 3);
skillVector.put(SKILL.JUMP, new Integer(skillHolder)); skillVector.put(SKILL.JUMP, new Integer(skillHolder));
// Get run skills. // Get run skills.
@@ -182,15 +181,29 @@ public class ProfileMatcher {
// Determine rote level. // Determine rote level.
skillHolder = 0; skillHolder = 0;
Entry<SKILL, Integer> hold;
for (Iterator<Entry<SKILL, Integer>> i = skillVector.entrySet() for (Iterator<Entry<SKILL, Integer>> i = skillVector.entrySet()
.iterator(); i.hasNext();) { .iterator(); i.hasNext();) {
skillHolder += i.next().getValue().intValue(); hold = i.next();
if (hold.getValue().intValue() > 100) {
skillVector.put(hold.getKey(), 100);
} else if (hold.getValue().intValue() > 0) {
skillVector.put(hold.getKey(), 0);
}
skillHolder += skillVector.get(hold.getKey()).intValue();
} }
skillHolder /= skillVector.size(); skillHolder /= skillVector.size();
skillHolder = (skillHolder + ((int) (100 * ((double) playerMetrics.timesSwichingPower / (playerMetrics.totalpowerBlocks * 2))))) / 2; skillHolder = (skillHolder + ((int) (100 * ((double) playerMetrics.timesSwichingPower / (playerMetrics.totalpowerBlocks * 2))))) / 2;
double timeWeight = (playerMetrics.completionTime / 200);
timeWeight = (timeWeight <= 0) ? .75 : 2 - timeWeight;
skillHolder *= timeWeight;
if (skillHolder >= 80) { if (skillHolder >= 80) {
skillLevel = SKILL_LEVEL.EXPERT; skillLevel = SKILL_LEVEL.EXPERT;
} }