From f3e19d85711e30dddd7745ac840c28e209e39fdc Mon Sep 17 00:00:00 2001
From: Guilherme Henrique Teixeira de Oliveira <htoguilherme@gmail.com>
Date: Mon, 26 Nov 2018 15:27:43 -0200
Subject: [PATCH] Concept arts integrated into the combat system

The only "missing" point is converting the game from 720p to 1080p. For
what I can tell, it's already 1080p, but it's being tested as 720p.

I had to downscale the sprites for the battlers, they were occuping the
whole screen.

For the platforms, I decided to only hide the sprite:
- The platforms might be used in a different area theme in the future
- The characters already have their own shadow
- Shadows have different sizes depending on what battler is "casting" it

Closes #53
---
 .../{DanAnim.tscn => GodetteAnim.tscn}        | 12 +++++-----
 godot/animation/PorcupineAnim.tscn            | 13 +++++-----
 .../{BlueAnim.tscn => RobiAnim.tscn}          | 12 +++++-----
 godot/combat/CombatArena.tscn                 |  7 +++++-
 godot/combat/background/ArenaTheme.tscn       | 11 +++++++++
 godot/combat/background/Grasslands.tscn       | 24 +++++++++++++++++++
 godot/combat/background/StonePlatform.tscn    |  1 +
 godot/combat/battlers/Battler.tscn            |  4 ++--
 .../characters/{Dan.tres => Godette.tres}     |  2 +-
 .../characters/{Blue.tres => Robi.tres}       |  2 +-
 .../formations/PorcupineFormation001.tscn     |  6 ++---
 godot/party/Party.tscn                        |  8 +++----
 12 files changed, 71 insertions(+), 31 deletions(-)
 rename godot/animation/{DanAnim.tscn => GodetteAnim.tscn} (57%)
 rename godot/animation/{BlueAnim.tscn => RobiAnim.tscn} (56%)
 create mode 100644 godot/combat/background/ArenaTheme.tscn
 create mode 100644 godot/combat/background/Grasslands.tscn
 rename godot/combat/battlers/characters/{Dan.tres => Godette.tres} (84%)
 rename godot/combat/battlers/characters/{Blue.tres => Robi.tres} (87%)

diff --git a/godot/animation/DanAnim.tscn b/godot/animation/GodetteAnim.tscn
similarity index 57%
rename from godot/animation/DanAnim.tscn
rename to godot/animation/GodetteAnim.tscn
index 592ef02..76f7475 100644
--- a/godot/animation/DanAnim.tscn
+++ b/godot/animation/GodetteAnim.tscn
@@ -2,17 +2,17 @@
 
 [ext_resource path="res://animation/BattlerAnim.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/sprites/battlers/shadow.png" type="Texture" id=2]
-[ext_resource path="res://assets/sprites/battlers/character_green.png" type="Texture" id=3]
+[ext_resource path="res://assets/sprites/battlers/godette.png" type="Texture" id=3]
 
-[node name="DanAnim" instance=ExtResource( 1 )]
+[node name="GodetteAnim" instance=ExtResource( 1 )]
 
 [node name="shadow" type="Sprite" parent="." index="0"]
-position = Vector2( 0, -1 )
+position = Vector2( 0.278992, -1 )
+scale = Vector2( 0.442015, 1 )
 texture = ExtResource( 2 )
-_sections_unfolded = [ "Transform" ]
 
 [node name="body" type="Sprite" parent="." index="1"]
-position = Vector2( 0, -60 )
+position = Vector2( 0, -88 )
+scale = Vector2( 0.5, 0.5 )
 texture = ExtResource( 3 )
-_sections_unfolded = [ "Transform" ]
 
diff --git a/godot/animation/PorcupineAnim.tscn b/godot/animation/PorcupineAnim.tscn
index c017e64..6353195 100644
--- a/godot/animation/PorcupineAnim.tscn
+++ b/godot/animation/PorcupineAnim.tscn
@@ -2,18 +2,17 @@
 
 [ext_resource path="res://animation/BattlerAnim.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/sprites/battlers/shadow.png" type="Texture" id=2]
