Skip to content
Snippets Groups Projects
Commit 15fbd9db authored by Jannik Rosendahl's avatar Jannik Rosendahl
Browse files

balancing update

parent 07305339
No related branches found
No related tags found
No related merge requests found
...@@ -35,11 +35,11 @@ var is_alive = true ...@@ -35,11 +35,11 @@ var is_alive = true
var is_moving_right = true var is_moving_right = true
const is_stompable = true const is_stompable = true
var healthpoints = 10 var healthpoints
func _ready(): func _ready():
healthpoints = 10 healthpoints = 3
is_alive = true is_alive = true
$Control/HealthBar.max_value = healthpoints $Control/HealthBar.max_value = healthpoints
...@@ -124,14 +124,14 @@ func _on_Area2D_body_entered(body): ...@@ -124,14 +124,14 @@ func _on_Area2D_body_entered(body):
[sub_resource type="SpriteFrames" id=2] [sub_resource type="SpriteFrames" id=2]
animations = [ { 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, "loop": true,
"name": "walk", "name": "dead",
"speed": 5.0 "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, "loop": true,
"name": "dead", "name": "walk",
"speed": 5.0 "speed": 5.0
} ] } ]
...@@ -141,13 +141,9 @@ extents = Vector2( 13.047, 22.6729 ) ...@@ -141,13 +141,9 @@ extents = Vector2( 13.047, 22.6729 )
[sub_resource type="RectangleShape2D" id=4] [sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 15.8205, 22.4895 ) extents = Vector2( 15.8205, 22.4895 )
[node name="Node2D" type="Node2D" groups=[ [node name="Node2D" type="Node2D" groups=["enemy"]]
"enemy",
]]
[node name="Skeleton" type="KinematicBody2D" parent="." groups=[ [node name="Skeleton" type="KinematicBody2D" parent="." groups=["enemy"]]
"enemy",
]]
collision_layer = 8 collision_layer = 8
collision_mask = 13 collision_mask = 13
script = SubResource( 1 ) script = SubResource( 1 )
...@@ -156,7 +152,7 @@ script = SubResource( 1 ) ...@@ -156,7 +152,7 @@ script = SubResource( 1 )
position = Vector2( 0.18729, 0 ) position = Vector2( 0.18729, 0 )
frames = SubResource( 2 ) frames = SubResource( 2 )
animation = "walk" animation = "walk"
frame = 3 frame = 7
playing = true playing = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="Skeleton"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Skeleton"]
......
...@@ -44,7 +44,7 @@ var is_moving_right = true ...@@ -44,7 +44,7 @@ var is_moving_right = true
var is_alive = true # Überprüft ob der Gegner noch am leben ist var is_alive = true # Überprüft ob der Gegner noch am leben ist
const is_stompable = false const is_stompable = false
var healthpoints = 10 var healthpoints
var attack_timer : Timer var attack_timer : Timer
var hurt_timer : Timer var hurt_timer : Timer
...@@ -57,7 +57,7 @@ var is_hurt : bool ...@@ -57,7 +57,7 @@ var is_hurt : bool
func _ready(): func _ready():
healthpoints = 10 healthpoints = 5
is_alive = true is_alive = true
$Control/HealthBar.max_value = healthpoints $Control/HealthBar.max_value = healthpoints
...@@ -224,14 +224,14 @@ animations = [ { ...@@ -224,14 +224,14 @@ animations = [ {
"name": "idle", "name": "idle",
"speed": 5.0 "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, "loop": true,
"name": "jump", "name": "attack",
"speed": 5.0 "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, "loop": true,
"name": "attack", "name": "jump",
"speed": 5.0 "speed": 5.0
}, { }, {
"frames": [ ExtResource( 14 ), ExtResource( 16 ), ExtResource( 18 ), ExtResource( 20 ), ExtResource( 17 ), ExtResource( 19 ) ], "frames": [ ExtResource( 14 ), ExtResource( 16 ), ExtResource( 18 ), ExtResource( 20 ), ExtResource( 17 ), ExtResource( 19 ) ],
...@@ -259,9 +259,7 @@ extents = Vector2( 11.906, 20.5828 ) ...@@ -259,9 +259,7 @@ extents = Vector2( 11.906, 20.5828 )
[sub_resource type="RectangleShape2D" id=5] [sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 15.0609, 5.10341 ) extents = Vector2( 15.0609, 5.10341 )
[node name="enemy_knight" type="KinematicBody2D" groups=[ [node name="enemy_knight" type="KinematicBody2D" groups=["enemy"]]
"enemy",
]]
collision_layer = 8 collision_layer = 8
collision_mask = 3 collision_mask = 3
script = SubResource( 1 ) script = SubResource( 1 )
...@@ -269,7 +267,7 @@ script = SubResource( 1 ) ...@@ -269,7 +267,7 @@ script = SubResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
frames = SubResource( 2 ) frames = SubResource( 2 )
animation = "walk" animation = "walk"
frame = 5 frame = 2
playing = true playing = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
...@@ -286,18 +284,14 @@ modulate = Color( 0.827451, 0, 1, 1 ) ...@@ -286,18 +284,14 @@ modulate = Color( 0.827451, 0, 1, 1 )
position = Vector2( 28.2048, 10.4099 ) position = Vector2( 28.2048, 10.4099 )
shape = SubResource( 4 ) shape = SubResource( 4 )
[node name="SwordHitbox" type="Area2D" parent="." groups=[ [node name="SwordHitbox" type="Area2D" parent="." groups=["EnemyWeapon"]]
"EnemyWeapon",
]]
position = Vector2( 55.3471, -24.3883 ) position = Vector2( 55.3471, -24.3883 )
monitoring = false
monitorable = false
collision_layer = 16 collision_layer = 16
collision_mask = 2 collision_mask = 2
monitoring = false
monitorable = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="SwordHitbox" groups=[ [node name="CollisionShape2D" type="CollisionShape2D" parent="SwordHitbox" groups=["EnemyWeapon"]]
"EnemyWeapon",
]]
modulate = Color( 0, 0, 0, 1 ) modulate = Color( 0, 0, 0, 1 )
position = Vector2( -23.8406, 27.286 ) position = Vector2( -23.8406, 27.286 )
shape = SubResource( 5 ) shape = SubResource( 5 )
......
...@@ -43,14 +43,11 @@ animations = [ { ...@@ -43,14 +43,11 @@ animations = [ {
[sub_resource type="RectangleShape2D" id=3] [sub_resource type="RectangleShape2D" id=3]
[node name="Node2D" type="Node2D" groups=[ [node name="Node2D" type="Node2D" groups=["enemy_weapon"]]
"enemy_weapon",
]]
script = SubResource( 1 ) script = SubResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
frames = SubResource( 2 ) frames = SubResource( 2 )
frame = 1
playing = true playing = true
[node name="Area2D" type="Area2D" parent="."] [node name="Area2D" type="Area2D" parent="."]
......
...@@ -113,9 +113,7 @@ extents = Vector2( 10, 19.2882 ) ...@@ -113,9 +113,7 @@ extents = Vector2( 10, 19.2882 )
[sub_resource type="RectangleShape2D" id=11] [sub_resource type="RectangleShape2D" id=11]
extents = Vector2( 11.0537, 20.5606 ) extents = Vector2( 11.0537, 20.5606 )
[node name="ghost" type="KinematicBody2D" groups=[ [node name="ghost" type="KinematicBody2D" groups=["enemy"]]
"enemy",
]]
script = SubResource( 1 ) script = SubResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
......
...@@ -45,7 +45,7 @@ var velocity = Vector2(0, 1) ...@@ -45,7 +45,7 @@ var velocity = Vector2(0, 1)
const is_stompable = true const is_stompable = true
var is_alive = true var is_alive = true
var healthpoints = 10 var healthpoints
var attack_timer : Timer var attack_timer : Timer
var hurt_timer : Timer var hurt_timer : Timer
...@@ -60,7 +60,7 @@ var is_hurt : bool ...@@ -60,7 +60,7 @@ var is_hurt : bool
func _ready(): func _ready():
healthpoints = 10 healthpoints = 9
is_alive = true is_alive = true
$Control/HealthBar.max_value = healthpoints $Control/HealthBar.max_value = healthpoints
...@@ -185,9 +185,7 @@ extents = Vector2( 15.9676, 19.6908 ) ...@@ -185,9 +185,7 @@ extents = Vector2( 15.9676, 19.6908 )
[sub_resource type="RectangleShape2D" id=5] [sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 196.177, 15.9619 ) extents = Vector2( 196.177, 15.9619 )
[node name="wizard" type="KinematicBody2D" groups=[ [node name="wizard" type="KinematicBody2D" groups=["enemy"]]
"enemy",
]]
collision_layer = 8 collision_layer = 8
collision_mask = 7 collision_mask = 7
script = SubResource( 1 ) script = SubResource( 1 )
......
...@@ -330,5 +330,5 @@ func _on_StompDetector_body_entered(body): ...@@ -330,5 +330,5 @@ func _on_StompDetector_body_entered(body):
func _on_MeleeDetector_body_entered(body): func _on_MeleeDetector_body_entered(body):
if body.is_in_group("enemy"): if body.is_in_group("enemy"):
body.take_damage(5) body.take_damage(3)
...@@ -180,7 +180,7 @@ __meta__ = { ...@@ -180,7 +180,7 @@ __meta__ = {
position = Vector2( 1080, 248 ) position = Vector2( 1080, 248 )
scale = Vector2( 2.81113, 2.65621 ) scale = Vector2( 2.81113, 2.65621 )
frames = SubResource( 18 ) frames = SubResource( 18 )
frame = 2 frame = 1
speed_scale = 0.8 speed_scale = 0.8
playing = true playing = true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment