From 850ee5803e4fd3feb06ccf60c503d970a6304b66 Mon Sep 17 00:00:00 2001 From: vizthex123 Date: Tue, 2 Jun 2020 03:41:44 -0500 Subject: [PATCH] Made everything functional Also re-balanced a few things Large Coins, fixed typo in the Magical Souls' tooltip, fixed broken build.txt Updated to latest TML version (v0.11.7.4) --- Accessories/LargeCCoin.cs | 2 +- Accessories/LargeGCoin.cs | 2 +- Accessories/LargePCoin.cs | 2 +- Accessories/LargeSCoin.cs | 2 +- Items/Souls/MagicalSoul.cs | 2 +- Properties/launchSettings.json | 14 ++++++ StrangeThings.csproj | 81 +++++++--------------------------- build.txt | 2 +- 8 files changed, 36 insertions(+), 71 deletions(-) create mode 100644 Properties/launchSettings.json diff --git a/Accessories/LargeCCoin.cs b/Accessories/LargeCCoin.cs index 2fb6f91..189dcc5 100644 --- a/Accessories/LargeCCoin.cs +++ b/Accessories/LargeCCoin.cs @@ -17,7 +17,7 @@ public override void SetDefaults() item.rare = 0; item.maxStack = 1; item.accessory = true; - item.defense = 1; + item.defense = 2; item.value = Item.sellPrice(0, 0, 0, 100); } diff --git a/Accessories/LargeGCoin.cs b/Accessories/LargeGCoin.cs index b0934b7..d984c0a 100644 --- a/Accessories/LargeGCoin.cs +++ b/Accessories/LargeGCoin.cs @@ -17,7 +17,7 @@ public override void SetDefaults() item.rare = 2; item.maxStack = 1; item.accessory = true; - item.defense = 4; + item.defense = 12; item.value = Item.sellPrice(0, 100, 0, 0); } diff --git a/Accessories/LargePCoin.cs b/Accessories/LargePCoin.cs index 1c7ab1e..264af70 100644 --- a/Accessories/LargePCoin.cs +++ b/Accessories/LargePCoin.cs @@ -17,7 +17,7 @@ public override void SetDefaults() item.rare = 3; item.maxStack = 1; item.accessory = true; - item.defense = 8; + item.defense = 20; item.value = Item.sellPrice(100, 0, 0, 0); } diff --git a/Accessories/LargeSCoin.cs b/Accessories/LargeSCoin.cs index 511127e..6f3342b 100644 --- a/Accessories/LargeSCoin.cs +++ b/Accessories/LargeSCoin.cs @@ -17,7 +17,7 @@ public override void SetDefaults() item.rare = 1; item.maxStack = 1; item.accessory = true; - item.defense = 2; + item.defense = 4; item.value = Item.sellPrice(0, 0, 100, 0); } diff --git a/Items/Souls/MagicalSoul.cs b/Items/Souls/MagicalSoul.cs index 5b0910b..f31573f 100644 --- a/Items/Souls/MagicalSoul.cs +++ b/Items/Souls/MagicalSoul.cs @@ -9,7 +9,7 @@ public class MagicalSoul : ModItem public override void SetStaticDefaults() { DisplayName.SetDefault("Magical Soul"); - Tooltip.SetDefault("The soul of a Skeleton \nCan be used for items that crunch when touched"); + Tooltip.SetDefault("The soul of a Pixie\nCan be used for items that crunch when touched"); } public override void SetDefaults() { diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json new file mode 100644 index 0000000..c335608 --- /dev/null +++ b/Properties/launchSettings.json @@ -0,0 +1,14 @@ +{ + "profiles": { + "Terraria": { + "commandName": "Executable", + "executablePath": "$(tMLPath)", + "workingDirectory": "$(TerrariaSteamPath)" + }, + "TerrariaServer": { + "commandName": "Executable", + "executablePath": "$(tMLServerPath)", + "workingDirectory": "$(TerrariaSteamPath)" + } + } +} \ No newline at end of file diff --git a/StrangeThings.csproj b/StrangeThings.csproj index d09ac50..59912d4 100644 --- a/StrangeThings.csproj +++ b/StrangeThings.csproj @@ -1,65 +1,16 @@ - - - - - Debug - AnyCPU - {8298EAB6-0586-4BDA-9483-83624B66B13A} - Library - Properties - StrangeThings - StrangeThings - v4.5.2 - 512 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - False - C:\Windows\Microsoft.NET\assembly\GAC_32\Microsoft.Xna.Framework\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.dll - - - False - C:\Windows\Microsoft.NET\assembly\GAC_32\Microsoft.Xna.Framework.Game\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Game.dll - - - False - C:\Windows\Microsoft.NET\assembly\GAC_32\Microsoft.Xna.Framework.Graphics\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Graphics.dll - - - False - C:\Windows\Microsoft.NET\assembly\GAC_32\Microsoft.Xna.Framework.Xact\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Xact.dll - - - - C:\Program Files (x86)\Steam\steamapps\common\terraria\Terraria.exe - - - - - "C:\Program Files (x86)\Steam\steamapps\common\terraria\Terraria.exe" -build "$(ProjectDir)\" -eac "$(TargetPath)" - - - + + + + + StrangeThings + net45 + x86 + 7.3 + + + + + + + + \ No newline at end of file diff --git a/build.txt b/build.txt index b845245..536a643 100644 --- a/build.txt +++ b/build.txt @@ -1,4 +1,4 @@ author = Radiance Development -version = 0.1-A +version = 1.0 displayName = Strange Things Mod homepage = https://github.com/RadianceDevelopment/StrangeThings \ No newline at end of file