diff options
author | Starla Insigna <hatkirby@fourisland.com> | 2009-02-10 23:26:22 -0500 |
---|---|---|
committer | Starla Insigna <hatkirby@fourisland.com> | 2009-02-10 23:26:22 -0500 |
commit | 2e1192dc0bccd79f00fcfef266809f3d1787aafa (patch) | |
tree | ad2449562b79a4f1ec2cfd253053f36453d93d06 | |
parent | 41ce65d9ae3e75cd374b6f5f99486ee057194a06 (diff) | |
download | fourpuzzle-2e1192dc0bccd79f00fcfef266809f3d1787aafa.tar.gz fourpuzzle-2e1192dc0bccd79f00fcfef266809f3d1787aafa.tar.bz2 fourpuzzle-2e1192dc0bccd79f00fcfef266809f3d1787aafa.zip |
Engine: Changed default TitleScreen
Replaced default TitleScreen (which was the TPOAHT Title Screen for testing reasons) with a FourPuzzle Title Screen. Also moved the Title Menu to the bottom-left corner.
-rwxr-xr-x | src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java | 6 | ||||
-rwxr-xr-x | src/com/fourisland/fourpuzzle/gamestate/mapview/event/AnimationType.java | 5 | ||||
-rw-r--r-- | src/com/fourisland/fourpuzzle/resources/picture/Title.png | bin | 16801 -> 12714 bytes |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java b/src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java index ad1ffe1..6e87dd0 100755 --- a/src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java +++ b/src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java | |||
@@ -34,7 +34,7 @@ public class TitleScreenGameState implements GameState { | |||
34 | Audio.playMusic(Database.getMusic(Music.Title)); | 34 | Audio.playMusic(Database.getMusic(Music.Title)); |
35 | 35 | ||
36 | choices = new ChoiceWindow(Arrays.asList(Database.getVocab(Vocabulary.NewGame), Database.getVocab(Vocabulary.LoadGame), Database.getVocab(Vocabulary.EndGame)), true); | 36 | choices = new ChoiceWindow(Arrays.asList(Database.getVocab(Vocabulary.NewGame), Database.getVocab(Vocabulary.LoadGame), Database.getVocab(Vocabulary.EndGame)), true); |
37 | wx = (Game.WIDTH/2)-(choices.getWidth()/2); | 37 | wx = (Game.WIDTH/5)-(choices.getWidth()/2); |
38 | wy = (Game.HEIGHT/4*3)-(choices.getHeight()/2); | 38 | wy = (Game.HEIGHT/4*3)-(choices.getHeight()/2); |
39 | } | 39 | } |
40 | 40 | ||
@@ -94,12 +94,12 @@ public class TitleScreenGameState implements GameState { | |||
94 | { | 94 | { |
95 | choices.moveUp(); | 95 | choices.moveUp(); |
96 | 96 | ||
97 | pt.setTimer(1); | 97 | pt.setTimer(2); |
98 | } else if (Game.getKey().getKeyCode() == KeyEvent.VK_DOWN) | 98 | } else if (Game.getKey().getKeyCode() == KeyEvent.VK_DOWN) |
99 | { | 99 | { |
100 | choices.moveDown(); | 100 | choices.moveDown(); |
101 | 101 | ||
102 | pt.setTimer(1); | 102 | pt.setTimer(2); |
103 | } | 103 | } |
104 | } | 104 | } |
105 | } | 105 | } |
diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/AnimationType.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/AnimationType.java index 4c3aeb9..76582e3 100755 --- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/AnimationType.java +++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/AnimationType.java | |||
@@ -8,7 +8,10 @@ package com.fourisland.fourpuzzle.gamestate.mapview.event; | |||
8 | import com.fourisland.fourpuzzle.util.Interval; | 8 | import com.fourisland.fourpuzzle.util.Interval; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * | 11 | * An AnimationType is a property all PossibleEvents have. An AnimationType |
12 | * exerts some control over the Direction and AnimationStep of the | ||
13 | * PossibleEvent in question. | ||
14 | * | ||
12 | * @author hatkirby | 15 | * @author hatkirby |
13 | */ | 16 | */ |
14 | public enum AnimationType { | 17 | public enum AnimationType { |
diff --git a/src/com/fourisland/fourpuzzle/resources/picture/Title.png b/src/com/fourisland/fourpuzzle/resources/picture/Title.png index 850ad8d..99a6022 100644 --- a/src/com/fourisland/fourpuzzle/resources/picture/Title.png +++ b/src/com/fourisland/fourpuzzle/resources/picture/Title.png | |||
Binary files differ | |||