Skip to content

Commit

Permalink
NoteFairy Obj_arg4
Browse files Browse the repository at this point in the history
Added note-count to music 0 through 5
  • Loading branch information
SY-24 committed Sep 4, 2024
1 parent 5102418 commit 9eeae33
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions data/configs/NoteFairy.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,27 +87,27 @@
},
{
"Value": "0",
"Notes": "Extended SMB Theme Intro (unused)"
"Notes": "Extended SMB Theme Intro (unused), 13 notes"
},
{
"Value": "1",
"Notes": "SMB Theme Intro (unused)"
"Notes": "SMB Theme Intro (unused), 7 notes"
},
{
"Value": "2",
"Notes": "SMB Underground"
"Notes": "SMB Underground, 43 notes"
},
{
"Value": "3",
"Notes": "Extended SMB Theme Intro (unused)"
"Notes": "SMB Theme Intro (unused), 7 notes"
},
{
"Value": "4",
"Notes": "SMB Underwater"
"Notes": "SMB Underwater, 46 notes"
},
{
"Value": "5",
"Notes": "SMW Bonus Stage"
"Notes": "SMW Bonus Stage, 64 notes"
}
],
"Exclusives": []
Expand Down
2 changes: 1 addition & 1 deletion docs/config_NoteFairy.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h2>Arguments</h2>
<tr><td>Obj_arg1</td><td>Float</td><td>Both</td><td>False</td><td><p><b>Appearance Speed</b>: How fast the creator note moves along the path. Requires Obj_arg3 set to any value between 1 and 6 inclusive. Default is 13.</p></td><td><ul></ul></td></tr>
<tr><td>Obj_arg2</td><td>Integer</td><td>Both</td><td>False</td><td><p><b>Time Limit</b>: How long it takes before the notes disappear again. Default is 20.</p></td><td><ul></ul></td></tr>
<tr><td>Obj_arg3</td><td>Integer</td><td>Both</td><td>False</td><td><p><b>Appearance Type</b>: Specifies how the individual notes appear and whether a short cutscene should be played or not.</p></td><td><ul><li>-1: Notes already there</li><li>1: Single note appears, moves along path and creates other notes, starts appearance camera</li><li>2: Single note appears, moves along path and creates other notes, starts appearance camera</li><li>3: Single note moves on path and creates trail of notes, cutscene runs until all notes have appeared</li><li>4: Notes appear one by one, starts appearance camera</li><li>5: Notes appear one by one</li><li>6: Notes appear one by one, no appearance jingle plays</li></ul></td></tr>
<tr><td>Obj_arg4</td><td>Integer</td><td>Both</td><td>False</td><td><p><b>Song Type</b>: Specifies the song that should be played.</p></td><td><ul><li>-2: Low ascending notes</li><li>-1: Ascending notes</li><li>0: Extended SMB Theme Intro (unused)</li><li>1: SMB Theme Intro (unused)</li><li>2: SMB Underground</li><li>3: Extended SMB Theme Intro (unused)</li><li>4: SMB Underwater</li><li>5: SMW Bonus Stage</li></ul></td></tr>
<tr><td>Obj_arg4</td><td>Integer</td><td>Both</td><td>False</td><td><p><b>Song Type</b>: Specifies the song that should be played.</p></td><td><ul><li>-2: Low ascending notes</li><li>-1: Ascending notes</li><li>0: Extended SMB Theme Intro (unused), 13 notes</li><li>1: SMB Theme Intro (unused), 7 notes</li><li>2: SMB Underground, 43 notes</li><li>3: SMB Theme Intro (unused), 7 notes</li><li>4: SMB Underwater, 46 notes</li><li>5: SMW Bonus Stage, 64 notes</li></ul></td></tr>
<tr><td>Obj_arg5</td><td>Integer</td><td>Both</td><td>False</td><td><p><b>Completion SFX Type</b>: Can be used to enable the completion jingle.</p></td><td><ul><li>-1: Don't play completion jingle</li><li>0: Play completion jingle</li></ul></td></tr>
<tr><td>Obj_arg6</td><td>Integer</td><td>Both</td><td>False</td><td><p><b>BGM Change Type</b>: How the stage's BGM will be changed while the notes are active.</p></td><td><ul><li>-1: Mute stage's BGM</li><li>1: Lower stage's BGM volume</li></ul></td></tr>
<tr><td>Obj_arg7</td><td>Integer</td><td>Both</td><td>False</td><td><p><b>Power Star Type</b>: Specifies whether a Power Star should be spawned and how it appears.</p></td><td><ul><li>-1: Doesn't spawn Power Star</li><li>1: Spawn Power Star from object's position</li><li>2: Spawn Power Star from note's position</li><li>3: Spawn Power Star from note's position</li></ul></td></tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/config_SkeletalFishBoss.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ <h2>Setup</h2>
<tr><th>Name</th><th>Games</th><th>Required?</th><th>Description</th><th>Values</th></tr>
<tr><td>Group</td><td>SMG1</td><td>False</td><td><p>Used to link to SubmarineVolcanoBigColumn and the unused SubmarineVolcanoSmallColumn. Also links with BirdLouseS and BirdLouseL.</p></td><td><ul></ul></td></tr>
<tr><td>AppearPowerStar</td><td>SMG1</td><td>True</td><td><p>Spawns a power star upon defeat. Requires a properly setup scenario with スカルシャーク as the PowerStarAppearObj.</p></td><td><ul></ul></td></tr>
<tr><td>NamePos</td><td>SMG1</td><td>False</td><td><p>Additional placements that can be freely placed.</p></td><td><ul><li>マリオ再セット位置1: The position to place mario during the first cutscene.</li><li>マリオ再セット位置2: The position to place mario during the other cutscenes.</li></ul></td></tr>
<tr><td>Camera</td><td>SMG1</td><td>False</td><td><p></p></td><td><ul></ul></td></tr>
<tr><td>DemoCast</td><td>SMG1</td><td>False</td><td><p>Can take part in a cutscene.</p></td><td><ul></ul></td></tr>
<tr><td>NamePos</td><td>SMG1</td><td>False</td><td><p>Additional placements that can be freely placed.</p></td><td><ul><li>マリオ再セット位置1: The position to place mario during the first cutscene.</li><li>マリオ再セット位置2: The position to place mario during the other cutscenes.</li></ul></td></tr>
</table>
<h2>Properties</h2>
<table width="100%">
Expand Down
2 changes: 1 addition & 1 deletion objectdb.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions objectdb.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<database timestamp="1719512440">
<database timestamp="1725462755">
<categories>
<category id="0">Stage Parts</category>
<category id="1">Level Features</category>
Expand Down Expand Up @@ -20010,7 +20010,7 @@ A set of Rainbow Notes that can be collected in order to activate a switch. It c
<field id="1" type="float" name="Appearance Speed" notes="How fast the creator note moves along the path. Requires Obj_arg3 set to any value between 1 and 6 inclusive. Default is 13." values="" />
<field id="2" type="int" name="Time Limit" notes="How long it takes before the notes disappear again. Default is 20." values="" />
<field id="3" type="int" name="Appearance Type" notes="Specifies how the individual notes appear and whether a short cutscene should be played or not." values="-1 = Notes already there, 1 = Single note appears, moves along path and creates other notes, starts appearance camera, 2 = Single note appears, moves along path and creates other notes, starts appearance camera, 3 = Single note moves on path and creates trail of notes, cutscene runs until all notes have appeared, 4 = Notes appear one by one, starts appearance camera, 5 = Notes appear one by one, 6 = Notes appear one by one, no appearance jingle plays" />
<field id="4" type="int" name="Song Type" notes="Specifies the song that should be played." values="-2 = Low ascending notes, -1 = Ascending notes, 0 = Extended SMB Theme Intro (unused), 1 = SMB Theme Intro (unused), 2 = SMB Underground, 3 = Extended SMB Theme Intro (unused), 4 = SMB Underwater, 5 = SMW Bonus Stage" />
<field id="4" type="int" name="Song Type" notes="Specifies the song that should be played." values="-2 = Low ascending notes, -1 = Ascending notes, 0 = Extended SMB Theme Intro (unused), 13 notes, 1 = SMB Theme Intro (unused), 7 notes, 2 = SMB Underground, 43 notes, 3 = SMB Theme Intro (unused), 7 notes, 4 = SMB Underwater, 46 notes, 5 = SMW Bonus Stage, 64 notes" />
<field id="5" type="int" name="Completion SFX Type" notes="Can be used to enable the completion jingle." values="-1 = Don't play completion jingle, 0 = Play completion jingle" />
<field id="6" type="int" name="BGM Change Type" notes="How the stage's BGM will be changed while the notes are active." values="-1 = Mute stage's BGM, 1 = Lower stage's BGM volume" />
<field id="7" type="int" name="Power Star Type" notes="Specifies whether a Power Star should be spawned and how it appears." values="-1 = Doesn't spawn Power Star, 1 = Spawn Power Star from object's position, 2 = Spawn Power Star from note's position, 3 = Spawn Power Star from note's position" />
Expand Down

0 comments on commit 9eeae33

Please sign in to comment.