diff --git a/ai/ogre.gd b/ai/ogre.gd index d756dc2..e24c042 100644 --- a/ai/ogre.gd +++ b/ai/ogre.gd @@ -1,6 +1,6 @@ extends Enemy -var contact_damage = 0.5 +var contact_damage = 1.5 onready var Spr = $Sprite onready var DamageCD = $DamageCD @@ -19,6 +19,9 @@ func _physics_process(delta): elif player.x < global_position.x: Spr.flip_h = true velocity.x = -speed + + if health <= 0: + queue_free() if not is_on_floor(): velocity.y = 10 diff --git a/levels/World.tscn b/levels/World.tscn index 3021175..ea3b4c5 100644 --- a/levels/World.tscn +++ b/levels/World.tscn @@ -252,5 +252,5 @@ autoplay = "Type Writer" "anims/Type Writer" = SubResource( 8 ) [node name="Ogre" parent="." instance=ExtResource( 8 )] -position = Vector2( 89.8511, 126.388 ) +position = Vector2( 179.376, 152.61 ) [connection signal="body_entered" from="Area2D" to="text/Text2" method="_on_body_entered"] diff --git a/magic/Wands/TripleWand.gd b/magic/Wands/TripleWand.gd index 8cb3ba5..96385ad 100644 --- a/magic/Wands/TripleWand.gd +++ b/magic/Wands/TripleWand.gd @@ -1,6 +1,5 @@ extends Wand - func fire(projectile, effect): if $ShootDelay.is_stopped() and projectile != null: var temp1 = projectile.instance() diff --git a/project.godot b/project.godot index 3f85285..d3dcc24 100644 --- a/project.godot +++ b/project.godot @@ -97,6 +97,13 @@ texture={ [input] +ui_up={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) + ] +} up={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)