Skip to content

Commit 8173a4c

Browse files
author
Lily
committed
Merge branch 'main' into mobile
2 parents aab5088 + dde99b8 commit 8173a4c

File tree

8 files changed

+113
-6
lines changed

8 files changed

+113
-6
lines changed

.github/ISSUE_TEMPLATE/bugs.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,29 @@ body:
1010
required: true
1111

1212
- type: dropdown
13-
id: Measures
13+
id: outdatedBuildCheck
1414
attributes:
15-
label: 'Did you see if the "bug" occurs on the latest commit?'
15+
label: "Did you check if the problem occurs in the latest build?"
16+
options:
17+
- "Yes"
18+
- "No"
19+
validations:
20+
required: true
21+
22+
- type: dropdown
23+
id: knownIssueCheck
24+
attributes:
25+
label: "Did you check if there's a problem that you are trying to figure out on (this issue)[https://github.com/JordanSantiagoYT/FNF-JS-Engine/issues/359]?"
26+
options:
27+
- "No"
28+
- "Yes"
29+
validations:
30+
required: true
31+
32+
- type: dropdown
33+
id: dupeCheck
34+
attributes:
35+
label: "Did you check if there's any similar issues?"
1636
options:
1737
- "No"
1838
- "Yes"

.github/ISSUE_TEMPLATE/help.yml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,37 @@ body:
55
- type: textarea
66
id: description
77
attributes:
8-
label: "Describe your problem here. If you are modding, please try testing your problem in a clean version of the engine instead, this ensures the problem is actually caused by the engine itself. Also, if you're using an older version of JSE, please try the latest action build in the Actions tab or the latest release build. The issue has probably been fixed since that version. Oh yeah, and also be sure to check the pinned 'JS Engine: Known Issues' issue, to double check if your issue hasn't already been found!"
8+
label: "Describe your problem here."
9+
validations:
10+
required: true
11+
12+
- type: dropdown
13+
id: outdatedBuildCheck
14+
attributes:
15+
label: "Did you check if the problem occurs in the latest build?"
16+
options:
17+
- "Yes"
18+
- "No"
19+
validations:
20+
required: true
21+
22+
- type: dropdown
23+
id: knownIssueCheck
24+
attributes:
25+
label: "Did you check if there's a problem that you are trying to figure out on (this issue)[https://github.com/JordanSantiagoYT/FNF-JS-Engine/issues/359]?"
26+
options:
27+
- "No"
28+
- "Yes"
29+
validations:
30+
required: true
31+
32+
- type: dropdown
33+
id: dupeCheck
34+
attributes:
35+
label: "Did you check if there's any similar issues?"
36+
options:
37+
- "No"
38+
- "Yes"
939
validations:
1040
required: true
1141

.github/ISSUE_TEMPLATE/question.yml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,34 @@ body:
66
attributes:
77
label: What is your question?
88
validations:
9-
required: true
9+
required: true
10+
11+
- type: dropdown
12+
id: outdatedBuildCheck
13+
attributes:
14+
label: "Did you check if the problem occurs in the latest build?"
15+
options:
16+
- "Yes"
17+
- "No"
18+
validations:
19+
required: true
20+
21+
- type: dropdown
22+
id: knownIssueCheck
23+
attributes:
24+
label: "Did you check if there's a problem that you are trying to figure out on (this issue)[https://github.com/JordanSantiagoYT/FNF-JS-Engine/issues/359]?"
25+
options:
26+
- "No"
27+
- "Yes"
28+
validations:
29+
required: true
30+
31+
- type: dropdown
32+
id: dupeCheck
33+
attributes:
34+
label: "Did you check if there's any similar issues?"
35+
options:
36+
- "No"
37+
- "Yes"
38+
validations:
39+
required: true
193 KB
Binary file not shown.

assets/splash/images/autism.png

111 KB
Loading
12.7 KB
Binary file not shown.

source/StartupState.hx

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ class StartupState extends MusicBeatState
77
var logo:FlxSprite;
88
var skipTxt:FlxText;
99

10-
var maxIntros:Int = 6;
10+
var maxIntros:Int = 7;
1111
var date:Date = Date.now();
1212

1313
var canChristmas = false;
14+
var canAutism = false;
15+
1416

1517
private var vidSprite:VideoSprite = null;
1618
private function startVideo(name:String, ?library:String = null, ?callback:Void->Void = null, canSkip:Bool = true, loop:Bool = false, playOnLoad:Bool = true)
@@ -65,6 +67,11 @@ class StartupState extends MusicBeatState
6567
canChristmas = true;
6668
maxIntros += 1; //JOLLY SANTA!!!
6769
}
70+
else if (date.getMonth() == 4 && date.getDate() == 1) // funny
71+
{
72+
canAutism = true;
73+
maxIntros += 1; //autism!!!!!!!!!!!!!!!!!!!!!!oubgrebiugerbiuegrs
74+
}
6875

6976
FlxTransitionableState.skipNextTransIn = true;
7077
FlxTransitionableState.skipNextTransOut = true;
@@ -162,6 +169,20 @@ class StartupState extends MusicBeatState
162169
}
163170
else
164171
doIntro();
172+
173+
case 7:
174+
if (canAutism)
175+
{
176+
FlxG.sound.play(Paths.sound('aprilFools', 'splash'));
177+
logo.loadGraphic(Paths.image('autism', 'splash'));
178+
logo.scale.set(0.1,0.1);
179+
logo.updateHitbox();
180+
logo.screenCenter();
181+
FlxTween.tween(logo, {alpha: 1, "scale.x": 1, "scale.y": 1}, 0.95, {ease: FlxEase.linear, onComplete: _ -> onIntroDone()});
182+
}
183+
else
184+
doIntro();
185+
165186
}
166187
}
167188
#end

source/TitleState.hx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ class TitleState extends MusicBeatState
6060
public static var sarcasmEgg:String;
6161
public var inCutscene:Bool = false;
6262
var canPause:Bool = true;
63+
var date:Date = Date.now();
6364

6465
final sarcasmKeys:Array<String> = [
6566
'ANNOUNCER'
@@ -257,7 +258,12 @@ class TitleState extends MusicBeatState
257258
{
258259
if (!initialized)
259260
{
260-
if(FlxG.sound.music == null) {
261+
if (date.getMonth() == 4 && date.getDate() == 1)
262+
{
263+
FlxG.sound.playMusic(Paths.music('aprilFools'), 0);
264+
}
265+
else if(FlxG.sound.music == null)
266+
{
261267
FlxG.sound.playMusic(Paths.music('freakyMenu-' + ClientPrefs.daMenuMusic), 0);
262268
}
263269
}

0 commit comments

Comments
 (0)