Skip to content

Commit

Permalink
Adds proper rarities to items
Browse files Browse the repository at this point in the history
  • Loading branch information
shnakamura committed Sep 11, 2024
1 parent 0116e29 commit cd854d5
Show file tree
Hide file tree
Showing 52 changed files with 231 additions and 20 deletions.
2 changes: 1 addition & 1 deletion build/Aurora.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Import Project="C:\Program Files (x86)\Steam\steamapps\common\tModLoader\tMLMod.targets" />
<Import Project="..\..\tModLoader.targets" />

<Import Project="Aurora.Publicizer.targets"/>
<Import Project="Aurora.Usings.targets"/>
Expand Down
16 changes: 16 additions & 0 deletions scripts/gen-shaders.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
set "CompilerPath=%~dp0..\src\Aurora\Assets\Effects\Compiler\fxc"
set "EffectsPath=%~dp0..\src\Aurora\Assets\Effects\"

if not exist "%CompilerPath%" (
echo "ERROR: Compiler does not exist: %CompilerPath%"
pause
exit /b 1
)

if not exist "%EffectsPath%" (
echo "ERROR: Effects directory does not exist: %CompilerPath%"
pause
exit /b 1
)

pause
5 changes: 2 additions & 3 deletions setup.bat → scripts/gen-symlinks.bat
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
set "SourcePath=%~dp0src\Aurora"
set "SourcePath=%~dp0..\src\Aurora"
set "TargetPath=%USERPROFILE%\Documents\My Games\Terraria\tModLoader\ModSources\Aurora"

if not exist "%SourcePath%" (
echo "ERROR: Source directory does not exist: %SourcePath%"
pause
exit /b 1
)

set "TargetPath=%USERPROFILE%\Documents\My Games\Terraria\tModLoader\ModSources\Aurora"

mklink /D "%TargetPath%" "%SourcePath%"

if %ERRORLEVEL% equ 1 (
Expand Down
2 changes: 1 addition & 1 deletion src/Aurora/Assets/Effects/Outline.fx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ float4 Outline(float2 coords : TEXCOORD0) : COLOR0
}

if (found) {
return float4(uColor.r, uColor.g, uColor.b, 1);
return float4(uColor.r, uColor.g, uColor.b, uOpacity);
}

return color;
Expand Down
Binary file modified src/Aurora/Assets/Effects/Outline.fxc
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 src/Aurora/Assets/Textures/Items/Everbloom/Flora.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/Aurora/Aurora.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,8 @@
<AdditionalFiles Include="**\*.footstep" />
</ItemGroup>

<ItemGroup>
<Folder Include="Content\Projectiles\Explosives\" />
</ItemGroup>

