From 5ce066a21ef6380d1502006468a581cfb33a61dd Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Sun, 26 Jan 2020 17:18:09 +1100 Subject: [PATCH 1/5] Altering the effects of the ebow to hopefully make it not terrible --- .../modules/projectiles/projectile/energy/ebow.dm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/projectile/energy/ebow.dm b/code/modules/projectiles/projectile/energy/ebow.dm index d3f5162bf6..a26ee93b31 100644 --- a/code/modules/projectiles/projectile/energy/ebow.dm +++ b/code/modules/projectiles/projectile/energy/ebow.dm @@ -4,9 +4,18 @@ damage = 8 damage_type = TOX nodamage = 0 - knockdown = 100 - stutter = 5 - drowsy = 50 + stamina = 60 + eyeblur = 10 + knockdown = 10 + slur = 5 + +/obj/item/projectile/energy/bolt/on_hit(atom/target, blocked = FALSE) + . = ..() + if(iscarbon(target)) + var/mob/living/carbon/C = target + var/obj/item/I = C.get_active_held_item() + if(I && C.dropItemToGround(I)) + to_chat(C, "Your arm goes limp, and you drop what you're holding!") /obj/item/projectile/energy/bolt/halloween name = "candy corn" From 8e489a77263e2980ad404c40ff9eb0bafb894ae6 Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Mon, 27 Jan 2020 10:41:27 +1100 Subject: [PATCH 2/5] Hopefully I put in the override correctly --- code/modules/projectiles/projectile/energy/ebow.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/projectile/energy/ebow.dm b/code/modules/projectiles/projectile/energy/ebow.dm index a26ee93b31..34d7fb2589 100644 --- a/code/modules/projectiles/projectile/energy/ebow.dm +++ b/code/modules/projectiles/projectile/energy/ebow.dm @@ -6,8 +6,10 @@ nodamage = 0 stamina = 60 eyeblur = 10 - knockdown = 10 slur = 5 + var/hardstun_ds = 0 + var/softstun_ds = 1 + var/stam_dmg = 0 /obj/item/projectile/energy/bolt/on_hit(atom/target, blocked = FALSE) . = ..() @@ -16,6 +18,7 @@ var/obj/item/I = C.get_active_held_item() if(I && C.dropItemToGround(I)) to_chat(C, "Your arm goes limp, and you drop what you're holding!") + C.Knockdown(softstun_ds, TRUE, FALSE, hardstun_ds, stam_dmg) /obj/item/projectile/energy/bolt/halloween name = "candy corn" From 5e7b7143de0068575eda945e023497f3b43e2c1e Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Mon, 27 Jan 2020 11:48:56 +1100 Subject: [PATCH 3/5] Additional adjustments, added more damage to the mini ebow becaues I forgot to do that originally and made large ebows bulky and heavy weapons --- code/modules/projectiles/guns/energy/special.dm | 3 ++- code/modules/projectiles/projectile/energy/ebow.dm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index eeb272f8d9..f84079645d 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -107,10 +107,11 @@ name = "energy crossbow" desc = "A reverse engineered weapon using syndicate technology." icon_state = "crossbowlarge" - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_BULKY materials = list(MAT_METAL=4000) suppressed = null ammo_type = list(/obj/item/ammo_casing/energy/bolt/large) + weapon_weight = WEAPON_HEAVY pin = null /obj/item/gun/energy/plasmacutter diff --git a/code/modules/projectiles/projectile/energy/ebow.dm b/code/modules/projectiles/projectile/energy/ebow.dm index 34d7fb2589..41ed6dfcf1 100644 --- a/code/modules/projectiles/projectile/energy/ebow.dm +++ b/code/modules/projectiles/projectile/energy/ebow.dm @@ -1,7 +1,7 @@ /obj/item/projectile/energy/bolt //ebow bolts name = "bolt" icon_state = "cbbolt" - damage = 8 + damage = 15 damage_type = TOX nodamage = 0 stamina = 60 From f9d6a9b9c49ebb04f849f363d486a9d5eb48daf8 Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Wed, 29 Jan 2020 14:23:50 +1100 Subject: [PATCH 4/5] Added the tweaks suggested by kevin but good fucking lord this changes a lot and also fuck the pka reload proc --- code/modules/projectiles/guns/energy/special.dm | 3 ++- .../projectiles/projectile/energy/ebow.dm | 16 +++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index f84079645d..f0b38f2d4e 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -105,7 +105,7 @@ /obj/item/gun/energy/kinetic_accelerator/crossbow/large name = "energy crossbow" - desc = "A reverse engineered weapon using syndicate technology." + desc = "A reverse engineered weapon using syndicate technology. This thing seems incredibly unwieldly, and seems to be using similar internals to the Proto-Kinetic Accelerator. It might not play nice when brought near weapons similar to it." icon_state = "crossbowlarge" w_class = WEIGHT_CLASS_BULKY materials = list(MAT_METAL=4000) @@ -113,6 +113,7 @@ ammo_type = list(/obj/item/ammo_casing/energy/bolt/large) weapon_weight = WEAPON_HEAVY pin = null + unique_frequency = FALSE /obj/item/gun/energy/plasmacutter name = "plasma cutter" diff --git a/code/modules/projectiles/projectile/energy/ebow.dm b/code/modules/projectiles/projectile/energy/ebow.dm index 41ed6dfcf1..47aff5fb24 100644 --- a/code/modules/projectiles/projectile/energy/ebow.dm +++ b/code/modules/projectiles/projectile/energy/ebow.dm @@ -4,21 +4,11 @@ damage = 15 damage_type = TOX nodamage = 0 - stamina = 60 eyeblur = 10 slur = 5 - var/hardstun_ds = 0 - var/softstun_ds = 1 - var/stam_dmg = 0 - -/obj/item/projectile/energy/bolt/on_hit(atom/target, blocked = FALSE) - . = ..() - if(iscarbon(target)) - var/mob/living/carbon/C = target - var/obj/item/I = C.get_active_held_item() - if(I && C.dropItemToGround(I)) - to_chat(C, "Your arm goes limp, and you drop what you're holding!") - C.Knockdown(softstun_ds, TRUE, FALSE, hardstun_ds, stam_dmg) + knockdown = 160 + stamina = 0 + knockdown_stamoverride = 60 /obj/item/projectile/energy/bolt/halloween name = "candy corn" From 66862db7ab45d6b86e2f112495a7d6fd62bf404e Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Sat, 1 Feb 2020 14:07:23 +1100 Subject: [PATCH 5/5] Last change to this, now the damage is respected by energy armor --- code/modules/projectiles/projectile/energy/ebow.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/projectile/energy/ebow.dm b/code/modules/projectiles/projectile/energy/ebow.dm index 47aff5fb24..9e2992b76b 100644 --- a/code/modules/projectiles/projectile/energy/ebow.dm +++ b/code/modules/projectiles/projectile/energy/ebow.dm @@ -7,8 +7,8 @@ eyeblur = 10 slur = 5 knockdown = 160 - stamina = 0 - knockdown_stamoverride = 60 + stamina = 60 + knockdown_stamoverride = 0 /obj/item/projectile/energy/bolt/halloween name = "candy corn"