e4ccb49 · hyper-tps_demo

Changed files (3) +5 -8

game/player/player_core.gd +4 -4

…	…	@@ -125,7 +125,6 @@ func grapplingHook_CheckActivation():
125	125	if(playerWantsToShootGrapplingHook):
126	126	playerWantsToShootGrapplingHook = false
127	127	grapplingHook_IsHooked = true
128		# grapplingHook_GrapplePosition = grappleHookCast.get_collision_point()
129	128	grappleVisualLine.show()
130	129	$Model/Sound_Shoot_GrapplingHook_2.play()
131	130	grappleIKTarget.translation = grapplingHook_GrapplePosition
…	…	@@ -289,7 +288,7 @@ func respawnPlayer():
289	288	kinematicVelocity = Vector3.ZERO
290	289	grapplingHook_IsHooked = false
291	290	playerWantsToShootGrapplingHook = false
292		playerWantsToReleaseGrapplingHook = false
	291	playerWantsToReleaseGrapplingHook = true
293	292	self.translation = currentSpawnLocation
294	293
295	294	func playerCanJump() -> bool:
…	…	@@ -369,8 +368,9 @@ func _on_Input_player_shoot_grapplinghook():
369	368
370	369	func _on_Input_player_release_grapplinghook():
371	370	if( Input.get_mouse_mode() != Input.MOUSE_MODE_VISIBLE ):
372		playerWantsToReleaseGrapplingHook = true
373		hyperGossip.broadcast_event(EVENT_PLAYER_RELEASE_GRAPPLINGHOOK, getPlayerLocalCoreNetworkData() )
	371	if(grapplingHook_IsHooked):
	372	playerWantsToReleaseGrapplingHook = true
	373	hyperGossip.broadcast_event(EVENT_PLAYER_RELEASE_GRAPPLINGHOOK, getPlayerLocalCoreNetworkData() )
374	374
375	375
376	376	func _checkPlayerCanJump(newBody : PhysicsBody, addedBody : bool) -> void:

game/player/player_core_local.tscn +0 -3

…	…	@@ -20,9 +20,6 @@ transform = Transform( 1.53846, 0, 0, 0, 1.53846, 0, 0, 0, 1.53846, 0, 0, 0 )
20	20	stream = ExtResource( 9 )
21	21	attenuation_filter_cutoff_hz = 5000.0
22	22
23		[node name="AnimationTree" parent="." index="3"]
24		active = true
25
26	23	[node name="Input" type="Node" parent="." index="4"]
27	24	script = ExtResource( 2 )
28	25

hypergodot/hyper_godot_core.gd +1 -1

…	…	@@ -97,7 +97,6 @@ func get_player_object(id):
97	97	func updatePlayer_shootGrapplingHook(data, id):
98	98	var remotePlayer = get_player_object(id)
99	99
100		remotePlayer.playerWantsToShootGrapplingHook = true
101	100	var translation : Vector3 = Vector3(data.translation.x, data.translation.y, data.translation.z)
102	101	var direction : Vector3 = Vector3(data.direction.x, data.direction.y, data.direction.z)
103	102	var velocity : Vector3 = Vector3(data.velocity.x, data.velocity.y, data.velocity.z)
…	…	@@ -105,6 +104,7 @@ func updatePlayer_shootGrapplingHook(data, id):
105	104
106	105	remotePlayer.playerCoreNetworkDataUpdate_Types(translation, direction, velocity)
107	106	remotePlayer.grapplingHook_GrapplePosition = grapple_position
	107	remotePlayer.playerWantsToShootGrapplingHook = true
108	108
109	109	func updatePlayer_releaseGrapplingHook(data, id):
110	110	var remotePlayer = get_player_object(id)