cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10310 from Novacat/nova-pathfinder

Browse Source 
Mecha Balance and Fighter Fixes
This commit is contained in:
Aronai Sieyes
2021-05-15 13:17:04 -04:00
committed by Chompstation Bot
parent bddfb995a2
commit 2d4853ca4f
9 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/mecha/combat/fighter.dm
View File

@@ -16,6 +16,7 @@
dir_in = null //Don't reset direction when empty
step_in = 2 //Fast
step_energy_drain = 0 //These should use fuel instead of energy
health = 400
maxhealth = 400
@@ -38,6 +39,14 @@
max_universal_equip = 1
max_special_equip = 1
starting_components = list(
/obj/item/mecha_parts/component/hull/lightweight,
/obj/item/mecha_parts/component/actuator,
/obj/item/mecha_parts/component/armor,
/obj/item/mecha_parts/component/gas,
/obj/item/mecha_parts/component/electrical
)
/obj/mecha/combat/fighter/Initialize()
. = ..()
ion_trail = new /datum/effect/effect/system/ion_trail_follow()

8
code/game/mecha/combat/fighter_vr.dm
View File

@@ -1,8 +0,0 @@
/obj/mecha/combat/fighter
starting_components = list(
/obj/item/mecha_parts/component/hull/lightweight,
/obj/item/mecha_parts/component/actuator,
/obj/item/mecha_parts/component/armor,
/obj/item/mecha_parts/component/gas,
/obj/item/mecha_parts/component/electrical
)

20
code/game/mecha/mecha.dm
View File

@@ -1450,16 +1450,28 @@
else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HURT)
var/obj/item/weapon/weldingtool/WT = W
var/obj/item/mecha_parts/component/hull/HC = internal_components[MECH_HULL]
var/obj/item/mecha_parts/component/armor/AC = internal_components[MECH_ARMOR]
if (WT.remove_fuel(0,user))
if (hasInternalDamage(MECHA_INT_TANK_BREACH))
clearInternalDamage(MECHA_INT_TANK_BREACH)
to_chat(user, "<span class='notice'>You repair the damaged gas tank.</span>")
else
return
if(src.health<initial(src.health))
to_chat(user, "<span class='notice'>You repair some damage to [src.name].</span>")
src.health += min(10, initial(src.health)-src.health)
update_damage_alerts()
if((src.health<initial(src.health)) || (HC.integrity<HC.max_integrity) || (AC.integrity<AC.max_integrity))
if(src.health<initial(src.health))
to_chat(user, "<span class='notice'>You repair some damage to [src.name].</span>")
src.health += min(10, initial(src.health)-src.health)
update_damage_alerts()
else if(HC.integrity<HC.max_integrity)
to_chat(user, "<span class='notice'>You repair some damage to [HC.name].</span>")
HC.integrity += min(10, HC.max_integrity-HC.integrity)
update_damage_alerts()
else if(AC.integrity<AC.max_integrity)
to_chat(user, "<span class='notice'>You repair some damage to [AC.name].</span>")
AC.integrity += min(10, AC.max_integrity-AC.integrity)
update_damage_alerts()
else
to_chat(user, "The [src.name] is at full integrity")
return