From 6702f310e037b2bc519df373b95f75f295f5ef11 Mon Sep 17 00:00:00 2001
From: Adonis Stavridis <adonis-ioannis.stavridis@etu.unistra.fr>
Date: Thu, 26 Mar 2020 13:39:07 +0100
Subject: [PATCH] #112 fix player hitbox

---
 server/entities/characters/player.tscn | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/server/entities/characters/player.tscn b/server/entities/characters/player.tscn
index 5fc9174..8473d5a 100644
--- a/server/entities/characters/player.tscn
+++ b/server/entities/characters/player.tscn
@@ -2,19 +2,19 @@
 
 [ext_resource path="res://entities/characters/Class1/class1.gd" type="Script" id=1]
 
-[sub_resource type="BoxShape" id=5]
-extents = Vector3( 0.176075, 0.669145, 0.351434 )
+[sub_resource type="BoxShape" id=1]
+extents = Vector3( 0.176075, 0.674417, 0.351434 )
 
-[sub_resource type="CubeMesh" id=6]
+[sub_resource type="CubeMesh" id=2]
 
-[sub_resource type="SphereMesh" id=7]
+[sub_resource type="SphereMesh" id=3]
 
-[sub_resource type="CubeMesh" id=2]
+[sub_resource type="CubeMesh" id=4]
 
-[sub_resource type="ConvexPolygonShape" id=8]
+[sub_resource type="ConvexPolygonShape" id=5]
 points = PoolVector3Array( -1, -1, -1, -1, -1, 1, -1, 1, -1, -1, 1, 1, 1, -1, -1, 1, -1, 1, 1, 1, -1, 1, 1, 1 )
 
-[sub_resource type="ConvexPolygonShape" id=9]
+[sub_resource type="ConvexPolygonShape" id=6]
 points = PoolVector3Array( -1, -1, -1, -1, -1, 1, -1, 1, -1, -1, 1, 1, 1, -1, -1, 1, -1, 1, 1, 1, -1, 1, 1, 1 )
 
 [node name="player" type="KinematicBody"]
@@ -25,19 +25,19 @@ script = ExtResource( 1 )
 
 [node name="collisionShape" type="CollisionShape" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.678055, 0 )
-shape = SubResource( 5 )
+shape = SubResource( 1 )
 
 [node name="model" type="Spatial" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.67638e-08, 0 )
 
 [node name="body" type="MeshInstance" parent="model"]
 transform = Transform( 0.174564, 0, 0, 0, 0.532433, 0, 0, 0, 0.360351, 0, 0.545559, 0 )
-mesh = SubResource( 6 )
+mesh = SubResource( 2 )
 material/0 = null
 
 [node name="head" type="MeshInstance" parent="model"]
 transform = Transform( 0.177349, 0, 0, 0, 0.177349, 0, 0, 0, 0.177349, 0, 1.19631, 0 )
-mesh = SubResource( 7 )
+mesh = SubResource( 3 )
 material/0 = null
 
 [node name="punchHitArea" type="Area" parent="."]
@@ -49,12 +49,12 @@ collision_mask = 2
 
 [node name="punchMesh" type="MeshInstance" parent="punchHitArea"]
 transform = Transform( 0.130706, 0, 0, 0, 0.179953, 0, 0, 0, 0.320349, 0, 0, 0 )
-mesh = SubResource( 2 )
+mesh = SubResource( 4 )
 material/0 = null
 
 [node name="punchCollider" type="CollisionShape" parent="punchHitArea"]
 transform = Transform( 0.130706, 0, 0, 0, 0.179953, 0, 0, 0, 0.320349, 0, 0, 0 )
-shape = SubResource( 8 )
+shape = SubResource( 5 )
 
 [node name="kickHitArea" type="Area" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.730753, 0 )
@@ -65,12 +65,12 @@ collision_mask = 2
 
 [node name="kickMesh" type="MeshInstance" parent="kickHitArea"]
 transform = Transform( 0.130706, 0, 0, 0, 0.115231, 0, 0, 0, 0.320349, 0, 0, 0 )
-mesh = SubResource( 2 )
+mesh = SubResource( 4 )
 material/0 = null
 
 [node name="kickCollider" type="CollisionShape" parent="kickHitArea"]
 transform = Transform( 0.130706, 0, 0, 0, 0.115231, 0, 0, 0, 0.320349, 0, 0.161263, 0 )
-shape = SubResource( 9 )
+shape = SubResource( 6 )
 
 [node name="attackTween" type="Tween" parent="."]
 [connection signal="body_entered" from="punchHitArea" to="." method="_on_punchHitArea_body_entered"]
-- 
GitLab