From ba2d198ba33d11bc1cfc9b653c310a635efd064a Mon Sep 17 00:00:00 2001
From: Jacoder23 <Jacoder23@users.noreply.github.com>
Date: Mon, 8 Apr 2024 23:12:05 +0800
Subject: [PATCH] added marisa getting hit really hard animation

Word count: 5,670 words
---
 game/achievements.rpy                         |   6 +-
 ...alice surprised.png => alice surprise.png} | Bin
 game/images/chill.png                         | Bin 1860 -> 0 bytes
 game/images/chills.png                        | Bin 0 -> 5684 bytes
 game/script.rpy                               | 251 +++++++++++++++++-
 5 files changed, 247 insertions(+), 10 deletions(-)
 rename game/images/{alice surprised.png => alice surprise.png} (100%)
 delete mode 100644 game/images/chill.png
 create mode 100644 game/images/chills.png

diff --git a/game/achievements.rpy b/game/achievements.rpy
index 1689898..7006e98 100644
--- a/game/achievements.rpy
+++ b/game/achievements.rpy
@@ -299,7 +299,7 @@ screen achievement_popup(a, tag, num):
             ## its dimensions.
             fit "contain" ysize 95 align (0.5, 0.5)
         vbox:
-            text a.name
+            text a.name size 100
             text a.description size 100
 
     ## Hide the screen after 5 seconds. You can change the time but shouldn't
@@ -398,8 +398,8 @@ screen ending_gallery():
                 # else:
                 #     null width -10
                 vbox:
-                    label a.name
-                    text a.description
+                    text a.name size 100
+                    text a.description size 100
                     # if a.has():
                     #     ## There are two ways to display the timestamp. The
                     #     ## first is automatically formatted like
