mirror of
https://github.com/JezuzLizard/BO2-Reimagined.git
synced 2025-06-20 03:59:47 -05:00
Origins: remove player staff part on HUD
This commit is contained in:
Jbleezy
@ -557,7 +557,7 @@
|
||||
* Players can go prone on the tank
|
||||
* Shovels automatically picked up
|
||||
* Gramophone and records automatically picked up
|
||||
* Gramophone and master record no longer show on HUD
|
||||
* Musical parts no longer show on HUD
|
||||
* Der Wunderfizz: increased cost from 1500 to 2500
|
||||
* Der Wunderfizz: all perks have an equal chance of being obtained
|
||||
* Rituals of the Ancients: spend points challenge reward changed from Double Tap perk to a random perk that the player does not have (perk does not change if reward is reopened)
|
||||
|
||||
@ -13,6 +13,144 @@
|
||||
#include maps\mp\zombies\_zm_equipment;
|
||||
#include maps\mp\zm_tomb_craftables;
|
||||
|
||||
include_craftables()
|
||||
{
|
||||
level thread run_craftables_devgui();
|
||||
craftable_name = "equip_dieseldrone_zm";
|
||||
quadrotor_body = generate_zombie_craftable_piece( craftable_name, "body", "veh_t6_dlc_zm_quad_piece_body", 32, 64, 0, undefined, ::onpickup_common, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_quadrotor_zm_body", 1, "build_dd" );
|
||||
quadrotor_brain = generate_zombie_craftable_piece( craftable_name, "brain", "veh_t6_dlc_zm_quad_piece_brain", 32, 64, 0, undefined, ::onpickup_common, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_quadrotor_zm_brain", 1, "build_dd_brain" );
|
||||
quadrotor_engine = generate_zombie_craftable_piece( craftable_name, "engine", "veh_t6_dlc_zm_quad_piece_engine", 32, 64, 0, undefined, ::onpickup_common, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_quadrotor_zm_engine", 1, "build_dd" );
|
||||
quadrotor = spawnstruct();
|
||||
quadrotor.name = craftable_name;
|
||||
quadrotor add_craftable_piece( quadrotor_body );
|
||||
quadrotor add_craftable_piece( quadrotor_brain );
|
||||
quadrotor add_craftable_piece( quadrotor_engine );
|
||||
quadrotor.triggerthink = ::quadrotorcraftable;
|
||||
include_zombie_craftable( quadrotor );
|
||||
level thread add_craftable_cheat( quadrotor );
|
||||
craftable_name = "tomb_shield_zm";
|
||||
riotshield_top = generate_zombie_craftable_piece( craftable_name, "top", "t6_wpn_zmb_shield_dlc4_top", 48, 64, 0, undefined, ::onpickup_common, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_riotshield_dolly", 1, "build_zs" );
|
||||
riotshield_door = generate_zombie_craftable_piece( craftable_name, "door", "t6_wpn_zmb_shield_dlc4_door", 48, 15, 25, undefined, ::onpickup_common, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_riotshield_door", 1, "build_zs" );
|
||||
riotshield_bracket = generate_zombie_craftable_piece( craftable_name, "bracket", "t6_wpn_zmb_shield_dlc4_bracket", 48, 15, 0, undefined, ::onpickup_common, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_riotshield_clamp", 1, "build_zs" );
|
||||
riotshield = spawnstruct();
|
||||
riotshield.name = craftable_name;
|
||||
riotshield add_craftable_piece( riotshield_top );
|
||||
riotshield add_craftable_piece( riotshield_door );
|
||||
riotshield add_craftable_piece( riotshield_bracket );
|
||||
riotshield.onbuyweapon = ::onbuyweapon_riotshield;
|
||||
riotshield.triggerthink = ::riotshieldcraftable;
|
||||
include_craftable( riotshield );
|
||||
level thread add_craftable_cheat( riotshield );
|
||||
craftable_name = "elemental_staff_air";
|
||||
staff_air_gem = generate_zombie_craftable_piece( craftable_name, "gem", "t6_wpn_zmb_staff_crystal_air_part", 48, 64, 0, undefined, ::onpickup_aircrystal, ::ondrop_aircrystal, undefined, undefined, undefined, undefined, undefined, 0, "crystal", 1 );
|
||||
staff_air_upper_staff = generate_zombie_craftable_piece( craftable_name, "upper_staff", "t6_wpn_zmb_staff_tip_air_world", 32, 64, 0, undefined, ::onpickup_staffpiece, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_staff_zm_ustaff_air", 1, "staff_part" );
|
||||
staff_air_middle_staff = generate_zombie_craftable_piece( craftable_name, "middle_staff", "t6_wpn_zmb_staff_stem_air_part", 32, 64, 0, undefined, ::onpickup_staffpiece, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_staff_zm_mstaff_air", 1, "staff_part" );
|
||||
staff_air_lower_staff = generate_zombie_craftable_piece( craftable_name, "lower_staff", "t6_wpn_zmb_staff_revive_part", 32, 64, 0, undefined, ::onpickup_staffpiece, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_staff_zm_lstaff_air", 1, "staff_part" );
|
||||
staff = spawnstruct();
|
||||
staff.name = craftable_name;
|
||||
staff add_craftable_piece( staff_air_gem );
|
||||
staff add_craftable_piece( staff_air_upper_staff );
|
||||
staff add_craftable_piece( staff_air_middle_staff );
|
||||
staff add_craftable_piece( staff_air_lower_staff );
|
||||
staff.triggerthink = ::staffcraftable_air;
|
||||
staff.custom_craftablestub_update_prompt = ::tomb_staff_update_prompt;
|
||||
include_zombie_craftable( staff );
|
||||
level thread add_craftable_cheat( staff );
|
||||
count_staff_piece_pickup( array( staff_air_upper_staff, staff_air_middle_staff, staff_air_lower_staff ) );
|
||||
craftable_name = "elemental_staff_fire";
|
||||
staff_fire_gem = generate_zombie_craftable_piece( craftable_name, "gem", "t6_wpn_zmb_staff_crystal_fire_part", 48, 64, 0, undefined, ::onpickup_firecrystal, ::ondrop_firecrystal, undefined, undefined, undefined, undefined, undefined, 0, "crystal", 1 );
|
||||
staff_fire_upper_staff = generate_zombie_craftable_piece( craftable_name, "upper_staff", "t6_wpn_zmb_staff_tip_fire_world", 32, 64, 0, undefined, ::onpickup_staffpiece, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_staff_zm_ustaff_fire", 1, "staff_part" );
|
||||
staff_fire_middle_staff = generate_zombie_craftable_piece( craftable_name, "middle_staff", "t6_wpn_zmb_staff_stem_fire_part", 32, 64, 0, undefined, ::onpickup_staffpiece, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_staff_zm_mstaff_fire", 1, "staff_part" );
|
||||
staff_fire_lower_staff = generate_zombie_craftable_piece( craftable_name, "lower_staff", "t6_wpn_zmb_staff_revive_part", 64, 128, 0, undefined, ::onpickup_staffpiece, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_staff_zm_lstaff_fire", 1, "staff_part" );
|
||||
level thread maps\mp\zm_tomb_main_quest::staff_mechz_drop_pieces( staff_fire_lower_staff );
|
||||
level thread maps\mp\zm_tomb_main_quest::staff_biplane_drop_pieces( array( staff_fire_middle_staff ) );
|
||||
level thread maps\mp\zm_tomb_main_quest::staff_unlock_with_zone_capture( staff_fire_upper_staff );
|
||||
staff = spawnstruct();
|
||||
staff.name = craftable_name;
|
||||
staff add_craftable_piece( staff_fire_gem );
|
||||
staff add_craftable_piece( staff_fire_upper_staff );
|
||||
staff add_craftable_piece( staff_fire_middle_staff );
|
||||
staff add_craftable_piece( staff_fire_lower_staff );
|
||||
staff.triggerthink = ::staffcraftable_fire;
|
||||
staff.custom_craftablestub_update_prompt = ::tomb_staff_update_prompt;
|
||||
include_zombie_craftable( staff );
|
||||
level thread add_craftable_cheat( staff );
|
||||
count_staff_piece_pickup( array( staff_fire_upper_staff, staff_fire_middle_staff, staff_fire_lower_staff ) );
|
||||
craftable_name = "elemental_staff_lightning";
|
||||
staff_lightning_gem = generate_zombie_craftable_piece( craftable_name, "gem", "t6_wpn_zmb_staff_crystal_bolt_part", 48, 64, 0, undefined, ::onpickup_lightningcrystal, ::ondrop_lightningcrystal, undefined, undefined, undefined, undefined, undefined, 0, "crystal", 1 );
|
||||
staff_lightning_upper_staff = generate_zombie_craftable_piece( craftable_name, "upper_staff", "t6_wpn_zmb_staff_tip_lightning_world", 32, 64, 0, undefined, ::onpickup_staffpiece, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_staff_zm_ustaff_lightning", 1, "staff_part" );
|
||||
staff_lightning_middle_staff = generate_zombie_craftable_piece( craftable_name, "middle_staff", "t6_wpn_zmb_staff_stem_bolt_part", 32, 64, 0, undefined, ::onpickup_staffpiece, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_staff_zm_mstaff_lightning", 1, "staff_part" );
|
||||
staff_lightning_lower_staff = generate_zombie_craftable_piece( craftable_name, "lower_staff", "t6_wpn_zmb_staff_revive_part", 32, 64, 0, undefined, ::onpickup_staffpiece, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_staff_zm_lstaff_lightning", 1, "staff_part" );
|
||||
staff = spawnstruct();
|
||||
staff.name = craftable_name;
|
||||
staff add_craftable_piece( staff_lightning_gem );
|
||||
staff add_craftable_piece( staff_lightning_upper_staff );
|
||||
staff add_craftable_piece( staff_lightning_middle_staff );
|
||||
staff add_craftable_piece( staff_lightning_lower_staff );
|
||||
staff.triggerthink = ::staffcraftable_lightning;
|
||||
staff.custom_craftablestub_update_prompt = ::tomb_staff_update_prompt;
|
||||
include_zombie_craftable( staff );
|
||||
level thread add_craftable_cheat( staff );
|
||||
count_staff_piece_pickup( array( staff_lightning_upper_staff, staff_lightning_middle_staff, staff_lightning_lower_staff ) );
|
||||
craftable_name = "elemental_staff_water";
|
||||
staff_water_gem = generate_zombie_craftable_piece( craftable_name, "gem", "t6_wpn_zmb_staff_crystal_water_part", 48, 64, 0, undefined, ::onpickup_watercrystal, ::ondrop_watercrystal, undefined, undefined, undefined, undefined, undefined, 0, "crystal", 1 );
|
||||
staff_water_upper_staff = generate_zombie_craftable_piece( craftable_name, "upper_staff", "t6_wpn_zmb_staff_tip_water_world", 32, 64, 0, undefined, ::onpickup_staffpiece, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_staff_zm_ustaff_water", 1, "staff_part" );
|
||||
staff_water_middle_staff = generate_zombie_craftable_piece( craftable_name, "middle_staff", "t6_wpn_zmb_staff_stem_water_part", 32, 64, 0, undefined, ::onpickup_staffpiece, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_staff_zm_mstaff_water", 1, "staff_part" );
|
||||
staff_water_lower_staff = generate_zombie_craftable_piece( craftable_name, "lower_staff", "t6_wpn_zmb_staff_revive_part", 32, 64, 0, undefined, ::onpickup_staffpiece, ::ondrop_common, undefined, undefined, undefined, undefined, "piece_staff_zm_lstaff_water", 1, "staff_part" );
|
||||
a_ice_staff_parts = array( staff_water_lower_staff, staff_water_middle_staff, staff_water_upper_staff );
|
||||
level thread maps\mp\zm_tomb_main_quest::staff_ice_dig_pieces( a_ice_staff_parts );
|
||||
staff = spawnstruct();
|
||||
staff.name = craftable_name;
|
||||
staff add_craftable_piece( staff_water_gem );
|
||||
staff add_craftable_piece( staff_water_upper_staff );
|
||||
staff add_craftable_piece( staff_water_middle_staff );
|
||||
staff add_craftable_piece( staff_water_lower_staff );
|
||||
staff.triggerthink = ::staffcraftable_water;
|
||||
staff.custom_craftablestub_update_prompt = ::tomb_staff_update_prompt;
|
||||
include_zombie_craftable( staff );
|
||||
level thread add_craftable_cheat( staff );
|
||||
count_staff_piece_pickup( array( staff_water_upper_staff, staff_water_middle_staff, staff_water_lower_staff ) );
|
||||
craftable_name = "gramophone";
|
||||
vinyl_pickup_player = vinyl_add_pickup( craftable_name, "vinyl_player", "p6_zm_tm_gramophone", "piece_record_zm_player", undefined, "gramophone" );
|
||||
vinyl_pickup_master = vinyl_add_pickup( craftable_name, "vinyl_master", "p6_zm_tm_record_master", "piece_record_zm_vinyl_master", undefined, "record" );
|
||||
vinyl_pickup_air = vinyl_add_pickup( craftable_name, "vinyl_air", "p6_zm_tm_record_wind", "piece_record_zm_vinyl_air", "quest_state2", "record" );
|
||||
vinyl_pickup_ice = vinyl_add_pickup( craftable_name, "vinyl_ice", "p6_zm_tm_record_ice", "piece_record_zm_vinyl_water", "quest_state4", "record" );
|
||||
vinyl_pickup_fire = vinyl_add_pickup( craftable_name, "vinyl_fire", "p6_zm_tm_record_fire", "piece_record_zm_vinyl_fire", "quest_state1", "record" );
|
||||
vinyl_pickup_elec = vinyl_add_pickup( craftable_name, "vinyl_elec", "p6_zm_tm_record_lightning", "piece_record_zm_vinyl_lightning", "quest_state3", "record" );
|
||||
vinyl_pickup_player.sam_line = "gramophone_found";
|
||||
vinyl_pickup_master.sam_line = "master_found";
|
||||
vinyl_pickup_air.sam_line = "first_record_found";
|
||||
vinyl_pickup_ice.sam_line = "first_record_found";
|
||||
vinyl_pickup_fire.sam_line = "first_record_found";
|
||||
vinyl_pickup_elec.sam_line = "first_record_found";
|
||||
level thread maps\mp\zm_tomb_vo::watch_one_shot_samantha_line( "vox_sam_1st_record_found_0", "first_record_found" );
|
||||
level thread maps\mp\zm_tomb_vo::watch_one_shot_samantha_line( "vox_sam_gramophone_found_0", "gramophone_found" );
|
||||
level thread maps\mp\zm_tomb_vo::watch_one_shot_samantha_line( "vox_sam_master_found_0", "master_found" );
|
||||
gramophone = spawnstruct();
|
||||
gramophone.name = craftable_name;
|
||||
gramophone add_craftable_piece( vinyl_pickup_player );
|
||||
gramophone add_craftable_piece( vinyl_pickup_master );
|
||||
gramophone add_craftable_piece( vinyl_pickup_air );
|
||||
gramophone add_craftable_piece( vinyl_pickup_ice );
|
||||
gramophone add_craftable_piece( vinyl_pickup_fire );
|
||||
gramophone add_craftable_piece( vinyl_pickup_elec );
|
||||
gramophone.triggerthink = ::gramophonecraftable;
|
||||
include_zombie_craftable( gramophone );
|
||||
level thread add_craftable_cheat( gramophone );
|
||||
staff_fire_gem thread watch_part_pickup( "quest_state1", 2 );
|
||||
staff_air_gem thread watch_part_pickup( "quest_state2", 2 );
|
||||
staff_lightning_gem thread watch_part_pickup( "quest_state3", 2 );
|
||||
staff_water_gem thread watch_part_pickup( "quest_state4", 2 );
|
||||
staff_fire_gem thread staff_crystal_wait_for_teleport( 1 );
|
||||
staff_air_gem thread staff_crystal_wait_for_teleport( 2 );
|
||||
staff_lightning_gem thread staff_crystal_wait_for_teleport( 3 );
|
||||
staff_water_gem thread staff_crystal_wait_for_teleport( 4 );
|
||||
level thread maps\mp\zm_tomb_vo::staff_craft_vo();
|
||||
level thread maps\mp\zm_tomb_vo::samantha_discourage_think();
|
||||
level thread maps\mp\zm_tomb_vo::samantha_encourage_think();
|
||||
level thread craftable_add_glow_fx();
|
||||
}
|
||||
|
||||
vinyl_add_pickup( str_craftable_name, str_piece_name, str_model_name, str_bit_clientfield, str_quest_clientfield, str_vox_id )
|
||||
{
|
||||
if (str_bit_clientfield == "piece_record_zm_player" || str_bit_clientfield == "piece_record_zm_vinyl_master")
|
||||
@ -112,6 +250,28 @@ setup_quadrotor_purchase( player )
|
||||
return false;
|
||||
}
|
||||
|
||||
quadrotor_watcher( player )
|
||||
{
|
||||
quadrotor_set_unavailable();
|
||||
player thread quadrotor_return_condition_watcher();
|
||||
player thread quadrotor_control_thread();
|
||||
|
||||
level waittill( "drone_available" );
|
||||
|
||||
level.maxis_quadrotor = undefined;
|
||||
|
||||
if ( flag( "ee_quadrotor_disabled" ) )
|
||||
flag_waitopen( "ee_quadrotor_disabled" );
|
||||
|
||||
quadrotor_set_available();
|
||||
}
|
||||
|
||||
quadrotor_set_unavailable()
|
||||
{
|
||||
level.quadrotor_status.picked_up = 1;
|
||||
level.quadrotor_status.pickup_trig.model ghost();
|
||||
}
|
||||
|
||||
tomb_custom_craftable_validation( player )
|
||||
{
|
||||
if ( self.stub.equipname == "equip_dieseldrone_zm" )
|
||||
@ -149,9 +309,3 @@ tomb_custom_craftable_validation( player )
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
quadrotor_set_unavailable()
|
||||
{
|
||||
level.quadrotor_status.picked_up = 1;
|
||||
level.quadrotor_status.pickup_trig.model ghost();
|
||||
}
|
||||
@ -34,9 +34,8 @@ main()
|
||||
replaceFunc(maps\mp\zm_tomb_ee_main_step_2::remove_plinth, scripts\zm\replaced\zm_tomb_ee_main_step_2::remove_plinth);
|
||||
replaceFunc(maps\mp\zm_tomb_ee_main_step_3::fire_link_cooldown, scripts\zm\replaced\zm_tomb_ee_main_step_3::fire_link_cooldown);
|
||||
replaceFunc(maps\mp\zm_tomb_challenges::challenges_init, scripts\zm\replaced\zm_tomb_challenges::challenges_init);
|
||||
replaceFunc(maps\mp\zm_tomb_craftables::include_craftables, scripts\zm\replaced\zm_tomb_craftables::include_craftables);
|
||||
replaceFunc(maps\mp\zm_tomb_craftables::quadrotor_control_thread, scripts\zm\replaced\zm_tomb_craftables::quadrotor_control_thread);
|
||||
replaceFunc(maps\mp\zm_tomb_craftables::quadrotor_set_unavailable, scripts\zm\replaced\zm_tomb_craftables::quadrotor_set_unavailable);
|
||||
replaceFunc(maps\mp\zm_tomb_craftables::vinyl_add_pickup, scripts\zm\replaced\zm_tomb_craftables::vinyl_add_pickup);
|
||||
replaceFunc(maps\mp\zm_tomb_dig::init_shovel, scripts\zm\replaced\zm_tomb_dig::init_shovel);
|
||||
replaceFunc(maps\mp\zm_tomb_dig::increment_player_perk_purchase_limit, scripts\zm\replaced\zm_tomb_dig::increment_player_perk_purchase_limit);
|
||||
replaceFunc(maps\mp\zm_tomb_tank::players_on_tank_update, scripts\zm\replaced\zm_tomb_tank::players_on_tank_update);
|
||||
|
||||
Reference in New Issue
Block a user