Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions RLBotCS/Conversion/FlatToCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ private static string MapMatchLength(MatchLengthMutator matchLength) =>
private static string MapMaxScore(MaxScoreMutator maxScore) =>
maxScore switch
{
MaxScoreMutator.Default => "",
MaxScoreMutator.Unlimited => "",
MaxScoreMutator.OneGoal => "Max1",
MaxScoreMutator.ThreeGoals => "Max3",
MaxScoreMutator.FiveGoals => "Max5",
Expand All @@ -50,7 +50,6 @@ private static string MapMaxScore(MaxScoreMutator maxScore) =>
MaxScoreMutator.EightyGoals => "Max80",
MaxScoreMutator.NinetyGoals => "Max90",
MaxScoreMutator.HundredGoals => "Max100",
MaxScoreMutator.Unlimited => "UnlimitedScore",
_ => throw new ArgumentOutOfRangeException(nameof(maxScore), maxScore, null),
};

Expand Down Expand Up @@ -170,7 +169,7 @@ private static string MapBoostAmount(BoostAmountMutator option) =>
private static string MapRumble(RumbleMutator option) =>
option switch
{
RumbleMutator.NoRumble => "",
RumbleMutator.Off => "",
RumbleMutator.DefaultRumble => "ItemsMode",
RumbleMutator.Slow => "ItemsModeSlow",
RumbleMutator.Civilized => "ItemsModeBallManipulators",
Expand Down Expand Up @@ -234,7 +233,7 @@ private static string MapRespawnTime(RespawnTimeMutator option) =>
private static string MapMaxTime(MaxTimeMutator option) =>
option switch
{
MaxTimeMutator.Default => "",
MaxTimeMutator.Unlimited => "",
MaxTimeMutator.ElevenMinutes => "MaxTime11Minutes",
_ => throw new ArgumentOutOfRangeException(nameof(option), option, null),
};
Expand Down Expand Up @@ -269,15 +268,15 @@ private static string MapBallGravity(BallGravityMutator option) =>
private static string MapTerritory(TerritoryMutator option) =>
option switch
{
TerritoryMutator.Default => "",
TerritoryMutator.Off => "",
TerritoryMutator.Territory => "Territory",
_ => throw new ArgumentOutOfRangeException(nameof(option), option, null),
};

private static string MapStaleBall(StaleBallMutator option) =>
option switch
{
StaleBallMutator.Default => "",
StaleBallMutator.Unlimited => "",
StaleBallMutator.ThirtySeconds => "ThirtySeconds",
_ => throw new ArgumentOutOfRangeException(nameof(option), option, null),
};
Expand All @@ -298,7 +297,7 @@ private static string MapJump(JumpMutator option) =>
private static string MapDodgeTimer(DodgeTimerMutator option) =>
option switch
{
DodgeTimerMutator.Default => "",
DodgeTimerMutator.OnePointTwentyFiveSeconds => "",
DodgeTimerMutator.TwoSeconds => "DodgeTwoSeconds",
DodgeTimerMutator.ThreeSeconds => "DodgeThreeSeconds",
DodgeTimerMutator.Unlimited => "DodgeUnlimitedSeconds",
Expand All @@ -308,7 +307,7 @@ private static string MapDodgeTimer(DodgeTimerMutator option) =>
private static string MapPossessionScore(PossessionScoreMutator option) =>
option switch
{
PossessionScoreMutator.Default => "",
PossessionScoreMutator.Off => "",
PossessionScoreMutator.OneSecond => "Possession1Second",
PossessionScoreMutator.TwoSeconds => "Possession2Seconds",
PossessionScoreMutator.ThreeSeconds => "Possession3Seconds",
Expand All @@ -318,7 +317,7 @@ private static string MapPossessionScore(PossessionScoreMutator option) =>
private static string MapDemolishScore(DemolishScoreMutator option) =>
option switch
{
DemolishScoreMutator.Default => "",
DemolishScoreMutator.Zero => "",
DemolishScoreMutator.One => "DemolishScore1",
DemolishScoreMutator.Two => "DemolishScore2",
DemolishScoreMutator.Three => "DemolishScore3",
Expand All @@ -328,7 +327,7 @@ private static string MapDemolishScore(DemolishScoreMutator option) =>
private static string MapNormalGoalScore(NormalGoalScoreMutator option) =>
option switch
{
NormalGoalScoreMutator.Default => "",
NormalGoalScoreMutator.One => "",
NormalGoalScoreMutator.Zero => "GoalScore0",
NormalGoalScoreMutator.Two => "GoalScore2",
NormalGoalScoreMutator.Three => "GoalScore3",
Expand All @@ -340,7 +339,7 @@ private static string MapNormalGoalScore(NormalGoalScoreMutator option) =>
private static string MapAerialGoalScore(AerialGoalScoreMutator option) =>
option switch
{
AerialGoalScoreMutator.Default => "",
AerialGoalScoreMutator.One => "",
AerialGoalScoreMutator.Zero => "AerialGoalScore0",
AerialGoalScoreMutator.Two => "AerialGoalScore2",
AerialGoalScoreMutator.Three => "AerialGoalScore3",
Expand All @@ -352,7 +351,7 @@ private static string MapAerialGoalScore(AerialGoalScoreMutator option) =>
private static string MapAssistGoalScore(AssistGoalScoreMutator option) =>
option switch
{
AssistGoalScoreMutator.Default => "",
AssistGoalScoreMutator.Zero => "",
AssistGoalScoreMutator.One => "AssistScore1",
AssistGoalScoreMutator.Two => "AssistScore2",
AssistGoalScoreMutator.Three => "AssistScore3",
Expand Down
2 changes: 1 addition & 1 deletion RLBotCS/Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

if (args.Length > 0 && args[0] == "--version")
{
Console.WriteLine("RLBotServer v5.beta.4.10");
Console.WriteLine("RLBotServer v5.beta.5.0");
Environment.Exit(0);
}

Expand Down
22 changes: 11 additions & 11 deletions RLBotCS/ManagerTools/ConfigParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ private MutatorSettingsT GetMutatorSettings(TomlTable mutatorTable) =>
Fields.MutatorsMatchLength,
MatchLengthMutator.FiveMinutes
),
MaxScore = GetEnum(mutatorTable, Fields.MutatorsMaxScore, MaxScoreMutator.Default),
MaxScore = GetEnum(mutatorTable, Fields.MutatorsMaxScore, MaxScoreMutator.Unlimited),
MultiBall = GetEnum(mutatorTable, Fields.MutatorsMultiBall, MultiBallMutator.One),
Overtime = GetEnum(
mutatorTable,
Expand Down Expand Up @@ -511,7 +511,7 @@ private MutatorSettingsT GetMutatorSettings(TomlTable mutatorTable) =>
Fields.MutatorsBoostAmount,
BoostAmountMutator.NormalBoost
),
Rumble = GetEnum(mutatorTable, Fields.MutatorsRumble, RumbleMutator.NoRumble),
Rumble = GetEnum(mutatorTable, Fields.MutatorsRumble, RumbleMutator.Off),
BoostStrength = GetEnum(
mutatorTable,
Fields.MutatorsBoostStrength,
Expand All @@ -524,7 +524,7 @@ private MutatorSettingsT GetMutatorSettings(TomlTable mutatorTable) =>
Fields.MutatorsRespawnTime,
RespawnTimeMutator.ThreeSeconds
),
MaxTime = GetEnum(mutatorTable, Fields.MutatorsMaxTime, MaxTimeMutator.Default),
MaxTime = GetEnum(mutatorTable, Fields.MutatorsMaxTime, MaxTimeMutator.Unlimited),
GameEvent = GetEnum(
mutatorTable,
Fields.MutatorsGameEvent,
Expand All @@ -539,43 +539,43 @@ private MutatorSettingsT GetMutatorSettings(TomlTable mutatorTable) =>
Territory = GetEnum(
mutatorTable,
Fields.MutatorsTerritory,
TerritoryMutator.Default
TerritoryMutator.Off
),
StaleBall = GetEnum(
mutatorTable,
Fields.MutatorsStaleBall,
StaleBallMutator.Default
StaleBallMutator.Unlimited
),
Jump = GetEnum(mutatorTable, Fields.MutatorsJump, JumpMutator.Default),
DodgeTimer = GetEnum(
mutatorTable,
Fields.MutatorsDodgeTimer,
DodgeTimerMutator.Default
DodgeTimerMutator.OnePointTwentyFiveSeconds
),
PossessionScore = GetEnum(
mutatorTable,
Fields.MutatorsPossessionScore,
PossessionScoreMutator.Default
PossessionScoreMutator.Off
),
DemolishScore = GetEnum(
mutatorTable,
Fields.MutatorsDemolishScore,
DemolishScoreMutator.Default
DemolishScoreMutator.Zero
),
NormalGoalScore = GetEnum(
mutatorTable,
Fields.MutatorsNormalGoalScore,
NormalGoalScoreMutator.Default
NormalGoalScoreMutator.One
),
AerialGoalScore = GetEnum(
mutatorTable,
Fields.MutatorsAerialGoalScore,
AerialGoalScoreMutator.Default
AerialGoalScoreMutator.One
),
AssistGoalScore = GetEnum(
mutatorTable,
Fields.MutatorsAssistGoalScore,
AssistGoalScoreMutator.Default
AssistGoalScoreMutator.Zero
),
InputRestriction = GetEnum(
mutatorTable,
Expand Down
2 changes: 1 addition & 1 deletion flatbuffers-schema