Merge pull request #537 from Just-Natsuki-Team/feature/v1.0.3

v1.0.3

game/atmosphere.rpy

@@ -592,57 +592,57 @@ label weather_change:
             if jn_atmosphere.isCurrentWeatherSunny():
                 if previous_weather.weather_type == jn_atmosphere.JNWeatherTypes.rain:
                     n 1fcsaj "Well,{w=1}{nw}"
-                    extend 1fllgs " about time all that rain buzzed off!{w=1}{nw}"
-                    n 1nchgn "Much better.{w=3}{nw}"
+                    extend 2fllgs " about time all that rain buzzed off!{w=1}{nw}"
+                    n 2nchgn "Much better.{w=3}{nw}"
 
                 elif previous_weather.weather_type == jn_atmosphere.JNWeatherTypes.thunder:
-                    n 1tllpu "Huh?{w=1.25}{nw}"
-                    extend 1ullajeex "Oh,{w=0.2} the storm passed.{w=1}{nw}"
-                    n 1fcsajsbl "Good riddance.{w=3}{nw}"
+                    n 3tllpu "Huh?{w=1.25}{nw}"
+                    extend 4ullajeex "Oh,{w=0.2} the storm passed.{w=1}{nw}"
+                    n 2fcsajsbl "Good riddance.{w=3}{nw}"
 
                 elif previous_weather.weather_type == jn_atmosphere.JNWeatherTypes.snow:
-                    n 1kllpu "Aww...{w=1.5}{nw}"
+                    n 4kllpu "Aww...{w=1.5}{nw}"
                     extend 1kllpol " it stopped snowing...{w=3}{nw}"
 
                 else:
                     n 1ulraj "Oh,{w=0.2} hey.{w=1}{nw}"
-                    extend 1ulrbo " It just cleared up outside.{w=3}{nw}"
+                    extend 2ulrbo " It just cleared up outside.{w=3}{nw}"
 
             if jn_atmosphere.isCurrentWeatherRain():
                 # Rain
                 if alt_dialogue:
                     n 1kcsemesi "Man...{w=1.25}{nw}"
-                    extend 1kllsl " rain {i}again{/i}?{w=1}{nw}"
-                    extend 1fsrbo " Lame...{w=3}{nw}"
+                    extend 4kllsl " rain {i}again{/i}?{w=1}{nw}"
+                    extend 3fsrbo " Lame...{w=3}{nw}"
 
                 else:
-                    n 1fcsem "Ugh...{w=1.5}{nw}"
-                    extend 1fslpol " I'll never {i}not{/i} find rain gross.{w=3}{nw}"
+                    n 3fcsem "Ugh...{w=1.5}{nw}"
+                    extend 3fslpol " I'll never {i}not{/i} find rain gross.{w=3}{nw}"
 
             elif jn_atmosphere.isCurrentWeatherThunder():
                 # Thunder
                 if alt_dialogue:
-                    n 1unmboesu "...{w=1}{nw}"
-                    n 1nllem "I gotta say,{w=0.75}{nw}"
-                    extend 1ksqsr " I am {i}not{/i} liking the look of those clouds.{w=1}{nw}"
-                    extend 1nsrupesd " Yeesh...{w=3}{nw}"
+                    n 4unmboesu "...{w=1}{nw}"
+                    n 2nllem "I gotta say,{w=0.75}{nw}"
+                    extend 2ksqsr " I am {i}not{/i} liking the look of those clouds.{w=1}{nw}"
+                    extend 3nsrupesd " Yeesh...{w=3}{nw}"
 
                 else:
                     n 1ulremesu "Woah...{w=1}{nw}"
-                    extend 1ullpu " now those are some clouds,{w=0.5}{nw}"
-                    extend 1tnmbo " huh?{w=3}{nw}"
+                    extend 2ullpu " now those are some clouds,{w=0.5}{nw}"
+                    extend 2tnmbo " huh?{w=3}{nw}"
 
             elif jn_atmosphere.isCurrentWeatherSnow():
                 # Snow
                 if alt_dialogue:
-                    n 1uwdajeex "Woah!{w=1}{nw}"
+                    n 4uwdajeex "Woah!{w=1}{nw}"
                     n 1ullgs "[player],{w=0.2} look!{w=0.5}{nw}"
