team-sg/hero-mark-2
team-sg/hero-mark-2
5
0
Fork 1
Code Issues 12 Releases Activity

player scholar now just player

Browse source
This commit is contained in:
pennyrigate 2023-06-01 23:09:06 -04:00
parent 9f7668107b
commit 6e16aead24
17 changed files with 50 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
autoloads/game.gd
View file

@ -23,7 +23,7 @@ var current_file = 1 #Current save file
var shards_collected = [false,false,false,false,false,false,false,false,false,false] var shards_collected = [false,false,false,false,false,false,false,false,false,false]
var is_marathon_mode = false var is_marathon_mode = false
var is_easy_mode = false var is_easy_mode = false
var easy_mode_speed_factor = 1.25 var easy_mode_speed_factor = 0.75
var use_lives = false var use_lives = false
var can_pause = true var can_pause = true

BIN
graphics/player/sg_fall_scared.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 357 B

Before After
Before After

BIN
graphics/player/sg_step.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 293 B

35
graphics/player/sg_step.png.import Normal file
View file

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/sg_step.png-05fa404dd930772c6e0da48aaf383812.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/player/sg_step.png"
dest_files=[ "res://.import/sg_step.png-05fa404dd930772c6e0da48aaf383812.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=false
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

2
maps/abyss.tscn
View file

@ -7,7 +7,7 @@
[ext_resource path="res://audio/music/moon_trail.ogg" type="AudioStream" id=5] [ext_resource path="res://audio/music/moon_trail.ogg" type="AudioStream" id=5]
[ext_resource path="res://tilesets/t_ladders.tres" type="TileSet" id=6] [ext_resource path="res://tilesets/t_ladders.tres" type="TileSet" id=6]
[ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=7] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=7]
[ext_resource path="res://objects/player/player_scholar.tscn" type="PackedScene" id=8] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=8]
[ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=9] [ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=9]
[ext_resource path="res://tilesets/t_abyss.tres" type="TileSet" id=10] [ext_resource path="res://tilesets/t_abyss.tres" type="TileSet" id=10]
[ext_resource path="res://objects/enemy/mine.tscn" type="PackedScene" id=11] [ext_resource path="res://objects/enemy/mine.tscn" type="PackedScene" id=11]

2
maps/boss/boss1_arena.tscn
View file

@ -1,7 +1,7 @@
[gd_scene load_steps=15 format=2] [gd_scene load_steps=15 format=2]
[ext_resource path="res://objects/enemy/boss/scrump.tscn" type="PackedScene" id=1] [ext_resource path="res://objects/enemy/boss/scrump.tscn" type="PackedScene" id=1]
[ext_resource path="res://objects/player/player_scholar.tscn" type="PackedScene" id=2] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=2]
[ext_resource path="res://graphics/backgrounds/mountain_clouds.png" type="Texture" id=3] [ext_resource path="res://graphics/backgrounds/mountain_clouds.png" type="Texture" id=3]
[ext_resource path="res://graphics/backgrounds/mountain_sunset.png" type="Texture" id=4] [ext_resource path="res://graphics/backgrounds/mountain_sunset.png" type="Texture" id=4]
[ext_resource path="res://tilesets/t_mountain.tres" type="TileSet" id=5] [ext_resource path="res://tilesets/t_mountain.tres" type="TileSet" id=5]

2
maps/canopy.tscn
View file

@ -5,7 +5,7 @@
[ext_resource path="res://graphics/backgrounds/canopy.png" type="Texture" id=3] [ext_resource path="res://graphics/backgrounds/canopy.png" type="Texture" id=3]
[ext_resource path="res://tilesets/t_canopy.tres" type="TileSet" id=4] [ext_resource path="res://tilesets/t_canopy.tres" type="TileSet" id=4]
[ext_resource path="res://objects/enemy/skelarcher.tscn" type="PackedScene" id=5] [ext_resource path="res://objects/enemy/skelarcher.tscn" type="PackedScene" id=5]
[ext_resource path="res://objects/player/player_scholar.tscn" type="PackedScene" id=6] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=6]
[ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=7] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=7]
[ext_resource path="res://scripts/delete_on_game_running.gd" type="Script" id=8] [ext_resource path="res://scripts/delete_on_game_running.gd" type="Script" id=8]
[ext_resource path="res://objects/enemy/spider.tscn" type="PackedScene" id=9] [ext_resource path="res://objects/enemy/spider.tscn" type="PackedScene" id=9]

2
maps/cave.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=26 format=2] [gd_scene load_steps=26 format=2]
[ext_resource path="res://objects/player/player_scholar.tscn" type="PackedScene" id=1] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1]
[ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2] [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2]
[ext_resource path="res://objects/environment/rock/rock.tscn" type="PackedScene" id=3] [ext_resource path="res://objects/environment/rock/rock.tscn" type="PackedScene" id=3]
[ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=4] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=4]

