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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)$(MSBuildToolsVersion)\Microsoft.Common.props')" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{8298EAB6-0586-4BDA-9483-83624B66B13A}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>StrangeThings</RootNamespace> - <AssemblyName>StrangeThings</AssemblyName> - <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <PlatformTarget>AnyCPU</PlatformTarget> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <PlatformTarget>AnyCPU</PlatformTarget> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <ItemGroup> - <Compile Include="**\*.cs" /> - </ItemGroup> - <ItemGroup> - <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>C:\Windows\Microsoft.NET\assembly\GAC_32\Microsoft.Xna.Framework\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.dll</HintPath> - </Reference> - <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>C:\Windows\Microsoft.NET\assembly\GAC_32\Microsoft.Xna.Framework.Game\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Game.dll</HintPath> - </Reference> - <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>C:\Windows\Microsoft.NET\assembly\GAC_32\Microsoft.Xna.Framework.Graphics\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Graphics.dll</HintPath> - </Reference> - <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <HintPath>C:\Windows\Microsoft.NET\assembly\GAC_32\Microsoft.Xna.Framework.Xact\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Xact.dll</HintPath> - </Reference> - <Reference Include="System" /> - <Reference Include="Terraria"> - <HintPath>C:\Program Files (x86)\Steam\steamapps\common\terraria\Terraria.exe</HintPath> - </Reference> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <PropertyGroup> - <PostBuildEvent>"C:\Program Files (x86)\Steam\steamapps\common\terraria\Terraria.exe" -build "$(ProjectDir)\" -eac "$(TargetPath)"</PostBuildEvent> - </PropertyGroup> -</Project> - +<?xml version="1.0" encoding="utf-8"?> +<Project Sdk="Microsoft.NET.Sdk"> + <Import Project="..\..\references\tModLoader.targets" /> + <PropertyGroup> + <AssemblyName>StrangeThings</AssemblyName> + <TargetFramework>net45</TargetFramework> + <PlatformTarget>x86</PlatformTarget> + <LangVersion>7.3</LangVersion> + </PropertyGroup> + <Target Name="BuildMod" AfterTargets="Build"> + <Exec Command=""$(tMLBuildServerPath)" -build $(ProjectDir) -eac $(TargetPath) -define "$(DefineConstants)" -unsafe $(AllowUnsafeBlocks)" /> + </Target> + <ItemGroup> + <PackageReference Include="tModLoader.CodeAssist" Version="0.1.*" /> + </ItemGroup> +</Project> \ 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