Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add option to make judge animations static. #151

Merged
merged 1 commit into from Jun 30, 2020
Merged

Add option to make judge animations static. #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/classes/User.as
View file
Open in desktop
Expand Up @@ -77,6 +77,7 @@ package classes
public var JUDGE_OFFSET:Number = 0;
public var AUTO_JUDGE_OFFSET:Boolean = false;
public var DISPLAY_JUDGE:Boolean = true;
public var DISPLAY_JUDGE_ANIMATIONS:Boolean = true;
public var DISPLAY_HEALTH:Boolean = true;
public var DISPLAY_GAME_TOP_BAR:Boolean = true;
public var DISPLAY_GAME_BOTTOM_BAR:Boolean = true;
Expand Down Expand Up @@ -439,6 +440,8 @@ package classes
this.DISPLAY_SONG_FLAG = _settings.viewSongFlag;
if (_settings.viewJudge != null)
this.DISPLAY_JUDGE = _settings.viewJudge;
if (_settings.viewJudgeAnimations != null)
this.DISPLAY_JUDGE_ANIMATIONS = _settings.viewJudgeAnimations;
if (_settings.viewHealth != null)
this.DISPLAY_HEALTH = _settings.viewHealth;
if (_settings.viewGameTopBar != null)
Expand Down Expand Up @@ -569,6 +572,7 @@ package classes
gameSave.viewSongFlag = this.DISPLAY_SONG_FLAG;
gameSave.viewJudge = this.DISPLAY_JUDGE;
gameSave.viewHealth = this.DISPLAY_HEALTH;
gameSave.viewJudgeAnimations = this.DISPLAY_JUDGE_ANIMATIONS;
gameSave.viewGameTopBar = this.DISPLAY_GAME_TOP_BAR;
gameSave.viewGameBottomBar = this.DISPLAY_GAME_BOTTOM_BAR;
gameSave.viewScore = this.DISPLAY_SCORE;
Expand Down
2 changes: 2 additions & 0 deletions src/game/GameOptions.as
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@ package game
public var displayGameTopBar:Boolean = true;
public var displayGameBottomBar:Boolean = true;
public var displayJudge:Boolean = true;
public var displayJudgeAnimations:Boolean = true;
public var displayHealth:Boolean = true;
public var displayScore:Boolean = true;
public var displayCombo:Boolean = true;
Expand Down Expand Up @@ -98,6 +99,7 @@ package game
autoJudgeOffset = user.AUTO_JUDGE_OFFSET;

displayJudge = user.DISPLAY_JUDGE;
displayJudgeAnimations = user.DISPLAY_JUDGE_ANIMATIONS;
displayHealth = user.DISPLAY_HEALTH;
displayGameTopBar = user.DISPLAY_GAME_TOP_BAR;
displayGameBottomBar = user.DISPLAY_GAME_BOTTOM_BAR;
Expand Down
3 changes: 3 additions & 0 deletions src/game/controls/Judge.as
View file
Open in desktop
Expand Up @@ -33,6 +33,9 @@ package game.controls
{
this.options = options;

if (!this.options.displayJudgeAnimations)
indexes = Judge_Tweens.judge_indexes_static;

labelDesc[100] = {colour: options.judgeColours[0], title: "AMAZING!!!"};
labelDesc[50] = {colour: options.judgeColours[1], title: "PERFECT!"};
labelDesc[25] = {colour: options.judgeColours[2], title: "GOOD"};
Expand Down
31 changes: 31 additions & 0 deletions src/game/controls/Judge_Tweens.as
View file
Open in desktop
Expand Up @@ -49,5 +49,36 @@ package game.controls
"14": [0, -1, 1, 1, 1, 0.25, 1],
"15": [0, 0, 0, 1, 1, 0, 1]
}}


public static var judge_indexes_static:Object = {"100": {
"0": [0, 0, 0, 1, 1, 1, 0],
"18": [0, 0, 0, 1, 1, 0, 1]
},

"50": {
"0": [0, 0, 0, 1, 1, 1, 0],
"18": [0, 0, 0, 1, 1, 0, 1]
},

"25": {
"0": [0, 0, 0, 1, 1, 1, 0],
"18": [0, 0, 0, 1, 1, 0, 1]
},

"5": {
"0": [0, 0, 0, 1, 1, 1, 0],
"18": [0, 0, 0, 1, 1, 0, 1]
},

"-10": {
"0": [0, 0, 0, 1, 1, 1, 0],
"18": [0, 0, 0, 1, 1, 0, 1]
},

"-5": {
"0": [0, 0, 0, 1, 1, 1, 0],
"18": [0, 0, 0, 1, 1, 0, 1]
}}
}
}
2 changes: 1 addition & 1 deletion src/popups/PopupOptions.as
View file
Open in desktop
Expand Up @@ -74,7 +74,7 @@ package popups
//- Arrays
private var keyInputs:Array = ["left", "down", "up", "right", "restart", "quit", "options"];
private var judgeTitles:Array = ["amazing", "perfect", "good", "average", "miss", "boo"];
private var displayArray:Array = ["SONG_FLAG", "----", "JUDGE", "HEALTH", "SCORE", "COMBO", "PACOUNT", "SONGPROGRESS", "AMAZING", "PERFECT", "TOTAL", "SCREENCUT", "MP_MASK", "GAME_TOP_BAR", "GAME_BOTTOM_BAR"];
private var displayArray:Array = ["SONG_FLAG", "----", "JUDGE", "JUDGE_ANIMATIONS", "HEALTH", "SCORE", "COMBO", "PACOUNT", "SONGPROGRESS", "AMAZING", "PERFECT", "TOTAL", "SCREENCUT", "MP_MASK", "GAME_TOP_BAR", "GAME_BOTTOM_BAR"];
private var noteColorComboArray:Array = [];
private var startUpScreenSelections:Array = [];

Expand Down