diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/effects/effects/EffectBleed.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/effects/effects/EffectBleed.java index 63a8ae5..e0f57bb 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/effects/effects/EffectBleed.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoweapons/effects/effects/EffectBleed.java @@ -39,7 +39,6 @@ public class EffectBleed extends Effect implements Listener { @NotNull final JSONConfig args) { double bleedDamage = args.getDouble("damage"); - int bleedCount = args.getInt("amount"); AtomicInteger currentBleedCount = new AtomicInteger(0); diff --git a/eco-core/core-plugin/src/main/resources/ecoweapons.json b/eco-core/core-plugin/src/main/resources/ecoweapons.json index 4563939..3743028 100644 --- a/eco-core/core-plugin/src/main/resources/ecoweapons.json +++ b/eco-core/core-plugin/src/main/resources/ecoweapons.json @@ -1,95 +1,133 @@ { "weapons": [ { - "name": "test_bow", - "conditions": [], + "name": "scythe", + "conditions": [ + { + "id": "above-health-percent", + "args": 98 + } + ], + "effects": [ + { + "id": "bleed", + "args": { + "damage": 4, + "amount": 5, + "chance": 25 + }, + "trigger": "melee_attack" + } + ], + "item": { + "material": "golden_hoe", + "displayName": "&cReaper Scythe", + "lore": [ + "&c&oCut straight through your opponents", + "&c&ofaster and stronger.", + "", + "&8» &cDeal 20% more damage", + "&8» &cAttack 15% faster", + "&8» &c25% chance to bleed enemies", + "", + "&8&oYou must be on full health to activate bleed" + ], + "attributes": [ + { + "id": "generic_attack_speed", + "amount": 0.15, + "operation": "multiply_scalar_1" + }, + { + "id": "generic_attack_damage", + "amount": 0.2, + "operation": "multiply_scalar_1" + } + ], + "unbreakable": false, + "flags": [], + "customModelData": -1, + "enchants": [ + { + "id": "sharpness", + "level": 5 + }, + { + "id": "fire_aspect", + "level": 2 + } + ], + "craftable": true, + "recipe": [ + "nether_star", + "netherite_sword", + "nether_star", + "netherite_sword", + "golden_hoe", + "netherite_sword", + "nether_star", + "netherite_sword", + "nether_star" + ] + } + }, + { + "name": "maelstrom_trident", + "conditions": [ + ], "effects": [ { "id": "arrow-storm", "args": { - "amount": 5, - "height": 5, - "radius": 2, - "cooldown": 20 + "amount": 18, + "height": 8, + "radius": 3 + }, + "trigger": "projectile_hit" + }, + { + "id": "strike-lightning", + "args": { + "amount": 3, + "chance": 10 }, "trigger": "projectile_hit" } ], "item": { - "material": "bow", - "displayName": "&9&l▶ &r&fTest Bow &9&l◀", + "material": "trident", + "displayName": "Maelstrom Trident", "lore": [ + "&3&oBox in your opponents by", + "&3&osending a swarm of arrows.", "", - "amogus" + "&8» &c10% chance to summon lightning", + "&8» &cSurround your opponent with arrows" ], "attributes": [ ], - "unbreakable": true, + "unbreakable": false, "flags": [], "customModelData": -1, "enchants": [ { - "id": "power", + "id": "impaling", "level": 5 } ], "craftable": true, "recipe": [ - "redstone_block", - "glowstone_block", - "redstone_block", + "trident", + "spectral_arrow", + "trident", - "glowstone_block", - "bow", - "glowstone_block", + "spectral_arrow", + "trident", + "spectral_arrow", - "redstone_block", - "glowstone_block", - "redstone_block" - ] - } - }, - { - "name": "railgun", - "conditions": [], - "effects": [ - { - "id": "railgun", - "args": { - "damage": 4, - "sound": "entity_llama_spit", - "particle": "smoke_normal", - "cooldown": 15 - }, - "trigger": "alt_click" - } - ], - "item": { - "material": "iron_hoe", - "displayName": "&aRailgun", - "lore": [ - "railgun innit" - ], - "attributes": [ - ], - "unbreakable": true, - "flags": [], - "customModelData": -1, - "enchants": [ - ], - "craftable": false, - "recipe": [ - "redstone_block", - "glowstone_block", - "redstone_block", - - "glowstone_block", - "iron_hoe", - "glowstone_block", - - "redstone_block", - "glowstone_block", - "redstone_block" + "trident", + "spectral_arrow", + "trident" ] } } diff --git a/gradle.properties b/gradle.properties index cca708f..b87332d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 1.0.0-beta1 +version = 0.1.0 plugin-name = EcoWeapons \ No newline at end of file