Rename InteractivePawn -> PawnInteractive

gdquest-demos · Dec 27, 2018 · 3d8f3b5 · 3d8f3b5
1 parent 1a92cd4
commit 3d8f3b5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/godot/local_map/LocalMap.tscn b/godot/local_map/LocalMap.tscn
@@ -7,12 +7,13 @@
 [ext_resource path="res://local_map/grid/SpawningPoint.tscn" type="PackedScene" id=5]
 [ext_resource path="res://local_map/grid/PawnContainer.gd" type="Script" id=6]
 [ext_resource path="res://party/Party.tscn" type="PackedScene" id=7]
-[ext_resource path="res://local_map/pawns/InteractivePawn.tscn" type="PackedScene" id=8]
+[ext_resource path="res://local_map/pawns/PawnInteractive.tscn" type="PackedScene" id=8]
 [ext_resource path="res://local_map/pawns/actions/StartCombatAction.tscn" type="PackedScene" id=9]
 [ext_resource path="res://combat/battlers/formations/PorcupineFormation001.tscn" type="PackedScene" id=10]
 [ext_resource path="res://local_map/pawns/actions/DialogueAction.tscn" type="PackedScene" id=11]
 [ext_resource path="res://interface/gui/DialogueBox.tscn" type="PackedScene" id=12]
 
+
 [sub_resource type="RectangleShape2D" id=1]
 
 extents = Vector2( 50, 50 )

diff --git a/godot/local_map/pawns/InteractivePawn.gd → godot/local_map/pawns/PawnInteractive.gd b/godot/local_map/pawns/InteractivePawn.gd → godot/local_map/pawns/PawnInteractive.gd
@@ -1,5 +1,5 @@
 extends PawnActor
-class_name InteractivePawn
+class_name PawnInteractive
 
 onready var raycasts : = $Raycasts as Node2D
 onready var dialogue_balloon : = $DialogueBalloon as Sprite
@@ -69,7 +69,7 @@ func start_interaction() -> void:
 	Pauses the game and play each action under the $Actions node
 	Actions that transition to another scene (e.g. StartCombatAction) may unpause
 	the game themselves
-	InteractivePawn processes even when the game is paused, but not
+	PawnInteractive processes even when the game is paused, but not
 	PawnLeader, the player-controlled pawn
 	"""
 	dialogue_balloon.hide()

diff --git a/godot/local_map/pawns/InteractivePawn.tscn → godot/local_map/pawns/PawnInteractive.tscn b/godot/local_map/pawns/InteractivePawn.tscn → godot/local_map/pawns/PawnInteractive.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://local_map/pawns/InteractivePawn.gd" type="Script" id=1]
+[ext_resource path="res://local_map/pawns/PawnInteractive.gd" type="Script" id=1]
 [ext_resource path="res://local_map/pawns/sprites/star.png" type="Texture" id=2]
 [ext_resource path="res://assets/sprites/dialogue_balloon.png" type="Texture" id=3]
 

diff --git a/godot/project.godot b/godot/project.godot
@@ -99,10 +99,10 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://combat/Hit.gd"
 }, {
-"base": "Node2D",
+"base": "PawnActor",
 "class": "InteractivePawn",
 "language": "GDScript",
-"path": "res://local_map/pawns/InteractivePawn.gd"
+"path": "res://local_map/pawns/PawnInteractive.gd"
 }, {
 "base": "Reference",
 "class": "Inventory",