EFFECT(0, SMOKE_LARGE, "smoke_large")
-EFFECT(0, ARC_MUZZLEFLASH, "arc_muzzleflash")
+EFFECT(0, ARC_MUZZLEFLASH, "electro_muzzleflash")
EFFECT(0, BLASTER_IMPACT, "laser_impact")
EFFECT(0, BLASTER_MUZZLEFLASH, "laser_muzzleflash")
EFFECT(0, ARC_BEAM_HEAL, "arc_beam_heal")
EFFECT(0, ARC_BEAM_HEAL_IMPACT, "arc_beam_healimpact")
EFFECT(0, ARC_BEAM_HEAL_IMPACT2, "healray_impact")
-EFFECT(0, ARC_BOLT_EXPLODE, "arc_bolt_explode")
EFFECT(0, ARC_OVERHEAT, "arc_overheat")
EFFECT(0, ARC_OVERHEAT_FIRE, "arc_overheat_fire")
EFFECT(0, ARC_SMOKE, "arc_smoke")
EFFECT(0, RACER_IMPACT, "wakizashi_gun_impact")
EFFECT(0, RACER_MUZZLEFLASH, "wakizashi_gun_muzzleflash")
EFFECT(0, RACER_ROCKETLAUNCH, "wakizashi_rocket_launch")
-EFFECT(0, RACER_ROCKET_EXPLODE, "wakizashi_rocket_launch")
+EFFECT(0, RACER_ROCKET_EXPLODE, "wakizashi_rocket_explode")
EFFECT(1, RACER_ROCKET_TRAIL, "wakizashi_rocket_thrust")
EFFECT(0, SPIDERBOT_ROCKETLAUNCH, "spiderbot_rocket_launch")
EFFECT(0, TELEPORT, "teleport")
EFFECT(0, SPAWNPOINT_RED, "spawn_point_red")
-EFFECT(0, SPAWN_RED, "spawn_event_red")
EFFECT(0, SPAWNPOINT_BLUE, "spawn_point_blue")
-EFFECT(0, SPAWN_BLUE, "spawn_event_blue")
EFFECT(0, SPAWNPOINT_YELLOW, "spawn_point_yellow")
-EFFECT(0, SPAWN_YELLOW, "spawn_event_yellow")
EFFECT(0, SPAWNPOINT_PINK, "spawn_point_pink")
-EFFECT(0, SPAWN_PINK, "spawn_event_pink")
EFFECT(0, SPAWNPOINT_NEUTRAL, "spawn_point_neutral")
+entity EFFECT_SPAWNPOINT(int teamid)
+{
+ switch (teamid) {
+ case NUM_TEAM_1: return EFFECT_SPAWNPOINT_RED;
+ case NUM_TEAM_2: return EFFECT_SPAWNPOINT_BLUE;
+ case NUM_TEAM_3: return EFFECT_SPAWNPOINT_YELLOW;
+ case NUM_TEAM_4: return EFFECT_SPAWNPOINT_PINK;
+ default: return EFFECT_SPAWNPOINT_NEUTRAL;
+ }
+}
+
+EFFECT(0, SPAWN_RED, "spawn_event_red")
+EFFECT(0, SPAWN_BLUE, "spawn_event_blue")
+EFFECT(0, SPAWN_YELLOW, "spawn_event_yellow")
+EFFECT(0, SPAWN_PINK, "spawn_event_pink")
EFFECT(0, SPAWN_NEUTRAL, "spawn_event_neutral")
+entity EFFECT_SPAWN(int teamid)
+{
+ switch (teamid) {
+ case NUM_TEAM_1: return EFFECT_SPAWN_RED;
+ case NUM_TEAM_2: return EFFECT_SPAWN_BLUE;
+ case NUM_TEAM_3: return EFFECT_SPAWN_YELLOW;
+ case NUM_TEAM_4: return EFFECT_SPAWN_PINK;
+ default: return EFFECT_SPAWN_NEUTRAL;
+ }
+}
EFFECT(0, ICEORGLASS, "iceorglass")
EFFECT(0, ICEFIELD, "icefield")
EFFECT(0, SMOKE_RING, "smoke_ring")
EFFECT(0, JUMPPAD, "jumppad_activate")
EFFECT(1, BULLET, "tr_bullet")
+EFFECT(1, BULLET_WEAK, "tr_bullet_weak")
EFFECT(0, EF_FLAME, "EF_FLAME")
EFFECT(0, EF_STARDUST, "EF_STARDUST")
EFFECT(0, TE_EXPLOSION, "TE_EXPLOSION")
case NUM_TEAM_4: e = EFFECT_ROCKETMINSTA_LASER_PINK; break;
default: e = EFFECT_ROCKETMINSTA_LASER_NEUTRAL; break;
}
- if (particleeffectnum(e) < 0 || Team_TeamToNumber(teamid) == -1) { e = EFFECT_TR_NEXUIZPLASMA; }
+ if (particleeffectnum(e) < 0 || !Team_IsValidTeam(teamid)) { e = EFFECT_TR_NEXUIZPLASMA; }
return e;
}