DecimationTeam/Decimation_Mod
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The bloody lunar tablet could be used at day time

Browse Source 
Fixed the sling and the slingshot
Balanced the sling and the slingshot
This commit is contained in:
FyloZ 2020-03-30 12:39:49 -04:00
parent 0ae1deed08
commit 05149c4341
5 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Content/Items/Ammo/Pebble.cs
View File

@ -10,7 +10,7 @@ namespace Decimation.Content.Items.Ammo
protected override string ItemName => "Pebble"; protected override string ItemName => "Pebble";
protected override string ItemTooltip => "For use with slings and slingshots"; protected override string ItemTooltip => "For use with slings and slingshots";
protected override string Projectile => "Pebble"; protected override string Projectile => "Pebble";
protected override int Ammo => ModContent.ItemType<Pebble>(); protected override int Ammo => item.type;
protected override int Damages => 11; protected override int Damages => 11;
protected override void InitAmmo() protected override void InitAmmo()

3
Content/Items/Misc/BloodyLunarTablet.cs
View File

@ -19,8 +19,7 @@ namespace Decimation.Content.Items.Misc
item.useTime = 20; item.useTime = 20;
item.useAnimation = 20; item.useAnimation = 20;
item.consumable = true; item.consumable = true;
item.maxStack = 1;
this.item.maxStack = 1;
} }
public override bool CanUseItem(Player player) public override bool CanUseItem(Player player)

15
Content/Items/Weapons/Sling.cs
View File

@ -1,6 +1,9 @@
using Decimation.Content.Items.Ammo;
using Decimation.Lib.Items; using Decimation.Lib.Items;
using Decimation.Lib.Util; using Decimation.Lib.Util;
using Terraria.ID; using Terraria.ID;
using Terraria.ModLoader;
using Terraria.ModLoader.Config;
namespace Decimation.Content.Items.Weapons namespace Decimation.Content.Items.Weapons
{ {
@ -8,7 +11,7 @@ namespace Decimation.Content.Items.Weapons
{ {
protected override string ItemName => "Sling"; protected override string ItemName => "Sling";
protected override string ItemTooltip => "Uses pebbles and marbles as ammo"; protected override string ItemTooltip => "Uses pebbles and marbles as ammo";
protected override DamageType DamagesType => DamageType.Ranged; protected override DamageType DamagesType => DamageType.Throw;
protected override int Damages => 9; protected override int Damages => 9;
protected override string Ammo => "Pebble"; protected override string Ammo => "Pebble";
@ -16,13 +19,13 @@ namespace Decimation.Content.Items.Weapons
{ {
item.width = 30; item.width = 30;
item.height = 22; item.height = 22;
item.useTime = 16; item.useTime = 25;
item.useAnimation = 16; item.useAnimation = 25;
item.knockBack = 6;
item.rare = Rarity.Orange.GetRarityValue(); item.rare = Rarity.Orange.GetRarityValue();
item.UseSound = SoundID.Item5; item.shootSpeed = 7.5f;
item.shootSpeed = 10f;
item.crit = 10; item.crit = 10;
item.shoot = 1;
item.useTurn = false;
} }
} }
} }

9
Content/Items/Weapons/SlingshotWood.cs
View File

@ -12,22 +12,21 @@ namespace Decimation.Content.Items.Weapons
protected override string ItemTooltip => "Uses pebbles and marbles as ammo"; protected override string ItemTooltip => "Uses pebbles and marbles as ammo";
protected override DamageType DamagesType => DamageType.Throw; protected override DamageType DamagesType => DamageType.Throw;
protected override int Damages => 7; protected override int Damages => 7;
protected override string Ammo => "Pebble";
protected override void InitWeapon() protected override void InitWeapon()
{ {
this.item.noMelee = true;
item.width = 32; item.width = 32;
item.height = 32; item.height = 32;
item.useTime = 16; item.useTime = 16;
item.useAnimation = 16; item.useAnimation = 16;
item.useStyle = 5; item.useStyle = 5;
this.item.shoot = 1; item.shoot = 1;
item.useAmmo = ModContent.ItemType<Pebble>();
item.knockBack = 6;
item.rare = Rarity.Orange.GetRarityValue(); item.rare = Rarity.Orange.GetRarityValue();
item.UseSound = SoundID.Item5; item.UseSound = SoundID.Item5;
item.shootSpeed = 10f; item.shootSpeed = 5f;
item.crit = 10; item.crit = 10;
item.useTurn = false;
} }
protected override ModRecipe GetRecipe() protected override ModRecipe GetRecipe()

6
Content/Projectiles/Pebble.cs
View File

@ -1,10 +1,5 @@
using Decimation.Content.Items.Weapons;
using Decimation.Lib.Items; using Decimation.Lib.Items;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Terraria;
using Terraria.ID; using Terraria.ID;
using Terraria.ModLoader;
namespace Decimation.Content.Projectiles namespace Decimation.Content.Projectiles
{ {
@ -23,6 +18,7 @@ namespace Decimation.Content.Projectiles
projectile.scale = 0.625f; projectile.scale = 0.625f;
projectile.aiStyle = 1; projectile.aiStyle = 1;
DamageType = DecimationWeapon.DamageType.Ranged; DamageType = DecimationWeapon.DamageType.Ranged;
projectile.knockBack = 6;
projectile.penetrate = 5; projectile.penetrate = 5;
projectile.timeLeft = 600; projectile.timeLeft = 600;
projectile.alpha = 0; projectile.alpha = 0;