From acab209dd5248a474c1fa8be880cbfa84dfd19e0 Mon Sep 17 00:00:00 2001
From: Adonis Stavridis <adonis-ioannis.stavridis@etu.unistra.fr>
Date: Thu, 26 Mar 2020 21:39:13 +0100
Subject: [PATCH] #116 left-right mouse attack directions
---
client/levels/test/game.gd | 19 ++++++------
server/autoloads/gamestate.gd | 2 +-
server/entities/characters/player.gd | 44 ++++++++++++++++++----------
server/levels/test/game.gd | 6 ++--
4 files changed, 43 insertions(+), 28 deletions(-)
diff --git a/client/levels/test/game.gd b/client/levels/test/game.gd
index 614d3e1..1bf1493 100644
--- a/client/levels/test/game.gd
+++ b/client/levels/test/game.gd
@@ -2,10 +2,10 @@ extends Node
# Movements
var movementInput:int = 0
-
var jumpInput:bool = false # Know if the player wants to jump
var jumpId:int = 0 # Distinguish 2 different jumps
-var sprintInput:bool = false
+var mouseX:int = 0 # Mouse X percentage
+var mouseY:int = 0 # Mouse Y percentage
# Attacks
enum {
@@ -21,6 +21,8 @@ func _physics_process(_delta):
func getPlayerInput():
movementInput = 0
var attackStateInput:int = NONE
+ var vpSize:Vector2 = get_viewport().size
+ var mousePosition:Vector2 = get_viewport().get_mouse_position()
if Input.is_action_pressed("movementLeft"):
movementInput -= 1
@@ -34,19 +36,18 @@ func getPlayerInput():
else:
jumpInput = false
- if Input.is_action_pressed("movementSprint"):
- sprintInput = true
- else:
- sprintInput = false
-
if Input.is_action_pressed("primaryAttack"):
attackStateInput = PUNCH
-
+ mouseX = int(mousePosition.x/vpSize.x * 100) - 50
+ mouseY = int(mousePosition.y/vpSize.y * 100) - 50
elif Input.is_action_pressed("secondaryAttack"):
attackStateInput = KICK
+ mouseX = int(mousePosition.x/vpSize.x * 100) - 50
+ mouseY = int(mousePosition.y/vpSize.y * 100) - 50
# Sent without safety resend
- rpc_unreliable_id(1, "sendPlayerInputs", movementInput, jumpInput, jumpId, sprintInput, attackStateInput)
+ rpc_unreliable_id(1, "sendPlayerInputs", movementInput, jumpInput, jumpId,
+ attackStateInput, mouseX, mouseY)
puppet func backToLobby():
diff --git a/server/autoloads/gamestate.gd b/server/autoloads/gamestate.gd
index 86335ac..12fa5c5 100644
--- a/server/autoloads/gamestate.gd
+++ b/server/autoloads/gamestate.gd
@@ -3,7 +3,7 @@ extends Node
const GAMEPATH = "/root/game/"
const PORT = 10001
-const MAX_CLIENTS = 2
+const MAX_CLIENTS = 1
var players = {}
diff --git a/server/entities/characters/player.gd b/server/entities/characters/player.gd
index 96bad2f..1e18792 100644
--- a/server/entities/characters/player.gd
+++ b/server/entities/characters/player.gd
@@ -9,13 +9,11 @@ var bodyRotation:int = 1
# Speed values
const MAX_SPEED:float = 8.0
-const MAX_SPRINT_SPEED:float = 12.0
var motion:float = 0
var isSprinting:bool = false
# Acceleration values
const ACCEL:float = 8.5
-const SPRINT_ACCEL:float = 16.0
const MVMNT_MOMENTUM:float = 10.0
const THROW_MOMENTUM:float = 2.0
@@ -59,6 +57,15 @@ enum {
var lastPunchId:int = 0 # Detect a new punch (of any type)
var idleTime:float = 0 # Stun when hit + prevent spam
+# Mouse
+var attackDirection:int
+enum {
+ MOUSE_LEFT = 0,
+ MOUSE_UP = 1,
+ MOUSE_RIGHT = 2,
+ MOUSE_DOWN = 3
+}
+
# Punch attack parameters
onready var punchHitArea:Area = $punchHitArea
var punchAttackDmg:float = 5.0
@@ -119,15 +126,14 @@ func _physics_process(delta:float):
# Called from the game script to update the vars
-func getPlayerInputs(movementInput:int, jumpInput:bool, jumpId:int, sprintInput:bool, attackTypeInput:int):
+func getPlayerInputs(movementInput:int, jumpInput:bool, jumpId:int,
+attackTypeInput:int, mouseX:int, mouseY:int):
motion = 0
# Prevent the player from moving when attacking
if isAttacking:
return
motion = movementInput
-
- isSprinting = sprintInput
isJumping = false
# Differentiate a new jump from a reemitted one
@@ -135,9 +141,22 @@ func getPlayerInputs(movementInput:int, jumpInput:bool, jumpId:int, sprintInput:
lastJumpId = jumpId
if jumpInput:
isJumping = true
-
- # Check if the character isn't already attacking
+
+ # Execute attack
if attackTypeInput != NONE:
+ attackDirection = MOUSE_UP
+ if (!self.is_on_floor() && mouseY < 0 && mouseX < mouseY && mouseX > -mouseY):
+ attackDirection = MOUSE_DOWN
+ elif (mouseX < 0 && mouseX <= mouseY):
+ attackDirection = MOUSE_LEFT
+ bodyRotation = -1
+ set_rotation_degrees(Vector3(0, 180, 0))
+ broadcastTurn(bodyRotation)
+ elif (mouseX > 0 && mouseX >= -mouseY):
+ attackDirection = MOUSE_RIGHT
+ bodyRotation = 1
+ set_rotation_degrees(Vector3(0, 0, 0))
+ broadcastTurn(bodyRotation)
processAttack(attackTypeInput)
@@ -167,7 +186,6 @@ func processMovement(delta:float):
else:
broadcastAnimation(ANIM_CONTROLLED_FALL)
-
if self.is_on_floor():
# Reset the number of jumps left
@@ -193,19 +211,13 @@ func processMovement(delta:float):
# Speed of the player
var target:Vector3 = Vector3(motion, 0, 0)
- if isSprinting:
- target *= MAX_SPRINT_SPEED
- else:
- target *= MAX_SPEED
+ target *= MAX_SPEED
# Acceleration of the player if he is moving horizontally
var accel:float
var hvel:Vector3 = Vector3(vel.x, 0, 0)
if target.dot(hvel)>0:
- if isSprinting:
- accel = SPRINT_ACCEL
- else:
- accel = ACCEL
+ accel = ACCEL
elif !is_on_floor()&&!isJumping:
accel = THROW_MOMENTUM
else:
diff --git a/server/levels/test/game.gd b/server/levels/test/game.gd
index 7364c55..d2b18e6 100644
--- a/server/levels/test/game.gd
+++ b/server/levels/test/game.gd
@@ -1,10 +1,12 @@
extends Node
-master func sendPlayerInputs(movementInput:int, jumpInput:bool, jumpId:int, sprintInput:bool, attackStateInput:int):
+master func sendPlayerInputs(movementInput:int, jumpInput:bool, jumpId:int,
+attackStateInput:int, mouseX:int, mouseY:int):
# Get the input from a client and send it to the matching remote player
var senderId:int = get_tree().get_rpc_sender_id()
if gamestate.players.has(senderId):
- gamestate.get_node("/root/game/"+str(senderId)).getPlayerInputs(movementInput, jumpInput, jumpId, sprintInput, attackStateInput)
+ gamestate.get_node("/root/game/"+str(senderId)).getPlayerInputs(movementInput,
+ jumpInput, jumpId, attackStateInput, mouseX, mouseY)
# When the player exits the game area
--
GitLab