-                    extend 1uchbgledz " It's snowing!{w=3}{nw}"
+                    extend 4uchbgledz " It's snowing!{w=3}{nw}"
 
                 else:
                     n 1uwdajeex "...!{w=1}{nw}"
-                    n 1ullbg "Heeey!{w=0.75}{nw}"
-                    extend 1uchgnledz " It's snowing!{w=3}{nw}"
+                    n 4ullbg "Heeey!{w=0.75}{nw}"
+                    extend 4uchgnledz " It's snowing!{w=3}{nw}"
 
             pause 1
             show natsuki idle at jn_center zorder JN_NATSUKI_ZORDER

game/custom-music.rpy

@@ -98,7 +98,7 @@ init python in jn_custom_music:
         renpy.show(
             name="music_player {0}".format(state),
             at_list=[store.music_player_fadein],
-            zorder=jn_events.JN_EVENT_PROP_ZORDER
+            zorder=store.JN_PROP_ZORDER
         )
         store.jnPause(0.5)
         renpy.play(filename=store.audio.gift_close, channel="audio")
@@ -111,7 +111,7 @@ init python in jn_custom_music:
         renpy.show(
             name="music_player",
             at_list=[store.music_player_fadeout],
-            zorder=jn_events.JN_EVENT_PROP_ZORDER
+            zorder=store.JN_PROP_ZORDER
         )
         store.jnPause(0.5)
         renpy.hide("music_player")
@@ -153,42 +153,46 @@ label music_menu:
     if not success:
         show natsuki at jn_center
         n 1kllunl "Uhmm..."
-        n 1knmunl "Hey...{w=0.3} [player]?"
-        n 1klrbgl "Something went wrong when I was trying look for your music..."
+        n 4knmunl "Hey...{w=0.3} [player]?"
+        n 4klrbgl "Something went wrong when I was trying look for your music..."
         n 1kchbgl "Can you do me a favour and just check everything out real quick?"
         $ folder = jn_custom_music.CUSTOM_MUSIC_DIRECTORY
-        n 1knmbgl "If you forgot -{w=0.1} anything you want me to play needs to be in the {a=[folder]}custom_music{/a} folder."
-        n 1uwdaj "Oh!{w=0.2} Right!{w=0.2} And it also needs to be in {i}.mp3,{w=0.1} .ogg or .wav{/i} format -{w=0.1} just look for the letters after the period in the file name!"
+        n 2knmbgl "If you forgot -{w=0.1} anything you want me to play needs to be in the {a=[folder]}custom_music{/a} folder."
+        n 2uwdaj "Oh!{w=0.2} Right!{w=0.2} And it also needs to be in {i}.mp3,{w=0.1} .ogg or .wav{/i} format -{w=0.1} just look for the letters after the period in the file name!"
         jump ch30_loop
 
     elif preferences.get_volume("music") == 0:
         show natsuki at jn_center
         n 1tsqaj "Uh...{w=0.5}{nw}"
         extend 1tslaj " huh."
-        n 1tsgsg "And {i}how{/i} exactly do you plan to hear any music with the volume at zero?"
-        n 1fchbg "Jeez, [player].{w=0.5}{nw}" 
+        n 2tsgsg "And {i}how{/i} exactly do you plan to hear any music with the volume at zero?"
+        n 2fchbg "Jeez, [player].{w=0.5}{nw}" 
         extend 1uchgn " How do you even get dressed in the morning with memory like that?!"
-        n 1ullss "Well, whatever.{w=0.5}{nw}"
-        extend 1unmaj " So..."
+        n 3ullss "Well, whatever.{w=0.5}{nw}"
+        extend 3unmaj " So..."
+
+        show natsuki 3unmboeqm
         menu:
             n "Did you want me to turn the music back up so you can pick something?"
 
             "Yes.":
                 n 1nchsm "Okey-{w=0.1}dokey!{w=0.2} Just a second..."
                 $ preferences.set_volume("music", 0.75)
-                n 1fcsbg "And there we are!"
-                n 1ullss "So...{w=0.5}{nw}"
-                extend 1unmaj " What did you wanna listen to?"
+                n 2fcsbg "And there we are!"
+                n 2ullss "So...{w=0.5}{nw}"
+                extend 2unmaj " what did you wanna listen to?"
+
                 show natsuki idle at jn_left
 
             "No.":
