Update battlers to use the two different starting character stats res…

…ources
gdquest-demos · Oct 22, 2018 · ce9ceb4 · ce9ceb4
1 parent ee4de9a
commit ce9ceb4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/godot/combat/battlers/Battler.tscn b/godot/combat/battlers/Battler.tscn
@@ -1,11 +1,12 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://combat/battlers/Battler.gd" type="Script" id=1]
 [ext_resource path="res://combat/battlers/BattlerSkin.gd" type="Script" id=2]
 [ext_resource path="res://combat/battlers/Job.tscn" type="PackedScene" id=3]
-[ext_resource path="res://combat/battlers/actions/Attack.tscn" type="PackedScene" id=4]
-[ext_resource path="res://combat/battlers/actions/Attack.gd" type="Script" id=5]
-[ext_resource path="res://combat/interface/lifebar/InterfaceAnchor.tscn" type="PackedScene" id=6]
+[ext_resource path="res://combat/battlers/jobs/DefaultJob.tres" type="Resource" id=4]
+[ext_resource path="res://combat/battlers/actions/Attack.tscn" type="PackedScene" id=5]
+[ext_resource path="res://combat/battlers/actions/Attack.gd" type="Script" id=6]
+[ext_resource path="res://combat/interface/lifebar/InterfaceAnchor.tscn" type="PackedScene" id=7]
 
 [sub_resource type="Animation" id=1]
 
@@ -53,8 +54,6 @@ TARGET_OFFSET_DISTANCE = null
 [node name="Skin" type="Position2D" parent="."]
 script = ExtResource( 2 )
 _sections_unfolded = [ "Visibility" ]
-TURN_START_MOVE_DISTANCE = null
-TWEEN_DURATION = null
 
 [node name="Tween" type="Tween" parent="Skin"]
 repeat = false
@@ -75,13 +74,14 @@ anims/idle = SubResource( 2 )
 blend_times = [  ]
 
 [node name="Job" parent="." instance=ExtResource( 3 )]
+starting_stats = ExtResource( 4 )
 
 [node name="Actions" type="Node" parent="."]
 
-[node name="Attack" parent="Actions" instance=ExtResource( 4 )]
-script = ExtResource( 5 )
+[node name="Attack" parent="Actions" instance=ExtResource( 5 )]
+script = ExtResource( 6 )
 
-[node name="InterfaceAnchor" parent="." instance=ExtResource( 6 )]
+[node name="InterfaceAnchor" parent="." instance=ExtResource( 7 )]
 position = Vector2( 0, 42 )
 
 [node name="TargetAnchor" type="Position2D" parent="."]

diff --git a/godot/combat/battlers/BlueBattler.tscn b/godot/combat/battlers/BlueBattler.tscn
@@ -1,14 +1,18 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://combat/battlers/Battler.tscn" type="PackedScene" id=1]
 [ext_resource path="res://animation/BlueAnim.tscn" type="PackedScene" id=2]
+[ext_resource path="res://combat/battlers/jobs/Fighter.tres" type="Resource" id=3]
 
-[node name="Blue" groups=[
+[node name="Blue" index="0" groups=[
 "party",
 ] instance=ExtResource( 1 )]
 
 [node name="BlueAnim" parent="Skin" index="0" instance=ExtResource( 2 )]
 
+[node name="Job" parent="." index="1"]
+starting_stats = ExtResource( 3 )
+
 [node name="InterfaceAnchor" parent="." index="3"]
 position = Vector2( 0, 61.8831 )
 
diff --git a/godot/combat/battlers/DanBattler.tscn b/godot/combat/battlers/DanBattler.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://combat/battlers/Battler.tscn" type="PackedScene" id=1]
 [ext_resource path="res://animation/DanAnim.tscn" type="PackedScene" id=2]
+[ext_resource path="res://combat/battlers/jobs/Fighter.tres" type="Resource" id=3]
 
 [sub_resource type="Shader" id=1]
 
@@ -16,14 +17,17 @@ render_priority = 0
 shader = SubResource( 1 )
 _sections_unfolded = [ "shader" ]
 
-[node name="Dan" groups=[
+[node name="Dan" index="0" groups=[
 "party",
 ] instance=ExtResource( 1 )]
 material = SubResource( 2 )
 _sections_unfolded = [ "Material", "Visibility", "material" ]
 
 [node name="DanAnim" parent="Skin" index="0" instance=ExtResource( 2 )]
 
+[node name="Job" parent="." index="1"]
+starting_stats = ExtResource( 3 )
+
 [node name="InterfaceAnchor" parent="." index="3"]
 position = Vector2( 0, 60.5757 )
 
diff --git a/godot/combat/battlers/PorcupineBattler.tscn b/godot/combat/battlers/PorcupineBattler.tscn
@@ -1,14 +1,18 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://combat/battlers/Battler.tscn" type="PackedScene" id=1]
 [ext_resource path="res://animation/PorcupineAnim.tscn" type="PackedScene" id=2]
+[ext_resource path="res://combat/battlers/jobs/Porcupine.tres" type="Resource" id=3]
 
-[node name="Porcupine" groups=[
+[node name="Porcupine" index="0" groups=[
 "monster",
 ] instance=ExtResource( 1 )]
 
 [node name="PorcupineAnim" parent="Skin" index="0" instance=ExtResource( 2 )]
 
+[node name="Job" parent="." index="1"]
+starting_stats = ExtResource( 3 )
+
 [node name="InterfaceAnchor" parent="." index="3"]
 position = Vector2( 0, 48.9708 )