daniel/Embodiment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge with main

Browse Source
This commit is contained in:
Daniel Tam
2021-12-07 20:21:41 -06:00
parent 05e04c7db9
commit 7d04c41d79
15 changed files with 203 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Enemies/Creepy Glowing Ghost.gd
View File

@@ -10,44 +10,44 @@ var health: int = 1
func _physics_process(_delta: float) -> void:
velocity = Vector2.ZERO
velocity = Vector2.ZERO
if player:
if position.distance_to(player.position) < 40:
velocity = position.direction_to(player.position).normalized() * -SPEED
elif position.distance_to(player.position) > 41:
velocity = position.direction_to(player.position).normalized() * SPEED
if player:
if position.distance_to(player.position) < 40:
velocity = position.direction_to(player.position).normalized() * -SPEED
elif position.distance_to(player.position) > 41:
velocity = position.direction_to(player.position).normalized() * SPEED
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_projectile_timer_timeout() -> void:
if player:
var projectile: Node = creepy_hand.instance()
projectile.init($Sprite.global_position, player.position)
get_tree().get_current_scene().get_node('Projectiles').add_child(projectile)
return
if player:
var projectile: Node = creepy_hand.instance()
projectile.init($Sprite.global_position, player.position)
get_tree().get_current_scene().get_node('Projectiles').add_child(projectile)
return
func _on_hitbox_area_entered(area: Area2D) -> void:
if area.is_in_group('player_weapon_1'):
health -= 1
elif area.is_in_group('player_weapon_2'):
health -= 2
if area.is_in_group('player_weapon_1'):
health -= 1
elif area.is_in_group('player_weapon_2'):
health -= 2
if health <= 0:
call_deferred('queue_free')
return
if health <= 0:
call_deferred('queue_free')
return

20
Enemies/Flaming Skull.gd
View File

@@ -7,22 +7,22 @@ var velocity: Vector2 = Vector2.ZERO
func _physics_process(_delta: float) -> void:
velocity = Vector2.ZERO
velocity = Vector2.ZERO
if player:
velocity = position.direction_to(player.position).normalized() * SPEED
if player:
velocity = position.direction_to(player.position).normalized() * SPEED
velocity = move_and_slide(velocity)
return
velocity = move_and_slide(velocity)
return
func _on_player_detector_area_entered(area: Area2D) -> void:
if area.get_parent().name == 'Player':
player = area.get_parent()
if area.get_parent().name == 'Player':
player = area.get_parent()
return
return
func _on_player_detector_area_exited(_area: Area2D):
player = null
return
player = null
return

4
Levels/Hub World.gd
View File

@@ -2,5 +2,5 @@ extends Node2D
func _ready() -> void:
$YSort/Player.load_hud($HUD)
return
$YSort/Player.load_hud($HUD)
return

6
Levels/Interactables/Gem.gd
View File

@@ -8,7 +8,7 @@ extends Node2D
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
pass # Replace with function body.
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
@@ -17,8 +17,8 @@ func _ready() -> void:
func _on_AnimationPlayer_animation_finished(anim_name: String) -> void:
$GemSprite.visible = false
$GemSprite.visible = false
func _on_AnimationPlayer_animation_started(anim_name: String) -> void:
$GemSprite.visible = true
$GemSprite.visible = true

2
Levels/Interactables/Gem.tscn
View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Sprites/Assets/Resources_Basic.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Assets/resources_basic.png" type="Texture" id=1]
[ext_resource path="res://Levels/Interactables/Gem.gd" type="Script" id=2]
[sub_resource type="Animation" id=3]

22
Levels/Level 4.gd
View File

@@ -3,22 +3,22 @@ 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

19
Levels/Level 4.tscn
View File

@@ -1,18 +1,18 @@
[gd_scene load_steps=31 format=2]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_12.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Levels/Environment/fire_column_medium_12.png" type="Texture" id=1]
[ext_resource path="res://Enemies/Hellhound.tscn" type="PackedScene" id=2]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_03.png" type="Texture" id=3]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_09.png" type="Texture" id=4]
[ext_resource path="res://Levels/Objects/Door.tscn" type="PackedScene" id=5]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_10.png" type="Texture" id=6]
[ext_resource path="res://Sprites/Levels/Environment/fire_column_medium_10.png" type="Texture" id=6]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_04.png" type="Texture" id=7]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_06.png" type="Texture" id=8]
[ext_resource path="res://Levels/Level 4.gd" type="Script" id=9]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_01.png" type="Texture" id=10]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_13.png" type="Texture" id=11]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_14.png" type="Texture" id=12]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_11.png" type="Texture" id=13]
[ext_resource path="res://Sprites/Levels/Environment/fire_column_medium_13.png" type="Texture" id=11]
[ext_resource path="res://Sprites/Levels/Environment/fire_column_medium_14.png" type="Texture" id=12]
[ext_resource path="res://Sprites/Levels/Environment/fire_column_medium_11.png" type="Texture" id=13]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_08.png" type="Texture" id=14]
[ext_resource path="res://Resources/Level_4_Tileset.tres" type="TileSet" id=15]
[ext_resource path="res://Levels/Interactables/Treasure Chest.tscn" type="PackedScene" id=16]
@@ -86,21 +86,21 @@ tile_data = PoolIntArray( -2359292, 0, 5, -2359291, 0, 196610, -2359290, 0, 1966
[node name="Fire3" type="AnimatedSprite" parent="."]
position = Vector2( -607.628, -210.601 )
frames = SubResource( 1 )
frame = 2
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 = 5
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 = 12
frame = 6
playing = true
offset = Vector2( 679.819, 333.222 )
@@ -206,11 +206,12 @@ scale = Vector2( 1.25, 1.25 )
collision_layer = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="DoorCollision"]
position = Vector2( 201, -10 )
position = Vector2( 203, -9 )
shape = SubResource( 11 )
[node name="NextArea" type="Area2D" parent="."]
collision_layer = 2
collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="NextArea"]
position = Vector2( 200, -56 )

