diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 8aec01b0..9858f084 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -2790,7 +2790,7 @@ get_equipment_display_name() get_equipment_cost() { - if (self.equipname == "turbine") + if (self.equipname == "turbine" && level.script == "zm_transit") { return 500; } @@ -2813,6 +2813,18 @@ buildable_place_think() while ( isDefined( self.stub.built ) && !self.stub.built ) { 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 ) { continue; @@ -3358,26 +3370,20 @@ choose_open_buildable( player ) self.buildables_available_index++; b_got_input = 1; } - else + else if ( player actionslottwobuttonpressed() ) { - if ( player actionslottwobuttonpressed() ) - { - self.buildables_available_index--; - b_got_input = 1; - } + self.buildables_available_index--; + b_got_input = 1; } if ( self.buildables_available_index >= level.buildables_available.size ) { 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 ) diff --git a/scripts/zm/zm_buried/zm_buried_reimagined.gsc b/scripts/zm/zm_buried/zm_buried_reimagined.gsc index 95d2a771..98b706b8 100644 --- a/scripts/zm/zm_buried/zm_buried_reimagined.gsc +++ b/scripts/zm/zm_buried/zm_buried_reimagined.gsc @@ -33,6 +33,7 @@ init() level.zombie_init_done = ::zombie_init_done; 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._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.zmeat_create_item_meat_watcher = maps\mp\gametypes_zm\zmeat::create_item_meat_watcher;