From 465dee005ede2fdb560841189b69086264e746e7 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 23 Jan 2011 19:49:39 +0100 Subject: [PATCH] fix some weapon names --- misc/tools/WeaponEncounterProfile.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/misc/tools/WeaponEncounterProfile.pm b/misc/tools/WeaponEncounterProfile.pm index 1da3cc2b..4218be62 100644 --- a/misc/tools/WeaponEncounterProfile.pm +++ b/misc/tools/WeaponEncounterProfile.pm @@ -28,7 +28,7 @@ sub load($) /^#/ and next; /^\/\// and next; my ($addr, $map, $attackerweapon, $targweapon, $value); - if(/^(\S+)\t(\S+)\t(\d+) (\d+)\t(\d+) (\d+)\t(\d+) (\d+) (\S+)$/) + if(/^([^\t]+)\t(\S+)\t(\d+) (\d+)\t(\d+) (\d+)\t(\d+) (\d+) (\S+)$/) { # new format (Xonotic) ($addr, $map, $attackerweapon, $targweapon) = ($1, $2, $3, $5); @@ -39,13 +39,14 @@ sub load($) $ENV{WEAPONPROFILER_HITS} ? $8 : $7; } - elsif(/^(\S+)\t(\S+)\t(\d+)\t(\d+)\t(\S+)$/) + elsif(/^([^\t]+)\t(\S+)\t(\d+)\t(\d+)\t(\S+)$/) { # legacy format (Nexuiz) ($addr, $map, $attackerweapon, $targweapon, $value) = ($1, $2, $3, $4, $5); } else { + print STDERR "UNRECOGNIZED: $_\n"; next; } $targweapon = int $self->weaponid_from_name($targweapon) @@ -132,8 +133,8 @@ our %WeaponMap = ( 12 => ["MinstaNex", "minstanex"], 13 => ["Grappling Hook", "hookgun"], 14 => ["Heavy Laser Assault Cannon", "hlac"], - 15 => ["Tuba", "tuba"], - 16 => ["Camping Rifle", "campingrifle"], + 15 => ["@!#%'n Tuba", "tuba"], + 16 => ["Sniper Rifle", "sniperrifle"], 17 => ["Fireball", "fireball"], 18 => ["Seeker", "seeker"], ); -- 2.39.2