Skip to content
Permalink
Browse files

game: remove mod with scoped weapon

TODO :
* Fix obituary message with scoped weapon
* Fix skill point type with scoped weapon
  • Loading branch information...
Aranud committed Jul 1, 2019
1 parent d666e9e commit ad7f19c006e8c1845aca09ac585848da1e635091
Showing with 4 additions and 10 deletions.
  1. +0 −3 src/game/bg_misc.c
  2. +4 −7 src/game/bg_public.h
@@ -250,7 +250,6 @@ modTable_t modTable[MOD_NUM_MODS] =
{ MOD_GARAND, WP_GARAND, qtrue, qfalse, WEAPON_CLASS_FOR_MOD_NO, qfalse, "was killed by", "'s Garand", "killed himself", NULL, "MOD_GARAND", SK_LIGHT_WEAPONS, 3.f, 0.f, {5.f, 3.f, 3.f, 3.f}, qtrue, "", WS_GARAND },

{ MOD_FG42, WP_FG42, qtrue, qfalse, WEAPON_CLASS_FOR_MOD_NO, qfalse, "was killed by", "'s FG 42", "killed himself", NULL, "MOD_FG42", SK_LIGHT_WEAPONS, 3.f, 0.f, {5.f, 3.f, 3.f, 3.f}, qtrue, "", WS_FG42 },
//{ MOD_FG42SCOPE, WP_FG42SCOPE, qtrue, qfalse, WEAPON_CLASS_FOR_MOD_NO, qfalse, "was sniped by", "'s FG 42", "killed himself", NULL, "MOD_FG42SCOPE", SK_LIGHT_WEAPONS, 3.f, 0.f, {5.f, 3.f, 3.f, 3.f}, qtrue, "", WS_FG42 },
{ MOD_PANZERFAUST, WP_PANZERFAUST, qfalse, qtrue, WEAPON_CLASS_FOR_MOD_EXPLOSIVE, qfalse, "was blasted by", "'s Panzerfaust", "vaporized himself", NULL, "MOD_PANZERFAUST", SK_HEAVY_WEAPONS, 3.f, 3.f, {0.f, 0.f, 0.f, 0.f}, qfalse, "rocket launcher", WS_PANZERFAUST },
{ MOD_GRENADE_LAUNCHER, WP_GRENADE_LAUNCHER, qfalse, qtrue, WEAPON_CLASS_FOR_MOD_EXPLOSIVE, qfalse, "was exploded by", "'s grenade", "dove on his own grenade", NULL, "MOD_GRENADE_LAUNCHER", SK_LIGHT_WEAPONS, 3.f, 3.f, {0.f, 0.f, 0.f, 0.f}, qfalse, "hand grenade", WS_GRENADE },
{ MOD_FLAMETHROWER, WP_FLAMETHROWER, qfalse, qfalse, WEAPON_CLASS_FOR_MOD_NO, qtrue, "was cooked by", "'s flamethrower", "played with fire", NULL, "MOD_FLAMETHROWER", SK_HEAVY_WEAPONS, 3.f, 3.f, {0.f, 0.f, 0.f, 0.f}, qfalse, "flamethrower", WS_FLAMETHROWER },
@@ -287,14 +286,12 @@ modTable_t modTable[MOD_NUM_MODS] =

{ MOD_SMOKEBOMB, WP_SMOKE_BOMB, qfalse, qfalse, WEAPON_CLASS_FOR_MOD_NO, qfalse, "was killed by", "", "killed himself", NULL, "MOD_SMOKEBOMB", SK_NUM_SKILLS, 0.f, 0.f, {0.f, 0.f, 0.f, 0.f}, qfalse, "", WS_MAX },
{ MOD_MOBILE_MG42, WP_MOBILE_MG42, qfalse, qfalse, WEAPON_CLASS_FOR_MOD_NO, qfalse, "was mown down by", "'s Mobile MG 42", "killed himself", NULL, "MOD_MOBILE_MG42", SK_HEAVY_WEAPONS, 3.f, 0.f, {0.f, 0.f, 0.f, 0.f}, qfalse, "mobile machinegun", WS_MG42 },
//{ MOD_GARAND_SCOPE, WP_GARAND_SCOPE, qtrue, qfalse, WEAPON_CLASS_FOR_MOD_NO, qfalse, "was silenced by", "'s Garand", "killed himself", NULL, "MOD_GARAND_SCOPE", SK_MILITARY_INTELLIGENCE_AND_SCOPED_WEAPONS, 3.f, 0.f, {5.f, 3.f, 3.f, 3.f}, qtrue, "", WS_GARAND },

