Merge pull request #838 from Just-Natsuki-Team/v1.3.3

v1.3.3
Just-Natsuki-Team · Nov 10, 2023 · f6a367b · f6a367b
2 parents 8cee0ae + 77cc9a2
commit f6a367b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-    <img src="https://justnatsuki.club/img/logos/jn_1-3-2_logo.png" height="300"/>
+    <img src="https://justnatsuki.club/img/logos/jn_1-3-3_logo.png" height="300"/>
 </p>
 <br>
 

diff --git a/game/options.rpy b/game/options.rpy
@@ -12,7 +12,7 @@
 ##
 ## The _() surrounding the string marks it as eligible for translation.
 
-define config.version = "1.3.2"
+define config.version = "1.3.3"
 define config.name = "Just Natsuki"
 define config.window_title = _("Just Natsuki - {0}".format(config.version))
 

diff --git a/game/script-ch30.rpy b/game/script-ch30.rpy
@@ -244,7 +244,8 @@ label ch30_init:
 
 #The main loop
 label ch30_loop:
-    show natsuki idle at jn_center zorder JN_NATSUKI_ZORDER
+    if not renpy.showing("natsuki idle"):
+        show natsuki idle at jn_center zorder JN_NATSUKI_ZORDER
 
     #Run our checks
     python:

diff --git a/game/script-events.rpy b/game/script-events.rpy
@@ -2980,15 +2980,15 @@ label holiday_new_years_day:
             play audio kiss
             $ jnPause(1.5)
             hide black with Dissolve(1.25)
-            $ chosen_endearment = random.choice(jn_globals.DEFAULT_PLAYER_ENDEARMENTS)
+            $ chosen_endearment = jn_utils.getRandomEndearment()
             n 4kwmsmf "...Happy new year,{w=0.2} [chosen_endearment].{w=1.25}{nw}"
             extend 4kllssfess " Ehehe."
 
         else:
             show natsuki 1nsldvlsbl at jn_center zorder JN_NATSUKI_ZORDER
             $ jnPause(1.5)
             hide black with Dissolve(1.25)
-            $ chosen_tease = random.choice(jn_globals.DEFAULT_PLAYER_TEASE_NAMES)
+            $ chosen_tease = jn_utils.getRandomTease()
             n 4klrssf "Heh."
             n 1fchsmfess "...Happy new year,{w=0.2} [chosen_tease]."
 
@@ -5026,7 +5026,7 @@ label holiday_player_birthday:
             n 4fsrsrl "..."
             n 4fcsunl "Uuuuu..."
             n 1fcspul "Just...{w=1}{nw}"
-            $ chosen_tease = random.choice(jn_globals.DEFAULT_PLAYER_TEASE_NAMES)
+            $ chosen_tease = jn_utils.getRandomTease()
             extend 2klrpol " read it already,{w=0.2} [chosen_tease]."
 
         else:

diff --git a/game/zz_data-migrations.rpy b/game/zz_data-migrations.rpy
@@ -443,25 +443,17 @@ init python in jn_data_migrations:
         jn_utils.log("Migration to 1.3.0 DONE")
         return
 
-    @migration(["1.3.0"], "1.3.1", runtime=MigrationRuntimes.INIT)
-    def to_1_3_1():
-        jn_utils.log("Migration to 1.3.1 START")
-        store.persistent._jn_version = "1.3.1"
-        jn_utils.save_game()
-        jn_utils.log("Migration to 1.3.1 DONE")
-        return
-
-    @migration(["1.3.1"], "1.3.2", runtime=MigrationRuntimes.INIT)
+    @migration(["1.3.0", "1.3.1", "1.3.2"], "1.3.3", runtime=MigrationRuntimes.INIT)
     def to_1_3_2():
-        jn_utils.log("Migration to 1.3.2 START")
-        store.persistent._jn_version = "1.3.2"
+        jn_utils.log("Migration to 1.3.3 START")
+        store.persistent._jn_version = "1.3.3"
 
-        if store.persistent.affinity >= 7500:
+        if store.persistent.affinity >= 10000:
             store.persistent._jn_pic_aff = store.persistent.affinity
             store.persistent.affinity = 0
             store.persistent._jn_pic = True
             jn_utils.log("434346".decode("hex"))
 
         jn_utils.save_game()
-        jn_utils.log("Migration to 1.3.2 DONE")
-        return
+        jn_utils.log("Migration to 1.3.3 DONE")
+        return