Merge pull request #17 from CyndaquilDAC/master

Unhardcode cutscene text and spooky text, remove code that references unused assets
Kade-github · Jun 7, 2021 · ca2463c · ca2463c · ides-dev · Jun 15, 2021
2 parents f8dc02f + 1aa7855
commit ca2463c
Show file tree

Hide file tree

Showing 17 changed files with 79 additions and 1,297 deletions.
diff --git a/assets/preload/data/characterList.txt b/assets/preload/data/characterList.txt
@@ -1,21 +1,10 @@
 bf
 dad
 gf
-spooky
-pico
-mom
-mom-car
-bf-car
-parents-christmas
-monster-christmas
-bf-christmas
-gf-christmas
-monster
-bf-pixel
-senpai
-senpai-angry
-spirit
 tricky
 trickyMask
 trickyH
-trickyEx
+trickyEx
+bf-hell
+gf-hell
+gf-tied
diff --git a/assets/preload/data/cutMyBalls.txt b/assets/preload/data/cutMyBalls.txt
@@ -0,0 +1,3 @@
+OMFG CLOWN!!!!
+YOU DO NOT KILL CLOWN
+CLOWN KILLS YOU!!!!!!
diff --git a/assets/preload/data/gfVersionList.txt b/assets/preload/data/gfVersionList.txt
@@ -0,0 +1,3 @@
+gf
+gf-hell
+gf-tied
diff --git a/assets/preload/data/stageList.txt b/assets/preload/data/stageList.txt
@@ -0,0 +1,4 @@
+stage
+nevada
+nevada-spook
+auditor-hell
diff --git a/assets/preload/data/trickyExSingStrings.txt b/assets/preload/data/trickyExSingStrings.txt
@@ -0,0 +1,12 @@
+YOU AREN'T HANK
+WHERE IS HANK
+HANK???
+WHO ARE YOU
+WHERE AM I
+THIS ISN'T RIGHT
+MIDGET
+SYSTEM UNRESPONSIVE
+WHY CAN'T I KILL?????
+CRITICAL FAILURE
+HANK!!!!
+BRING ME HANK
diff --git a/assets/preload/data/trickyMissStrings.txt b/assets/preload/data/trickyMissStrings.txt
@@ -0,0 +1,14 @@
+TERRIBLE
+WASTE
+MISS CALCULTED
+PREDICTED
+FAILURE
+DISGUSTING
+ABHORRENT
+FORESEEN
+CONTEMPTIBLE
+PROGNOSTICATE
+DISPICABLE
+REPREHENSIBLE
+UNSURPRISING
+PREDETERMINED
diff --git a/assets/preload/data/trickySingStrings.txt b/assets/preload/data/trickySingStrings.txt
@@ -0,0 +1,13 @@
+SUFFER
+INCORRECT
+INCOMPLETE
+INSUFFICIENT
+INVALID
+CORRECTION
+MISTAKE
+REDUCE
+ERROR
+ADJUSTING
+IMPROBABLE
+IMPLAUSIBLE
+MISJUDGED
diff --git a/1002539.jpg → assets/shared/images/lol.jpg b/1002539.jpg → assets/shared/images/lol.jpg
diff --git a/source/BackgroundDancer.hx b/source/BackgroundDancer.hx
diff --git a/source/BackgroundGirls.hx b/source/BackgroundGirls.hx
diff --git a/source/BeatBattle.hx b/source/BeatBattle.hx
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    gf
+    gf-hell
+    gf-tied