Permalink
Browse files

game: add means of death MOD_SHELL for airstrike

  • Loading branch information...
Aranud committed Feb 11, 2019
1 parent a22899c commit 8b887a37bf58ee3e6fbc8dc34f456e4d4674052b
Showing with 3 additions and 1 deletion.
  1. +2 −1 src/game/bg_misc.c
  2. +1 −0 src/game/bg_public.h
@@ -225,7 +225,7 @@ weaponTable_t weaponTable[WP_NUM_WEAPONS] =
{ WP_MORTAR2_SET, ITEM_WEAPON_MORTAR2_SET, TEAM_AXIS, SK_HEAVY_WEAPONS, WP_MORTAR2, WP_MORTAR_SET, WP_NONE, WP_MORTAR2, WP_MORTAR2, 250, 0, 0, 400, 400, WEAPON_TYPE_MORTAR | WEAPON_TYPE_SET, WEAPON_FIRING_MODE_MANUAL, WEAPON_ATTRIBUT_CHARGE_TIME, 0, 0, "GRANATWERFER", WS_MORTAR2, qtrue, qfalse, 16, 1, 1, 0, DELAY_HW, 1400, 0, 0, 0, 0, 0, 250, 250, 0, 1667, 0, { 14, 6, -4 }, 1.0f, 0, 0, 0, { 0, 0 }, { 0, 0 }, "mortar_grenade", "axis_mortar_set", WEAP_IDLE2, WEAP_ATTACK1, WEAP_ATTACK1, WEAP_ALTSWITCHFROM, WEAP_ALTSWITCHTO, WEAP_RELOAD1, WEAP_RAISE, WEAP_DROP, {.5f, .33f, .33f, .33f, .33f}, MOD_MORTAR2, MOD_MORTAR2 }, // WP_MORTAR2_SET // 52
{ WP_BAZOOKA, ITEM_WEAPON_BAZOOKA, TEAM_ALLIES, SK_HEAVY_WEAPONS, WP_NONE, WP_PANZERFAUST, WP_NONE, WP_BAZOOKA, WP_BAZOOKA, 400, 0, 0, 400, 300, WEAPON_TYPE_PANZER, WEAPON_FIRING_MODE_ONE_SHOT, WEAPON_ATTRIBUT_CHARGE_TIME | WEAPON_ATTRIBUT_SHAKE, 0, 0, "BAZOOKA", WS_BAZOOKA, qtrue, qfalse, 4, 1, 1, 0, DELAY_HW, 2000, 0, 0, 0, 0, 0, 250, 250, 250, 250, 32000.f, { 14, 10, 0 }, 1.0f, 0, 0, 0, { 0, 0 }, { 0, 0 }, "rocket", "bazooka", WEAP_IDLE1, WEAP_ATTACK1, WEAP_ATTACK_LASTSHOT, WEAP_ALTSWITCHFROM, WEAP_ALTSWITCHTO, WEAP_RELOAD1, WEAP_RAISE, WEAP_DROP, {1, .66f, .66f, .66f, .66f}, MOD_BAZOOKA, MOD_BAZOOKA }, // WP_BAZOOKA // 53
{ WP_MP34, ITEM_WEAPON_MP34, TEAM_AXIS, SK_LIGHT_WEAPONS, WP_NONE, WP_STEN, WP_NONE, WP_MP34, WP_MP34, 14, 200, 0.6f, 0, 0, WEAPON_TYPE_SMG, WEAPON_FIRING_MODE_AUTOMATIC, WEAPON_ATTRIBUT_FAST_RELOAD | WEAPON_ATTRIBUT_SILENCED | WEAPON_ATTRIBUT_KEEP_DESGUISE | WEAPON_ATTRIBUT_FALL_OFF, 0, 0, "MP 34", WS_MP34, qtrue, qtrue, 96, 1, 32, 3100, DELAY_LOW, 150, 0, 15, 1200, 450, 2000, 250, 250, 250, 250, 0, { 14, 6, -4 }, 1.0f, 0.3f, 0.6f, 0, { 0, 0 }, { 0, 0 }, "", "mp34", WEAP_IDLE1, WEAP_ATTACK1, WEAP_ATTACK_LASTSHOT, WEAP_ALTSWITCHFROM, WEAP_ALTSWITCHTO, WEAP_RELOAD1, WEAP_RAISE, WEAP_DROP, {1, 1, 1, 1, 1}, MOD_MP34, MOD_MP34 }, // WP_MP34 // 54 // Solothurn S1-100 SMG
{ WP_SHELL, ITEM_WEAPON_SHELL, TEAM_FREE, SK_SIGNALS, WP_NONE, WP_NONE, WP_NONE, WP_SHELL, WP_SHELL, 400, 0, 0, 400, 400, WEAPON_TYPE_NONE, WEAPON_FIRING_MODE_NONE, WEAPON_ATTRIBUT_CHARGE_TIME | WEAPON_ATTRIBUT_SHAKE, 0, 0, "", WS_AIRSTRIKE, qfalse, qfalse, 1, 0, 1, 0, 50, 1000, 0, 0, 0, 0, 0, 250, 250, 250, 250, 0, { 14, 6, -4 }, 1.0f, 0, 0, 0, { 0, 0 }, { 0, 0 }, "air strike", "shell", WEAP_IDLE1, WEAP_ATTACK1, WEAP_ATTACK_LASTSHOT, WEAP_ALTSWITCHFROM, WEAP_ALTSWITCHTO, WEAP_RELOAD1, WEAP_RAISE, WEAP_DROP, {1, 1, .66f, .66f, .66f}, MOD_AIRSTRIKE, MOD_AIRSTRIKE }, // WP_SHELL // 55 // airstrike shell bomb
{ WP_SHELL, ITEM_WEAPON_SHELL, TEAM_FREE, SK_SIGNALS, WP_NONE, WP_NONE, WP_NONE, WP_SHELL, WP_SHELL, 400, 0, 0, 400, 400, WEAPON_TYPE_NONE, WEAPON_FIRING_MODE_NONE, WEAPON_ATTRIBUT_CHARGE_TIME | WEAPON_ATTRIBUT_SHAKE, 0, 0, "", WS_AIRSTRIKE, qfalse, qfalse, 1, 0, 1, 0, 50, 1000, 0, 0, 0, 0, 0, 250, 250, 250, 250, 0, { 14, 6, -4 }, 1.0f, 0, 0, 0, { 0, 0 }, { 0, 0 }, "air strike", "shell", WEAP_IDLE1, WEAP_ATTACK1, WEAP_ATTACK_LASTSHOT, WEAP_ALTSWITCHFROM, WEAP_ALTSWITCHTO, WEAP_RELOAD1, WEAP_RAISE, WEAP_DROP, {1, 1, .66f, .66f, .66f}, MOD_SHELL, MOD_SHELL }, // WP_SHELL // 55 // airstrike shell bomb
};

