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
5 changes: 1 addition & 4 deletions Content/Archaeology/Artifact.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,7 @@ public override void LoadData(TagCompound tag)
{
displayedOnMap = tag.GetBool(nameof(displayedOnMap));
bounds = new Rectangle((int)WorldPosition.X, (int)WorldPosition.Y, (int)Size.X, (int)Size.Y);
texture = ModContent.Request<Texture2D>(TexturePath);

if (texture is null)
throw new MissingResourceException(TexturePath + " Could not be found for an artifact!");
texture = ModContent.Request<Texture2D>(TexturePath) ?? throw new MissingResourceException(TexturePath + " Could not be found for an artifact!");

ArtifactManager.artifacts.Add(this);
}
Expand Down
97 changes: 0 additions & 97 deletions Content/ArmorEnchantment/ArmorEnchantment.cs

This file was deleted.

47 changes: 0 additions & 47 deletions Content/ArmorEnchantment/DebugEnchant.cs

This file was deleted.

46 changes: 0 additions & 46 deletions Content/ArmorEnchantment/DebugEnchant2.cs

This file was deleted.

96 changes: 0 additions & 96 deletions Content/ArmorEnchantment/EnchantedArmorGlobalItem.cs

This file was deleted.

2 changes: 1 addition & 1 deletion Content/GUI/BossRushMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ public override void OnInitialize()
Append(new BossRushUnlockInfo(BossrushUnlockFlag.Auroracle, "Mods.StarlightRiver.GUI.BossRushMenu.AuroracleUnlock", Assets.Bosses.SquidBoss.SquidBoss_Head_Boss, 220, -1.57f - 1f));
Append(new BossRushUnlockInfo(BossrushUnlockFlag.Glassweaver, "Mods.StarlightRiver.GUI.BossRushMenu.GlassweaverUnlock", Assets.Bosses.GlassMiniboss.Glassweaver_Head_Boss, 220, -1.57f - 0.33f));
Append(new BossRushUnlockInfo(BossrushUnlockFlag.Ceiros, "Mods.StarlightRiver.GUI.BossRushMenu.CeirosUnlock", Assets.Bosses.VitricBoss.VitricBoss_Head_Boss, 220, -1.57f + 0.33f));
Append(new BossRushUnlockInfo(BossrushUnlockFlag.Thinker, "Mods.StarlightRiver.GUI.BossRushMenu.ThinkerUnlock", Assets.Bosses.TheThinkerBoss.TheThinker_Head_Boss, 220, -1.57f + 1f));
//Append(new BossRushUnlockInfo(BossrushUnlockFlag.Thinker, "Mods.StarlightRiver.GUI.BossRushMenu.ThinkerUnlock", Assets.Bosses.TheThinkerBoss.TheThinker_Head_Boss, 220, -1.57f + 1f));