-[ext_resource path="res://assets/sprites/monsters/porcupine.png" type="Texture" id=3]
+[ext_resource path="res://assets/sprites/battlers/porcupine.png" type="Texture" id=3]
 
-[node name="PorcupineAnim" index="0" instance=ExtResource( 1 )]
+[node name="PorcupineAnim" instance=ExtResource( 1 )]
 
 [node name="shadow" type="Sprite" parent="." index="0"]
-position = Vector2( -2.18341, -7.19193 )
-scale = Vector2( 0.944015, 0.77886 )
+position = Vector2( -2.09242, -7.19193 )
+scale = Vector2( 0.762035, 0.77886 )
 texture = ExtResource( 2 )
-_sections_unfolded = [ "Transform" ]
 
 [node name="body" type="Sprite" parent="." index="1"]
-position = Vector2( 11.4993, -57.4964 )
+position = Vector2( 11.4993, -54.4964 )
+scale = Vector2( 0.5, 0.5 )
 texture = ExtResource( 3 )
-_sections_unfolded = [ "Transform" ]
 
diff --git a/godot/animation/BlueAnim.tscn b/godot/animation/RobiAnim.tscn
similarity index 56%
rename from godot/animation/BlueAnim.tscn
rename to godot/animation/RobiAnim.tscn
index 1f631f7..e8177d2 100644
--- a/godot/animation/BlueAnim.tscn
+++ b/godot/animation/RobiAnim.tscn
@@ -2,17 +2,17 @@
 
 [ext_resource path="res://animation/BattlerAnim.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/sprites/battlers/shadow.png" type="Texture" id=2]
-[ext_resource path="res://assets/sprites/battlers/character_blue.png" type="Texture" id=3]
+[ext_resource path="res://assets/sprites/battlers/robi.png" type="Texture" id=3]
 
-[node name="BlueAnim" index="0" instance=ExtResource( 1 )]
+[node name="RobiAnim" instance=ExtResource( 1 )]
 
 [node name="shadow" type="Sprite" parent="." index="0"]
-position = Vector2( 0, -1 )
+position = Vector2( 0.274139, -1 )
+scale = Vector2( 0.451718, 1 )
 texture = ExtResource( 2 )
-_sections_unfolded = [ "Transform" ]
 
 [node name="body" type="Sprite" parent="." index="1"]
-position = Vector2( 0, -60 )
+position = Vector2( 0, -78 )
+scale = Vector2( 0.5, 0.5 )
 texture = ExtResource( 3 )
-_sections_unfolded = [ "Transform" ]
 
diff --git a/godot/combat/CombatArena.tscn b/godot/combat/CombatArena.tscn
index 08dfd2d..7c6a492 100644
--- a/godot/combat/CombatArena.tscn
+++ b/godot/combat/CombatArena.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://combat/CombatArena.gd" type="Script" id=1]
 [ext_resource path="res://combat/turn_queue/TurnQueue.tscn" type="PackedScene" id=2]
@@ -7,6 +7,7 @@
 [ext_resource path="res://interface/default.theme" type="Theme" id=5]
 [ext_resource path="res://combat/interface/bars/BattlersBarsBuilder.tscn" type="PackedScene" id=6]
 [ext_resource path="res://combat/Rewards.gd" type="Script" id=7]
+[ext_resource path="res://combat/background/Grasslands.tscn" type="PackedScene" id=8]
 
 [node name="CombatArena" type="Node2D"]
 script = ExtResource( 1 )
@@ -39,6 +40,7 @@ script = ExtResource( 3 )
 [node name="SelectArrow" parent="CombatInterface" instance=ExtResource( 4 )]
 
 [node name="OldSchoolUI" type="Control" parent="CombatInterface"]
+editor/display_folded = true
 anchor_left = 0.0
 anchor_top = 1.0
 anchor_right = 1.0
