r/emotionhero
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Slight level changes

Browse source
This commit is contained in:
Ruben 2016-08-30 15:56:21 +01:00
parent cb5d5dff69
commit d12a9bd38e
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/com/rubenvandeven/emotionhero/Scenario.java
View file

@ -301,18 +301,32 @@ public class Scenario {
public void createTargets() { public void createTargets() {
switch(id) { switch(id) {
case LVL_ANGER: case LVL_ANGER:
setTarget(Emotion.ANGER, 10, 1); setTarget(Emotion.ANGER, 100, 1);
setTarget(Emotion.ANGER, 100, 2);
setTarget(Emotion.ANGER, 10, 3);
setTarget(Emotion.ANGER, 20, 4);
setTarget(Emotion.ANGER, 40, 5);
setTarget(Emotion.ANGER, 70, 6);
setTarget(Emotion.ANGER, 100, 7);
break; break;
case LVL_JOY: case LVL_JOY:
setTarget(Emotion.ANGER, 10, 1); setTarget(Emotion.JOY, 100, 1);
setTarget(Emotion.ANGER, 20, 2); setTarget(Emotion.JOY, 100, 2);
setTarget(Emotion.ANGER, 40, 3); setTarget(Emotion.JOY, 100, 4);
setTarget(Emotion.ANGER, 70, 4); setTarget(Emotion.CONTEMPT, 20, 4);
setTarget(Emotion.ANGER, 100, 5); setTarget(Emotion.ANGER, 100, 5);
setTarget(Emotion.JOY, 100, 8); setTarget(Emotion.JOY, 100, 7);
setTarget(Emotion.ANGER, 100, 10); setTarget(Emotion.ANGER, 100, 9);
setTarget(Emotion.JOY, 100, 15); setTarget(Emotion.JOY, 100, 11);
setTarget(Emotion.ANGER, 100, 20); setTarget(Emotion.JOY, 70, 12);
setTarget(Emotion.JOY, 60, 13);
setTarget(Emotion.JOY, 30, 14);
setTarget(Emotion.JOY, 10, 14.5f);
setTarget(Emotion.ANGER, 100, 16);
setTarget(Emotion.JOY, 100, 17);
setTarget(Emotion.JOY, 100, 18);
setTarget(Emotion.JOY, 100, 19);
setTarget(Emotion.JOY, 100, 20);
break; break;
case LVL_SURPRISE: case LVL_SURPRISE:
setTarget(Emotion.SURPRISE, 20, 1); setTarget(Emotion.SURPRISE, 20, 1);

4
app/src/main/java/com/rubenvandeven/emotionhero/ScenarioView.java
View file

@ -242,8 +242,8 @@ public class ScenarioView extends SurfaceView implements SurfaceHolder.Callback
public void surfaceCreated(SurfaceHolder holder) { public void surfaceCreated(SurfaceHolder holder) {
setWillNotDraw(false); //Allows us to use invalidate() to call onDraw() setWillNotDraw(false); //Allows us to use invalidate() to call onDraw()
this.setZOrderOnTop(true); // this.setZOrderOnTop(true);
holder.setFormat(PixelFormat.TRANSPARENT); // holder.setFormat(PixelFormat.TRANSPARENT);
// Log.e("TEST2", "Jaa2!"); // Log.e("TEST2", "Jaa2!");
_thread = new PanelThread(getHolder(), this); //Start the thread that _thread = new PanelThread(getHolder(), this); //Start the thread that