1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-17 18:48:03 -05:00

Buried: fix buildables not building at any spot

This commit is contained in:
Jbleezy
2023-02-24 23:54:03 -08:00
parent 557e1d9070
commit 00f7e775f1
2 changed files with 19 additions and 12 deletions

View File

@ -2790,7 +2790,7 @@ get_equipment_display_name()
get_equipment_cost() get_equipment_cost()
{ {
if (self.equipname == "turbine") if (self.equipname == "turbine" && level.script == "zm_transit")
{ {
return 500; return 500;
} }
@ -2813,6 +2813,18 @@ buildable_place_think()
while ( isDefined( self.stub.built ) && !self.stub.built ) while ( isDefined( self.stub.built ) && !self.stub.built )
{ {
self waittill( "trigger", player ); self waittill( "trigger", player );
if (isDefined(level._zm_buildables_pooled_swap_buildable_fields))
{
slot = self.stub.buildablestruct.buildable_slot;
bind_to = self.stub.buildable_pool pooledbuildable_stub_for_piece( player player_get_buildable_piece( slot ) );
if (bind_to != self.stub)
{
[[level._zm_buildables_pooled_swap_buildable_fields]]( self.stub, bind_to );
}
}
if ( player != self.parent_player ) if ( player != self.parent_player )
{ {
continue; continue;
@ -3358,27 +3370,21 @@ choose_open_buildable( player )
self.buildables_available_index++; self.buildables_available_index++;
b_got_input = 1; b_got_input = 1;
} }
else else if ( player actionslottwobuttonpressed() )
{ {
if ( player actionslottwobuttonpressed() )
{
self.buildables_available_index--;
self.buildables_available_index--;
b_got_input = 1; b_got_input = 1;
} }
}
if ( self.buildables_available_index >= level.buildables_available.size ) if ( self.buildables_available_index >= level.buildables_available.size )
{ {
self.buildables_available_index = 0; self.buildables_available_index = 0;
} }
else else if ( self.buildables_available_index < 0 )
{
if ( self.buildables_available_index < 0 )
{ {
self.buildables_available_index = level.buildables_available.size - 1; self.buildables_available_index = level.buildables_available.size - 1;
} }
}
if ( b_got_input ) if ( b_got_input )
{ {

View File

@ -33,6 +33,7 @@ init()
level.zombie_init_done = ::zombie_init_done; level.zombie_init_done = ::zombie_init_done;
level.special_weapon_magicbox_check = ::buried_special_weapon_magicbox_check; level.special_weapon_magicbox_check = ::buried_special_weapon_magicbox_check;
level._is_player_in_zombie_stink = maps\mp\zombies\_zm_perk_vulture::_is_player_in_zombie_stink; level._is_player_in_zombie_stink = maps\mp\zombies\_zm_perk_vulture::_is_player_in_zombie_stink;
level._zm_buildables_pooled_swap_buildable_fields = maps\mp\zombies\_zm_buildables_pooled::swap_buildable_fields;
level.zgrief_meat_stink_player_create = maps\mp\gametypes_zm\zgrief::meat_stink_player_create; level.zgrief_meat_stink_player_create = maps\mp\gametypes_zm\zgrief::meat_stink_player_create;
level.zmeat_create_item_meat_watcher = maps\mp\gametypes_zm\zmeat::create_item_meat_watcher; level.zmeat_create_item_meat_watcher = maps\mp\gametypes_zm\zmeat::create_item_meat_watcher;