2
maps/factory.tscn
View file

@ -3,7 +3,7 @@
[ext_resource path="res://maps/map.gd" type="Script" id=1] [ext_resource path="res://maps/map.gd" type="Script" id=1]
[ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=2] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=2]
[ext_resource path="res://graphics/backgrounds/factory.png" type="Texture" id=3] [ext_resource path="res://graphics/backgrounds/factory.png" type="Texture" id=3]
[ext_resource path="res://objects/player/player_scholar.tscn" type="PackedScene" id=4] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=4]
[ext_resource path="res://tilesets/t_factory.tres" type="TileSet" id=5] [ext_resource path="res://tilesets/t_factory.tres" type="TileSet" id=5]
[ext_resource path="res://objects/environment/tube/tube_entrance.tscn" type="PackedScene" id=6] [ext_resource path="res://objects/environment/tube/tube_entrance.tscn" type="PackedScene" id=6]
[ext_resource path="res://objects/environment/tube/tube_exit.tscn" type="PackedScene" id=7] [ext_resource path="res://objects/environment/tube/tube_exit.tscn" type="PackedScene" id=7]

2
maps/graveyard.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=21 format=2] [gd_scene load_steps=21 format=2]
[ext_resource path="res://objects/player/player_scholar.tscn" type="PackedScene" id=1] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1]
[ext_resource path="res://maps/map.gd" type="Script" id=2] [ext_resource path="res://maps/map.gd" type="Script" id=2]
[ext_resource path="res://graphics/backgrounds/night.png" type="Texture" id=3] [ext_resource path="res://graphics/backgrounds/night.png" type="Texture" id=3]
[ext_resource path="res://tilesets/t_horror.tres" type="TileSet" id=4] [ext_resource path="res://tilesets/t_horror.tres" type="TileSet" id=4]

2
maps/hills.tscn
View file

@ -24,7 +24,7 @@
[ext_resource path="res://objects/lore/hills/catbat.tscn" type="PackedScene" id=23] [ext_resource path="res://objects/lore/hills/catbat.tscn" type="PackedScene" id=23]
[ext_resource path="res://objects/lore/hills/eviscerator.tscn" type="PackedScene" id=24] [ext_resource path="res://objects/lore/hills/eviscerator.tscn" type="PackedScene" id=24]
[ext_resource path="res://objects/lore/hills/verdant_hills.tscn" type="PackedScene" id=25] [ext_resource path="res://objects/lore/hills/verdant_hills.tscn" type="PackedScene" id=25]
[ext_resource path="res://objects/player/player_scholar.tscn" type="PackedScene" id=26] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=26]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 8, 128 ) extents = Vector2( 8, 128 )

2
maps/mountain.tscn
View file

@ -5,7 +5,7 @@
[ext_resource path="res://graphics/backgrounds/mountain_mountain.png" type="Texture" id=3] [ext_resource path="res://graphics/backgrounds/mountain_mountain.png" type="Texture" id=3]
[ext_resource path="res://graphics/backgrounds/mountain_clouds.png" type="Texture" id=4] [ext_resource path="res://graphics/backgrounds/mountain_clouds.png" type="Texture" id=4]
[ext_resource path="res://graphics/backgrounds/mountain_sunset.png" type="Texture" id=5] [ext_resource path="res://graphics/backgrounds/mountain_sunset.png" type="Texture" id=5]
[ext_resource path="res://objects/player/player_scholar.tscn" type="PackedScene" id=6] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=6]
[ext_resource path="res://tilesets/t_mountain.tres" type="TileSet" id=7] [ext_resource path="res://tilesets/t_mountain.tres" type="TileSet" id=7]
[ext_resource path="res://objects/enemy/rolling_fiend.tscn" type="PackedScene" id=8] [ext_resource path="res://objects/enemy/rolling_fiend.tscn" type="PackedScene" id=8]
[ext_resource path="res://objects/environment/moving_platform/moving_platform.tscn" type="PackedScene" id=9] [ext_resource path="res://objects/environment/moving_platform/moving_platform.tscn" type="PackedScene" id=9]

2
maps/rust.tscn
View file

