Skip to content

Commit 363da76

Browse files
SamsonAllen13SamsonAllen13
committed
1.2.2
- Updated effects for Honey Glazed Clicker, Frozen Clicker, and The Clicker to better line up with other clicker effects - Added config option for 'hold auto select' suggestion text - Increased Precursor Breastplate damage from 10% to 15%. - Changed acc effect tooltip colors
1 parent 6030e34 commit 363da76

12 files changed

Lines changed: 87 additions & 136 deletions

‎ClickerConfig.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@ public class ClickerConfigClient : ModConfig
1313

1414
[Header("General Options")]
1515

16-
[Label("Show Class Tags")]
16+
[Label("Display Class Tags")]
1717
[Tooltip("Toggle the display of class tags for items made for custom classes on the tooltip")]
1818
[DefaultValue(true)]
1919
public bool ShowClassTags = true;
20+
21+
[Label("Display 'hold auto select' text")]
22+
[Tooltip("Toggle the display of the 'Hold auto select for clicker effects' suggestion text for clicker weapons\n-The key will continue to work regardless of this toggle-")]
23+
[DefaultValue(true)]
24+
public bool ShowEffectSuggestion = true;
2025

2126
[Label("Display Custom Cursors")]
2227
[Tooltip("Toggle the display of 'Custom Cursors' for clicker weapons")]

‎Items/Accessories/ChocolateChip.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public override void SetStaticDefaults()
1313
base.SetStaticDefaults();
1414
Tooltip.SetDefault("Every 15 clicks releases a burst of damaging chocolate");
1515

