Skip to content
Open
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
3 changes: 0 additions & 3 deletions TsRandomizer/Screens/GameplayScreen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,6 @@ public override void Update(GameTime gameTime, InputState input)

deathLinkService?.Update(Level, ScreenManager);

if (Settings.MeleeAutofire.Value)
GamePadWrapper.GetProperty("IsMeleeDown").SetValue(Level.MainHero.AsDynamic()._gamePadWrapper, false, null);

if (Settings.ExtraEarringsXP.Value > 0)
{
OrbExperienceManager.UpdateHitRegistry(Level.MainHero);
Expand Down
6 changes: 6 additions & 0 deletions TsRandomizer/Screens/OptionsMenuScreen.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Microsoft.Xna.Framework;
using Timespinner.GameAbstractions;
using Timespinner.GameStateManagement.ScreenManager;
Expand Down Expand Up @@ -31,6 +32,11 @@ void AddSettingButton(MenuEntry settingButton)
settingButton.DoesDrawLargeShadow = false;

var buttons = (IList)((object)Dynamic._primaryMenuCollection).AsDynamic()._entries;
// Delete Passwords Menu if present
if (buttons[buttons.Count - 1].AsDynamic().Text == "Passwords")
{
buttons.RemoveAt(buttons.Count - 1);
}
buttons.Add(settingButton.AsTimeSpinnerMenuEntry());

((object)Dynamic._primaryMenuCollection).AsDynamic()._entries = buttons.ToList(MainMenuEntryType);
Expand Down
2 changes: 0 additions & 2 deletions TsRandomizer/Settings/GameSettingsLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,6 @@ public static SettingCollection LoadSettingsFromSlotData(Dictionary<string, obje
SetNumberGameSetting(settings.LevelCap, levelCap);
if (slotData.TryGetValue("ExtraEarringsXP", out var extraEarringsXP))
SetNumberGameSetting(settings.ExtraEarringsXP, extraEarringsXP);
if (slotData.TryGetValue("MeleeAutofire", out var meleeAutofire))
settings.MeleeAutofire.Value = IsTrue(meleeAutofire);

if (slotData.TryGetValue("ShowDrops", out var showDrops))
settings.ShowDrops.Value = IsTrue(showDrops);
Expand Down
6 changes: 1 addition & 5 deletions TsRandomizer/Settings/SettingCollection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class SettingCollection
}},
new GameSettingCategoryInfo { Name = "Other", Description = "Miscellaneous settings",
SettingsPerCategory = new List<Func<SettingCollection, GameSetting>> {
s => s.ShowBestiary, s => s.ShowDrops, s => s.MeleeAutofire, s => s.NoSaveStatues, s => s.EnableMapFromStart
s => s.ShowBestiary, s => s.ShowDrops, s => s.NoSaveStatues, s => s.EnableMapFromStart
}}
};

Expand Down Expand Up @@ -259,10 +259,6 @@ public class SettingCollection
public NumberGameSetting ExtraEarringsXP = new NumberGameSetting("Extra Earrings XP",
"Adds additional XP granted by Galaxy Earrings", 0, 24, 1, 0, true);

[DoesNotAffectCompetitiveBalance]
public OnOffGameSetting MeleeAutofire = new OnOffGameSetting("Autofire (Melee)",
"Holding the melee attack button will attack repeatedly.", false, true);

public OnOffGameSetting NoSaveStatues = new OnOffGameSetting("No Save Statues",
"Breaks all the save statues", false, true);

Expand Down