Skip to content

Commit

Permalink
game: add shake attribute to mortar, refs #1335
Browse files Browse the repository at this point in the history
  • Loading branch information
@isRyven
isRyven committed Aug 7, 2019
1 parent 1e52029 commit 9898c3a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/game/bg_misc.c
View file
Expand Up @@ -202,7 +202,7 @@ weaponTable_t weaponTable[WP_NUM_WEAPONS] =
{ WP_GARAND_SCOPE, ITEM_WEAPON_GARAND_SCOPE, TEAM_ALLIES, SK_MILITARY_INTELLIGENCE_AND_SCOPED_WEAPONS, WP_GARAND, WP_K43_SCOPE, WP_NONE, WP_GARAND, WP_GARAND, 50, 700, 10.f, 0, 0, WEAPON_TYPE_RIFLE | WEAPON_TYPE_SCOPED, WEAPON_FIRING_MODE_SEMI_AUTOMATIC, WEAPON_ATTRIBUT_SILENCED | WEAPON_ATTRIBUT_KEEP_DESGUISE, 20, 4, "", WS_GARAND, qtrue, qtrue, 30, 1, 10, 1500, 0, 400, 0, 200, 0, 0, 0, 250, 250, 0, 0, 0, { 14, 6, -4 }, 300, { 0, 0 }, { 1.f, .5f }, "", "m1_garand_s", {1, 1, 1, 1, 1}, MOD_GARAND_SCOPE, MOD_GARAND_SCOPE }, // WP_GARAND_SCOPE // 40 // GARAND old max ammo 24 max clip size 8 start ammo 16 start clip 8
{ WP_K43_SCOPE, ITEM_WEAPON_K43_SCOPE, TEAM_AXIS, SK_MILITARY_INTELLIGENCE_AND_SCOPED_WEAPONS, WP_K43, WP_GARAND_SCOPE, WP_NONE, WP_K43, WP_K43, 50, 700, 10.f, 0, 0, WEAPON_TYPE_RIFLE | WEAPON_TYPE_SCOPED, WEAPON_FIRING_MODE_SEMI_AUTOMATIC, WEAPON_ATTRIBUT_SILENCED | WEAPON_ATTRIBUT_KEEP_DESGUISE, 20, 4, "", WS_K43, qtrue, qtrue, 30, 1, 10, 1500, 0, 400, 0, 200, 0, 0, 0, 250, 250, 0, 0, 0, { 14, 6, -4 }, 300, { 0, 0 }, { 1.f, .5f }, "", "k43", {1, 1, 1, 1, 1}, MOD_K43_SCOPE, MOD_K43_SCOPE }, // WP_K43_SCOPE // 41 // K43
{ WP_FG42SCOPE, ITEM_WEAPON_FG42SCOPE, TEAM_ALLIES, SK_LIGHT_WEAPONS, WP_FG42, WP_NONE, WP_NONE, WP_FG42, WP_FG42, 30, 200, 10.f, 0, 0, WEAPON_TYPE_SMG | WEAPON_TYPE_SCOPED, WEAPON_FIRING_MODE_AUTOMATIC, WEAPON_ATTRIBUT_NONE, 55, 55, "FG 42", WS_FG42, qtrue, qtrue, 60, 1, 20, 2000, DELAY_LOW, 400, 0, 100, 0, 0, 0, 250, 250, 0, 0, 0, { 14, 6, -4 }, 100, { .45f, .15f }, { 0, 0 }, "", "fg42", {1, 1, 1, 1, 1}, MOD_FG42SCOPE, MOD_FG42SCOPE }, // WP_FG42SCOPE // 42
{ WP_MORTAR_SET, ITEM_WEAPON_MORTAR_SET, TEAM_ALLIES, SK_HEAVY_WEAPONS, WP_MORTAR, WP_MORTAR2_SET, WP_NONE, WP_MORTAR, WP_MORTAR, 250, 0, 0, 400, 400, WEAPON_TYPE_MORTAR | WEAPON_TYPE_SET, WEAPON_FIRING_MODE_MANUAL, WEAPON_ATTRIBUT_CHARGE_TIME, 0, 0, "MORTAR", WS_MORTAR, qtrue, qfalse, 16, 1, 1, 0, DELAY_HW, 1400, 0, 0, 0, 0, 0, 250, 250, 0, 0, 0, { 14, 6, -4 }, 0, { 0, 0 }, { 0, 0 }, "mortar_grenade", "mortar_set", {.5f, .33f, .33f, .33f, .33f}, MOD_MORTAR, MOD_MORTAR }, // WP_MORTAR_SET // 43
{ WP_MORTAR_SET, ITEM_WEAPON_MORTAR_SET, TEAM_ALLIES, SK_HEAVY_WEAPONS, WP_MORTAR, WP_MORTAR2_SET, WP_NONE, WP_MORTAR, WP_MORTAR, 250, 0, 0, 400, 400, WEAPON_TYPE_MORTAR | WEAPON_TYPE_SET, WEAPON_FIRING_MODE_MANUAL, WEAPON_ATTRIBUT_CHARGE_TIME | WEAPON_ATTRIBUT_SHAKE, 0, 0, "MORTAR", WS_MORTAR, qtrue, qfalse, 16, 1, 1, 0, DELAY_HW, 1400, 0, 0, 0, 0, 0, 250, 250, 0, 0, 0, { 14, 6, -4 }, 0, { 0, 0 }, { 0, 0 }, "mortar_grenade", "mortar_set", {.5f, .33f, .33f, .33f, .33f}, MOD_MORTAR, MOD_MORTAR }, // WP_MORTAR_SET // 43
{ WP_MEDIC_ADRENALINE, ITEM_WEAPON_MEDIC_ADRENALINE, TEAM_FREE, SK_FIRST_AID, WP_NONE, WP_NONE, WP_NONE, WP_MEDIC_SYRINGE, WP_MEDIC_SYRINGE, 1, 0, 0, 0, 0, WEAPON_TYPE_SYRINGUE, WEAPON_FIRING_MODE_MANUAL | WEAPON_FIRING_MODE_ONE_SHOT, WEAPON_ATTRIBUT_FIRE_UNDERWATER | WEAPON_ATTRIBUT_CHARGE_TIME | WEAPON_ATTRIBUT_KEEP_DESGUISE, 0, 0, "ADRENALINE", WS_MAX, qtrue, qfalse, 10, 1, 1, 1500, 50, 1000, 0, 0, 0, 0, 0, 250, 250, 0, 0, 0, { 14, 6, -4 }, 0, { 0, 0 }, { 0, 0 }, "", "adrenaline", {1, 1, 1, 1, 1}, MOD_SYRINGE, MOD_SYRINGE }, // WP_MEDIC_ADRENALINE // 44
{ WP_AKIMBO_SILENCEDCOLT, ITEM_WEAPON_AKIMBO_SILENCED_COLT, TEAM_ALLIES, SK_LIGHT_WEAPONS, WP_NONE, WP_AKIMBO_SILENCEDLUGER, WP_COLT, WP_COLT, WP_AKIMBO_COLT, 18, 600, 0.4f, 0, 0, WEAPON_TYPE_PISTOL, WEAPON_FIRING_MODE_SEMI_AUTOMATIC, WEAPON_ATTRIBUT_AKIMBO | WEAPON_ATTRIBUT_SILENCED | WEAPON_ATTRIBUT_KEEP_DESGUISE | WEAPON_ATTRIBUT_FALL_OFF, 0, 0, "SLNCD AKIMBO COLTS", WS_COLT, qtrue, qtrue, 48, 1, 8, 2700, DELAY_PISTOL, 200, 0, 20, 0, 0, 0, 250, 250, 0, 0, 0, { 14, -6, -4 }, 100, { .45f, .15f }, { 0, 0 }, "", "akimbo_silenced_colt", {1, 1, 1, 1, 1}, MOD_AKIMBO_SILENCEDCOLT, MOD_AKIMBO_SILENCEDCOLT }, // WP_AKIMBO_SILENCEDCOLT // 45
{ WP_AKIMBO_SILENCEDLUGER, ITEM_WEAPON_AKIMBO_SILENCED_LUGER, TEAM_AXIS, SK_LIGHT_WEAPONS, WP_NONE, WP_AKIMBO_SILENCEDCOLT, WP_LUGER, WP_LUGER, WP_AKIMBO_LUGER, 18, 600, 0.4f, 0, 0, WEAPON_TYPE_PISTOL, WEAPON_FIRING_MODE_SEMI_AUTOMATIC, WEAPON_ATTRIBUT_AKIMBO | WEAPON_ATTRIBUT_SILENCED | WEAPON_ATTRIBUT_KEEP_DESGUISE | WEAPON_ATTRIBUT_FALL_OFF, 0, 0, "SLNCD AKIMBO LUGERS", WS_LUGER, qtrue, qtrue, 48, 1, 8, 2700, DELAY_PISTOL, 200, 0, 20, 0, 0, 0, 250, 250, 0, 0, 0, { 14, -6, -4 }, 100, { .45f, .15f }, { 0, 0 }, "", "akimbo_silenced_luger", {1, 1, 1, 1, 1}, MOD_AKIMBO_SILENCEDLUGER, MOD_AKIMBO_SILENCEDLUGER }, // WP_AKIMBO_SILENCEDLUGER // 46
Expand All @@ -212,7 +212,7 @@ weaponTable_t weaponTable[WP_NUM_WEAPONS] =
{ WP_MOBILE_BROWNING, ITEM_WEAPON_MOBILE_BROWNING, TEAM_ALLIES, SK_HEAVY_WEAPONS, WP_MOBILE_BROWNING_SET, WP_MOBILE_MG42, WP_NONE, WP_MOBILE_BROWNING, WP_MOBILE_BROWNING, 18, 2500, 0.9f, 0, 0, WEAPON_TYPE_MG | WEAPON_TYPE_SETTABLE, WEAPON_FIRING_MODE_AUTOMATIC, WEAPON_ATTRIBUT_NONE, 0, 0, "MOBILE BROWNING", WS_BROWNING, qtrue, qtrue, 450, 1, 150, 3000, DELAY_LOW, 66, 0, 20, 1500, 300, 2000, 250, 250, 1250, 1722, 4000.f, { 14, 6, -4 }, 200, { .75f, .2f }, { 1.f, .25f }, "", "browning", {1, 1, 1, 1, 1}, MOD_MOBILE_BROWNING, MOD_MOBILE_BROWNING }, // WP_MOBILE_BROWNING // 49
{ WP_MOBILE_BROWNING_SET, ITEM_WEAPON_MOBILE_BROWNING_SET, TEAM_ALLIES, SK_HEAVY_WEAPONS, WP_MOBILE_BROWNING, WP_MOBILE_MG42_SET, WP_NONE, WP_MOBILE_BROWNING, WP_MOBILE_BROWNING, 18, 2500, 0.9f, 0, 0, WEAPON_TYPE_MG | WEAPON_TYPE_SET, WEAPON_FIRING_MODE_AUTOMATIC, WEAPON_ATTRIBUT_NONE, 55, 55, "MOBILE BROWNING", WS_BROWNING, qtrue, qtrue, 450, 1, 150, 3000, DELAY_LOW, 66, 0, 20, 1500, 300, 2000, 250, 250, 0, 0, 0, { 14, 6, -4 }, 0, { 0, 0 }, { 0, 0 }, "", "browning", {1, 1, 1, 1, 1}, MOD_MOBILE_BROWNING, MOD_MOBILE_BROWNING }, // WP_MOBILE_BROWNING_SET // 50
{ WP_MORTAR2, ITEM_WEAPON_MORTAR2, TEAM_AXIS, SK_HEAVY_WEAPONS, WP_MORTAR2_SET, WP_MORTAR, WP_NONE, WP_MORTAR2, WP_MORTAR2, 1, 0, 0, 0, 0, WEAPON_TYPE_MORTAR | WEAPON_TYPE_SETTABLE, WEAPON_FIRING_MODE_MANUAL, WEAPON_ATTRIBUT_NONE, 0, 0, "GRANATWERFER", WS_MORTAR2, qtrue, qfalse, 15, 1, 1, 0, DELAY_HW, 1600, 0, 0, 0, 0, 0, 250, 250, 1667, 1000, 0, { 14, 6, -4 }, 0, { 0, 0 }, { 0, 0 }, "", "axis_mortar", {1, 1, 1, 1, 1}, MOD_MORTAR2, MOD_MORTAR2 }, // WP_MORTAR2 // 51
{ 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, 0, 0, { 14, 6, -4 }, 0, { 0, 0 }, { 0, 0 }, "mortar_grenade", "axis_mortar_set", {.5f, .33f, .33f, .33f, .33f}, MOD_MORTAR2, MOD_MORTAR2 }, // WP_MORTAR2_SET // 52
{ 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 | WEAPON_ATTRIBUT_SHAKE, 0, 0, "GRANATWERFER", WS_MORTAR2, qtrue, qfalse, 16, 1, 1, 0, DELAY_HW, 1400, 0, 0, 0, 0, 0, 250, 250, 0, 0, 0, { 14, 6, -4 }, 0, { 0, 0 }, { 0, 0 }, "mortar_grenade", "axis_mortar_set", {.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, 0, 0, 32000.f, { 14, 10, 0 }, 0, { 0, 0 }, { 0, 0 }, "rocket", "bazooka", {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, 0, 0, 0, { 14, 6, -4 }, 0, { 0, 0 }, { 0, 0 }, "", "mp34", {1, 1, 1, 1, 1}, MOD_MP34, MOD_MP34 }, // WP_MP34 // 54 // Solothurn S1-100 SMG
{ WP_AIRSTRIKE, ITEM_WEAPON_AIRSTRIKE, TEAM_FREE, SK_SIGNALS, WP_NONE, WP_NONE, WP_NONE, WP_AIRSTRIKE, WP_AIRSTRIKE, 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, 0, 0, 0, { 14, 6, -4 }, 0, { 0, 0 }, { 0, 0 }, "air strike", "airstrike", {1, 1, .66f, .66f, .66f}, MOD_AIRSTRIKE, MOD_AIRSTRIKE }, // WP_AIRSTRIKE // 55 // airstrike shell bomb
Expand Down

0 comments on commit 9898c3a

Please sign in to comment.