summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLogan <logan@cflip.net>2022-09-23 20:42:32 -0600
committerLogan <logan@cflip.net>2022-09-23 20:42:32 -0600
commitc0d37da4fd91352f9fa9c7ff1219fea96283be17 (patch)
treee9af0f687b0b3cc663d39673ce4faea8663a99d3
parentd0915c865ae0f56e05e92cee798dffa6b494a682 (diff)
Created folders and renamed files and nodes to standard naming scheme.
-rw-r--r--desksmashers.mp3.import15
-rw-r--r--project.godot2
-rw-r--r--scenes/basketball.tscn (renamed from basketball.tscn)4
-rw-r--r--scenes/hoop.tscn (renamed from hoop.tscn)12
-rw-r--r--scenes/level.tscn (renamed from level.tscn)8
-rw-r--r--scripts/basketball.gd (renamed from Basketball.gd)0
-rw-r--r--sound/desksmashers.mp3 (renamed from desksmashers.mp3)bin33045 -> 33045 bytes
-rw-r--r--sound/desksmashers.mp3.import15
-rw-r--r--textures/basketball.png (renamed from ballforbasketing.png)bin493 -> 493 bytes
-rw-r--r--textures/basketball.png.import (renamed from ballforbasketing.png.import)6
-rw-r--r--textures/hoop_back.png (renamed from hoop_back.png)bin996 -> 996 bytes
-rw-r--r--textures/hoop_back.png.import (renamed from hoop_back.png.import)6
-rw-r--r--textures/hoop_fore.png (renamed from hoop_fore.png)bin496 -> 496 bytes
-rw-r--r--textures/hoop_fore.png.import (renamed from hoop_fore.png.import)6
14 files changed, 37 insertions, 37 deletions
diff --git a/desksmashers.mp3.import b/desksmashers.mp3.import
deleted file mode 100644
index 7a2ff5a..0000000
--- a/desksmashers.mp3.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-path="res://.import/desksmashers.mp3-c28d5641a29bc7ba093d166470963c0e.mp3str"
-
-[deps]
-
-source_file="res://desksmashers.mp3"
-dest_files=[ "res://.import/desksmashers.mp3-c28d5641a29bc7ba093d166470963c0e.mp3str" ]
-
-[params]
-
-loop=true
-loop_offset=0
diff --git a/project.godot b/project.godot
index 50147a8..596829e 100644
--- a/project.godot
+++ b/project.godot
@@ -11,7 +11,7 @@ config_version=4
[application]
config/name="BasketBALLAZ"
-run/main_scene="res://level.tscn"
+run/main_scene="res://scenes/level.tscn"
config/icon="res://icon.png"
[gui]
diff --git a/basketball.tscn b/scenes/basketball.tscn
index 91d7a77..457da83 100644
--- a/basketball.tscn
+++ b/scenes/basketball.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=2]
-[ext_resource path="res://ballforbasketing.png" type="Texture" id=1]
-[ext_resource path="res://Basketball.gd" type="Script" id=2]
+[ext_resource path="res://textures/basketball.png" type="Texture" id=1]
+[ext_resource path="res://scripts/basketball.gd" type="Script" id=2]
[sub_resource type="PhysicsMaterial" id=2]
bounce = 0.5
diff --git a/hoop.tscn b/scenes/hoop.tscn
index 6713627..eee6bc2 100644
--- a/hoop.tscn
+++ b/scenes/hoop.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=2]
-[ext_resource path="res://hoop_fore.png" type="Texture" id=1]
-[ext_resource path="res://hoop_back.png" type="Texture" id=2]
+[ext_resource path="res://textures/hoop_fore.png" type="Texture" id=1]
+[ext_resource path="res://textures/hoop_back.png" type="Texture" id=2]
[sub_resource type="SegmentShape2D" id=1]
a = Vector2( 3.8, -24.8 )
@@ -14,18 +14,18 @@ b = Vector2( -1.4, 9.6 )
[node name="Hoop" type="StaticBody2D"]
scale = Vector2( 5, 5 )
-[node name="Background Sprite" type="Sprite" parent="."]
+[node name="BackgroundSprite" type="Sprite" parent="."]
light_mask = 4
texture = ExtResource( 2 )
-[node name="Foreground Sprite" type="Sprite" parent="."]
+[node name="ForegroundSprite" type="Sprite" parent="."]
position = Vector2( -12, 16 )
texture = ExtResource( 1 )
-[node name="Right Collider" type="CollisionShape2D" parent="."]
+[node name="RightCollider" type="CollisionShape2D" parent="."]
position = Vector2( 1.6, 1 )
shape = SubResource( 1 )
-[node name="Left Collider" type="CollisionShape2D" parent="."]
+[node name="LeftCollider" type="CollisionShape2D" parent="."]
position = Vector2( -22, 1 )
shape = SubResource( 2 )
diff --git a/level.tscn b/scenes/level.tscn
index bf6281c..0b7b9e3 100644
--- a/level.tscn
+++ b/scenes/level.tscn
@@ -1,18 +1,18 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://icon.png" type="Texture" id=1]
-[ext_resource path="res://basketball.tscn" type="PackedScene" id=2]
-[ext_resource path="res://hoop.tscn" type="PackedScene" id=3]
+[ext_resource path="res://scenes/hoop.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scenes/basketball.tscn" type="PackedScene" id=3]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 512, 10 )
[node name="Node2D" type="Node2D"]
-[node name="hoop" parent="." instance=ExtResource( 3 )]
+[node name="Hoop" parent="." instance=ExtResource( 2 )]
position = Vector2( 721, 409 )
-[node name="Basketball" parent="." instance=ExtResource( 2 )]
+[node name="Basketball" parent="." instance=ExtResource( 3 )]
position = Vector2( 71, 536 )
[node name="StaticBody2D" type="StaticBody2D" parent="."]
diff --git a/Basketball.gd b/scripts/basketball.gd
index 40d189c..40d189c 100644
--- a/Basketball.gd
+++ b/scripts/basketball.gd
diff --git a/desksmashers.mp3 b/sound/desksmashers.mp3
index 40bd0e5..40bd0e5 100644
--- a/desksmashers.mp3
+++ b/sound/desksmashers.mp3
Binary files differ
diff --git a/sound/desksmashers.mp3.import b/sound/desksmashers.mp3.import
new file mode 100644
index 0000000..e3aa404
--- /dev/null
+++ b/sound/desksmashers.mp3.import
@@ -0,0 +1,15 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+path="res://.import/desksmashers.mp3-5079e868584565b6dd55a38e2a7dcdd5.mp3str"
+
+[deps]
+
+source_file="res://sound/desksmashers.mp3"
+dest_files=[ "res://.import/desksmashers.mp3-5079e868584565b6dd55a38e2a7dcdd5.mp3str" ]
+
+[params]
+
+loop=true
+loop_offset=0
diff --git a/ballforbasketing.png b/textures/basketball.png
index 00f8cb4..00f8cb4 100644
--- a/ballforbasketing.png
+++ b/textures/basketball.png
Binary files differ
diff --git a/ballforbasketing.png.import b/textures/basketball.png.import
index 469926b..7175da5 100644
--- a/ballforbasketing.png.import
+++ b/textures/basketball.png.import
@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
-path="res://.import/ballforbasketing.png-d2d8fd665fcb547004fb51b606b48f4f.stex"
+path="res://.import/basketball.png-e91ab41cfdc1c0211edda122bf946726.stex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://ballforbasketing.png"
-dest_files=[ "res://.import/ballforbasketing.png-d2d8fd665fcb547004fb51b606b48f4f.stex" ]
+source_file="res://textures/basketball.png"
+dest_files=[ "res://.import/basketball.png-e91ab41cfdc1c0211edda122bf946726.stex" ]
[params]
diff --git a/hoop_back.png b/textures/hoop_back.png
index 37eb8a0..37eb8a0 100644
--- a/hoop_back.png
+++ b/textures/hoop_back.png
Binary files differ
diff --git a/hoop_back.png.import b/textures/hoop_back.png.import
index 7d94239..9bfbec9 100644
--- a/hoop_back.png.import
+++ b/textures/hoop_back.png.import
@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
-path="res://.import/hoop_back.png-a8645b655f25bd15150a8e38f88bf7b1.stex"
+path="res://.import/hoop_back.png-a682eb8c46340d708eb2003b6a7bd071.stex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://hoop_back.png"
-dest_files=[ "res://.import/hoop_back.png-a8645b655f25bd15150a8e38f88bf7b1.stex" ]
+source_file="res://textures/hoop_back.png"
+dest_files=[ "res://.import/hoop_back.png-a682eb8c46340d708eb2003b6a7bd071.stex" ]
[params]
diff --git a/hoop_fore.png b/textures/hoop_fore.png
index f865ea7..f865ea7 100644
--- a/hoop_fore.png
+++ b/textures/hoop_fore.png
Binary files differ
diff --git a/hoop_fore.png.import b/textures/hoop_fore.png.import
index b8a9a27..c41033b 100644
--- a/hoop_fore.png.import
+++ b/textures/hoop_fore.png.import
@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
-path="res://.import/hoop_fore.png-ee0a5c1a7482b7452f013e728dfcceda.stex"
+path="res://.import/hoop_fore.png-735987c0139e90c50f0f163134f2370f.stex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://hoop_fore.png"
-dest_files=[ "res://.import/hoop_fore.png-ee0a5c1a7482b7452f013e728dfcceda.stex" ]
+source_file="res://textures/hoop_fore.png"
+dest_files=[ "res://.import/hoop_fore.png-735987c0139e90c50f0f163134f2370f.stex" ]
[params]