From 6fcdc690a9387803c514c22204c2385cc639d230 Mon Sep 17 00:00:00 2001 From: Ilysen Date: Sun, 11 Aug 2019 15:50:02 -0400 Subject: [PATCH] 1.0.18.5 --- Items/Armor/AuromechanicalSet.cs | 14 ++++--- Items/Armor/StarbrassSet.cs | 2 +- Items/AuraAegis.cs | 2 +- Items/AuralTether.cs | 9 ++--- Items/AurelianHarness.cs | 2 +- Items/AuricSteel.png | Bin 0 -> 1571 bytes Items/AuricSteelWaraxe.cs | 50 +++++++++++++++++++++++ Items/AuricSteelWaraxe.png | Bin 0 -> 1536 bytes Items/StabilizedHarness.cs | 2 +- Items/StarbrassHamaxe.cs | 49 ++++++++++++++++++++++ Items/StarbrassHamaxe.png | Bin 0 -> 476 bytes Items/StarbrassPickaxe.cs | 67 +++++++++++++++++++++++++++++++ Items/StarbrassPickaxe.png | Bin 0 -> 444 bytes Items/Weapons/AuricGunshell.cs | 2 +- Items/_Ingredients.cs | 32 ++++++++++++++- README.md | 12 +++++- build.txt | 2 +- 17 files changed, 226 insertions(+), 19 deletions(-) create mode 100644 Items/AuricSteel.png create mode 100644 Items/AuricSteelWaraxe.cs create mode 100644 Items/AuricSteelWaraxe.png create mode 100644 Items/StarbrassHamaxe.cs create mode 100644 Items/StarbrassHamaxe.png create mode 100644 Items/StarbrassPickaxe.cs create mode 100644 Items/StarbrassPickaxe.png diff --git a/Items/Armor/AuromechanicalSet.cs b/Items/Armor/AuromechanicalSet.cs index 2a62192..1ecb1be 100644 --- a/Items/Armor/AuromechanicalSet.cs +++ b/Items/Armor/AuromechanicalSet.cs @@ -1,6 +1,4 @@ -using Microsoft.Xna.Framework; using Terraria; -using Terraria.ID; using Terraria.ModLoader; namespace Thaumaturgy.Items.Armor @@ -53,10 +51,14 @@ public override void UpdateEquip(Player player) public override void AddRecipes() { + // NOTE FOR CODE READERS. + // IT'S "GogglesofRevealing", NOT "GogglesOfRevealing" + // THIS TOOK ME AN HOUR TO FIND OUT WHY THE RECIPE WASN'T WORKING AND I WAS TEARING MY HAIR OUT. + // I HOPE IT WAS WORTH IT. ModRecipe recipe = new ModRecipe(mod); - recipe.AddIngredient(mod.ItemType("GogglesOfRevealing")); + recipe.AddIngredient(mod.ItemType("GogglesofRevealing")); recipe.AddIngredient(mod.ItemType("StarbrassMask")); - recipe.AddIngredient(ItemID.Meteorite, 10); + recipe.AddIngredient(mod.ItemType("AuricSteel"), 3); recipe.AddIngredient(mod.ItemType("AuricShard"), 5); recipe.SetResult(this); recipe.AddTile(mod.TileType("Thaumatrestle")); @@ -93,7 +95,7 @@ public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); recipe.AddIngredient(mod.ItemType("StarbrassBreastplate")); - recipe.AddIngredient(ItemID.Meteorite, 20); + recipe.AddIngredient(mod.ItemType("AuricSteel"), 9); recipe.AddIngredient(mod.ItemType("AuricCore")); recipe.SetResult(this); recipe.AddTile(mod.TileType("Thaumatrestle")); @@ -130,7 +132,7 @@ public override void AddRecipes() { ModRecipe recipe = new ModRecipe(mod); recipe.AddIngredient(mod.ItemType("StarbrassGreaves")); - recipe.AddIngredient(ItemID.Meteorite, 15); + recipe.AddIngredient(mod.ItemType("AuricSteel"), 6); recipe.AddIngredient(mod.ItemType("AuricShard"), 5); recipe.SetResult(this); recipe.AddTile(mod.TileType("Thaumatrestle")); diff --git a/Items/Armor/StarbrassSet.cs b/Items/Armor/StarbrassSet.cs index 59ddbf2..6cbc0ee 100644 --- a/Items/Armor/StarbrassSet.cs +++ b/Items/Armor/StarbrassSet.cs @@ -8,7 +8,7 @@ public class StarbrassMask : ModItem { public override void SetStaticDefaults() { - DisplayName.SetDefault("Starbrass Helmet"); + DisplayName.SetDefault("Starbrass Mask"); Tooltip.SetDefault("Mana usage reduced by 10%"); } diff --git a/Items/AuraAegis.cs b/Items/AuraAegis.cs index 0865d08..6ecf46c 100644 --- a/Items/AuraAegis.cs +++ b/Items/AuraAegis.cs @@ -18,7 +18,7 @@ public override void SetDefaults() { item.width = 24; item.height = 28; - item.value = Item.sellPrice(0, 25, 0, 0); + item.value = Item.sellPrice(0, 5, 0, 0); item.rare = 9; item.accessory = true; item.defense = 6; diff --git a/Items/AuralTether.cs b/Items/AuralTether.cs index 52f4c33..d290633 100644 --- a/Items/AuralTether.cs +++ b/Items/AuralTether.cs @@ -7,7 +7,6 @@ namespace Thaumaturgy.Items { public class AuralTether : ModItem { - private Vector2 pseudoNull = new Vector2(0, 0); private Vector2 markedPoint; public override void SetStaticDefaults() @@ -31,19 +30,19 @@ public override void SetDefaults() item.maxStack = 1; item.consumable = false; item.noMelee = true; - markedPoint = pseudoNull; + markedPoint = default; } public override bool UseItem(Player player) { if(player.altFunctionUse == 2) { - markedPoint = pseudoNull; + markedPoint = default; Main.NewText("Tether point reset.", 135, 115, 255); Main.PlaySound(SoundID.Item73.WithVolume(0.5f), player.Center); return true; } - if (markedPoint == pseudoNull) + if (markedPoint == default) { Main.NewText("Tether point marked.", 135, 115, 255); markedPoint = player.position; @@ -54,7 +53,7 @@ public override bool UseItem(Player player) Main.NewText("The tether yanks you through space and time.", 135, 115, 255); player.Teleport(markedPoint); Main.PlaySound(SoundID.Item74.WithVolume(0.5f), player.Center); - markedPoint = pseudoNull; + markedPoint = default; } return true; } diff --git a/Items/AurelianHarness.cs b/Items/AurelianHarness.cs index f1b3a2b..95b4e25 100644 --- a/Items/AurelianHarness.cs +++ b/Items/AurelianHarness.cs @@ -20,7 +20,7 @@ public override void SetDefaults() { item.width = 22; item.height = 20; - item.value = Item.sellPrice(0, 10, 0, 0); + item.value = Item.sellPrice(0, 1, 0, 0); item.rare = 3; item.accessory = true; item.defense = 1; diff --git a/Items/AuricSteel.png b/Items/AuricSteel.png new file mode 100644 index 0000000000000000000000000000000000000000..166121d562e4a50fc704cb4dc6b79deb5bd0e46f GIT binary patch literal 1571 zcmeAS@N?(olHy`uVBq!ia0vp^azHG>!3HGXX8P_2QjEnx?oJHr&dIz4aySb-B8wRq zxP?KOkzv*x2?hohmCTTck_cZPtK|G#y~LFKq*T3%+ybC#1_ql7D* z7iAWdWaj57fXq!y$}cUkRZ;?31P2gzmSmOrNrwBXptL9l?5C7u{nVV)+|<01VxT@ltkwa;7OoM+krjyr5X-=U2=SW@$mLc+ zsm1v@rJx`P&C4vYGqM4D2wfNvA`o59`MCu}sl~-WZFZ(mEy!Z%>LU==*qOuZKo&&T z;9ryp^l2i;q38AY7TN8<}#>fQO8YBrMjVZ}i#idDEsmUcsu?37XaN2iDOxH&e zw$aC`+6I^stbFrRGSezu5=&C;j0_Adbqy?lD8$gh%D}?P3>XP$YLHw2l5s9dO)SYT z3dzsUu><=e7sORC*0az9#yGkPsAd~|P(DJ+SCC8#76s;7J1(G3SP5XqRsG`b2Vj9R z!_&nv#Dn+jRBLZ$N0HXvCBZ_A6on=oVi)2Ty?7~IHA;h{DdDmHC;f<Gubdrnfc+7(ClK zxqbh&g5C8QlU;W`idwZk-DB2^+!f*(>^YzQd*A8Fsm=9HX|0Kjs@!Sn(YajRZ0dKZ z<~x!b>mSXU*vqSb>f@nH9b017c-AZNUWs^Yyx8;Qxp&*HNES+5a?s^zKUos;@#4d+ zQ*LQ~kUDWf*!hG-*@}N*fv02*`*PZ!M61r7J3q1O%akGPL=6L?%%s=u{>=~);s;bWp5Q) z&K&sKbSLzh$4>QQg*uZaZGQ7_-jrF+Uc9`&8yiY@tS`A5H~-J}C+X)TH@$ zgv!=aJZCiZ?#%bdR8Vf)5S2eCZT5u16~;;bL+qy%EozrZ-?;w0PRoRg_q7xs2c{pX n>n&`$_2liOjq}!?>#%3IwQ6a_1CQIFf}X+C)z4*}Q$iB}UotIG literal 0 HcmV?d00001 diff --git a/Items/AuricSteelWaraxe.cs b/Items/AuricSteelWaraxe.cs new file mode 100644 index 0000000..6e46d01 --- /dev/null +++ b/Items/AuricSteelWaraxe.cs @@ -0,0 +1,50 @@ +using Terraria; +using Terraria.ID; +using Terraria.ModLoader; + +namespace Thaumaturgy.Items +{ + public class AuricSteelWaraxe : ModItem + { + public override void SetStaticDefaults() + { + DisplayName.SetDefault("Auric Steel Waraxe"); + Tooltip.SetDefault("Deals magic damage"); + } + + public override void SetDefaults() + { + item.damage = 28; + item.magic = true; + item.autoReuse = true; + item.useTurn = true; + item.knockBack = 7; + item.width = 38; + item.height = 34; + item.useTime = 15; + item.useAnimation = 24; + item.useStyle = 1; + item.axe = 10; + item.scale = 1.3f; + item.value = Item.sellPrice(0, 0, 40, 0); + item.rare = 1; + item.crit = 20; + item.maxStack = 1; + item.UseSound = SoundID.Item1; + } + + public override void AddRecipes() + { + ModRecipe recipe = new ModRecipe(mod); + recipe.AddIngredient(mod.ItemType("Starbrass"), 15); + recipe.AddRecipeGroup("Wood", 5); + recipe.AddIngredient(mod.ItemType("AuricCore")); + recipe.AddIngredient(mod.ItemType("AuricShard"), 5); + recipe.AddIngredient(ItemID.MeteorHamaxe); + recipe.AddTile(mod.TileType("Thaumatrestle")); + recipe.AddTile(mod.TileType("SynthesisFocus")); + recipe.SetResult(this); + recipe.AddRecipe(); + } + } +} \ No newline at end of file diff --git a/Items/AuricSteelWaraxe.png b/Items/AuricSteelWaraxe.png new file mode 100644 index 0000000000000000000000000000000000000000..28ea01ef9e4b280078951359081ec6cf900a53af GIT binary patch literal 1536 zcmeAS@N?(olHy`uVBq!ia0vp^YCtTXQ2>tmIipR1RclAn~SSCLx)RL#I(Q(*;U=BAb;Dpcg= zfKjI1nLzvjMr> zDk!x$Kc^HF1fhAEC3Z$OU=N`SBSHkC%Q-){peVJt7^uz86siST3|)N$!Wuhsm>tN1 z=o%{Ka=e1w#*Aej~{3e2^3TtJ<$62Ok@WwQBN1_s6= zPZ!6K2+rh`1wsK6%>MP~TxnjOE;;e%l1(!`t~%&{75T~a#3RB(G^J$Gj>gG)8D`hMxS9)POSQC$=p0E@w5@UGnN~I}SDUfD zqq|bgV#$$~sRzHT-d=vtM802QM%YwS_RH_>Z5da8-=fLz`C{io>7*BSd;k7W=@RJS z=hmE&G9{e9r*o>@KE-3_wfiP*`!;7zpAgdvMON=>jjjy^Y`Gm1V?P~sIu&u5|IPi) z*UcMW_Ro)RI@@w`@$;ZB2Li88WZ^z|Nj7nxjYe2d%jIu1Im`jc&a!+7qUsR>fkeka(uEKkhj zj+Hsq{?txFey&`VqFbKF!ryaZ{$1cSjPMYQ_M0fJ)bfS*pMbQEA}jaFgVISGCLFrz u)$p_7-j@gbh7lbCS{D;vW%%;n5@2QsH0UfTWA)AimC2s2elF{r5}E*1$Nypg literal 0 HcmV?d00001 diff --git a/Items/StabilizedHarness.cs b/Items/StabilizedHarness.cs index 23abdf5..d368222 100644 --- a/Items/StabilizedHarness.cs +++ b/Items/StabilizedHarness.cs @@ -20,7 +20,7 @@ public override void SetDefaults() { item.width = 22; item.height = 20; - item.value = Item.sellPrice(0, 50, 0, 0); + item.value = Item.sellPrice(0, 5, 0, 0); item.rare = 6; item.accessory = true; item.defense = 1; diff --git a/Items/StarbrassHamaxe.cs b/Items/StarbrassHamaxe.cs new file mode 100644 index 0000000..b22dd40 --- /dev/null +++ b/Items/StarbrassHamaxe.cs @@ -0,0 +1,49 @@ +using Terraria; +using Terraria.ID; +using Terraria.ModLoader; + +namespace Thaumaturgy.Items +{ + public class StarbrassHamaxe : ModItem + { + public override void SetStaticDefaults() + { + DisplayName.SetDefault("Starbrass Hamaxe"); + Tooltip.SetDefault("Deals magic damage"); + } + + public override void SetDefaults() + { + item.damage = 20; + item.magic = true; + item.autoReuse = true; + item.useTurn = true; + item.knockBack = 7; + item.width = 38; + item.height = 34; + item.useTime = 15; + item.useAnimation = 30; + item.useStyle = 1; + item.hammer = 70; + item.axe = 40; + item.value = Item.sellPrice(0, 0, 10, 0); + item.rare = 2; + item.maxStack = 1; + item.UseSound = SoundID.Item1; + } + + public override void AddRecipes() + { + ModRecipe recipe = new ModRecipe(mod); + recipe.AddIngredient(mod.ItemType("Starbrass"), 15); + recipe.AddRecipeGroup("Wood", 5); + recipe.AddIngredient(mod.ItemType("AuricCore")); + recipe.AddIngredient(mod.ItemType("AuricShard"), 5); + recipe.AddIngredient(ItemID.MeteorHamaxe); + recipe.AddTile(mod.TileType("Thaumatrestle")); + recipe.AddTile(mod.TileType("SynthesisFocus")); + recipe.SetResult(this); + recipe.AddRecipe(); + } + } +} \ No newline at end of file diff --git a/Items/StarbrassHamaxe.png b/Items/StarbrassHamaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..0045d182b0473548474498aa35d4e689579e29e1 GIT binary patch literal 476 zcmV<20VDp2P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0dYx0K~z{r?Up}F z!$26uFLicu(F#IG?dCuH09v7g1@|Jl`3*!W2#Pp52yTKnI_cKp2N11JwvHW&#of7F z;kkPRUs}$jt>$8XkUY7NT;Rvun>SDcVsUaz+e=XWX!kXD%4Y27+ZatfJ>OwWmKHXU zQOzaKm^9U@KO#w?c#IqwbD3(@%=qD@hPx&X=<~$jpY5^(+ZN%pq!7p zIiY=hFp}k(*vd^KX(~OpjI7?ABWZGFK8vKm+v^gN&wm-iIfg_wMkc26 z-zGR*dqvWWG)2-`V~G4eW9zFY7?WretSJdYK~r8VhTR$bYHC z)t~uiEUKwN;g7Mfb!u3|*O=Trg_$<;uS}8n8)Fy1Uffk@hK)aKjEszRMX3(tr_z?T S!DPPx0000!lvI6;>1s;*b3=G`DAk4@xYmNj^L!hUNV@QO1a*Be`3=f02ZHlPvxj- z*d{bA&`z|wzhej6ndz5|m@mJ0aC2+0z%Q+qb8l|2E=yzx@8J0-(7@=Fsc_F%>Qoa0 zw{orqH&cRQlbn#VItvG51jo*-Pt8ArHrXUdv4Mq|<(NXs9VYCzWI3+ZWT|KAWZ zuq|JYq_8n(utCwmxYI)+iLI8K>2Z5gAl7@Smr2af* z*jm%am!N2vaf?}EpQ8Ev$=qyqED427%>Rn&51Op4>-|htws@(A fMnNGa9v%j3&Z?)z3}s2c5NGgo^>bP0l+XkKfAO8- literal 0 HcmV?d00001 diff --git a/Items/Weapons/AuricGunshell.cs b/Items/Weapons/AuricGunshell.cs index 6766c94..1c56a91 100644 --- a/Items/Weapons/AuricGunshell.cs +++ b/Items/Weapons/AuricGunshell.cs @@ -9,7 +9,7 @@ public class AuricGunshell : ModItem public override void SetStaticDefaults() { DisplayName.SetDefault("Auric Gunshell"); - Tooltip.SetDefault("An infinite source of ethereal bullets\nNo knockback, but can pierce"); + Tooltip.SetDefault("An infinite source of ethereal bullets\nVery low knockback, but can pierce"); } public override void SetDefaults() diff --git a/Items/_Ingredients.cs b/Items/_Ingredients.cs index 7754a12..879b64e 100644 --- a/Items/_Ingredients.cs +++ b/Items/_Ingredients.cs @@ -75,7 +75,7 @@ public class Starbrass : ModItem public override void SetStaticDefaults() { DisplayName.SetDefault("Starbrass"); - Tooltip.SetDefault("A strong, mana-conductive alloy\nPioneered by a thaumaturge from an ancient land"); + Tooltip.SetDefault("A strong, mana-conductive metal\nPioneered by a thaumaturge from an ancient land"); } public override void SetDefaults() @@ -88,6 +88,36 @@ public override void SetDefaults() } } + public class AuricSteel : ModItem + { + public override void SetStaticDefaults() + { + DisplayName.SetDefault("Auric Steel"); + Tooltip.SetDefault("Starbrass melded with other materials\nStronger, but less conductive to mana"); + } + + public override void SetDefaults() + { + item.width = 30; + item.height = 24; + item.maxStack = 999; + item.value = Item.sellPrice(0, 0, 10, 0); + item.rare = 1; + } + + public override void AddRecipes() + { + ModRecipe recipe = new ModRecipe(mod); + recipe.AddIngredient(ItemID.Meteorite); + recipe.AddIngredient(mod.ItemType("Starbrass")); + recipe.AddRecipeGroup("IronBar"); + recipe.SetResult(this); + recipe.AddTile(mod.TileType("Thaumatrestle")); + recipe.AddTile(mod.TileType("SynthesisFocus")); + recipe.AddRecipe(); + } + } + public class TreatedFlask : ModItem { public override void SetStaticDefaults() diff --git a/README.md b/README.md index b6ff5e5..73dea79 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,21 @@ You are free to decompile, modify etc. this mod under the MIT License. The mod i * **Xhuis** - Code, sprites. * **Ilysen** - Code, sprites, and writing after 1.0.15.0. -* **Flaqzar** - Sprites for the Starbrass armor set. +* **Flaqzar** - Sprites for the starbrass armor set, starbrass tools, auric steel, and auric steel tools. * **Re-Logic** - Terraria, and the sprites I used as reference/basis for Thaumaturgy's! # Changelog +### Aug. 11, 2019 + +#### 1.0.18.5 + +* Rebalanced the value of tools and accessories to not make reforging wholly unfeasible. +* Added the Starbrass Pickaxe and Starbrass Hamaxe. Both deal magic damage instead of melee damage! +* Corrected the Auric Gunshell's tooltip stating that it had no knockback; guns would add knockback to it in spite of it having no innate knockback. +* Added Auric Steel. Make it with starbrass, meteorite, and iron or lead bars. It's included in the recipe for auromechanical armor, and can be used to make the Auric Steel Waraxe. +* Added the Auric Steel Waraxe, which is a pre-Hardmode melee weapon with high critical chance and deals magic damage. + ### Aug. 10, 2019 #### 1.0.18.4 diff --git a/build.txt b/build.txt index 2a14289..db11d0f 100644 --- a/build.txt +++ b/build.txt @@ -1,4 +1,4 @@ author = Ilysen -version = 1.0.18.4 +version = 1.0.18.5 displayName = Thaumaturgy homepage = https://forums.terraria.org/index.php?threads/avas-mods-thaumaturgy-challenge-runes-yabssm.81892/ \ No newline at end of file