bomb is now plantable
This commit is contained in:
parent
e2540d8417
commit
2c7903e95d
3 changed files with 10 additions and 11 deletions
|
|
@ -271,15 +271,15 @@ func stop_interact() -> void:
|
||||||
var id = multiplayer.get_remote_sender_id()
|
var id = multiplayer.get_remote_sender_id()
|
||||||
player_stopped_interacting.emit(id)
|
player_stopped_interacting.emit(id)
|
||||||
|
|
||||||
func is_on_site() -> bool:
|
func is_on_site(id: int) -> bool:
|
||||||
for plant in plants:
|
for plant in plants:
|
||||||
if plant.is_player_on_site(multiplayer.get_unique_id()):
|
if plant.is_player_on_site(id):
|
||||||
return true
|
return true
|
||||||
return false
|
return false
|
||||||
|
|
||||||
func get_site() -> PlantSite:
|
func get_site(id: int) -> PlantSite:
|
||||||
for plant in plants:
|
for plant in plants:
|
||||||
if plant.is_player_on_site(multiplayer.get_unique_id()):
|
if plant.is_player_on_site(id):
|
||||||
return plant
|
return plant
|
||||||
return null
|
return null
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,6 @@ func enter() -> void:
|
||||||
func exit() -> void:
|
func exit() -> void:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
func state_input(event: InputEvent) -> void:
|
func use_begin() -> void:
|
||||||
if event.is_action("plr_bomb") and Session.is_on_site():
|
if Session.is_on_site(machine.player.player_id):
|
||||||
transition.emit("Plant")
|
transition.emit("Plant")
|
||||||
|
|
|
||||||
|
|
@ -17,14 +17,13 @@ func on_animation_finished(animation: StringName):
|
||||||
return
|
return
|
||||||
if animation == machine.animation_prefix + "plant":
|
if animation == machine.animation_prefix + "plant":
|
||||||
|
|
||||||
Session.spawn({"scene": active_bomb, "position": machine.player_camera.get_parent().global_position,"plant": Session.get_site().name})
|
Session.spawn({"scene": active_bomb, "position": machine.player_camera.get_parent().global_position,"plant": Session.get_site(machine.player.player_id).name})
|
||||||
|
|
||||||
machine.ammo -= 1
|
machine.ammo -= 1
|
||||||
return_to_previous.emit()
|
return_to_previous.emit()
|
||||||
|
|
||||||
func state_input(event: InputEvent) -> void:
|
func use_end() -> void:
|
||||||
if is_multiplayer_authority() == false:
|
if is_multiplayer_authority() == false:
|
||||||
return
|
return
|
||||||
if event.is_action_released("plr_bomb"):
|
transition.emit("Idle")
|
||||||
transition.emit("Idle")
|
machine.player.get_node("PlantAudio").multiplayer_stop()
|
||||||
machine.player.get_node("PlantAudio").multiplayer_stop()
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue