diff --git a/icon.png b/icon.png index f16436c..26eb051 100644 Binary files a/icon.png and b/icon.png differ diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index 4e799eb..8addfd6 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -67,19 +67,6 @@ var weaponAngle = 0 var particleTexture = ImageTexture.new() var particleImage = Image.new() -func equip_weapon(): - if Input.is_action_just_pressed("line"): - weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na1".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na1".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na1".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na1".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) - if Input.is_action_just_pressed("sine"): - weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na2".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na2".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na2".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na2".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) - if Input.is_action_just_pressed("parab"): - weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na3".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na3".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na3".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na3".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) - if Input.is_action_just_pressed("hyper"): - weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na4".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na4".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na4".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na4".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) - $"weaponHolder/Player-character-theme-gun".position = weaponPositionalOffset - pass - - func _ready(): weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na3".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na3".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na3".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na3".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0) $"weaponHolder/Player-character-theme-gun".position = weaponPositionalOffset @@ -137,8 +124,8 @@ func process_rotation(): func _process(delta: float) -> void: $"weaponHolder/Player-character-theme-gun".play(theme) - #particleImage.load("res://source/assets/sprites/character/player/theme/" + theme + "/na/Player-character-theme-particle-"+theme+".png") - #particleTexture.create_from_image(particleImage) + particleImage.load("res://source/assets/sprites/character/player/theme/" + theme + "/na/Player-character-theme-particle-"+theme+".png") + particleTexture.create_from_image(particleImage) $Particles2D.texture = particleTexture if username_text_instance != null: username_text_instance.name = "username" + name diff --git a/source/assets/scripts/server_handlers/trinity_site_level.gd b/source/assets/scripts/server_handlers/trinity_site_level.gd index 1a1543e..da34bc5 100644 --- a/source/assets/scripts/server_handlers/trinity_site_level.gd +++ b/source/assets/scripts/server_handlers/trinity_site_level.gd @@ -3,6 +3,9 @@ extends Node2D var current_spawn_location_instance_number = 1 var current_player_location_instance_number = null +var gameControllerStates = {"singleplayer": false, "waiting": true, "allowMove": false, "allowShoot": false, "allowAim": false, "allowInput": false, "allowMenu": true, "simulatingEnvironment": false, "players": {}, "activePlayer": null} +var activePlayerIndicator = "0" +var gameTimer = 0 func _ready() -> void: get_tree().connect("network_peer_disconnected", self, "_player_disconnected") @@ -10,6 +13,35 @@ func _ready() -> void: if get_tree().is_network_server(): setup_player_positions() +func _process(delta): + gameTimer += delta + if not gameControllerStates["singleplayer"]: + if gameControllerStates["waiting"] and gameControllerStates["players"] != {} and not gameControllerStates["simulatingEnvironment"]: + if gameTimer > 5: + # Wait for tanks to fall to the ground + gameControllerStates["allowMove"] = true + gameControllerStates["activePlayer"] = gameControllerStates["players"][activePlayerIndicator] + gameControllerStates["waiting"] = false + gameTimer = 0 + if gameControllerStates["allowMove"]: + # Get the active player and allow their inputs to have effect. + print("Awaiting player input and processing it to adjust location and rotation") + # DO FOR EACH PLAYER - ONE AFTER THE OTHER + if gameControllerStates["allowAim"] and gameControllerStates["allowInput"]: + # Get the active player and allow their input into adjusting function. + print("Awaiting player input and processing it to adjust aim.") + # DO FOR EACH PLAYER - AT THE SAME TIME + if gameControllerStates["allowShooot"]: + # Enable function locking feature and prepare for shooting phase -- simulatingEnvironment = true + print("Awaiting player function confirmation.") + # DO FOR EACH PLAYER - AT THE SAME TIME + if gameControllerStates["simulatingEnvironment"]: + # Ignore player input, request player weapons to fire the bullets and account for the damages. + # Reset the cycle back to the move stage if neither player won the game. + print("Game result: undetermined, returning to move phase.") + if gameControllerStates["singleplayer"]: + # Do not interrupt user input -> only request checking for victory. + print("Singleplayer mode selected, awaiting game result.") func setup_player_positions() -> void: for player in PersistentNodes.get_children(): diff --git a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd index 69f7b2e..9949707 100644 --- a/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd +++ b/source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd @@ -1,4 +1,4 @@ -extends Area2D +extends Sprite var velocity = Vector2() var speed = 1 @@ -9,7 +9,7 @@ var gravitile = 5 func follow_hyperbolic_trajectory(): velocity.x = gravitile * time - velocity.y = 1/time + velocity.y = 1 / time func _process(delta): @@ -18,7 +18,7 @@ func _process(delta): position += velocity * speed * delta -func _on_Bullet_body_entered(body): +func _on_hitbox_body_entered(body): if body.is_in_group("mobs"): body.queue_free() queue_free() diff --git a/source/assets/scripts/shooting/Line/Line_Bullet.gd b/source/assets/scripts/shooting/Line/Line_Bullet.gd index 7ca1846..319427f 100644 --- a/source/assets/scripts/shooting/Line/Line_Bullet.gd +++ b/source/assets/scripts/shooting/Line/Line_Bullet.gd @@ -1,4 +1,4 @@ -extends Area2D +extends Sprite export var speed = 100 var velocity = Vector2() @@ -34,7 +34,7 @@ func _process(delta): position += velocity * speed * delta -func _on_Bullet_body_entered(body): +func _on_hitbox_body_entered(body): if body.is_in_group("mobs"): body.queue_free() queue_free() diff --git a/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd b/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd index 6de1e86..1df7718 100644 --- a/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd +++ b/source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd @@ -12,5 +12,5 @@ func shoot(): func _process(delta): - if Input.is_action_just_pressed("shoot"): + if Input.is_action_just_pressed("input_shoot"): shoot() diff --git a/source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd b/source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd index beee2de..3e4b6ae 100644 --- a/source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd +++ b/source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd @@ -18,7 +18,7 @@ func _process(delta): position += velocity * speed * delta -func _on_Bullet_body_entered(body): +func _on_hitbox_body_entered(body): if body.is_in_group("mobs"): body.queue_free() queue_free() diff --git a/source/assets/scripts/shooting/Sine/Sine_Barrel.gd b/source/assets/scripts/shooting/Sine/Sine_Barrel.gd index 6526775..4e5e58a 100644 --- a/source/assets/scripts/shooting/Sine/Sine_Barrel.gd +++ b/source/assets/scripts/shooting/Sine/Sine_Barrel.gd @@ -1,20 +1,33 @@ -extends StaticBody2D - -onready var bullet_env = preload("res://source/entities/shooting/Sine_Trajectory/Sine_Env.tscn") - -var velocity = Vector2(1, 0) -var shooting_speed = 200 +extends Line2D +export var speed = 100 +var velocity = Vector2(0, 0) +var dot_position = Vector2(0, 0) +var dot_array:PoolVector2Array = [] -func shoot(): - var bullet = bullet_env.instance() - get_parent().get_parent().get_parent().add_child(bullet) - bullet.global_position = $Position2D.global_position - bullet.global_rotation = $Position2D.global_rotation - pass +var time = 0 +export var amplitude = 4 +export var frequency = 5 + +var maxpoints = 15 + + +func follow_sine_trajectory(time): + for x in range(maxpoints): + velocity.y = amplitude * cos(time * frequency) + velocity.x = 5 + dot_position += velocity + dot_array.append(dot_position) + return dot_array +func construct_a_line(): + clear_points() + for x in range(maxpoints): + add_point(follow_sine_trajectory(x)) + pass func _process(delta): - if Input.is_action_just_pressed("input_shoot"): - shoot() + time += delta + self.points = follow_sine_trajectory(time) + pass diff --git a/source/assets/scripts/shooting/Sine/Sine_Bullet.gd b/source/assets/scripts/shooting/Sine/Sine_Bullet.gd index dfd000a..98722ea 100644 --- a/source/assets/scripts/shooting/Sine/Sine_Bullet.gd +++ b/source/assets/scripts/shooting/Sine/Sine_Bullet.gd @@ -18,7 +18,7 @@ func _process(delta): position += velocity * speed * delta -func _on_Bullet_body_entered(body): +func _on_hitbox_body_entered(body): if body.is_in_group("mobs"): body.queue_free() queue_free() diff --git a/source/assets/sprites/GUI/logo_design/FUNCit_game_logo.png b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo.png new file mode 100644 index 0000000..b822d17 Binary files /dev/null and b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo.png differ diff --git a/source/assets/sprites/GUI/logo_design/FUNCit_game_logo.png.import b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo.png.import new file mode 100644 index 0000000..300a6fc --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/FUNCit_game_logo.png-4b8a7bfc14dee0c3c007908dbecaf9eb.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://source/assets/sprites/GUI/logo_design/FUNCit_game_logo.png" +dest_files=[ "res://.import/FUNCit_game_logo.png-4b8a7bfc14dee0c3c007908dbecaf9eb.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +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 +svg/scale=1.0 diff --git a/source/assets/sprites/GUI/logo_design/FUNCit_game_logo.svg b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo.svg new file mode 100644 index 0000000..28a98fd --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/logo_design/FUNCit_game_logo.svg.import b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo.svg.import new file mode 100644 index 0000000..3953d80 --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/FUNCit_game_logo.svg-9e3b0fff2b1f9450b5124ecd3e8836ff.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://source/assets/sprites/GUI/logo_design/FUNCit_game_logo.svg" +dest_files=[ "res://.import/FUNCit_game_logo.svg-9e3b0fff2b1f9450b5124ecd3e8836ff.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +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 +svg/scale=1.0 diff --git a/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.png b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.png new file mode 100644 index 0000000..b4c4de8 Binary files /dev/null and b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.png differ diff --git a/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.png.import b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.png.import new file mode 100644 index 0000000..49ca197 --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/FUNCit_game_logo_dark.png-4b793fdf6f485973b8fdbae8cdbabc82.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.png" +dest_files=[ "res://.import/FUNCit_game_logo_dark.png-4b793fdf6f485973b8fdbae8cdbabc82.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +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 +svg/scale=1.0 diff --git a/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.svg b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.svg new file mode 100644 index 0000000..f3da6da --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + FUNCit + + + + + + + + + + + + + + + + + Prototype + + + diff --git a/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.svg.import b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.svg.import new file mode 100644 index 0000000..1c0d7cc --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/FUNCit_game_logo_dark.svg-4eaaa54dbd21c4c0050a0cf7d2dd41c5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark.svg" +dest_files=[ "res://.import/FUNCit_game_logo_dark.svg-4eaaa54dbd21c4c0050a0cf7d2dd41c5.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +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 +svg/scale=1.0 diff --git a/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.png b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.png new file mode 100644 index 0000000..4866e41 Binary files /dev/null and b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.png differ diff --git a/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.png.import b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.png.import new file mode 100644 index 0000000..be21d7e --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/FUNCit_game_logo_dark_transparent.png-bd09704de1b347e6cdcf01974115dd10.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.png" +dest_files=[ "res://.import/FUNCit_game_logo_dark_transparent.png-bd09704de1b347e6cdcf01974115dd10.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +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 +svg/scale=1.0 diff --git a/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.svg b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.svg new file mode 100644 index 0000000..d638a97 --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + FUNCit + + + + + + + + + + + + + + + + + Prototype + + + diff --git a/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.svg.import b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.svg.import new file mode 100644 index 0000000..7541898 --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/FUNCit_game_logo_dark_transparent.svg-e73eaf514f6ac0a4219bae35bfa4f86e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.svg" +dest_files=[ "res://.import/FUNCit_game_logo_dark_transparent.svg-e73eaf514f6ac0a4219bae35bfa4f86e.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +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 +svg/scale=1.0 diff --git a/source/assets/sprites/GUI/logo_design/Game-title-ideas.png b/source/assets/sprites/GUI/logo_design/Game-title-ideas.png new file mode 100644 index 0000000..290c746 Binary files /dev/null and b/source/assets/sprites/GUI/logo_design/Game-title-ideas.png differ diff --git a/source/assets/sprites/GUI/logo_design/Game-title-ideas.png.import b/source/assets/sprites/GUI/logo_design/Game-title-ideas.png.import new file mode 100644 index 0000000..3c0c0c3 --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/Game-title-ideas.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Game-title-ideas.png-55fb435541b14dbb7802a68905a0c083.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://source/assets/sprites/GUI/logo_design/Game-title-ideas.png" +dest_files=[ "res://.import/Game-title-ideas.png-55fb435541b14dbb7802a68905a0c083.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +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 +svg/scale=1.0 diff --git a/source/assets/sprites/GUI/logo_design/Player-character-1.svg b/source/assets/sprites/GUI/logo_design/Player-character-1.svg new file mode 100644 index 0000000..d3add36 --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/Player-character-1.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/logo_design/Player-character-1.svg.import b/source/assets/sprites/GUI/logo_design/Player-character-1.svg.import new file mode 100644 index 0000000..cee3d3a --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/Player-character-1.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Player-character-1.svg-ca1e6c2b4a7d20a6059e7b37440eb442.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://source/assets/sprites/GUI/logo_design/Player-character-1.svg" +dest_files=[ "res://.import/Player-character-1.svg-ca1e6c2b4a7d20a6059e7b37440eb442.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +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 +svg/scale=1.0 diff --git a/source/assets/sprites/GUI/logo_design/Player-character-2.svg b/source/assets/sprites/GUI/logo_design/Player-character-2.svg new file mode 100644 index 0000000..b5fe66b --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/Player-character-2.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/logo_design/Player-character-2.svg.import b/source/assets/sprites/GUI/logo_design/Player-character-2.svg.import new file mode 100644 index 0000000..a9588c9 --- /dev/null +++ b/source/assets/sprites/GUI/logo_design/Player-character-2.svg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Player-character-2.svg-a6dd3f63664ad5e208ae415ec82c8cf5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://source/assets/sprites/GUI/logo_design/Player-character-2.svg" +dest_files=[ "res://.import/Player-character-2.svg-a6dd3f63664ad5e208ae415ec82c8cf5.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +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 +svg/scale=1.0 diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index 6a4f678..15c5220 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -175,6 +175,66 @@ [sub_resource type="SpriteFrames" id=2] animations = [ { +"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], +"loop": true, +"name": "idle-speed-right-02", +"speed": 25.0 +}, { +"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], +"loop": true, +"name": "move-speed-left-01", +"speed": 35.0 +}, { +"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], +"loop": true, +"name": "boost-speed-right-03", +"speed": 50.0 +}, { +"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], +"loop": true, +"name": "idle-speed-left-02", +"speed": 25.0 +}, { +"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], +"loop": true, +"name": "idle-speed-right-01", +"speed": 25.0 +}, { +"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], +"loop": true, +"name": "move-speed-left-02", +"speed": 35.0 +}, { +"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], +"loop": true, +"name": "move-speed-right-03", +"speed": 35.0 +}, { +"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], +"loop": true, +"name": "idle-speed-right-04", +"speed": 25.0 +}, { +"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], +"loop": true, +"name": "idle-speed-left-04", +"speed": 25.0 +}, { +"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], +"loop": true, +"name": "boost-speed-left-03", +"speed": 50.0 +}, { +"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], +"loop": true, +"name": "boost-speed-right-02", +"speed": 50.0 +}, { +"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], +"loop": true, +"name": "move-speed-right-04", +"speed": 35.0 +}, { "frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], "loop": true, "name": "boost-speed-left-01", @@ -185,14 +245,14 @@ animations = [ { "name": "boost-speed-right-01", "speed": 50.0 }, { -"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], +"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], "loop": true, -"name": "move-speed-left-02", -"speed": 35.0 +"name": "boost-speed-right-04", +"speed": 50.0 }, { -"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], +"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], "loop": true, -"name": "move-speed-right-02", +"name": "move-speed-right-01", "speed": 35.0 }, { "frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], @@ -200,45 +260,15 @@ animations = [ { "name": "move-speed-left-03", "speed": 35.0 }, { -"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], +"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], "loop": true, -"name": "idle-speed-right-01", -"speed": 25.0 -}, { -"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], -"loop": true, -"name": "move-speed-right-03", +"name": "move-speed-right-02", "speed": 35.0 }, { "frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], "loop": true, -"name": "idle-speed-left-04", -"speed": 25.0 -}, { -"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], -"loop": true, -"name": "idle-speed-left-02", -"speed": 25.0 -}, { -"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], -"loop": true, -"name": "boost-speed-right-04", -"speed": 50.0 -}, { -"frames": [ ExtResource( 70 ), ExtResource( 49 ), ExtResource( 74 ), ExtResource( 75 ), ExtResource( 28 ), ExtResource( 52 ), ExtResource( 53 ), ExtResource( 55 ), ExtResource( 150 ), ExtResource( 156 ), ExtResource( 138 ), ExtResource( 161 ), ExtResource( 145 ), ExtResource( 148 ), ExtResource( 147 ), ExtResource( 133 ), ExtResource( 164 ), ExtResource( 134 ), ExtResource( 152 ), ExtResource( 160 ) ], -"loop": true, -"name": "boost-speed-left-03", -"speed": 50.0 -}, { -"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], -"loop": true, -"name": "idle-speed-left-01", -"speed": 25.0 -}, { -"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], -"loop": true, -"name": "idle-speed-right-04", -"speed": 25.0 +"name": "move-speed-left-04", +"speed": 35.0 }, { "frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], "loop": true, @@ -247,38 +277,8 @@ animations = [ { }, { "frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], "loop": true, -"name": "move-speed-left-01", -"speed": 35.0 -}, { -"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], -"loop": true, -"name": "idle-speed-right-02", +"name": "idle-speed-left-01", "speed": 25.0 -}, { -"frames": [ ExtResource( 114 ), ExtResource( 128 ), ExtResource( 93 ), ExtResource( 107 ), ExtResource( 117 ), ExtResource( 102 ), ExtResource( 81 ), ExtResource( 118 ), ExtResource( 76 ), ExtResource( 115 ), ExtResource( 127 ), ExtResource( 123 ), ExtResource( 113 ), ExtResource( 77 ), ExtResource( 78 ), ExtResource( 124 ), ExtResource( 94 ), ExtResource( 112 ), ExtResource( 131 ), ExtResource( 95 ) ], -"loop": true, -"name": "boost-speed-right-03", -"speed": 50.0 -}, { -"frames": [ ExtResource( 99 ), ExtResource( 83 ), ExtResource( 109 ), ExtResource( 111 ), ExtResource( 101 ), ExtResource( 96 ), ExtResource( 79 ), ExtResource( 132 ), ExtResource( 119 ), ExtResource( 80 ), ExtResource( 85 ), ExtResource( 86 ), ExtResource( 87 ), ExtResource( 106 ), ExtResource( 121 ), ExtResource( 129 ), ExtResource( 100 ), ExtResource( 108 ), ExtResource( 110 ), ExtResource( 120 ) ], -"loop": true, -"name": "move-speed-right-04", -"speed": 35.0 -}, { -"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], -"loop": true, -"name": "boost-speed-right-02", -"speed": 50.0 -}, { -"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], -"loop": true, -"name": "move-speed-right-01", -"speed": 35.0 -}, { -"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], -"loop": true, -"name": "move-speed-left-04", -"speed": 35.0 } ] [sub_resource type="RectangleShape2D" id=3] @@ -316,11 +316,6 @@ animations = [ { }, { "frames": [ ExtResource( 27 ) ], "loop": true, -"name": "01", -"speed": 5.0 -}, { -"frames": [ ExtResource( 169 ) ], -"loop": true, "name": "04", "speed": 5.0 }, { @@ -328,6 +323,11 @@ animations = [ { "loop": true, "name": "03", "speed": 5.0 +}, { +"frames": [ ExtResource( 169 ) ], +"loop": true, +"name": "04", +"speed": 5.0 } ] [node name="player" type="KinematicBody2D" groups=[ @@ -384,7 +384,6 @@ texture = ExtResource( 26 ) shape = SubResource( 5 ) [node name="Player-character-theme-gun" type="AnimatedSprite" parent="weaponHolder"] -position = Vector2( -13, 1 ) scale = Vector2( 0.25, 0.25 ) frames = SubResource( 6 ) animation = "04" @@ -395,28 +394,8 @@ position = Vector2( -120, 0 ) rotation = 3.14159 scale = Vector2( 4, 4 ) -[node name="Player-character-theme-gun-na1" type="Sprite" parent="weaponHolder"] -visible = false -position = Vector2( -100, 7 ) -scale = Vector2( 0.25, 0.25 ) -texture = ExtResource( 171 ) - -[node name="Player-character-theme-gun-na2" type="Sprite" parent="weaponHolder"] -visible = false -position = Vector2( -106, -18 ) -scale = Vector2( 0.177591, 0.18125 ) -texture = ExtResource( 171 ) - [node name="Player-character-theme-gun-na3" type="Sprite" parent="weaponHolder"] -visible = false -position = Vector2( -93, -65 ) -scale = Vector2( 0.375937, 0.251953 ) -texture = ExtResource( 171 ) - -[node name="Player-character-theme-gun-na4" type="Sprite" parent="weaponHolder"] -visible = false -position = Vector2( -104, -38 ) -scale = Vector2( 0.508138, 0.140008 ) +scale = Vector2( 0.3, 0.25 ) texture = ExtResource( 171 ) [connection signal="timeout" from="network_tick_rate" to="." method="_on_network_tick_rate_timeout"] diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn index d1bea7d..851f564 100644 --- a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn +++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Barrel.tscn @@ -1,22 +1,6 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=2 format=2] -[ext_resource path="res://icon.png" type="Texture" id=1] -[ext_resource path="res://source/assets/scripts/shooting/Hyperbola/Hyperbolic_Barrel.gd" type="Script" id=2] +[sub_resource type="Curve" id=1] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5946, 3.60519 ) - -[node name="Hyperbolic_Barrel" type="StaticBody2D"] -script = ExtResource( 2 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 30.4661, 0.749161 ) -shape = SubResource( 1 ) - -[node name="icon" type="Sprite" parent="."] -position = Vector2( 42.4007, 0.196289 ) -scale = Vector2( 1.31624, 0.140625 ) -texture = ExtResource( 1 ) - -[node name="Position2D" type="Position2D" parent="."] -position = Vector2( 97.6552, 0.0842819 ) +[node name="Hyperbolic_Barrel" type="Line2D"] +width_curve = SubResource( 1 ) diff --git a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn index 2e85e5d..9a0d2f8 100644 --- a/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn +++ b/source/entities/shooting/Hyperbolic_Trajectory/Hyperbolic_Bullet.tscn @@ -4,18 +4,19 @@ [ext_resource path="res://source/assets/scripts/shooting/Hyperbola/Hyperbolic_Bullet.gd" type="Script" id=2] [sub_resource type="CapsuleShape2D" id=1] -radius = 5.4212 -height = 7.62897 -[node name="Bullet" type="Area2D"] +[node name="playert_bullet" type="Sprite" groups=[ +"Net", +]] +texture = ExtResource( 1 ) script = ExtResource( 2 ) -[node name="bullet" type="Sprite" parent="."] -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 1 ) +[node name="hitbox" type="Area2D" parent="." groups=[ +"Player_damager", +]] -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"] rotation = 1.5708 shape = SubResource( 1 ) -[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] +[connection signal="body_entered" from="hitbox" to="." method="_on_hitbox_body_entered"] diff --git a/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn b/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn index 4faa39b..9bd312b 100644 --- a/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn +++ b/source/entities/shooting/Line_Trajectory/Line_Barrel.tscn @@ -1,22 +1,3 @@ -[gd_scene load_steps=4 format=2] +[gd_scene format=2] -[ext_resource path="res://icon.png" type="Texture" id=1] -[ext_resource path="res://source/assets/scripts/shooting/Line/Line_Barrel.gd" type="Script" id=2] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22.5946, 3.60519 ) - -[node name="Line_Barrel" type="StaticBody2D"] -script = ExtResource( 2 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 30.4661, 0.749161 ) -shape = SubResource( 1 ) - -[node name="icon" type="Sprite" parent="."] -position = Vector2( 32.281, 0.196289 ) -scale = Vector2( 1, 0.140625 ) -texture = ExtResource( 1 ) - -[node name="Position2D" type="Position2D" parent="."] -position = Vector2( 64.7166, 0.0842819 ) +[node name="Line_Barrel" type="Line2D"] diff --git a/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn index bdd5dc9..4cdb733 100644 --- a/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn +++ b/source/entities/shooting/Line_Trajectory/Line_Bullet.tscn @@ -4,18 +4,19 @@ [ext_resource path="res://source/assets/scripts/shooting/Line/Line_Bullet.gd" type="Script" id=2] [sub_resource type="CapsuleShape2D" id=1] -radius = 5.4212 -height = 7.62897 -[node name="Bullet" type="Area2D"] +[node name="player_bullet" type="Sprite" groups=[ +"Net", +]] +texture = ExtResource( 1 ) script = ExtResource( 2 ) -[node name="bullet" type="Sprite" parent="."] -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 1 ) +[node name="hitbox" type="Area2D" parent="." groups=[ +"Player_damager", +]] -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"] rotation = 1.5708 shape = SubResource( 1 ) -[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] +[connection signal="body_entered" from="hitbox" to="." method="_on_hitbox_body_entered"] diff --git a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn index 0fcdc54..6bb42a2 100644 --- a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn +++ b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Barrel.tscn @@ -1,22 +1,3 @@ -[gd_scene load_steps=4 format=2] +[gd_scene format=2] -[ext_resource path="res://icon.png" type="Texture" id=1] -[ext_resource path="res://source/assets/scripts/shooting/Parabola/Parabolic_Barrel.gd" type="Script" id=2] - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 8.79762, 3.60519 ) - -[node name="Parabolic_Barrel" type="StaticBody2D"] -script = ExtResource( 2 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 13.539, 2.08551 ) -shape = SubResource( 1 ) - -[node name="icon" type="Sprite" parent="."] -position = Vector2( 16.2448, 0.641744 ) -scale = Vector2( 0.387507, 0.251987 ) -texture = ExtResource( 1 ) - -[node name="Position2D" type="Position2D" parent="."] -position = Vector2( 34.426, 0.975182 ) +[node name="Parabolic_Barrel" type="Line2D"] diff --git a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn index bdd5dc9..391d84f 100644 --- a/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn +++ b/source/entities/shooting/Parabolic_Trajectory/Parabolic_Bullet.tscn @@ -1,21 +1,22 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://source/assets/sprites/bullet/bullet.png" type="Texture" id=1] -[ext_resource path="res://source/assets/scripts/shooting/Line/Line_Bullet.gd" type="Script" id=2] +[ext_resource path="res://source/assets/scripts/shooting/Parabola/Parabolic_Bullet.gd" type="Script" id=2] [sub_resource type="CapsuleShape2D" id=1] -radius = 5.4212 -height = 7.62897 -[node name="Bullet" type="Area2D"] +[node name="player_bullet" type="Sprite" groups=[ +"Net", +]] +texture = ExtResource( 1 ) script = ExtResource( 2 ) -[node name="bullet" type="Sprite" parent="."] -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 1 ) +[node name="hitbox" type="Area2D" parent="." groups=[ +"Player_damager", +]] -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"] rotation = 1.5708 shape = SubResource( 1 ) -[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] +[connection signal="body_entered" from="hitbox" to="." method="_on_hitbox_body_entered"] diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn index 07882a0..5c2db70 100644 --- a/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn +++ b/source/entities/shooting/Sine_Trajectory/Sine_Barrel.tscn @@ -1,22 +1,8 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=2 format=2] -[ext_resource path="res://icon.png" type="Texture" id=1] -[ext_resource path="res://source/assets/scripts/shooting/Sine/Sine_Barrel.gd" type="Script" id=2] +[ext_resource path="res://source/assets/scripts/shooting/Sine/Sine_Barrel.gd" type="Script" id=1] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 21.0351, 6.99966 ) - -[node name="Sine_Barrel" type="StaticBody2D"] -script = ExtResource( 2 ) - -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( 32.0917, 0.471939 ) -scale = Vector2( 1, 0.336339 ) -texture = ExtResource( 1 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 30.8681, 0 ) -shape = SubResource( 1 ) - -[node name="Position2D" type="Position2D" parent="."] -position = Vector2( 64.7166, 0.0842819 ) +[node name="Sine_Barrel" type="Line2D"] +show_behind_parent = true +width = 4.0 +script = ExtResource( 1 ) diff --git a/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn b/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn index e05e92a..536bf28 100644 --- a/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn +++ b/source/entities/shooting/Sine_Trajectory/Sine_Bullet.tscn @@ -4,18 +4,19 @@ [ext_resource path="res://source/assets/scripts/shooting/Sine/Sine_Bullet.gd" type="Script" id=2] [sub_resource type="CapsuleShape2D" id=1] -radius = 5.4212 -height = 7.62897 -[node name="Bullet" type="Area2D"] +[node name="player_bullet" type="Sprite" groups=[ +"Net", +]] +texture = ExtResource( 1 ) script = ExtResource( 2 ) -[node name="bullet" type="Sprite" parent="."] -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 1 ) +[node name="hitbox" type="Area2D" parent="." groups=[ +"Player_damager", +]] -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +[node name="CollisionShape2D" type="CollisionShape2D" parent="hitbox"] rotation = 1.5708 shape = SubResource( 1 ) -[connection signal="body_entered" from="." to="." method="_on_Bullet_body_entered"] +[connection signal="body_entered" from="hitbox" to="." method="_on_hitbox_body_entered"] diff --git a/source/scenes/GUI/main_menu.tscn b/source/scenes/GUI/main_menu.tscn index c35c9fc..bbc934b 100644 --- a/source/scenes/GUI/main_menu.tscn +++ b/source/scenes/GUI/main_menu.tscn @@ -1,20 +1,14 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://source/entities/menu_player/player_node.tscn" type="PackedScene" id=1] [ext_resource path="res://source/scenes/GUI/background.tscn" type="PackedScene" id=2] [ext_resource path="res://source/assets/sprites/GUI/lan_logo.svg" type="Texture" id=3] -[ext_resource path="res://source/fonts/oxygen/Oxygen-Bold.ttf" type="DynamicFontData" id=4] +[ext_resource path="res://source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.png" type="Texture" id=4] [ext_resource path="res://source/fonts/oxygen/oxygen_bold.tres" type="DynamicFont" id=5] [ext_resource path="res://source/assets/scripts/ui_element_handlers/main_menu.gd" type="Script" id=6] [ext_resource path="res://source/scenes/OVERLAY/elements/button.tscn" type="PackedScene" id=7] [ext_resource path="res://source/fonts/oxygen/oxygen_regular.tres" type="DynamicFont" id=8] -[sub_resource type="DynamicFont" id=1] -size = 100 -use_mipmaps = true -use_filter = true -font_data = ExtResource( 4 ) - [node name="main_menu" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -37,20 +31,6 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="name" type="Label" parent="foreground"] -anchor_left = 0.5 -anchor_right = 0.5 -margin_left = -320.0 -margin_top = 350.0 -margin_right = 320.0 -margin_bottom = 477.0 -custom_fonts/font = SubResource( 1 ) -text = "NAME&LOGO" -__meta__ = { -"_edit_lock_": true, -"_edit_use_anchors_": false -} - [node name="play" parent="foreground" instance=ExtResource( 7 )] margin_left = 810.0 margin_top = 500.0 @@ -144,6 +124,11 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="FunCitGameLogoDarkTransparent" type="Sprite" parent="."] +position = Vector2( 980, 335 ) +scale = Vector2( 0.462963, 0.462963 ) +texture = ExtResource( 4 ) + [connection signal="pressed" from="foreground/play" to="." method="_on_play_pressed"] [connection signal="pressed" from="foreground/LAN_party" to="." method="_on_LAN_party_pressed"] [connection signal="pressed" from="foreground/exit" to="." method="_on_exit_pressed"]