Skip to content

Commit

Permalink
mod: fix adrenaline animations, fixes #1634
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aciz @rmarquis
Aciz authored and rmarquis committed Apr 9, 2021
1 parent 8af6d96 commit 4cff173
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion etmain/models/multiplayer/adrenaline/weapon.cfg
View file
Expand Up @@ -22,7 +22,7 @@ newfmt

37 15 12 0 0 0 0 // ATTACK1
0 1 15 0 0 0 0 // ATTACK2
1 13 15 0 0 0 0 // ATTACKLASTSHOT
37 15 12 0 0 0 0 // ATTACKLASTSHOT

51 4 15 0 0 0 0 // DROP
31 5 15 0 0 0 0 // RAISE
Expand Down
2 changes: 1 addition & 1 deletion src/game/bg_misc.c
View file
Expand Up @@ -206,7 +206,7 @@ weaponTable_t weaponTable[WP_NUM_WEAPONS] =
{ 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_FG42_SCOPE, ITEM_WEAPON_FG42_SCOPE, 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_FG42_SCOPE // 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 | 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_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, 0, 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
{ WP_MOBILE_MG42_SET, ITEM_WEAPON_MOBILE_MG42_SET, TEAM_AXIS, SK_HEAVY_WEAPONS, WP_MOBILE_MG42, WP_MOBILE_BROWNING_SET, WP_NONE, WP_MOBILE_MG42, WP_MOBILE_MG42, 18, 2500, 0.9f, 0, 0, WEAPON_TYPE_MG | WEAPON_TYPE_SET, WEAPON_FIRING_MODE_AUTOMATIC, WEAPON_ATTRIBUT_NONE, 55, 55, "MOBILE MG 42", WS_MG42, 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 }, "", "mg42", {1, 1, 1, 1, 1}, MOD_MOBILE_MG42, MOD_MOBILE_MG42 }, // WP_MOBILE_MG42_SET // 47
Expand Down

0 comments on commit 4cff173

Please sign in to comment.