88
Main.gd
View File

@@ -7,72 +7,72 @@ export var world_path: String
func _ready() -> void:
var splash_screen: Node = play_splash_screen()
yield(splash_screen, 'complete')
splash_screen = null
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':
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':
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

158
Player/Player.gd
View File

@@ -7,131 +7,129 @@ export var FRICTION: int = 1000
const HEALTH_SLICES: Array = [0, 18, 35, 50, 65, 82, 100]
var health_index: int = 6
var l5_gems: int = 0
var hud: CanvasLayer = null
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
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
else:
return
if health_index != 0:
health_index -= hit
if health_index < 0:
health_index = 0
hud.update_health(HEALTH_SLICES[health_index])
return
if health_index != 0:
health_index -= hit
if health_index < 0:
health_index = 0
hud.update_health(HEALTH_SLICES[health_index])
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')
if event.is_action_pressed('screenshot'):
var img: Image = get_viewport().get_texture().get_data()
yield(get_tree(), 'idle_frame')
yield(get_tree(), 'idle_frame')
if 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

6
Sprites/Assets/resources_basic.png.import
View File

@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
path="res://.import/Resources_Basic.png-ace2281282b93b7ae48cda9c52d377ad.stex"
path="res://.import/resources_basic.png-128bab182945611297ec1bda48bed0c4.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Assets/Resources_Basic.png"
dest_files=[ "res://.import/Resources_Basic.png-ace2281282b93b7ae48cda9c52d377ad.stex" ]
source_file="res://Sprites/Assets/resources_basic.png"
dest_files=[ "res://.import/resources_basic.png-128bab182945611297ec1bda48bed0c4.stex" ]
[params]

6
Sprites/Levels/Environment/fire_column_medium_10.png.import
View File

@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
path="res://.import/Fire_Column_Medium_10.png-505d756e8645c45b6fb339fbb6f8add5.stex"
path="res://.import/fire_column_medium_10.png-9ae78a0f5ef8531c3b56d09574ecd317.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_10.png"
dest_files=[ "res://.import/Fire_Column_Medium_10.png-505d756e8645c45b6fb339fbb6f8add5.stex" ]
source_file="res://Sprites/Levels/Environment/fire_column_medium_10.png"
dest_files=[ "res://.import/fire_column_medium_10.png-9ae78a0f5ef8531c3b56d09574ecd317.stex" ]
[params]

6
Sprites/Levels/Environment/fire_column_medium_11.png.import
View File

@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
path="res://.import/Fire_Column_Medium_11.png-cb278dde504fd6f8f415eda7091cfa9a.stex"
path="res://.import/fire_column_medium_11.png-f6c2ac8f20428aebca0febd0f65a5806.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_11.png"
dest_files=[ "res://.import/Fire_Column_Medium_11.png-cb278dde504fd6f8f415eda7091cfa9a.stex" ]
source_file="res://Sprites/Levels/Environment/fire_column_medium_11.png"
dest_files=[ "res://.import/fire_column_medium_11.png-f6c2ac8f20428aebca0febd0f65a5806.stex" ]
[params]

6
Sprites/Levels/Environment/fire_column_medium_12.png.import
View File

@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
path="res://.import/Fire_Column_Medium_12.png-1e7c2da6903b243f73d7ed4b50d90f8a.stex"
path="res://.import/fire_column_medium_12.png-25bc0d063fd42a44b6e9e423e3bf2656.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_12.png"
dest_files=[ "res://.import/Fire_Column_Medium_12.png-1e7c2da6903b243f73d7ed4b50d90f8a.stex" ]
source_file="res://Sprites/Levels/Environment/fire_column_medium_12.png"
dest_files=[ "res://.import/fire_column_medium_12.png-25bc0d063fd42a44b6e9e423e3bf2656.stex" ]
[params]

6
Sprites/Levels/Environment/fire_column_medium_13.png.import
View File

@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
path="res://.import/Fire_Column_Medium_13.png-a147b7694df1cdf05d373697c6a4ede3.stex"
path="res://.import/fire_column_medium_13.png-6f8490642f9a7a3884a31ae3975deb08.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_13.png"
dest_files=[ "res://.import/Fire_Column_Medium_13.png-a147b7694df1cdf05d373697c6a4ede3.stex" ]
source_file="res://Sprites/Levels/Environment/fire_column_medium_13.png"
dest_files=[ "res://.import/fire_column_medium_13.png-6f8490642f9a7a3884a31ae3975deb08.stex" ]
[params]

6
Sprites/Levels/Environment/fire_column_medium_14.png.import
View File

@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
path="res://.import/Fire_Column_Medium_14.png-205dacf8251c335e3becb65b0df84941.stex"
path="res://.import/fire_column_medium_14.png-81452b14764f0dd97e4008c5f9448c38.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_14.png"
dest_files=[ "res://.import/Fire_Column_Medium_14.png-205dacf8251c335e3becb65b0df84941.stex" ]
source_file="res://Sprites/Levels/Environment/fire_column_medium_14.png"
dest_files=[ "res://.import/fire_column_medium_14.png-81452b14764f0dd97e4008c5f9448c38.stex" ]
[params]