Skip to content

Commit d8ee5be

Browse files
committed
v4.1
1 parent 38822d0 commit d8ee5be

File tree

8 files changed

+79
-3
lines changed

8 files changed

+79
-3
lines changed

Funkin in Sunny Side Skies/custom_notetypes/Crucial Note.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ function onCreate()
1212
if getPropertyFromGroup('unspawnNotes', i, 'mustPress') then
1313
setPropertyFromGroup('unspawnNotes', i, 'ignoreNote', false);
1414
end
15+
16+
setPropertyFromGroup('unspawnNotes', i, 'noteSplashHue', 1);
17+
setPropertyFromGroup('unspawnNotes', i, 'noteSplashSat', 0);
18+
setPropertyFromGroup('unspawnNotes', i, 'noteSplashBrt', 1);
1519
end
1620
end
1721
end

Funkin in Sunny Side Skies/custom_notetypes/Mine.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ function onCreate()
1616
if getPropertyFromGroup('unspawnNotes', i, 'mustPress') then
1717
setPropertyFromGroup('unspawnNotes', i, 'ignoreNote', true);
1818
end
19+
20+
setPropertyFromGroup('unspawnNotes', i, 'noteSplashHue', 1);
21+
setPropertyFromGroup('unspawnNotes', i, 'noteSplashSat', 0);
22+
setPropertyFromGroup('unspawnNotes', i, 'noteSplashBrt', 1);
1923
end
2024
end
2125
end

Funkin in Sunny Side Skies/custom_notetypes/Snowball Note.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ function onCreate()
1111
--if getPropertyFromGroup('unspawnNotes', i, 'mustPress') then
1212
--setPropertyFromGroup('unspawnNotes', i, 'ignoreNote', true);
1313
--end
14+
15+
setPropertyFromGroup('unspawnNotes', i, 'noteSplashHue', 1);
16+
setPropertyFromGroup('unspawnNotes', i, 'noteSplashSat', 0);
17+
setPropertyFromGroup('unspawnNotes', i, 'noteSplashBrt', 1);
1418
end
1519
end
1620
end

Funkin in Sunny Side Skies/data/raveyard/dialogue.json

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,69 @@
11
{
22
"dialogue": [
3+
{
4+
"expression": "talk",
5+
"text": "Adiel says goodbye to Sett and heads out to find a dozen wyverberries for his potion.",
6+
"boxState": "normal",
7+
"sound": "",
8+
"speed": 0.05,
9+
"portrait": "narrator"
10+
},
11+
{
12+
"expression": "talk",
13+
"text": "They seem to have all gone missing, though.",
14+
"boxState": "normal",
15+
"sound": "",
16+
"speed": 0.05,
17+
"portrait": "narrator"
18+
},
19+
{
20+
"expression": "talk",
21+
"text": "He soon finds an injured wolf.",
22+
"boxState": "normal",
23+
"sound": "",
24+
"speed": 0.05,
25+
"portrait": "narrator"
26+
},
27+
{
28+
"expression": "talk",
29+
"text": "Adiel wraps a bandage around the wolf's leg, and then the wolf runs off.",
30+
"boxState": "normal",
31+
"sound": "",
32+
"speed": 0.05,
33+
"portrait": "narrator"
34+
},
35+
{
36+
"expression": "talk",
37+
"text": "However, the wolf comes back with a mouthful of wyverberries.",
38+
"boxState": "normal",
39+
"sound": "",
40+
"speed": 0.05,
41+
"portrait": "narrator"
42+
},
43+
{
44+
"expression": "talk",
45+
"text": "It seems this wolf has been gathering them to feel better because of their magical healing properties.",
46+
"boxState": "normal",
47+
"sound": "",
48+
"speed": 0.05,
49+
"portrait": "narrator"
50+
},
51+
{
52+
"expression": "talk",
53+
"text": "The wolf follows Adiel home, who binds the wolf to him as his familiar.",
54+
"boxState": "normal",
55+
"sound": "",
56+
"speed": 0.05,
57+
"portrait": "narrator"
58+
},
59+
{
60+
"expression": "talk",
61+
"text": "Then, they get in bed for a good night's rest.",
62+
"boxState": "normal",
63+
"sound": "",
64+
"speed": 0.05,
65+
"portrait": "narrator"
66+
},
367
{
468
"expression": "talk",
569
"text": "Episode: Good Morning",

Funkin in Sunny Side Skies/data/raveyard/raveyard.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ end
2525

2626
function onTimerCompleted(tag, loops, loopsLeft)
2727
if tag == 'startDialogue' then -- Timer completed, play dialogue
28-
startDialogue('dialogue', 'chase');
28+
startDialogue('frustration', 'chase');
2929
end
3030
end
3131

329 KB
Binary file not shown.
80.8 KB
Binary file not shown.

Funkin in Sunny Side Skies/scripts/nutshellUi.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ function popUpScore()
151151
setProperty(comboSpriteName .. '.x', getProperty(comboSpriteName .. '.x') + getPropertyFromClass('ClientPrefs', 'comboOffset[0]'));
152152
setProperty(comboSpriteName .. '.y', getProperty(comboSpriteName .. '.y') - getPropertyFromClass('ClientPrefs', 'comboOffset[1]') + 60);
153153
if not hideHud and showCombo then
154-
addLuaSprite(comboSpriteName, true);
154+
addLuaSprite(comboSpriteName, false);
155155
end
156156

157157
--local comboSpriteScale = math.floor(getProperty(comboSpriteName .. '.width') * 0.7);
@@ -185,7 +185,7 @@ function popUpScore()
185185
setProperty(numSpriteName .. '.velocity.y', -getRandomInt(140, 160));
186186
setProperty(numSpriteName .. '.velocity.x', getRandomInt(-5, 5));
187187
if not hideHud and showComboNum then
188-
addLuaSprite(numSpriteName, true);
188+
addLuaSprite(numSpriteName, false);
189189
end
190190
runTimer(i .. 'comboNumFade' .. comboIdCounter, crochet * 0.002, 1);
191191
--doTweenAlpha(i .. 'comboNumFade' .. comboIdCounter, numSpriteName, 0, 0.2, 'linear');

0 commit comments

Comments
 (0)