var speedRelic = new BossRushRelicToggle(() => BossRushSpeedupAddon.active, "Mods.StarlightRiver.GUI.BossRushMenu.SpeedRelic", Assets.NPCs.BossRush.SpeedRelic, 240, 1.57f - 0.66f);
speedRelic.OnLeftClick += (a, b) => BossRushSpeedupAddon.active = !BossRushSpeedupAddon.active;
Expand Down
6 changes: 2 additions & 4 deletions Content/Items/BaseTypes/BaseMaterial.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,17 @@ public abstract class BaseMaterial : ModItem
{
private readonly string name;
private readonly string tooltip;
private readonly int maxStack;
private readonly int value;
private readonly int rarity;
private readonly string texturePath;
private readonly bool pathHasName;

public override string Texture => string.IsNullOrEmpty(texturePath) ? base.Texture : texturePath + (pathHasName ? string.Empty : Name);

protected BaseMaterial(string name, string tooltip, int maxstack, int value, int rare, string texturePath = null, bool pathHasName = false)
protected BaseMaterial(string name, string tooltip, int value, int rare, string texturePath = null, bool pathHasName = false)
{
this.name = name;
this.tooltip = tooltip;
maxStack = maxstack;
this.value = value;
rarity = rare;
this.texturePath = texturePath;
Expand All @@ -39,7 +37,7 @@ public override void SetDefaults()
{
Item.width = 16;
Item.height = 16;
Item.maxStack = maxStack;
Item.maxStack = 9999;
Item.value = value;
Item.rare = rarity;
}
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Brewing/QuickPotion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public override void SetDefaults()
Item.useTime = 15;
Item.useTurn = true;
Item.UseSound = SoundID.Item3;
Item.maxStack = 30;
Item.maxStack = 9999;
Item.consumable = true;
Item.rare = Rare;
Item.value = Item.buyPrice(gold: 1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,37 @@ namespace StarlightRiver.Content.Items.BuriedArtifacts
public class DesertArtifact1Item : BaseMaterial
{
public override string Texture => AssetDirectory.Archaeology + "DesertArtifact1";
public DesertArtifact1Item() : base("Ancient Fossil", "Would fetch a nice price!", 999, Item.sellPrice(0, 15, 0, 0), 2) { }
public DesertArtifact1Item() : base("Ancient Fossil", "Would fetch a nice price!", Item.sellPrice(0, 15, 0, 0), 2) { }
}

public class DesertArtifact2Item : BaseMaterial
{
public override string Texture => AssetDirectory.Archaeology + "DesertArtifact2";
public DesertArtifact2Item() : base("Ancient Fossil", "Would fetch a nice price!", 999, Item.sellPrice(0, 5, 0, 0), 2) { }
public DesertArtifact2Item() : base("Ancient Fossil", "Would fetch a nice price!", Item.sellPrice(0, 5, 0, 0), 2) { }
}
public class DesertArtifact3Item : BaseMaterial
{
public override string Texture => AssetDirectory.Archaeology + "DesertArtifact3";
public DesertArtifact3Item() : base("Ancient Fossil", "Would fetch a nice price!", 999, Item.sellPrice(0, 5, 0, 0), 2) { }
public DesertArtifact3Item() : base("Ancient Fossil", "Would fetch a nice price!", Item.sellPrice(0, 5, 0, 0), 2) { }
}
public class DesertArtifact4Item : BaseMaterial
{
public override string Texture => AssetDirectory.Archaeology + "DesertArtifact4";
public DesertArtifact4Item() : base("Ancient Fossil", "Would fetch a nice price!", 999, Item.sellPrice(0, 5, 0, 0), 2) { }
public DesertArtifact4Item() : base("Ancient Fossil", "Would fetch a nice price!", Item.sellPrice(0, 5, 0, 0), 2) { }
}
public class DesertArtifact5Item : BaseMaterial
{
public override string Texture => AssetDirectory.Archaeology + "DesertArtifact5";
public DesertArtifact5Item() : base("Ancient Fossil", "Would fetch a nice price!", 999, Item.sellPrice(0, 6, 0, 0), 2) { }
public DesertArtifact5Item() : base("Ancient Fossil", "Would fetch a nice price!", Item.sellPrice(0, 6, 0, 0), 2) { }
}
public class DesertArtifact6Item : BaseMaterial
{
public override string Texture => AssetDirectory.Archaeology + "DesertArtifact6";
public DesertArtifact6Item() : base("Ancient Fossil", "Would fetch a nice price!", 999, Item.sellPrice(0, 7, 0, 0), 2) { }
public DesertArtifact6Item() : base("Ancient Fossil", "Would fetch a nice price!", Item.sellPrice(0, 7, 0, 0), 2) { }
}
public class DesertArtifact7Item : BaseMaterial
{
public override string Texture => AssetDirectory.Archaeology + "DesertArtifact7";
public DesertArtifact7Item() : base("Ancient Fossil", "Would fetch a nice price!", 999, Item.sellPrice(0, 5, 0, 0), 2) { }
public DesertArtifact7Item() : base("Ancient Fossil", "Would fetch a nice price!", Item.sellPrice(0, 5, 0, 0), 2) { }
}
}
Loading
Loading