From 8e64a3677f3e7bd790ba8e3974d88fce087128ba Mon Sep 17 00:00:00 2001 From: Daniel Tam Date: Thu, 9 Dec 2021 22:35:48 -0600 Subject: [PATCH] added l4 win condition --- Enemies/Demon Boss.gd | 3 +- Enemies/Flaming Skull.gd | 62 +++---- Enemies/Hellhound.gd | 88 ++++----- Enemies/Hellhound.tscn | 113 ++++++++++-- GUI/HUD.gd | 88 ++++----- GUI/Main Menu.gd | 30 ++-- GUI/Splash Screen.gd | 34 ++-- Levels/Level 3.gd | 58 +++--- Levels/Level 4.gd | 26 +-- Levels/Level 4.tscn | 7 +- Levels/Level 5.gd | 4 +- Levels/Objects/icekey.png.import | 1 + Main.gd | 96 +++++----- Player/Player.gd | 170 +++++++++--------- Resources/level4tileset.png.import | 1 + Sprites/Assets/Black_Tile.png.import | 1 + Sprites/Assets/Cliffs.png.import | 1 + Sprites/Assets/DeadTree.png.import | 1 + Sprites/Assets/Dead_Tree.png.import | 1 + Sprites/Assets/DoorClosed.png.import | 1 + Sprites/Assets/DoorOpen.png.import | 1 + Sprites/Assets/Grass.png.import | 1 + Sprites/Assets/JournalScrap.png.import | 1 + Sprites/Assets/Key.png.import | 1 + Sprites/Assets/Plants and Trees.png.import | 1 + Sprites/Assets/Resources_Basic.png.import | 1 + Sprites/Assets/Shadow.png.import | 1 + Sprites/Assets/Skull.png.import | 1 + Sprites/Assets/Transparent_16x16.png.import | 1 + Sprites/Assets/blue_star_225.png.import | 1 + Sprites/Assets/blue_star_45.png.import | 1 + .../Assets/bule_star_sprite_spread.png.import | 1 + Sprites/Assets/cliffTileset.png.import | 1 + Sprites/Assets/darkForestTileset.png.import | 1 + .../Assets/fire_column_medium_1.png.import | 1 + .../Assets/fire_column_medium_10.png.import | 1 + .../Assets/fire_column_medium_11.png.import | 1 + .../Assets/fire_column_medium_12.png.import | 1 + .../Assets/fire_column_medium_13.png.import | 1 + .../Assets/fire_column_medium_14.png.import | 1 + .../Assets/fire_column_medium_2.png.import | 1 + .../Assets/fire_column_medium_3.png.import | 1 + .../Assets/fire_column_medium_4.png.import | 1 + .../Assets/fire_column_medium_5.png.import | 1 + .../Assets/fire_column_medium_6.png.import | 1 + .../Assets/fire_column_medium_7.png.import | 1 + .../Assets/fire_column_medium_8.png.import | 1 + .../Assets/fire_column_medium_9.png.import | 1 + Sprites/Assets/flame_06.png.import | 1 + Sprites/Assets/forestHouse.png.import | 1 + Sprites/Assets/ghost-appears.png.import | 1 + Sprites/Assets/ghost-idle.png.import | 1 + Sprites/Assets/ghost-shriek.png.import | 1 + Sprites/Assets/ghost-vanish.png.import | 1 + Sprites/Assets/global.png.import | 1 + Sprites/Assets/grassPatch.png.import | 1 + Sprites/Assets/light_02.png.import | 1 + ...t_mk_16_16_nature_tileset_godot.png.import | 1 + Sprites/Assets/transparent16x16.png.import | 1 + Sprites/Assets/treasureChest.png.import | 1 + Sprites/Assets/treasureChestOpen.png.import | 1 + .../Demon_Slime_Spritesheet.png.import | 1 + .../Enemies/Flaming_Skull_Design.png.import | 1 + Sprites/Enemies/Hell_Hound_Idle.png.import | 1 + Sprites/Enemies/Hell_Hound_Jump.png.import | 1 + Sprites/Enemies/Hell_Hound_Run.png.import | 1 + Sprites/Enemies/Hell_Hound_Walk.png.import | 1 + .../Projectiles/Iceball_84x9.png.import | 1 + ...e_FREE_v1.0_288x160_spritesheet.png.import | 1 + .../Enemies/flaming skull design.png.import | 1 + Sprites/Enemies/hell-hound-idle.png.import | 1 + Sprites/Enemies/hell-hound-jump.png.import | 1 + Sprites/Enemies/hell-hound-run.png.import | 1 + .../Fire_Column_Medium_01.png.import | 1 + .../Fire_Column_Medium_02.png.import | 1 + .../Fire_Column_Medium_03.png.import | 1 + .../Fire_Column_Medium_04.png.import | 1 + .../Fire_Column_Medium_05.png.import | 1 + .../Fire_Column_Medium_06.png.import | 1 + .../Fire_Column_Medium_07.png.import | 1 + .../Fire_Column_Medium_08.png.import | 1 + .../Fire_Column_Medium_09.png.import | 1 + .../Fire_Column_Medium_10.png.import | 1 + .../Fire_Column_Medium_11.png.import | 1 + .../Fire_Column_Medium_12.png.import | 1 + .../Fire_Column_Medium_13.png.import | 1 + .../Fire_Column_Medium_14.png.import | 1 + .../Levels/Interactables/Gold_Key.png.import | 1 + .../Interactables/Level_Portal.png.import | 1 + .../Treasure_Chest_Closed.png.import | 1 + .../Treasure_Chest_Open.png.import | 1 + .../Levels/Interactables/icekey.png.import | 1 + Sprites/Levels/Objects/Gate_Closed.png.import | 1 + Sprites/Levels/Objects/Gate_Open.png.import | 1 + .../Tilesets/Hub_World_Grass_Atlas.png.import | 1 + .../Back_To_Hub_Button_Hover.png.import | 1 + .../Back_To_Hub_Button_Normal.png.import | 1 + project.godot | 14 +- 98 files changed, 527 insertions(+), 350 deletions(-) diff --git a/Enemies/Demon Boss.gd b/Enemies/Demon Boss.gd index 560e715..9a60694 100644 --- a/Enemies/Demon Boss.gd +++ b/Enemies/Demon Boss.gd @@ -7,7 +7,7 @@ var velocity: Vector2 = Vector2.ZERO var health: int = 15 var hit: bool = false var counter: int = 0 - +signal demon_boss_death func _physics_process(_delta: float) -> void: velocity = Vector2.ZERO @@ -60,6 +60,7 @@ func _on_hitbox_area_entered(area: Area2D) -> void: if health <= 0: call_deferred('queue_free') + emit_signal("demon_boss_death") return func _on_Player_Detector__Attack_body_entered(body: Node) -> void: diff --git a/Enemies/Flaming Skull.gd b/Enemies/Flaming Skull.gd index bdab410..1aa4719 100644 --- a/Enemies/Flaming Skull.gd +++ b/Enemies/Flaming Skull.gd @@ -10,49 +10,49 @@ var counter: int = 0 func _physics_process(_delta: float) -> void: - velocity = Vector2.ZERO + velocity = Vector2.ZERO - if player and position.distance_to(player.position) > 1: - velocity = position.direction_to(player.position).normalized() * SPEED + if player and position.distance_to(player.position) > 1: + velocity = position.direction_to(player.position).normalized() * SPEED - if hit == true: - if counter < 15: - if counter % 5 == 0: - $AnimatedSprite.visible = false - else: - $AnimatedSprite.visible = true - counter += 1 - velocity = Vector2.ZERO - else: - counter = 0 - hit = false + if hit == true: + if counter < 15: + if counter % 5 == 0: + $AnimatedSprite.visible = false + else: + $AnimatedSprite.visible = true + counter += 1 + velocity = Vector2.ZERO + else: + counter = 0 + hit = false - velocity = move_and_slide(velocity) - return + velocity = move_and_slide(velocity) + return func _on_player_detector_body_entered(body: Node) -> void: - if body.is_in_group('player'): - player = body - return + if body.is_in_group('player'): + player = body + return func _on_player_detector_body_exited(body: Node) -> void: - if body.is_in_group('player'): - player = null - return + if body.is_in_group('player'): + player = null + return func _on_hitbox_area_entered(area: Area2D) -> void: - if area.is_in_group('player_weapon_1'): - health -= 1 - hit = true - elif area.is_in_group('player_weapon_2'): - health -= 2 - hit = true + if area.is_in_group('player_weapon_1'): + health -= 1 + hit = true + elif area.is_in_group('player_weapon_2'): + health -= 2 + hit = true - if health <= 0: - call_deferred('queue_free') - return + if health <= 0: + call_deferred('queue_free') + return diff --git a/Enemies/Hellhound.gd b/Enemies/Hellhound.gd index e70b5d2..580aca9 100644 --- a/Enemies/Hellhound.gd +++ b/Enemies/Hellhound.gd @@ -10,65 +10,65 @@ var counter: int = 0 func _physics_process(_delta: float) -> void: - velocity = Vector2.ZERO + velocity = Vector2.ZERO - if player and position.distance_to(player.position) > 1: - velocity = position.direction_to(player.position).normalized() * SPEED - var angle = position.angle_to_point(player.position) - if abs(angle) > PI/2: - $AnimatedSprite1.scale.x = -0.563 - else: - $AnimatedSprite1.scale.x = 0.563 + if player and position.distance_to(player.position) > 1: + velocity = position.direction_to(player.position).normalized() * SPEED + var angle = position.angle_to_point(player.position) + if abs(angle) > PI/2: + $AnimatedSprite1.scale.x = -0.563 + else: + $AnimatedSprite1.scale.x = 0.563 - if hit == true: - if counter < 15: - if counter % 5 == 0: - $AnimatedSprite1.visible = false - else: - $AnimatedSprite1.visible = true - counter += 1 - velocity = Vector2.ZERO - else: - counter = 0 - hit = false + if hit == true: + if counter < 15: + if counter % 5 == 0: + $AnimatedSprite1.visible = false + else: + $AnimatedSprite1.visible = true + counter += 1 + velocity = Vector2.ZERO + else: + counter = 0 + hit = false - velocity = move_and_slide(velocity) - return + velocity = move_and_slide(velocity) + return func _on_player_detector_body_entered(body: Node) -> void: - if body.is_in_group('player'): - player = body - $AnimatedSprite1.animation = 'Running' - return + if body.is_in_group('player'): + player = body + $AnimatedSprite1.animation = 'Running' + return func _on_player_detector_body_exited(body: Node) -> void: - if body.is_in_group('player'): - player = null - $AnimatedSprite1.animation = 'Idle' - return + if body.is_in_group('player'): + player = null + $AnimatedSprite1.animation = 'Idle' + return func _on_hitbox_area_entered(area: Area2D) -> void: - if area.is_in_group('player_weapon_1'): - health -= 1 - hit = true - elif area.is_in_group('player_weapon_2'): - health -= 2 - hit = true + if area.is_in_group('player_weapon_1'): + health -= 1 + hit = true + elif area.is_in_group('player_weapon_2'): + health -= 2 + hit = true - if health <= 0: - call_deferred('queue_free') - return + if health <= 0: + call_deferred('queue_free') + return func _on_Player_Detector__Attack_body_entered(body: Node) -> void: - if body.is_in_group('player'): - player = body - $AnimatedSprite1.animation = 'Jump' + if body.is_in_group('player'): + player = body + $AnimatedSprite1.animation = 'Jump' func _on_Player_Detector__Attack_body_exited(body: Node) -> void: - if body.is_in_group('player'): - player = body - $AnimatedSprite1.animation = 'Running' + if body.is_in_group('player'): + player = body + $AnimatedSprite1.animation = 'Running' diff --git a/Enemies/Hellhound.tscn b/Enemies/Hellhound.tscn index d5b976b..be28996 100644 --- a/Enemies/Hellhound.tscn +++ b/Enemies/Hellhound.tscn @@ -1,10 +1,99 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=30 format=2] [ext_resource path="res://Resources/Level_5_Enemy_Glowing_Ghost_Occluder.tres" type="OccluderPolygon2D" id=1] [ext_resource path="res://Sprites/Assets/Light.png" type="Texture" id=2] +[ext_resource path="res://Sprites/Enemies/Hell_Hound_Run.png" type="Texture" id=3] [ext_resource path="res://Enemies/Hellhound.gd" type="Script" id=4] +[ext_resource path="res://Sprites/Enemies/Hell_Hound_Idle.png" type="Texture" id=5] +[ext_resource path="res://Sprites/Enemies/Hell_Hound_Jump.png" type="Texture" id=6] [ext_resource path="res://Sprites/Enemies/Chasing_Glowing_Ghost.png" type="Texture" id=7] +[sub_resource type="AtlasTexture" id=5] +atlas = ExtResource( 6 ) +region = Rect2( 0, 0, 65, 48 ) + +[sub_resource type="AtlasTexture" id=6] +atlas = ExtResource( 6 ) +region = Rect2( 65, 0, 65, 48 ) + +[sub_resource type="AtlasTexture" id=7] +atlas = ExtResource( 6 ) +region = Rect2( 130, 0, 65, 48 ) + +[sub_resource type="AtlasTexture" id=8] +atlas = ExtResource( 6 ) +region = Rect2( 195, 0, 65, 48 ) + +[sub_resource type="AtlasTexture" id=9] +atlas = ExtResource( 6 ) +region = Rect2( 260, 0, 65, 48 ) + +[sub_resource type="AtlasTexture" id=10] +atlas = ExtResource( 6 ) +region = Rect2( 325, 0, 65, 48 ) + +[sub_resource type="AtlasTexture" id=11] +atlas = ExtResource( 3 ) +region = Rect2( 0, 0, 67, 32 ) + +[sub_resource type="AtlasTexture" id=12] +atlas = ExtResource( 3 ) +region = Rect2( 67, 0, 67, 32 ) + +[sub_resource type="AtlasTexture" id=13] +atlas = ExtResource( 3 ) +region = Rect2( 134, 0, 67, 32 ) + +[sub_resource type="AtlasTexture" id=14] +atlas = ExtResource( 3 ) +region = Rect2( 201, 0, 67, 32 ) + +[sub_resource type="AtlasTexture" id=15] +atlas = ExtResource( 3 ) +region = Rect2( 268, 0, 67, 32 ) + +[sub_resource type="AtlasTexture" id=16] +atlas = ExtResource( 5 ) +region = Rect2( 0, 0, 64, 32 ) + +[sub_resource type="AtlasTexture" id=17] +atlas = ExtResource( 5 ) +region = Rect2( 64, 0, 64, 32 ) + +[sub_resource type="AtlasTexture" id=18] +atlas = ExtResource( 5 ) +region = Rect2( 128, 0, 64, 32 ) + +[sub_resource type="AtlasTexture" id=19] +atlas = ExtResource( 5 ) +region = Rect2( 192, 0, 64, 32 ) + +[sub_resource type="AtlasTexture" id=20] +atlas = ExtResource( 5 ) +region = Rect2( 256, 0, 64, 32 ) + +[sub_resource type="AtlasTexture" id=21] +atlas = ExtResource( 5 ) +region = Rect2( 320, 0, 64, 32 ) + +[sub_resource type="SpriteFrames" id=22] +animations = [ { +"frames": [ SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ], +"loop": true, +"name": "Jump", +"speed": 5.0 +}, { +"frames": [ SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 15 ) ], +"loop": true, +"name": "Running", +"speed": 5.0 +}, { +"frames": [ SubResource( 16 ), SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ) ], +"loop": true, +"name": "Idle", +"speed": 5.0 +} ] + [sub_resource type="CapsuleShape2D" id=1] radius = 1.5 height = 3.0 @@ -19,9 +108,7 @@ radius = 82.0061 [sub_resource type="CircleShape2D" id=4] radius = 25.02 -[node name="Hellhound" type="KinematicBody2D" groups=[ -"enemy", -]] +[node name="Hellhound" type="KinematicBody2D" groups=["enemy"]] light_mask = 0 collision_layer = 4 collision_mask = 5 @@ -31,6 +118,8 @@ script = ExtResource( 4 ) light_mask = 0 position = Vector2( 1, -3 ) scale = Vector2( 0.5625, 0.5625 ) +frames = SubResource( 22 ) +animation = "Idle" playing = true [node name="Sprite" type="Sprite" parent="."] @@ -46,9 +135,7 @@ light_mask = 0 rotation = 1.5708 shape = SubResource( 1 ) -[node name="Hitbox" type="Area2D" parent="." groups=[ -"enemy_hitbox_1", -]] +[node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox_1"]] light_mask = 0 collision_layer = 4 collision_mask = 2 @@ -60,10 +147,10 @@ shape = SubResource( 2 ) [node name="Player Detector" type="Area2D" parent="."] light_mask = 0 -input_pickable = false -monitorable = false collision_layer = 0 collision_mask = 2 +input_pickable = false +monitorable = false [node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector"] visible = false @@ -72,20 +159,20 @@ shape = SubResource( 3 ) [node name="Player Detector - Attack" type="Area2D" parent="."] light_mask = 0 -input_pickable = false -monitorable = false collision_layer = 0 collision_mask = 2 +input_pickable = false +monitorable = false [node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector - Attack"] shape = SubResource( 4 ) [node name="Player Detector - Attack2" type="Area2D" parent="."] light_mask = 0 -input_pickable = false -monitorable = false collision_layer = 0 collision_mask = 2 +input_pickable = false +monitorable = false [node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector - Attack2"] shape = SubResource( 4 ) diff --git a/GUI/HUD.gd b/GUI/HUD.gd index 34f8d12..e68aee9 100644 --- a/GUI/HUD.gd +++ b/GUI/HUD.gd @@ -5,76 +5,76 @@ var weapon = "sword" func _on_Add_Currency_pressed() -> void: - emit_signal('add_currency', 1) - return + emit_signal('add_currency', 1) + return func update_currency(amount: int) -> void: - $Currency.set_text(String(amount)) - return + $Currency.set_text(String(amount)) + return func update_health(value: int) -> void: - $'Health Bar'.value = value - return + $'Health Bar'.value = value + return func _on_weapon_slot_pressed() -> void: - $'Weapon Selection'.set_visible(not $'Weapon Selection'.visible) - return + $'Weapon Selection'.set_visible(not $'Weapon Selection'.visible) + return func _on_select_bow_pressed() -> void: - $'Weapon Selection/Bow'.set_visible(false) - $'Equipped Weapon/Weapon'.set_normal_texture( - $'Weapon Selection/Bow/Weapon'.get_normal_texture()) + $'Weapon Selection/Bow'.set_visible(false) + $'Equipped Weapon/Weapon'.set_normal_texture( + $'Weapon Selection/Bow/Weapon'.get_normal_texture()) - $'Weapon Selection/Javelin'.set_visible(true) - $'Weapon Selection/Staff'.set_visible(true) - $'Weapon Selection/Sword'.set_visible(true) + $'Weapon Selection/Javelin'.set_visible(true) + $'Weapon Selection/Staff'.set_visible(true) + $'Weapon Selection/Sword'.set_visible(true) - $'Weapon Selection'.set_visible(false) - weapon = "bow" - return + $'Weapon Selection'.set_visible(false) + weapon = "bow" + return func _on_select_javelin_pressed() -> void: - $'Weapon Selection/Javelin'.set_visible(false) - $'Equipped Weapon/Weapon'.set_normal_texture( - $'Weapon Selection/Javelin/Weapon'.get_normal_texture()) + $'Weapon Selection/Javelin'.set_visible(false) + $'Equipped Weapon/Weapon'.set_normal_texture( + $'Weapon Selection/Javelin/Weapon'.get_normal_texture()) - $'Weapon Selection/Bow'.set_visible(true) - $'Weapon Selection/Staff'.set_visible(true) - $'Weapon Selection/Sword'.set_visible(true) + $'Weapon Selection/Bow'.set_visible(true) + $'Weapon Selection/Staff'.set_visible(true) + $'Weapon Selection/Sword'.set_visible(true) - $'Weapon Selection'.set_visible(false) - weapon = "javelin" - return + $'Weapon Selection'.set_visible(false) + weapon = "javelin" + return func _on_select_staff_pressed() -> void: - $'Weapon Selection/Staff'.set_visible(false) - $'Equipped Weapon/Weapon'.set_normal_texture( - $'Weapon Selection/Staff/Weapon'.get_normal_texture()) + $'Weapon Selection/Staff'.set_visible(false) + $'Equipped Weapon/Weapon'.set_normal_texture( + $'Weapon Selection/Staff/Weapon'.get_normal_texture()) - $'Weapon Selection/Bow'.set_visible(true) - $'Weapon Selection/Javelin'.set_visible(true) - $'Weapon Selection/Sword'.set_visible(true) + $'Weapon Selection/Bow'.set_visible(true) + $'Weapon Selection/Javelin'.set_visible(true) + $'Weapon Selection/Sword'.set_visible(true) - $'Weapon Selection'.set_visible(false) - weapon = "staff" - return + $'Weapon Selection'.set_visible(false) + weapon = "staff" + return func _on_select_sword_pressed() -> void: - $'Weapon Selection/Sword'.set_visible(false) - $'Equipped Weapon/Weapon'.set_normal_texture( - $'Weapon Selection/Sword/Weapon'.get_normal_texture()) + $'Weapon Selection/Sword'.set_visible(false) + $'Equipped Weapon/Weapon'.set_normal_texture( + $'Weapon Selection/Sword/Weapon'.get_normal_texture()) - $'Weapon Selection/Bow'.set_visible(true) - $'Weapon Selection/Javelin'.set_visible(true) - $'Weapon Selection/Staff'.set_visible(true) + $'Weapon Selection/Bow'.set_visible(true) + $'Weapon Selection/Javelin'.set_visible(true) + $'Weapon Selection/Staff'.set_visible(true) - $'Weapon Selection'.set_visible(false) - weapon = "sword" - return + $'Weapon Selection'.set_visible(false) + weapon = "sword" + return diff --git a/GUI/Main Menu.gd b/GUI/Main Menu.gd index dbfe113..f003653 100644 --- a/GUI/Main Menu.gd +++ b/GUI/Main Menu.gd @@ -4,36 +4,36 @@ signal complete(option) func _on_new_game_button_pressed() -> void: - emit_signal('complete', 'new game') - return + emit_signal('complete', 'new game') + return func _on_quit_button_pressed() -> void: - get_tree().quit() - return + get_tree().quit() + return func _on_continue_button_mouse_entered() -> void: - if not $'Menu/Menu Elements/Menu Options/Continue/Continue Button'.disabled: - $'Menu Button Hover'.play(0.0) - return + if not $'Menu/Menu Elements/Menu Options/Continue/Continue Button'.disabled: + $'Menu Button Hover'.play(0.0) + return func _on_new_game_button_mouse_entered() -> void: - $'Menu Button Hover'.play(0.0) - return + $'Menu Button Hover'.play(0.0) + return func _on_settings_button_mouse_entered() -> void: - $'Menu Button Hover'.play(0.0) - return + $'Menu Button Hover'.play(0.0) + return func _on_credits_button_mouse_entered() -> void: - $'Menu Button Hover'.play(0.0) - return + $'Menu Button Hover'.play(0.0) + return func _on_quit_button_mouse_entered() -> void: - $'Menu Button Hover'.play(0.0) - return + $'Menu Button Hover'.play(0.0) + return diff --git a/GUI/Splash Screen.gd b/GUI/Splash Screen.gd index c205b99..af414e3 100644 --- a/GUI/Splash Screen.gd +++ b/GUI/Splash Screen.gd @@ -4,26 +4,26 @@ signal complete func _ready() -> void: - # Fade in - if not $Tween.interpolate_property(self, 'self_modulate:a', 0, 1, 3, Tween.TRANS_LINEAR, Tween.EASE_IN): - print('ERROR: Splash Screen fade in animation has errors.') - if not $Tween.start(): - print('ERROR: Splash Screen fade in animation failed to start.') + # Fade in + if not $Tween.interpolate_property(self, 'self_modulate:a', 0, 1, 3, Tween.TRANS_LINEAR, Tween.EASE_IN): + print('ERROR: Splash Screen fade in animation has errors.') + if not $Tween.start(): + print('ERROR: Splash Screen fade in animation failed to start.') - yield($Tween, 'tween_completed') # Wait for fade in to complete + yield($Tween, 'tween_completed') # Wait for fade in to complete - # Fade out - if not $Tween.interpolate_property(self, 'self_modulate:a', 1, 0, 3, Tween.TRANS_LINEAR, Tween.EASE_OUT, 2): - print('ERROR: Splash Screen fade out animation has errors.') - if not $Tween.start(): - print('ERROR: Splash Screen fade out animation failed to start.') + # Fade out + if not $Tween.interpolate_property(self, 'self_modulate:a', 1, 0, 3, Tween.TRANS_LINEAR, Tween.EASE_OUT, 2): + print('ERROR: Splash Screen fade out animation has errors.') + if not $Tween.start(): + print('ERROR: Splash Screen fade out animation failed to start.') - yield($Tween, 'tween_completed') # Wait for fade out to complete - emit_signal('complete') - return + yield($Tween, 'tween_completed') # Wait for fade out to complete + emit_signal('complete') + return func _input(event: InputEvent) -> void: - if event.is_action_pressed('ui_accept'): - emit_signal('complete') - return + if event.is_action_pressed('ui_accept'): + emit_signal('complete') + return diff --git a/Levels/Level 3.gd b/Levels/Level 3.gd index 88375db..2669cd1 100644 --- a/Levels/Level 3.gd +++ b/Levels/Level 3.gd @@ -7,50 +7,50 @@ var score = 0 func _ready() -> void: - $YSort/Player.load_hud($HUD) - screensize = get_viewport_rect().size - spawn_coins(8) - return + $YSort/Player.load_hud($HUD) + screensize = get_viewport_rect().size + spawn_coins(8) + return func spawn_coins(num: int) -> void: - for _i in range(num): - var g: Node = coin.instance() - $'coin_container'.add_child(g) - g.connect('coin_grabbed', self, '_on_coin_grabbed') - #g.set_pos(Vector2(rand_range(0, screensize.x - 40), rand_range(0, screensize.y - 40))) - g.position = Vector2(rand_range(0, screensize.x - 40), rand_range(0, screensize.y - 40)) - return + for _i in range(num): + var g: Node = coin.instance() + $'coin_container'.add_child(g) + g.connect('coin_grabbed', self, '_on_coin_grabbed') + #g.set_pos(Vector2(rand_range(0, screensize.x - 40), rand_range(0, screensize.y - 40))) + g.position = Vector2(rand_range(0, screensize.x - 40), rand_range(0, screensize.y - 40)) + return func _on_coin_grabbed() -> void: - score += 1 - print(score) - $'Level 3 HUD/Label'.set_text(str(score) + '/5') - return + score += 1 + print(score) + $'Level 3 HUD/Label'.set_text(str(score) + '/5') + return func _timer_out() -> void: - get_tree().change_scene('res://Levels/Hub World.tscn') - return + get_tree().change_scene('res://Levels/Hub World.tscn') + return func _on_TreasureChest_ice_key_collected() -> void: - $YSort/Door/doorClosed.visible = false - $YSort/Door/doorOpened.visible = true - $YSort/DoorCollision.layers = 5 - return + $YSort/Door/doorClosed.visible = false + $YSort/Door/doorOpened.visible = true + $YSort/DoorCollision.layers = 5 + return func _on_DoorDetector_body_entered(body: Node) -> void: - if body.is_in_group('player'): - print('WIN WIN WIN') - get_tree().change_scene('res://Levels/Hub World.tscn') - return + if body.is_in_group('player'): + print('WIN WIN WIN') + get_tree().change_scene('res://Levels/Hub World.tscn') + return func _on_DoorDetector_area_entered(area: Area2D) -> void: - if area.get_parent().name == 'Player': - print('WIN WIN WIN') - get_tree().change_scene('res://Levels/Hub World.tscn') - return + if area.get_parent().name == 'Player': + print('WIN WIN WIN') + get_tree().change_scene('res://Levels/Hub World.tscn') + return diff --git a/Levels/Level 4.gd b/Levels/Level 4.gd index 2bb0e4d..30a4b48 100644 --- a/Levels/Level 4.gd +++ b/Levels/Level 4.gd @@ -3,22 +3,26 @@ extends Node2D var gems: int = 4 func _ready() -> void: - #$YSort/Player.position = get_viewport_rect().size / 2 - $YSort/Player.load_hud($HUD) - return + #$YSort/Player.position = get_viewport_rect().size / 2 + $YSort/Player.load_hud($HUD) + return func _on_TreasureChest_gem_collected() -> void: - gems -= 1 + gems -= 1 - if gems == 0: - $YSort/Items/Door/doorClosed.visible = false - $YSort/Items/Door/doorOpened.visible = true - $DoorCollision.layers = 5 + if gems == 0: + $YSort/Items/Door/doorClosed.visible = false + $YSort/Items/Door/doorOpened.visible = true + $DoorCollision.layers = 5 func _on_NextArea_area_entered(area: Area2D) -> void: - if area.get_parent().name == 'Player': - $YSort/Player.position.x = 195 - $YSort/Player.position.y = -335 + if area.get_parent().name == 'Player': + $YSort/Player.position.x = 195 + $YSort/Player.position.y = -335 + + +func _on_Demon_Boss_demon_boss_death() -> void: + get_tree().change_scene('res://Levels/Hub World.tscn') diff --git a/Levels/Level 4.tscn b/Levels/Level 4.tscn index 29d7252..befe9c5 100644 --- a/Levels/Level 4.tscn +++ b/Levels/Level 4.tscn @@ -86,21 +86,21 @@ tile_data = PoolIntArray( -2686978, 0, 5, -2686977, 0, 196610, -2752512, 0, 1966 [node name="Fire3" type="AnimatedSprite" parent="."] position = Vector2( -607.628, -210.601 ) frames = SubResource( 1 ) -frame = 12 +frame = 10 playing = true offset = Vector2( 679.819, 333.222 ) [node name="Fire2" type="AnimatedSprite" parent="."] position = Vector2( -543.25, -212.563 ) frames = SubResource( 1 ) -frame = 1 +frame = 13 playing = true offset = Vector2( 679.819, 333.222 ) [node name="Fire1" type="AnimatedSprite" parent="."] position = Vector2( -479.806, -214.167 ) frames = SubResource( 1 ) -frame = 8 +frame = 6 playing = true offset = Vector2( 679.819, 333.222 ) @@ -220,6 +220,7 @@ collision_mask = 2 position = Vector2( 200, -56 ) shape = SubResource( 5 ) +[connection signal="demon_boss_death" from="YSort/Enemies/Demon Boss" to="." method="_on_Demon_Boss_demon_boss_death"] [connection signal="gem_collected" from="YSort/Items/TreasureChest" to="." method="_on_TreasureChest_gem_collected"] [connection signal="gem_collected" from="YSort/Items/TreasureChest2" to="." method="_on_TreasureChest_gem_collected"] [connection signal="gem_collected" from="YSort/Items/TreasureChest3" to="." method="_on_TreasureChest_gem_collected"] diff --git a/Levels/Level 5.gd b/Levels/Level 5.gd index 06b26e7..5c4d9ab 100644 --- a/Levels/Level 5.gd +++ b/Levels/Level 5.gd @@ -2,5 +2,5 @@ extends Node2D func _ready() -> void: - $YSort/Player.load_hud($HUD) - return + $YSort/Player.load_hud($HUD) + return diff --git a/Levels/Objects/icekey.png.import b/Levels/Objects/icekey.png.import index 9cd8757..f74f1da 100644 --- a/Levels/Objects/icekey.png.import +++ b/Levels/Objects/icekey.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Main.gd b/Main.gd index 945f699..885c5eb 100644 --- a/Main.gd +++ b/Main.gd @@ -7,76 +7,76 @@ export var hub_world_path: String func _ready() -> void: - randomize() - var splash_screen: Node = play_splash_screen() - yield(splash_screen, 'complete') - splash_screen = null + randomize() + var splash_screen: Node = play_splash_screen() + yield(splash_screen, 'complete') + splash_screen = null - var main_menu: Node = play_main_menu() - yield(main_menu, 'complete') - free_connected_node(main_menu, 'main_menu_option') - main_menu = null - return + var main_menu: Node = play_main_menu() + yield(main_menu, 'complete') + free_connected_node(main_menu, 'main_menu_option') + main_menu = null + return func play_splash_screen() -> Node: - var splash_screen: Node = load(splash_screen_path).instance() - if splash_screen.connect('complete', self, 'free_connected_node', - [splash_screen, 'free_connected_node']) != OK: - print('ERROR: Splash Screen "complete" signal already connected.') + var splash_screen: Node = load(splash_screen_path).instance() + if splash_screen.connect('complete', self, 'free_connected_node', + [splash_screen, 'free_connected_node']) != OK: + print('ERROR: Splash Screen "complete" signal already connected.') - add_child(splash_screen) - return splash_screen + add_child(splash_screen) + return splash_screen func play_main_menu() -> Node: - var main_menu: Node = load(main_menu_path).instance() - if main_menu.connect('complete', self, 'main_menu_option') != OK: - print('ERROR: Main Menu "complete" signal already connected.') + var main_menu: Node = load(main_menu_path).instance() + if main_menu.connect('complete', self, 'main_menu_option') != OK: + print('ERROR: Main Menu "complete" signal already connected.') - add_child(main_menu) - return main_menu + add_child(main_menu) + return main_menu func main_menu_option(option: String) -> void: - if option == 'new game': - if get_tree().change_scene(hub_world_path) != OK: - print('ERROR: Main failed to change scene to Hub World.') - queue_free() - #var level_select_menu: Node = play_level_select_menu() - #yield(level_select_menu, 'complete') - #free_connected_node(level_select_menu, 'level_select_menu_option') - #level_select_menu = null - return + if option == 'new game': + if get_tree().change_scene(hub_world_path) != OK: + print('ERROR: Main failed to change scene to Hub World.') + queue_free() + #var level_select_menu: Node = play_level_select_menu() + #yield(level_select_menu, 'complete') + #free_connected_node(level_select_menu, 'level_select_menu_option') + #level_select_menu = null + return func play_level_select_menu() -> Node: - var level_select_menu: Node = load(level_select_menu_path).instance() - if level_select_menu.connect('complete', self, 'level_select_menu_option') != OK: - print('ERROR: Level Select Menu "complete" signal already connected.') + var level_select_menu: Node = load(level_select_menu_path).instance() + if level_select_menu.connect('complete', self, 'level_select_menu_option') != OK: + print('ERROR: Level Select Menu "complete" signal already connected.') - add_child(level_select_menu) - return level_select_menu + add_child(level_select_menu) + return level_select_menu func level_select_menu_option(option: String) -> void: - var level: String = 'res://Levels/' - if option == 'H': - level += 'Hub World.tscn' - else: - level += 'Level ' + option + '.tscn' + var level: String = 'res://Levels/' + if option == 'H': + level += 'Hub World.tscn' + else: + level += 'Level ' + option + '.tscn' - new_game(level) - return + new_game(level) + return func free_connected_node(node: Node, connected_function: String) -> void: - node.disconnect('complete', self, connected_function) - node.queue_free() - return + node.disconnect('complete', self, connected_function) + node.queue_free() + return func new_game(level: String) -> void: - if get_tree().change_scene(level) != OK: - print('ERROR: Main failed to change scene to Level.') - queue_free() - return + if get_tree().change_scene(level) != OK: + print('ERROR: Main failed to change scene to Level.') + queue_free() + return diff --git a/Player/Player.gd b/Player/Player.gd index 9d2e3aa..080d568 100644 --- a/Player/Player.gd +++ b/Player/Player.gd @@ -14,135 +14,135 @@ var velocity: Vector2 = Vector2.ZERO func _ready() -> void: - set_weapon_position(Vector2(1, 0)) - return + set_weapon_position(Vector2(1, 0)) + return func _physics_process(delta: float) -> void: - var input_vector: Vector2 = Vector2.ZERO + var input_vector: Vector2 = Vector2.ZERO - input_vector.x = Input.get_action_strength('player_right') \ - - Input.get_action_strength('player_left') - input_vector.y = Input.get_action_strength('player_down') \ - - Input.get_action_strength('player_up') - input_vector = input_vector.normalized() + input_vector.x = Input.get_action_strength('player_right') \ + - Input.get_action_strength('player_left') + input_vector.y = Input.get_action_strength('player_down') \ + - Input.get_action_strength('player_up') + input_vector = input_vector.normalized() - if input_vector != Vector2.ZERO: - $AnimationTree.set('parameters/Idle/blend_position', input_vector) - velocity = velocity.move_toward(input_vector * MAX_SPEED, ACCELERATION * delta) - set_weapon_position(input_vector) - else: - velocity = velocity.move_toward(Vector2.ZERO, FRICTION * delta) + if input_vector != Vector2.ZERO: + $AnimationTree.set('parameters/Idle/blend_position', input_vector) + velocity = velocity.move_toward(input_vector * MAX_SPEED, ACCELERATION * delta) + set_weapon_position(input_vector) + else: + velocity = velocity.move_toward(Vector2.ZERO, FRICTION * delta) - velocity = move_and_slide(velocity) - return + velocity = move_and_slide(velocity) + return func load_hud(node: CanvasLayer) -> void: - hud = node - if hud.connect('add_currency', self, 'add_currency') != OK: - print('ERROR: HUD "add_currency" signal already connected.') + hud = node + if hud.connect('add_currency', self, 'add_currency') != OK: + print('ERROR: HUD "add_currency" signal already connected.') - hud.update_health(HEALTH_SLICES[health_index]) - hud.update_currency($Inventory.get_currency()) - return + hud.update_health(HEALTH_SLICES[health_index]) + hud.update_currency($Inventory.get_currency()) + return func set_weapon_position(pos: Vector2) -> void: - # Facing left - if pos[0] < 0: - $Sword.rotation_degrees = -90 - $Javelin.rotation_degrees = -90 + # Facing left + if pos[0] < 0: + $Sword.rotation_degrees = -90 + $Javelin.rotation_degrees = -90 - # Facing right - elif pos[0] > 0: - $Sword.rotation_degrees = 90 - $Javelin.rotation_degrees = 90 + # Facing right + elif pos[0] > 0: + $Sword.rotation_degrees = 90 + $Javelin.rotation_degrees = 90 - # Facing up - elif pos[1] < 0: - $Sword.rotation_degrees = 0 - $Javelin.rotation_degrees = 0 + # Facing up + elif pos[1] < 0: + $Sword.rotation_degrees = 0 + $Javelin.rotation_degrees = 0 - # Facing down - elif pos[1] > 0: - $Sword.rotation_degrees = 180 - $Javelin.rotation_degrees = 180 - return + # Facing down + elif pos[1] > 0: + $Sword.rotation_degrees = 180 + $Javelin.rotation_degrees = 180 + return func add_currency(amount: int) -> void: - $Inventory.add_currency(amount) - return + $Inventory.add_currency(amount) + return func has_item(item: String) -> bool: - return $Inventory.contains(item) + return $Inventory.contains(item) func add_item(item: String) -> void: - $Inventory.add(item) - return + $Inventory.add(item) + return func remove_item(item: String) -> void: - $Inventory.remove(item) - return + $Inventory.remove(item) + return func _on_Inventory_update_currency(amount: int) -> void: - hud.update_currency(amount) - return + hud.update_currency(amount) + return func _on_hitbox_area_entered(area: Area2D) -> void: - var hit: int = 0 + var hit: int = 0 - if area.is_in_group('enemy_hitbox_1') or area.is_in_group('enemy_projectile_1'): - hit = 1 - elif area.is_in_group('enemy_hitbox_2') or area.is_in_group('enemy_projectile_2'): - hit = 2 - elif area.is_in_group('enemy_hitbox_3') or area.is_in_group('enemy_projectile_3'): - hit = 3 - elif area.is_in_group('freeze'): - emit_signal('frozen') - $Sprite.self_modulate = Color(0, 0.5, 1) - else: - return + if area.is_in_group('enemy_hitbox_1') or area.is_in_group('enemy_projectile_1'): + hit = 1 + elif area.is_in_group('enemy_hitbox_2') or area.is_in_group('enemy_projectile_2'): + hit = 2 + elif area.is_in_group('enemy_hitbox_3') or area.is_in_group('enemy_projectile_3'): + hit = 3 + elif area.is_in_group('freeze'): + emit_signal('frozen') + $Sprite.self_modulate = Color(0, 0.5, 1) + else: + return - if health_index != 0: - health_index -= hit - if health_index < 0: - health_index = 0 + if health_index != 0: + health_index -= hit + if health_index < 0: + health_index = 0 - hud.update_health(HEALTH_SLICES[health_index]) - else: - get_tree().change_scene('res://Levels/Hub World.tscn') - return + hud.update_health(HEALTH_SLICES[health_index]) + else: + get_tree().change_scene('res://Levels/Hub World.tscn') + return func _input(event: InputEvent) -> void: - if event.is_action_pressed('player_attack'): - if hud.weapon == 'sword': - $'Sword/Sword Animation'.play('swing') - elif hud.weapon == 'javelin': - $'Javelin/Javelin Animation'.play('swing') + if event.is_action_pressed('player_attack'): + if hud.weapon == 'sword': + $'Sword/Sword Animation'.play('swing') + elif hud.weapon == 'javelin': + $'Javelin/Javelin Animation'.play('swing') - elif event.is_action_pressed('screenshot'): - var img: Image = get_viewport().get_texture().get_data() - yield(get_tree(), 'idle_frame') - yield(get_tree(), 'idle_frame') + elif event.is_action_pressed('screenshot'): + var img: Image = get_viewport().get_texture().get_data() + yield(get_tree(), 'idle_frame') + yield(get_tree(), 'idle_frame') - img.flip_y() + img.flip_y() - var time: Dictionary = OS.get_datetime_from_unix_time(OS.get_unix_time()) - var time_msecs: int = OS.get_system_time_msecs() + var time: Dictionary = OS.get_datetime_from_unix_time(OS.get_unix_time()) + var time_msecs: int = OS.get_system_time_msecs() - if img.save_png('user://Screenshot_%d%d%d_%d.png' % [time.year, time.month, time.day, time_msecs]) != OK: - print('ERROR: Failed saving screenshot.') - return + if img.save_png('user://Screenshot_%d%d%d_%d.png' % [time.year, time.month, time.day, time_msecs]) != OK: + print('ERROR: Failed saving screenshot.') + return func _on_SlowTime_unfreeze() -> void: - $Sprite.self_modulate = Color(1, 1, 1) - return + $Sprite.self_modulate = Color(1, 1, 1) + return diff --git a/Resources/level4tileset.png.import b/Resources/level4tileset.png.import index 10aa06b..a97d0ef 100644 --- a/Resources/level4tileset.png.import +++ b/Resources/level4tileset.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/Sprites/Assets/Black_Tile.png.import b/Sprites/Assets/Black_Tile.png.import index 579d3b2..24dbfde 100644 --- a/Sprites/Assets/Black_Tile.png.import +++ b/Sprites/Assets/Black_Tile.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/Cliffs.png.import b/Sprites/Assets/Cliffs.png.import index e3febe4..7bce210 100644 --- a/Sprites/Assets/Cliffs.png.import +++ b/Sprites/Assets/Cliffs.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/DeadTree.png.import b/Sprites/Assets/DeadTree.png.import index fb7eab9..b268688 100644 --- a/Sprites/Assets/DeadTree.png.import +++ b/Sprites/Assets/DeadTree.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/Dead_Tree.png.import b/Sprites/Assets/Dead_Tree.png.import index 34dd9c2..ccccf28 100644 --- a/Sprites/Assets/Dead_Tree.png.import +++ b/Sprites/Assets/Dead_Tree.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/DoorClosed.png.import b/Sprites/Assets/DoorClosed.png.import index 9fc444c..9e95e92 100644 --- a/Sprites/Assets/DoorClosed.png.import +++ b/Sprites/Assets/DoorClosed.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/DoorOpen.png.import b/Sprites/Assets/DoorOpen.png.import index d211bae..91e466b 100644 --- a/Sprites/Assets/DoorOpen.png.import +++ b/Sprites/Assets/DoorOpen.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/Grass.png.import b/Sprites/Assets/Grass.png.import index 0e82685..63dc002 100644 --- a/Sprites/Assets/Grass.png.import +++ b/Sprites/Assets/Grass.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/JournalScrap.png.import b/Sprites/Assets/JournalScrap.png.import index 7c35a9a..9c53dd8 100644 --- a/Sprites/Assets/JournalScrap.png.import +++ b/Sprites/Assets/JournalScrap.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/Key.png.import b/Sprites/Assets/Key.png.import index 9ca2ea8..9eea8c3 100644 --- a/Sprites/Assets/Key.png.import +++ b/Sprites/Assets/Key.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/Plants and Trees.png.import b/Sprites/Assets/Plants and Trees.png.import index d1d8eeb..562e0a9 100644 --- a/Sprites/Assets/Plants and Trees.png.import +++ b/Sprites/Assets/Plants and Trees.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/Resources_Basic.png.import b/Sprites/Assets/Resources_Basic.png.import index 2ae57e6..53eb954 100644 --- a/Sprites/Assets/Resources_Basic.png.import +++ b/Sprites/Assets/Resources_Basic.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/Shadow.png.import b/Sprites/Assets/Shadow.png.import index 6c40207..277bed6 100644 --- a/Sprites/Assets/Shadow.png.import +++ b/Sprites/Assets/Shadow.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/Skull.png.import b/Sprites/Assets/Skull.png.import index 8d0c741..9013eb4 100644 --- a/Sprites/Assets/Skull.png.import +++ b/Sprites/Assets/Skull.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/Transparent_16x16.png.import b/Sprites/Assets/Transparent_16x16.png.import index 04b6d78..f25ee0b 100644 --- a/Sprites/Assets/Transparent_16x16.png.import +++ b/Sprites/Assets/Transparent_16x16.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/blue_star_225.png.import b/Sprites/Assets/blue_star_225.png.import index a4d7706..1cd9c33 100644 --- a/Sprites/Assets/blue_star_225.png.import +++ b/Sprites/Assets/blue_star_225.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/Sprites/Assets/blue_star_45.png.import b/Sprites/Assets/blue_star_45.png.import index a9e3cf4..5e3c707 100644 --- a/Sprites/Assets/blue_star_45.png.import +++ b/Sprites/Assets/blue_star_45.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/Sprites/Assets/bule_star_sprite_spread.png.import b/Sprites/Assets/bule_star_sprite_spread.png.import index 1918ba9..ac96345 100644 --- a/Sprites/Assets/bule_star_sprite_spread.png.import +++ b/Sprites/Assets/bule_star_sprite_spread.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/Sprites/Assets/cliffTileset.png.import b/Sprites/Assets/cliffTileset.png.import index 8c353ba..a56e23d 100644 --- a/Sprites/Assets/cliffTileset.png.import +++ b/Sprites/Assets/cliffTileset.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/darkForestTileset.png.import b/Sprites/Assets/darkForestTileset.png.import index a5e9bcc..305d186 100644 --- a/Sprites/Assets/darkForestTileset.png.import +++ b/Sprites/Assets/darkForestTileset.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_1.png.import b/Sprites/Assets/fire_column_medium_1.png.import index 15c40c9..ef85854 100644 --- a/Sprites/Assets/fire_column_medium_1.png.import +++ b/Sprites/Assets/fire_column_medium_1.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_10.png.import b/Sprites/Assets/fire_column_medium_10.png.import index fded122..29a8c28 100644 --- a/Sprites/Assets/fire_column_medium_10.png.import +++ b/Sprites/Assets/fire_column_medium_10.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_11.png.import b/Sprites/Assets/fire_column_medium_11.png.import index 823c351..6f29c9d 100644 --- a/Sprites/Assets/fire_column_medium_11.png.import +++ b/Sprites/Assets/fire_column_medium_11.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_12.png.import b/Sprites/Assets/fire_column_medium_12.png.import index 44bb42f..d2b1eb9 100644 --- a/Sprites/Assets/fire_column_medium_12.png.import +++ b/Sprites/Assets/fire_column_medium_12.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_13.png.import b/Sprites/Assets/fire_column_medium_13.png.import index e6c53f0..b983d79 100644 --- a/Sprites/Assets/fire_column_medium_13.png.import +++ b/Sprites/Assets/fire_column_medium_13.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_14.png.import b/Sprites/Assets/fire_column_medium_14.png.import index 466411a..9784ec6 100644 --- a/Sprites/Assets/fire_column_medium_14.png.import +++ b/Sprites/Assets/fire_column_medium_14.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_2.png.import b/Sprites/Assets/fire_column_medium_2.png.import index 6b81101..7845ab0 100644 --- a/Sprites/Assets/fire_column_medium_2.png.import +++ b/Sprites/Assets/fire_column_medium_2.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_3.png.import b/Sprites/Assets/fire_column_medium_3.png.import index 563e813..51d5b9c 100644 --- a/Sprites/Assets/fire_column_medium_3.png.import +++ b/Sprites/Assets/fire_column_medium_3.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_4.png.import b/Sprites/Assets/fire_column_medium_4.png.import index 51fffc4..7fd3c68 100644 --- a/Sprites/Assets/fire_column_medium_4.png.import +++ b/Sprites/Assets/fire_column_medium_4.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_5.png.import b/Sprites/Assets/fire_column_medium_5.png.import index cf2d3aa..3522d14 100644 --- a/Sprites/Assets/fire_column_medium_5.png.import +++ b/Sprites/Assets/fire_column_medium_5.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_6.png.import b/Sprites/Assets/fire_column_medium_6.png.import index 9fd3d60..85f3552 100644 --- a/Sprites/Assets/fire_column_medium_6.png.import +++ b/Sprites/Assets/fire_column_medium_6.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_7.png.import b/Sprites/Assets/fire_column_medium_7.png.import index a95f077..03f1f29 100644 --- a/Sprites/Assets/fire_column_medium_7.png.import +++ b/Sprites/Assets/fire_column_medium_7.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_8.png.import b/Sprites/Assets/fire_column_medium_8.png.import index 7470268..a80f19c 100644 --- a/Sprites/Assets/fire_column_medium_8.png.import +++ b/Sprites/Assets/fire_column_medium_8.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/fire_column_medium_9.png.import b/Sprites/Assets/fire_column_medium_9.png.import index a435328..77c6fb4 100644 --- a/Sprites/Assets/fire_column_medium_9.png.import +++ b/Sprites/Assets/fire_column_medium_9.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/flame_06.png.import b/Sprites/Assets/flame_06.png.import index 599b463..7c56caa 100644 --- a/Sprites/Assets/flame_06.png.import +++ b/Sprites/Assets/flame_06.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/Sprites/Assets/forestHouse.png.import b/Sprites/Assets/forestHouse.png.import index bdf89b5..b5cb748 100644 --- a/Sprites/Assets/forestHouse.png.import +++ b/Sprites/Assets/forestHouse.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/ghost-appears.png.import b/Sprites/Assets/ghost-appears.png.import index 33f6a4c..eaf2cb4 100644 --- a/Sprites/Assets/ghost-appears.png.import +++ b/Sprites/Assets/ghost-appears.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/ghost-idle.png.import b/Sprites/Assets/ghost-idle.png.import index 2221e6e..daab9b3 100644 --- a/Sprites/Assets/ghost-idle.png.import +++ b/Sprites/Assets/ghost-idle.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/ghost-shriek.png.import b/Sprites/Assets/ghost-shriek.png.import index dd13a3f..d465ce8 100644 --- a/Sprites/Assets/ghost-shriek.png.import +++ b/Sprites/Assets/ghost-shriek.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/ghost-vanish.png.import b/Sprites/Assets/ghost-vanish.png.import index d85b201..8bbd6e0 100644 --- a/Sprites/Assets/ghost-vanish.png.import +++ b/Sprites/Assets/ghost-vanish.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/global.png.import b/Sprites/Assets/global.png.import index a7e7978..b17b00c 100644 --- a/Sprites/Assets/global.png.import +++ b/Sprites/Assets/global.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/grassPatch.png.import b/Sprites/Assets/grassPatch.png.import index c7f9f16..9dd694c 100644 --- a/Sprites/Assets/grassPatch.png.import +++ b/Sprites/Assets/grassPatch.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/light_02.png.import b/Sprites/Assets/light_02.png.import index f13c44b..d57bc04 100644 --- a/Sprites/Assets/light_02.png.import +++ b/Sprites/Assets/light_02.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/Sprites/Assets/tileset_mk_16_16_nature_tileset_godot.png.import b/Sprites/Assets/tileset_mk_16_16_nature_tileset_godot.png.import index c74d69d..94c67d8 100644 --- a/Sprites/Assets/tileset_mk_16_16_nature_tileset_godot.png.import +++ b/Sprites/Assets/tileset_mk_16_16_nature_tileset_godot.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/Sprites/Assets/transparent16x16.png.import b/Sprites/Assets/transparent16x16.png.import index a2baa78..b8f6d5a 100644 --- a/Sprites/Assets/transparent16x16.png.import +++ b/Sprites/Assets/transparent16x16.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/Sprites/Assets/treasureChest.png.import b/Sprites/Assets/treasureChest.png.import index 57ab643..0e6e98d 100644 --- a/Sprites/Assets/treasureChest.png.import +++ b/Sprites/Assets/treasureChest.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Assets/treasureChestOpen.png.import b/Sprites/Assets/treasureChestOpen.png.import index 2440a7c..8c0a212 100644 --- a/Sprites/Assets/treasureChestOpen.png.import +++ b/Sprites/Assets/treasureChestOpen.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Enemies/Demon_Slime_Spritesheet.png.import b/Sprites/Enemies/Demon_Slime_Spritesheet.png.import index 8b4a076..bded42d 100644 --- a/Sprites/Enemies/Demon_Slime_Spritesheet.png.import +++ b/Sprites/Enemies/Demon_Slime_Spritesheet.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Enemies/Flaming_Skull_Design.png.import b/Sprites/Enemies/Flaming_Skull_Design.png.import index b187246..db7c6ea 100644 --- a/Sprites/Enemies/Flaming_Skull_Design.png.import +++ b/Sprites/Enemies/Flaming_Skull_Design.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Enemies/Hell_Hound_Idle.png.import b/Sprites/Enemies/Hell_Hound_Idle.png.import index 5d6fe55..9208741 100644 --- a/Sprites/Enemies/Hell_Hound_Idle.png.import +++ b/Sprites/Enemies/Hell_Hound_Idle.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Enemies/Hell_Hound_Jump.png.import b/Sprites/Enemies/Hell_Hound_Jump.png.import index 6e937f4..b1e8dd4 100644 --- a/Sprites/Enemies/Hell_Hound_Jump.png.import +++ b/Sprites/Enemies/Hell_Hound_Jump.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Enemies/Hell_Hound_Run.png.import b/Sprites/Enemies/Hell_Hound_Run.png.import index e6bcda8..eb2ea9d 100644 --- a/Sprites/Enemies/Hell_Hound_Run.png.import +++ b/Sprites/Enemies/Hell_Hound_Run.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Enemies/Hell_Hound_Walk.png.import b/Sprites/Enemies/Hell_Hound_Walk.png.import index 3e77503..186dece 100644 --- a/Sprites/Enemies/Hell_Hound_Walk.png.import +++ b/Sprites/Enemies/Hell_Hound_Walk.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Enemies/Projectiles/Iceball_84x9.png.import b/Sprites/Enemies/Projectiles/Iceball_84x9.png.import index 78ac8ff..3b6fb27 100644 --- a/Sprites/Enemies/Projectiles/Iceball_84x9.png.import +++ b/Sprites/Enemies/Projectiles/Iceball_84x9.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Enemies/demon_slime_FREE_v1.0_288x160_spritesheet.png.import b/Sprites/Enemies/demon_slime_FREE_v1.0_288x160_spritesheet.png.import index 9c7ac74..c675605 100644 --- a/Sprites/Enemies/demon_slime_FREE_v1.0_288x160_spritesheet.png.import +++ b/Sprites/Enemies/demon_slime_FREE_v1.0_288x160_spritesheet.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Enemies/flaming skull design.png.import b/Sprites/Enemies/flaming skull design.png.import index ead7f4c..8d2dd2e 100644 --- a/Sprites/Enemies/flaming skull design.png.import +++ b/Sprites/Enemies/flaming skull design.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Enemies/hell-hound-idle.png.import b/Sprites/Enemies/hell-hound-idle.png.import index 2b9b96c..0a36197 100644 --- a/Sprites/Enemies/hell-hound-idle.png.import +++ b/Sprites/Enemies/hell-hound-idle.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Enemies/hell-hound-jump.png.import b/Sprites/Enemies/hell-hound-jump.png.import index 85851b0..04963a5 100644 --- a/Sprites/Enemies/hell-hound-jump.png.import +++ b/Sprites/Enemies/hell-hound-jump.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Enemies/hell-hound-run.png.import b/Sprites/Enemies/hell-hound-run.png.import index c63014f..2f596fa 100644 --- a/Sprites/Enemies/hell-hound-run.png.import +++ b/Sprites/Enemies/hell-hound-run.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_01.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_01.png.import index df0a323..645d10b 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_01.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_01.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_02.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_02.png.import index 717fc23..aa8bcc9 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_02.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_02.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_03.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_03.png.import index bf06e58..e57effe 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_03.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_03.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_04.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_04.png.import index a9f4190..b424883 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_04.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_04.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_05.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_05.png.import index 01aa494..f61eeb8 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_05.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_05.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_06.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_06.png.import index 1573c7b..d49d106 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_06.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_06.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_07.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_07.png.import index 3a019b4..73ddeb1 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_07.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_07.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_08.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_08.png.import index cd6b8ae..c479307 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_08.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_08.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_09.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_09.png.import index 9cfe2a0..aae4c15 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_09.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_09.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_10.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_10.png.import index 95e0bbf..513ff9b 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_10.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_10.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_11.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_11.png.import index 7bd2db0..0c67aa1 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_11.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_11.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_12.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_12.png.import index 8c320c3..454f2bd 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_12.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_12.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_13.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_13.png.import index e76fec5..491e33f 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_13.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_13.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Environment/Fire_Column_Medium_14.png.import b/Sprites/Levels/Environment/Fire_Column_Medium_14.png.import index c52c780..a33cc3c 100644 --- a/Sprites/Levels/Environment/Fire_Column_Medium_14.png.import +++ b/Sprites/Levels/Environment/Fire_Column_Medium_14.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Interactables/Gold_Key.png.import b/Sprites/Levels/Interactables/Gold_Key.png.import index e0df5db..cc6c4f3 100644 --- a/Sprites/Levels/Interactables/Gold_Key.png.import +++ b/Sprites/Levels/Interactables/Gold_Key.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Interactables/Level_Portal.png.import b/Sprites/Levels/Interactables/Level_Portal.png.import index 1a48daf..fe114a1 100644 --- a/Sprites/Levels/Interactables/Level_Portal.png.import +++ b/Sprites/Levels/Interactables/Level_Portal.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Interactables/Treasure_Chest_Closed.png.import b/Sprites/Levels/Interactables/Treasure_Chest_Closed.png.import index ccb092f..6c4e744 100644 --- a/Sprites/Levels/Interactables/Treasure_Chest_Closed.png.import +++ b/Sprites/Levels/Interactables/Treasure_Chest_Closed.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Interactables/Treasure_Chest_Open.png.import b/Sprites/Levels/Interactables/Treasure_Chest_Open.png.import index 4c3d0e3..2f3adef 100644 --- a/Sprites/Levels/Interactables/Treasure_Chest_Open.png.import +++ b/Sprites/Levels/Interactables/Treasure_Chest_Open.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Interactables/icekey.png.import b/Sprites/Levels/Interactables/icekey.png.import index 6354a99..d674a89 100644 --- a/Sprites/Levels/Interactables/icekey.png.import +++ b/Sprites/Levels/Interactables/icekey.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Objects/Gate_Closed.png.import b/Sprites/Levels/Objects/Gate_Closed.png.import index 7e7600c..e45f322 100644 --- a/Sprites/Levels/Objects/Gate_Closed.png.import +++ b/Sprites/Levels/Objects/Gate_Closed.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Objects/Gate_Open.png.import b/Sprites/Levels/Objects/Gate_Open.png.import index 0c5a09b..38299dd 100644 --- a/Sprites/Levels/Objects/Gate_Open.png.import +++ b/Sprites/Levels/Objects/Gate_Open.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Levels/Tilesets/Hub_World_Grass_Atlas.png.import b/Sprites/Levels/Tilesets/Hub_World_Grass_Atlas.png.import index 420ef63..82cf097 100644 --- a/Sprites/Levels/Tilesets/Hub_World_Grass_Atlas.png.import +++ b/Sprites/Levels/Tilesets/Hub_World_Grass_Atlas.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Menus/Menu Buttons/Back_To_Hub_Button_Hover.png.import b/Sprites/Menus/Menu Buttons/Back_To_Hub_Button_Hover.png.import index 9d8fd50..964f7dd 100644 --- a/Sprites/Menus/Menu Buttons/Back_To_Hub_Button_Hover.png.import +++ b/Sprites/Menus/Menu Buttons/Back_To_Hub_Button_Hover.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Sprites/Menus/Menu Buttons/Back_To_Hub_Button_Normal.png.import b/Sprites/Menus/Menu Buttons/Back_To_Hub_Button_Normal.png.import index 356de90..b5eb706 100644 --- a/Sprites/Menus/Menu Buttons/Back_To_Hub_Button_Normal.png.import +++ b/Sprites/Menus/Menu Buttons/Back_To_Hub_Button_Normal.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/project.godot b/project.godot index 6049a4a..cc26c73 100644 --- a/project.godot +++ b/project.godot @@ -12,11 +12,11 @@ config_version=4 config/name="Embodiment" run/main_scene="res://Main.tscn" +run/delta_sync_after_draw=true boot_splash/image="res://Sprites/Assets/Black_Background.png" boot_splash/use_filter=false boot_splash/bg_color=Color( 0, 0, 0, 1 ) config/icon="res://Sprites/Assets/icon.png" -run/delta_sync_after_draw=true [display] @@ -31,33 +31,33 @@ window/stretch/aspect="keep" player_right={ "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":68,"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":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } player_left={ "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":65,"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":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } player_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":87,"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":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } player_down={ "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":83,"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":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } screenshot={ "deadzone": 0.5, "events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":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":32,"unicode":0,"echo":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":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } player_attack={ "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) +"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) ] }