Skip to content

Commit

Permalink
Feeling the burn
Browse files Browse the repository at this point in the history
But atleast it all works.
  • Loading branch information
V2LenKagamine committed Jun 18, 2023
1 parent e4e29b8 commit fc46910
Show file tree
Hide file tree
Showing 14 changed files with 64 additions and 6 deletions.
Binary file modified .vs/LensRands/DesignTimeBuild/.dtbcache.v2
Binary file not shown.
Binary file modified .vs/LensRands/v17/.suo
Binary file not shown.
Binary file modified .vs/ProjectEvaluation/lensrands.metadata.v6.1
Binary file not shown.
Binary file modified .vs/ProjectEvaluation/lensrands.projects.v6.1
Binary file not shown.
Binary file added Assets/Items/Placeables/YourDemise.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Music/DPZ-YourDemiseEX.ogg
Binary file not shown.
Binary file added Assets/Tiles/Furniture/YourDemiseBoxTile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions Content/Items/Consumable/RoRCrates.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public override void SetDefaults()
Item.width = 16;
Item.height = 16;
Item.rare = ItemRarityID.White;
Item.useStyle = 1;
Item.useStyle = ItemUseStyleID.Swing;
Item.autoReuse = true;
Item.consumable = true;
Item.useTime = 15;
Expand Down Expand Up @@ -129,7 +129,8 @@ public class LunarPod : ModItem
public int[] AuxLoot => new int[]
{
ModContent.ItemType<Monika>(),
ModContent.ItemType<MarkovBox>()
ModContent.ItemType<MarkovBox>(),
ModContent.ItemType<YourDemiseBox>()
};
public int[] LootTable => Mod.GetContent<RORLunar>().Select(x => x.Type).ToArray().Concat(AuxLoot).ToArray();

Expand All @@ -138,7 +139,7 @@ public override void SetDefaults()
Item.width = 16;
Item.height = 16;
Item.rare = ItemRarityID.Blue;
Item.useStyle = 1;
Item.useStyle = ItemUseStyleID.Swing;
Item.autoReuse = true;
Item.consumable = true;
Item.useTime = 15;
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Pets/Monika.cs
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ private void Respond(Player player)
if (PlayerMessage != null)
{

if (Regex.Match(PlayerMessage, "(I|i).love.you.+").Success)
if (Regex.Match(PlayerMessage, "I|i.love.you.+").Success)
{
Main.NewText(LoveList[Main.rand.Next(0, LoveList.Count)] + player.name + "!");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,19 @@ public override void SetDefaults()
Item.DefaultToMusicBox(ModContent.TileType<MarkovBoxTile>(), 0);
}
}
public class YourDemiseBox : ModItem
{
public override string Texture => LensRands.AssetsPath + "Items/Placeables/YourDemise";
public override void SetStaticDefaults()
{
ItemID.Sets.CanGetPrefixes[Type] = false;
ItemID.Sets.ShimmerTransformToItem[Type] = ItemID.MusicBox;
MusicLoader.AddMusicBox(Mod, MusicLoader.GetMusicSlot(Mod, "Assets/Music/DPZ-YourDemiseEX"), ModContent.ItemType<YourDemiseBox>(), ModContent.TileType<YourDemiseBoxTile>());
}

public override void SetDefaults()
{
Item.DefaultToMusicBox(ModContent.TileType<YourDemiseBoxTile>(), 0);
}
}
}
26 changes: 26 additions & 0 deletions Content/Tiles/Markov.cs → Content/Tiles/Musicboxes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,30 @@ public override void MouseOver(int i, int j)
player.cursorItemIconID = ModContent.ItemType<MarkovBox>();
}
}
public class YourDemiseBoxTile : ModTile
{
public override string Texture => LensRands.AssetsPath + "Tiles/Furniture/YourDemiseBoxTile";
public override void SetStaticDefaults()
{
Main.tileFrameImportant[Type] = true;
Main.tileObsidianKill[Type] = true;
TileObjectData.newTile.CopyFrom(TileObjectData.Style2x2);
TileObjectData.newTile.Origin = new Point16(0, 1);
TileObjectData.newTile.LavaDeath = false;
TileObjectData.newTile.DrawYOffset = 2;
TileObjectData.newTile.StyleLineSkip = 2;
TileObjectData.addTile(Type);

LocalizedText name = CreateMapEntryName();
AddMapEntry(new Color(200, 200, 200), name);
}

public override void MouseOver(int i, int j)
{
Player player = Main.LocalPlayer;
player.noThrow = 2;
player.cursorItemIconEnabled = true;
player.cursorItemIconID = ModContent.ItemType<YourDemiseBox>();
}
}
}
16 changes: 14 additions & 2 deletions Localization/en-US.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ Mods: {
Nanotrasen Brand Personal AI Unit!
Better yet, strap some C4 onto it and send it at your enemies!
Due to its robust casing, it won't even take a scratch!
[c/FFFF00:Warning: R.O.G.U.S. Brand PAI's are notably volitile and will]
[c/FFFF00:Warning: R.O.G.U.S. Brand PAI's are notably volatile and will]
[c/FFFF00:likely laugh hysterically when told to do this.]
'''
}
Expand Down Expand Up @@ -624,6 +624,15 @@ Mods: {
[c/FFFF00:You'll thank me later for doing that.]
'''
}

YourDemiseBox: {
DisplayName: Your Demise EX - DPZ
Tooltip:
'''
[c/9E4638:Should have known better than to]
[c/9E4638:mess with others love lifes.]
'''
}
}

Projectiles: {
Expand Down Expand Up @@ -705,6 +714,9 @@ Mods: {
}
}

Tiles.MarkovBoxTile.MapEntry: Markov Music Box
Tiles: {
MarkovBoxTile.MapEntry: Markov Music Box
YourDemiseBoxTile.MapEntry: Your Demise Box Tile
}
}
}
4 changes: 4 additions & 0 deletions description.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Len's Randoms is a hellscape created for the sole purpose of tormenting others. This should not be used unless you too enjoy poorly coded references and stupid items in your terraria game.

Do note: Items may change, become existn't,and this mod may stop being updated or update 5 times in a day.
Who knows.
Point is, you probably shouldn't use it unless you know me personally or are a madlad.

If you want actual features: heres a list;
Several RiskOfRain themed items/mechanics.
Monika pet.
Expand Down
Binary file modified obj/Debug/net6.0/LensRands.csproj.AssemblyReference.cache
Binary file not shown.

0 comments on commit fc46910

Please sign in to comment.