-                n 1fcsbg "The sound of silence it is,{w=0.1} then!{w=0.5}{nw}"
-                extend 1fchsm " Ehehe."
+                n 3fcsbg "The sound of silence it is,{w=0.1} then!{w=0.5}{nw}"
+                extend 3fchsm " Ehehe."
+
                 jump ch30_loop
 
     else:
         $ chosen_quip = renpy.substitute(random.choice(jn_custom_music._CHOOSE_PLAY_MUSIC_QUIPS))
-        n 1unmbgl "[chosen_quip]"
+        n 3unmbgl "[chosen_quip]"
         show natsuki idle at jn_left
 
     # We have custom music options, present the choices
@@ -200,8 +204,9 @@ label music_menu:
 
     if _return == "no_music":
         $ chosen_no_music_quip = renpy.substitute(random.choice(jn_custom_music._NATSUKI_NO_MUSIC_QUIPS))
-        n 1knmsm "[chosen_no_music_quip]"
-        show natsuki 1fchsm
+        n 2knmsm "[chosen_no_music_quip]"
+
+        show natsuki 2fchsm
         $ music_title = "No music"
 
         $ jn_custom_music.presentMusicPlayer("playing")
@@ -210,13 +215,13 @@ label music_menu:
         stop music fadeout 2
         $ jnPause(2)
 
-        n 1uchsm "There you go, [player]!{w=2}{nw}"
+        n 2uchsm "There you go, [player]!{w=2}{nw}"
 
         if persistent.jn_random_music_enabled:
             # Stop playing random music, if enabled
             $ persistent.jn_random_music_enabled = False
             n 1unmaj "Oh{w=0.2} -{w=0.50}{nw}" 
-            extend 1kchbgsbl " and I'll stop switching around the music too.{w=2}{nw}"
+            extend 3kchbgsbl " and I'll stop switching around the music too.{w=2}{nw}"
 
         $ jn_custom_music.hideMusicPlayer()
 
@@ -232,7 +237,7 @@ label music_menu:
         n 1unmajl "[chosen_question_quip]"
 
         $ chosen_answer_quip = renpy.substitute(random.choice(jn_custom_music._NATSUKI_PICK_MUSIC_ANSWER_QUIPS))
-        n 1uchbgl "[chosen_answer_quip]"
+        n 4uchbgl "[chosen_answer_quip]"
         show natsuki 1fchsmleme
 
         $ jn_custom_music.presentMusicPlayer("playing")
@@ -242,8 +247,8 @@ label music_menu:
         $ jnPause(2)
 
         $ chosen_search_quip = renpy.substitute(random.choice(jn_custom_music._NATSUKI_PICK_MUSIC_SEARCH_QUIPS))
-        n 1ullbgl "[chosen_search_quip]{w=2}{nw}"
-        show natsuki 1fcspul
+        n 2ullbgl "[chosen_search_quip]{w=2}{nw}"
+        show natsuki 4fcspul
 
         # If we have more than one track, we can make sure the new chosen track isn't the same as the current one
         if len(available_custom_music) > 1:
@@ -263,8 +268,8 @@ label music_menu:
     elif _return is not None:
         $ music_title = store.jn_utils.escapeRenpySubstitutionString(_return.split('/')[-1])
 
-        n 1fwlbg "You got it!{w=2}{nw}"
-        show natsuki 1fchsmleme
+        n 2fwlbg "You got it!{w=2}{nw}"
+        show natsuki 4fchsmleme
 
         $ jn_custom_music.presentMusicPlayer("playing")
         play audio button_tap_c
@@ -277,8 +282,8 @@ label music_menu:
         $ renpy.play(filename=_return, channel="music", fadein=2)
 
         $ chosen_done_quip = renpy.substitute(random.choice(jn_custom_music._NATSUKI_PICK_MUSIC_DONE_QUIPS))
-        n 1uchbgeme "[chosen_done_quip]{w=2}{nw}"
-        show natsuki 1fcssm
+        n 2uchbgeme "[chosen_done_quip]{w=2}{nw}"
+        show natsuki 2fcssm
 
         $ jn_custom_music.hideMusicPlayer()
 

