From 555d5538a81ec2dcf2dbd0879e0556531731756b Mon Sep 17 00:00:00 2001
From: Kelly Peng <mingyu.peng@stonybrook.edu>
Date: Mon, 25 Apr 2022 23:17:59 -0400
Subject: [PATCH] update splashscreen bg and fix the inheritance of start story

---
 dist/shattered_sword_assets/images/brown.png | Bin 0 -> 43042 bytes
 src/shattered_sword/Scenes/GameLevel.ts      |   2 +-
 src/shattered_sword/Scenes/SplashScreen.ts   |   2 +-
 src/shattered_sword/Scenes/Tutorial.ts       |   8 ++++++++
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 dist/shattered_sword_assets/images/brown.png

diff --git a/dist/shattered_sword_assets/images/brown.png b/dist/shattered_sword_assets/images/brown.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9263593d95b3997d1c014869e66c82693ca7576
GIT binary patch
literal 43042
zcmeI4UuauZ9LLX1Z`-?df9@PxBn#VZCrlJ(MTDT%-ga?Ggw;9rpkSE;tN0d~xLVkf
z=vX!wvc34?Lo4KY>_J4Z*kD0n%u({-ACN6YM5A-vL$T1B)SKkqLvotr`Xp?80^y$C
zo||)X@9+0L-|zR_{4O3Hi*4N;+AM_Fnute_3DH{+LZ2{toISq|T-xVsv{T1oqvGn#
zaLM^&a^jW5n@5g_$DFnybS)&ht6iM;^V%NSKCC?|x@!9aLS)|-y4z>W*;Zd4JMZc-
z^=;RT=Js~>%>=yOy@i=BudPp15376^d&b#pO2%J3B}DL{>RWqjy5O9)EfUd@<CEH*
zpPt+m(9A<4wh=Nj*LJ=)u#kN5?#qYgr~mr=#_YTApB-NMWzjG#J1w+;-lk!{R{UrD
z+v(!2)8=%CZnb}1O81|MJlF1%+@p^M2XjB{v4-0Z$!9g*3$B-pP~wXmQo)LtASQ^3
zHq$qA2XluD4>CuH31Whnkm;Z{;1lo(Vgf#aKcO37Ay^0&f`woqSSWD-{fK@<Kgx7a
z8*nB#6EOj2f-}LHBo4rt;7o8PnGR|L&ID&7Cg4nPCODJC0XP$!3C<+bL2ba9;7r5>
zoC(eZXOcJoXM!`qnPfVs4LB2=iI{*h!I|Jp5(nT+aHa>5GfjP+`qZlhz;E(Ri##XK
zAH+N-x5@2>k}GIjG_K^fZiAR0CWr}qj~2d1=98gkA8`tk+1B@SPp>{Tc=3(whm9<0
zM>3Z^)VV^K$eh+<t80Pf18R&(!dYu%j7VX=zj@z=B4GJ1)BDS3wAG!R$F%iuY0+#f
zlhtDE;&}c_<ttI%)Ok!R@X>P8XqZA<b-#D87*Cx@SA4peT5Kw!w}~|G6eokp+}sm(
z%BS0f^!}l6V8az^ygRxv+ZQR^4$ic=vrPv^^H=t6%QPRl;cMRN4wsht7W~S*4HV<s
zv)*@Ucbk@+i@MVN`%9fl%Q>e*c-3zc;U#mK@T%hi=p_LP^r}xgOpbE8VREbkCfrLh
z5xAENm~bzT=tAvXz=Ya+atP(<0w&7Q)87~qu1d$4koFG71jdA9mh}e41jdA7XJSlX
zOn6$u4GoM5j0sO`xS@eDfidA}4L39}CNL(X)~GiyCNL)CBB(ou^29`a3dNX^V1Y4#
zF@Z559}Q@1@Wh0?8W<B86BrW;PGU@8Oeh8}#stQMf|D2%QfpvLGyx`0On6|y6BGB>
z6BB=av%Xu11CJ-7Bgb2kA}7vS-e!4QVMnM)RHVX=Sl&iOHjyIJVtE@C=@COWG+5q7
zMWP}VoMd^M<!uEg?=KaJa+K?9EgP&q%FBXsL^+}yTLLD(*p`<C<%n`r7!k_x|5T3G
z{=T!&BgFZWKdzq${&qgJ`(~)GNwq|6r`FSmVhhVzUPkZe>RRs?zICIlTz205c8U^^
zV>;m2UoLn3>{~a=EX<!&&qGn1PPLTFm5O%Pw=9`aS{!V5LhhLr$L)A(U99+)B|EpA
zd{{XTWgfKd9kg<Dsq~s}S+dco$QC6%)H^X5Gz+(f^JSkQO|5?@+#|1Y>&9%KQCiwp
zJnJ*$h4kgU+nQ>`wHW+X_qpYj?MdIVWQ14k;t^gF7YMI<I)PpdG!gWw<_D9boc^o;
zlVdGEmI83EI$+v5+^d!!a4(O+W(=r(O?^P^rAFEDpOj->Tz_ZF^;GbW&xG?zyf7BM
JI{Nwt{{qrC=LG-&

literal 0
HcmV?d00001

diff --git a/src/shattered_sword/Scenes/GameLevel.ts b/src/shattered_sword/Scenes/GameLevel.ts
index 8c74524..256ddfd 100644
--- a/src/shattered_sword/Scenes/GameLevel.ts
+++ b/src/shattered_sword/Scenes/GameLevel.ts
@@ -976,7 +976,7 @@ export default class GameLevel extends Scene {
     protected playStartStory() {
         if (!this.touchedStartCheckPoint) {
             this.touchedStartCheckPoint = true;
-            this.storyLoader("shattered_sword_assets/jsons/level1story.json");
+            this.storyLoader("shattered_sword_assets/jsons/story.json");
             this.startTimer();
         }
     }
diff --git a/src/shattered_sword/Scenes/SplashScreen.ts b/src/shattered_sword/Scenes/SplashScreen.ts
index 4843a67..cde6d7f 100644
--- a/src/shattered_sword/Scenes/SplashScreen.ts
+++ b/src/shattered_sword/Scenes/SplashScreen.ts
@@ -22,8 +22,8 @@ export default class SplashScreen extends Scene {
 
     loadScene(): void {
         //load images
-        this.load.image("logo", "shattered_sword_assets/images/black.png");
         this.load.image("backgroundImage", "shattered_sword_assets/images/logo.png");
+        this.load.image("logo", "shattered_sword_assets/images/brown.png");
         // Load the menu song
         //this.load.audio("menu", "assets/music/menu.mp3");
     }
diff --git a/src/shattered_sword/Scenes/Tutorial.ts b/src/shattered_sword/Scenes/Tutorial.ts
index b7b67bc..12b6479 100644
--- a/src/shattered_sword/Scenes/Tutorial.ts
+++ b/src/shattered_sword/Scenes/Tutorial.ts
@@ -45,4 +45,12 @@ export default class Tutorial extends GameLevel {
         this.viewport.setZoomLevel(1);
         this.sceneManager.changeToScene(Porcelain);
     }
+
+    protected playStartStory(): void {
+        if (!this.touchedStartCheckPoint) {
+            this.touchedStartCheckPoint = true;
+            this.storyLoader("shattered_sword_assets/jsons/level1story.json");
+            this.startTimer();
+        }
+    }
 }
\ No newline at end of file