From f1e7f136f85b4b782603ccaf17511cfed6c9fd5d Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Wed, 8 Mar 2023 01:07:24 -0500 Subject: [PATCH] shaders folder! --- control.tscn | 4 ++-- maps/abyss.tscn | 2 +- maps/level_select.tscn | 2 +- maps/test_room.tscn | 7 +++---- objects/collectibles/arrow.tscn | 2 +- objects/collectibles/gold.tscn | 2 +- objects/collectibles/shard.tscn | 2 +- objects/collectibles/star.tscn | 2 +- objects/enemy/antlion.tscn | 2 +- objects/enemy/bat.tscn | 2 +- objects/enemy/enemy_arrow.tscn | 2 +- objects/enemy/ghost.tscn | 2 +- objects/enemy/roboturret.tscn | 2 +- objects/enemy/rolling_fiend.tscn | 2 +- objects/enemy/skelarcher.tscn | 2 +- objects/enemy/slime.tscn | 2 +- objects/enemy/snake.tscn | 2 +- objects/enemy/tin.tscn | 2 +- objects/environment/exit/exit.tscn | 2 +- objects/environment/rock/rock.tscn | 2 +- objects/hud/blocktext.tscn | 2 +- objects/player/arrow_projectile.tscn | 2 +- objects/player/player.tscn | 4 ++-- {scripts => shaders}/1px_border.gdshader | 0 {scripts => shaders}/fade.gdshader | 0 {scripts => shaders}/lcd.gdshader | 0 {scripts => shaders}/recolor.tres | 0 {scripts => shaders}/recolor_border.shader | 0 {scripts => shaders}/water_ripple.gdshader | 0 ui/2ndpuberty_outline.tres | 2 +- 30 files changed, 28 insertions(+), 29 deletions(-) rename {scripts => shaders}/1px_border.gdshader (100%) rename {scripts => shaders}/fade.gdshader (100%) rename {scripts => shaders}/lcd.gdshader (100%) rename {scripts => shaders}/recolor.tres (100%) rename {scripts => shaders}/recolor_border.shader (100%) rename {scripts => shaders}/water_ripple.gdshader (100%) diff --git a/control.tscn b/control.tscn index d1237f2..78f05f0 100644 --- a/control.tscn +++ b/control.tscn @@ -3,12 +3,12 @@ [ext_resource path="res://scripts/scaling.gd" type="Script" id=1] [ext_resource path="res://graphics/borders/prideborder.png" type="Texture" id=2] [ext_resource path="res://maps/level_select.tscn" type="PackedScene" id=3] -[ext_resource path="res://scripts/lcd.gdshader" type="Shader" id=4] +[ext_resource path="res://shaders/lcd.gdshader" type="Shader" id=4] [ext_resource path="res://ui/2ndpuberty_no_dropshadow.tres" type="Theme" id=5] [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=6] [ext_resource path="res://graphics/fade_patterns/diamonds2.png" type="Texture" id=7] [ext_resource path="res://scripts/fade.gd" type="Script" id=8] -[ext_resource path="res://scripts/fade.gdshader" type="Shader" id=9] +[ext_resource path="res://shaders/fade.gdshader" type="Shader" id=9] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 4 ) diff --git a/maps/abyss.tscn b/maps/abyss.tscn index 0809288..b274aff 100644 --- a/maps/abyss.tscn +++ b/maps/abyss.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://maps/map.gd" type="Script" id=1] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=2] [ext_resource path="res://graphics/backgrounds/abyss.png" type="Texture" id=3] -[ext_resource path="res://scripts/water_ripple.gdshader" type="Shader" id=4] +[ext_resource path="res://shaders/water_ripple.gdshader" type="Shader" id=4] [ext_resource path="res://audio/music/moon_trail.mp3" type="AudioStream" id=5] [ext_resource path="res://graphics/tiles/abyss.png" type="Texture" id=6] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=7] diff --git a/maps/level_select.tscn b/maps/level_select.tscn index f1e588a..9146260 100644 --- a/maps/level_select.tscn +++ b/maps/level_select.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://ui/theme.tres" type="Theme" id=1] [ext_resource path="res://tilesets/t_gui.tres" type="TileSet" id=2] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=3] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=3] [ext_resource path="res://graphics/hud/levelselect_arrow.png" type="Texture" id=4] [ext_resource path="res://objects/collectibles/gold.tscn" type="PackedScene" id=5] [ext_resource path="res://graphics/hud/levelselect_nexlevel.png" type="Texture" id=6] diff --git a/maps/test_room.tscn b/maps/test_room.tscn index 9d68f17..8c56bf1 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -14,7 +14,7 @@ [ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=12] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=13] [ext_resource path="res://objects/respawn_point.tscn" type="PackedScene" id=16] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=17] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=17] [ext_resource path="res://objects/enemy/tin.tscn" type="PackedScene" id=20] [ext_resource path="res://graphics/enemy/sawblade.png" type="Texture" id=21] [ext_resource path="res://objects/enemy/rolling_fiend.tscn" type="PackedScene" id=22] @@ -149,6 +149,7 @@ material = SubResource( 4 ) position = Vector2( 120, 168 ) z_index = -3 frames = SubResource( 5 ) +frame = 1 playing = true [node name="SawTest4" type="AnimatedSprite" parent="."] @@ -156,7 +157,6 @@ material = SubResource( 4 ) position = Vector2( 160, 168 ) z_index = -3 frames = SubResource( 5 ) -frame = 1 playing = true [node name="SawTest5" type="AnimatedSprite" parent="."] @@ -164,7 +164,6 @@ material = SubResource( 4 ) position = Vector2( 56, 176 ) z_index = -3 frames = SubResource( 5 ) -frame = 1 playing = true [node name="RollingFiend" parent="." instance=ExtResource( 22 )] @@ -172,13 +171,13 @@ position = Vector2( 48, 120 ) [node name="AnimatedSprite" parent="RollingFiend" index="0"] visible = false -frame = 0 [node name="SawTest2" type="AnimatedSprite" parent="RollingFiend"] material = SubResource( 4 ) position = Vector2( 4, 4 ) z_index = -3 frames = SubResource( 5 ) +frame = 1 playing = true [node name="Steam" parent="." instance=ExtResource( 23 )] diff --git a/objects/collectibles/arrow.tscn b/objects/collectibles/arrow.tscn index 86eb655..2beda79 100644 --- a/objects/collectibles/arrow.tscn +++ b/objects/collectibles/arrow.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=1] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [ext_resource path="res://objects/collectibles/arrow.gd" type="Script" id=2] [ext_resource path="res://graphics/player/arrow.png" type="Texture" id=3] diff --git a/objects/collectibles/gold.tscn b/objects/collectibles/gold.tscn index 1871f90..5fc3c33 100644 --- a/objects/collectibles/gold.tscn +++ b/objects/collectibles/gold.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=11 format=2] [ext_resource path="res://objects/collectibles/gold.gd" type="Script" id=1] -[ext_resource path="res://scripts/recolor_border.shader" type="Shader" id=2] +[ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=2] [ext_resource path="res://graphics/collectibles/coin.png" type="Texture" id=3] [ext_resource path="res://graphics/collectibles/pal_gold.png" type="Texture" id=4] diff --git a/objects/collectibles/shard.tscn b/objects/collectibles/shard.tscn index 4324ea3..e4bd5e7 100644 --- a/objects/collectibles/shard.tscn +++ b/objects/collectibles/shard.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=1] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [ext_resource path="res://graphics/collectibles/shard.png" type="Texture" id=2] [ext_resource path="res://objects/collectibles/shard.gd" type="Script" id=3] diff --git a/objects/collectibles/star.tscn b/objects/collectibles/star.tscn index 50925dc..d7bbba7 100644 --- a/objects/collectibles/star.tscn +++ b/objects/collectibles/star.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=14 format=2] [ext_resource path="res://graphics/collectibles/pal_star_red.png" type="Texture" id=1] -[ext_resource path="res://scripts/recolor_border.shader" type="Shader" id=2] +[ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=2] [ext_resource path="res://objects/collectibles/star.gd" type="Script" id=3] [ext_resource path="res://graphics/collectibles/star.png" type="Texture" id=4] diff --git a/objects/enemy/antlion.tscn b/objects/enemy/antlion.tscn index 85291bb..ee7095d 100644 --- a/objects/enemy/antlion.tscn +++ b/objects/enemy/antlion.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=10 format=2] [ext_resource path="res://graphics/enemy/antlion.png" type="Texture" id=1] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=2] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=2] [ext_resource path="res://objects/enemy/antlion.gd" type="Script" id=3] [ext_resource path="res://graphics/enemy/antlion_body.png" type="Texture" id=4] diff --git a/objects/enemy/bat.tscn b/objects/enemy/bat.tscn index 2a7bdec..605ddf3 100644 --- a/objects/enemy/bat.tscn +++ b/objects/enemy/bat.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=1] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [ext_resource path="res://graphics/enemy/bat.png" type="Texture" id=2] [ext_resource path="res://objects/enemy/enemy_move_sidesideupdown.gd" type="Script" id=3] diff --git a/objects/enemy/enemy_arrow.tscn b/objects/enemy/enemy_arrow.tscn index 60a9d5b..020aaed 100644 --- a/objects/enemy/enemy_arrow.tscn +++ b/objects/enemy/enemy_arrow.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=1] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [ext_resource path="res://graphics/player/arrow.png" type="Texture" id=2] [ext_resource path="res://objects/player/arrow_projectile.gd" type="Script" id=3] [ext_resource path="res://graphics/particles/dust.png" type="Texture" id=4] diff --git a/objects/enemy/ghost.tscn b/objects/enemy/ghost.tscn index d6556c8..672821d 100644 --- a/objects/enemy/ghost.tscn +++ b/objects/enemy/ghost.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=2] [ext_resource path="res://graphics/enemy/ghost.png" type="Texture" id=1] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=2] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=2] [ext_resource path="res://objects/enemy/ghost.gd" type="Script" id=3] [sub_resource type="Animation" id=3] diff --git a/objects/enemy/roboturret.tscn b/objects/enemy/roboturret.tscn index 39a935f..42f2c94 100644 --- a/objects/enemy/roboturret.tscn +++ b/objects/enemy/roboturret.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=1] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [ext_resource path="res://graphics/enemy/roboturret.png" type="Texture" id=2] [ext_resource path="res://objects/enemy/roboturret.gd" type="Script" id=3] diff --git a/objects/enemy/rolling_fiend.tscn b/objects/enemy/rolling_fiend.tscn index b2e409f..8506ea8 100644 --- a/objects/enemy/rolling_fiend.tscn +++ b/objects/enemy/rolling_fiend.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://graphics/enemy/rolling_fiend.png" type="Texture" id=2] [ext_resource path="res://objects/enemy/rolling_fiend.gd" type="Script" id=3] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=4] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=4] [sub_resource type="ShaderMaterial" id=5] shader = ExtResource( 4 ) diff --git a/objects/enemy/skelarcher.tscn b/objects/enemy/skelarcher.tscn index 0f4af1a..124b43f 100644 --- a/objects/enemy/skelarcher.tscn +++ b/objects/enemy/skelarcher.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=1] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [ext_resource path="res://graphics/enemy/skelarcher_shoot.png" type="Texture" id=2] [ext_resource path="res://objects/enemy/skelarcher.gd" type="Script" id=4] diff --git a/objects/enemy/slime.tscn b/objects/enemy/slime.tscn index 3600715..e36f82d 100644 --- a/objects/enemy/slime.tscn +++ b/objects/enemy/slime.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=10 format=2] [ext_resource path="res://graphics/enemy/slime.png" type="Texture" id=1] -[ext_resource path="res://scripts/recolor_border.shader" type="Shader" id=2] +[ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=2] [ext_resource path="res://graphics/enemy/slime_purple.png" type="Texture" id=3] [ext_resource path="res://objects/enemy/enemy.gd" type="Script" id=4] diff --git a/objects/enemy/snake.tscn b/objects/enemy/snake.tscn index b2d4ef2..66ad2e4 100644 --- a/objects/enemy/snake.tscn +++ b/objects/enemy/snake.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=12 format=2] [ext_resource path="res://graphics/enemy/snake.png" type="Texture" id=1] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=2] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=2] [ext_resource path="res://objects/enemy/enemy_move_sidesideupdown.gd" type="Script" id=3] [ext_resource path="res://graphics/enemy/robosnake.png" type="Texture" id=4] diff --git a/objects/enemy/tin.tscn b/objects/enemy/tin.tscn index 84ee4f9..d407e1f 100644 --- a/objects/enemy/tin.tscn +++ b/objects/enemy/tin.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=2] [ext_resource path="res://objects/enemy/tin.gd" type="Script" id=1] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=2] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=2] [ext_resource path="res://graphics/enemy/tin.png" type="Texture" id=3] [ext_resource path="res://graphics/enemy/tin_eye.png" type="Texture" id=4] diff --git a/objects/environment/exit/exit.tscn b/objects/environment/exit/exit.tscn index af6fbce..4c49a6b 100644 --- a/objects/environment/exit/exit.tscn +++ b/objects/environment/exit/exit.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://ui/theme.tres" type="Theme" id=1] [ext_resource path="res://objects/environment/exit/exit.gd" type="Script" id=2] [ext_resource path="res://graphics/exit/exit.png" type="Texture" id=3] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=4] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=4] [sub_resource type="ShaderMaterial" id=1] diff --git a/objects/environment/rock/rock.tscn b/objects/environment/rock/rock.tscn index 95cbba6..f535dd4 100644 --- a/objects/environment/rock/rock.tscn +++ b/objects/environment/rock/rock.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=2] [ext_resource path="res://graphics/rock/rock.png" type="Texture" id=1] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=2] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=2] [ext_resource path="res://objects/environment/rock/rock.gd" type="Script" id=3] [sub_resource type="ShaderMaterial" id=1] diff --git a/objects/hud/blocktext.tscn b/objects/hud/blocktext.tscn index 4efea9b..56ffa1b 100644 --- a/objects/hud/blocktext.tscn +++ b/objects/hud/blocktext.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=1] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [ext_resource path="res://objects/hud/blocktext.gd" type="Script" id=2] [ext_resource path="res://graphics/hud/block_text.png" type="Texture" id=3] diff --git a/objects/player/arrow_projectile.tscn b/objects/player/arrow_projectile.tscn index 76abb3c..2e30638 100644 --- a/objects/player/arrow_projectile.tscn +++ b/objects/player/arrow_projectile.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=1] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [ext_resource path="res://graphics/player/arrow.png" type="Texture" id=2] [ext_resource path="res://objects/player/arrow_projectile.gd" type="Script" id=3] [ext_resource path="res://graphics/particles/dust.png" type="Texture" id=4] diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 0aaad15..024c91f 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://objects/player/player.gd" type="Script" id=1] [ext_resource path="res://graphics/player/sg_walk.png" type="Texture" id=2] [ext_resource path="res://graphics/player/sg_idle.png" type="Texture" id=3] -[ext_resource path="res://scripts/recolor_border.shader" type="Shader" id=4] +[ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=4] [ext_resource path="res://graphics/player/jump.png" type="Texture" id=5] [ext_resource path="res://graphics/player/pal_purplearmor.png" type="Texture" id=6] [ext_resource path="res://graphics/player/sg_climb.png" type="Texture" id=7] @@ -12,7 +12,7 @@ [ext_resource path="res://graphics/player/sg_shoot_grounded.png" type="Texture" id=10] [ext_resource path="res://graphics/player/sword_stab.png" type="Texture" id=11] [ext_resource path="res://graphics/player/sg_shoot_air.png" type="Texture" id=12] -[ext_resource path="res://scripts/recolor.tres" type="Shader" id=13] +[ext_resource path="res://shaders/recolor.tres" type="Shader" id=13] [ext_resource path="res://graphics/player/sg_doublejump.png" type="Texture" id=14] [ext_resource path="res://graphics/particles/blood.png" type="Texture" id=15] [ext_resource path="res://graphics/particles/dust.png" type="Texture" id=16] diff --git a/scripts/1px_border.gdshader b/shaders/1px_border.gdshader similarity index 100% rename from scripts/1px_border.gdshader rename to shaders/1px_border.gdshader diff --git a/scripts/fade.gdshader b/shaders/fade.gdshader similarity index 100% rename from scripts/fade.gdshader rename to shaders/fade.gdshader diff --git a/scripts/lcd.gdshader b/shaders/lcd.gdshader similarity index 100% rename from scripts/lcd.gdshader rename to shaders/lcd.gdshader diff --git a/scripts/recolor.tres b/shaders/recolor.tres similarity index 100% rename from scripts/recolor.tres rename to shaders/recolor.tres diff --git a/scripts/recolor_border.shader b/shaders/recolor_border.shader similarity index 100% rename from scripts/recolor_border.shader rename to shaders/recolor_border.shader diff --git a/scripts/water_ripple.gdshader b/shaders/water_ripple.gdshader similarity index 100% rename from scripts/water_ripple.gdshader rename to shaders/water_ripple.gdshader diff --git a/ui/2ndpuberty_outline.tres b/ui/2ndpuberty_outline.tres index 7d70a7b..e2d56ae 100644 --- a/ui/2ndpuberty_outline.tres +++ b/ui/2ndpuberty_outline.tres @@ -1,6 +1,6 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=2] -[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=1] +[ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [resource] shader = ExtResource( 1 )