From 3c0673febf070cab8660c54b28c2f363c1b3a704 Mon Sep 17 00:00:00 2001 From: Marshall Date: Sun, 18 Mar 2012 20:31:54 -0400 Subject: [PATCH] Some new stuff. --- src/dk/itu/mario/MarioInterface/GamePlay.java | 9 ++++++--- src/dk/itu/mario/level/PlayerProfile.java | 7 ++++++- .../itu/mario/level/matcher/ProfileMatcher.java | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/dk/itu/mario/MarioInterface/GamePlay.java b/src/dk/itu/mario/MarioInterface/GamePlay.java index 6beebc2..a2a30f0 100644 --- a/src/dk/itu/mario/MarioInterface/GamePlay.java +++ b/src/dk/itu/mario/MarioInterface/GamePlay.java @@ -10,7 +10,8 @@ public class GamePlay implements Serializable { private static final long serialVersionUID = 1L; public static final GamePlay DEFAULT_PROFILE = new GamePlay(); - + public boolean isDefault = false; + public int completionTime; // counts only the current run on the level, // excluding death games public int totalTime;// sums all the time, including from previous games if @@ -95,9 +96,11 @@ public class GamePlay implements Serializable { gp = (GamePlay) in.readObject(); } catch (Exception e) { // TODO Auto-generated catch block - //e.printStackTrace(); - System.out.println("Unable to read from GamePlay file: " + fileName + ", initializing a new GamePlay instance."); + // e.printStackTrace(); + System.out.println("Unable to read from GamePlay file: " + fileName + + ", initializing a new GamePlay instance."); gp = GamePlay.DEFAULT_PROFILE; + gp.isDefault = true; } return gp; } diff --git a/src/dk/itu/mario/level/PlayerProfile.java b/src/dk/itu/mario/level/PlayerProfile.java index 7ceaee7..e97af47 100644 --- a/src/dk/itu/mario/level/PlayerProfile.java +++ b/src/dk/itu/mario/level/PlayerProfile.java @@ -55,23 +55,28 @@ public class PlayerProfile { public int getBumpSkill() { return skillVector.get(SKILL.BUMP); } + public int getCollectSkill() { return skillVector.get(SKILL.COLLECT); } + public int getJumpSkill() { return skillVector.get(SKILL.JUMP); } + public int getRunSkill() { return skillVector.get(SKILL.RUN); } + public int getShootSkill() { return skillVector.get(SKILL.SHOOT); } + public int getStompSkill() { return skillVector.get(SKILL.STOMP); } - public double getProbability(ChallengeRewardType crt) { + public double getProbability(ChallengeRewardType crt) { switch (crt) { case GAP: return Math.min(.5, (.5) * (skillVector.get(SKILL.JUMP) / 100.0) diff --git a/src/dk/itu/mario/level/matcher/ProfileMatcher.java b/src/dk/itu/mario/level/matcher/ProfileMatcher.java index 4d58b33..3ecf6b6 100644 --- a/src/dk/itu/mario/level/matcher/ProfileMatcher.java +++ b/src/dk/itu/mario/level/matcher/ProfileMatcher.java @@ -81,6 +81,21 @@ public class ProfileMatcher { TYPE type = null; HashMap skillVector = new HashMap(); + if (playerMetrics.isDefault) { + skillLevel = SKILL_LEVEL.BEGINNER; + type = TYPE.RUNNER; + + skillVector.put(SKILL.BUMP, new Integer(25)); + skillVector.put(SKILL.COLLECT, new Integer(25)); + skillVector.put(SKILL.JUMP, new Integer(25)); + skillVector.put(SKILL.RUN, new Integer(25)); + skillVector.put(SKILL.SHOOT, new Integer(25)); + skillVector.put(SKILL.STOMP, new Integer(25)); + + PlayerProfile ret = new PlayerProfile(skillLevel, type, skillVector); + return ret; + } + int skillHolder; // Get bump skills.