Merge branch 'dev' into gouv-3

game/scripts/cg/luna.rpy

@@ -294,8 +294,6 @@ image lun_blowjob_personal_loop_ahegao_hold_down:
     pause 0.10
     repeat
 
-
-
 image lun_blowjob_personal_pose1_handjob_slow:
     Fixed(
         "lun_blowjob_personal_pose1_luna_stroke_down_shadow",
@@ -333,3 +331,82 @@ image lun_blowjob_personal_pose1_handjob_fast:
 
     pause 0.2
     repeat
+
+layeredimage lun_grind:
+    fit "contain"
+    fit_first True
+
+    always "lun_grind_background"
+
+    group body:
+        attribute idle "lun_grind_idle" default
+        attribute grind "lun_grind_grind" default
+        attribute spread "lun_grind_spread" default
+        attribute cumshot "lun_grind_cumshot" default
+
+image lun_grind_idle:
+    Fixed(
+        "lun_grind_body_idle",
+        "lun_grind_penis_grind_frame0")
+
+image lun_grind_grind:
+    Fixed(
+        "lun_grind_body_idle",
+        "lun_grind_penis_grind_frame0")
+
+    pause 0.44
+
+    Fixed(
+        "lun_grind_body_grind",
+        "lun_grind_penis_grind_frame1")
+
+    pause 0.44
+    repeat
+
+image lun_grind_spread:
+    Fixed(
+        "lun_grind_body_spread",
+        "lun_grind_penis_grind_frame1")
+
+image lun_grind_cumshot:
+    Fixed(
+        "lun_grind_body_spread",
+        "lun_grind_penis_grind_frame1",
+        "lun_grind_cumshot_frame0")
+
+    pause 0.12
+    Fixed(
+        "lun_grind_body_spread",
+        "lun_grind_penis_grind_frame1",
+        "lun_grind_cumshot_frame1")
+
+    pause 0.12
+
+    Fixed(
+        "lun_grind_body_spread",
+        "lun_grind_penis_grind_frame1",
+        "lun_grind_cumshot_frame2")
+
+    pause 0.12
+
+    Fixed(
+        "lun_grind_body_spread",
+        "lun_grind_penis_grind_frame1",
+        "lun_grind_cumshot_frame3")
+
+    pause 0.12
+
+    Fixed(
+        "lun_grind_body_spread",
+        "lun_grind_penis_grind_frame1",
+        "lun_grind_cumshot_frame4")
+
+    pause 0.12
+
+    Fixed(
+        "lun_grind_body_spread",
+        "lun_grind_penis_grind_frame1",
+        "lun_grind_cumshot_frame5")
+
+    pause 1
+    repeat

game/scripts/characters/cho/summon.rpy

@@ -45,7 +45,7 @@ label summon_cho:
                     "Are you ready to begin the match?"
                     "-Yes-":
                         pass
-                    "-no-":
+                    "-No-":
                         jump cho_requests
             jump start_hufflepuff_match
 
@@ -57,7 +57,7 @@ label summon_cho:
                     "Are you ready to begin the match?"
                     "-Yes-":
                         pass
-                    "-no-":
+                    "-No-":
                         jump cho_requests
             jump start_slytherin_match
 

game/scripts/characters/susan/summon.rpy

@@ -194,7 +194,7 @@ label susan_talk:
                     gen "Being called a slut always boosts a girl's confidence!" ("base", xpos="far_left", ypos="head")
                     sus @ cheeks blush "R-- Really?" ("soft", "happy", "sad", "mid")
                     gen "Yes. Now... shall we try it?" ("base", xpos="far_left", ypos="head")
-                    sus @ cheeks blush "... alright, [name_genie_susan]..." ("base", "happy", "sad", "mid")
+                    sus @ cheeks blush "... Alright, [name_genie_susan]..." ("base", "happy", "sad", "mid")
                     jump susan_talk
                 "-Custom Input-":
                     $ temp_name = renpy.input("(Please enter the name.)", name_susan_genie, ALLOWED_CHARACTERS, length=14)

game/scripts/options.rpy

@@ -88,6 +88,7 @@ define config.tag_zorder = {
     "xray_overlay": -1,
     "xray_mask": -1,
     "cg": 17,
+    "cg2": 18,
 }
 
 # Saving and loading

game/scripts/rooms/main_room/objects/weather.rpy

@@ -22,6 +22,8 @@ image weather overcast = ConditionSwitch( # final
     )
 
 transform cloud_move:
+    animation
+
     subpixel True
     choice:
         yoffset 0