From b3597e4f31c5d1317dbf162931498d86ca0e5dfa Mon Sep 17 00:00:00 2001
From: Nathan Lovato <nathan@gdquest.com>
Date: Mon, 10 Dec 2018 09:43:05 +0900
Subject: [PATCH] Rename pawn files to reflect the class names

---
 godot/Game.tscn                                      |  1 +
 godot/local_map/LocalMap.tscn                        |  2 +-
 godot/local_map/grid/PawnContainer.gd                |  4 ++--
 godot/local_map/pawns/Follower.tscn                  |  8 --------
 godot/local_map/pawns/{Actor.gd => PawnActor.gd}     |  0
 .../local_map/pawns/{Follower.gd => PawnFollower.gd} |  0
 godot/local_map/pawns/PawnFollower.tscn              |  8 ++++++++
 godot/local_map/pawns/{Leader.gd => PawnLeader.gd}   |  0
 .../local_map/pawns/{Actor.tscn => PawnLeader.tscn}  |  2 +-
 godot/project.godot                                  | 12 ++++++------
 10 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 godot/local_map/pawns/Follower.tscn
 rename godot/local_map/pawns/{Actor.gd => PawnActor.gd} (100%)
 rename godot/local_map/pawns/{Follower.gd => PawnFollower.gd} (100%)
 create mode 100644 godot/local_map/pawns/PawnFollower.tscn
 rename godot/local_map/pawns/{Leader.gd => PawnLeader.gd} (100%)
 rename godot/local_map/pawns/{Actor.tscn => PawnLeader.tscn} (97%)

diff --git a/godot/Game.tscn b/godot/Game.tscn
index 5f85550..c773673 100644
--- a/godot/Game.tscn
+++ b/godot/Game.tscn
@@ -12,6 +12,7 @@ script = ExtResource( 1 )
 
 [node name="Party" parent="." instance=ExtResource( 2 )]
 visible = false
+PARTY_SIZE = null
 
 [node name="LocalMap" parent="." instance=ExtResource( 3 )]
 
diff --git a/godot/local_map/LocalMap.tscn b/godot/local_map/LocalMap.tscn
index 969b6b5..d6cf5ee 100644
--- a/godot/local_map/LocalMap.tscn
+++ b/godot/local_map/LocalMap.tscn
@@ -82,7 +82,7 @@ facing = {
 formation = ExtResource( 9 )
 
 [node name="DialoguePawn" parent="Grid/Pawns" instance=ExtResource( 7 )]
-position = Vector2( 800, 220 )
+position = Vector2( 350, 290 )
 facing = {
 "down": true,
 "left": true,
diff --git a/godot/local_map/grid/PawnContainer.gd b/godot/local_map/grid/PawnContainer.gd
index 7f35e3a..df47202 100644
--- a/godot/local_map/grid/PawnContainer.gd
+++ b/godot/local_map/grid/PawnContainer.gd
@@ -2,8 +2,8 @@ extends Node2D
 
 export var party_scene : PackedScene
 
-const Leader = preload("res://local_map/pawns/Actor.tscn")
-const Follower = preload("res://local_map/pawns/Follower.tscn")
+const Leader = preload("res://local_map/pawns/PawnLeader.tscn")
+const Follower = preload("res://local_map/pawns/PawnFollower.tscn")
 
 var party_members : = []
 var party
diff --git a/godot/local_map/pawns/Follower.tscn b/godot/local_map/pawns/Follower.tscn
deleted file mode 100644
index 882b0b0..0000000
--- a/godot/local_map/pawns/Follower.tscn
+++ /dev/null
@@ -1,8 +0,0 @@
-[gd_scene load_steps=3 format=2]
-
-[ext_resource path="res://local_map/pawns/Actor.tscn" type="PackedScene" id=1]
-[ext_resource path="res://local_map/pawns/Follower.gd" type="Script" id=2]
-
-[node name="Follower" instance=ExtResource( 1 )]
-script = ExtResource( 2 )
-
diff --git a/godot/local_map/pawns/Actor.gd b/godot/local_map/pawns/PawnActor.gd
similarity index 100%
rename from godot/local_map/pawns/Actor.gd
rename to godot/local_map/pawns/PawnActor.gd
diff --git a/godot/local_map/pawns/Follower.gd b/godot/local_map/pawns/PawnFollower.gd
similarity index 100%
rename from godot/local_map/pawns/Follower.gd
rename to godot/local_map/pawns/PawnFollower.gd
diff --git a/godot/local_map/pawns/PawnFollower.tscn b/godot/local_map/pawns/PawnFollower.tscn
new file mode 100644
index 0000000..4b83383
--- /dev/null
+++ b/godot/local_map/pawns/PawnFollower.tscn
@@ -0,0 +1,8 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://local_map/pawns/PawnLeader.tscn" type="PackedScene" id=1]
+[ext_resource path="res://local_map/pawns/PawnFollower.gd" type="Script" id=2]
+
+[node name="Follower" index="0" instance=ExtResource( 1 )]
+script = ExtResource( 2 )
+
diff --git a/godot/local_map/pawns/Leader.gd b/godot/local_map/pawns/PawnLeader.gd
similarity index 100%
rename from godot/local_map/pawns/Leader.gd
rename to godot/local_map/pawns/PawnLeader.gd
diff --git a/godot/local_map/pawns/Actor.tscn b/godot/local_map/pawns/PawnLeader.tscn
similarity index 97%
rename from godot/local_map/pawns/Actor.tscn
rename to godot/local_map/pawns/PawnLeader.tscn
index 28bfaae..38142bf 100644
--- a/godot/local_map/pawns/Actor.tscn
+++ b/godot/local_map/pawns/PawnLeader.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://local_map/pawns/Leader.gd" type="Script" id=1]
+[ext_resource path="res://local_map/pawns/PawnLeader.gd" type="Script" id=1]
 [ext_resource path="res://local_map/pawns/sprites/character.png" type="Texture" id=2]
 
 [sub_resource type="Animation" id=1]
diff --git a/godot/project.godot b/godot/project.godot
index 3d635be..e082606 100644
--- a/godot/project.godot
+++ b/godot/project.godot
@@ -134,20 +134,20 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://local_map/pawns/Pawn.gd"
 }, {
-"base": "Node2D",
+"base": "Pawn",
 "class": "PawnActor",
 "language": "GDScript",
-"path": "res://local_map/pawns/Actor.gd"
+"path": "res://local_map/pawns/PawnActor.gd"
 }, {
-"base": "Node2D",
+"base": "PawnActor",
 "class": "PawnFollower",
 "language": "GDScript",
-"path": "res://local_map/pawns/Follower.gd"
+"path": "res://local_map/pawns/PawnFollower.gd"
 }, {
-"base": "Node2D",
+"base": "PawnActor",
 "class": "PawnLeader",
 "language": "GDScript",
-"path": "res://local_map/pawns/Leader.gd"
+"path": "res://local_map/pawns/PawnLeader.gd"
 }, {
 "base": "Node2D",
 "class": "RectExtents",
-- 
GitLab