From 1e3b3df3cfc9d6571ced9415f1decc36daf6e3af Mon Sep 17 00:00:00 2001 From: Booklordofthedings Date: Sat, 17 Aug 2024 00:32:52 +0200 Subject: [PATCH] rename --- gmtk_2024/levels/LevelBase.tscn | 41 ++++++++++++++++++ gmtk_2024/levels/TestingField.tscn | 28 ++++++++++++ gmtk_2024/levels/TestingRoom.tscn | 34 --------------- .../{canvas_layer.tscn => objects/CRT.tscn} | 4 +- gmtk_2024/objects/Player.tscn | 19 ++++++++ gmtk_2024/player.tscn | 22 ---------- gmtk_2024/project.godot | 2 +- gmtk_2024/temp_assets/player.png | Bin 1107 -> 0 bytes gmtk_2024/temp_assets/player.png.import | 34 --------------- .../textures/{Virus_Player.png => player.png} | Bin ...us_Player.png.import => player.png.import} | 6 +-- 11 files changed, 94 insertions(+), 96 deletions(-) create mode 100644 gmtk_2024/levels/LevelBase.tscn create mode 100644 gmtk_2024/levels/TestingField.tscn delete mode 100644 gmtk_2024/levels/TestingRoom.tscn rename gmtk_2024/{canvas_layer.tscn => objects/CRT.tscn} (93%) create mode 100644 gmtk_2024/objects/Player.tscn delete mode 100644 gmtk_2024/player.tscn delete mode 100644 gmtk_2024/temp_assets/player.png delete mode 100644 gmtk_2024/temp_assets/player.png.import rename gmtk_2024/textures/{Virus_Player.png => player.png} (100%) rename gmtk_2024/textures/{Virus_Player.png.import => player.png.import} (71%) diff --git a/gmtk_2024/levels/LevelBase.tscn b/gmtk_2024/levels/LevelBase.tscn new file mode 100644 index 0000000..65ed42a --- /dev/null +++ b/gmtk_2024/levels/LevelBase.tscn @@ -0,0 +1,41 @@ +[gd_scene load_steps=3 format=3 uid="uid://ba6afuig8bqrg"] + +[ext_resource type="PackedScene" uid="uid://snxpqx0ony7s" path="res://objects/Player.tscn" id="1_prjlb"] +[ext_resource type="PackedScene" uid="uid://dii1q3f5dj72y" path="res://objects/CRT.tscn" id="2_mxtem"] + +[node name="LevelBase" type="Node"] + +[node name="Player" parent="." instance=ExtResource("1_prjlb")] + +[node name="CanvasLayer" parent="." instance=ExtResource("2_mxtem")] + +[node name="UILayer" type="CanvasLayer" parent="."] + +[node name="UI" type="Control" parent="UILayer"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="HBoxContainer" type="HBoxContainer" parent="UILayer/UI"] +layout_mode = 0 +offset_right = 40.0 +offset_bottom = 40.0 + +[node name="ScaleUp" type="Button" parent="UILayer/UI/HBoxContainer"] +layout_mode = 2 +text = "Scale up +" + +[node name="ScaleDown" type="Button" parent="UILayer/UI/HBoxContainer"] +layout_mode = 2 +text = "Scale down +" + +[node name="Mirror" type="Button" parent="UILayer/UI/HBoxContainer"] +layout_mode = 2 +text = "Mirror" + +[node name="Camera2D" type="Camera2D" parent="."] diff --git a/gmtk_2024/levels/TestingField.tscn b/gmtk_2024/levels/TestingField.tscn new file mode 100644 index 0000000..292f0d2 --- /dev/null +++ b/gmtk_2024/levels/TestingField.tscn @@ -0,0 +1,28 @@ +[gd_scene load_steps=5 format=3 uid="uid://ctc0arg3efa5k"] + +[ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_ad6qp"] +[ext_resource type="Texture2D" uid="uid://cyealb63c8uqg" path="res://temp_assets/background_commision.png" id="2_mirhn"] +[ext_resource type="Texture2D" uid="uid://bsu1bvlb0s8dp" path="res://temp_assets/Screenshot (1).png" id="3_ocraj"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_qjpxi"] +size = Vector2(1928.3, 529.623) + +[node name="LevelBase" instance=ExtResource("1_ad6qp")] + +[node name="Sprite2D" type="Sprite2D" parent="." index="1"] +z_index = -1 +texture = ExtResource("2_mirhn") + +[node name="Ground" type="Sprite2D" parent="." index="2"] +position = Vector2(38, 807) +scale = Vector2(1.06, 1.06) +texture = ExtResource("3_ocraj") + +[node name="StaticBody2D" type="StaticBody2D" parent="Ground" index="0"] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Ground/StaticBody2D" index="0"] +position = Vector2(1.88681, -274.811) +shape = SubResource("RectangleShape2D_qjpxi") + +[node name="Button" parent="UI" index="0"] +text = "ifjgoidfjgoidfjgoidfjigdf" diff --git a/gmtk_2024/levels/TestingRoom.tscn b/gmtk_2024/levels/TestingRoom.tscn deleted file mode 100644 index 2af5779..0000000 --- a/gmtk_2024/levels/TestingRoom.tscn +++ /dev/null @@ -1,34 +0,0 @@ -[gd_scene load_steps=6 format=3 uid="uid://o8wdfgnlp0ud"] - -[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"] - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_dqhmf"] -size = Vector2(1928.3, 529.623) - -[node name="TestingRoom" type="Node2D"] - -[node name="Player" parent="." instance=ExtResource("1_nvifn")] - -[node name="Sprite2D" type="Sprite2D" parent="."] -visible = false -z_index = -1 -texture = ExtResource("2_qherw") - -[node name="Camera2D" type="Camera2D" parent="."] -scale = Vector2(1e-05, 1e-05) - -[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="Ground"] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Ground/StaticBody2D"] -position = Vector2(1.88681, -274.811) -shape = SubResource("RectangleShape2D_dqhmf") - -[node name="CanvasLayer" parent="." instance=ExtResource("2_1gnwx")] diff --git a/gmtk_2024/canvas_layer.tscn b/gmtk_2024/objects/CRT.tscn similarity index 93% rename from gmtk_2024/canvas_layer.tscn rename to gmtk_2024/objects/CRT.tscn index 828062d..bf1007d 100644 --- a/gmtk_2024/canvas_layer.tscn +++ b/gmtk_2024/objects/CRT.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=3 format=3 uid="uid://dii1q3f5dj72y"] -[ext_resource type="Shader" path="res://shaders/crt.gdshader" id="2_wxq0n"] +[ext_resource type="Shader" path="res://shaders/crt.gdshader" id="1_wsc8u"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_c8ly2"] -shader = ExtResource("2_wxq0n") +shader = ExtResource("1_wsc8u") shader_parameter/crt_curve = 0.01 shader_parameter/crt_scan_line_color = 0.178 shader_parameter/aperture_grille_rate = 0.141 diff --git a/gmtk_2024/objects/Player.tscn b/gmtk_2024/objects/Player.tscn new file mode 100644 index 0000000..13ce4dc --- /dev/null +++ b/gmtk_2024/objects/Player.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=4 format=3 uid="uid://snxpqx0ony7s"] + +[ext_resource type="Script" path="res://scripts/player_movement.gd" id="1_a6lhy"] +[ext_resource type="Texture2D" uid="uid://qcx482jc7pqr" path="res://textures/player.png" id="2_sscjv"] + +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_jqi2f"] +radius = 9.0 +height = 22.0 + +[node name="Player" type="CharacterBody2D"] +script = ExtResource("1_a6lhy") +jump_count = 1 +jump_strength = 600 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource("CapsuleShape2D_jqi2f") + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("2_sscjv") diff --git a/gmtk_2024/player.tscn b/gmtk_2024/player.tscn deleted file mode 100644 index 6b5390e..0000000 --- a/gmtk_2024/player.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[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://qcx482jc7pqr" path="res://textures/Virus_Player.png" id="2_b0xe3"] - -[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_jqi2f"] -radius = 9.0 -height = 22.0 - -[node name="Player" type="Node2D"] - -[node name="CharacterBody2D" type="CharacterBody2D" parent="."] -script = ExtResource("1_otvu6") -speed = 250 -jump_count = 1 -jump_strength = 600 - -[node name="Sprite2D" type="Sprite2D" parent="CharacterBody2D"] -texture = ExtResource("2_b0xe3") - -[node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D"] -shape = SubResource("CapsuleShape2D_jqi2f") diff --git a/gmtk_2024/project.godot b/gmtk_2024/project.godot index 9b95802..e53d16f 100644 --- a/gmtk_2024/project.godot +++ b/gmtk_2024/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="GMTK_2024" -run/main_scene="res://levels/TestingRoom.tscn" +run/main_scene="res://levels/TestingField.tscn" config/features=PackedStringArray("4.3", "GL Compatibility") config/icon="res://icon.svg" diff --git a/gmtk_2024/temp_assets/player.png b/gmtk_2024/temp_assets/player.png deleted file mode 100644 index a0fc84caf1e456f19928c78999b3ac7d55d923f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1107 zcmV-Z1g!gsP)~MGZ$P?HzRKwu)xNfVCf6%29#T9v8AQ76mDD3y>(>` z*s@Q2>2p8abD#5^^Zd>^zvp)@@5`yrQ`kr2W1sD*0jvcgh=yZ(icK(yyfMPPOhmhu zF?;_ZyyPA9u0kXhLR+pud2K0bPgX;wlxAX`!w)bw<$-_x9}cLhL;*up37%~+qx6tr z$K1Sp9GLv`Z`kfQu<8r%+FxE{MAMmiXpAb{>zd$zGF!}!IE7Y@T5B~d=Nk9E15>>- z7{4`zSY!hxV+Go*?Wn76KsXY@-LWAIj^2UC;l*Zb3zU?C$4;k{6)Vtcv7)8U0)}BQ zI(-kr6T=uIbET3g968^VA3%T(VrIa}C9g6c#KjAjajfxq6p4$FBF~AIR#ciQ@!j<+ z@XfCP>^|}UwNi}_-~9;f)(+CvaIvqnw&B;lE?l|x4Qzu>lvL_qdajJiBk1_#^cTAU znC`RV!Pq0N{r1^+FwirAufP2Y^9ysZG+Uq|iAwcla6NKi(d)^KYi~UZ+U>pDZ$1G&j}Pyx52;itH-OOcHt94PEffkR_c&$Imyfq4SUH zh(se#s0y$e4#N4+LE;kJk$HVy+`9cce(3z3w9{o;_u^p~i8$pIqQRd=@K>*GTek^; z*fVBpJH8pu_{Bs6ST01@wk4WPu9Pb|vV|jIB$G+bZ>~3?{ex4WBvgJOI`(=qw&Gi` z56yD*oJ=LL9$n9hDOSl)|8gxTBF_^zm(2fh$G;Fjd_4}iMh3${J+x)&U1NELACdxq0)PU50)PU50)YJn Z@Gq}llN9mo3*`U+002ovPDHLkV1fY23043A diff --git a/gmtk_2024/temp_assets/player.png.import b/gmtk_2024/temp_assets/player.png.import deleted file mode 100644 index 2e596bf..0000000 --- a/gmtk_2024/temp_assets/player.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b6gxkpy33b88g" -path="res://.godot/imported/player.png-f011f11e1b5afaa2c3b0bec051759309.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://temp_assets/player.png" -dest_files=["res://.godot/imported/player.png-f011f11e1b5afaa2c3b0bec051759309.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/gmtk_2024/textures/Virus_Player.png b/gmtk_2024/textures/player.png similarity index 100% rename from gmtk_2024/textures/Virus_Player.png rename to gmtk_2024/textures/player.png diff --git a/gmtk_2024/textures/Virus_Player.png.import b/gmtk_2024/textures/player.png.import similarity index 71% rename from gmtk_2024/textures/Virus_Player.png.import rename to gmtk_2024/textures/player.png.import index 7928ab8..ba2a02e 100644 --- a/gmtk_2024/textures/Virus_Player.png.import +++ b/gmtk_2024/textures/player.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://qcx482jc7pqr" -path="res://.godot/imported/Virus_Player.png-4c00daa1e7b5018c0db649deca9e637e.ctex" +path="res://.godot/imported/player.png-ce289a19efa81f268b1bb13630e9f80b.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://textures/Virus_Player.png" -dest_files=["res://.godot/imported/Virus_Player.png-4c00daa1e7b5018c0db649deca9e637e.ctex"] +source_file="res://textures/player.png" +dest_files=["res://.godot/imported/player.png-ce289a19efa81f268b1bb13630e9f80b.ctex"] [params]