shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7746 from Citadel-Station-13/kevinz000-patch-9

Browse Source 
"Why did I set piercing to two instead of one" and other miscellaneous beam rifle rebalances
This commit is contained in:
nik707
2018-11-23 15:10:13 -06:00
committed by GitHub
parent 2926c2e9bd 79b4d5f663
commit fd45662aaf
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/misc/beam_rifle.dm
+18 -22
View File
@@ -29,36 +29,38 @@
ammo_type = list(/obj/item/ammo_casing/energy/beam_rifle/hitscan) ammo_type = list(/obj/item/ammo_casing/energy/beam_rifle/hitscan)
cell_type = /obj/item/stock_parts/cell/beam_rifle cell_type = /obj/item/stock_parts/cell/beam_rifle
canMouseDown = TRUE canMouseDown = TRUE
//Cit changes: beam rifle stats.
slowdown = 1
item_flags = NO_MAT_REDEMPTION | SLOWS_WHILE_IN_HAND | NEEDS_PERMIT
pin = null pin = null
var/aiming = FALSE var/aiming = FALSE
var/aiming_time = 12 var/aiming_time = 14
var/aiming_time_fire_threshold = 5 var/aiming_time_fire_threshold = 5
var/aiming_time_left = 12 var/aiming_time_left = 14
var/aiming_time_increase_user_movement = 3 var/aiming_time_increase_user_movement = 7
var/scoped_slow = 1 var/aiming_time_increase_angle_multiplier = 0.30
var/aiming_time_increase_angle_multiplier = 0.3
var/last_process = 0 var/last_process = 0
var/lastangle = 0 var/lastangle = 0
var/aiming_lastangle = 0 var/aiming_lastangle = 0
var/mob/current_user = null var/mob/current_user = null
var/list/obj/effect/projectile/tracer/current_tracers var/list/obj/effect/projectile/tracer/current_tracers
var/structure_piercing = 2 //Amount * 2. For some reason structures aren't respecting this unless you have it doubled. Probably with the objects in question's Bump() code instead of this but I'll deal with this later. var/structure_piercing = 1
var/structure_bleed_coeff = 0.7 var/structure_bleed_coeff = 0.7
var/wall_pierce_amount = 0 var/wall_pierce_amount = 0
var/wall_devastate = 0 var/wall_devastate = 0
var/aoe_structure_range = 1 var/aoe_structure_range = 1
var/aoe_structure_damage = 50 var/aoe_structure_damage = 35
var/aoe_fire_range = 2 var/aoe_fire_range = 1
var/aoe_fire_chance = 40 var/aoe_fire_chance = 100
var/aoe_mob_range = 1 var/aoe_mob_range = 1
var/aoe_mob_damage = 30 var/aoe_mob_damage = 20
var/impact_structure_damage = 60 var/impact_structure_damage = 75
var/projectile_damage = 30 var/projectile_damage = 40
var/projectile_stun = 0 var/projectile_stun = 0
var/projectile_setting_pierce = TRUE var/projectile_setting_pierce = TRUE
var/delay = 25 var/delay = 30
var/lastfire = 0 var/lastfire = 0
//ZOOMING //ZOOMING
@@ -120,14 +122,14 @@
/obj/item/gun/energy/beam_rifle/proc/handle_zooming() /obj/item/gun/energy/beam_rifle/proc/handle_zooming()
if(!zooming || !check_user()) if(!zooming || !check_user())
return return
current_user.client.change_view(world.view + zoom_target_view_increase)
zoom_current_view_increase = zoom_target_view_increase
set_autozoom_pixel_offsets_immediate(zooming_angle) set_autozoom_pixel_offsets_immediate(zooming_angle)
/obj/item/gun/energy/beam_rifle/proc/start_zooming() /obj/item/gun/energy/beam_rifle/proc/start_zooming()
if(zoom_lock == ZOOM_LOCK_OFF) if(zoom_lock == ZOOM_LOCK_OFF)
return return
zooming = TRUE zooming = TRUE
current_user.client.change_view(world.view + zoom_target_view_increase)
zoom_current_view_increase = zoom_target_view_increase
/obj/item/gun/energy/beam_rifle/proc/stop_zooming(mob/user) /obj/item/gun/energy/beam_rifle/proc/stop_zooming(mob/user)
if(zooming) if(zooming)
@@ -159,12 +161,6 @@
to_chat(user, "<span class='boldnotice'>You set \the [src] to [projectile_setting_pierce? "pierce":"impact"] mode.</span>") to_chat(user, "<span class='boldnotice'>You set \the [src] to [projectile_setting_pierce? "pierce":"impact"] mode.</span>")
aiming_beam() aiming_beam()
/obj/item/gun/energy/beam_rifle/proc/update_slowdown()
if(aiming)
slowdown = scoped_slow
else
slowdown = initial(slowdown)
/obj/item/gun/energy/beam_rifle/Initialize() /obj/item/gun/energy/beam_rifle/Initialize()
. = ..() . = ..()
fire_delay = delay fire_delay = delay