/**
@@ -338,6 +338,7 @@ modTable_t modTable[MOD_NUM_MODS] =
{ MOD_BAZOOKA, WP_BAZOOKA, qfalse, qtrue, WEAPON_CLASS_FOR_MOD_EXPLOSIVE, qfalse, "was blasted by", "'s Bazooka", "vaporized himself", NULL, "MOD_BAZOOKA", SK_HEAVY_WEAPONS, 3.f, 3.f, {0.f, 0.f, 0.f, 0.f}, qfalse, "rocket launcher", WS_BAZOOKA },
{ MOD_BACKSTAB, WP_NONE, qfalse, qfalse, WEAPON_CLASS_FOR_MOD_NO, qtrue, "was backstabbed by", "'s knife arts", "killed himself", NULL, "MOD_BACKSTAB", SK_LIGHT_WEAPONS, 5.f, 0.f, {0.f, 0.f, 0.f, 0.f}, qfalse, "backstab", WS_KNIFE },
{ MOD_MP34, WP_MP34, qtrue, qfalse, WEAPON_CLASS_FOR_MOD_NO, qfalse, "was killed by", "'s MP 34", "killed himself", NULL, "MOD_MP34", SK_LIGHT_WEAPONS, 3.f, 0.f, {5.f, 3.f, 3.f, 3.f}, qtrue, "", WS_MP34 },
{ MOD_SHELL, WP_SMOKE_MARKER, qfalse, qtrue, WEAPON_CLASS_FOR_MOD_EXPLOSIVE, qfalse, "was blasted by", "'s support fire", "obliterated himself", NULL, "MOD_SHELL", SK_SIGNALS, 3.f, 3.f, {0.f, 0.f, 0.f, 0.f}, qfalse, "airstrike", WS_AIRSTRIKE },
};

// *INDENT-ON*
@@ -1008,6 +1008,7 @@ typedef enum
MOD_BAZOOKA,
MOD_BACKSTAB,
MOD_MP34,
MOD_SHELL,

MOD_NUM_MODS

0 comments on commit 8b887a3

Please sign in to comment.