From 00ff356b9f1aeab1bb7e895009be3846c62e97a4 Mon Sep 17 00:00:00 2001 From: Martin Felis Date: Thu, 17 Jun 2021 23:25:01 +0200 Subject: [PATCH] Fixed wrong rebase --- project.godot | 1 + scenes/Game.tscn | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/project.godot b/project.godot index 56fec97..9f40be6 100644 --- a/project.godot +++ b/project.godot @@ -10,6 +10,7 @@ config_version=4 _global_script_classes=[ ] _global_script_class_icons={ + } [application] diff --git a/scenes/Game.tscn b/scenes/Game.tscn index 0d433cd..6226c83 100644 --- a/scenes/Game.tscn +++ b/scenes/Game.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://scenes/World.gd" type="Script" id=1] [ext_resource path="res://scenes/HexTile.gd" type="Script" id=2] [ext_resource path="res://assets/pirate.svg" type="Texture" id=3] -[ext_resource path="res://scenes/pirate.gd" type="Script" id=4] [ext_resource path="res://scenes/FPSValue.gd" type="Script" id=4] +[ext_resource path="res://scenes/pirate.gd" type="Script" id=5] [node name="GameRoot" type="Node"] @@ -79,14 +79,6 @@ margin_right = 317.0 margin_bottom = 27.0 text = "(0,0)" -[node name="PlayerChar" type="KinematicBody2D" parent="World"] -script = ExtResource( 4 ) - -[node name="pirate" type="Sprite" parent="World/PlayerChar"] -scale = Vector2( 0.45498, 0.45498 ) -texture = ExtResource( 3 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="World/PlayerChar"] [node name="VSeparator" type="VSeparator" parent="World/UI/TopContainer"] margin_left = 321.0 margin_right = 325.0 @@ -103,3 +95,12 @@ margin_bottom = 27.0 text = "0" align = 2 script = ExtResource( 4 ) + +[node name="PlayerChar" type="KinematicBody2D" parent="World"] +script = ExtResource( 5 ) + +[node name="pirate" type="Sprite" parent="World/PlayerChar"] +scale = Vector2( 0.45498, 0.45498 ) +texture = ExtResource( 3 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="World/PlayerChar"]