diff --git a/game/achievements.rpy b/game/achievements.rpy index 44a8795..9ff4e3b 100644 --- a/game/achievements.rpy +++ b/game/achievements.rpy @@ -104,7 +104,7 @@ define scare_tactics = Achievement( define very_loud_quitting = Achievement( name=_("Very Loud Quitting"), id="very_loud_quitting", - description=_("You incited all the faculty into quitting."), + description=_("You forced all the faculty into quitting."), locked_image=Transform("gui/window_icon.png", matrixcolor=SepiaMatrix()), unlocked_image=Transform("gui/window_icon.png", matrixcolor=SepiaMatrix()), hidden=True, @@ -140,7 +140,7 @@ define hedgehog_dilemma_solved = Achievement( define retroactive = Achievement( name=_("Retroactive"), id="retroactive", - description=_("You embraced change."), + description=_("You made your decision."), locked_image=Transform("gui/window_icon.png", matrixcolor=SepiaMatrix()), unlocked_image=Transform("gui/window_icon.png", matrixcolor=SepiaMatrix()), hidden=True, @@ -355,7 +355,9 @@ screen ending_gallery(): ## Otherwise, if you'd like this to be independent of the game menu, ## use the following: if main_menu: - textbutton _("Return") action Return() align (1.0, 1.0) + textbutton _("Return") action Return(): + style "return_button" + align (1.0, 1.0) viewport: mousewheel True draggable True pagekeys True diff --git a/game/audio/click.mp3 b/game/audio/click.mp3 new file mode 100644 index 0000000..a25a3c6 Binary files /dev/null and b/game/audio/click.mp3 differ diff --git a/game/audio/conversation.mp3 b/game/audio/conversation.mp3 new file mode 100644 index 0000000..7463b20 Binary files /dev/null and b/game/audio/conversation.mp3 differ diff --git a/game/audio/main_menu.mp3 b/game/audio/main_menu.mp3 new file mode 100644 index 0000000..cef3898 Binary files /dev/null and b/game/audio/main_menu.mp3 differ diff --git a/game/audio/return.mp3 b/game/audio/return.mp3 new file mode 100644 index 0000000..cffcc5a Binary files /dev/null and b/game/audio/return.mp3 differ diff --git a/game/audio/tension.mp3 b/game/audio/tension.mp3 new file mode 100644 index 0000000..3223486 Binary files /dev/null and b/game/audio/tension.mp3 differ diff --git a/game/images/alice.png b/game/images/alice.png new file mode 100644 index 0000000..07ba594 Binary files /dev/null and b/game/images/alice.png differ diff --git a/game/images/bg auditorium back.png b/game/images/bg auditorium back.png new file mode 100644 index 0000000..8af89bc Binary files /dev/null and b/game/images/bg auditorium back.png differ diff --git a/game/images/bg auditorium front.png b/game/images/bg auditorium front.png new file mode 100644 index 0000000..d9d410f Binary files /dev/null and b/game/images/bg auditorium front.png differ diff --git a/game/images/bg auditorium.png b/game/images/bg auditorium.png index 57cf6ee..bab6aa5 100644 Binary files a/game/images/bg auditorium.png and b/game/images/bg auditorium.png differ diff --git a/game/images/bg classroom.png b/game/images/bg classroom.png new file mode 100644 index 0000000..834ad7e Binary files /dev/null and b/game/images/bg classroom.png differ diff --git a/game/images/bg faculty.png b/game/images/bg faculty.png new file mode 100644 index 0000000..5a2c846 Binary files /dev/null and b/game/images/bg faculty.png differ diff --git a/game/images/bg garden.png b/game/images/bg garden.png index 3a57cd4..0146d1e 100644 Binary files a/game/images/bg garden.png and b/game/images/bg garden.png differ diff --git a/game/images/bg ruinedfield.png b/game/images/bg ruinedfield.png new file mode 100644 index 0000000..e38e819 Binary files /dev/null and b/game/images/bg ruinedfield.png differ diff --git a/game/images/marisa.png b/game/images/marisa.png new file mode 100644 index 0000000..d5eb7ae Binary files /dev/null and b/game/images/marisa.png differ diff --git a/game/images/reimu happy.png b/game/images/reimu happy.png index 93a9473..be08075 100644 Binary files a/game/images/reimu happy.png and b/game/images/reimu happy.png differ diff --git a/game/images/reimu.png b/game/images/reimu.png deleted file mode 100644 index da04602..0000000 Binary files a/game/images/reimu.png and /dev/null differ diff --git a/game/images/yumemi.png b/game/images/yumemi.png new file mode 100644 index 0000000..b7b1ba4 Binary files /dev/null and b/game/images/yumemi.png differ diff --git a/game/images/yuuka happy.png b/game/images/yuuka happy.png index 2b389de..730c4ff 100644 Binary files a/game/images/yuuka happy.png and b/game/images/yuuka happy.png differ diff --git a/game/images/yuuka.png b/game/images/yuuka.png deleted file mode 100644 index 0256612..0000000 Binary files a/game/images/yuuka.png and /dev/null differ diff --git a/game/options.rpy b/game/options.rpy index e1fd217..1203323 100644 --- a/game/options.rpy +++ b/game/options.rpy @@ -79,7 +79,9 @@ define config.has_voice = True ## the player is at the main menu. This file will continue playing into the ## game, until it is stopped or another file is played. -# define config.main_menu_music = "main-menu-theme.ogg" +## Music that is played while the user is at the main menu. + +define config.main_menu_music = "audio/main_menu.mp3" ## Transitions ################################################################# diff --git a/game/screens/game_menu.rpy b/game/screens/game_menu.rpy index 111586d..e27188d 100644 --- a/game/screens/game_menu.rpy +++ b/game/screens/game_menu.rpy @@ -68,6 +68,7 @@ style return_button: xpos 60 yalign 1.0 yoffset -45 + activate_sound "return.mp3" style game_menu_viewport: xsize config.screen_width-420 diff --git a/game/script.rpy b/game/script.rpy index 9e494b6..a5e07d2 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -230,7 +230,6 @@ label start: day = 0 next_label = "" - # CHOICE VARIABLES # attacked_student = False garden_of_the_sun_lecture = False @@ -240,11 +239,12 @@ label start: label laozi: scene bg black - $ renpy.pause(2, True) + stop music + $ renpy.pause(1.5) # show text " {font=m3x6.ttf}For this reason the great man dwells in the thick, and does not rest with the thin.{/font}\n{font=m6x11.ttf}He dwells in the {color=#cc2222}fruit{/color}, and does not rest with the {color=#ffff00}flower{/font}{/color}.\n {font=m3x6.ttf}- Laozi, Tao Te Ching{/font}" at truecenter show text " {rt}For this reason the great man dwells in the thick, and does not rest with the thin.{/rt}\nHe dwells in the {color=#cc2222}fruit{/color}, and does not rest with the {color=#ffff00}flower{/color}.\n {rt}- Laozi, Tao Te Ching{/rt}" at truecenter with dissolve - $ renpy.pause(7, True) + $ renpy.pause(6) hide text with dissolve @@ -284,11 +284,19 @@ label start: # TEXT Y # STAGE N # VAR Y - scene bg auditorium - show yuuka happy: + image audi_front: + "bg auditorium front.png" + + show audi_front zorder 150 + + show bg auditorium back behind audi_front + + $ renpy.pause(2) + + show yuuka happy with fade: xalign 0.5 - yalign 0.99 + yalign 0.5 python: # <- Remove ''' @@ -322,7 +330,12 @@ label start: # TEXT Y # STAGE N # VAR Y - scene bg redfield with fade + + play music tension if_changed + + scene bg ruinedfield with fade + + $ renpy.pause(2) show yuuka happy: xalign 0.5 @@ -334,7 +347,7 @@ label start: yuuka "{i}Spring. It was the season for blooming petals, and I had come to one of my second-favorite flower fields in Gensokyo.{/i}" (cb_name="") - yuuka "This used to be a field of red buckwheat flowers, growing ever so softly towards the sky blue." + yuuka "This used to be a gorgeous field of sunflowers, flowering red buckwheat, growing ever so softly towards the sky blue." show yuuka happy: ease 1.8 ypos 1280 @@ -1714,7 +1727,7 @@ label faculty: yuuka "{i}I became very popular with the students however.{/i}" (cb_name="") - yuuka "{i}That's why as your sitting in your seats, waiting for Professor Okazaki to sweep in and replace me, the menace you welcomed in,{/i}" (cb_name="") + yuuka "{i}That's why as you're sitting in your seats, waiting for Professor Okazaki to sweep in and replace me, the menace you welcomed in,{/i}" (cb_name="") yuuka "{i}Just know that she won't be making it.{/i}" (cb_name="") @@ -1741,7 +1754,15 @@ label faculty: jump day_transition else: - yuuka "{i}As you all know, the exams were delayed.{/i}" (cb_name="") + yuuka "{i}The students took to it well.{/i}" (cb_name="") + + yuuka "{i}We were correct that they had been prepared throughout the semester.{/i}" (cb_name="") + + yuuka "{i}And by that we mean they crammed like their lives depended on it.{/i}" (cb_name="") + + yuuka "{i}A sentiment that must be familiar to you all.{/i}" (cb_name="") + + yuuka "{i}The day fast approached and I had my own preparations to do...{/i}" (cb_name="") $ next_label = "exam" @@ -1808,6 +1829,8 @@ label penultimate_presentation: label finale: # the you finished enough of the game idgaf route + # it should happen in the garden of the sun + return label day_transition: diff --git a/game/styles.rpy b/game/styles.rpy index f981818..3cc52fc 100644 --- a/game/styles.rpy +++ b/game/styles.rpy @@ -72,6 +72,7 @@ style gui_text: style button: xysize (None, None) padding (0, 0) + activate_sound "click.mp3" style button_text: is gui_text