Convert demos to Godot 4 using regular expressions in a script

2026-01-04 23:10:08 +01:00 · 2022-03-26 05:00:50 -05:00
parent 410d783126
commit bbe50fc9da
1095 changed files with 13628 additions and 13557 deletions
--- a/networking/multiplayer_pong/ball.png.import
+++ b/networking/multiplayer_pong/ball.png.import
@@ -1,8 +1,8 @@
 [remap]

 importer="texture"
-type="StreamTexture"
-path="res://.import/ball.png-9a4ca347acb7532f6ae347744a6b04f7.stex"
+type="StreamTexture2D"
+path="res://.godot/imported/ball.png-9a4ca347acb7532f6ae347744a6b04f7.stex"
 metadata={
 "vram_texture": false
 }
@@ -10,7 +10,7 @@ metadata={
 [deps]

 source_file="res://ball.png"
-dest_files=[ "res://.import/ball.png-9a4ca347acb7532f6ae347744a6b04f7.stex" ]
+dest_files=["res://.godot/imported/ball.png-9a4ca347acb7532f6ae347744a6b04f7.stex"]

 [params]

--- a/networking/multiplayer_pong/ball.tscn
+++ b/networking/multiplayer_pong/ball.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=2]

 [ext_resource path="res://logic/ball.gd" type="Script" id=1]
-[ext_resource path="res://ball.png" type="Texture" id=2]
+[ext_resource path="res://ball.png" type="Texture2D" id=2]

 [sub_resource type="CircleShape2D" id=1]
 radius = 5.11969
@@ -9,8 +9,8 @@ radius = 5.11969
 [node name="Ball" type="Area2D"]
 script = ExtResource( 1 )

-[node name="Sprite" type="Sprite" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="."]
 texture = ExtResource( 2 )

-[node name="Shape" type="CollisionShape2D" parent="."]
+[node name="Shape3D" type="CollisionShape2D" parent="."]
 shape = SubResource( 1 )
--- a/networking/multiplayer_pong/icon.png.import
+++ b/networking/multiplayer_pong/icon.png.import
@@ -1,8 +1,8 @@
 [remap]

 importer="texture"
-type="StreamTexture"
-path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+type="StreamTexture2D"
+path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
 metadata={
 "vram_texture": false
 }
