YouHaveTrouble/YHTMod
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/YHTMod.git synced 2026-05-12 05:56:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

adapt ooga booga C# code style

Browse Source
This commit is contained in:
YouHaveTrouble
2025-12-22 17:59:47 +01:00
parent ee06338f22
commit 50d7f8b0d2
11 changed files with 69 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Items/ArcaneMissile/ArcaneMissile.cs
+1 -1
View File
@@ -26,7 +26,7 @@ public class ArcaneMissile : ModItem
public override void UpdateAccessory(Player player, bool hideVisual) public override void UpdateAccessory(Player player, bool hideVisual)
{ {
player.GetModPlayer<YhtPlayer>().arcaneMissle = Item.damage; player.GetModPlayer<YhtPlayer>().ArcaneMissle = Item.damage;
base.UpdateAccessory(player, hideVisual); base.UpdateAccessory(player, hideVisual);
} }
Items/ArcaneMissile/ArcaneMissileBehavior.cs
+2 -2
View File
@@ -21,7 +21,7 @@ public class ArcaneMissileBehavior : GlobalNPC
var player = Main.LocalPlayer; var player = Main.LocalPlayer;
if (player.GetModPlayer<YhtPlayer>().arcaneMissle != 0 && projectile.DamageType == DamageClass.Magic) if (player.GetModPlayer<YhtPlayer>().ArcaneMissle != 0 && projectile.DamageType == DamageClass.Magic)
{ {
// player just crit with magic weapon while having arcane missile accessory // player just crit with magic weapon while having arcane missile accessory
var proj = Projectile.NewProjectileDirect( var proj = Projectile.NewProjectileDirect(
@@ -29,7 +29,7 @@ public class ArcaneMissileBehavior : GlobalNPC
Main.LocalPlayer.position, Main.LocalPlayer.position,
npc.position.DirectionFrom(Main.LocalPlayer.position), npc.position.DirectionFrom(Main.LocalPlayer.position),
ProjectileID.MagicMissile, ProjectileID.MagicMissile,
player.GetModPlayer<YhtPlayer>().arcaneMissle, player.GetModPlayer<YhtPlayer>().ArcaneMissle,
0, 0,
Main.LocalPlayer.whoAmI Main.LocalPlayer.whoAmI
); );
Items/CopperSwordOnAStick.cs
+8 -4
View File
@@ -5,12 +5,15 @@ using YHTMod.Projectiles.Weapons;
namespace YHTMod.Items; namespace YHTMod.Items;
public class CopperSwordOnAStick : ModItem { public class CopperSwordOnAStick : ModItem
public override void SetStaticDefaults() { {
public override void SetStaticDefaults()
{
CreativeItemSacrificesCatalog.Instance.SacrificeCountNeededByItemId[Type] = 1; CreativeItemSacrificesCatalog.Instance.SacrificeCountNeededByItemId[Type] = 1;
} }
public override void SetDefaults() { public override void SetDefaults()
{
Item.DamageType = DamageClass.Melee; Item.DamageType = DamageClass.Melee;
Item.damage = 3; Item.damage = 3;
Item.width = 80; Item.width = 80;
@@ -31,7 +34,8 @@ public class CopperSwordOnAStick : ModItem {
Item.shoot = ModContent.ProjectileType<CopperSwordOnAStickProjectile>(); Item.shoot = ModContent.ProjectileType<CopperSwordOnAStickProjectile>();
} }
public override void AddRecipes() { public override void AddRecipes()
{
CreateRecipe() CreateRecipe()
.AddIngredient(ItemID.Wood, 5) .AddIngredient(ItemID.Wood, 5)
.AddIngredient(ItemID.Rope, 5) .AddIngredient(ItemID.Rope, 5)
Items/KatanaRedo.cs
+2 -2
View File
@@ -25,8 +25,8 @@ public class KatanaRedo : GlobalItem
if (item.type != ItemID.Katana || player.altFunctionUse != 2) return null; if (item.type != ItemID.Katana || player.altFunctionUse != 2) return null;
var yhtPlayer = player.GetModPlayer<YhtPlayer>(); var yhtPlayer = player.GetModPlayer<YhtPlayer>();
if (yhtPlayer.katanaTeleportCooldown > 0) return null; if (yhtPlayer.KatanaTeleportCooldown > 0) return null;
yhtPlayer.katanaTeleportCooldown = 300; yhtPlayer.KatanaTeleportCooldown = 300;
for (var i = 0; i < Main.maxNPCs; i++) for (var i = 0; i < Main.maxNPCs; i++)
{ {
Items/MithrilPebbleOfPigSmiting.cs
+6 -3
View File
@@ -5,12 +5,15 @@ using YHTMod.Projectiles.Weapons;
namespace YHTMod.Items; namespace YHTMod.Items;
public class MithrilPebbleOfPigSmiting : ModItem { public class MithrilPebbleOfPigSmiting : ModItem
public override void SetStaticDefaults() { {
public override void SetStaticDefaults()
{
CreativeItemSacrificesCatalog.Instance.SacrificeCountNeededByItemId[Type] = 1; CreativeItemSacrificesCatalog.Instance.SacrificeCountNeededByItemId[Type] = 1;
} }
public override void SetDefaults() { public override void SetDefaults()
{
Item.DamageType = DamageClass.Ranged; Item.DamageType = DamageClass.Ranged;
Item.damage = 16; Item.damage = 16;
Item.width = 8; Item.width = 8;
Items/ToclafaneStaff.cs
+13 -7
View File
@@ -9,15 +9,18 @@ using YHTMod.Projectiles.Weapons;
namespace YHTMod.Items; namespace YHTMod.Items;
public class ToclafaneStaff : ModItem { public class ToclafaneStaff : ModItem
{
public override void SetStaticDefaults() { public override void SetStaticDefaults()
ItemID.Sets.GamepadWholeScreenUseRange[Item.type] = true; // This lets the player target anywhere on the whole screen while using a controller. {
ItemID.Sets.GamepadWholeScreenUseRange[Item.type] =
true; // This lets the player target anywhere on the whole screen while using a controller.
ItemID.Sets.LockOnIgnoresCollision[Item.type] = true; ItemID.Sets.LockOnIgnoresCollision[Item.type] = true;
CreativeItemSacrificesCatalog.Instance.SacrificeCountNeededByItemId[Type] = 1; CreativeItemSacrificesCatalog.Instance.SacrificeCountNeededByItemId[Type] = 1;
} }
public override void SetDefaults() { public override void SetDefaults()
{
Item.damage = 30; Item.damage = 30;
Item.knockBack = 3f; Item.knockBack = 3f;
Item.mana = 10; Item.mana = 10;
@@ -35,13 +38,16 @@ public class ToclafaneStaff : ModItem {
Item.shoot = ModContent.ProjectileType<ToclafaneMinion>(); Item.shoot = ModContent.ProjectileType<ToclafaneMinion>();
} }
public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) { public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity,
int type, int damage, float knockback)
{
player.AddBuff(Item.buffType, 2); player.AddBuff(Item.buffType, 2);
position = Main.MouseWorld; position = Main.MouseWorld;
return base.Shoot(player, source, position, velocity, type, damage, knockback); return base.Shoot(player, source, position, velocity, type, damage, knockback);
} }
public override void AddRecipes() { public override void AddRecipes()
{
CreateRecipe() CreateRecipe()
.AddIngredient(ItemID.GuideVoodooDoll, 1) .AddIngredient(ItemID.GuideVoodooDoll, 1)
.AddIngredient(ItemID.HallowedBar, 15) .AddIngredient(ItemID.HallowedBar, 15)
Projectiles/Weapons/CopperSwordOnAStickProjectile.cs
+9 -5
View File
@@ -6,8 +6,10 @@ using Terraria.ModLoader;
namespace YHTMod.Projectiles.Weapons; namespace YHTMod.Projectiles.Weapons;
class CopperSwordOnAStickProjectile : ModProjectile { class CopperSwordOnAStickProjectile : ModProjectile
public override void SetDefaults() { {
public override void SetDefaults()
{
Projectile.width = 80; Projectile.width = 80;
Projectile.height = 80; Projectile.height = 80;
@@ -21,10 +23,12 @@ class CopperSwordOnAStickProjectile : ModProjectile {
Projectile.aiStyle = ProjAIStyleID.ShortSword; Projectile.aiStyle = ProjAIStyleID.ShortSword;
} }
public override void AI() { public override void AI()
{
base.AI(); base.AI();
float random = (float) (Random.Shared.NextDouble() / 5f); float random = (float)(Random.Shared.NextDouble() / 5f);
Projectile.rotation = Projectile.velocity.ToRotation() + MathHelper.PiOver2 - MathHelper.PiOver4 * Projectile.spriteDirection; Projectile.rotation = Projectile.velocity.ToRotation() + MathHelper.PiOver2 -
MathHelper.PiOver4 * Projectile.spriteDirection;
Projectile.rotation += random; Projectile.rotation += random;
DrawOriginOffsetX = 0; DrawOriginOffsetX = 0;
DrawOffsetX = 0; DrawOffsetX = 0;
Projectiles/Weapons/MithrilPebbleOfPigSmitingProjectile.cs
+6 -3
View File
@@ -5,8 +5,10 @@ using Terraria.ModLoader;
namespace YHTMod.Projectiles.Weapons; namespace YHTMod.Projectiles.Weapons;
class MithrilPebbleOfPigSmitingProjectile : ModProjectile { class MithrilPebbleOfPigSmitingProjectile : ModProjectile
public override void SetDefaults() { {
public override void SetDefaults()
{
Projectile.width = 8; Projectile.width = 8;
Projectile.height = 8; Projectile.height = 8;
Projectile.friendly = true; Projectile.friendly = true;
@@ -20,7 +22,8 @@ class MithrilPebbleOfPigSmitingProjectile : ModProjectile {
Projectile.light = 0.3f; Projectile.light = 0.3f;
} }
public override void AI() { public override void AI()
{
base.AI(); base.AI();
DrawOriginOffsetX = 0; DrawOriginOffsetX = 0;
DrawOffsetX = 0; DrawOffsetX = 0;
YHTMod.cs
+3 -3
View File
@@ -2,13 +2,13 @@ using Terraria.ModLoader;
namespace YHTMod { namespace YHTMod {
public class YHTMod : Mod { public class YHTMod : Mod {
private static YHTMod mod; private static YHTMod _mod;
public YHTMod() { public YHTMod() {
mod = this; _mod = this;
} }
public static YHTMod GetInstance() { public static YHTMod GetInstance() {
return mod; return _mod;
} }
} }
} }
YHTMod.csproj
+1 -4
View File
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\tModLoader.targets" /> <Import Project="..\tModLoader.targets" />
<PropertyGroup> <PropertyGroup>
<AssemblyName>YHTMod</AssemblyName> <AssemblyName>YHTMod</AssemblyName>
<TargetFramework>net6.0</TargetFramework>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="tModLoader.CodeAssist" Version="0.1.*" />
</ItemGroup> </ItemGroup>
</Project> </Project>
YhtPlayer.cs
+10 -9
View File
@@ -3,18 +3,19 @@ using Terraria.ModLoader;
namespace YHTMod; namespace YHTMod;
public class YhtPlayer : ModPlayer { public class YhtPlayer : ModPlayer
{
public int ArcaneMissle = 0;
public int KatanaTeleportCooldown = 0;
public int arcaneMissle = 0; public override void PreUpdate()
public int katanaTeleportCooldown = 0; {
KatanaTeleportCooldown = Math.Max(KatanaTeleportCooldown - 1, 0);
public override void PreUpdate() {
this.katanaTeleportCooldown = Math.Max(this.katanaTeleportCooldown - 1, 0);
} }
public override void ResetEffects() { public override void ResetEffects()
{
this.arcaneMissle = 0; ArcaneMissle = 0;
base.ResetEffects(); base.ResetEffects();
} }