16-
ClickEffect.ChocolateChip = ClickerSystem.RegisterClickEffect(mod, "ChocolateChip", "Chocolate Chip", "Releases a burst of damaging chocolate", 15, Color.Brown, delegate (Player player, Vector2 position, int type, int damage, float knockBack)
16+
ClickEffect.ChocolateChip = ClickerSystem.RegisterClickEffect(mod, "ChocolateChip", "Chocolate Chip", "Releases a burst of damaging chocolate", 15, new Color(165, 110, 60, 0), delegate (Player player, Vector2 position, int type, int damage, float knockBack)
1717
{
1818
Main.PlaySound(SoundID.Item, (int)Main.MouseWorld.X, (int)Main.MouseWorld.Y, 112);
1919
for (int k = 0; k < 6; k++)

‎Items/Accessories/StickyKeychain.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public override void SetStaticDefaults()
1212
base.SetStaticDefaults();
1313
Tooltip.SetDefault("Every 10 clicks sticks damaging slime on to your screen");
1414

15-
ClickEffect.StickyKeychain = ClickerSystem.RegisterClickEffect(mod, "StickyKeychain", "Sticky Keychain", "Sticks damaging slime on to your screen", 10, Color.White, delegate (Player player, Vector2 position, int type, int damage, float knockBack)
15+
ClickEffect.StickyKeychain = ClickerSystem.RegisterClickEffect(mod, "StickyKeychain", "Sticky Keychain", "Sticks damaging slime on to your screen", 10, new Color(145, 180, 230, 0), delegate (Player player, Vector2 position, int type, int damage, float knockBack)
1616
{
1717
Main.PlaySound(3, (int)Main.MouseWorld.X, (int)Main.MouseWorld.Y, 13);
1818
Projectile.NewProjectile(Main.MouseWorld.X, Main.MouseWorld.Y, 0f, 0f, ModContent.ProjectileType<StickyKeychainPro>(), (int)(damage * 0.5), 3f, player.whoAmI, Main.rand.Next(3));

‎Items/Armors/PrecursorBreastplate.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public override void SetStaticDefaults()
1111
{
1212
base.SetStaticDefaults();
1313
DisplayName.SetDefault("Precursor Breastplate");
14-
Tooltip.SetDefault("Increases click damage by 10%"
14+
Tooltip.SetDefault("Increases click damage by 15%"
1515
+ "\nReduces base clicker radius by 50%");
1616
}
1717

@@ -27,7 +27,7 @@ public override void SetDefaults()
2727
public override void UpdateEquip(Player player)
2828
{
2929
ClickerPlayer clickerPlayer = player.GetModPlayer<ClickerPlayer>();
30-
clickerPlayer.clickerDamage += 0.1f;
30+
clickerPlayer.clickerDamage += 0.15f;
3131
clickerPlayer.clickerRadius -= 1f;
3232
}
3333

‎Items/ClickerItemCore.cs‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,7 @@ public override void ModifyTooltips(Item item, List<TooltipLine> tooltips)
217217
if (tooltip != null)
218218
{
219219
string number = tooltip.text.Split(' ')[0];
220-
if (!clickerPlayer.HasClickEffect(ClickEffect.TheClick))
221-
{
222-
tooltip.text = $"{number} click damage";
223-
}
224-
else
225-
{
226-
tooltip.text = $"{number} + 1% enemy life click damage";
227-
}
220+
tooltip.text = $"{number} click damage";
228221
}
229222

230223
//Show the clicker's effects
@@ -265,11 +258,11 @@ public override void ModifyTooltips(Item item, List<TooltipLine> tooltips)
265258
}
266259
}
267260

268-
if (!showDesc)
261+
if (!showDesc && ClickerConfigClient.Instance.ShowEffectSuggestion)
269262
{
270263
//Add ForMoreInfo as the last line
271264
index = tooltips.FindLastIndex(tt => tt.mod.Equals("Terraria") && tt.Name.StartsWith("Tooltip"));
272-
var ttl = new TooltipLine(mod, "ForMoreInfo", $"Hold 'Auto Select' key ({key}) to show click effects")
265+
var ttl = new TooltipLine(mod, "ForMoreInfo", $"Hold 'Auto Select' key ({key}) while not auto-paused to show click effects")
273266
{
274267
overrideColor = Color.Gray
275268
};

‎Items/Weapons/Clickers/AdamantiteClicker.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public override void SetStaticDefaults()
2323
public override void SetDefaults()
2424
{
2525
base.SetDefaults();
26-
2726
SetRadius(item, 3.15f);
2827
SetColor(item, new Color(255, 25, 25, 0));
2928
SetDust(item, 50);

‎Items/Weapons/Clickers/FrozenClicker.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using ClickerClass.Projectiles;
22
using Microsoft.Xna.Framework;
3+
using Terraria;
4+
using Terraria.ID;
35
using Terraria.ModLoader;
46

57
namespace ClickerClass.Items.Weapons.Clickers
@@ -11,16 +13,18 @@ public override void SetStaticDefaults()
1113
base.SetStaticDefaults();
1214
DisplayName.SetDefault("Frozen Clicker");
1315

14-
//TODO lie because FrozenClickerPro
15-
ClickEffect.Freeze = ClickerSystem.RegisterClickEffect(mod, "Freeze", "Freeze", "Inflicts the Frozen debuff", 1, new Color(175, 255, 255, 0), null);
16+
ClickEffect.Freeze = ClickerSystem.RegisterClickEffect(mod, "Freeze", "Freeze", "Freezes enemies under your cursor, stopping them in place", 1, new Color(175, 255, 255, 0), delegate (Player player, Vector2 position, int type, int damage, float knockBack)
17+
{
18+
Projectile.NewProjectile(Main.MouseWorld.X, Main.MouseWorld.Y, 0f, 0f, ModContent.ProjectileType<FrozenClickerPro>(), 0, 0f, player.whoAmI);
19+
});
1620
}
1721

1822
public override void SetDefaults()
1923
{
2024
base.SetDefaults();
2125
SetRadius(item, 6f);
2226
SetColor(item, new Color(175, 255, 255, 0));
23-
SetDust(item, 15);
27+
SetDust(item, 92);
2428
AddEffect(item, ClickEffect.Freeze);
2529

2630
item.damage = 82;
@@ -29,7 +33,6 @@ public override void SetDefaults()
2933
item.knockBack = 1f;
3034
item.value = 500000;
3135
item.rare = 8;
32-
item.shoot = ModContent.ProjectileType<FrozenClickerPro>();
3336
}
3437
}
3538
}

‎Items/Weapons/Clickers/HoneyGlazedClicker.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ public override void SetStaticDefaults()
1313
base.SetStaticDefaults();
1414
DisplayName.SetDefault("Honey Glazed Clicker");
1515

16-
//TODO HoneyGlazedClickerPro here
17-
ClickEffect.StickyHoney = ClickerSystem.RegisterClickEffect(mod, "StickyHoney", "Sticky Honey", "Inflicts the Honey debuff, significantly slowing down enemies", 1, new Color(255, 175, 0, 0), delegate (Player player, Vector2 position, int type, int damage, float knockBack)
16+
ClickEffect.StickyHoney = ClickerSystem.RegisterClickEffect(mod, "StickyHoney", "Sticky Honey", "Covers enemies under cursor in sticky honey, slowing them", 1, new Color(255, 175, 0, 0), delegate (Player player, Vector2 position, int type, int damage, float knockBack)
1817
{
19-
18+
Projectile.NewProjectile(Main.MouseWorld.X, Main.MouseWorld.Y, 0f, 0f, ModContent.ProjectileType<HoneyGlazedClickerPro>(), 0, 0f, player.whoAmI);
2019
});
2120
}
2221

@@ -34,7 +33,6 @@ public override void SetDefaults()
3433
item.knockBack = 2f;
3534
item.value = 10000;
3635
item.rare = 3;
37-
item.shoot = ModContent.ProjectileType<HoneyGlazedClickerPro>();
3836
}
3937

4038
public override void AddRecipes()

‎Items/Weapons/Clickers/TheClicker.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
using ClickerClass.Dusts;
2+
using ClickerClass.Projectiles;
13
using Microsoft.Xna.Framework;
24
using Terraria;
5+
using Terraria.ID;
6+
using Terraria.ModLoader;
37

48
namespace ClickerClass.Items.Weapons.Clickers
59
{
@@ -10,10 +14,9 @@ public override void SetStaticDefaults()
1014
base.SetStaticDefaults();
1115
DisplayName.SetDefault("The Clicker");
1216

13-
//TODO orphaned?
14-
ClickEffect.TheClick = ClickerSystem.RegisterClickEffect(mod, "TheClick", "The Click", "Causes the clicker's attacks to additionally deal damage equal to 1% of the enemy's maximum life", 1, new Color(255, 255, 255, 0), delegate (Player player, Vector2 position, int type, int damage, float knockBack)
17+
ClickEffect.TheClick = ClickerSystem.RegisterClickEffect(mod, "TheClick", "The Click", "Deals an additional 1% of the enemy's maximum life as damage", 1, new Color(255, 255, 255, 0), delegate (Player player, Vector2 position, int type, int damage, float knockBack)
1518
{
16-
19+
Projectile.NewProjectile(Main.MouseWorld.X, Main.MouseWorld.Y, 0f, 0f, ModContent.ProjectileType<TheClickerPro>(), damage, 0f, player.whoAmI);
1720
});
1821
}
1922

‎Projectiles/FrozenClickerPro.cs‎

Lines changed: 19 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using ClickerClass.Buffs;
2+
using Microsoft.Xna.Framework;
23
using Terraria;
4+
using Terraria.ID;
35
using Terraria.ModLoader;
46

57
namespace ClickerClass.Projectiles
@@ -12,53 +14,34 @@ public override void SetDefaults()
1214
projectile.height = 30;
1315
projectile.aiStyle = -1;
1416
projectile.alpha = 255;
15-
projectile.friendly = true;
1617
projectile.tileCollide = false;
1718
projectile.penetrate = -1;
18-
projectile.timeLeft = 10;
19-
projectile.usesLocalNPCImmunity = true;
20-
projectile.localNPCHitCooldown = 10;
21-
}
22-
23-
public override void OnHitNPC(NPC target, int damage, float knockback, bool crit)
24-
{
25-
target.AddBuff(ModContent.BuffType<Frozen>(), 120, false);
19+
projectile.timeLeft = 6;
2620
}
2721

2822
public override void Kill(int timeLeft)
2923
{
3024
Player player = Main.player[projectile.owner];
31-
32-
for (int k = 0; k < 5; k++)
33-
{
34-
Dust dust = Dust.NewDustDirect(projectile.Center, 10, 10, 15, Main.rand.NextFloat(-3f, 3f), Main.rand.NextFloat(-3f, 3f), 255, default, 1.25f);
35-
dust.noGravity = true;
36-
}
37-
38-
ClickerPlayer clickerPlayer = player.GetModPlayer<ClickerPlayer>();
39-
if (clickerPlayer.accEnchantedLED2)
40-
{
41-
for (int k = 0; k < 5; k++)
42-
{
43-
Dust dust = Dust.NewDustDirect(projectile.Center, 10, 10, 90, Main.rand.NextFloat(-3f, 3f), Main.rand.NextFloat(-3f, 3f), 0, default, 1.15f);
44-
dust.noGravity = true;
45-
}
46-
}
47-
48-
if (clickerPlayer.accEnchantedLED)
25+
for (int u = 0; u < Main.maxNPCs; u++)
4926
{
50-
for (int i = 0; i < 15; i++)
27+
NPC target = Main.npc[u];
28+
if (target.CanBeChasedBy(projectile) && target.DistanceSQ(projectile.Center) < 100 * 20)
5129
{
52-
int dustType = Main.rand.Next(3);
53-
switch (dustType)
30+
target.AddBuff(ModContent.BuffType<Frozen>(), 120, false);
31+
for (int i = 0; i < 15; i++)
5432
{
55-
case 0: dustType = 15; break;
56-
case 1: dustType = 57; break;
57-
default: dustType = 58; break;
33+
int num6 = Dust.NewDust(target.position, target.width, target.height, 15, 0f, 0f, 255, default(Color), 1f);
34+
Main.dust[num6].noGravity = true;
35+
Main.dust[num6].velocity *= 0.75f;
36+
int num7 = Main.rand.Next(-50, 51);
37+
int num8 = Main.rand.Next(-50, 51);
38+
Dust dust = Main.dust[num6];
39+
dust.position.X = dust.position.X + (float)num7;
40+
Dust dust2 = Main.dust[num6];
41+
dust2.position.Y = dust2.position.Y + (float)num8;
42+
Main.dust[num6].velocity.X = -(float)num7 * 0.075f;
43+
Main.dust[num6].velocity.Y = -(float)num8 * 0.075f;
5844
}
59-
Dust dust = Dust.NewDustDirect(projectile.Center, 10, 10, dustType, Main.rand.NextFloat(-3f, 3f), Main.rand.NextFloat(-3f, 3f), 100, default, 1.5f);
60-
dust.velocity *= 1.5f;
61-
dust.noGravity = true;
6245
}
6346
}
6447
}

0 commit comments

Comments
 (0)