diff --git a/Project.xml b/Project.xml
index 6951ccd..29bb440 100644
--- a/Project.xml
+++ b/Project.xml
@@ -88,7 +88,7 @@
-
+
diff --git a/assets/shared/characters/bf-dead-funny.json b/assets/shared/characters/bf-dead-funny.json
index 67c63f9..fd8b0fb 100644
--- a/assets/shared/characters/bf-dead-funny.json
+++ b/assets/shared/characters/bf-dead-funny.json
@@ -50,7 +50,7 @@
-27
],
"camera_position": [
- 0,
+ -350,
0
],
diff --git a/assets/shared/characters/gb-angrier.json b/assets/shared/characters/gb-angrier.json
index 11e937b..5f09879 100644
--- a/assets/shared/characters/gb-angrier.json
+++ b/assets/shared/characters/gb-angrier.json
@@ -1,85 +1,91 @@
{
"animations": [
{
- "anim": "idle",
- "name": "Idle",
- "fps": 24,
- "loop": false,
- "indices": [],
"offsets": [
0,
0
- ]
- },
- {
- "anim": "singLEFT",
- "name": "left",
- "fps": 24,
+ ],
"loop": false,
+ "fps": 24,
+ "anim": "idle",
"indices": [],
- "offsets": [
- 29,
- -1
- ]
+ "name": "Idle"
},
{
- "anim": "singDOWN",
- "name": "down",
- "fps": 24,
+ "offsets": [
+ 29,
+ -2
+ ],
"loop": false,
+ "fps": 24,
+ "anim": "singLEFT",
"indices": [],
- "offsets": [
- -21,
- -22
- ]
+ "name": "left"
},
{
- "anim": "singUP",
- "name": "up",
- "fps": 24,
+ "offsets": [
+ -22,
+ -22
+ ],
"loop": false,
+ "fps": 24,
+ "anim": "singDOWN",
"indices": [],
+ "name": "down"
+ },
+ {
"offsets": [
- 15,
+ 14,
23
- ]
+ ],
+ "loop": false,
+ "fps": 24,
+ "anim": "singUP",
+ "indices": [],
+ "name": "up"
},
{
- "anim": "singRIGHT",
- "name": "right",
- "fps": 24,
+ "offsets": [
+ -27,
+ -1
+ ],
"loop": false,
+ "fps": 24,
+ "anim": "singRIGHT",
"indices": [],
+ "name": "right"
+ },
+ {
"offsets": [
- -26,
- -1
- ]
+ 0,
+ 0
+ ],
+ "indices": [
+ 10,
+ 11,
+ 12,
+ 13
+ ],
+ "fps": 24,
+ "anim": "idle-loop",
+ "loop": true,
+ "name": "Idle"
}
],
- "image": "characters/ANGRYgb",
- "scale": 1,
- "sing_duration": 6.1,
- "healthicon": "gb-angry",
-
+ "vocals_file": "gb",
+ "no_antialiasing": false,
+ "image": "characters/gameboy_really_angry",
"position": [
- 16,
+ 21,
170
],
+ "healthicon": "gb-angry",
+ "flip_x": false,
"camera_position": [
- -34,
+ -40,
-3
],
-
- "flip_x": false,
- "no_antialiasing": false,
- "vocals_file": "gb",
-
- "note_colors": [
- ["FF00EB", "FFFFFF", "4C0047"],
- ["A14DD9", "FFFFFF", "381B4C"],
- ["FF00EB", "FFFFFF", "4C0047"],
- ["A14DD9", "FFFFFF", "381B4C"]
- ],
-
+ "sing_duration": 6.1,
+ "scale": 1,
"_editor_isPlayer": false
}
\ No newline at end of file
diff --git a/assets/shared/characters/gb-angry.json b/assets/shared/characters/gb-angry.json
index 5f09879..30da769 100644
--- a/assets/shared/characters/gb-angry.json
+++ b/assets/shared/characters/gb-angry.json
@@ -1,91 +1,85 @@
{
"animations": [
{
+ "anim": "idle",
+ "name": "Idle",
+ "fps": 24,
+ "loop": false,
+ "indices": [],
"offsets": [
0,
0
- ],
- "loop": false,
- "fps": 24,
- "anim": "idle",
- "indices": [],
- "name": "Idle"
+ ]
},
{
- "offsets": [
- 29,
- -2
- ],
- "loop": false,
- "fps": 24,
"anim": "singLEFT",
+ "name": "left",
+ "fps": 24,
+ "loop": false,
"indices": [],
- "name": "left"
+ "offsets": [
+ 18,
+ -3
+ ]
},
{
- "offsets": [
- -22,
- -22
- ],
- "loop": false,
- "fps": 24,
"anim": "singDOWN",
+ "name": "down",
+ "fps": 24,
+ "loop": false,
"indices": [],
- "name": "down"
+ "offsets": [
+ -3,
+ -20
+ ]
},
{
- "offsets": [
- 14,
- 23
- ],
- "loop": false,
- "fps": 24,
"anim": "singUP",
+ "name": "up",
+ "fps": 24,
+ "loop": false,
"indices": [],
- "name": "up"
+ "offsets": [
+ -15,
+ 14
+ ]
},
{
- "offsets": [
- -27,
- -1
- ],
- "loop": false,
- "fps": 24,
"anim": "singRIGHT",
+ "name": "right",
+ "fps": 24,
+ "loop": false,
"indices": [],
- "name": "right"
- },
- {
"offsets": [
- 0,
- 0
- ],
- "indices": [
- 10,
- 11,
- 12,
- 13
- ],
- "fps": 24,
- "anim": "idle-loop",
- "loop": true,
- "name": "Idle"
+ -39,
+ -3
+ ]
}
],
- "vocals_file": "gb",
- "no_antialiasing": false,
- "image": "characters/gameboy_really_angry",
+ "image": "characters/ANGRYgb",
+ "scale": 1,
+ "sing_duration": 6.1,
+ "healthicon": "gb-angry",
+
"position": [
- 21,
- 170
+ 14,
+ 173
],
- "healthicon": "gb-angry",
- "flip_x": false,
"camera_position": [
- -40,
- -3
+ -32,
+ -6
],
- "sing_duration": 6.1,
- "scale": 1,
+
+ "flip_x": false,
+ "no_antialiasing": false,
+ "vocals_file": "gb",
+
+ "note_colors": [
+ ["FF00EB", "FFFFFF", "4C0047"],
+ ["A14DD9", "FFFFFF", "381B4C"],
+ ["FF00EB", "FFFFFF", "4C0047"],
+ ["A14DD9", "FFFFFF", "381B4C"]
+ ],
+
"_editor_isPlayer": false
}
\ No newline at end of file
diff --git a/assets/shared/data/chillin/events.json b/assets/shared/data/chillin/events.json
index 927f40e..ac2a7a8 100644
--- a/assets/shared/data/chillin/events.json
+++ b/assets/shared/data/chillin/events.json
@@ -10,46 +10,6 @@
"0.54"
]
]
- ],
- [
- 86181.8181818182,
- [
- [
- "Countdown",
- "0",
- ""
- ]
- ]
- ],
- [
- 86454.5454545455,
- [
- [
- "Countdown",
- "1",
- ""
- ]
- ]
- ],
- [
- 86727.2727272727,
- [
- [
- "Countdown",
- "2",
- ""
- ]
- ]
- ],
- [
- 87000,
- [
- [
- "Countdown",
- "3",
- ""
- ]
- ]
]
]
}
diff --git a/assets/shared/images/characters/ANGRYgb.png b/assets/shared/images/characters/ANGRYgb.png
index e6e9d34..cc216aa 100644
Binary files a/assets/shared/images/characters/ANGRYgb.png and b/assets/shared/images/characters/ANGRYgb.png differ
diff --git a/assets/shared/images/characters/ANGRYgb.xml b/assets/shared/images/characters/ANGRYgb.xml
index a84b68e..6293986 100644
--- a/assets/shared/images/characters/ANGRYgb.xml
+++ b/assets/shared/images/characters/ANGRYgb.xml
@@ -2,74 +2,74 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/shared/images/characters/gameboy_really_angry.png b/assets/shared/images/characters/gameboy_really_angry.png
index 408e504..e6e9d34 100644
Binary files a/assets/shared/images/characters/gameboy_really_angry.png and b/assets/shared/images/characters/gameboy_really_angry.png differ
diff --git a/assets/week_assets/gbstage/images/rain/lightning.png b/assets/week_assets/gbstage/images/rain/lightning.png
index 0b733c0..2ff383c 100644
Binary files a/assets/week_assets/gbstage/images/rain/lightning.png and b/assets/week_assets/gbstage/images/rain/lightning.png differ
diff --git a/extras/bestqualityimages/20240531_063919.jpg b/extras/bestqualityimages/20240531_063919.jpg
new file mode 100644
index 0000000..7915550
Binary files /dev/null and b/extras/bestqualityimages/20240531_063919.jpg differ
diff --git a/extras/bestqualityimages/20240604_092430.jpg b/extras/bestqualityimages/20240604_092430.jpg
new file mode 100644
index 0000000..bb77f2e
Binary files /dev/null and b/extras/bestqualityimages/20240604_092430.jpg differ
diff --git a/extras/bestqualityimages/IMG_9107.png b/extras/bestqualityimages/IMG_9107.png
new file mode 100644
index 0000000..e2f2293
Binary files /dev/null and b/extras/bestqualityimages/IMG_9107.png differ
diff --git a/extras/bestqualityimages/Screenshot_20240526-112016-536.png b/extras/bestqualityimages/Screenshot_20240526-112016-536.png
new file mode 100644
index 0000000..d671b36
Binary files /dev/null and b/extras/bestqualityimages/Screenshot_20240526-112016-536.png differ
diff --git a/extras/bestqualityimages/Skipper03.png b/extras/bestqualityimages/Skipper03.png
new file mode 100644
index 0000000..c1d352a
Binary files /dev/null and b/extras/bestqualityimages/Skipper03.png differ
diff --git a/extras/bestqualityimages/japanese_toilet.mp4 b/extras/bestqualityimages/japanese_toilet.mp4
new file mode 100644
index 0000000..10e069a
Binary files /dev/null and b/extras/bestqualityimages/japanese_toilet.mp4 differ
diff --git a/extras/bestqualityimages/lobster_2_1.mp4 b/extras/bestqualityimages/lobster_2_1.mp4
new file mode 100644
index 0000000..d45dd40
Binary files /dev/null and b/extras/bestqualityimages/lobster_2_1.mp4 differ
diff --git a/extras/bestqualityimages/z38la6wldgnb1.jpg b/extras/bestqualityimages/z38la6wldgnb1.jpg
new file mode 100644
index 0000000..6246721
Binary files /dev/null and b/extras/bestqualityimages/z38la6wldgnb1.jpg differ
diff --git a/source/states/FreeplaySelector.hx b/source/states/FreeplaySelector.hx
index 99335f4..102828d 100644
--- a/source/states/FreeplaySelector.hx
+++ b/source/states/FreeplaySelector.hx
@@ -175,7 +175,7 @@ class FreeplaySelector extends MusicBeatState
{
if (!freeplayOptions[curSelected][1])
{
- var buzzer:FlxSound = FlxG.sound.play(Paths.sound('buzzer'), 0.4);
+ var buzzer:FlxSound = FlxG.sound.play(Paths.sound('buzzer'), 0.1);
FlxG.camera.shake(0.0015, buzzer.length / 1000);
return;
}
diff --git a/source/states/stages/GBStage.hx b/source/states/stages/GBStage.hx
index 77ee1d9..6f583d6 100644
--- a/source/states/stages/GBStage.hx
+++ b/source/states/stages/GBStage.hx
@@ -205,6 +205,15 @@ class GBStage extends BaseStage
Paths.image('$value1/$image', null, true);
}
+ // Also precaching thunder sound for rain
+ // Fun Facts with CrusherNotDrip: idk what causes the lag spike we did allw e could GO HOME
+
+ if (value1.toLowerCase() == 'rain')
+ {
+ Paths.sound('thunder_1');
+ Paths.sound('thunder_2');
+ }
+
if (ClientPrefs.data.shaders && value1.toLowerCase() == 'rain' && rainShader == null)
{
rainShader = game.createRuntimeShader('rain');