From 5b6b99c52873e6cb6e0f6e744ca65ef51245b4c4 Mon Sep 17 00:00:00 2001 From: allespro Date: Tue, 23 Apr 2019 23:19:17 +0000 Subject: [PATCH] =?UTF-8?q?=D0=A3=20=D0=B2=D1=80=D0=B0=D0=B3=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=8F=D0=B2=D0=B8=D0=BB=D0=B8=D1=81=D1=8C=20=D0=B6?= =?UTF-8?q?=D0=B8=D0=B7=D0=BD=D0=B8=20=D0=B8=20=D1=83=D1=80=D0=BE=D0=BD=20?= =?UTF-8?q?=D0=BE=D1=82=20=D1=81=D0=BD=D0=B0=D1=80=D1=8F=D0=B4=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...1.png-030132975b8230ef880eedf5c61c605b.md5 | 2 +- ....png-030132975b8230ef880eedf5c61c605b.stex | Bin 685 -> 685 bytes ...2.png-2380b47d2f707432e332b78737eb4060.md5 | 2 +- ....png-2380b47d2f707432e332b78737eb4060.stex | Bin 672 -> 672 bytes ...1.png-462c45c0aa6b7e685b7bcd9b30fab3a4.md5 | 2 +- ....png-462c45c0aa6b7e685b7bcd9b30fab3a4.stex | Bin 1064 -> 1064 bytes ...2.png-4710f8052bb4d0e97500d14c848f8a04.md5 | 2 +- ....png-4710f8052bb4d0e97500d14c848f8a04.stex | Bin 1123 -> 1123 bytes ...1.png-e054fe75857017589bf8e0614d33db2c.md5 | 2 +- ....png-e054fe75857017589bf8e0614d33db2c.stex | Bin 861 -> 861 bytes ...2.png-f0de760f5e5fc2246364a8aab1fbb7ef.md5 | 2 +- ....png-f0de760f5e5fc2246364a8aab1fbb7ef.stex | Bin 684 -> 684 bytes ...1.png-ea08426d9b587d5fd6272284ce8c4274.md5 | 2 +- ....png-ea08426d9b587d5fd6272284ce8c4274.stex | Bin 914 -> 914 bytes ...2.png-fc7299c3b439d6cbdddd23865c013f2d.md5 | 2 +- ....png-fc7299c3b439d6cbdddd23865c013f2d.stex | Bin 787 -> 787 bytes Enemy1.tscn | 31 +++++++++++++++++- KinematicEnemy1.gd | 14 ++++++-- enemy/amg1_bk1.png.import | 2 +- enemy/amg1_bk2.png.import | 2 +- enemy/amg1_fr1.png.import | 2 +- enemy/amg1_fr2.png.import | 2 +- enemy/amg1_lf1.png.import | 2 +- enemy/amg1_lf2.png.import | 2 +- enemy/amg1_rt1.png.import | 2 +- enemy/amg1_rt2.png.import | 2 +- player/Bullet.tscn | 1 - player/bars.tscn | 9 +++-- 28 files changed, 62 insertions(+), 25 deletions(-) diff --git a/.import/amg1_bk1.png-030132975b8230ef880eedf5c61c605b.md5 b/.import/amg1_bk1.png-030132975b8230ef880eedf5c61c605b.md5 index d6aeb24..a128c5c 100644 --- a/.import/amg1_bk1.png-030132975b8230ef880eedf5c61c605b.md5 +++ b/.import/amg1_bk1.png-030132975b8230ef880eedf5c61c605b.md5 @@ -1,3 +1,3 @@ source_md5="b5c935cd630a1ae65ae370a5866771b3" -dest_md5="c148e6f6cae2843eba7990a6de070358" +dest_md5="963e3f7c79db5f3aebb5187890c6be6e" diff --git a/.import/amg1_bk1.png-030132975b8230ef880eedf5c61c605b.stex b/.import/amg1_bk1.png-030132975b8230ef880eedf5c61c605b.stex index e653f6eb130bef36457f488c70251a495081bb9a..30e6e87dfc4028522f3dbe2de785bd19ca5653bd 100644 GIT binary patch delta 22 ccmZ3>x|WsK-6c3gmVtpm0f-qk@-AQk05@C&K>z>% delta 22 ccmZ3>x|WsK-6c3gmVtpm0f<>P@-AQk05@<1MF0Q* diff --git a/.import/amg1_bk2.png-2380b47d2f707432e332b78737eb4060.md5 b/.import/amg1_bk2.png-2380b47d2f707432e332b78737eb4060.md5 index 24b1819..61cc31c 100644 --- a/.import/amg1_bk2.png-2380b47d2f707432e332b78737eb4060.md5 +++ b/.import/amg1_bk2.png-2380b47d2f707432e332b78737eb4060.md5 @@ -1,3 +1,3 @@ source_md5="4662762a869a130b3f48f0da852f3a57" -dest_md5="c18aa7eaff091acea896909d46da8c3e" +dest_md5="f463ec304944466ef996ff21302d9b5b" diff --git a/.import/amg1_bk2.png-2380b47d2f707432e332b78737eb4060.stex b/.import/amg1_bk2.png-2380b47d2f707432e332b78737eb4060.stex index 2f585d128a6d703e5157162a40bc5075213d8f9b..852d8f3b77bed248251db2b5d78982df5ed69eca 100644 GIT binary patch delta 22 ccmZ3$x`36}-6c3gmVtpm0f-qk@=j&~05u>48UO$Q delta 22 ccmZ3$x`36}-6c3gmVtpm0f<>P@=j&~05voO9smFU diff --git a/.import/amg1_fr1.png-462c45c0aa6b7e685b7bcd9b30fab3a4.md5 b/.import/amg1_fr1.png-462c45c0aa6b7e685b7bcd9b30fab3a4.md5 index d93f23d..6660e5c 100644 --- a/.import/amg1_fr1.png-462c45c0aa6b7e685b7bcd9b30fab3a4.md5 +++ b/.import/amg1_fr1.png-462c45c0aa6b7e685b7bcd9b30fab3a4.md5 @@ -1,3 +1,3 @@ source_md5="aaf16ebbc2e817b5f321c79b80708dae" -dest_md5="dea02330cf7c595cfb735df6a7f812a7" +dest_md5="04eaa086274695806aed6e9748e0862d" diff --git a/.import/amg1_fr1.png-462c45c0aa6b7e685b7bcd9b30fab3a4.stex b/.import/amg1_fr1.png-462c45c0aa6b7e685b7bcd9b30fab3a4.stex index 049ab5fdaa5b7c8f245f35c3289ebcd6fe26c688..ac03f1f5cf8dadcbe258d5ddde7a7c8dd5350a0b 100644 GIT binary patch delta 22 bcmZ3%v4Vrw-6c3gfq{Vmgc&ySO0xg}HX#GO delta 22 bcmZ3%v4Vrw-6c3gfq{VmgjqK7O0xg}HZ=pm diff --git a/.import/amg1_fr2.png-4710f8052bb4d0e97500d14c848f8a04.md5 b/.import/amg1_fr2.png-4710f8052bb4d0e97500d14c848f8a04.md5 index 9d9e653..00d4a4e 100644 --- a/.import/amg1_fr2.png-4710f8052bb4d0e97500d14c848f8a04.md5 +++ b/.import/amg1_fr2.png-4710f8052bb4d0e97500d14c848f8a04.md5 @@ -1,3 +1,3 @@ source_md5="57aea223614b603deae1e50ed8c4cff1" -dest_md5="fd30040b5ba51cb6c2136b6360058973" +dest_md5="ba16374ecf1e650192dfd82619adc978" diff --git a/.import/amg1_fr2.png-4710f8052bb4d0e97500d14c848f8a04.stex b/.import/amg1_fr2.png-4710f8052bb4d0e97500d14c848f8a04.stex index 5995fefa2f5e9b2520038d2062a86d329c2bd376..5254e2d2c9246ce9e3d7d5ad4c51f5471bb7e695 100644 GIT binary patch delta 22 bcmaFN@tA|x-6c3gfq{Vmgc&yShOqzuKt%*@ delta 22 bcmaFN@tA|x-6c3gfq{VmgjqK7hOqzuKv@KG diff --git a/.import/amg1_lf1.png-e054fe75857017589bf8e0614d33db2c.md5 b/.import/amg1_lf1.png-e054fe75857017589bf8e0614d33db2c.md5 index b3c2740..0567beb 100644 --- a/.import/amg1_lf1.png-e054fe75857017589bf8e0614d33db2c.md5 +++ b/.import/amg1_lf1.png-e054fe75857017589bf8e0614d33db2c.md5 @@ -1,3 +1,3 @@ source_md5="8815b99c223feb3b87943850897ddbda" -dest_md5="2adb7c0ae3bcb18ccb9413417c5fb738" +dest_md5="ee1b9d9bf13d04f4844eac5553b1f594" diff --git a/.import/amg1_lf1.png-e054fe75857017589bf8e0614d33db2c.stex b/.import/amg1_lf1.png-e054fe75857017589bf8e0614d33db2c.stex index 38b736756e7d338a9910f1e219b5ed8c8dba7a18..d50a30c95f455c1bab49e9e5c5f37eb0d7e98288 100644 GIT binary patch delta 22 ccmcc1c9)IU-6c3gih+Sa0f-qk@&+&i06v}sQ2+n{ delta 22 ccmcc1c9)IU-6c3gih+Sa0f<>P@&+&i06ww=RR910 diff --git a/.import/amg1_lf2.png-f0de760f5e5fc2246364a8aab1fbb7ef.md5 b/.import/amg1_lf2.png-f0de760f5e5fc2246364a8aab1fbb7ef.md5 index ba09a0f..6efaac7 100644 --- a/.import/amg1_lf2.png-f0de760f5e5fc2246364a8aab1fbb7ef.md5 +++ b/.import/amg1_lf2.png-f0de760f5e5fc2246364a8aab1fbb7ef.md5 @@ -1,3 +1,3 @@ source_md5="4bfb364168f227da44b32e95ea68df81" -dest_md5="83365ef8a0d5a83be63764340b0b848b" +dest_md5="90b16aa1fe89ee71f10dc85a53bd9cc7" diff --git a/.import/amg1_lf2.png-f0de760f5e5fc2246364a8aab1fbb7ef.stex b/.import/amg1_lf2.png-f0de760f5e5fc2246364a8aab1fbb7ef.stex index d4752d68b8bb6ecf01a8294a53b00335c8ac5a5e..e53117b3ac586483c0cbd83c35ce2e798a68b1c5 100644 GIT binary patch delta 22 ccmZ3(x`vh4-6c3gl!1Xk0f-qk^3G=h05-@3HUIzs delta 22 ccmZ3(x`vh4-6c3gl!1Xk0f<>P^3G=h05;qNIsgCw diff --git a/.import/amg1_rt1.png-ea08426d9b587d5fd6272284ce8c4274.md5 b/.import/amg1_rt1.png-ea08426d9b587d5fd6272284ce8c4274.md5 index 1d282de..4496838 100644 --- a/.import/amg1_rt1.png-ea08426d9b587d5fd6272284ce8c4274.md5 +++ b/.import/amg1_rt1.png-ea08426d9b587d5fd6272284ce8c4274.md5 @@ -1,3 +1,3 @@ source_md5="76ae883507e61bef46426bdbc72811a9" -dest_md5="157712c138b3e2a86cb5d24a87cf8835" +dest_md5="3cb43707b548483615c69971ca30dbb2" diff --git a/.import/amg1_rt1.png-ea08426d9b587d5fd6272284ce8c4274.stex b/.import/amg1_rt1.png-ea08426d9b587d5fd6272284ce8c4274.stex index 835cfc0990ecea93f713639a5a654cc5a79c1c28..37502f9e608f6101ee31d39ac01532549b064a97 100644 GIT binary patch delta 22 ccmbQlK8c;z-6c3gih+Sa0f-qk^0qPq05akO@&Et; delta 22 ccmbQlK8c;z-6c3gih+Sa0f<>P^0qPq05bLi_5c6? diff --git a/.import/amg1_rt2.png-fc7299c3b439d6cbdddd23865c013f2d.md5 b/.import/amg1_rt2.png-fc7299c3b439d6cbdddd23865c013f2d.md5 index d2324ac..a88083c 100644 --- a/.import/amg1_rt2.png-fc7299c3b439d6cbdddd23865c013f2d.md5 +++ b/.import/amg1_rt2.png-fc7299c3b439d6cbdddd23865c013f2d.md5 @@ -1,3 +1,3 @@ source_md5="b0e391b200eeee2190a7779a8bd0c449" -dest_md5="951b3813b75f107fe289372319c544e5" +dest_md5="8009ba60faa0e92b216cebb60c5f1454" diff --git a/.import/amg1_rt2.png-fc7299c3b439d6cbdddd23865c013f2d.stex b/.import/amg1_rt2.png-fc7299c3b439d6cbdddd23865c013f2d.stex index d6c61750e6e83f5fe87376551773735d80473ad5..ec8f5f6e42f041c512350334031cfbd686025054 100644 GIT binary patch delta 22 ccmbQtHkpmr-6c3gl!1Xk0f-qk^0F}l05PQlZU6uP delta 22 ccmbQtHkpmr-6c3gl!1Xk0f<>P^0F}l05Q1(asU7T diff --git a/Enemy1.tscn b/Enemy1.tscn index e25ee38..b195e42 100644 --- a/Enemy1.tscn +++ b/Enemy1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=18 format=2] [ext_resource path="res://KinematicEnemy1.gd" type="Script" id=1] [ext_resource path="res://enemy/amg1_lf1.png" type="Texture" id=2] @@ -10,6 +10,9 @@ [ext_resource path="res://enemy/amg1_fr1.png" type="Texture" id=8] [ext_resource path="res://enemy/amg1_fr2.png" type="Texture" id=9] [ext_resource path="res://Enemy/KnightBody.gd" type="Script" id=10] +[ext_resource path="res://images/pixel_under_health.png" type="Texture" id=11] +[ext_resource path="res://images/health_bar.png" type="Texture" id=12] +[ext_resource path="res://images/pixel_health.png" type="Texture" id=13] [sub_resource type="CapsuleShape2D" id=1] radius = 15.6866 @@ -41,9 +44,13 @@ animations = [ { [sub_resource type="CircleShape2D" id=3] radius = 148.282 +[sub_resource type="CircleShape2D" id=4] +radius = 23.0975 + [node name="Enemy1" type="Node2D"] [node name="KinematicEnemy1" type="KinematicBody2D" parent="."] +scale = Vector2( 0.7, 0.7 ) script = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicEnemy1"] @@ -56,11 +63,33 @@ animation = "RIGHT" [node name="Body" type="Area2D" parent="KinematicEnemy1" groups=[ "noheavy", ]] +editor/display_folded = true +visible = false script = ExtResource( 10 ) [node name="CollisionShape2D2" type="CollisionShape2D" parent="KinematicEnemy1/Body"] position = Vector2( -0.71698, 0 ) shape = SubResource( 3 ) +[node name="HitZone" type="Area2D" parent="KinematicEnemy1"] +editor/display_folded = true +visible = false + +[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicEnemy1/HitZone"] +shape = SubResource( 4 ) + +[node name="HealthBar" type="TextureProgress" parent="KinematicEnemy1"] +margin_left = -12.7624 +margin_top = -21.5248 +margin_right = 11.2376 +margin_bottom = -18.5248 +value = 20.0 +texture_under = ExtResource( 11 ) +texture_over = ExtResource( 12 ) +texture_progress = ExtResource( 13 ) +fill_mode = 1 +nine_patch_stretch = true + [connection signal="area_entered" from="KinematicEnemy1/Body" to="KinematicEnemy1/Body" method="_on_Body_area_entered"] [connection signal="area_exited" from="KinematicEnemy1/Body" to="KinematicEnemy1/Body" method="_on_Body_area_exited"] +[connection signal="area_entered" from="KinematicEnemy1/HitZone" to="KinematicEnemy1" method="_on_HitZone_area_entered"] diff --git a/KinematicEnemy1.gd b/KinematicEnemy1.gd index 8a5fe69..4eb2948 100644 --- a/KinematicEnemy1.gd +++ b/KinematicEnemy1.gd @@ -2,9 +2,13 @@ extends KinematicBody2D var IsPlayerNear = false var SPEED = 120 +var health = 100 var PlayerPos = Vector2(0,0) func _physics_process(delta): + $HealthBar.set_value(health) + if(health <= 0): + queue_free() if(IsPlayerNear == true): PlayerPos.x = $"../../../../KinematicPlayer".global_position.x - self.global_position.x PlayerPos.y = $"../../../../KinematicPlayer".global_position.y - self.global_position.y @@ -16,6 +20,12 @@ func _physics_process(delta): func attack(): IsPlayerNear = true - func stop_attack(): - IsPlayerNear = false \ No newline at end of file + IsPlayerNear = false + +func _on_HitZone_area_entered(area): + var groups = area.get_groups() + if (groups.has("player")): + print("EEEEBOYYY") + if (groups.has("bullet")): + health -= 10 \ No newline at end of file diff --git a/enemy/amg1_bk1.png.import b/enemy/amg1_bk1.png.import index 451c36b..2ab0e1a 100644 --- a/enemy/amg1_bk1.png.import +++ b/enemy/amg1_bk1.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/enemy/amg1_bk2.png.import b/enemy/amg1_bk2.png.import index 06f6405..23022c6 100644 --- a/enemy/amg1_bk2.png.import +++ b/enemy/amg1_bk2.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/enemy/amg1_fr1.png.import b/enemy/amg1_fr1.png.import index ba204cc..d5ad194 100644 --- a/enemy/amg1_fr1.png.import +++ b/enemy/amg1_fr1.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/enemy/amg1_fr2.png.import b/enemy/amg1_fr2.png.import index 4172656..b2d4d9b 100644 --- a/enemy/amg1_fr2.png.import +++ b/enemy/amg1_fr2.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/enemy/amg1_lf1.png.import b/enemy/amg1_lf1.png.import index 41e538a..ce1dda3 100644 --- a/enemy/amg1_lf1.png.import +++ b/enemy/amg1_lf1.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/enemy/amg1_lf2.png.import b/enemy/amg1_lf2.png.import index 45d2dd3..727d596 100644 --- a/enemy/amg1_lf2.png.import +++ b/enemy/amg1_lf2.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/enemy/amg1_rt1.png.import b/enemy/amg1_rt1.png.import index fa7cb35..e8dd2cc 100644 --- a/enemy/amg1_rt1.png.import +++ b/enemy/amg1_rt1.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/enemy/amg1_rt2.png.import b/enemy/amg1_rt2.png.import index a59cd32..fcede26 100644 --- a/enemy/amg1_rt2.png.import +++ b/enemy/amg1_rt2.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/player/Bullet.tscn b/player/Bullet.tscn index 95a5ed4..cdbfd45 100644 --- a/player/Bullet.tscn +++ b/player/Bullet.tscn @@ -63,7 +63,6 @@ script = ExtResource( 1 ) position = Vector2( -5.32552, 0 ) scale = Vector2( 0.470545, 0.470545 ) frames = SubResource( 1 ) -frame = 1 playing = true [node name="CollisionShape2D" type="CollisionShape2D" parent="BulletArea"] diff --git a/player/bars.tscn b/player/bars.tscn index 08847bc..eeb0d9c 100644 --- a/player/bars.tscn +++ b/player/bars.tscn @@ -11,17 +11,16 @@ [node name="CanvasLayer" type="CanvasLayer"] [node name="Player_bars" type="Control" parent="."] -editor/display_folded = true margin_right = 40.0 margin_bottom = 40.0 [node name="player1_health_bar" type="TextureProgress" parent="Player_bars"] anchor_top = 0.5 anchor_bottom = 0.5 -margin_left = 1121.0 -margin_top = 636.0 -margin_right = 1289.0 -margin_bottom = 647.0 +margin_left = 1121.31 +margin_top = 636.307 +margin_right = 1289.31 +margin_bottom = 647.307 step = 0.005 value = 30.0 texture_under = ExtResource( 1 )