summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLogan <logan@cflip.net>2023-05-01 10:18:06 -0600
committerLogan <logan@cflip.net>2023-05-01 10:18:06 -0600
commita9598f7ccf107de5e62591b2b3a88067464896f7 (patch)
treee37cc65ec984379c2e7f21c4f53c6b4ff5a72fdc
parentdce598f66e1334698fcb38074fbd80457301ff07 (diff)
Replace old background with new one
-rw-r--r--scenes/hoop.tscn45
-rw-r--r--scenes/level.tscn44
-rw-r--r--textures/court.pngbin0 -> 13291 bytes
-rw-r--r--textures/court.png.import (renamed from textures/court_tile.png.import)8
-rw-r--r--textures/court_lines.pngbin3449 -> 0 bytes
-rw-r--r--textures/court_lines.png.import34
-rw-r--r--textures/court_tile.pngbin819 -> 0 bytes
7 files changed, 36 insertions, 95 deletions
diff --git a/scenes/hoop.tscn b/scenes/hoop.tscn
index 7183d85..2efdbc8 100644
--- a/scenes/hoop.tscn
+++ b/scenes/hoop.tscn
@@ -1,49 +1,50 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=6 format=3 uid="uid://dbcc3l74gqjjo"]
-[ext_resource path="res://textures/hoop_fore.png" type="Texture2D" id=1]
-[ext_resource path="res://textures/hoop_back.png" type="Texture2D" id=2]
-[ext_resource path="res://scripts/hoop.gd" type="Script" id=3]
+[ext_resource type="Texture2D" uid="uid://djxcqmro8usq" path="res://textures/hoop_fore.png" id="1"]
+[ext_resource type="Texture2D" uid="uid://buvj1niafrqgw" path="res://textures/hoop_back.png" id="2"]
+[ext_resource type="Script" path="res://scripts/hoop.gd" id="3"]
-[sub_resource type="SegmentShape2D" id=1]
-a = Vector2( 5.8, -12.4 )
-b = Vector2( -4.6, 11.4 )
+[sub_resource type="SegmentShape2D" id="1"]
+a = Vector2(5.8, -12.4)
+b = Vector2(-4.6, 11.4)
-[sub_resource type="RectangleShape2D" id=2]
-size = Vector2( 6.3, 0.55 )
+[sub_resource type="RectangleShape2D" id="2"]
+size = Vector2(6.3, 0.55)
[node name="Hoop" type="StaticBody2D"]
-script = ExtResource( 3 )
+script = ExtResource("3")
[node name="BackgroundSprite" type="Sprite2D" parent="."]
+visible = false
light_mask = 4
z_index = -1
-texture = ExtResource( 2 )
+texture = ExtResource("2")
[node name="ForegroundSprite" type="Sprite2D" parent="."]
-position = Vector2( -12, 16 )
z_index = 1
-texture = ExtResource( 1 )
+position = Vector2(-12, 16)
+texture = ExtResource("1")
[node name="RightCollider" type="CollisionShape2D" parent="."]
-position = Vector2( 1.6, 1 )
-shape = SubResource( 1 )
+position = Vector2(1.6, 1)
+shape = SubResource("1")
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
-position = Vector2( -21.8, 6.6 )
+position = Vector2(-21.8, 6.6)
rotation = 0.546288
-scale = Vector2( 0.5, 1 )
-polygon = PackedVector2Array( 0.762794, -5.14728, 5.32917, 3.9975, 2.25312, 4.93263, -3.35769, 0.318554 )
+scale = Vector2(0.5, 1)
+polygon = PackedVector2Array(0.762794, -5.14728, 5.32917, 3.9975, 2.25312, 4.93263, -3.35769, 0.318554)
[node name="Area2D" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
-position = Vector2( -12.7, 10.75 )
-shape = SubResource( 2 )
+position = Vector2(-12.7, 10.75)
+shape = SubResource("2")
[node name="CollisionPolygon2D2" type="CollisionPolygon2D" parent="."]
-position = Vector2( -12.5, 14.4 )
+position = Vector2(-12.5, 14.4)
rotation = 3.14159
-polygon = PackedVector2Array( 10.9, 3.20002, -11.1, 3.19997, -8.49998, -3.60003, 7.50002, -3.59999 )
+polygon = PackedVector2Array(10.9, 3.20002, -11.1, 3.19997, -8.49998, -3.60003, 7.50002, -3.59999)
one_way_collision = true
[connection signal="body_exited" from="Area2D" to="." method="_on_Area2D_body_exited"]
diff --git a/scenes/level.tscn b/scenes/level.tscn
index 91f685f..5e8c5d3 100644
--- a/scenes/level.tscn
+++ b/scenes/level.tscn
@@ -1,10 +1,9 @@
-[gd_scene load_steps=11 format=3 uid="uid://cdtc5xcoq0iun"]
+[gd_scene load_steps=10 format=3 uid="uid://cdtc5xcoq0iun"]
-[ext_resource type="PackedScene" path="res://scenes/hoop.tscn" id="2"]
+[ext_resource type="PackedScene" uid="uid://dbcc3l74gqjjo" path="res://scenes/hoop.tscn" id="2"]
[ext_resource type="PackedScene" uid="uid://dnb0otlc0mnc5" path="res://scenes/basketball.tscn" id="3"]
-[ext_resource type="Texture2D" uid="uid://cw2d7vif3odgj" path="res://textures/court_lines.png" id="3_y2ldl"]
[ext_resource type="PackedScene" uid="uid://cixqgc85i5wnn" path="res://scenes/interface.tscn" id="4"]
-[ext_resource type="Texture2D" uid="uid://bnptqq0g60r6q" path="res://textures/court_tile.png" id="4_pw3tr"]
+[ext_resource type="Texture2D" uid="uid://f47j73kxq8lf" path="res://textures/court.png" id="5_53mtb"]
[ext_resource type="Script" path="res://scripts/camera.gd" id="6"]
[ext_resource type="PackedScene" uid="uid://ckf344kaw3ak6" path="res://scenes/audio.tscn" id="7"]
@@ -32,52 +31,27 @@ script = ExtResource("6")
[node name="Background" type="StaticBody2D" parent="."]
z_index = -1
-[node name="CourtLines" type="Sprite2D" parent="Background"]
-position = Vector2(134, 56)
-texture = ExtResource("3_y2ldl")
-
[node name="FloorCollider" type="CollisionShape2D" parent="Background"]
position = Vector2(93, 113)
shape = SubResource("1")
-[node name="CourtTile" type="TextureRect" parent="Background"]
-offset_left = -202.0
-offset_top = -8.0
-offset_right = 55.0
-offset_bottom = 120.0
-mouse_filter = 2
-texture = ExtResource("4_pw3tr")
-stretch_mode = 1
-
[node name="RightWallCollider" type="CollisionShape2D" parent="Background"]
position = Vector2(194, 20)
shape = SubResource("2")
[node name="LeftWallCollider" type="CollisionShape2D" parent="Background"]
-position = Vector2(-202, 20)
+position = Vector2(-281, 20)
shape = SubResource("3")
-[node name="WallCourtLines" type="Sprite2D" parent="Background"]
-position = Vector2(141, -161)
-scale = Vector2(1, 2.55)
-texture = ExtResource("3_y2ldl")
-centered = false
-region_enabled = true
-region_rect = Rect2(87, 0, 73, 60)
-
-[node name="WallCourtTile" type="Sprite2D" parent="Background"]
-position = Vector2(-202, -161)
-scale = Vector2(10.719, 2.55)
-texture = ExtResource("4_pw3tr")
-centered = false
-region_enabled = true
-region_rect = Rect2(0, 0, 32, 60)
+[node name="Court" type="Sprite2D" parent="Background"]
+position = Vector2(-34, -8)
+texture = ExtResource("5_53mtb")
[node name="Hoop" parent="." instance=ExtResource("2")]
-position = Vector2(163, 37)
+position = Vector2(142, 34)
[node name="Basketball" parent="." instance=ExtResource("3")]
-position = Vector2(123, 73)
+position = Vector2(103, 73)
[node name="Audio" parent="." instance=ExtResource("7")]
diff --git a/textures/court.png b/textures/court.png
new file mode 100644
index 0000000..cc6ef79
--- /dev/null
+++ b/textures/court.png
Binary files differ
diff --git a/textures/court_tile.png.import b/textures/court.png.import
index 59c7623..3d64346 100644
--- a/textures/court_tile.png.import
+++ b/textures/court.png.import
@@ -2,16 +2,16 @@
importer="texture"
type="CompressedTexture2D"
-uid="uid://bnptqq0g60r6q"
-path="res://.godot/imported/court_tile.png-220b287bd426c3317e102f3d7a225ca2.ctex"
+uid="uid://f47j73kxq8lf"
+path="res://.godot/imported/court.png-baf922ac3cff12bf7cb49397098119e7.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://textures/court_tile.png"
-dest_files=["res://.godot/imported/court_tile.png-220b287bd426c3317e102f3d7a225ca2.ctex"]
+source_file="res://textures/court.png"
+dest_files=["res://.godot/imported/court.png-baf922ac3cff12bf7cb49397098119e7.ctex"]
[params]
diff --git a/textures/court_lines.png b/textures/court_lines.png
deleted file mode 100644
index f862349..0000000
--- a/textures/court_lines.png
+++ /dev/null
Binary files differ
diff --git a/textures/court_lines.png.import b/textures/court_lines.png.import
deleted file mode 100644
index 62b3726..0000000
--- a/textures/court_lines.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://cw2d7vif3odgj"
-path="res://.godot/imported/court_lines.png-92f98f04291e84f62ad00334a0ec4c0f.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://textures/court_lines.png"
-dest_files=["res://.godot/imported/court_lines.png-92f98f04291e84f62ad00334a0ec4c0f.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/textures/court_tile.png b/textures/court_tile.png
deleted file mode 100644
index 8d2e711..0000000
--- a/textures/court_tile.png
+++ /dev/null
Binary files differ