Refactors telegun, mimicgun, and tempgun

This commit is contained in:
TheDZD
2016-07-22 16:08:17 -04:00
parent c2092ac2d0
commit 79d51a57da
6 changed files with 34 additions and 23 deletions
@@ -104,16 +104,15 @@
/obj/item/ammo_casing/energy/temp
projectile_type = /obj/item/projectile/temp
e_cost = 100
fire_sound = 'sound/weapons/pulse3.ogg'
var/temp = 300
/obj/item/ammo_casing/energy/temp/New()
..()
BB = null
/obj/item/ammo_casing/energy/temp/newshot(shot_temp, shot_cost)
e_cost = shot_cost
..(shot_temp)
/obj/item/ammo_casing/energy/temp/newshot()
..(temp)
/obj/item/ammo_casing/energy/meteor
projectile_type = /obj/item/projectile/meteor
@@ -231,17 +230,18 @@
..()
BB = null
/obj/item/ammo_casing/energy/teleport/newshot(teleport_target)
..()
/obj/item/ammo_casing/energy/teleport/newshot()
..(teleport_target)
/obj/item/ammo_casing/energy/mimic
projectile_type = /obj/item/projectile/mimic
fire_sound = 'sound/weapons/bite.ogg'
select_name = "gun mimic"
var/mimic_type
/obj/item/ammo_casing/energy/mimic/New()
..()
BB = null
/obj/item/ammo_casing/energy/mimic/newshot(mimic_type)
..()
/obj/item/ammo_casing/energy/mimic/newshot()
..(mimic_type)
+1 -1
View File
@@ -161,7 +161,7 @@
return 0
return 1
obj/item/weapon/gun/proc/newshot(params)
obj/item/weapon/gun/proc/newshot()
return
/obj/item/weapon/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override)
+2 -2
View File
@@ -80,13 +80,13 @@
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
return power_supply.charge >= shot.e_cost
/obj/item/weapon/gun/energy/newshot(params)
/obj/item/weapon/gun/energy/newshot()
if(!ammo_type || !power_supply)
return
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
if(power_supply.charge >= shot.e_cost) //if there's enough power in the power_supply cell...
chambered = shot //...prepare a new shot based on the current ammo type selected
chambered.newshot(params)
chambered.newshot()
return
/obj/item/weapon/gun/energy/process_chamber()
+19 -10
View File
@@ -442,6 +442,7 @@
origin_tech = "combat=3;materials=4;powerstorage=3;magnets=2"
ammo_type = list(/obj/item/ammo_casing/energy/temp)
selfcharge = 1
cell_type = /obj/item/weapon/stock_parts/cell
var/powercost = ""
@@ -461,7 +462,7 @@
return ..()
/obj/item/weapon/gun/energy/temperature/newshot()
..(temperature, e_cost)
..()
/obj/item/weapon/gun/energy/temperature/attack_self(mob/living/user as mob)
user.set_machine(src)
@@ -493,26 +494,32 @@
return
/obj/item/weapon/gun/energy/temperature/process()
..()
var/obj/item/ammo_casing/energy/temp/T = ammo_type[select]
T.temp = temperature
switch(temperature)
if(0 to 100)
e_cost = 3000
T.e_cost = 3000
powercost = "High"
if(100 to 250)
e_cost = 2000
T.e_cost = 2000
powercost = "Medium"
if(251 to 300)
e_cost = 1000
T.e_cost = 1000
powercost = "Low"
if(301 to 400)
e_cost = 2000
T.e_cost = 2000
powercost = "Medium"
if(401 to 1000)
e_cost = 3000
T.e_cost = 3000
powercost = "High"
switch(powercost)
if("High") powercostcolor = "orange"
if("Medium") powercostcolor = "green"
else powercostcolor = "blue"
if("High")
powercostcolor = "orange"
if("Medium")
powercostcolor = "green"
else
powercostcolor = "blue"
if(target_temperature != temperature)
var/difference = abs(target_temperature - temperature)
if(difference >= (10 + 40*emagged)) //so emagged temp guns adjust their temperature much more quickly
@@ -616,4 +623,6 @@
var/mimic_type = /obj/item/weapon/gun/projectile/automatic/pistol //Setting this to the mimicgun type does exactly what you think it will.
/obj/item/weapon/gun/energy/mimicgun/newshot()
..(mimic_type)
var/obj/item/ammo_casing/energy/mimic/M = ammo_type[select]
M.mimic_type = mimic_type
..()
@@ -38,4 +38,6 @@
teleport_target = L[desc]
/obj/item/weapon/gun/energy/telegun/newshot()
..(teleport_target)
var/obj/item/ammo_casing/energy/teleport/T = ammo_type[select]
T.teleport_target = teleport_target
..()
@@ -55,7 +55,7 @@
/obj/item/projectile/temp/New(loc, shot_temp)
..(loc)
if(shot_temp)
if(!isnull(shot_temp))
temperature = shot_temp
switch(temperature)
if(501 to INFINITY)