From 395c25b1fbe51f42decf402f97e51eabcc8c0a77 Mon Sep 17 00:00:00 2001
From: Daniel Weipert <code@drogueronin.de>
Date: Sun, 18 Jun 2023 16:43:22 +0200
Subject: Godot v3 -> v4

---
 Objects/CheckFall.gd   |  2 +-
 Objects/CheckFall.tscn |  2 +-
 Objects/Flag.tscn      | 87 ++++++++++++++++++++++++++++----------------------
 3 files changed, 50 insertions(+), 41 deletions(-)

(limited to 'Objects')

diff --git a/Objects/CheckFall.gd b/Objects/CheckFall.gd
index ff28fc0..914967a 100644
--- a/Objects/CheckFall.gd
+++ b/Objects/CheckFall.gd
@@ -1,5 +1,5 @@
 extends Area2D
 
 
-func _on_CheckFall_body_entered(body):
+func _on_CheckFall_body_entered(_body):
 	get_parent().respawn_player()
diff --git a/Objects/CheckFall.tscn b/Objects/CheckFall.tscn
index 526c2e3..7a729d6 100644
--- a/Objects/CheckFall.tscn
+++ b/Objects/CheckFall.tscn
@@ -3,7 +3,7 @@
 [ext_resource path="res://Objects/CheckFall.gd" type="Script" id=1]
 
 [sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 384, 10 )
+size = Vector2( 384, 10 )
 
 [node name="CheckFall" type="Area2D"]
 collision_layer = 0
diff --git a/Objects/Flag.tscn b/Objects/Flag.tscn
index 7d77d10..ab8e3eb 100644
--- a/Objects/Flag.tscn
+++ b/Objects/Flag.tscn
@@ -1,50 +1,59 @@
-[gd_scene load_steps=9 format=2]
-
-[ext_resource path="res://Assets/Environment/OA animated flag.png" type="Texture" id=1]
-[ext_resource path="res://Objects/Flag.gd" type="Script" id=2]
-
-[sub_resource type="AtlasTexture" id=1]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 0, 0, 38, 138 )
-
-[sub_resource type="AtlasTexture" id=2]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 38, 0, 38, 138 )
-
-[sub_resource type="AtlasTexture" id=3]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 76, 0, 38, 138 )
-
-[sub_resource type="AtlasTexture" id=4]
-flags = 4
-atlas = ExtResource( 1 )
-region = Rect2( 114, 0, 38, 138 )
-
-[sub_resource type="SpriteFrames" id=5]
-animations = [ {
-"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ) ],
+[gd_scene load_steps=9 format=3 uid="uid://cssvf3k8yn751"]
+
+[ext_resource type="Texture2D" uid="uid://cc2ffqakc6s7m" path="res://Assets/Environment/OA animated flag.png" id="1"]
+[ext_resource type="Script" path="res://Objects/Flag.gd" id="2"]
+
+[sub_resource type="AtlasTexture" id="1"]
+atlas = ExtResource("1")
+region = Rect2(0, 0, 38, 138)
+
+[sub_resource type="AtlasTexture" id="2"]
+atlas = ExtResource("1")
+region = Rect2(38, 0, 38, 138)
+
+[sub_resource type="AtlasTexture" id="3"]
+atlas = ExtResource("1")
+region = Rect2(76, 0, 38, 138)
+
+[sub_resource type="AtlasTexture" id="4"]
+atlas = ExtResource("1")
+region = Rect2(114, 0, 38, 138)
+
+[sub_resource type="SpriteFrames" id="5"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("1")
+}, {
+"duration": 1.0,
+"texture": SubResource("2")
+}, {
+"duration": 1.0,
+"texture": SubResource("3")
+}, {
+"duration": 1.0,
+"texture": SubResource("4")
+}],
 "loop": true,
-"name": "default",
+"name": &"default",
 "speed": 5.0
-} ]
+}]
 
-[sub_resource type="RectangleShape2D" id=6]
-extents = Vector2( 19.3237, 69.0456 )
+[sub_resource type="RectangleShape2D" id="6"]
+size = Vector2(12, 62)
 
 [node name="Flag" type="Area2D"]
 collision_layer = 0
-script = ExtResource( 2 )
+script = ExtResource("2")
 
-[node name="Sprite" type="AnimatedSprite" parent="."]
-scale = Vector2( 0.25, 0.25 )
-frames = SubResource( 5 )
+[node name="Sprite2D" type="AnimatedSprite2D" parent="."]
+scale = Vector2(0.25, 0.25)
+sprite_frames = SubResource("5")
 frame = 3
-playing = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-scale = Vector2( 0.25, 0.25 )
-shape = SubResource( 6 )
+position = Vector2(0, -0.5)
+scale = Vector2(0.5, 0.5)
+shape = SubResource("6")
+
 [connection signal="body_entered" from="." to="." method="_on_Flag_body_entered"]
-- 
cgit v1.2.3