creyD/ludum_dare_46
1
0
Fork 0
mirror of https://github.com/creyD/ludum_dare_46.git synced 2026-06-12 21:42:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bos_testing' into devRefactor

Browse Source
This commit is contained in:
Conrad
2020-04-19 21:29:28 +02:00
committed by GitHub
parent 44e7d388ca 5a21a715f5
commit 95f37d9705
7 changed files with 173 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Player/Player.gd
View File

@@ -56,7 +56,7 @@ func _physics_process(delta):
while(totaldamage < -1):
totaldamage+=1
player_stats.health+=1
#adjustPrio(player_stats.health, player_stats.max_health)
adjustPrio(player_stats.health, player_stats.max_health)
_debug_update()
if debug == true:
match movementState:
@@ -165,7 +165,8 @@ func movement_roll():
func roll_finished():
movementState = moveState.IDLE
ExecutionState = AI_MOVE
ai_movement_state = STEP
ExecutionState = EXECUTING
func _on_Hurtbox_area_entered(area):

14
src/Player/Player.tscn
View File

@@ -14,9 +14,8 @@
[ext_resource path="res://Player/PlayerStateMachine.gd" type="Script" id=15]
[ext_resource path="res://Player/States/Roll.gd" type="Script" id=16]
[sub_resource type="CapsuleShape2D" id=1]
radius = 2.15976
height = 3.85866
[sub_resource type="CircleShape2D" id=50]
radius = 3.0
[sub_resource type="Animation" id=2]
resource_name = "HitDown"
@@ -629,6 +628,7 @@ script = ExtResource( 1 )
FRICTION = 270
[node name="Kind" parent="." instance=ExtResource( 7 )]
general = 4
kind = 1
[node name="Sprite" type="Sprite" parent="."]
@@ -640,9 +640,9 @@ hframes = 60
frame = 12
[node name="Body" type="CollisionShape2D" parent="."]
position = Vector2( -0.0470657, -0.609329 )
position = Vector2( 0.0107212, 0.0456073 )
rotation = 1.5708
shape = SubResource( 1 )
shape = SubResource( 50 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
anims/HitDown = SubResource( 2 )
@@ -678,7 +678,7 @@ collision_layer = 0
collision_mask = 32
[node name="CollisionShape2D" parent="Hitbox" index="0"]
position = Vector2( 0, -0.5 )
position = Vector2( -0.0192623, 0.000833511 )
shape = SubResource( 46 )
[node name="Hurtbox" parent="." instance=ExtResource( 3 )]
@@ -686,7 +686,7 @@ position = Vector2( 0, 0.0375252 )
collision_mask = 0
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
position = Vector2( 0, -0.5 )
position = Vector2( 1.90735e-06, 0.000833988 )
shape = SubResource( 47 )
[node name="Pivot" type="Position2D" parent="."]