Skip to content

Commit

Permalink
Fix line endings
Browse files Browse the repository at this point in the history
  • Loading branch information
Keripo committed Dec 31, 2014
1 parent 5baddc6 commit 5cb6a94
Show file tree
Hide file tree
Showing 9 changed files with 203 additions and 207 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Beats2
Intro
------
**Beats2** is a cross-platform, multi-style rhythm game designed for **touch-screen devices**.

See http://beats2.net for current progress and updates.

Styles
Expand All @@ -30,7 +31,7 @@ Target Platforms

Code
------
- **/beats** - currently active development branch
- **/beats2** - currently active development branch
- **/beats2n** - test demo made using NGUI library, for reference purposes only
- **/beats2td** - test demo made using tk2d library, for reference purposes only

13 changes: 7 additions & 6 deletions beats2/Assets/Scripts/Data/Chart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@

namespace Beats2.Data
{
public class Chart
{
public ChartInfo info;
public List<Note> notes;
public List<Event> events;
}

public class Chart
{
public ChartInfo info = new ChartInfo();
public List<Note> notes = new List<Note>();
public List<Event> events = new List<Event>();
}
}
102 changes: 51 additions & 51 deletions beats2/Assets/Scripts/Data/ChartInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,62 +7,62 @@

namespace Beats2.Data
{
public class ChartInfo
{
public ChartStyle style;
public ChartType type;
public int keyCount;
public class ChartInfo
{
public ChartStyle style;
public ChartType type;
public int keyCount;

public ChartDifficulty difficulty;
public string difficultyName;
public int difficultyValue;
public ChartRadar radar;
public ChartDifficulty difficulty;
public string difficultyName;
public int difficultyValue;
public ChartRadar radar;

public string credits;
public string description;
}
public string credits;
public string description;
}

public enum ChartStyle
{
Beats,
Technika,
Square,
Taiko,
Mai,
Diva,
Osu
}
public enum ChartStyle
{
Beats,
Technika,
Square,
Taiko,
Mai,
Diva,
Osu
}

public enum ChartType
{
Pad,
Keyboard,
Touch,
Kinect,
Unknown
}
public enum ChartType
{
Pad,
Keyboard,
Touch,
Kinect,
Unknown
}

// See https://github.com/stepmania/stepmania/blob/master/src/Difficulty.cpp
public enum ChartDifficulty
{
Tutorial,
Beginner,
Easy, // Basic, Light
Medium, // Another, Trick, Standard, Difficult
Hard, // SSR, Maniac, Heavy
Challenge, // SManiac, Expert, Oni
Edit,
Unknown
}
// See https://github.com/stepmania/stepmania/blob/master/src/Difficulty.cpp
public enum ChartDifficulty
{
Tutorial,
Beginner,
Easy, // Basic, Light
Medium, // Another, Trick, Standard, Difficult
Hard, // SSR, Maniac, Heavy
Challenge, // SManiac, Expert, Oni
Edit,
Unknown
}

// See http://dancedancerevolutionddr.wikia.com/wiki/Groove_Radar
public struct ChartRadar
{
public int stream;
public int voltage;
public int air;
public int freeze;
public int chaos;
}
// See http://dancedancerevolutionddr.wikia.com/wiki/Groove_Radar
public struct ChartRadar
{
public int stream;
public int voltage;
public int air;
public int freeze;
public int chaos;
}

}
52 changes: 26 additions & 26 deletions beats2/Assets/Scripts/Data/Event.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,31 @@

namespace Beats2.Data
{
public class Event
{
public EventType type;
public int beat;
public double time;
public object value;
}
public class Event
{
public EventType type;
public int beat;
public double time;
public object value;
}

// Note:
// Beats2 is touch-based rhythm game, not an arcade machine simulator.
// The following list of tags are not supported or remaped:
// From StepMania 5.0's .SSC format:
// * Delays -> Stop
// * Warps -> ignored
// * Fakes -> ignored
// * Speeds -> ignored
// * Scrolls -> built-in
// * TimeSignatures -> ignored
// * TickCounts -> ignored
// * Combos -> ignored
public enum EventType
{
Bpm,
Stop, // Note: Delays and Warps not intented to be implemented
Label,
BgChange
}
// Note:
// Beats2 is touch-based rhythm game, not an arcade machine simulator.
// The following list of tags are not supported or remaped:
// From StepMania 5.0's .SSC format:
// * Delays -> Stop
// * Warps -> ignored
// * Fakes -> ignored
// * Speeds -> ignored
// * Scrolls -> built-in
// * TimeSignatures -> ignored
// * TickCounts -> ignored
// * Combos -> ignored
public enum EventType
{
Bpm,
Stop, // Note: Delays and Warps not intented to be implemented
Label,
BgChange
}
}
24 changes: 12 additions & 12 deletions beats2/Assets/Scripts/Data/Lyric.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@

namespace Beats2.Data
{
public class Lyric
{
public string language;
public string filePath;
public List<LyricLine> lines;
}
public class Lyric
{
public string language;
public string filePath;
public List<LyricLine> lines = new List<LyricLine>();
}

public struct LyricLine
{
public int colour;
public double time;
public string line;
}
public struct LyricLine
{
public int colour;
public double time;
public string line;
}
}
65 changes: 33 additions & 32 deletions beats2/Assets/Scripts/Data/Metadata.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,40 +7,41 @@

namespace Beats2.Data
{
public struct Metadata
{
public string simfileParentDirectoryPath;
public string simfilePath;
public string simfileVersion;
public string simfileDatabaseId;

public struct Metadata
{
public string simfileParentDirectoryPath;
public string simfilePath;
public string simfileVersion;
public string simfileDatabaseId;

public string infoCredits;
public string infoPack;
public string infoDescription;
public string infoCategory;
public string infoTags;
public string infoCredits;
public string infoPack;
public string infoDescription;
public string infoCategory;
public string infoTags;

public string songTitle;
public string songTitleTranslit;
public string songSubtitle;
public string songSubtitleTranslit;
public string songArtist;
public string songArtistTranslit;
public string songAlbum;
public string songAlbumTranslit;
public string songSeries;
public string songSeriesTranslit;
public string songGenre;
public string songReleaseYear;
public string songTitle;
public string songTitleTranslit;
public string songSubtitle;
public string songSubtitleTranslit;
public string songArtist;
public string songArtistTranslit;
public string songAlbum;
public string songAlbumTranslit;
public string songSeries;
public string songSeriesTranslit;
public string songGenre;
public string songReleaseYear;

public string musicPath;
public string musicOffset;
public string musicSampleStart;
public string musicSampleLength;
public string musicBpmDisplay;
public string musicPath;
public string musicOffset;
public string musicSampleStart;
public string musicSampleLength;
public string musicBpmDisplay;

public string graphicBackground;
public string graphicBanner;
public string graphicCover;
}
public string graphicBackground;
public string graphicBanner;
public string graphicCover;
}
}
Loading

0 comments on commit 5cb6a94

Please sign in to comment.