do my work logan

This commit is contained in:
Diego 2020-07-21 15:20:55 -05:00
parent 2e71f04731
commit 326bc2df93
12 changed files with 89 additions and 25 deletions

View file

@ -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://script/player.gd" type="Script" id=1]
[ext_resource path="res://ui/PlayerStats.tscn" type="PackedScene" id=2] [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://art/WizardM.png" type="Texture" id=6]
[ext_resource path="res://script/WandPosition.gd" type="Script" id=7] [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://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] [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 ) 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"] [node name="Paralax Dungeon" type="Sprite" parent="ParallaxBackground/ParallaxLayer"]
position = Vector2( 192, 90 ) position = Vector2( 192, 90 )
texture = ExtResource( 8 ) 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

Binary file not shown.

View file

@ -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

BIN
Sound Effects/Enemy Hit.wav Normal file

Binary file not shown.

View file

@ -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

View file

@ -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://ai/Hell Projectile.gd" type="Script" id=1]
[ext_resource path="res://art/Fireball.png" type="Texture" id=2] [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 radius = 4.54199
[node name="KinematicBody2D" type="KinematicBody2D"] [node name="KinematicBody2D" type="KinematicBody2D"]
@ -15,4 +17,11 @@ script = ExtResource( 1 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [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 )

View file

@ -9,7 +9,7 @@
extents = Vector2( 5.06709, 5.78183 ) extents = Vector2( 5.06709, 5.78183 )
[sub_resource type="Animation" id=2] [sub_resource type="Animation" id=2]
length = 0.65 length = 0.6
loop = true loop = true
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("Hell:frame") tracks/0/path = NodePath("Hell:frame")
@ -30,11 +30,11 @@ collision_mask = 11
script = ExtResource( 2 ) script = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 2 ) position = Vector2( 0, 1.87833 )
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="Hell" type="Sprite" parent="."] [node name="Hell" type="Sprite" parent="."]
position = Vector2( -8, -8 ) position = Vector2( -7.56425, -7.87261 )
texture = ExtResource( 1 ) texture = ExtResource( 1 )
centered = false centered = false
hframes = 8 hframes = 8

View file

@ -60,11 +60,10 @@ one_shot = true
[node name="Position2D" type="Position2D" parent="."] [node name="Position2D" type="Position2D" parent="."]
[node name="Skeleton" type="Sprite" parent="."] [node name="Skeleton" type="Sprite" parent="."]
modulate = Color( 10, 10, 10, 1 )
position = Vector2( 1, -1 ) position = Vector2( 1, -1 )
texture = ExtResource( 3 ) texture = ExtResource( 3 )
hframes = 8 hframes = 8
frame = 4 frame = 2
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
autoplay = "Skeleton Jump" autoplay = "Skeleton Jump"

View file

@ -21,7 +21,7 @@ script = ExtResource( 1 )
position = Vector2( 0, -17 ) position = Vector2( 0, -17 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
hframes = 4 hframes = 4
frame = 1 frame = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
visible = false visible = false

View file

@ -6,11 +6,13 @@
[node name="Level 1" type="Node"] [node name="Level 1" type="Node"]
[node name="TileMap" type="TileMap" parent="."] [node name="TileMap" type="TileMap" parent="." groups=[
"Tilemap",
]]
tile_set = ExtResource( 1 ) tile_set = ExtResource( 1 )
cell_size = Vector2( 16, 16 ) cell_size = Vector2( 16, 16 )
format = 1 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="."] [node name="ParallaxBackground" type="ParallaxBackground" parent="."]
@ -22,4 +24,4 @@ texture = ExtResource( 2 )
centered = false centered = false
[node name="Player" parent="." instance=ExtResource( 3 )] [node name="Player" parent="." instance=ExtResource( 3 )]
position = Vector2( 72.96, 153.777 ) position = Vector2( 92.1555, 139.436 )

View file

@ -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://Player/Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://meta/DungeonTilemap.tscn" type="PackedScene" id=2] [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"] [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 )] [node name="Player" parent="." instance=ExtResource( 1 )]
position = Vector2( 60, 176 ) position = Vector2( 60, 176 )
[node name="Ogre" parent="." instance=ExtResource( 3 )] [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
position = Vector2( 346, 167 ) stream = ExtResource( 4 )
volume_db = -14.136
autoplay = true
[node name="Ogre2" parent="." instance=ExtResource( 3 )] [node name="KinematicBody2D" parent="." instance=ExtResource( 3 )]
position = Vector2( 415, 164 ) position = Vector2( 267.022, 161.644 )
[node name="Ogre" parent="Ogre2" instance=ExtResource( 3 )]
position = Vector2( 37, -1 )
[node name="Ogre2" parent="Ogre2" instance=ExtResource( 3 )]
position = Vector2( 67, -5 )

View file

@ -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) "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] [layer_names]