Merge pull request #40 from RIP95/master

Another graphics update
2017-03-16 22:01:12 +01:00 · 2017-03-16 22:01:12 +01:00 · b28145dfc3
parent 3fa085e9d5 93e565ca05
commit b28145dfc3
543 changed files with 93 additions and 94 deletions
--- a/app/src/main/java/com/example/yink/amadeus/VoiceLine.java
+++ b/app/src/main/java/com/example/yink/amadeus/VoiceLine.java
@ -28,21 +28,21 @@ class VoiceLine {
    }

    static class Mood {
-        static final int HAPPY = R.drawable.kurisu_9;
-        static final int PISSED = R.drawable.kurisu_6;
-        static final int ANNOYED = R.drawable.kurisu_7;
-        static final int ANGRY = R.drawable.kurisu_10;
-        static final int BLUSH = R.drawable.kurisu_11;
+        static final int HAPPY = R.drawable.kurisu_happy;
+        static final int PISSED = R.drawable.kurisu_pissed;
+        static final int ANNOYED = R.drawable.kurisu_annoyed;
+        static final int ANGRY = R.drawable.kurisu_angry;
+        static final int BLUSH = R.drawable.kurisu_blush;
        /* TODO: How should we name this mood?.. */
-        static final int SIDE = R.drawable.kurisu_12;
-        static final int SAD = R.drawable.kurisu_3;
-        static final int NORMAL = R.drawable.kurisu_2;
-        static final int SLEEPY = R.drawable.kurisu_1;
-        static final int WINKING = R.drawable.kurisu_5;
-        static final int DISAPPOINTED = R.drawable.kurisu_8;
-        static final int INDIFFERENT = R.drawable.kurisu_4;
-        static final int SIDED_PLEASANT = R.drawable.kurisu_15;
-        static final int SIDED_WORRIED = R.drawable.kurisu_17;
+        static final int SIDE = R.drawable.kurisu_side;
+        static final int SAD = R.drawable.kurisu_sad;
+        static final int NORMAL = R.drawable.kurisu_normal;
+        static final int SLEEPY = R.drawable.kurisu_eyes_closed;
+        static final int WINKING = R.drawable.kurisu_winking;
+        static final int DISAPPOINTED = R.drawable.kurisu_disappointed;
+        static final int INDIFFERENT = R.drawable.kurisu_indifferent;
+        static final int SIDED_PLEASANT = R.drawable.kurisu_sided_pleasant;
+        static final int SIDED_WORRIED = R.drawable.kurisu_sided_worried;
    }

    static class Line {
--- a/app/src/main/res/drawable-hdpi/kurisu10a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu10a.png
--- a/app/src/main/res/drawable-hdpi/kurisu10b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu10b.png
--- a/app/src/main/res/drawable-hdpi/kurisu10c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu10c.png
--- a/app/src/main/res/drawable-hdpi/kurisu11a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu11a.png
--- a/app/src/main/res/drawable-hdpi/kurisu11b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu11b.png
--- a/app/src/main/res/drawable-hdpi/kurisu11c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu11c.png
--- a/app/src/main/res/drawable-hdpi/kurisu12a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu12a.png
--- a/app/src/main/res/drawable-hdpi/kurisu12b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu12b.png
--- a/app/src/main/res/drawable-hdpi/kurisu12c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu12c.png
--- a/app/src/main/res/drawable-hdpi/kurisu13a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu13a.png
--- a/app/src/main/res/drawable-hdpi/kurisu13b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu13b.png
--- a/app/src/main/res/drawable-hdpi/kurisu13c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu13c.png
--- a/app/src/main/res/drawable-hdpi/kurisu14a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu14a.png
--- a/app/src/main/res/drawable-hdpi/kurisu14b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu14b.png
--- a/app/src/main/res/drawable-hdpi/kurisu14c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu14c.png
--- a/app/src/main/res/drawable-hdpi/kurisu15a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu15a.png
--- a/app/src/main/res/drawable-hdpi/kurisu15b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu15b.png
--- a/app/src/main/res/drawable-hdpi/kurisu15c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu15c.png
--- a/app/src/main/res/drawable-hdpi/kurisu16a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu16a.png
--- a/app/src/main/res/drawable-hdpi/kurisu16b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu16b.png
--- a/app/src/main/res/drawable-hdpi/kurisu16c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu16c.png
--- a/app/src/main/res/drawable-hdpi/kurisu17a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu17a.png
--- a/app/src/main/res/drawable-hdpi/kurisu17b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu17b.png
--- a/app/src/main/res/drawable-hdpi/kurisu17c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu17c.png
--- a/app/src/main/res/drawable-hdpi/kurisu18a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu18a.png
--- a/app/src/main/res/drawable-hdpi/kurisu18b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu18b.png
--- a/app/src/main/res/drawable-hdpi/kurisu18c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu18c.png
--- a/app/src/main/res/drawable-hdpi/kurisu19a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu19a.png
--- a/app/src/main/res/drawable-hdpi/kurisu19b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu19b.png
--- a/app/src/main/res/drawable-hdpi/kurisu19c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu19c.png
--- a/app/src/main/res/drawable-hdpi/kurisu1a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu1a.png
--- a/app/src/main/res/drawable-hdpi/kurisu1b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu1b.png
--- a/app/src/main/res/drawable-hdpi/kurisu1c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu1c.png
--- a/app/src/main/res/drawable-hdpi/kurisu2a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu2a.png
--- a/app/src/main/res/drawable-hdpi/kurisu2b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu2b.png
--- a/app/src/main/res/drawable-hdpi/kurisu2c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu2c.png
--- a/app/src/main/res/drawable-hdpi/kurisu3a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu3a.png
--- a/app/src/main/res/drawable-hdpi/kurisu3b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu3b.png
--- a/app/src/main/res/drawable-hdpi/kurisu3c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu3c.png
--- a/app/src/main/res/drawable-hdpi/kurisu4a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu4a.png
--- a/app/src/main/res/drawable-hdpi/kurisu4b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu4b.png
--- a/app/src/main/res/drawable-hdpi/kurisu4c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu4c.png
--- a/app/src/main/res/drawable-hdpi/kurisu5a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu5a.png
--- a/app/src/main/res/drawable-hdpi/kurisu5b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu5b.png
--- a/app/src/main/res/drawable-hdpi/kurisu5c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu5c.png
--- a/app/src/main/res/drawable-hdpi/kurisu6a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu6a.png
--- a/app/src/main/res/drawable-hdpi/kurisu6b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu6b.png
--- a/app/src/main/res/drawable-hdpi/kurisu6c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu6c.png
--- a/app/src/main/res/drawable-hdpi/kurisu7a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu7a.png
--- a/app/src/main/res/drawable-hdpi/kurisu7b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu7b.png
--- a/app/src/main/res/drawable-hdpi/kurisu7c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu7c.png
--- a/app/src/main/res/drawable-hdpi/kurisu8a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu8a.png
--- a/app/src/main/res/drawable-hdpi/kurisu8b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu8b.png
--- a/app/src/main/res/drawable-hdpi/kurisu8c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu8c.png
--- a/app/src/main/res/drawable-hdpi/kurisu9a.png
+++ b/app/src/main/res/drawable-hdpi/kurisu9a.png
--- a/app/src/main/res/drawable-hdpi/kurisu9b.png
+++ b/app/src/main/res/drawable-hdpi/kurisu9b.png
--- a/app/src/main/res/drawable-hdpi/kurisu9c.png
+++ b/app/src/main/res/drawable-hdpi/kurisu9c.png
--- a/app/src/main/res/drawable-hdpi/kurisu_angry1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_angry1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_angry2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_angry2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_angry3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_angry3.png
--- a/app/src/main/res/drawable-hdpi/kurisu_annoyed1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_annoyed1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_annoyed2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_annoyed2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_annoyed3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_annoyed3.png
--- a/app/src/main/res/drawable-hdpi/kurisu_blush1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_blush1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_blush2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_blush2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_blush3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_blush3.png
--- a/app/src/main/res/drawable-hdpi/kurisu_disappointed1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_disappointed1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_disappointed2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_disappointed2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_disappointed3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_disappointed3.png
--- a/app/src/main/res/drawable-hdpi/kurisu_eyes_closed1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_eyes_closed1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_eyes_closed2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_eyes_closed2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_eyes_closed3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_eyes_closed3.png
--- a/app/src/main/res/drawable-hdpi/kurisu_happy1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_happy1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_happy2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_happy2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_happy3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_happy3.png
--- a/app/src/main/res/drawable-hdpi/kurisu_indifferent1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_indifferent1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_indifferent2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_indifferent2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_indifferent3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_indifferent3.png
--- a/app/src/main/res/drawable-hdpi/kurisu_normal1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_normal1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_normal2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_normal2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_normal3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_normal3.png
--- a/app/src/main/res/drawable-hdpi/kurisu_pissed1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_pissed1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_pissed2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_pissed2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_pissed3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_pissed3.png
--- a/app/src/main/res/drawable-hdpi/kurisu_sad1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_sad1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_sad2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_sad2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_sad3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_sad3.png
--- a/app/src/main/res/drawable-hdpi/kurisu_side1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_side1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_side2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_side2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_side3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_side3.png
--- a/app/src/main/res/drawable-hdpi/kurisu_sided_angry1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_sided_angry1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_sided_angry2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_sided_angry2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_sided_angry3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_sided_angry3.png
--- a/app/src/main/res/drawable-hdpi/kurisu_sided_blush1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_sided_blush1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_sided_blush2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_sided_blush2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_sided_blush3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_sided_blush3.png
--- a/app/src/main/res/drawable-hdpi/kurisu_sided_eyes_closed1.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_sided_eyes_closed1.png
--- a/app/src/main/res/drawable-hdpi/kurisu_sided_eyes_closed2.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_sided_eyes_closed2.png
--- a/app/src/main/res/drawable-hdpi/kurisu_sided_eyes_closed3.png
+++ b/app/src/main/res/drawable-hdpi/kurisu_sided_eyes_closed3.png
--- a/Show More
+++ b/Show More