Skip to content

Commit

Permalink
Merge branch 'R2Northstar:main' into stim_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Gazyi authored Sep 4, 2024
2 parents 12de5cc + 16c1f6d commit 983883a
Showing 1 changed file with 24 additions and 22 deletions.
46 changes: 24 additions & 22 deletions Northstar.Custom/mod/scripts/vscripts/weapons/_arc_cannon.nut
Original file line number Diff line number Diff line change
Expand Up @@ -85,28 +85,30 @@ global const ARC_CANNON_BEAM_EFFECT_MOD = $"wpn_arc_cannon_beam_mod"
global const ARC_CANNON_FX_TABLE = "exp_arc_cannon"

global const ArcCannonTargetClassnames = {
[ "npc_drone" ] = true,
[ "npc_dropship" ] = true,
[ "npc_marvin" ] = true,
[ "npc_prowler" ] = true,
[ "npc_soldier" ] = true,
[ "npc_soldier_heavy" ] = true,
[ "npc_soldier_shield" ] = true,
[ "npc_spectre" ] = true,
[ "npc_stalker" ] = true,
[ "npc_super_spectre" ] = true,
[ "npc_titan" ] = true,
[ "npc_turret_floor" ] = true,
[ "npc_turret_mega" ] = true,
[ "npc_turret_sentry" ] = true,
[ "npc_frag_drone" ] = true,
[ "player" ] = true,
[ "prop_dynamic" ] = true,
[ "prop_script" ] = true,
[ "grenade_frag" ] = true,
[ "rpg_missile" ] = true,
[ "script_mover" ] = true,
[ "turret" ] = true,
[ "npc_drone" ] = true,
[ "npc_dropship" ] = true,
[ "npc_gunship" ] = true,
[ "npc_marvin" ] = true,
[ "npc_prowler" ] = true,
[ "npc_soldier" ] = true,
[ "npc_soldier_heavy" ] = true,
[ "npc_soldier_shield" ] = true,
[ "npc_pilot_elite" ] = true,
[ "npc_spectre" ] = true,
[ "npc_stalker" ] = true,
[ "npc_super_spectre" ] = true,
[ "npc_titan" ] = true,
[ "npc_turret_floor" ] = true,
[ "npc_turret_mega" ] = true,
[ "npc_turret_sentry" ] = true,
[ "npc_frag_drone" ] = true,
[ "player" ] = true,
[ "prop_dynamic" ] = true,
[ "prop_script" ] = true,
[ "grenade_frag" ] = true,
[ "rpg_missile" ] = true,
[ "script_mover" ] = true,
[ "turret" ] = true,
}

struct {
Expand Down

0 comments on commit 983883a

Please sign in to comment.