@@ -196,6 +198,7 @@ size_flags_vertical = 1
 [node name="BattlersBarsBuilder" parent="CombatInterface" instance=ExtResource( 6 )]
 
 [node name="Rewards" type="CanvasLayer" parent="."]
+editor/display_folded = true
 layer = 1
 offset = Vector2( 0, 0 )
 rotation = 0.0
@@ -238,4 +241,6 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
+[node name="Grasslands" parent="." instance=ExtResource( 8 )]
+
 [connection signal="item_activated" from="CombatInterface/OldSchoolUI/Row/MonstersPanel/ActionSelector/ItemList" to="CombatInterface" method="_on_ItemList_item_activated"]
diff --git a/godot/combat/background/ArenaTheme.tscn b/godot/combat/background/ArenaTheme.tscn
new file mode 100644
index 0000000..5d15090
--- /dev/null
+++ b/godot/combat/background/ArenaTheme.tscn
@@ -0,0 +1,11 @@
+[gd_scene format=2]
+
+[node name="ArenaTheme" type="Node2D"]
+
+[node name="Background" type="Sprite" parent="."]
+position = Vector2( 960, 540 )
+z_index = -1
+
+[node name="ForegroundElements" type="Node2D" parent="."]
+z_index = 1
+
diff --git a/godot/combat/background/Grasslands.tscn b/godot/combat/background/Grasslands.tscn
new file mode 100644
index 0000000..28f83d8
--- /dev/null
+++ b/godot/combat/background/Grasslands.tscn
@@ -0,0 +1,24 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://combat/background/ArenaTheme.tscn" type="PackedScene" id=1]
+[ext_resource path="res://assets/sprites/background/grasslands/grasslands.png" type="Texture" id=2]
+[ext_resource path="res://assets/sprites/background/grasslands/reek_1.png" type="Texture" id=3]
+[ext_resource path="res://assets/sprites/background/grasslands/reek_2.png" type="Texture" id=4]
+
+[node name="Grasslands" instance=ExtResource( 1 )]
+
+[node name="Background" parent="." index="0"]
+texture = ExtResource( 2 )
+
+[node name="Reek" type="Sprite" parent="ForegroundElements" index="0"]
+position = Vector2( 0, 940 )
+texture = ExtResource( 3 )
+
+[node name="Reek3" type="Sprite" parent="ForegroundElements" index="1"]
+position = Vector2( 1670, 990 )
+texture = ExtResource( 3 )
+
+[node name="Reek2" type="Sprite" parent="ForegroundElements" index="2"]
+position = Vector2( 1860, 940 )
+texture = ExtResource( 4 )
+
diff --git a/godot/combat/background/StonePlatform.tscn b/godot/combat/background/StonePlatform.tscn
index 11cd82b..f2e2aea 100644
--- a/godot/combat/background/StonePlatform.tscn
+++ b/godot/combat/background/StonePlatform.tscn
@@ -5,6 +5,7 @@
 [node name="StonePlatform" type="Position2D"]
 
 [node name="sprite" type="Sprite" parent="."]
+visible = false
 position = Vector2( 0, 43 )
 texture = ExtResource( 1 )
 
diff --git a/godot/combat/battlers/Battler.tscn b/godot/combat/battlers/Battler.tscn
index 19ce76f..f20835a 100644
--- a/godot/combat/battlers/Battler.tscn
+++ b/godot/combat/battlers/Battler.tscn
@@ -90,9 +90,9 @@ anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = -100.0
-margin_top = 70.0
+margin_top = 8.0
 margin_right = 100.0
-margin_bottom = 90.0
+margin_bottom = 28.0
 rect_min_size = Vector2( 200, 20 )
 rect_pivot_offset = Vector2( 100, 10 )
 rect_clip_content = false
diff --git a/godot/combat/battlers/characters/Dan.tres b/godot/combat/battlers/characters/Godette.tres
similarity index 84%
rename from godot/combat/battlers/characters/Dan.tres
rename to godot/combat/battlers/characters/Godette.tres
index 365e869..3cd38d6 100644
--- a/godot/combat/battlers/characters/Dan.tres
+++ b/godot/combat/battlers/characters/Godette.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" load_steps=5 format=2]
 
