From 15fbd9dbce3bb7641dcef80a91f6e1524c52328d Mon Sep 17 00:00:00 2001
From: Jannik Rosendahl <jannik.rosendahl@me.com>
Date: Fri, 17 Dec 2021 08:40:12 +0100
Subject: [PATCH] balancing update

---
 src/actors/enemy/Skeleton.tscn        | 22 ++++++++------------
 src/actors/enemy/enemy_knight.tscn    | 30 +++++++++++----------------
 src/actors/enemy/fireball_wizard.tscn |  5 +----
 src/actors/enemy/ghost.tscn           |  4 +---
 src/actors/enemy/wizard.tscn          |  8 +++----
 src/actors/player/Player.gd           |  2 +-
 src/scenes/Menu.tscn                  |  2 +-
 7 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/src/actors/enemy/Skeleton.tscn b/src/actors/enemy/Skeleton.tscn
index 16f9bf2..3fdfc03 100644
--- a/src/actors/enemy/Skeleton.tscn
+++ b/src/actors/enemy/Skeleton.tscn
@@ -35,11 +35,11 @@ var is_alive = true
 var is_moving_right = true
 const is_stompable = true
 
-var healthpoints = 10
+var healthpoints
 
 func _ready():
 	
-	healthpoints = 10
+	healthpoints = 3
 	is_alive = true
 	
 	$Control/HealthBar.max_value = healthpoints
@@ -124,14 +124,14 @@ func _on_Area2D_body_entered(body):
 
 [sub_resource type="SpriteFrames" id=2]
 animations = [ {
-"frames": [ ExtResource( 3 ), ExtResource( 5 ), ExtResource( 4 ), ExtResource( 1 ), ExtResource( 6 ), ExtResource( 8 ), ExtResource( 7 ), ExtResource( 2 ) ],
+"frames": [ ExtResource( 13 ), ExtResource( 13 ), ExtResource( 13 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ) ],
 "loop": true,
-"name": "walk",
+"name": "dead",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 13 ), ExtResource( 13 ), ExtResource( 13 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ) ],
+"frames": [ ExtResource( 3 ), ExtResource( 5 ), ExtResource( 4 ), ExtResource( 1 ), ExtResource( 6 ), ExtResource( 8 ), ExtResource( 7 ), ExtResource( 2 ) ],
 "loop": true,
-"name": "dead",
+"name": "walk",
 "speed": 5.0
 } ]
 
@@ -141,13 +141,9 @@ extents = Vector2( 13.047, 22.6729 )
 [sub_resource type="RectangleShape2D" id=4]
 extents = Vector2( 15.8205, 22.4895 )
 
-[node name="Node2D" type="Node2D" groups=[
-"enemy",
-]]
+[node name="Node2D" type="Node2D" groups=["enemy"]]
 
-[node name="Skeleton" type="KinematicBody2D" parent="." groups=[
-"enemy",
-]]
+[node name="Skeleton" type="KinematicBody2D" parent="." groups=["enemy"]]
 collision_layer = 8
 collision_mask = 13
 script = SubResource( 1 )
@@ -156,7 +152,7 @@ script = SubResource( 1 )
 position = Vector2( 0.18729, 0 )
 frames = SubResource( 2 )
 animation = "walk"
-frame = 3
+frame = 7
 playing = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Skeleton"]
diff --git a/src/actors/enemy/enemy_knight.tscn b/src/actors/enemy/enemy_knight.tscn
index a68dc17..91a80b4 100644
--- a/src/actors/enemy/enemy_knight.tscn
+++ b/src/actors/enemy/enemy_knight.tscn
@@ -44,7 +44,7 @@ var is_moving_right = true
 var is_alive = true # Überprüft ob der Gegner noch am leben ist
 const is_stompable = false
 
-var healthpoints = 10
+var healthpoints
 
 var attack_timer : Timer
 var hurt_timer : Timer
@@ -57,7 +57,7 @@ var is_hurt : bool
 
 func _ready():
 	
-	healthpoints = 10
+	healthpoints = 5
 	is_alive = true
 	
 	$Control/HealthBar.max_value = healthpoints
@@ -224,14 +224,14 @@ animations = [ {
 "name": "idle",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 8 ), ExtResource( 10 ), ExtResource( 12 ), ExtResource( 13 ) ],
+"frames": [ ExtResource( 1 ), ExtResource( 11 ), ExtResource( 2 ), ExtResource( 3 ), ExtResource( 15 ) ],
 "loop": true,
-"name": "jump",
+"name": "attack",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 1 ), ExtResource( 11 ), ExtResource( 2 ), ExtResource( 3 ), ExtResource( 15 ) ],
+"frames": [ ExtResource( 8 ), ExtResource( 10 ), ExtResource( 12 ), ExtResource( 13 ) ],
 "loop": true,
