From 854dc2a418691b8b10ce773d86d51fed72fff917 Mon Sep 17 00:00:00 2001 From: MinaciousGrace Date: Sat, 7 Jan 2017 00:10:02 -0500 Subject: [PATCH] add more skillsets --- .../ScreenSelectMusic decorations/profile.lua | 21 +++--------------- Themes/Til Death/Scripts/WifeSundries.lua | 9 +++++--- extern/MinaCalc/MinaCalc.lib | Bin 151068 -> 156198 bytes src/GameConstantsAndTypes.cpp | 20 +++++++++++------ src/GameConstantsAndTypes.h | 7 ++++-- 5 files changed, 27 insertions(+), 30 deletions(-) diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/profile.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/profile.lua index 51ef18c621..d2d73ce2c7 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/profile.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/profile.lua @@ -35,24 +35,8 @@ local rankingX = capWideScale(75,90) local rankingY = capWideScale(200,180) local rankingTitleWidth = (rankingWidth/(#ms.SkillSets + 1)) -local skillsets = { - Overall = 0, - Speed = 0, - Stam = 0, - Jack = 0, - Technical = 0 -} - - if GAMESTATE:IsPlayerEnabled(PLAYER_1) then profile = GetPlayerOrMachineProfile(PLAYER_1) - if profile ~= nil then - skillsets.Overall = profile:GetPlayerRating() - skillsets.Speed = profile:GetPlayerSkillsetRating(2) - skillsets.Stam = profile:GetPlayerSkillsetRating(3) - skillsets.Jack = profile:GetPlayerSkillsetRating(4) - skillsets.Technical = profile:GetPlayerSkillsetRating(5) - end end @@ -201,8 +185,9 @@ local function littlebits(i) InitCommand=cmd(xy,frameX+(frameWidth/2)+90,frameY+20 + 22*i;halign,1;zoom,0.5), BeginCommand=cmd(queuecommand,"Set"), SetCommand=function(self) - self:settextf("%5.2f",skillsets[ms.SkillSets[i]]) - self:diffuse(ByMSD(skillsets[ms.SkillSets[i]])) + local rating = profile:GetPlayerSkillsetRating(i) + self:settextf("%5.2f",rating) + self:diffuse(ByMSD(rating)) end, PlayerJoinedMessageCommand=cmd(queuecommand,"Set"), PlayerUnjoinedMessageCommand=cmd(queuecommand,"Set"), diff --git a/Themes/Til Death/Scripts/WifeSundries.lua b/Themes/Til Death/Scripts/WifeSundries.lua index 0ddd81699b..7efb011513 100644 --- a/Themes/Til Death/Scripts/WifeSundries.lua +++ b/Themes/Til Death/Scripts/WifeSundries.lua @@ -56,9 +56,12 @@ ms.JudgeCountInverse = { ms.SkillSets = { "Overall", - "Speed", - "Stam", - "Jack", + "Stream", + "Jumpstream", + "Handstream", + "Stamina", + "Jack Speed", + "Jack Stamina", "Technical" } diff --git a/extern/MinaCalc/MinaCalc.lib b/extern/MinaCalc/MinaCalc.lib index cb4bdd0311c62ebaf1ea35ac234e46d0f0116ed2..f76dfc3adad676dac25ffb6b99a528e80215cf5c 100644 GIT binary patch delta 30634 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 hpnap!{{gDsnb4;o^Igrlgw+Tg!v&+#8G(Z3de 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 diff --git a/src/GameConstantsAndTypes.cpp b/src/GameConstantsAndTypes.cpp index 68e88ee6cd..e78bd1d27d 100644 --- a/src/GameConstantsAndTypes.cpp +++ b/src/GameConstantsAndTypes.cpp @@ -274,19 +274,25 @@ XToLocalizedString( HoldNoteScore ); // wtf is this shit - mina static const char *SkillsetNames[] = { "Overall", - "Speed", + "Stream", + "Jumpstream", + "Handstream", "Stamina", - "Jack", + "Jack Speed", + "Jack Stamina", "Technical", }; XToString(Skillset); LuaXType(Skillset); Skillset StringToSkillset(const RString &s) { - if (s == "Overall") return Skill_Overall; - else if (s == "Speed") return Skill_Speed; - else if (s == "Stamina") return Skill_Stamina; - else if (s == "Jack") return Skill_Jack; - else if (s == "Technical") return Skill_Technical; + if (s == "Overall") return Skill_Overall; + else if (s == "Stream") return Skill_Stream; + else if (s == "Jumpstream") return Skill_Jumpstream; + else if (s == "Handstream") return Skill_Jumpstream; + else if (s == "Stamina") return Skill_Stamina; + else if (s == "Jack Speed") return Skill_JackSpeed; + else if (s == "Jack Stamina") return Skill_JackStamina; + else if (s == "Technical") return Skill_Technical; return Skill_Overall; } diff --git a/src/GameConstantsAndTypes.h b/src/GameConstantsAndTypes.h index 115c888985..5363b7c08a 100644 --- a/src/GameConstantsAndTypes.h +++ b/src/GameConstantsAndTypes.h @@ -23,9 +23,12 @@ const int MAX_NUM_CREDITS = 20; enum Skillset { Skill_Overall, - Skill_Speed, + Skill_Stream, + Skill_Jumpstream, + Skill_Handstream, Skill_Stamina, - Skill_Jack, + Skill_JackSpeed, + Skill_JackStamina, Skill_Technical, NUM_Skillset, Skillset_Invalid,