@ -4,7 +4,7 @@
[ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=2] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=2]
[ext_resource path="res://graphics/backgrounds/rust.png" type="Texture" id=3] [ext_resource path="res://graphics/backgrounds/rust.png" type="Texture" id=3]
[ext_resource path="res://tilesets/t_rust.tres" type="TileSet" id=4] [ext_resource path="res://tilesets/t_rust.tres" type="TileSet" id=4]
[ext_resource path="res://objects/player/player_scholar.tscn" type="PackedScene" id=5] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=5]
[ext_resource path="res://scripts/delete_on_game_running.gd" type="Script" id=6] [ext_resource path="res://scripts/delete_on_game_running.gd" type="Script" id=6]
[ext_resource path="res://objects/enemy/steam.tscn" type="PackedScene" id=7] [ext_resource path="res://objects/enemy/steam.tscn" type="PackedScene" id=7]
[ext_resource path="res://objects/environment/rock/crate.tscn" type="PackedScene" id=8] [ext_resource path="res://objects/environment/rock/crate.tscn" type="PackedScene" id=8]

2
maps/station.tscn
View file

@ -1,7 +1,7 @@
[gd_scene load_steps=24 format=2] [gd_scene load_steps=24 format=2]
[ext_resource path="res://maps/station.gd" type="Script" id=1] [ext_resource path="res://maps/station.gd" type="Script" id=1]
[ext_resource path="res://objects/player/player_scholar.tscn" type="PackedScene" id=2] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=2]
[ext_resource path="res://tilesets/t_station.tres" type="TileSet" id=3] [ext_resource path="res://tilesets/t_station.tres" type="TileSet" id=3]
[ext_resource path="res://graphics/backgrounds/night.png" type="Texture" id=4] [ext_resource path="res://graphics/backgrounds/night.png" type="Texture" id=4]
[ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=5] [ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=5]

2
maps/test_room.tscn
View file

@ -23,7 +23,7 @@
[ext_resource path="res://objects/enemy/steam.tscn" type="PackedScene" id=23] [ext_resource path="res://objects/enemy/steam.tscn" type="PackedScene" id=23]
[ext_resource path="res://objects/enemy/cop.tscn" type="PackedScene" id=25] [ext_resource path="res://objects/enemy/cop.tscn" type="PackedScene" id=25]
[ext_resource path="res://objects/environment/turret/turret_bullet.tscn" type="PackedScene" id=26] [ext_resource path="res://objects/environment/turret/turret_bullet.tscn" type="PackedScene" id=26]
[ext_resource path="res://objects/player/player_scholar.tscn" type="PackedScene" id=27] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=27]
[sub_resource type="ShaderMaterial" id=4] [sub_resource type="ShaderMaterial" id=4]
shader = ExtResource( 17 ) shader = ExtResource( 17 )

0
objects/player/player_scholar.gd → objects/player/player.gd
View file

6
objects/player/player_scholar.tscn → objects/player/player.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=43 format=2] [gd_scene load_steps=43 format=2]
[ext_resource path="res://objects/player/player_scholar.gd" type="Script" id=1] [ext_resource path="res://objects/player/player.gd" type="Script" id=1]
[ext_resource path="res://graphics/player/pal_purplearmor.png" type="Texture" id=2] [ext_resource path="res://graphics/player/pal_purplearmor.png" type="Texture" id=2]
[ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=3] [ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=3]
[ext_resource path="res://graphics/player/sg_idle.png" type="Texture" id=4] [ext_resource path="res://graphics/player/sg_idle.png" type="Texture" id=4]
@ -740,7 +740,7 @@ tracks/2/keys = {
"times": PoolRealArray( 0, 0.1, 0.2, 0.3 ), "times": PoolRealArray( 0, 0.1, 0.2, 0.3 ),
"transitions": PoolRealArray( 1, 1, 1, 1 ), "transitions": PoolRealArray( 1, 1, 1, 1 ),
"update": 1, "update": 1,
"values": [ 0, 1, 2, 3 ] "values": [ 1, 2, 3, 0 ]
} }
tracks/3/type = "value" tracks/3/type = "value"
tracks/3/path = NodePath("Graphics/Sprite:rotation_degrees") tracks/3/path = NodePath("Graphics/Sprite:rotation_degrees")
@ -1174,8 +1174,8 @@ script = ExtResource( 8 )
[connection signal="state_physics_processing" from="StateChart/Root/Movement" to="." method="_process_movement"] [connection signal="state_physics_processing" from="StateChart/Root/Movement" to="." method="_process_movement"]
[connection signal="state_entered" from="StateChart/Root/Movement/Grounded" to="." method="_on_Grounded_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded" to="." method="_on_Grounded_state_entered"]
[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded" to="." method="_process_grounded"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded" to="." method="_process_grounded"]
[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement_grounded"]
[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"]
[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement_grounded"]
[connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Still" to="." method="_on_Still_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Still" to="." method="_on_Still_state_entered"]
[connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Walking" to="." method="_on_Walking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Walking" to="." method="_on_Walking_state_entered"]
[connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"]