Skip to content

Commit 61b084e

Browse files
author
Lily
committed
Merge remote-tracking branch 'origin/main' into mobile
2 parents f3a6118 + 855d792 commit 61b084e

File tree

4 files changed

+17
-22
lines changed

4 files changed

+17
-22
lines changed

.github/ISSUE_TEMPLATE/bugs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@ body:
1313
id: terminal
1414
attributes:
1515
label: "Command Prompt/Terminal/Crash logs (if existing)"
16-
render: bash
1716
validations:
1817
required: false
1918

2019
- type: textarea
2120
id: reproduce
2221
attributes:
2322
label: "Have you identified any steps to reproduce the bug? If so, please describe them below in as much detail as possible. Use images if possible."
24-
render: bash
2523
validations:
2624
required: false
2725

README.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,23 @@ THIS NOT THE JS ENGINE BASE REPO. THIS BRANCH MADE BY [mcagabe19](https://github
1010
</h1>
1111

1212
<h3 align="center">
13-
<b>JS Engine is a heavily modified Psych Engine fork Jordan made, with lower-end PCs and more customization in mind while also aiming to be a replacement for OS "Engine".</b>
13+
<b>JS Engine is a heavily modified Psych Engine fork, with lower-end PCs and more customization in mind.</b>
1414
</h3>
1515

1616
README.md revamped by [Nael2xd](https://youtube.com/@nael2xd?si=axwJrY_8jdlXUwSm)
1717

18-
If you're looking for the Desktop version, [go here!](https://github.com/JordanSantiagoYT/FNF-JS-Engine)
18+
_If you're looking for the deskto version, [go here!](https://github.com/JordanSantiagoYT/FNF-JS-Engine)_
1919

2020
## Welcome
2121

22-
Hello and welcome to JS Engine Mobile's github repo, where you can download the port and play spammy charts or have fun with the engine.
22+
Welcome to JS Engine's github repo, where you can download the engine and make spammy charts or have fun with the engine.
2323

2424
This contains lots and lots of customizable and features built in to JS Engine, if you wanna see most of them listed, you can see it below this text
2525

2626
# Features/Performances in JS ENGINE
2727

28-
This fork of this engine has tons of features and performances, most will be listed but some of them won't because there's a lot of it.
28+
**This fork has tons of features and performances features, most will be listed:
2929

30-
The features/performances included are:
3130
- No BotPlay lag!
3231
- Faster Song Loading!
3332
- Loading songs longer than 20 minutes!
@@ -42,8 +41,6 @@ There is like lots and lots of stuff Jordan have missed, but at least you would
4241

4342
# Screenshots
4443

45-
Here are some screenshots of what the engine looks like.
46-
4744
![Screenshot 2024-07-07 14-00-00](https://github.com/JordanSantiagoYT/FNF-JS-Engine/assets/108278470/d4e89995-fa14-40bf-a5d6-d1647548fd93)
4845

4946
![Screenshot 2024-07-07 14-01-15](https://github.com/JordanSantiagoYT/FNF-JS-Engine/assets/108278470/b6d7d5ef-196d-4c39-9055-97815d63cdf0)

docs/TemplateScript.lua

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
-- Lua stuff
22

33
function onCreate()
4-
-- triggered when the lua file is started, some variables weren't created yet
4+
-- When the lua file is started/created, some variables weren't created yet
55
end
66

77
function onCreatePost()
8-
-- end of "create"
8+
-- End of "create", all variables have already been loaded, recommended.
99
end
1010

1111
function onDestroy()
12-
-- triggered when the lua file is ended (Song fade out finished)
12+
-- When the lua file is ended (Song fade out finished)
1313
end
1414

1515

1616
-- Gameplay/Song interactions
1717
function onBeatHit()
18-
-- triggered 4 times per section
18+
-- Triggered 4 times per section
1919
end
2020

2121
function onStepHit()
22-
-- triggered 16 times per section
22+
-- Triggered 16 times per section
2323
end
2424

2525
function onUpdate(elapsed)
26-
-- start of "update", some variables weren't updated yet
26+
-- Start of "update", some variables weren't updated yet
2727
end
2828

2929
function onUpdatePost(elapsed)
30-
-- end of "update"
30+
-- End of "update"
3131
end
3232

3333
function onStartCountdown()
34-
-- countdown started, duh
35-
-- return Function_Stop if you want to stop the countdown from happening (Can be used to trigger dialogues and stuff! You can trigger the countdown with startCountdown())
34+
-- Countdown started, duh
35+
-- Return Function_Stop if you want to stop the countdown from happening (Can be used to trigger dialogues and stuff! You can trigger the countdown with startCountdown())
3636
return Function_Continue;
3737
end
3838

@@ -49,7 +49,7 @@ function onSongStart()
4949
end
5050

5151
function onEndSong()
52-
-- song ended/starting transition (Will be delayed if you're unlocking an achievement)
52+
-- Song ended/starting transition (Will be delayed if you're unlocking an achievement)
5353
-- return Function_Stop to stop the song from ending for playing a cutscene or something.
5454
return Function_Continue;
5555
end
@@ -80,11 +80,11 @@ end
8080

8181
-- Dialogue (When a dialogue is finished, it calls startCountdown again)
8282
function onNextDialogue(line)
83-
-- triggered when the next dialogue line starts, dialogue line starts with 1
83+
-- Triggered when the next dialogue line starts, dialogue line starts with 1
8484
end
8585

8686
function onSkipDialogue(line)
87-
-- triggered when you press Enter and skip a dialogue line that was still being typed, dialogue line starts with 1
87+
-- Triggered when you press Enter and skip a dialogue line that was still being typed, dialogue line starts with 1
8888
end
8989

9090

source/PauseSubState.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ class PauseSubState extends MusicBeatSubstate
407407

408408
override function destroy()
409409
{
410-
pauseMusic.destroy();
410+
if (pauseMusic != null) pauseMusic.destroy();
411411
if (PlayState != null) MusicBeatState.windowNameSuffix = " - " + PlayState.SONG.song + " " + (PlayState.isStoryMode ? "(Story Mode)" : "(Freeplay)");
412412

413413
super.destroy();

0 commit comments

Comments
 (0)