@@ -10,7 +10,7 @@ metadata={
 [deps]

 source_file="res://icon.png"
-dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
+dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"]

 [params]

--- a/networking/multiplayer_pong/lobby.tscn
+++ b/networking/multiplayer_pong/lobby.tscn
@@ -7,10 +7,10 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -320.0
-margin_top = -200.0
-margin_right = 320.0
-margin_bottom = 200.0
+offset_left = -320.0
+offset_top = -200.0
+offset_right = 320.0
+offset_bottom = 200.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 __meta__ = {
@@ -18,10 +18,10 @@ __meta__ = {
 }

 [node name="Title" type="Label" parent="."]
-margin_left = 210.0
-margin_top = 40.0
-margin_right = 430.0
-margin_bottom = 80.0
+offset_left = 210.0
+offset_top = 40.0
+offset_right = 430.0
+offset_bottom = 80.0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "Multiplayer Pong"
@@ -29,76 +29,76 @@ align = 1
 valign = 1

 [node name="LobbyPanel" type="Panel" parent="."]
-margin_left = 210.0
-margin_top = 160.0
-margin_right = 430.0
-margin_bottom = 270.0
+offset_left = 210.0
+offset_top = 160.0
+offset_right = 430.0
+offset_bottom = 270.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 script = ExtResource( 1 )

 [node name="AddressLabel" type="Label" parent="LobbyPanel"]
-margin_left = 10.0
-margin_top = 10.0
-margin_right = 62.0
-margin_bottom = 24.0
+offset_left = 10.0
+offset_top = 10.0
+offset_right = 62.0
+offset_bottom = 24.0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "Address"

 [node name="Address" type="LineEdit" parent="LobbyPanel"]
-margin_left = 10.0
-margin_top = 30.0
-margin_right = 210.0
-margin_bottom = 54.0
+offset_left = 10.0
+offset_top = 30.0
+offset_right = 210.0
+offset_bottom = 54.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 text = "127.0.0.1"

 [node name="HostButton" type="Button" parent="LobbyPanel"]
-margin_left = 10.0
-margin_top = 60.0
-margin_right = 90.0
-margin_bottom = 80.0
+offset_left = 10.0
+offset_top = 60.0
+offset_right = 90.0
+offset_bottom = 80.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 text = "Host"

 [node name="JoinButton" type="Button" parent="LobbyPanel"]
-margin_left = 130.0
-margin_top = 60.0
-margin_right = 210.0
-margin_bottom = 80.0
+offset_left = 130.0
+offset_top = 60.0
+offset_right = 210.0
+offset_bottom = 80.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 text = "Join"

 [node name="StatusOk" type="Label" parent="LobbyPanel"]
-margin_left = 10.0
-margin_top = 90.0
-margin_right = 210.0
-margin_bottom = 104.0
+offset_left = 10.0
+offset_top = 90.0
+offset_right = 210.0
+offset_bottom = 104.0
 size_flags_horizontal = 2
 size_flags_vertical = 0
-custom_colors/font_color = Color( 0, 1, 0.015625, 1 )
+custom_colors/font_color = Color(0, 1, 0.015625, 1)
 align = 1

 [node name="StatusFail" type="Label" parent="LobbyPanel"]
-margin_left = 10.0
-margin_top = 90.0
-margin_right = 210.0
-margin_bottom = 104.0
+offset_left = 10.0
+offset_top = 90.0
+offset_right = 210.0
+offset_bottom = 104.0
 size_flags_horizontal = 2
 size_flags_vertical = 0
-custom_colors/font_color = Color( 1, 0, 0, 1 )
+custom_colors/font_color = Color(1, 0, 0, 1)
 align = 1

 [node name="PortForward" type="Label" parent="LobbyPanel"]
 visible = false
-margin_left = -128.0
-margin_top = 136.0
-margin_right = 124.0
-margin_bottom = 184.0
+offset_left = -128.0
+offset_top = 136.0
+offset_right = 124.0
+offset_bottom = 184.0
 custom_constants/line_spacing = 6
 text = "If you want non-LAN clients to connect,
 make sure the port 8910 in UDP
@@ -110,10 +110,10 @@ __meta__ = {

 [node name="FindPublicIP" type="LinkButton" parent="LobbyPanel"]
 visible = false
-margin_left = 155.0
-margin_top = 152.0
-margin_right = 328.0
-margin_bottom = 166.0
+offset_left = 155.0
+offset_top = 152.0
+offset_right = 328.0
+offset_bottom = 166.0
 text = "Find your public IP address"
 __meta__ = {
 "_edit_use_anchors_": false
--- a/networking/multiplayer_pong/logic/ball.gd
+++ b/networking/multiplayer_pong/logic/ball.gd
@@ -6,7 +6,7 @@ var direction = Vector2.LEFT
 var stopped = false
 var _speed = DEFAULT_SPEED

-onready var _screen_size = get_viewport_rect().size
+@onready var _screen_size = get_viewport_rect().size

 func _process(delta):
 	_speed += delta
--- a/networking/multiplayer_pong/logic/lobby.gd
+++ b/networking/multiplayer_pong/logic/lobby.gd
@@ -5,32 +5,32 @@ extends Control
 # https://en.wikipedia.org/wiki/List_of_TCP_and_UDP_port_numbers
 const DEFAULT_PORT = 8910

-onready var address = $Address
-onready var host_button = $HostButton
-onready var join_button = $JoinButton
-onready var status_ok = $StatusOk
-onready var status_fail = $StatusFail
-onready var port_forward_label = $PortForward
-onready var find_public_ip_button = $FindPublicIP
+@onready var address = $Address
+@onready var host_button = $HostButton
+@onready var join_button = $JoinButton
+@onready var status_ok = $StatusOk
+@onready var status_fail = $StatusFail
+@onready var port_forward_label = $PortForward
+@onready var find_public_ip_button = $FindPublicIP

 var peer = null

 func _ready():
 	# Connect all the callbacks related to networking.
-	get_tree().connect("network_peer_connected", self, "_player_connected")
-	get_tree().connect("network_peer_disconnected", self, "_player_disconnected")
-	get_tree().connect("connected_to_server", self, "_connected_ok")
-	get_tree().connect("connection_failed", self, "_connected_fail")
-	get_tree().connect("server_disconnected", self, "_server_disconnected")
+	get_tree().connect(&"network_peer_connected", self._player_connected)
+	get_tree().connect(&"network_peer_disconnected", self._player_disconnected)
+	get_tree().connect(&"connected_to_server", self._connected_ok)
+	get_tree().connect(&"connection_failed", self._connected_fail)
+	get_tree().connect(&"server_disconnected", self._server_disconnected)

 #### Network callbacks from SceneTree ####

 # Callback from SceneTree.
 func _player_connected(_id):
 	# Someone connected, start the game!
-	var pong = load("res://pong.tscn").instance()
+	var pong = load("res://pong.tscn").instantiate()
 	# Connect deferred so we can safely erase it from the callback.
-	pong.connect("game_finished", self, "_end_game", [], CONNECT_DEFERRED)
+	pong.connect(&"game_finished", self._end_game, [], CONNECT_DEFERRED)

 	get_tree().get_root().add_child(pong)
 	hide()
@@ -66,7 +66,7 @@ func _end_game(with_error = ""):
 	if has_node("/root/Pong"):
 		# Erase immediately, otherwise network might show
 		# errors (this is why we connected deferred above).
-		get_node("/root/Pong").free()
+		get_node(^"/root/Pong").free()
 		show()

 	get_tree().set_network_peer(null) # Remove peer.
--- a/networking/multiplayer_pong/logic/paddle.gd
+++ b/networking/multiplayer_pong/logic/paddle.gd
@@ -2,17 +2,17 @@ extends Area2D

 const MOTION_SPEED = 150

-export var left = false
+@export var left = false

 var _motion = 0
 var _you_hidden = false

-onready var _screen_size_y = get_viewport_rect().size.y
+@onready var _screen_size_y = get_viewport_rect().size.y

 func _process(delta):
 	# Is the master of the paddle.
 	if is_network_master():
-		_motion = Input.get_action_strength("move_down") - Input.get_action_strength("move_up")
+		_motion = Input.get_axis(&"move_up", &"move_down")

 		if not _you_hidden and _motion != 0:
 			_hide_you_label()
@@ -40,7 +40,7 @@ puppet func set_pos_and_motion(pos, motion):

 func _hide_you_label():
 	_you_hidden = true
-	get_node("You").hide()
+	get_node(^"You").hide()


 func _on_paddle_area_enter(area):
--- a/networking/multiplayer_pong/logic/pong.gd
+++ b/networking/multiplayer_pong/logic/pong.gd
@@ -7,11 +7,11 @@ const SCORE_TO_WIN = 10
 var score_left = 0
 var score_right = 0

-onready var player2 = $Player2
-onready var score_left_node = $ScoreLeft
-onready var score_right_node = $ScoreRight
-onready var winner_left = $WinnerLeft
-onready var winner_right = $WinnerRight
+@onready var player2 = $Player2
+@onready var score_left_node = $ScoreLeft
+@onready var score_right_node = $ScoreRight
+@onready var winner_left = $WinnerLeft
+@onready var winner_right = $WinnerRight

 func _ready():
 	# By default, all nodes in server inherit from master,
--- a/networking/multiplayer_pong/paddle.png.import
+++ b/networking/multiplayer_pong/paddle.png.import
@@ -1,8 +1,8 @@
 [remap]

 importer="texture"
-type="StreamTexture"
-path="res://.import/paddle.png-0e798fb0912613386507c9904d5cc01a.stex"
+type="StreamTexture2D"
+path="res://.godot/imported/paddle.png-0e798fb0912613386507c9904d5cc01a.stex"
 metadata={
 "vram_texture": false
 }
@@ -10,7 +10,7 @@ metadata={
 [deps]

 source_file="res://paddle.png"
-dest_files=[ "res://.import/paddle.png-0e798fb0912613386507c9904d5cc01a.stex" ]
+dest_files=["res://.godot/imported/paddle.png-0e798fb0912613386507c9904d5cc01a.stex"]

 [params]

--- a/networking/multiplayer_pong/paddle.tscn
+++ b/networking/multiplayer_pong/paddle.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=2]

 [ext_resource path="res://logic/paddle.gd" type="Script" id=1]
-[ext_resource path="res://paddle.png" type="Texture" id=2]
+[ext_resource path="res://paddle.png" type="Texture2D" id=2]

 [sub_resource type="CapsuleShape2D" id=1]
 radius = 4.78568
@@ -10,17 +10,17 @@ height = 23.6064
 [node name="Paddle" type="Area2D"]
 script = ExtResource( 1 )

-[node name="Sprite" type="Sprite" parent="."]
+[node name="Sprite2D" type="Sprite2D" parent="."]
 texture = ExtResource( 2 )

-[node name="Shape" type="CollisionShape2D" parent="."]
+[node name="Shape3D" type="CollisionShape2D" parent="."]
 shape = SubResource( 1 )

 [node name="You" type="Label" parent="."]
-margin_left = -26.0
-margin_top = -33.0
-margin_right = 27.0
-margin_bottom = -19.0
+offset_left = -26.0
+offset_top = -33.0
+offset_right = 27.0
+offset_bottom = -19.0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "You"
--- a/networking/multiplayer_pong/pong.tscn
+++ b/networking/multiplayer_pong/pong.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=2]

 [ext_resource path="res://logic/pong.gd" type="Script" id=1]
-[ext_resource path="res://separator.png" type="Texture" id=2]
+[ext_resource path="res://separator.png" type="Texture2D" id=2]
 [ext_resource path="res://paddle.tscn" type="PackedScene" id=3]
 [ext_resource path="res://ball.tscn" type="PackedScene" id=4]

@@ -9,44 +9,44 @@
 script = ExtResource( 1 )

 [node name="ColorRect" type="ColorRect" parent="."]
-margin_right = 640.0
-margin_bottom = 400.0
-color = Color( 0.141176, 0.152941, 0.164706, 1 )
+offset_right = 640.0
+offset_bottom = 400.0
+color = Color(0.141176, 0.152941, 0.164706, 1)
 __meta__ = {
 "_edit_use_anchors_": false
 }

-[node name="Separator" type="Sprite" parent="."]
-position = Vector2( 320, 200 )
+[node name="Separator" type="Sprite2D" parent="."]
+position = Vector2(320, 200)
 texture = ExtResource( 2 )

 [node name="Player1" parent="." instance=ExtResource( 3 )]
-modulate = Color( 0, 1, 1, 1 )
-position = Vector2( 32.49, 188.622 )
+modulate = Color(0, 1, 1, 1)
+position = Vector2(32.49, 188.622)
 left = true

 [node name="Player2" parent="." instance=ExtResource( 3 )]
-modulate = Color( 1, 0, 1, 1 )
-position = Vector2( 608.88, 188.622 )
+modulate = Color(1, 0, 1, 1)
+position = Vector2(608.88, 188.622)

 [node name="Ball" parent="." instance=ExtResource( 4 )]
-position = Vector2( 320.387, 189.525 )
+position = Vector2(320.387, 189.525)

 [node name="ScoreLeft" type="Label" parent="."]
-margin_left = 240.0
-margin_top = 10.0
-margin_right = 280.0
-margin_bottom = 30.0
+offset_left = 240.0
+offset_top = 10.0
+offset_right = 280.0
+offset_bottom = 30.0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "0"
 align = 1

 [node name="ScoreRight" type="Label" parent="."]
-margin_left = 360.0
-margin_top = 10.0
-margin_right = 400.0
-margin_bottom = 30.0
+offset_left = 360.0
+offset_top = 10.0
+offset_right = 400.0
+offset_bottom = 30.0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "0"
@@ -54,36 +54,36 @@ align = 1

 [node name="WinnerLeft" type="Label" parent="."]
 visible = false
-margin_left = 190.0
-margin_top = 170.0
-margin_right = 267.0
-margin_bottom = 184.0
+offset_left = 190.0
+offset_top = 170.0
+offset_right = 267.0
+offset_bottom = 184.0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "The Winner!"

 [node name="WinnerRight" type="Label" parent="."]
 visible = false
-margin_left = 380.0
-margin_top = 170.0
-margin_right = 457.0
-margin_bottom = 184.0
+offset_left = 380.0
+offset_top = 170.0
+offset_right = 457.0
+offset_bottom = 184.0
 size_flags_horizontal = 2
 size_flags_vertical = 0
 text = "The Winner!"

 [node name="ExitGame" type="Button" parent="."]
 visible = false
-margin_left = 280.0
-margin_top = 340.0
-margin_right = 360.0
-margin_bottom = 360.0
+offset_left = 280.0
+offset_top = 340.0
+offset_right = 360.0
+offset_bottom = 360.0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 text = "Exit Game"

 [node name="Camera2D" type="Camera2D" parent="."]
-offset = Vector2( 320, 200 )
+offset = Vector2(320, 200)
 current = true

 [connection signal="pressed" from="ExitGame" to="." method="_on_exit_game_pressed"]
--- a/networking/multiplayer_pong/project.godot
+++ b/networking/multiplayer_pong/project.godot
@@ -32,27 +32,27 @@ stretch_2d=true

 [gdnative]

-singletons=[  ]
+singletons=[]

 [input]

 move_down={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":16777234,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":90,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":90,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":83,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+]
 }
 move_up={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":16777232,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":65,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"store_command":true,"alt_pressed":false,"shift_pressed":false,"meta_pressed":false,"command_pressed":false,"pressed":false,"keycode":87,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+]
 }

 [rendering]
--- a/networking/multiplayer_pong/separator.png.import
+++ b/networking/multiplayer_pong/separator.png.import
@@ -1,8 +1,8 @@
 [remap]

 importer="texture"
-type="StreamTexture"
-path="res://.import/separator.png-f981c8489b9148e2e1dc63398273da74.stex"
+type="StreamTexture2D"
+path="res://.godot/imported/separator.png-f981c8489b9148e2e1dc63398273da74.stex"
 metadata={
 "vram_texture": false
 }
@@ -10,7 +10,7 @@ metadata={
 [deps]

 source_file="res://separator.png"
-dest_files=[ "res://.import/separator.png-f981c8489b9148e2e1dc63398273da74.stex" ]
+dest_files=["res://.godot/imported/separator.png-f981c8489b9148e2e1dc63398273da74.stex"]

 [params]