diff --git a/Assets/Gores/frame_00004.png b/Assets/Gores/frame_00004.png new file mode 100644 index 0000000..6278b3f Binary files /dev/null and b/Assets/Gores/frame_00004.png differ diff --git a/Assets/Gores/frame_00005.png b/Assets/Gores/frame_00005.png new file mode 100644 index 0000000..2634641 Binary files /dev/null and b/Assets/Gores/frame_00005.png differ diff --git a/Content/Items/SummonItems/LexySummon.cs b/Content/Items/SummonItems/LexySummon.cs index 13b6b05..0a38a8d 100644 --- a/Content/Items/SummonItems/LexySummon.cs +++ b/Content/Items/SummonItems/LexySummon.cs @@ -7,6 +7,7 @@ using Terraria.ModLoader; using Terraria.Chat; using Terraria.Localization; using ForgottenWawiTech.Content.NPCs.OriginalLexy; +using ForgottenWawiTech.Content.Rarities; namespace ForgottenWawiTech.Content.Items.SummonItems { @@ -20,7 +21,7 @@ namespace ForgottenWawiTech.Content.Items.SummonItems Item.useAnimation = 10; Item.useStyle = ItemUseStyleID.HoldUp; Item.consumable = false; - Item.rare = ItemRarityID.Red; + Item.rare = ModContent.RarityType(); } public override bool CanUseItem(Player player) @@ -39,5 +40,20 @@ namespace ForgottenWawiTech.Content.Items.SummonItems return true; } + + public override void AddRecipes() + { + // Only add the recipe if Calamity Mod is loaded + if (ModLoader.TryGetMod("CalamityMod", out Mod calamityMod)) + { + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ItemID.RainbowBrick, 100); + // Exo Prism + recipe.AddIngredient(calamityMod.Find("ExoPrism").Type, 5); + recipe.AddIngredient(calamityMod.Find("MysteriousCircuitry").Type, 10); + recipe.AddTile(TileID.LunarCraftingStation); + recipe.Register(); + } + } } } \ No newline at end of file diff --git a/Content/Items/SummonItems/LexySummon.png b/Content/Items/SummonItems/LexySummon.png index 9e0cf81..004eae3 100644 Binary files a/Content/Items/SummonItems/LexySummon.png and b/Content/Items/SummonItems/LexySummon.png differ diff --git a/Content/Items/SummonItems/LyykaSummon.cs b/Content/Items/SummonItems/LyykaSummon.cs index 301e523..850746b 100644 --- a/Content/Items/SummonItems/LyykaSummon.cs +++ b/Content/Items/SummonItems/LyykaSummon.cs @@ -7,6 +7,7 @@ using Terraria.ModLoader; using Terraria.Chat; using Terraria.Localization; using ForgottenWawiTech.Content.NPCs.OriginalLyyka; +using ForgottenWawiTech.Content.Rarities; namespace ForgottenWawiTech.Content.Items.SummonItems { @@ -20,7 +21,7 @@ namespace ForgottenWawiTech.Content.Items.SummonItems Item.useAnimation = 10; Item.useStyle = ItemUseStyleID.HoldUp; Item.consumable = false; - Item.rare = ItemRarityID.Red; + Item.rare = ModContent.RarityType(); } public override bool CanUseItem(Player player) diff --git a/Content/Items/SummonItems/LyykaSummon.png b/Content/Items/SummonItems/LyykaSummon.png index 9e0cf81..47e57ff 100644 Binary files a/Content/Items/SummonItems/LyykaSummon.png and b/Content/Items/SummonItems/LyykaSummon.png differ diff --git a/Content/Items/SummonItems/NeptuneSummon.cs b/Content/Items/SummonItems/NeptuneSummon.cs index bd60a14..ba2593c 100644 --- a/Content/Items/SummonItems/NeptuneSummon.cs +++ b/Content/Items/SummonItems/NeptuneSummon.cs @@ -7,6 +7,7 @@ using Terraria.ModLoader; using Terraria.Chat; using Terraria.Localization; using ForgottenWawiTech.Content.NPCs.OriginalNeptune; +using ForgottenWawiTech.Content.Rarities; namespace ForgottenWawiTech.Content.Items.SummonItems { @@ -20,7 +21,7 @@ namespace ForgottenWawiTech.Content.Items.SummonItems Item.useAnimation = 10; Item.useStyle = ItemUseStyleID.HoldUp; Item.consumable = false; - Item.rare = ItemRarityID.Red; + Item.rare = ModContent.RarityType(); } public override bool CanUseItem(Player player) diff --git a/Content/Items/SummonItems/NikoSummon.cs b/Content/Items/SummonItems/NikoSummon.cs index f73b02b..fb13a6e 100644 --- a/Content/Items/SummonItems/NikoSummon.cs +++ b/Content/Items/SummonItems/NikoSummon.cs @@ -7,6 +7,7 @@ using Terraria.ModLoader; using Terraria.Chat; using Terraria.Localization; using ForgottenWawiTech.Content.NPCs.OriginalNiko; +using ForgottenWawiTech.Content.Rarities; namespace ForgottenWawiTech.Content.Items.SummonItems { @@ -20,7 +21,7 @@ namespace ForgottenWawiTech.Content.Items.SummonItems Item.useAnimation = 10; Item.useStyle = ItemUseStyleID.HoldUp; Item.consumable = false; - Item.rare = ItemRarityID.Red; + Item.rare = ModContent.RarityType(); } // Only allow the boss to be summoned if the Wall of Flesh is defeated (hardmode) @@ -32,7 +33,6 @@ namespace ForgottenWawiTech.Content.Items.SummonItems public override bool? UseItem(Player player) { - string summonText = "A familiar presence fills the air..."; if (Main.netMode != NetmodeID.MultiplayerClient) { NPC.SpawnOnPlayer(player.whoAmI, ModContent.NPCType()); @@ -41,14 +41,14 @@ namespace ForgottenWawiTech.Content.Items.SummonItems return true; } - /* public override void AddRecipes() - { - Recipe recipe = CreateRecipe(); - recipe.AddIngredient(1); - recipe.AddIngredient(ItemID.LunarBar, 20); - recipe.AddIngredient(ItemID.Meowmere, 5); - recipe.AddTile(TileID.LunarCraftingStation); - recipe.Register(); - } */ + public override void AddRecipes() + { + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ItemID.RatCage, 1); + recipe.AddIngredient(ItemID.Feather, 100); + recipe.AddIngredient(ItemID.HoneyBucket, 1); + recipe.AddTile(TileID.LunarCraftingStation); + recipe.Register(); + } } } diff --git a/Content/Items/SummonItems/NikoSummon.png b/Content/Items/SummonItems/NikoSummon.png index 9e0cf81..c3b1f09 100644 Binary files a/Content/Items/SummonItems/NikoSummon.png and b/Content/Items/SummonItems/NikoSummon.png differ diff --git a/Content/Items/TrueNyanageddon.cs b/Content/Items/TrueNyanageddon.cs index 2eb71be..6921624 100644 --- a/Content/Items/TrueNyanageddon.cs +++ b/Content/Items/TrueNyanageddon.cs @@ -16,36 +16,37 @@ namespace ForgottenWawiTech.Content.Items Item.DamageType = DamageClass.Ranged; Item.width = 40; Item.height = 40; - Item.useTime = 7; - Item.useAnimation = 7; + Item.useTime = 17; + Item.useAnimation = 17; Item.useStyle = ItemUseStyleID.Shoot; Item.knockBack = 20; Item.value = Item.buyPrice(gold: 60); - Item.rare = ItemRarityID.Red; + Item.rare = ItemRarityID.Expert; Item.UseSound = SoundID.Meowmere; Item.autoReuse = true; Item.noMelee = true; Item.shoot = ProjectileID.PurificationPowder; Item.shootSpeed = 30f; Item.useAmmo = AmmoID.None; + Item.crit = 60; } public override bool Shoot(Player player, Terraria.DataStructures.EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockBack) { - for (int i = 0; i <= 2; i++) // hey c# what the fuck. anyway, shoot 3 proj. + for (int i = 0; i <= 2; i++) // hey c# what the fuck. anyway, shoot 3 proj. { Vector2 newVelocity = velocity.RotatedBy(MathHelper.ToRadians(3 * i)); Terraria.Projectile.NewProjectile(source, position, newVelocity, 502, damage, knockBack, player.whoAmI); } - return false; // return false to prevent tModLoader from shooting the default projectile + return false; // return false to prevent tModLoader from shooting the default projectile */ } public override Vector2? HoldoutOffset() { - return new Vector2(2f, -2f); + return new Vector2(-5f, -2f); } public override void ModifyShootStats(Player player, ref Vector2 position, ref Vector2 velocity, ref int type, ref int damage, ref float knockback) { - Vector2 muzzleOffset = Vector2.Normalize(velocity) * 25f; + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 58f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -54,15 +55,14 @@ namespace ForgottenWawiTech.Content.Items public override void AddRecipes() { + Recipe recipe = CreateRecipe(); if (ModLoader.TryGetMod("CalamityMod", out Mod calamityMod) && calamityMod.TryFind("AuricBar", out ModItem auricBar)) { - Recipe recipe = CreateRecipe(); recipe.AddIngredient(auricBar.Type, 20); } - Recipe recipe = CreateRecipe(); recipe.AddIngredient(1); recipe.AddIngredient(ItemID.LunarBar, 20); - recipe.AddIngredient(ItemID.Meowmere, 5); + recipe.AddIngredient(ItemID.Meowmere, 3); recipe.AddTile(TileID.LunarCraftingStation); recipe.Register(); } diff --git a/Content/Rarities/DeveloperItem.cs b/Content/Rarities/DeveloperItem.cs new file mode 100644 index 0000000..647062e --- /dev/null +++ b/Content/Rarities/DeveloperItem.cs @@ -0,0 +1,11 @@ +using Terraria.ModLoader; +using Terraria; +using Microsoft.Xna.Framework; + +namespace ForgottenWawiTech.Content.Rarities +{ + public class FWTDeveloperItem : ModRarity + { + public override Color RarityColor => new Color(255, 0, 255); // Bright magenta color + } +} \ No newline at end of file diff --git a/Localization/en-US_Mods.ForgottenWawiTech.hjson b/Localization/en-US_Mods.ForgottenWawiTech.hjson index dcf8f27..543aab8 100644 --- a/Localization/en-US_Mods.ForgottenWawiTech.hjson +++ b/Localization/en-US_Mods.ForgottenWawiTech.hjson @@ -21,7 +21,12 @@ Items: { } TrueNyanageddon: { - Tooltip: Why are you like this? + Tooltip: + ''' + The ultimate evolution of the Meowmere. + Mob the rainbow, taste the rainbow, transcend the rainbow. + Ethically questionable. + ''' DisplayName: True Nyanageddon } @@ -29,10 +34,10 @@ Items: { Tooltip: ''' Summons Niko. - Not consumable - 'You are about to have a bad time.' + Not consumable. + 'Until my final breath I will grind you to dust until your dust begs for death, you meainingless FUCK!' ''' - DisplayName: Niko Summon + DisplayName: Bird Thing } NeptuneSummon: { @@ -50,18 +55,18 @@ Items: { ''' Summons Lyyka. Not consumable - 'You hear several voices calling out...' + 'A strum, of a ranger.' ''' - DisplayName: Lyyka Summon + DisplayName: SLW STRIX } LexySummon: { - DisplayName: Lexy Summon + DisplayName: Expensive-looking RAM Stick Tooltip: ''' Summons Lexy. Not consumable - 'Twist their minds.' + Not edible.... I think. ''' } }