From 326bc2df93c912c7223d41ebd75e47ecbaed2c3b Mon Sep 17 00:00:00 2001 From: Diego Date: Tue, 21 Jul 2020 15:20:55 -0500 Subject: [PATCH] do my work logan --- Player/Player.tscn | 12 +++++++++++- Sound Effects/Enemy Hit Wall.wav | Bin 0 -> 3814 bytes Sound Effects/Enemy Hit Wall.wav.import | 21 +++++++++++++++++++++ Sound Effects/Enemy Hit.wav | Bin 0 -> 8156 bytes Sound Effects/Enemy Hit.wav.import | 21 +++++++++++++++++++++ ai/BadFireball.tscn | 15 ++++++++++++--- ai/Hell.tscn | 6 +++--- ai/Skeleton Enemy.tscn | 3 +-- ai/ogre.tscn | 2 +- levels/Level 1.tscn | 8 +++++--- levels/test.tscn | 21 +++++++++------------ project.godot | 5 +++++ 12 files changed, 89 insertions(+), 25 deletions(-) create mode 100644 Sound Effects/Enemy Hit Wall.wav create mode 100644 Sound Effects/Enemy Hit Wall.wav.import create mode 100644 Sound Effects/Enemy Hit.wav create mode 100644 Sound Effects/Enemy Hit.wav.import diff --git a/Player/Player.tscn b/Player/Player.tscn index 28584ec..ea15a52 100644 --- a/Player/Player.tscn +++ b/Player/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://script/player.gd" type="Script" id=1] [ext_resource path="res://ui/PlayerStats.tscn" type="PackedScene" id=2] @@ -8,6 +8,8 @@ [ext_resource path="res://art/WizardM.png" type="Texture" id=6] [ext_resource path="res://script/WandPosition.gd" type="Script" id=7] [ext_resource path="res://art/Paralax Dungeon.png" type="Texture" id=8] +[ext_resource path="res://Sound Effects/Enemy Hit.wav" type="AudioStream" id=9] +[ext_resource path="res://Sound Effects/Enemy Hit Wall.wav" type="AudioStream" id=10] [sub_resource type="OccluderPolygon2D" id=1] polygon = PoolVector2Array( -7, 0, -7, -2, -6, -2, -6, -3, -5, -3, -5, -5, -6, -5, -6, -10, -7, -10, -7, -12, -6, -12, -6, -19, -4, -19, -4, -18, -3, -18, -3, -17, 1, -17, 1, -16, 3, -16, 3, -15, 4, -15, 4, -14, 5, -14, 5, -13, 6, -13, 6, -12, 7, -12, 7, -10, 6, -10, 6, -9, 5, -9, 5, -8, 6, -8, 6, -4, 5, -4, 5, 0, -7, 0 ) @@ -134,3 +136,11 @@ motion_mirroring = Vector2( 32, 32 ) [node name="Paralax Dungeon" type="Sprite" parent="ParallaxBackground/ParallaxLayer"] position = Vector2( 192, 90 ) texture = ExtResource( 8 ) + +[node name="Enemy Hit" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 9 ) +volume_db = -8.077 + +[node name="Enemy Hit Wall" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 10 ) +volume_db = -7.068 diff --git a/Sound Effects/Enemy Hit Wall.wav b/Sound Effects/Enemy Hit Wall.wav new file mode 100644 index 0000000000000000000000000000000000000000..daefaefa9d70b75e930b277545b0f93cebf21015 GIT binary patch literal 3814 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 literal 0 HcmV?d00001 diff --git a/Sound Effects/Enemy Hit Wall.wav.import b/Sound Effects/Enemy Hit Wall.wav.import new file mode 100644 index 0000000..6bcbe60 --- /dev/null +++ b/Sound Effects/Enemy Hit Wall.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Enemy Hit Wall.wav-75c061c85b9fcc7a8a29cd67f0cb1c13.sample" + +[deps] + +source_file="res://Sound Effects/Enemy Hit Wall.wav" +dest_files=[ "res://.import/Enemy Hit Wall.wav-75c061c85b9fcc7a8a29cd67f0cb1c13.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/Sound Effects/Enemy Hit.wav b/Sound Effects/Enemy Hit.wav new file mode 100644 index 0000000000000000000000000000000000000000..c19576b1fd051a58058d5e0fcc1adc8851165e49 GIT binary patch literal 8156 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 Jw6*{L^FJuza!~*P literal 0 HcmV?d00001 diff --git a/Sound Effects/Enemy Hit.wav.import b/Sound Effects/Enemy Hit.wav.import new file mode 100644 index 0000000..ec10be1 --- /dev/null +++ b/Sound Effects/Enemy Hit.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Enemy Hit.wav-415e5f25db608ef09f937a69514d2452.sample" + +[deps] + +source_file="res://Sound Effects/Enemy Hit.wav" +dest_files=[ "res://.import/Enemy Hit.wav-415e5f25db608ef09f937a69514d2452.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/ai/BadFireball.tscn b/ai/BadFireball.tscn index 817196b..9d9dea6 100644 --- a/ai/BadFireball.tscn +++ b/ai/BadFireball.tscn @@ -1,9 +1,11 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://ai/Hell Projectile.gd" type="Script" id=1] [ext_resource path="res://art/Fireball.png" type="Texture" id=2] +[ext_resource path="res://Sound Effects/Enemy Hit Wall.wav" type="AudioStream" id=3] +[ext_resource path="res://Sound Effects/Enemy Hit.wav" type="AudioStream" id=4] -[sub_resource type="CircleShape2D" id=2] +[sub_resource type="CircleShape2D" id=1] radius = 4.54199 [node name="KinematicBody2D" type="KinematicBody2D"] @@ -15,4 +17,11 @@ script = ExtResource( 1 ) texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource( 2 ) +shape = SubResource( 1 ) + +[node name="Enemy" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 4 ) +volume_db = -4.039 + +[node name="Enemy2" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 3 ) diff --git a/ai/Hell.tscn b/ai/Hell.tscn index 21e9f2f..ef8ec09 100644 --- a/ai/Hell.tscn +++ b/ai/Hell.tscn @@ -9,7 +9,7 @@ extents = Vector2( 5.06709, 5.78183 ) [sub_resource type="Animation" id=2] -length = 0.65 +length = 0.6 loop = true tracks/0/type = "value" tracks/0/path = NodePath("Hell:frame") @@ -30,11 +30,11 @@ collision_mask = 11 script = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 0, 2 ) +position = Vector2( 0, 1.87833 ) shape = SubResource( 1 ) [node name="Hell" type="Sprite" parent="."] -position = Vector2( -8, -8 ) +position = Vector2( -7.56425, -7.87261 ) texture = ExtResource( 1 ) centered = false hframes = 8 diff --git a/ai/Skeleton Enemy.tscn b/ai/Skeleton Enemy.tscn index bf33baf..c3b3e43 100644 --- a/ai/Skeleton Enemy.tscn +++ b/ai/Skeleton Enemy.tscn @@ -60,11 +60,10 @@ one_shot = true [node name="Position2D" type="Position2D" parent="."] [node name="Skeleton" type="Sprite" parent="."] -modulate = Color( 10, 10, 10, 1 ) position = Vector2( 1, -1 ) texture = ExtResource( 3 ) hframes = 8 -frame = 4 +frame = 2 [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "Skeleton Jump" diff --git a/ai/ogre.tscn b/ai/ogre.tscn index f71e759..814ce84 100644 --- a/ai/ogre.tscn +++ b/ai/ogre.tscn @@ -21,7 +21,7 @@ script = ExtResource( 1 ) position = Vector2( 0, -17 ) texture = ExtResource( 2 ) hframes = 4 -frame = 1 +frame = 2 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] visible = false diff --git a/levels/Level 1.tscn b/levels/Level 1.tscn index 4c7fe12..19f988d 100644 --- a/levels/Level 1.tscn +++ b/levels/Level 1.tscn @@ -6,11 +6,13 @@ [node name="Level 1" type="Node"] -[node name="TileMap" type="TileMap" parent="."] +[node name="TileMap" type="TileMap" parent="." groups=[ +"Tilemap", +]] tile_set = ExtResource( 1 ) cell_size = Vector2( 16, 16 ) format = 1 -tile_data = PoolIntArray( 720896, 0, 196609, 720897, 1610612736, 196610, 720898, 1610612736, 196610, 720899, 1610612736, 196610, 720900, 1610612736, 196610, 720901, 1610612736, 196610, 720902, 1610612736, 196610, 720903, 1610612736, 196610, 720904, 1610612736, 196610, 720905, 1610612736, 196610, 720906, 1610612736, 196610, 720907, 1610612736, 196610, 720908, 1610612736, 196610, 720909, 1610612736, 196610, 720910, 1610612736, 196610, 720911, 1610612736, 196610, 720912, 1610612736, 196610, 720913, 1610612736, 196610, 720914, 1610612736, 196610, 720915, 1610612736, 196610, 720916, 1610612736, 196610, 720917, 1610612736, 196610, 720918, 1610612736, 196610, 720919, 1610612736, 196610, 720920, 1610612736, 196610, 720921, 0, 196610, 720922, 0, 196610, 720923, 0, 196610, 720924, 0, 196610, 720925, 0, 196610, 720926, 0, 196610, 720927, 0, 196610, 720928, 0, 196610, 720929, 0, 196610, 720930, 0, 196610, 720931, 0, 196610, 720932, 0, 196610, 720933, 0, 196611 ) +tile_data = PoolIntArray( 0, 0, 196609, 1, 0, 196610, 2, 0, 196610, 3, 0, 196610, 4, 0, 196610, 5, 0, 196610, 6, 0, 196610, 7, 0, 196610, 8, 0, 196610, 9, 0, 196610, 10, 0, 196610, 11, 0, 196610, 12, 0, 196610, 13, 0, 196610, 14, 0, 196610, 15, 0, 196610, 16, 0, 196610, 17, 0, 196610, 18, 0, 196610, 19, 0, 196610, 20, 0, 196610, 21, 0, 196610, 22, 0, 196610, 23, 0, 196610, 24, 0, 196610, 25, 0, 196610, 26, 0, 196610, 27, 0, 196610, 28, 0, 196610, 29, 0, 196610, 30, 0, 196610, 31, 0, 196610, 32, 0, 196610, 33, 0, 196610, 34, 0, 196610, 35, 0, 196611, 720896, 0, 196609, 720897, 1610612736, 196610, 720898, 1610612736, 196610, 720899, 1610612736, 196610, 720900, 1610612736, 196610, 720901, 1610612736, 196610, 720902, 1610612736, 196610, 720903, 1610612736, 196610, 720904, 1610612736, 196610, 720905, 1610612736, 196610, 720906, 1610612736, 196610, 720907, 1610612736, 196610, 720908, 1610612736, 196610, 720909, 1610612736, 196610, 720910, 1610612736, 196610, 720911, 1610612736, 196610, 720912, 1610612736, 196610, 720913, 1610612736, 196610, 720914, 1610612736, 196610, 720915, 1610612736, 196610, 720916, 1610612736, 196610, 720917, 1610612736, 196610, 720918, 1610612736, 196610, 720919, 1610612736, 196610, 720920, 1610612736, 196610, 720921, 0, 196610, 720922, 0, 196610, 720923, 0, 196610, 720924, 0, 196610, 720925, 0, 196610, 720926, 0, 196610, 720927, 0, 196610, 720928, 0, 196610, 720929, 0, 196610, 720930, 0, 196610, 720931, 0, 196610, 720932, 0, 196610, 720933, 0, 196611 ) [node name="ParallaxBackground" type="ParallaxBackground" parent="."] @@ -22,4 +24,4 @@ texture = ExtResource( 2 ) centered = false [node name="Player" parent="." instance=ExtResource( 3 )] -position = Vector2( 72.96, 153.777 ) +position = Vector2( 92.1555, 139.436 ) diff --git a/levels/test.tscn b/levels/test.tscn index ea69223..b54f8ae 100644 --- a/levels/test.tscn +++ b/levels/test.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1] [ext_resource path="res://meta/DungeonTilemap.tscn" type="PackedScene" id=2] -[ext_resource path="res://ai/ogre.tscn" type="PackedScene" id=3] +[ext_resource path="res://ai/Hell.tscn" type="PackedScene" id=3] +[ext_resource path="res://Music and Fonts(Misc.)/Main music.ogg" type="AudioStream" id=4] [node name="Node2D" type="Node2D"] @@ -12,14 +13,10 @@ tile_data = PoolIntArray( 65536, 0, 8, 65537, 0, 10, 65538, 0, 10, 65539, 0, 10, [node name="Player" parent="." instance=ExtResource( 1 )] position = Vector2( 60, 176 ) -[node name="Ogre" parent="." instance=ExtResource( 3 )] -position = Vector2( 346, 167 ) +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 4 ) +volume_db = -14.136 +autoplay = true -[node name="Ogre2" parent="." instance=ExtResource( 3 )] -position = Vector2( 415, 164 ) - -[node name="Ogre" parent="Ogre2" instance=ExtResource( 3 )] -position = Vector2( 37, -1 ) - -[node name="Ogre2" parent="Ogre2" instance=ExtResource( 3 )] -position = Vector2( 67, -5 ) +[node name="KinematicBody2D" parent="." instance=ExtResource( 3 )] +position = Vector2( 267.022, 161.644 ) diff --git a/project.godot b/project.godot index f635f4f..f3c8e77 100644 --- a/project.godot +++ b/project.godot @@ -161,6 +161,11 @@ inventory={ "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":69,"unicode":0,"echo":false,"script":null) ] } +open={ +"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":70,"unicode":0,"echo":false,"script":null) + ] +} [layer_names]