Skip to content

Commit

Permalink
Made everything functional
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
vizthex123 authored Jun 2, 2020
1 parent 07cadb5 commit 850ee58
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 71 deletions.
2 changes: 1 addition & 1 deletion Accessories/LargeCCoin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion Accessories/LargeGCoin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion Accessories/LargePCoin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion Accessories/LargeSCoin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion Items/Souls/MagicalSoul.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
14 changes: 14 additions & 0 deletions Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"profiles": {
"Terraria": {
"commandName": "Executable",
"executablePath": "$(tMLPath)",
"workingDirectory": "$(TerrariaSteamPath)"
},
"TerrariaServer": {
"commandName": "Executable",
"executablePath": "$(tMLServerPath)",
"workingDirectory": "$(TerrariaSteamPath)"
}
}
}
81 changes: 16 additions & 65 deletions StrangeThings.csproj
Original file line number Diff line number Diff line change
@@ -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="&quot;$(tMLBuildServerPath)&quot; -build $(ProjectDir) -eac $(TargetPath) -define &quot;$(DefineConstants)&quot; -unsafe $(AllowUnsafeBlocks)" />
</Target>
<ItemGroup>
<PackageReference Include="tModLoader.CodeAssist" Version="0.1.*" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
author = Radiance Development
version = 0.1-A
version = 1.0
displayName = Strange Things Mod
homepage = https://github.com/RadianceDevelopment/StrangeThings

0 comments on commit 850ee58

Please sign in to comment.