1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-07 21:59:49 -05:00

SMR: replace M14

This commit is contained in:
Jbleezy 2023-12-30 22:00:13 -08:00
parent 8a768056a2
commit 8e0edc4861
18 changed files with 141 additions and 21 deletions

View File

@ -184,8 +184,15 @@
* Upgraded: changed default attachment from Reflex Sight to None
### SMR
* Increased damage by 100%
* Replaces M14
* Removed from Mystery Box
* Removed aim spread
* Unupgraded: decreased clip ammo from 20 to 10
* Unupgraded: decreased stock ammo from 140 to 100
* Upgraded: decreased clip ammo from 30 to 20
* Upgraded: decreased stock ammo from 420 to 200
* Upgraded: increased damage by 50%
* Upgraded: increased headshot multiplier from 4 to 4.5
### STG-44
* Ammo gets added to the clip at the same time that it gets added in the reload anim

View File

@ -1011,6 +1011,9 @@ LANG_ENGLISH "Toughguy & Crybaby"
// HINT STRINGS
REFERENCE ZOMBIE_WEAPON_SARITCH
LANG_ENGLISH "Hold ^3[{+activate}]^7 for SMR [Cost: &&1]"
REFERENCE ZOMBIE_PERK_QUICKREVIVE
LANG_ENGLISH "Hold ^3[{+activate}]^7 for Quick Revive [Cost: &&1]"

View File

@ -136,7 +136,6 @@ init()
level.using_solo_revive = 0;
level.claymores_max_per_player = 20;
level.zombiemode_reusing_pack_a_punch = 0;
level.navcards = undefined; // removes navcards on HUD
level.powerup_intro_vox = undefined;
level.player_too_many_players_check = 0;
@ -1667,6 +1666,19 @@ weapon_changes()
include_weapon( "held_one_inch_punch_lightning_zm", 0 );
register_melee_weapon_for_level( "held_one_inch_punch_lightning_zm" );
}
if (isdefined(level.zombie_weapons["saritch_zm"]))
{
level.zombie_weapons["saritch_zm"].is_in_box = 0;
level.zombie_weapons["saritch_zm"].cost = 500;
level.zombie_weapons["saritch_zm"].ammo_cost = 250;
}
else
{
include_weapon( "saritch_zm", 0 );
include_weapon( "saritch_upgraded_zm", 0 );
add_zombie_weapon( "saritch_zm", "saritch_upgraded_zm", &"ZOMBIE_WEAPON_SARITCH", 500, "wpck_smr", "", undefined, 1 );
}
}
player_give_willy_pete()

View File

@ -257,7 +257,7 @@ init_wallbuys()
og_weapon_structs = array_randomize(og_weapon_structs);
scripts\zm\replaced\utility::wallbuy("m14_zm", "m14", "weapon_upgrade", og_weapon_structs[0].origin, og_weapon_structs[0].angles);
scripts\zm\replaced\utility::wallbuy("saritch_zm", "saritch", "weapon_upgrade", og_weapon_structs[0].origin, og_weapon_structs[0].angles);
scripts\zm\replaced\utility::wallbuy("rottweil72_zm", "olympia", "weapon_upgrade", og_weapon_structs[1].origin, og_weapon_structs[1].angles);
scripts\zm\replaced\utility::wallbuy("beretta93r_zm", "beretta93r", "weapon_upgrade", og_weapon_structs[2].origin, og_weapon_structs[2].angles);
scripts\zm\replaced\utility::wallbuy("pdw57_zm", "pdw57", "weapon_upgrade", og_weapon_structs[3].origin, og_weapon_structs[3].angles);

View File

@ -128,7 +128,7 @@ set_box_weapons()
init_wallbuys()
{
scripts\zm\replaced\utility::wallbuy("m14_zm", "m14", "weapon_upgrade", (305, 6376, 319), (0, -80, 0));
scripts\zm\replaced\utility::wallbuy("saritch_zm", "saritch", "weapon_upgrade", (305, 6376, 319), (0, -80, 0));
scripts\zm\replaced\utility::wallbuy("rottweil72_zm", "olympia", "weapon_upgrade", (-709, 5721, -19.875), (0, -80, 30));
scripts\zm\replaced\utility::wallbuy("uzi_zm", "uzi", "weapon_upgrade", (-219, 7156, 122), (0, 190, 0));
}

View File