-[ext_resource path="res://animation/DanAnim.tscn" type="PackedScene" id=1]
+[ext_resource path="res://animation/GodetteAnim.tscn" type="PackedScene" id=1]
 [ext_resource path="res://combat/battlers/BattlerTemplate.gd" type="Script" id=2]
 [ext_resource path="res://combat/battlers/skills/Slash.tres" type="Resource" id=3]
 [ext_resource path="res://combat/battlers/jobs/Fighter.tres" type="Resource" id=4]
diff --git a/godot/combat/battlers/characters/Blue.tres b/godot/combat/battlers/characters/Robi.tres
similarity index 87%
rename from godot/combat/battlers/characters/Blue.tres
rename to godot/combat/battlers/characters/Robi.tres
index 9bc6f6a..4adb3b5 100644
--- a/godot/combat/battlers/characters/Blue.tres
+++ b/godot/combat/battlers/characters/Robi.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" load_steps=5 format=2]
 
-[ext_resource path="res://animation/BlueAnim.tscn" type="PackedScene" id=1]
+[ext_resource path="res://animation/RobiAnim.tscn" type="PackedScene" id=1]
 [ext_resource path="res://combat/battlers/BattlerTemplate.gd" type="Script" id=2]
 [ext_resource path="res://combat/battlers/skills/Slash.tres" type="Resource" id=3]
 [ext_resource path="res://combat/battlers/jobs/Fighter.tres" type="Resource" id=4]
diff --git a/godot/combat/battlers/formations/PorcupineFormation001.tscn b/godot/combat/battlers/formations/PorcupineFormation001.tscn
index 3612bbb..d57d61f 100644
--- a/godot/combat/battlers/formations/PorcupineFormation001.tscn
+++ b/godot/combat/battlers/formations/PorcupineFormation001.tscn
@@ -12,14 +12,14 @@ platform_template = ExtResource( 2 )
 background_image = null
 
 [node name="Porcupine" parent="." instance=ExtResource( 3 )]
-position = Vector2( 615.574, 266.879 )
+position = Vector2( 369.233, 566.37 )
 combat_template = ExtResource( 4 )
 
 [node name="Porcupine3" parent="." instance=ExtResource( 3 )]
-position = Vector2( 204.542, 488.953 )
+position = Vector2( 204.542, 698.953 )
 combat_template = ExtResource( 5 )
 
 [node name="Porcupine2" parent="." instance=ExtResource( 3 )]
-position = Vector2( 498.693, 693.495 )
+position = Vector2( 455.643, 817.395 )
 combat_template = ExtResource( 4 )
 
diff --git a/godot/party/Party.tscn b/godot/party/Party.tscn
index 185353b..019f162 100644
--- a/godot/party/Party.tscn
+++ b/godot/party/Party.tscn
@@ -2,16 +2,16 @@
 
 [ext_resource path="res://party/Party.gd" type="Script" id=1]
 [ext_resource path="res://combat/battlers/characters/PartyMember.tscn" type="PackedScene" id=2]
-[ext_resource path="res://combat/battlers/characters/Blue.tres" type="Resource" id=3]
-[ext_resource path="res://combat/battlers/characters/Dan.tres" type="Resource" id=4]
+[ext_resource path="res://combat/battlers/characters/Godette.tres" type="Resource" id=3]
+[ext_resource path="res://combat/battlers/characters/Robi.tres" type="Resource" id=4]
 
 [node name="Party" type="Node2D"]
 visible = false
 script = ExtResource( 1 )
 
-[node name="Blue" parent="." instance=ExtResource( 2 )]
+[node name="Godette" parent="." instance=ExtResource( 2 )]
 combat_template = ExtResource( 3 )
 
-[node name="Dan" parent="." instance=ExtResource( 2 )]
+[node name="Robi" parent="." instance=ExtResource( 2 )]
 combat_template = ExtResource( 4 )
 
-- 
GitLab