fix(candy-survival): restore ability to lift/carry roaming Tekton character
This commit is contained in:
@@ -2457,16 +2457,6 @@ func grab_tekton():
|
|||||||
if not is_multiplayer_authority() or is_carrying_tekton or is_frozen or is_stop_frozen:
|
if not is_multiplayer_authority() or is_carrying_tekton or is_frozen or is_stop_frozen:
|
||||||
return
|
return
|
||||||
|
|
||||||
if LobbyManager.game_mode == "Candy Survival":
|
|
||||||
var gm = get_node_or_null("/root/Main/CandySurvivalManager")
|
|
||||||
if gm and gm.active:
|
|
||||||
var pid = get("peer_id") if "peer_id" in self else name.to_int()
|
|
||||||
if multiplayer.is_server():
|
|
||||||
gm.try_activate_ghost(pid)
|
|
||||||
else:
|
|
||||||
gm.rpc_id(1, "try_activate_ghost", pid)
|
|
||||||
return
|
|
||||||
|
|
||||||
# 1. Check for nearby carrier to snatch from
|
# 1. Check for nearby carrier to snatch from
|
||||||
var carrier = _find_nearby_carrier()
|
var carrier = _find_nearby_carrier()
|
||||||
if carrier:
|
if carrier:
|
||||||
|
|||||||
@@ -148,9 +148,6 @@ func handle_unhandled_input(event):
|
|||||||
return
|
return
|
||||||
|
|
||||||
elif event.is_action_pressed("action_grab_tekton"):
|
elif event.is_action_pressed("action_grab_tekton"):
|
||||||
if LobbyManager.game_mode == "Candy Survival":
|
|
||||||
get_viewport().set_input_as_handled()
|
|
||||||
return
|
|
||||||
|
|
||||||
if not player.is_carrying_tekton:
|
if not player.is_carrying_tekton:
|
||||||
if player.powerup_manager and player.powerup_manager.has_method("can_use_special"):
|
if player.powerup_manager and player.powerup_manager.has_method("can_use_special"):
|
||||||
|
|||||||
Reference in New Issue
Block a user