@ -121,7 +121,7 @@ main()
init_wallbuys()
{
scripts\zm\replaced\utility::wallbuy("m14_zm", "m14", "weapon_upgrade", (13662, -1166, -134), (0, -90, 0));
scripts\zm\replaced\utility::wallbuy("saritch_zm", "saritch", "weapon_upgrade", (13662, -1166, -134), (0, -90, 0));
scripts\zm\replaced\utility::wallbuy("rottweil72_zm", "olympia", "weapon_upgrade", (13553, -539, -133), (0, -90, 0));
scripts\zm\replaced\utility::wallbuy("beretta93r_zm", "beretta93r", "weapon_upgrade", (13793, -1646, -105), (0, 0, 0));
scripts\zm\replaced\utility::wallbuy("mp5k_zm", "mp5", "weapon_upgrade", (13553, -769, -133), (0, -90, 0));

View File

@ -158,7 +158,7 @@ treasure_chest_init()
init_wallbuys()
{
scripts\zm\replaced\utility::wallbuy("m14_zm", "m14", "weapon_upgrade", (-5085, -7807, -5), (0, 0, 0));
scripts\zm\replaced\utility::wallbuy("saritch_zm", "saritch", "weapon_upgrade", (-5085, -7807, -5), (0, 0, 0));
scripts\zm\replaced\utility::wallbuy("rottweil72_zm", "olympia", "weapon_upgrade", (-4576, -7748, 18), (0, 90, 0));
scripts\zm\replaced\utility::wallbuy("mp5k_zm", "mp5", "weapon_upgrade", (-5489, -7982.7, 62), (0, 1, 0));
scripts\zm\replaced\utility::wallbuy("tazer_knuckles_zm", "tazer_knuckles", "tazer_upgrade", (-6265, -7941, 100), (0, 90, 0));

View File

@ -103,7 +103,7 @@ treasure_chest_init()
init_wallbuys()
{
scripts\zm\replaced\utility::wallbuy("m14_zm", "m14", "weapon_upgrade", (10559, 8220, -495), (0, 90, 0));
scripts\zm\replaced\utility::wallbuy("saritch_zm", "saritch", "weapon_upgrade", (10559, 8220, -495), (0, 90, 0));
scripts\zm\replaced\utility::wallbuy("rottweil72_zm", "olympia", "weapon_upgrade", (10678, 8135, -476), (0, 180, 0));
scripts\zm\replaced\utility::wallbuy("870mcs_zm", "870mcs", "weapon_upgrade", (11778, 7664, -697), (0, 170, 0));
scripts\zm\replaced\utility::wallbuy("mp5k_zm", "mp5", "weapon_upgrade", (11452, 8692, -521), (0, 90, 0));

View File

@ -69,7 +69,7 @@ main()
init_wallbuys()
{
scripts\zm\replaced\utility::wallbuy("m14_zm", "m14", "weapon_upgrade", (-11166, -2844, 247), (0, -86, 0));
scripts\zm\replaced\utility::wallbuy("saritch_zm", "saritch", "weapon_upgrade", (-11166, -2844, 247), (0, -86, 0));
scripts\zm\replaced\utility::wallbuy("rottweil72_zm", "olympia", "weapon_upgrade", (-10735, -2960, 247), (0, 97, 0));
scripts\zm\replaced\utility::wallbuy("ak74u_zm", "ak74u", "weapon_upgrade", (-10656, -752, 247), (0, 83, 0));
scripts\zm\replaced\utility::wallbuy("m16_zm", "m16", "weapon_upgrade", (-11839, -1695.1, 287), (0, 270, 0));

View File

@ -1431,11 +1431,6 @@ actor_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
attacker thread maps\mp\gametypes_zm\_weapons::checkhit(weapon);
if (maps\mp\zombies\_zm_weapons::get_base_weapon_name(weapon, 1) == "saritch_zm")
{
final_damage *= 2;
}
if (weapon == "blundergat_zm")
{
if (!is_true(self.is_brutus))

View File

@ -87,6 +87,8 @@ init_spawnable_weapon_upgrade()
continue;
}
spawn_list[i] wallbuy_changes();
precachemodel(target_struct.model);
unitrigger_stub = spawnstruct();
unitrigger_stub.origin = spawn_list[i].origin;
@ -173,6 +175,14 @@ init_spawnable_weapon_upgrade()
tempmodel delete();
}
wallbuy_changes()
{
if (self.zombie_weapon_upgrade == "m14_zm")
{
self.zombie_weapon_upgrade = "saritch_zm";
}
}
add_dynamic_wallbuy(weapon, wallbuy, pristine)
{
spawned_wallbuy = undefined;

View File

@ -325,12 +325,22 @@ wallbuy(weapon_name, target, targetname, origin, angles, play_chalk_fx = 1)
if (play_chalk_fx)
{
chalk_fx = weapon_name + "_fx";
level thread playchalkfx(chalk_fx, origin, angles);
chalk_fx = get_chalk_fx_name(weapon_name);
level thread play_chalk_fx(chalk_fx, origin, angles);
}
}
playchalkfx(effect, origin, angles)
get_chalk_fx_name(weapon_name)
{
if (weapon_name == "saritch_zm")
{
weapon_name = "m14_zm";
}
return weapon_name + "_fx";
}
play_chalk_fx(effect, origin, angles)
{
while (1)
{

View File

@ -171,8 +171,8 @@ builddynamicwallbuy(location, weaponname)
model useweaponhidetags(weaponname);
model hide();
chalk_fx = weaponname + "_fx";
thread scripts\zm\replaced\utility::playchalkfx(chalk_fx, origin, wallbuy.angles);
chalk_fx = scripts\zm\replaced\utility::get_chalk_fx_name(weaponname);
thread scripts\zm\replaced\utility::play_chalk_fx(chalk_fx, origin, wallbuy.angles);
}
maps\mp\zombies\_zm_weapons::add_dynamic_wallbuy(weaponname, wallbuy.targetname, 1);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2,6 +2,7 @@
>type,fastfile
>name,mod
include,saritch_zm
include,knife_ballistic_zm
include,ray_gun_zm
include,raygun_mark2_zm

View File

@ -0,0 +1,82 @@
image,~~-gmtl_t6_weapon_ar_saritch_~509512b7
image,mtl_t6_weapon_ar_saritch_nml
image,~mtl_t6_weapon_ar_saritch_ao-~962bd871
image,~-gmtl_t6_weapon_ar_saritch_col
image,~mtl_t6_weapon_ar_saritch_ir-~0f155f85
material,mc/mtl_t6_wpn_ar_saritch_thermal
material,mc/mtl_t6_wpn_ar_saritch
material,mc/mtl_t6_wpn_ar_saritch_camo1
material,mc/mtl_t6_wpn_ar_saritch_camo2
material,mc/mtl_t6_wpn_ar_saritch_camo3
xmodel,t6_wpn_ar_saritch_view
xmodel,t6_wpn_ar_saritch_world
xmodel,t6_attach_mag_saritch_view
xmodel,t6_attach_mag_saritch_world
camo,camo_saritch
xanim,viewmodel_saritch_idle
xanim,viewmodel_saritch_fire
xanim,viewmodel_saritch_reload
xanim,viewmodel_saritch_reload_empty
xanim,viewmodel_saritch_pullout
xanim,viewmodel_saritch_first_raise
xanim,viewmodel_saritch_putaway
xanim,viewmodel_saritch_pullout_quick
xanim,viewmodel_saritch_putaway_quick
xanim,viewmodel_saritch_sprint_in
xanim,viewmodel_saritch_sprint_loop
xanim,viewmodel_saritch_sprint_out
xanim,viewmodel_saritch_crawl_in
xanim,viewmodel_saritch_crawl_forward
xanim,viewmodel_saritch_crawl_back
xanim,viewmodel_saritch_crawl_right
xanim,viewmodel_saritch_crawl_left
xanim,viewmodel_saritch_crawl_out
xanim,viewmodel_saritch_ads_fire
xanim,viewmodel_saritch_d2p_in
xanim,viewmodel_saritch_d2p_loop
xanim,viewmodel_saritch_d2p_out
xanim,viewmodel_saritch_ads_up
xanim,viewmodel_saritch_ads_down
image,menu_mp_weapons_saritch
material,menu_mp_weapons_saritch
weapon,saritch_zm
xanim,viewmodel_saritch_rmr_alt_raise_up
xanim,viewmodel_saritch_acog_ads_fire
xanim,viewmodel_saritch_rmr_top_ads_up
xanim,viewmodel_saritch_rmr_top_ads_down
xanim,viewmodel_saritch_rmr_bottom_ads_up
attachment,dualoptic
attachmentunique,au_saritch_none
image,mtl_t6_attach_optic_combo_reddot
material,mc/mtl_t6_attach_optic_combo_reticle_up
image,mtl_t6_attach_optic_combo_acog_reticle
material,mc/mtl_t6_attach_optic_combo_reticle_down
image,~~-gmtl_t6_attach_optic_combo~bc3c1b55
image,mtl_t6_attach_optic_combo_nml
image,~mtl_t6_attach_optic_combo_ao~fcaffea3
image,~-gmtl_t6_attach_optic_combo_col
image,~mtl_t6_attach_optic_combo_ir~11ddeb86
material,mc/mtl_t6_attach_optic_combo_thermal
material,mc/mtl_t6_attach_optic_combo
image,~-gmtl_t6_attach_optic_combo_lens
material,mc/mtl_t6_attach_optic_combo_lens
material,mc/mtl_t6_attach_optic_combo_camo1
material,mc/mtl_t6_attach_optic_combo_camo2
xmodel,t6_attach_optic_combo_view
xmodel,t6_attach_optic_combo_world
camo,camo_hybrid
attachmentunique,au_saritch_upgraded_dualoptic
attachmentunique,au_saritch_upgraded_mms
attachmentunique,au_saritch_upgraded_rangefinder
attachmentunique,au_saritch_upgraded_reflex
weapon,saritch_upgraded_zm
xanim,viewmodel_saritch_reflex_ads_up
xanim,viewmodel_saritch_reflex_ads_down
xanim,viewmodel_saritch_mms_first_raise
xanim,viewmodel_saritch_mms_ads_up
xanim,viewmodel_saritch_mms_ads_down
xanim,viewmodel_saritch_rangefinder_ads_fire
xanim,viewmodel_saritch_rangefinder_ads_up
xanim,viewmodel_saritch_rangefinder_ads_down
xanim,viewmodel_saritch_rmr_bottom_ads_down
weapon,dualoptic_saritch_upgraded_zm