Skip to content

Commit d7c1541

Browse files
committed
Add new mutators
1 parent 4ffc621 commit d7c1541

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

RLBotCS/Conversion/FlatToCommand.cs

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ private static string MapBallType(BallTypeMutator option) =>
117117
BallTypeMutator.PlayerSeeking => "Ball_Fire",
118118
BallTypeMutator.Dropshot => "Ball_Breakout",
119119
BallTypeMutator.ScoreAbsorb => "Ball_Score",
120+
BallTypeMutator.Shoe => "Ball_Shoe",
121+
BallTypeMutator.PizzaPuck => "Ball_PizzaPuck",
120122
_ => throw new ArgumentOutOfRangeException(nameof(option), option, null),
121123
};
122124

@@ -130,6 +132,7 @@ private static string MapBallWeight(BallWeightMutator option) =>
130132
BallWeightMutator.CurveBall => "MagnusBall",
131133
BallWeightMutator.BeachBallCurve => "MagnusBeachBall",
132134
BallWeightMutator.MagnusFutBall => "MagnusFutBallTest",
135+
BallWeightMutator.MagnusFutballLess => "MagnusFutballLess",
133136
_ => throw new ArgumentOutOfRangeException(nameof(option), option, null),
134137
};
135138

@@ -182,6 +185,8 @@ private static string MapRumble(RumbleMutator option) =>
182185
RumbleMutator.BatmanRumble => "ItemsMode_BM",
183186
RumbleMutator.GrapplingOnly => "ItemsModeGrapplingHooks",
184187
RumbleMutator.HaymakerOnly => "ItemsModeBoxingGloves",
188+
RumbleMutator.SpikeRushForce => "ItemsModeRugbyLightDark",
189+
RumbleMutator.RPS => "ItemsModeRPS",
185190
_ => throw new ArgumentOutOfRangeException(nameof(option), option, null),
186191
};
187192

@@ -216,7 +221,9 @@ private static string MapDemolish(DemolishMutator option) =>
216221
DemolishMutator.OnContact => "AlwaysDemolishOpposing",
217222
DemolishMutator.OnContactFF => "AlwaysDemolish",
218223
DemolishMutator.OnBallContact => "TeamDemoBall",
224+
DemolishMutator.OnBallContactSilent => "TeamDemoBallSilent",
219225
DemolishMutator.OnBallContactFF => "FFADemoBall",
226+
DemolishMutator.OnBallContactFFSilent => "FFADemoBallSilent",
220227
_ => throw new ArgumentOutOfRangeException(nameof(option), option, null),
221228
};
222229

@@ -269,7 +276,7 @@ private static string MapTerritory(TerritoryMutator option) =>
269276
option switch
270277
{
271278
TerritoryMutator.Off => "",
272-
TerritoryMutator.Territory => "Territory",
279+
TerritoryMutator.Territory => "TerritoryEnabled",
273280
_ => throw new ArgumentOutOfRangeException(nameof(option), option, null),
274281
};
275282

@@ -366,6 +373,14 @@ private static string MapInputRestriction(InputRestrictionMutator option) =>
366373
_ => throw new ArgumentOutOfRangeException(nameof(option), option, null),
367374
};
368375

376+
private static string MapScoringRule(ScoringRule option) =>
377+
option switch
378+
{
379+
ScoringRule.Default => "",
380+
ScoringRule.DisableGoalScoring => "DisableGoalScoring",
381+
_ => throw new ArgumentOutOfRangeException(nameof(option), option, null),
382+
};
383+
369384
private static string GetOption(string option)
370385
{
371386
if (option != "")
@@ -439,6 +454,8 @@ public static string MakeOpenCommand(MatchConfigurationT matchConfig)
439454
command += GetOption(MapNormalGoalScore(mutatorSettings.NormalGoalScore));
440455
command += GetOption(MapAerialGoalScore(mutatorSettings.AerialGoalScore));
441456
command += GetOption(MapAssistGoalScore(mutatorSettings.AssistGoalScore));
457+
command += GetOption(MapInputRestriction(mutatorSettings.InputRestriction));
458+
command += GetOption(MapScoringRule(mutatorSettings.ScoringRule));
442459

443460
return command;
444461
}

RLBotCS/Main.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
if (args.Length > 0 && args[0] == "--version")
1111
{
1212
Console.WriteLine(
13-
$"RLBotServer v5.beta.7.2\n"
13+
$"RLBotServer v5.beta.7.3\n"
1414
+ $"Bridge {BridgeVersion.Version}\n"
1515
+ $"@ https://www.rlbot.org & https://github.com/RLBot/core"
1616
);

flatbuffers-schema

0 commit comments

Comments
 (0)