Skip to content

Commit

Permalink
Revert "Revert "New damage types""
Browse files Browse the repository at this point in the history
This reverts commit 5e9a6c3.
  • Loading branch information
CafeFPS committed Oct 20, 2022
1 parent 5e9a6c3 commit 9269efd
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions vscripts/sh_damage_types.nut
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@ global enum eDamageSourceId
mp_weapon_defender
mp_weapon_softball
mp_weapon_warmachine
//mp_weapon_car //WAITING NEW CHECKSUM CHANGE
//mp_weapon_dragon_lmg //WAITING NEW CHECKSUM CHANGE
mp_weapon_car
mp_weapon_3030
mp_weapon_dragon_lmg
//
melee_pilot_emptyhanded
melee_pilot_arena
Expand Down Expand Up @@ -461,7 +462,7 @@ void function DamageTypes_Init()
[ eDamageSourceId.mp_weapon_gunship_turret ] = "#WPN_GUNSHIP_MISSILE",

[ eDamageSourceId.mp_titanability_slow_trap ] = "#DEATH_SLOW_TRAP",

[ eDamageSourceId.damagedef_suicide ] = "#DEATH_SUICIDE",
[ eDamageSourceId.rodeo ] = "#DEATH_TITAN_RODEO",
[ eDamageSourceId.rodeo_forced_titan_eject ] = "#DEATH_TITAN_RODEO",
[ eDamageSourceId.rodeo_execution ] = "#DEATH_RODEO_EXECUTION",
Expand Down Expand Up @@ -509,6 +510,7 @@ void function DamageTypes_Init()
[ eDamageSourceId.splat ] = "#DEATH_SPLAT",
[ eDamageSourceId.titan_execution ] = "#DEATH_TITAN_EXECUTION",
[ eDamageSourceId.human_execution ] = "#DEATH_HUMAN_EXECUTION",
[ eDamageSourceId.deathField ] = "#DEATH_DEATH_FIELD",
[ eDamageSourceId.outOfBounds ] = "#DEATH_OUT_OF_BOUNDS",
[ eDamageSourceId.indoor_inferno ] = "#DEATH_INDOOR_INFERNO",
[ eDamageSourceId.submerged ] = "#DEATH_SUBMERGED",
Expand Down Expand Up @@ -554,8 +556,9 @@ void function DamageTypes_Init()
[ eDamageSourceId.melee_bolo_sword ] = "Bolo Sword Melee",
[ eDamageSourceId.mp_weapon_bolo_sword_primary ] = "Bolo Sword Melee",
[ eDamageSourceId.mp_weapon_volt_smg ] = "#WPN_VOLT_SMG",
//[ eDamageSourceId.mp_weapon_car ] = "Car SMG", //WAITING NEW CHECKSUM CHANGE
//[ eDamageSourceId.mp_weapon_dragon_lmg ] = "Rampage LMG", //WAITING NEW CHECKSUM CHANGE
[ eDamageSourceId.mp_weapon_car ] = "Car SMG",
[ eDamageSourceId.mp_weapon_3030 ] = "30-30 Repeater",
[ eDamageSourceId.mp_weapon_dragon_lmg ] = "Rampage LMG",
[ eDamageSourceId.mp_ability_octane_stim ] = "#WPN_OCTANE_STIM_SHORT",

[ eDamageSourceId.mp_weapon_tesla_trap ] = "#DEATH_TESLA_TRAP"
Expand Down

0 comments on commit 9269efd

Please sign in to comment.