wfolsom/cs8803p4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p3

Browse Source 
Conflicts:
	src/dk/itu/mario/level/matcher/ProfileMatcher.java
This commit is contained in:
Marshall
2012-03-18 19:57:41 -04:00
parent 952ccdc23b d5b8e0b85e
commit aa5d9099f1
19 changed files with 485 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dk/itu/mario/level/matcher/ProfileMatcher.java
View File

@@ -69,7 +69,6 @@ public class ProfileMatcher {
DataRecorder detailedInfo) {
System.out
.println("Selecting PlayerProfile based on GamePlay metrics, DataRecorder logs.");
// GAP comes from jump skill and jumper type.
// ENEMY comes from run skill and runner type and stomp skill.
// HARDER_ENEMY comes from shooting skill and shooting type.
@@ -123,7 +122,7 @@ public class ProfileMatcher {
// Relevant to: ENEMY.
skillHolder = (int) (100 * ((((double) playerMetrics.timeSpentRunning)
/ playerMetrics.totalTime + (playerMetrics.timesPressedRun / 75 > 1 ? 0
: 1 - (playerMetrics.timesPressedRun / 75.0))) / 2));
: 1 - (playerMetrics.timesPressedRun / 200))) / 2));
skillVector.put(SKILL.RUN, new Integer(skillHolder));
// Get shoot skills.
@@ -174,6 +173,8 @@ public class ProfileMatcher {
skillHolder /= skillVector.size();
skillHolder = (skillHolder + ((int) (100 * ((double) playerMetrics.timesSwichingPower / (playerMetrics.totalpowerBlocks * 2))))) / 2;
if (skillHolder >= 80) {
skillLevel = SKILL_LEVEL.EXPERT;
}