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 592ef0210a7f3911c2c52cbd463b670d1281a926..76f7475ed2b02646b9b173c02cea0858580f2b17 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 c017e642182236253c87fd50f4207f5d45d001fe..63531950ae11d21b6ac9bb421c2eab474cacbe6d 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 1f631f755b46ceb1a511bbd980700cb40f8a6170..e8177d226c6fd0308ddaecaeec769fc655e9cd66 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 08dfd2d3a293dd4d1843d6bbaa012d6f86611b45..7c6a492dd3402d491bee0e0169bba0b315652d2d 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 0000000000000000000000000000000000000000..5d150905ede725a26958efdfe44d9afe6f0a21b9 --- /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 0000000000000000000000000000000000000000..28f83d846ee152196eff87413d011bfd289ad93a --- /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 11cd82bbfe3046a194606a049af5d218f24501d2..f2e2aea41249f4a5c795d9d796eff492161dba12 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 19ce76f8cf22478b5a7bd112396ea1fee9ea4b70..f20835a92e09e6c6adf87ae1e158a40ac9d07238 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 365e869074d6ed9d7c8629334181171c161fa081..3cd38d64b5846f3d03c80f411fec6c8a11ad68c4 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 9bc6f6a11cb852a159484e53ec547a61ea630b68..4adb3b5709b887e252ba60e3e31472502490cd40 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 3612bbb520285f5bebc028c2bc439f2248b56da3..d57d61f5201aff393cd1048fc98388dfbb5b863c 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 185353b192d193dabf0f3eceb9799ac05cfed096..019f162a293f631ade4747e8f25412aad1150372 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 )