{ MOD_CRUSH_CONSTRUCTION, WP_PLIERS, qfalse, qfalse, WEAPON_CLASS_FOR_MOD_NO, qtrue, "got caught in", "'s construction madness", "engineered himself into oblivion", NULL, "MOD_CRUSH_CONSTRUCTION", SK_NUM_SKILLS, 0.f, 0.f, {0.f, 0.f, 0.f, 0.f}, qfalse, "", WS_MAX },
{ MOD_CRUSH_CONSTRUCTIONDEATH, WP_PLIERS, qfalse, qfalse, WEAPON_CLASS_FOR_MOD_NO, qtrue, "got burried under", "'s rubble", "buried himself alive", NULL, "MOD_CRUSH_CONSTRUCTIONDEATH", SK_NUM_SKILLS, 0.f, 0.f, {0.f, 0.f, 0.f, 0.f}, qfalse, "", WS_MAX },
{ MOD_CRUSH_CONSTRUCTIONDEATH_NOATTACKER, WP_PLIERS, qfalse, qfalse, WEAPON_CLASS_FOR_MOD_NO, qtrue, "was killed by", "", "killed himself", "got buried under a pile of rubble", "MOD_CRUSH_CONSTRUCTIONDEATH_NOATTACKER", SK_NUM_SKILLS, 0.f, 0.f, {0.f, 0.f, 0.f, 0.f}, qfalse, "", WS_MAX },

{ MOD_K43, WP_K43, qtrue, qfalse, WEAPON_CLASS_FOR_MOD_NO, qfalse, "was killed by", "'s K43", "killed himself", NULL, "MOD_K43", SK_LIGHT_WEAPONS, 3.f, 0.f, {5.f, 3.f, 3.f, 3.f}, qtrue, "", WS_K43 },
//{ MOD_K43_SCOPE, WP_K43_SCOPE, qtrue, qfalse, WEAPON_CLASS_FOR_MOD_NO, qfalse, "was silenced by", "'s K43", "killed himself", NULL, "MOD_K43_SCOPE", SK_MILITARY_INTELLIGENCE_AND_SCOPED_WEAPONS, 3.f, 0.f, {5.f, 3.f, 3.f, 3.f}, qtrue, "", WS_K43 },

{ MOD_MORTAR, WP_MORTAR, qfalse, qtrue, WEAPON_CLASS_FOR_MOD_EXPLOSIVE, qfalse, "never saw", "'s mortar round coming", "never saw his own mortar round coming", NULL, "MOD_MORTAR", SK_HEAVY_WEAPONS, 3.f, 3.f, {0.f, 0.f, 0.f, 0.f}, qfalse, "mortar", WS_MORTAR },

@@ -933,7 +933,6 @@ typedef enum
MOD_GARAND,

MOD_FG42,
MOD_FG42SCOPE,
MOD_PANZERFAUST,
MOD_GRENADE_LAUNCHER,
MOD_FLAMETHROWER,
@@ -970,14 +969,12 @@ typedef enum

MOD_SMOKEBOMB,
MOD_MOBILE_MG42,
MOD_GARAND_SCOPE,

MOD_CRUSH_CONSTRUCTION,
MOD_CRUSH_CONSTRUCTIONDEATH,
MOD_CRUSH_CONSTRUCTIONDEATH_NOATTACKER,

MOD_K43,
MOD_K43_SCOPE,

MOD_MORTAR,

@@ -1193,10 +1190,10 @@ typedef struct modtable_s

int weaponClassForMOD; ///< g
int noYellMedic; ///< g
const char *obituaryKillMessage1; ///< g
const char *obituaryKillMessage2; ///< g
const char *obituarySelfKillMessage; ///< g
const char *obituaryNoAttackerMessage; ///< g
const char *obituaryKillMessage1; ///< cg
const char *obituaryKillMessage2; ///< cg
const char *obituarySelfKillMessage; ///< cg
const char *obituaryNoAttackerMessage; ///< cg
const char *modName; ///< g - These are just for logging, the client prints its own messages
skillType_t skillType; ///< g
float defaultKillPoints; ///< g

0 comments on commit ad7f19c

Please sign in to comment.
You can’t perform that action at this time.