From 4b0d443d149e40b532f05dbc23c344c393cca92a Mon Sep 17 00:00:00 2001
From: Booklordofthedings <Booklordofthedings@tutanota.com>
Date: Fri, 16 Aug 2024 23:05:23 +0200
Subject: [PATCH] settings changes

---
 gmtk_2024/canvas_layer.tscn       |  8 ++++----
 gmtk_2024/levels/TestingRoom.tscn | 10 +++++-----
 gmtk_2024/player.tscn             |  2 +-
 gmtk_2024/shaders/crt.gdshader    |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gmtk_2024/canvas_layer.tscn b/gmtk_2024/canvas_layer.tscn
index 151159d..828062d 100644
--- a/gmtk_2024/canvas_layer.tscn
+++ b/gmtk_2024/canvas_layer.tscn
@@ -1,12 +1,12 @@
-[gd_scene load_steps=3 format=3 uid="uid://cxbalfjqtp06t"]
+[gd_scene load_steps=3 format=3 uid="uid://dii1q3f5dj72y"]
 
 [ext_resource type="Shader" path="res://shaders/crt.gdshader" id="2_wxq0n"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_c8ly2"]
 shader = ExtResource("2_wxq0n")
-shader_parameter/crt_curve = 0.02
-shader_parameter/crt_scan_line_color = 0.347
-shader_parameter/aperture_grille_rate = 0.4
+shader_parameter/crt_curve = 0.01
+shader_parameter/crt_scan_line_color = 0.178
+shader_parameter/aperture_grille_rate = 0.141
 shader_parameter/rf_switch_esque_blur = 1.0
 shader_parameter/white_noise_rate = 0.0
 
diff --git a/gmtk_2024/levels/TestingRoom.tscn b/gmtk_2024/levels/TestingRoom.tscn
index bc63495..00e2951 100644
--- a/gmtk_2024/levels/TestingRoom.tscn
+++ b/gmtk_2024/levels/TestingRoom.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=3 uid="uid://o8wdfgnlp0ud"]
 
-[ext_resource type="PackedScene" uid="uid://cfnmiqovwwhry" path="res://player.tscn" id="1_nvifn"]
-[ext_resource type="PackedScene" uid="uid://cxbalfjqtp06t" path="res://canvas_layer.tscn" id="2_1gnwx"]
+[ext_resource type="PackedScene" uid="uid://snxpqx0ony7s" path="res://player.tscn" id="1_nvifn"]
+[ext_resource type="PackedScene" uid="uid://dii1q3f5dj72y" path="res://canvas_layer.tscn" id="2_1gnwx"]
 [ext_resource type="Texture2D" uid="uid://cyealb63c8uqg" path="res://temp_assets/background_commision.png" id="2_qherw"]
 [ext_resource type="Texture2D" uid="uid://bsu1bvlb0s8dp" path="res://temp_assets/Screenshot (1).png" id="3_es5ys"]
 
@@ -19,14 +19,14 @@ texture = ExtResource("2_qherw")
 [node name="Camera2D" type="Camera2D" parent="."]
 scale = Vector2(1e-05, 1e-05)
 
-[node name="Sprite2D2" type="Sprite2D" parent="."]
+[node name="Ground" type="Sprite2D" parent="."]
 position = Vector2(38, 807)
 scale = Vector2(1.06, 1.06)
 texture = ExtResource("3_es5ys")
 
-[node name="StaticBody2D" type="StaticBody2D" parent="Sprite2D2"]
+[node name="StaticBody2D" type="StaticBody2D" parent="Ground"]
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite2D2/StaticBody2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Ground/StaticBody2D"]
 position = Vector2(1.88681, -274.811)
 shape = SubResource("RectangleShape2D_dqhmf")
 
diff --git a/gmtk_2024/player.tscn b/gmtk_2024/player.tscn
index 3e4c180..607c394 100644
--- a/gmtk_2024/player.tscn
+++ b/gmtk_2024/player.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://cfnmiqovwwhry"]
+[gd_scene load_steps=4 format=3 uid="uid://snxpqx0ony7s"]
 
 [ext_resource type="Script" path="res://scripts/player_movement.gd" id="1_otvu6"]
 [ext_resource type="Texture2D" uid="uid://b6gxkpy33b88g" path="res://temp_assets/player.png" id="2_d4ig1"]
diff --git a/gmtk_2024/shaders/crt.gdshader b/gmtk_2024/shaders/crt.gdshader
index 4dc8b9a..6a80205 100644
--- a/gmtk_2024/shaders/crt.gdshader
+++ b/gmtk_2024/shaders/crt.gdshader
@@ -8,12 +8,12 @@ uniform sampler2D screen_texture : hint_screen_texture;
 
 // ブラウン管のガラスの曲がり具合（フラットなやつは0.0でいいかな）
 uniform float crt_curve : hint_range( 0.0, 1.0 ) = 0.02;
-// 走査線の濃さ
+// 走査線の濃さ  
 uniform float crt_scan_line_color : hint_range( 0.0, 1.0 ) = 0.347;
 // 光量
 uniform float aperture_grille_rate : hint_range( 0.0, 1.0 ) = 0.4;
 // RFスイッチ的ブラー
-uniform float rf_switch_esque_blur : hint_range( 0.0, 1.0 ) = 1.0;
+uniform float rf_switch_esque_blur : hint_range( 0.0, 1.0 ) = 1;
 // 白色ノイズ
 uniform float white_noise_rate : hint_range( 0.0, 1.0 ) = 0.0;