Merge pull request 'final map' (#178) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/178
2025-01-22 09:16:56 +01:00 · 2021-11-27 02:58:00 +00:00 · 2021-11-27 02:58:00 +00:00 · 28cb852ab6
commit 28cb852ab6
parent 52f497efc1 f3016f8098
70 changed files with 1 additions and 32 deletions
--- a/game/audio/OST/its_the_piece_of_shit_you_asked_for.ogg
+++ b/game/audio/OST/its_the_piece_of_shit_you_asked_for.ogg
--- a/game/audio/OST/ringtone.ogg
+++ b/game/audio/OST/ringtone.ogg
--- a/game/audio/OST/startup.ogg
+++ b/game/audio/OST/startup.ogg
--- a/game/audio/effects/beachLoop1.ogg
+++ b/game/audio/effects/beachLoop1.ogg
--- a/game/audio/effects/beachLoop2.ogg
+++ b/game/audio/effects/beachLoop2.ogg
--- a/game/audio/effects/caveman_magic.ogg
+++ b/game/audio/effects/caveman_magic.ogg
--- a/game/audio/effects/city
+++ b/game/audio/effects/city
--- a/game/audio/effects/correctA.ogg
+++ b/game/audio/effects/correctA.ogg
--- a/game/audio/effects/correctB.ogg
+++ b/game/audio/effects/correctB.ogg
--- a/game/audio/effects/correctC.ogg
+++ b/game/audio/effects/correctC.ogg
--- a/game/audio/effects/paAlertReverb.ogg
+++ b/game/audio/effects/paAlertReverb.ogg
--- a/game/audio/effects/promChatterLoop1.ogg
+++ b/game/audio/effects/promChatterLoop1.ogg
--- a/game/audio/effects/promChatterLoop2.ogg
+++ b/game/audio/effects/promChatterLoop2.ogg
--- a/game/audio/effects/rumble.ogg
+++ b/game/audio/effects/rumble.ogg
--- a/game/audio/effects/tireSqueal.ogg
+++ b/game/audio/effects/tireSqueal.ogg
--- a/game/audio/effects/wooden-door-slam-hard.ogg
+++ b/game/audio/effects/wooden-door-slam-hard.ogg
--- a/game/audio/title_3.ogg
+++ b/game/audio/title_3.ogg
--- a/game/images/anon/Other/test.png
+++ b/game/images/anon/Other/test.png
--- a/game/images/anon/base
+++ b/game/images/anon/base
--- a/game/images/anon/ending
+++ b/game/images/anon/ending
--- a/game/images/anon/ending
+++ b/game/images/anon/ending
--- a/game/images/anon/ending
+++ b/game/images/anon/ending
--- a/game/images/anon/ending
+++ b/game/images/anon/ending
--- a/game/images/anon/prom
+++ b/game/images/anon/prom
--- a/game/images/anon/prom
+++ b/game/images/anon/prom
--- a/game/images/anon/yiiknon.png
+++ b/game/images/anon/yiiknon.png
--- a/game/images/backgrounds/Reed_Backgarden_V2.jpg
+++ b/game/images/backgrounds/Reed_Backgarden_V2.jpg
--- a/game/images/backgrounds/aquarium
+++ b/game/images/backgrounds/aquarium
--- a/game/images/backgrounds/moespizza
+++ b/game/images/backgrounds/moespizza
--- a/game/images/fang/christmas/fang
+++ b/game/images/fang/christmas/fang
--- a/game/images/fang/christmas/fang
+++ b/game/images/fang/christmas/fang
--- a/game/images/fang/fullbody/guitar.png
+++ b/game/images/fang/fullbody/guitar.png
--- a/game/images/fang/fullbody/guitar2.png
+++ b/game/images/fang/fullbody/guitar2.png
--- a/game/images/fang/prom
+++ b/game/images/fang/prom
--- a/game/images/fang/prom
+++ b/game/images/fang/prom
--- a/game/images/fangparents/fangdad
+++ b/game/images/fangparents/fangdad
--- a/game/images/fangparents/fangdad
+++ b/game/images/fangparents/fangdad
--- a/game/images/fangparents/fangdad
+++ b/game/images/fangparents/fangdad
--- a/game/images/naomi/naomi
+++ b/game/images/naomi/naomi
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/phone/aafmp_anyone.png
+++ b/phone/aafmp_anyone.png
--- a/phone/aafmp_dotdotdot1.png
+++ b/phone/aafmp_dotdotdot1.png
--- a/phone/aafmp_dotdotdot2.png
+++ b/phone/aafmp_dotdotdot2.png
--- a/phone/aafmp_dotdotdot3.png
+++ b/phone/aafmp_dotdotdot3.png
--- a/phone/aafmp_dotdotdot4.png
+++ b/phone/aafmp_dotdotdot4.png
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/phone/aafmp_sure_anon.png
+++ b/phone/aafmp_sure_anon.png
--- a/game/images/other/anon
+++ b/game/images/other/anon
--- a/phone/aafmp_thanks.png
+++ b/phone/aafmp_thanks.png
--- a/game/images/trish/trish
+++ b/game/images/trish/trish
--- a/game/images/trish/trish
+++ b/game/images/trish/trish
--- a/game/script.rpy
+++ b/game/script.rpy
@ -297,7 +297,6 @@ image stella prom considering flip = im.Flip("stella/stella prom considering.png
 #happy flips
 image fang blacklight happy flip = im.Flip("fang/blacklight/fang blacklight happy.png", horizontal=True)
 image fang happy flip = im.Flip("fang/basic set/fang happy.png", horizontal=True)
 image fang a prom happy flip = im.Flip("fang/prom sets/fang a prom happy.png", horizontal=True)
 image fang d prom happy flip = im.Flip("fang/prom sets/fang d prom happy.png", horizontal=True)
 image fang c prom happy flip = im.Flip("fang/prom sets/fang c prom happy.png", horizontal=True)
 image fang c happy flip = im.Flip("fang/future sets/fang c happy.png", horizontal=True)
@ -449,8 +448,6 @@ image projector9 normal = "images/cgs/projector9.jpg"
 image schooloutside normal = "images/backgrounds/outside school.jpg"
 image schooloutside blurred = im.Blur("images/backgrounds/outside school.jpg", 1.8)
 image sodacan blurred = im.Blur("images/other/sodacan.png", 1.8)
 image fangdadlarge = "images/fangparents/fangdad neutral large.png"
 image fangdadunimpressedlarge = "images/fangparents/fangdad unimpressed large.png"
 image lighter = "images/other/lighter.png"
 image amberpendant = "images/other/amberpendant1.png"
 image fangphone = "images/other/fangphone.png"
@ -890,34 +887,6 @@ image anonphonetoplayer = "images/other/phoneshitpost/anonphonetoplayer.png"
 image baseanonphone = "images/anon/Other/anonphone.png"
 image anonblack_mid = im.Crop("images/other/black.png",740,200,300,450)
 #anon and fang messaging
 image msg_fang_hey = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_hey.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_about_earlier = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_about earlier.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_thanks = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_thanks.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_for_like_hanging_out = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_for like hanging out.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_and_sorry_about_dad = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_and sorry about dad.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_typing_first_1 = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_dotdotdot1.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_typing_first_2 = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_dotdotdot2.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_typing_first_3 = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_dotdotdot3.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_typing_first_4 = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_dotdotdot4.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_about_that_song = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_about that song.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_typing_second_1 = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_about that song 2nd dots 1.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_typing_second_2 = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_about that song 2nd dots 2.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_typing_second_3 = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_about that song 2nd dots 3.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_typing_second_4 = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_about that song 2nd dots 4.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_so_like_how_about_we = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_so like how about we.png", 1.0),(737,200,440,655)), 0.692)
 image msg_anon_sure = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_sure_anon.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_and_sorry_about_mom = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_and sorry about mom.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_just_ignore_anything_she_says = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_just ignore anything she says.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_also_dont_tell_anyone = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_also dont tell anyone what you saw.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_anyone = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_anyone.png", 1.0),(737,200,440,655)), 0.692)
 image msg_anon_ten_bucks = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_ten bucks anon.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_i_have_my_dad = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_I have my dad on speed dial.png", 1.0),(737,200,440,655)), 0.692)
 image msg_anon_five_bucks = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_five bucks anon.png", 1.0),(737,200,440,655)), 0.692)
 image msg_anon_lol_jk = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_lol jk anon.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_gobble_a_knob = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_gobble a knob.png", 1.0),(737,200,440,655)), 0.692)
 image msg_anon_see_you_monday = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_see you on monday anon.png", 1.0),(737,200,440,655)), 0.692)
 image msg_fang_see_ya = im.FactorScale(im.Crop(im.FactorScale("images/other/anon fang messaging on phone/aafmp_see ya.png", 1.0),(737,200,440,655)), 0.692)
 image fang_typing_1:
   "msg_fang_typing_first_1" with Dissolve(0.25)
--- a/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy
+++ b/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy
@ -342,7 +342,7 @@ label chapter_6:
    # TODO: thunder or other sudden-but-lingering bassy rumble
    # play sound "audio/effects/slapstickThunder.ogg" volume 0.7
-    play audio 'audio/effects/rumble.ogg'
+    #play audio 'audio/effects/rumble.ogg'
    #play ambient 'audio/effects/hungrybeast.ogg' fadein 1
    show dimmer_light behind anon
    show dimmer_darker behind anon