</Project>
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Daggers/CopperDaggerItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public override void SetDefaults() {

Item.shootSpeed = 2f;
Item.shoot = ModContent.ProjectileType<CopperDaggerProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Daggers/GoldDaggerItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public override void SetDefaults() {

Item.shootSpeed = 3f;
Item.shoot = ModContent.ProjectileType<GoldDaggerProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Daggers/IronDaggerItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public override void SetDefaults() {

Item.shootSpeed = 2.2f;
Item.shoot = ModContent.ProjectileType<IronDaggerProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Daggers/LeadDaggerItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public override void SetDefaults() {

Item.shootSpeed = 2.4f;
Item.shoot = ModContent.ProjectileType<LeadDaggerProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Daggers/PlatinumDaggerItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public override void SetDefaults() {

Item.shootSpeed = 3.5f;
Item.shoot = ModContent.ProjectileType<PlatinumDaggerProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Daggers/SilverDaggerItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public override void SetDefaults() {

Item.shootSpeed = 2.6f;
Item.shoot = ModContent.ProjectileType<SilverDaggerProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Daggers/TinDaggerItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public override void SetDefaults() {

Item.shootSpeed = 2f;
Item.shoot = ModContent.ProjectileType<TinDaggerProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Daggers/TungstenDaggerItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public override void SetDefaults() {

Item.shootSpeed = 2.8f;
Item.shoot = ModContent.ProjectileType<TungstenDaggerProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
15 changes: 15 additions & 0 deletions src/Aurora/Content/Items/Everbloom/BloomRose.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
namespace Aurora.Content.Items.Everbloom;

public class BloomRose : ModItem
{
public override void SetDefaults() {
base.SetDefaults();

Item.maxStack = Item.CommonMaxStack;

Item.width = 26;
Item.height = 26;

Item.rare = ItemRarityID.Blue;
}
}
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Everbloom/EverbloomHeadgearItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@ public override void SetDefaults() {

Item.width = 30;
Item.height = 22;

Item.rare = ItemRarityID.Blue;
}
}
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Everbloom/EverbloomHoodItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@ public override void SetDefaults() {

Item.width = 22;
Item.height = 20;

Item.rare = ItemRarityID.Blue;
}
}
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Everbloom/EverbloomLeggingsItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@ public override void SetDefaults() {

Item.width = 26;
Item.height = 18;

Item.rare = ItemRarityID.Blue;
}
}
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Everbloom/EverbloomMantleItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@ public override void SetDefaults() {

Item.width = 34;
Item.height = 18;

Item.rare = ItemRarityID.Blue;
}
}
6 changes: 2 additions & 4 deletions src/Aurora/Content/Items/Explosives/DirtDynamiteItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ public class DirtDynamiteItem : ModItem
{
public override void SetDefaults() {
base.SetDefaults();

Item.maxStack = Item.CommonMaxStack;

Item.consumable = true;

Item.CloneDefaults(ItemID.Dynamite);

Item.width = 18;
Item.height = 38;
Expand Down
9 changes: 4 additions & 5 deletions src/Aurora/Content/Items/Explosives/StickyDirtDynamiteItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ public class StickyDirtDynamiteItem : ModItem
{
public override void SetDefaults() {
base.SetDefaults();

Item.maxStack = Item.CommonMaxStack;

Item.consumable = true;

Item.CloneDefaults(ItemID.StickyDynamite);

Item.width = 18;
Item.height = 38;
Expand All @@ -17,8 +15,9 @@ public override void AddRecipes() {
base.AddRecipes();

CreateRecipe()
.AddIngredient(ItemID.StickyDynamite)
.AddIngredient(ItemID.Dynamite)
.AddIngredient(ItemID.DirtBlock, 50)
.AddIngredient(ItemID.Gel)
.Register();

CreateRecipe()
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Guns/BigIronItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public override void SetDefaults() {
Item.useAmmo = AmmoID.Bullet;
Item.shootSpeed = 8f;
Item.shoot = ProjectileID.PurificationPowder;

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 1 addition & 1 deletion src/Aurora/Content/Items/Miscellaneous/StoneBootsItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public override void SetDefaults() {

public override void UpdateAccessory(Player player, bool hideVisual) {
base.UpdateAccessory(player, hideVisual);

if (!player.controlDown) {
return;
}
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Tomahawks/CopperTomahawkItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public override void SetDefaults() {

Item.shootSpeed = 10f;
Item.shoot = ModContent.ProjectileType<CopperTomahawkProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Tomahawks/GoldTomahawkItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public override void SetDefaults() {

Item.shootSpeed = 13f;
Item.shoot = ModContent.ProjectileType<GoldTomahawkProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Tomahawks/IronTomahawkItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public override void SetDefaults() {

Item.shootSpeed = 11f;
Item.shoot = ModContent.ProjectileType<IronTomahawkProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Tomahawks/LeadTomahawkItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public override void SetDefaults() {

Item.shootSpeed = 9f;
Item.shoot = ModContent.ProjectileType<LeadTomahawkProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Tomahawks/PlatinumTomahawkItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public override void SetDefaults() {

Item.shootSpeed = 13f;
Item.shoot = ModContent.ProjectileType<PlatinumTomahawkProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Tomahawks/SilverTomahawkItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public override void SetDefaults() {

Item.shootSpeed = 12f;
Item.shoot = ModContent.ProjectileType<SilverTomahawkProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Tomahawks/TinTomahawkItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public override void SetDefaults() {

Item.shootSpeed = 11f;
Item.shoot = ModContent.ProjectileType<TinTomahawkProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Tomahawks/TungstenTomahawkItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public override void SetDefaults() {

Item.shootSpeed = 10f;
Item.shoot = ModContent.ProjectileType<TungstenTomahawkProjectile>();

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Wildlife/BarkBallistaItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public override void SetDefaults() {
Item.useAmmo = AmmoID.Arrow;
Item.shootSpeed = 8f;
Item.shoot = ProjectileID.WoodenArrowFriendly;

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Wildlife/WildAxeItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public override void SetDefaults() {
Item.useAnimation = 28;
Item.UseSound = SoundID.Item1;
Item.useStyle = ItemUseStyleID.Swing;

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Wildlife/WildHammerItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public override void SetDefaults() {
Item.useAnimation = 30;
Item.UseSound = SoundID.Item1;
Item.useStyle = ItemUseStyleID.Swing;

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Wildlife/WildNatureItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ public override void SetDefaults() {
Item.useAnimation = 21;
Item.UseSound = SoundID.Item1;
Item.useStyle = ItemUseStyleID.Swing;

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
2 changes: 2 additions & 0 deletions src/Aurora/Content/Items/Wildlife/WildPickaxeItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public override void SetDefaults() {
Item.useAnimation = 22;
Item.UseSound = SoundID.Item1;
Item.useStyle = ItemUseStyleID.Swing;

Item.rare = ItemRarityID.Blue;
}

public override void AddRecipes() {
Expand Down
8 changes: 8 additions & 0 deletions src/Aurora/Content/Items/Wildlife/WildWariorGarbItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ public override void SetDefaults() {
Item.height = 22;

Item.defense = 2;

Item.rare = ItemRarityID.Blue;
}

public override void UpdateEquip(Player player) {
base.UpdateEquip(player);

player.GetCritChance(DamageClass.Generic) += 0.01f;
}

public override void AddRecipes() {
Expand Down
8 changes: 8 additions & 0 deletions src/Aurora/Content/Items/Wildlife/WildWarriorGreavesItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ public override void SetDefaults() {
Item.height = 16;

Item.defense = 1;

Item.rare = ItemRarityID.Blue;
}

public override void UpdateEquip(Player player) {
base.UpdateEquip(player);

player.moveSpeed += 0.05f;
}

public override void AddRecipes() {
Expand Down
Loading

0 comments on commit cd854d5

Please sign in to comment.