Skip to content

Commit

Permalink
Witness Enemy, Shadow Bullet Sprite, More Player Animations
Browse files Browse the repository at this point in the history
Added the witness enemy prototype, filled out some of the player animations, fixed world corruption hitbox.
  • Loading branch information
surfsidegryphon committed Jan 17, 2024
1 parent 26a37e4 commit 2beb455
Show file tree
Hide file tree
Showing 24 changed files with 384 additions and 877 deletions.
Binary file added Assets/EnemySprites/EnemyWitness.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/EnemySprites/EnemyWitness.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://p265uno1pgs5"
path="res://.godot/imported/EnemyWitness.png-9f24b977be1e86f61654c93c0093531c.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/EnemySprites/EnemyWitness.png"
dest_files=["res://.godot/imported/EnemyWitness.png-9f24b977be1e86f61654c93c0093531c.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Assets/PyramidManAnimations.aseprite
Binary file not shown.
Binary file added Assets/PyramidManAnimations.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/PyramidManAnimations.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://rshl87v2ov7x"
path="res://.godot/imported/PyramidManAnimations.png-954c7e177b044f35ddbdbf2758c062c2.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/PyramidManAnimations.png"
dest_files=["res://.godot/imported/PyramidManAnimations.png-954c7e177b044f35ddbdbf2758c062c2.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Assets/PyramidManRunLeft-Sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/PyramidManRunLeft-Sheet.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://b6rkk4pnogu0v"
path="res://.godot/imported/PyramidManRunLeft-Sheet.png-3d538c97f4847cb279752441785adeb1.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/PyramidManRunLeft-Sheet.png"
dest_files=["res://.godot/imported/PyramidManRunLeft-Sheet.png-3d538c97f4847cb279752441785adeb1.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Assets/PyramidManRunRight-Sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/PyramidManRunRight-Sheet.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cc0mgju3pad6c"
path="res://.godot/imported/PyramidManRunRight-Sheet.png-e1616df9d3f836baf72946897f3b4cea.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/PyramidManRunRight-Sheet.png"
dest_files=["res://.godot/imported/PyramidManRunRight-Sheet.png-e1616df9d3f836baf72946897f3b4cea.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Assets/WeaponSprites/ShadowBulletSprite-Sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/WeaponSprites/ShadowBulletSprite-Sheet.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://d3df3db84cltp"
path="res://.godot/imported/ShadowBulletSprite-Sheet.png-181e618a92d95ac91dd3526bb3473833.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/WeaponSprites/ShadowBulletSprite-Sheet.png"
dest_files=["res://.godot/imported/ShadowBulletSprite-Sheet.png-181e618a92d95ac91dd3526bb3473833.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
2 changes: 1 addition & 1 deletion Scenes/Environment/Corruption/WorldCorruption.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ _data = {
}

[sub_resource type="CircleShape2D" id="CircleShape2D_evqbx"]
radius = 13.0
radius = 31.0644

[node name="WorldCorruption" type="Area2D" groups=["Corruption"]]
collision_layer = 3
Expand Down
27 changes: 18 additions & 9 deletions Scenes/Levels/Main1.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=29 format=3 uid="uid://dhyngl3yw2nlk"]
[gd_scene load_steps=31 format=3 uid="uid://dhyngl3yw2nlk"]

[ext_resource type="Script" path="res://Scenes/Levels/Main1.gd" id="1_ifvqx"]
[ext_resource type="Texture2D" uid="uid://rvnog7dr0rk1" path="res://Assets/TX Tileset Grass.png" id="1_o13ts"]
Expand All @@ -13,8 +13,9 @@
[ext_resource type="PackedScene" uid="uid://cj12h42s62ac8" path="res://Scenes/UI/HUD.tscn" id="8_bblo0"]
[ext_resource type="PackedScene" uid="uid://bka6s55gapgh6" path="res://Scenes/Music/LevelMusicPlayer.tscn" id="9_dgq3r"]
[ext_resource type="PackedScene" uid="uid://drjtdncp6aqen" path="res://Scenes/NPC/RedSkeleton/RedSkeleton.tscn" id="11_idxgl"]
[ext_resource type="PackedScene" uid="uid://nta62ow40nvt" path="res://Scenes/UI/PauseScreen.tscn" id="11_ruu0n"]
[ext_resource type="PackedScene" path="res://Scenes/UI/PauseScreen.tscn" id="11_ruu0n"]
[ext_resource type="Texture2D" uid="uid://d3037ujvawr5o" path="res://BoundryTiles.png" id="14_0oqfc"]
[ext_resource type="PackedScene" uid="uid://c0gsn2o8xonou" path="res://Scenes/NPC/Witness/EnemyWitness.tscn" id="16_ky0o4"]

[sub_resource type="Resource" id="Resource_v7bvu"]
script = ExtResource("2_6relg")
Expand Down Expand Up @@ -738,7 +739,7 @@ enemySpawnLocationType = 0

[sub_resource type="Resource" id="Resource_gdhwj"]
script = ExtResource("7_8u0y1")
timeStart = 10
timeStart = 0
timeEnd = 120
enemy = ExtResource("8_0ssgb")
enemyNum = 8
Expand All @@ -749,7 +750,7 @@ enemySpawnLocationType = 1

[sub_resource type="Resource" id="Resource_pa2s0"]
script = ExtResource("7_8u0y1")
timeStart = 60
timeStart = 0
timeEnd = 120
enemy = ExtResource("2_ixrcc")
enemyNum = 2
Expand All @@ -760,7 +761,7 @@ enemySpawnLocationType = 0

[sub_resource type="Resource" id="Resource_hpcv7"]
script = ExtResource("7_8u0y1")
timeStart = 240
timeStart = 0
timeEnd = 600
enemy = ExtResource("11_idxgl")
enemyNum = 10
Expand All @@ -769,6 +770,17 @@ corruptionTier = 0
circleRadius = 0.0
enemySpawnLocationType = 0

[sub_resource type="Resource" id="Resource_i4rnp"]
script = ExtResource("7_8u0y1")
timeStart = 0
timeEnd = 600
enemy = ExtResource("16_ky0o4")
enemyNum = 1
enemySpawnDelay = 10
corruptionTier = 0
circleRadius = 0.0
enemySpawnLocationType = 0

[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_gx0st"]
bounce = 0.25

Expand Down Expand Up @@ -1152,9 +1164,6 @@ layer_0/tile_data = PackedInt32Array(2097165, 524288, 1, 2097166, 458752, 3, 209
position = Vector2(50, 300)
damageInterval = 0.25

[node name="Camera2D" parent="Player" index="4"]
zoom = Vector2(2.5, 2.5)

[node name="PlayerSpawn" type="Marker2D" parent="."]
process_mode = 1
position = Vector2(50, 300)
Expand Down Expand Up @@ -1219,7 +1228,7 @@ color = Color(0.462745, 0.258824, 0.541176, 1)
texture = SubResource("GradientTexture2D_hg7eg")

[node name="EnemySpawner" parent="." instance=ExtResource("6_83mbe")]
spawns = Array[ExtResource("7_8u0y1")]([SubResource("Resource_dfkmv"), SubResource("Resource_gdhwj"), SubResource("Resource_pa2s0"), SubResource("Resource_hpcv7")])
spawns = Array[ExtResource("7_8u0y1")]([SubResource("Resource_dfkmv"), SubResource("Resource_gdhwj"), SubResource("Resource_pa2s0"), SubResource("Resource_hpcv7"), SubResource("Resource_i4rnp")])

[node name="Timer" type="Timer" parent="EnemySpawner"]
autostart = true
Expand Down
Loading

0 comments on commit 2beb455

Please sign in to comment.