diff --git a/game/images/alice surprised.png b/game/images/alice surprise.png
similarity index 100%
rename from game/images/alice surprised.png
rename to game/images/alice surprise.png
diff --git a/game/images/chill.png b/game/images/chill.png
deleted file mode 100644
index a2612648a9e9802137ba0d83cdf3649b1f4af766..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1860
zcmeHG{ZkZW9DjK8;CQKnb4URX7p~aGyO1SHLk!vtj^pKCSOO%3@)k8_QoHU-9L4l>
zZ$(}%!d8OfcnLQMxUQpVjT#1~5zi)uBt$Ome2a9vtQ=%O+?M~K-}5u`JfH9L`F!R(
z^L%H%W>sEhsBpay01&FkLNz>7{K*gW<8Qx1eQKTrdPOcKnD-Zm;jmkn*uYDXdaOvV
zeVfo5D-P&DW)8}?i8bgB#3J(K{iaS29|_d&%gf{)gs(w%4J_fwzcM{H9e~05;D;3f
ze1D+IDZqH0<KcCBS%yPVa`lNb3<@z2AOOQ~yx_#0MquO^*2}O2K|I1RUN!sp-~iA#
z%Hn{d0ZxkIzKHXw^bwJ~X=HJh1SA1)Cj>Ek3;+Uw7y_d4Rn_H0IS!yK0uc~N;xtV=
zStrYKjEe&_1B@g<7?Fq|5E4ge0%sZ8<#KUOgdqWeLa39ZX%r_Bh{X{XZRA!xhNg+I
zFwyFFALH=^{=)?RP8m0uOy5j4Wb<L4H<XzuAOm8u_!{UndD_*j_#Xpk9|)uX_|_`W
z^n&+3xisUl9E%MJD4!$Q^IXf|WQpg7KtC02f6cqw<7cV)%60p#w5yXfkKW&o?UG&p
zXPsthM_In;S>4ZuEK!QI>X5d+=7yRAT@A4MPRkK@T)TFr$B#-y|5&M7S?FKxKb`|8
zRw<9ti?7Q&>~&DKM=Mm-wK?Py;x<&f)N>SS9qC&}D7SS};93lBgKm2@R5Eo|e7Lt<
zurYuMd*RrqhO&yWD;1kgnb(*TUd^>l@4hFVFYZys8{EH(En{^^_u`(7MRL_ZrAO9y
z#=ps$FN(joMLM8LXdhJ#H(!&LQZG`rL^v);wGa_fQmCdnl7m|`pIsgnuZ0bc`)7K@
z`^C>!+fG=u*!M9Tp0HSo)up)-bpqS)x!Y^I^33+3tUGVQgx%A7kCNp$E~;0ShUYq4
z!{wTTjn`XSe;LV#1++o0ncUXtmZQQMMtNaf*LKwUahWwlcs@Ei>eiO7BzTgvHyJLq
zzibE#=1Ru<cg-I@A#UpuoXV?*O%bxbj)?3d{&OHnn$`G@u!#KeDtt2`ZCP^MJn_<9
z(z<uHLQ(gWDCR?C{I_?jBNdLUKXn<KeIVbRO6&B~nHPHJ3QtRSLWaS;`>2-G>K)-j
z8$MlZm7Y#&^cUAoCH{rPTcr~}&B~sPJ=cVoSLzw%P_nRaO~enIb>AvxyQ8<Aw7^(k
z)8MEY)!LF0tkYZ5%pW<!BkwvKwbjDrS^J1YRm#?BYAi#7itpBc9i??g?HOB0lj<}}
zLGzNPv&wUA*SeQ|rLSmkqO8-dO)O2rMANp>=61HZI1Rn*h#X4|s;w&6`s)gspZmZR
kQer;nryIEc+*0UGiAOQ@&^?urvbx<0ED!xMqx^$^0hz(Owg3PC

diff --git a/game/images/chills.png b/game/images/chills.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa9cc78d79e76c6ff8b5ac52c590ddfc72fe5c8f
GIT binary patch
literal 5684
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

literal 0
HcmV?d00001

diff --git a/game/script.rpy b/game/script.rpy
index 5616d0e..eafdc25 100644
--- a/game/script.rpy
+++ b/game/script.rpy
@@ -38,6 +38,15 @@ transform damaged:
     ease .02 xoffset -2
     ease .01 xoffset 0
 
+transform thrown_offscreen:
+    ease .5 xoffset 100 yoffset -100
+    ease .4 xoffset 200 yoffset -200
+    ease .3 xoffset 400 yoffset -400
+    ease .3 xoffset 800 yoffset -800
+    ease .2 xoffset 1600 yoffset -1600
+    ease .2 xoffset 3200 yoffset -3200
+    ease .1 xoffset 6400 yoffset -6400
+
 transform idle_vertical:
     yoffset 0
     ease 0.06
@@ -124,6 +133,82 @@ transform idle_horizontal:
     ease 0.04
     repeat
 
+transform spin:
+    around (.5, .5)
+    alignaround (.5, .5) xalign .5 yalign .5
+    rotate 0
+    linear 1 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.75 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.5 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.25 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.125 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.125 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.125 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.125 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.125 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.125 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.125 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.125 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.125 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.125 rotate 360
+
+    around (.5, .5)
+    alignaround (.5, .5)
+    rotate 0
+    linear 0.125 rotate 360
+
 # TODO: List all needed expressions
 python:
     """
@@ -211,10 +296,78 @@ image reimu surprise:
     "reimu surprise.png"
     function SpriteFocus('reimu')
 
+image yumemi disguise:
+    "yumemi disguise.png"
+    function SpriteFocus('yumemi')
+
+image yumemi glasses:
+    "yumemi glasses.png"
+    function SpriteFocus('yumemi')
+
 image yumemi happy:
     "yumemi happy.png"
     function SpriteFocus('yumemi')
 
+image yumemi neutral:
+    "yumemi neutral.png"
+    function SpriteFocus('yumemi')
+
+image yumemi serious:
+    "yumemi serious.png"
+    function SpriteFocus('yumemi')
+
+image yumemi wistful:
+    "yumemi wistful.png"
+    function SpriteFocus('yumemi')
+
+image marisa concerned:
+    "marisa concerned.png"
+    function SpriteFocus('marisa')
+
+image marisa defiant:
+    "marisa defiant.png"
+    function SpriteFocus('marisa')
+
+image marisa happy:
+    "marisa happy.png"
+    function SpriteFocus('marisa')
+
+image marisa laugh:
+    "marisa laugh.png"
+    function SpriteFocus('marisa')
+
+image marisa neutral:
+    "marisa neutral.png"
+    function SpriteFocus('marisa')
+
+image marisa serious:
+    "marisa serious.png"
+    function SpriteFocus('marisa')
+
+image marisa surprise:
+    "marisa surprise.png"
+    function SpriteFocus('marisa')
+
+image alice angry:
+    "alice angry.png"
+    function SpriteFocus('alice')
+
+image alice happy:
+    "alice happy.png"
+    function SpriteFocus('alice')
+
+image alice neutral:
+    "alice neutral.png"
+    function SpriteFocus('alice')
+
+image alice surprise:
+    "alice surprise.png"
+    function SpriteFocus('alice')
+
+image alice worried:
+    "alice worried.png"
+    function SpriteFocus('alice')
+
 screen devModeButtons1():
     grid 3 12:
         $ i = 0
@@ -376,14 +529,18 @@ label start:
         image audi_front:
             "bg auditorium front.png"
 
+        image yuuka_look:
+            "yuuka looking eyes.png"
+
+        image chills:
+            "chills.png"
+
+
         show audi_front zorder 150
 
         show bg auditorium back behind audi_front
 
         $ renpy.pause(2)
-
-        image yuuka_look:
-            "yuuka looking eyes.png"
         
         show yuuka neutral behind yuuka_look
         with fade
@@ -460,7 +617,7 @@ label start:
         $ renpy.pause(1.5)
         # play a wind sound
 
-        show yuuka neutral:
+        show yuuka irritated unmarked:
             ease 1.6 ypos 1080
 
         yuuka "Sent by a scientist you say? I think I might know who this is."
@@ -549,25 +706,61 @@ label start:
 
                     yuuka "Always with the jokes."
 
+                    show marisa laugh:
+                        xalign 1.0
+                        yalign 0.5
+
                     marisa "Can't help it when the situation's smelling funny."
 
                     yuuka "You'd know about smelling funny, little miss thief."
 
+                    show marisa surprise:
+                        xalign 1.0
+                        yalign 0.5
+
                     marisa "Thief? I can't believe you'd try to slander me like that!"
 
+                    show marisa happy:
+                        xalign 1.0
+                        yalign 0.5
+
                     marisa "I prefer to be called Robin Hood."
 
+                    show yuuka amused:
+                        xalign 0.0
+                        yalign 0.5
+
                     yuuka "Because you take from the rich and dress poor?"
 
+                    show marisa surprise:
+                        xalign 1.0
+                        yalign 0.5
+
                     marisa "Ack! How you wound me."
 
+                    show marisa happy:
+                        xalign 1.0
+                        yalign 0.5
+
                     marisa "Though given you were living it up in a mansion before, not wrong about the first half."
 
+                    show yuuka irritated:
+                        xalign 0.0
+                        yalign 0.5
+
                     yuuka "Cut to chase, Marisa. I need to see that scientist friend of yours."
 
+                    show marisa neutral:
+                        xalign 1.0
+                        yalign 0.5
+
                     marisa "Oh I'd tell you where Yumemi is, if I knew. But she's not here."
-                    
-                    yuuka "And I'm to believe you're not lying when you've lied about where you got your oh-so-original Master Spark from?"
+
+                    yuuka "And I'm to believe you're not lying when you've lied about who you got your oh-so-original Master Spark from?"
+
+                    show marisa serious:
+                        xalign 1.0
+                        yalign 0.5
 
                     marisa "Uh, yeah. Because I'm not lying."
 
@@ -575,11 +768,30 @@ label start:
                         "Does Yuuka believe her?"
 
                         "No, obviously.":
+
+                            show yuuka neutral:
+                                xalign 0.0
+                                yalign 0.5
+
                             yuuka "..."
 
                             marisa "..."
 
+                            show marisa neutral:
+                                xalign 1.0
+                                yalign 0.5
+
                             marisa "So does that mean..."
+
+                            show yuuka rage:
+                                easeout_expo 1.0 xpos 2700
+                                yalign 0.5
+
+                            $ renpy.pause(0.85, hard=True)
+
+                            show marisa surprise at spin, thrown_offscreen:
+                                xalign 1.0
+                                yalign 0.5
                             
                             yuuka "{i}Then I hit her really hard.{/i}" (cb_name="")
 
@@ -591,16 +803,41 @@ label start:
 
                             # TODO: kamehameha
 
-                            yuuka "{i}Then I blasted her really hard.{nw=1.5}{/i}" (cb_name="")
+                            show bg black with fade
+
+                            yuuka "{i}Then she was gone, just like that.{nw=2.5}{/i}" (cb_name="")
+
+                            hide bg black
+                            scene bg entrance
+
+                            show yuuka happy:
+                                xalign 0.0
+                                yalign 0.5
+
+                            show marisa serious:
+                                xalign 1.0
+                                yalign 0.5
 
                             yuuka "{i}Is what I want to say happened, but we do have spellcard rules for a reason.{/i}" (cb_name="")
 
                             yuuka "Fine then. If you're not going to concede her, shall we duel?"
 
+                            show marisa concerned:
+                                xalign 1.0
+                                yalign 0.5
+
                             marisa "Every spellcard duel begins with a misunderstanding, they say."
 
+                            show marisa defiant:
+                                xalign 1.0
+                                yalign 0.5
+
                             marisa "I'm not gonna even try to explain myself then! Let the bullets do the talking!"
 
+                            show yuuka irritated unmarked:
+                                xalign 0.0
+                                yalign 0.5
+
                             yuuka "Lets."
 
                             # TODO: lots of blasty sfx and explosions