-"name": "attack",
+"name": "jump",
 "speed": 5.0
 }, {
 "frames": [ ExtResource( 14 ), ExtResource( 16 ), ExtResource( 18 ), ExtResource( 20 ), ExtResource( 17 ), ExtResource( 19 ) ],
@@ -259,9 +259,7 @@ extents = Vector2( 11.906, 20.5828 )
 [sub_resource type="RectangleShape2D" id=5]
 extents = Vector2( 15.0609, 5.10341 )
 
-[node name="enemy_knight" type="KinematicBody2D" groups=[
-"enemy",
-]]
+[node name="enemy_knight" type="KinematicBody2D" groups=["enemy"]]
 collision_layer = 8
 collision_mask = 3
 script = SubResource( 1 )
@@ -269,7 +267,7 @@ script = SubResource( 1 )
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 frames = SubResource( 2 )
 animation = "walk"
-frame = 5
+frame = 2
 playing = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
@@ -286,18 +284,14 @@ modulate = Color( 0.827451, 0, 1, 1 )
 position = Vector2( 28.2048, 10.4099 )
 shape = SubResource( 4 )
 
-[node name="SwordHitbox" type="Area2D" parent="." groups=[
-"EnemyWeapon",
-]]
+[node name="SwordHitbox" type="Area2D" parent="." groups=["EnemyWeapon"]]
 position = Vector2( 55.3471, -24.3883 )
-monitoring = false
-monitorable = false
 collision_layer = 16
 collision_mask = 2
+monitoring = false
+monitorable = false
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="SwordHitbox" groups=[
-"EnemyWeapon",
-]]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="SwordHitbox" groups=["EnemyWeapon"]]
 modulate = Color( 0, 0, 0, 1 )
 position = Vector2( -23.8406, 27.286 )
 shape = SubResource( 5 )
diff --git a/src/actors/enemy/fireball_wizard.tscn b/src/actors/enemy/fireball_wizard.tscn
index e9928a2..27e3c5c 100644
--- a/src/actors/enemy/fireball_wizard.tscn
+++ b/src/actors/enemy/fireball_wizard.tscn
@@ -43,14 +43,11 @@ animations = [ {
 
 [sub_resource type="RectangleShape2D" id=3]
 
-[node name="Node2D" type="Node2D" groups=[
-"enemy_weapon",
-]]
+[node name="Node2D" type="Node2D" groups=["enemy_weapon"]]
 script = SubResource( 1 )
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 frames = SubResource( 2 )
-frame = 1
 playing = true
 
 [node name="Area2D" type="Area2D" parent="."]
diff --git a/src/actors/enemy/ghost.tscn b/src/actors/enemy/ghost.tscn
index 503eed8..5b0597e 100644
--- a/src/actors/enemy/ghost.tscn
+++ b/src/actors/enemy/ghost.tscn
@@ -113,9 +113,7 @@ extents = Vector2( 10, 19.2882 )
 [sub_resource type="RectangleShape2D" id=11]
 extents = Vector2( 11.0537, 20.5606 )
 
-[node name="ghost" type="KinematicBody2D" groups=[
-"enemy",
-]]
+[node name="ghost" type="KinematicBody2D" groups=["enemy"]]
 script = SubResource( 1 )
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
diff --git a/src/actors/enemy/wizard.tscn b/src/actors/enemy/wizard.tscn
index 25e8a67..ed92cf2 100644
--- a/src/actors/enemy/wizard.tscn
+++ b/src/actors/enemy/wizard.tscn
@@ -45,7 +45,7 @@ var velocity = Vector2(0, 1)
 const is_stompable = true
 
 var is_alive = true 
-var healthpoints = 10
+var healthpoints
 
 var attack_timer : Timer
 var hurt_timer : Timer
@@ -60,7 +60,7 @@ var is_hurt : bool
 
 func _ready():
 	
-	healthpoints = 10
+	healthpoints = 9
 	is_alive = true
 	
 	$Control/HealthBar.max_value = healthpoints
@@ -185,9 +185,7 @@ extents = Vector2( 15.9676, 19.6908 )
 [sub_resource type="RectangleShape2D" id=5]
 extents = Vector2( 196.177, 15.9619 )
 
-[node name="wizard" type="KinematicBody2D" groups=[
-"enemy",
-]]
+[node name="wizard" type="KinematicBody2D" groups=["enemy"]]
 collision_layer = 8
 collision_mask = 7
 script = SubResource( 1 )
diff --git a/src/actors/player/Player.gd b/src/actors/player/Player.gd
index f1ec723..a9a7ae9 100644
--- a/src/actors/player/Player.gd
+++ b/src/actors/player/Player.gd
@@ -330,5 +330,5 @@ func _on_StompDetector_body_entered(body):
 
 func _on_MeleeDetector_body_entered(body):
 	if body.is_in_group("enemy"):
-		body.take_damage(5)
+		body.take_damage(3)
 
diff --git a/src/scenes/Menu.tscn b/src/scenes/Menu.tscn
index 4c01083..6aca5fc 100644
--- a/src/scenes/Menu.tscn
+++ b/src/scenes/Menu.tscn
@@ -180,7 +180,7 @@ __meta__ = {
 position = Vector2( 1080, 248 )
 scale = Vector2( 2.81113, 2.65621 )
 frames = SubResource( 18 )
-frame = 2
+frame = 1
 speed_scale = 0.8
 playing = true
 
-- 
GitLab