From 6e16aead24721a7606db669eb1a03fac3c401d25 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Thu, 1 Jun 2023 23:09:06 -0400 Subject: [PATCH] player scholar now just player --- autoloads/game.gd | 2 +- graphics/player/sg_fall_scared.png | Bin 358 -> 357 bytes graphics/player/sg_step.png | Bin 0 -> 293 bytes graphics/player/sg_step.png.import | 35 ++++++++++++++++++ maps/abyss.tscn | 2 +- maps/boss/boss1_arena.tscn | 2 +- maps/canopy.tscn | 2 +- maps/cave.tscn | 2 +- maps/factory.tscn | 2 +- maps/graveyard.tscn | 2 +- maps/hills.tscn | 2 +- maps/mountain.tscn | 2 +- maps/rust.tscn | 2 +- maps/station.tscn | 2 +- maps/test_room.tscn | 2 +- .../player/{player_scholar.gd => player.gd} | 0 .../{player_scholar.tscn => player.tscn} | 6 +-- 17 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 graphics/player/sg_step.png create mode 100644 graphics/player/sg_step.png.import rename objects/player/{player_scholar.gd => player.gd} (100%) rename objects/player/{player_scholar.tscn => player.tscn} (99%) diff --git a/autoloads/game.gd b/autoloads/game.gd index 1f5f8f4..2c23872 100644 --- a/autoloads/game.gd +++ b/autoloads/game.gd @@ -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 is_marathon_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 can_pause = true diff --git a/graphics/player/sg_fall_scared.png b/graphics/player/sg_fall_scared.png index 894cf4ac5098db8ff5cdeedb515473455c6aa2a1..b8304b78a89c5856b36e79d15771c9c39d2e5ed3 100644 GIT binary patch delta 224 zcmV<603ZM60_6gbjeo!Z01m(bYSxJf0002CNklG?ks=7<0xpQ&|zu8$0`s=JC3*vLe1mSGGm{;nQqvi}!u6=Xs)e8q3kY av(_JZ));u^S#$FM0000PqoFy1HG|A3mGS?c#mk>v^6?PIEc> bH*5U?fC3nNF!;*S00000NkvXXu0mjf2-;_k diff --git a/graphics/player/sg_step.png b/graphics/player/sg_step.png new file mode 100644 index 0000000000000000000000000000000000000000..272f20d05565e6b34fd1b0b6dbc5288c724beec0 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQajKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbU85sUMF#P`yL=OKO82&dn{C9Bp&j2JF{xbj(14H%9BpV>bT@vIM z{2vY&y!;tI0fjjWJR*x382Ao?FyoGi*>8b@Wu7jMAsWHCy^ee=iX1GF%LJeP=Z_N! zm^{QcIT@+ Vs%!lZ{s6jw!PC{xWt~$(697u5alHTl literal 0 HcmV?d00001 diff --git a/graphics/player/sg_step.png.import b/graphics/player/sg_step.png.import new file mode 100644 index 0000000..f27b874 --- /dev/null +++ b/graphics/player/sg_step.png.import @@ -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 diff --git a/maps/abyss.tscn b/maps/abyss.tscn index d5a153a..747fb76 100644 --- a/maps/abyss.tscn +++ b/maps/abyss.tscn @@ -7,7 +7,7 @@ [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://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://tilesets/t_abyss.tres" type="TileSet" id=10] [ext_resource path="res://objects/enemy/mine.tscn" type="PackedScene" id=11] diff --git a/maps/boss/boss1_arena.tscn b/maps/boss/boss1_arena.tscn index 7d46252..61ac2d7 100644 --- a/maps/boss/boss1_arena.tscn +++ b/maps/boss/boss1_arena.tscn @@ -1,7 +1,7 @@ [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/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_sunset.png" type="Texture" id=4] [ext_resource path="res://tilesets/t_mountain.tres" type="TileSet" id=5] diff --git a/maps/canopy.tscn b/maps/canopy.tscn index 979e718..3c6ea46 100644 --- a/maps/canopy.tscn +++ b/maps/canopy.tscn @@ -5,7 +5,7 @@ [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://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://scripts/delete_on_game_running.gd" type="Script" id=8] [ext_resource path="res://objects/enemy/spider.tscn" type="PackedScene" id=9] diff --git a/maps/cave.tscn b/maps/cave.tscn index e914dce..7837f15 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -1,6 +1,6 @@ [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://objects/environment/rock/rock.tscn" type="PackedScene" id=3] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=4] diff --git a/maps/factory.tscn b/maps/factory.tscn index 1e7a01c..188f41b 100644 --- a/maps/factory.tscn +++ b/maps/factory.tscn @@ -3,7 +3,7 @@ [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://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://objects/environment/tube/tube_entrance.tscn" type="PackedScene" id=6] [ext_resource path="res://objects/environment/tube/tube_exit.tscn" type="PackedScene" id=7] diff --git a/maps/graveyard.tscn b/maps/graveyard.tscn index 2927600..018d85f 100644 --- a/maps/graveyard.tscn +++ b/maps/graveyard.tscn @@ -1,6 +1,6 @@ [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://graphics/backgrounds/night.png" type="Texture" id=3] [ext_resource path="res://tilesets/t_horror.tres" type="TileSet" id=4] diff --git a/maps/hills.tscn b/maps/hills.tscn index 5b5ce49..83e13b8 100644 --- a/maps/hills.tscn +++ b/maps/hills.tscn @@ -24,7 +24,7 @@ [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/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] extents = Vector2( 8, 128 ) diff --git a/maps/mountain.tscn b/maps/mountain.tscn index 69453d5..c09a08e 100644 --- a/maps/mountain.tscn +++ b/maps/mountain.tscn @@ -5,7 +5,7 @@ [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_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://objects/enemy/rolling_fiend.tscn" type="PackedScene" id=8] [ext_resource path="res://objects/environment/moving_platform/moving_platform.tscn" type="PackedScene" id=9] diff --git a/maps/rust.tscn b/maps/rust.tscn index 6e91a1a..7394c55 100644 --- a/maps/rust.tscn +++ b/maps/rust.tscn @@ -4,7 +4,7 @@ [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://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://objects/enemy/steam.tscn" type="PackedScene" id=7] [ext_resource path="res://objects/environment/rock/crate.tscn" type="PackedScene" id=8] diff --git a/maps/station.tscn b/maps/station.tscn index 4e69714..f9eccc6 100644 --- a/maps/station.tscn +++ b/maps/station.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=24 format=2] [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://graphics/backgrounds/night.png" type="Texture" id=4] [ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=5] diff --git a/maps/test_room.tscn b/maps/test_room.tscn index b8f33df..0a50ea1 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -23,7 +23,7 @@ [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/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] shader = ExtResource( 17 ) diff --git a/objects/player/player_scholar.gd b/objects/player/player.gd similarity index 100% rename from objects/player/player_scholar.gd rename to objects/player/player.gd diff --git a/objects/player/player_scholar.tscn b/objects/player/player.tscn similarity index 99% rename from objects/player/player_scholar.tscn rename to objects/player/player.tscn index d4e70ac..5e55e36 100644 --- a/objects/player/player_scholar.tscn +++ b/objects/player/player.tscn @@ -1,6 +1,6 @@ [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://shaders/recolor_border.shader" type="Shader" id=3] [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 ), "transitions": PoolRealArray( 1, 1, 1, 1 ), "update": 1, -"values": [ 0, 1, 2, 3 ] +"values": [ 1, 2, 3, 0 ] } tracks/3/type = "value" 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_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/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_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/Walking" to="." method="_on_Walking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"]