game/definitions.rpy

@@ -17,6 +17,16 @@ init -990 python:
     import easter
     _easter = easter.easter(datetime.datetime.today().year)
 
+    # zorder constants; use these in place of hard-coded values!
+    # Remember that higher zorder values are displayed closer to the player!
+    JN_GLITCH_ZORDER = 99
+    JN_BLACK_ZORDER = 10
+    JN_OVERLAY_ZORDER = 5
+    JN_PROP_ZORDER = 4
+    JN_NATSUKI_ZORDER = 3
+    JN_DECO_ZORDER = 2
+    JN_LOCATION_ZORDER = 1
+
 define JN_NEW_YEARS_DAY = datetime.date(datetime.date.today().year, 1, 1)
 define JN_VALENTINES_DAY = datetime.date(datetime.date.today().year, 2, 14)
 define JN_EASTER = datetime.date(_easter.year, _easter.month, _easter.day)
@@ -921,7 +931,7 @@ init -3 python:
 
     def jnPause(delay, hard=True):
         """
-        Equivalent to jnPause, but we assume a hard pause so players cannot skip.
+        Equivalent to Ren'Py's pause, but we assume a hard pause so players cannot skip.
 
         IN:
             - delay - int/decimal amount of time in seconds to wait for
@@ -1018,7 +1028,15 @@ init -990 python in jn_globals:
         "[player]!{w=0.2} What's on your mind?",
         "Ooh!{w=0.2} What did you wanna talk about?",
         "I'm all ears,{w=0.1} [player]!",
-        "I've always got time for you,{w=0.1} [player]!"
+        "I've always got time for you,{w=0.1} [player]!",
+        "Hey!{w=0.2} What's up,{w=0.2} [player]?",
+        "What have you got for me?{w=0.2} Ehehe.",
+        "[player]!{w=0.2} What's new?",
+        "[player]!{w=0.2} You wanna talk?",
+        "Shoot,{w=0.2} [player]!{w=0.3} Ehehe.",
+        "Shoot,{w=0.2} [player]!",
+        "Oh!{w=0.2} Oh!{w=0.2} You got something for me?",
+        "Talk to me,{w=0.2} [player]!{w=0.3} Ehehe."
     ]
 
     # Flavor text for the talk menu at medium affinity
@@ -1031,7 +1049,9 @@ init -990 python in jn_globals:
         "Huh?{w=0.2} What's up?",
         "You wanna share something?",
         "What's new,{w=0.1} [player]?",
-        "'Sup,{w=0.1} [player]?"
+        "'Sup,{w=0.1} [player]?",
+        "You wanna talk?",
+        "Hey,{w=0.2} [player]!"
     ]
 
     # Flavor text for the talk menu at low affinity
@@ -1818,7 +1838,8 @@ init -100 python in jn_utils:
 
         if store.persistent.affinity >= (store.persistent._jn_gs_aff + 250):
             store.persistent.affinity = store.persistent._jn_gs_aff
-            jn_utils.log("434845415421".decode("hex"))
+            jn_utils.log("434346".decode("hex"))
+            store.persistent._jn_pic = True
 
         else:
             store.persistent._jn_gs_aff = store.persistent.affinity

game/locations.rpy

@@ -15,8 +15,6 @@ init python in locations:
 init -20 python:
     import os
 
-    JN_LOCATION_ZORDER = 1
-
     class Location(object):
         """
         PROPERTIES:
@@ -190,7 +188,7 @@ init -20 python:
 
             #Draw the room if we're not showing it already
             if room is not None:
-                renpy.show(room, tag="main_bg", zorder=JN_LOCATION_ZORDER)
+                renpy.show(room, tag="main_bg", zorder=store.JN_LOCATION_ZORDER)
 
             else:
                 jn_utils.log("Unable to draw room: no room image was found.")
@@ -207,7 +205,7 @@ init -20 python:
             """
             room = self.location.get_current_room_image()
             if room is not None:
-                renpy.show(room, tag="main_bg", zorder=JN_LOCATION_ZORDER)
+                renpy.show(room, tag="main_bg", zorder=store.JN_LOCATION_ZORDER)
 
             else:
                 jn_utils.log("Unable to show room: no room image was found.")