Skip to content

Commit

Permalink
the definitive dialogue and file cleanup commit
Browse files Browse the repository at this point in the history
  • Loading branch information
x8c8r committed Jul 9, 2024
1 parent 940553f commit 95d445d
Show file tree
Hide file tree
Showing 181 changed files with 148 additions and 882 deletions.
4 changes: 2 additions & 2 deletions assets/preload/data/characterList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ gf-christmas
monster
bf-pixel
bf-pixel-good
senpai
senpai-angry
sigmio
sigmio-evil
spirit
sonicexe
dad-test
2 changes: 1 addition & 1 deletion assets/preload/data/roses/roses.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -4139,7 +4139,7 @@
"mustHitSection": true
}
],
"player2": "senpai",
"player2": "sigmio",
"player3": null,
"song": "Senpai-Impossible-Ver",
"stage": "school",
Expand Down
2 changes: 1 addition & 1 deletion assets/preload/data/senpai/senpai.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/preload/data/thorns/thorns.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
2 changes: 2 additions & 0 deletions assets/shared/images/dialogue/boxes/dialogueBox-evil.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Spirit Textbox spawn
Spirit Textbox spawn
2 changes: 2 additions & 0 deletions assets/shared/images/dialogue/boxes/dialogueBox-pixel.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Text Box Appear
Text Box Appear
2 changes: 2 additions & 0 deletions assets/shared/images/dialogue/boxes/dialogueBox-senpaiMad.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SENPAI ANGRY IMPACT SPEECH
SENPAI ANGRY IMPACT SPEECH
2 changes: 2 additions & 0 deletions assets/shared/images/dialogue/boxes/frosted.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Text Box Appear
Text Box Appear
6 changes: 5 additions & 1 deletion assets/shared/images/dialogue/boxes/songDBDefine.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,8 @@ pico::week3
philly::week3
blammed::week3
cocoa::week5
eggnog::week5
eggnog::week5
winter-horrorland::frosted
senpai::dialogueBox-pixel
roses::dialogueBox-senpaiMad
thorns::dialogueBox-evil
File renamed without changes
6 changes: 6 additions & 0 deletions assets/shared/images/dialogue/characters/bf-pixel-good.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Boyfriend portrait enter
0
40
-20
40
false
File renamed without changes.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/shared/images/dialogue/characters/bf-pixel.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Boyfriend portrait enter
0
40
-20
40
false
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Boyfriend portrait enter
0
40
-20
40
false
File renamed without changes.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/shared/images/dialogue/characters/sigmio-evil.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Boyfriend portrait enter
0
40
-20
40
false
6 changes: 6 additions & 0 deletions assets/shared/images/dialogue/characters/sigmio-evil.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="senpaiPortrait.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Senpai Portrait Enter instance 10000" x="0" y="0" width="1" height="1"/>
</TextureAtlas>
6 changes: 6 additions & 0 deletions assets/shared/images/dialogue/characters/sigmio.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Boyfriend portrait enter
0
40
-20
40
false
File renamed without changes.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/shared/images/dialogue/characters/spirit.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Boyfriend portrait enter
0
40
-20
40
false
6 changes: 6 additions & 0 deletions assets/shared/images/dialogue/characters/spirit.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="senpaiPortrait.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Senpai Portrait Enter instance 10000" x="0" y="0" width="267" height="131"/>
</TextureAtlas>
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file removed assets/week5/images/weeb/bfPortrait.png
Diff not rendered.
Binary file removed assets/week6/images/weeb/animatedEvilSchool.png
Diff not rendered.
45 changes: 0 additions & 45 deletions assets/week6/images/weeb/animatedEvilSchool.xml

This file was deleted.

Binary file removed assets/week6/images/weeb/bfPixel.png
Diff not rendered.
131 changes: 0 additions & 131 deletions assets/week6/images/weeb/bfPixel.xml

This file was deleted.

Binary file removed assets/week6/images/weeb/bfPixelsDEAD.png
Diff not rendered.
Loading

0 comments on commit 95d445d

Please sign in to comment.