From 6e3db7c64dece8c7763f8259c44492badd1151b4 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Sun, 20 Jun 2021 22:47:24 -0400 Subject: [PATCH] Vastly simplify the JRPG demo --- 2d/role_playing_game/Game.tscn | 4 +- .../{screens => }/combat/Combat.gd | 1 - .../{screens => }/combat/Combat.tscn | 11 +- .../turn_queue => combat}/TurnQueue.gd | 4 +- .../combatants/Combatant.gd | 1 + .../combat/combatants/Combatant.tscn | 15 +++ .../health => combat/combatants}/Health.gd | 0 .../combatants/Opponent.gd | 4 +- .../combatants/Opponent.tscn | 6 +- .../combatants/Player.tscn | 2 +- .../combatants/health/Health.tscn | 2 +- .../combatants}/sprites/Sprite.tscn | 4 +- .../combatants}/sprites/blue.png | Bin .../combatants}/sprites/blue.png.import | 6 +- .../combatants}/sprites/green.png | Bin .../combatants}/sprites/green.png.import | 6 +- .../combatants}/sprites/shadow.png | Bin .../combatants/sprites/shadow.png.import} | 6 +- .../{screens => }/combat/interface/Info.tscn | 14 ++- .../{screens => }/combat/interface/UI.gd | 0 .../Exploration.tscn | 10 +- .../grid_lines => grid/lines}/grid_lines.png | Bin .../lines/grid_lines.png.import} | 6 +- .../lines}/grid_lines_tileset.tres | 2 +- .../{tilesets/grid => grid/tiles}/actor.png | Bin .../grid => grid/tiles}/actor.png.import | 6 +- .../grid => grid/tiles}/grid_tileset.tres | 6 +- .../{tilesets/grid => grid/tiles}/object.png | Bin .../tiles/object.png.import} | 6 +- .../grid => grid/tiles}/obstacle.png | Bin .../grid/tiles/obstacle.png.import | 34 ++++++ .../grid_movement/pawns/Actor.gd | 2 +- .../grid_movement/pawns/Actor.tscn | 83 -------------- .../grid_movement/pawns/Character.tscn | 4 +- .../grid_movement/pawns/IdleActor.gd | 8 -- .../pawns/{Character.gd => Opponent.gd} | 2 +- .../grid_movement/pawns/Pawn.gd | 1 + .../grid_movement/pawns/RandomActor.gd | 16 --- .../grid_movement/pawns/Walker.gd | 6 +- .../grid_movement/pawns/sprite.png | Bin 480 -> 0 bytes .../tilesets/grid_lines/grid_lines.png.import | 34 ------ 2d/role_playing_game/icon.png | Bin 2853 -> 6104 bytes 2d/role_playing_game/project.godot | 16 +++ .../screens/combat/actors/Actor.tscn | 14 --- .../screens/combat/actors/Opponent.tscn | 39 ------- .../screens/combat/actors/Player.tscn | 6 - .../combat/actors/sprites/shadow.png.import | 34 ------ .../screens/combat/interface/ActorInfo.tscn | 36 ------ 2d/role_playing_game/theme/Theme.tscn | 104 ------------------ .../theme/foreground_stylebox_blue.tres | 11 ++ .../theme/foreground_stylebox_red.tres | 11 ++ .../{progressbar => images}/background.png | Bin .../theme/images/background.png.import | 34 ++++++ .../theme/{button => images}/button_rect.png | Bin .../{button => images}/button_rect.png.import | 6 +- .../button_rect_pressed.png | Bin .../button_rect_pressed.png.import | 6 +- .../foreground_blue.png | Bin .../theme/images/foreground_blue.png.import | 34 ++++++ .../foreground_red.png | Bin .../theme/images/foreground_red.png.import | 34 ++++++ .../theme/{panel => images}/panel_rect.png | Bin .../{panel => images}/panel_rect.png.import | 6 +- 2d/role_playing_game/theme/labels/Title.tscn | 18 --- .../theme/progressbar/background.png.import | 34 ------ .../progressbar/foreground_blue.png.import | 34 ------ .../progressbar/foreground_red.png.import | 34 ------ .../progressbar/foreground_stylebox_blue.tres | 25 ----- .../progressbar/foreground_stylebox_red.tres | 25 ----- 2d/role_playing_game/theme/theme.tres | 10 +- .../turn_combat/combatants/Combatant.tscn | 14 --- .../combatants/sprites/Sprite.tscn | 38 ------- .../turn_combat/combatants/sprites/blue.png | Bin 1325 -> 0 bytes .../combatants/sprites/blue.png.import | 34 ------ .../turn_combat/combatants/sprites/green.png | Bin 1332 -> 0 bytes .../combatants/sprites/green.png.import | 34 ------ .../turn_combat/combatants/sprites/shadow.png | Bin 741 -> 0 bytes .../combatants/sprites/shadow.png.import | 34 ------ .../turn_combat/turn_queue/TurnQueue.tscn | 6 - .../.broken-cs-files/Viewport25D.cs | 2 - 80 files changed, 270 insertions(+), 775 deletions(-) rename 2d/role_playing_game/{screens => }/combat/Combat.gd (92%) rename 2d/role_playing_game/{screens => }/combat/Combat.tscn (84%) rename 2d/role_playing_game/{turn_combat/turn_queue => combat}/TurnQueue.gd (93%) rename 2d/role_playing_game/{turn_combat => combat}/combatants/Combatant.gd (97%) create mode 100644 2d/role_playing_game/combat/combatants/Combatant.tscn rename 2d/role_playing_game/{turn_combat/combatants/health => combat/combatants}/Health.gd (100%) rename 2d/role_playing_game/{turn_combat => combat}/combatants/Opponent.gd (79%) rename 2d/role_playing_game/{turn_combat => combat}/combatants/Opponent.tscn (59%) rename 2d/role_playing_game/{turn_combat => combat}/combatants/Player.tscn (60%) rename 2d/role_playing_game/{turn_combat => combat}/combatants/health/Health.tscn (51%) rename 2d/role_playing_game/{screens/combat/actors => combat/combatants}/sprites/Sprite.tscn (85%) rename 2d/role_playing_game/{screens/combat/actors => combat/combatants}/sprites/blue.png (100%) rename 2d/role_playing_game/{screens/combat/actors => combat/combatants}/sprites/blue.png.import (70%) rename 2d/role_playing_game/{screens/combat/actors => combat/combatants}/sprites/green.png (100%) rename 2d/role_playing_game/{screens/combat/actors => combat/combatants}/sprites/green.png.import (69%) rename 2d/role_playing_game/{screens/combat/actors => combat/combatants}/sprites/shadow.png (100%) rename 2d/role_playing_game/{grid_movement/tilesets/grid/object.png.import => combat/combatants/sprites/shadow.png.import} (69%) rename 2d/role_playing_game/{screens => }/combat/interface/Info.tscn (62%) rename 2d/role_playing_game/{screens => }/combat/interface/UI.gd (100%) rename 2d/role_playing_game/{screens/exploration => grid_movement}/Exploration.tscn (97%) rename 2d/role_playing_game/grid_movement/{tilesets/grid_lines => grid/lines}/grid_lines.png (100%) rename 2d/role_playing_game/grid_movement/{tilesets/grid/obstacle.png.import => grid/lines/grid_lines.png.import} (68%) rename 2d/role_playing_game/grid_movement/{tilesets/grid_lines => grid/lines}/grid_lines_tileset.tres (77%) mode change 100755 => 100644 rename 2d/role_playing_game/grid_movement/{tilesets/grid => grid/tiles}/actor.png (100%) rename 2d/role_playing_game/grid_movement/{tilesets/grid => grid/tiles}/actor.png.import (70%) rename 2d/role_playing_game/grid_movement/{tilesets/grid => grid/tiles}/grid_tileset.tres (77%) mode change 100755 => 100644 rename 2d/role_playing_game/grid_movement/{tilesets/grid => grid/tiles}/object.png (100%) rename 2d/role_playing_game/grid_movement/{pawns/sprite.png.import => grid/tiles/object.png.import} (70%) rename 2d/role_playing_game/grid_movement/{tilesets/grid => grid/tiles}/obstacle.png (100%) create mode 100644 2d/role_playing_game/grid_movement/grid/tiles/obstacle.png.import delete mode 100644 2d/role_playing_game/grid_movement/pawns/Actor.tscn delete mode 100644 2d/role_playing_game/grid_movement/pawns/IdleActor.gd rename 2d/role_playing_game/grid_movement/pawns/{Character.gd => Opponent.gd} (90%) delete mode 100644 2d/role_playing_game/grid_movement/pawns/RandomActor.gd delete mode 100755 2d/role_playing_game/grid_movement/pawns/sprite.png delete mode 100644 2d/role_playing_game/grid_movement/tilesets/grid_lines/grid_lines.png.import delete mode 100644 2d/role_playing_game/screens/combat/actors/Actor.tscn delete mode 100644 2d/role_playing_game/screens/combat/actors/Opponent.tscn delete mode 100644 2d/role_playing_game/screens/combat/actors/Player.tscn delete mode 100644 2d/role_playing_game/screens/combat/actors/sprites/shadow.png.import delete mode 100644 2d/role_playing_game/screens/combat/interface/ActorInfo.tscn delete mode 100644 2d/role_playing_game/theme/Theme.tscn create mode 100644 2d/role_playing_game/theme/foreground_stylebox_blue.tres create mode 100644 2d/role_playing_game/theme/foreground_stylebox_red.tres rename 2d/role_playing_game/theme/{progressbar => images}/background.png (100%) create mode 100644 2d/role_playing_game/theme/images/background.png.import rename 2d/role_playing_game/theme/{button => images}/button_rect.png (100%) rename 2d/role_playing_game/theme/{button => images}/button_rect.png.import (68%) rename 2d/role_playing_game/theme/{button => images}/button_rect_pressed.png (100%) rename 2d/role_playing_game/theme/{button => images}/button_rect_pressed.png.import (66%) rename 2d/role_playing_game/theme/{progressbar => images}/foreground_blue.png (100%) create mode 100644 2d/role_playing_game/theme/images/foreground_blue.png.import rename 2d/role_playing_game/theme/{progressbar => images}/foreground_red.png (100%) create mode 100644 2d/role_playing_game/theme/images/foreground_red.png.import rename 2d/role_playing_game/theme/{panel => images}/panel_rect.png (100%) rename 2d/role_playing_game/theme/{panel => images}/panel_rect.png.import (69%) delete mode 100644 2d/role_playing_game/theme/labels/Title.tscn delete mode 100644 2d/role_playing_game/theme/progressbar/background.png.import delete mode 100644 2d/role_playing_game/theme/progressbar/foreground_blue.png.import delete mode 100644 2d/role_playing_game/theme/progressbar/foreground_red.png.import delete mode 100755 2d/role_playing_game/theme/progressbar/foreground_stylebox_blue.tres delete mode 100755 2d/role_playing_game/theme/progressbar/foreground_stylebox_red.tres delete mode 100644 2d/role_playing_game/turn_combat/combatants/Combatant.tscn delete mode 100644 2d/role_playing_game/turn_combat/combatants/sprites/Sprite.tscn delete mode 100755 2d/role_playing_game/turn_combat/combatants/sprites/blue.png delete mode 100644 2d/role_playing_game/turn_combat/combatants/sprites/blue.png.import delete mode 100755 2d/role_playing_game/turn_combat/combatants/sprites/green.png delete mode 100644 2d/role_playing_game/turn_combat/combatants/sprites/green.png.import delete mode 100755 2d/role_playing_game/turn_combat/combatants/sprites/shadow.png delete mode 100644 2d/role_playing_game/turn_combat/combatants/sprites/shadow.png.import delete mode 100644 2d/role_playing_game/turn_combat/turn_queue/TurnQueue.tscn diff --git a/2d/role_playing_game/Game.tscn b/2d/role_playing_game/Game.tscn index f8fa4887..1278848f 100644 --- a/2d/role_playing_game/Game.tscn +++ b/2d/role_playing_game/Game.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://Game.gd" type="Script" id=1] -[ext_resource path="res://screens/combat/Combat.tscn" type="PackedScene" id=2] -[ext_resource path="res://screens/exploration/Exploration.tscn" type="PackedScene" id=3] +[ext_resource path="res://combat/Combat.tscn" type="PackedScene" id=2] +[ext_resource path="res://grid_movement/Exploration.tscn" type="PackedScene" id=3] [sub_resource type="Animation" id=1] length = 0.5 diff --git a/2d/role_playing_game/screens/combat/Combat.gd b/2d/role_playing_game/combat/Combat.gd similarity index 92% rename from 2d/role_playing_game/screens/combat/Combat.gd rename to 2d/role_playing_game/combat/Combat.gd index f190ead2..b1666db3 100644 --- a/2d/role_playing_game/screens/combat/Combat.gd +++ b/2d/role_playing_game/combat/Combat.gd @@ -1,7 +1,6 @@ extends Node signal combat_finished(winner, loser) -const Combatant = preload("res://turn_combat/combatants/Combatant.gd") func initialize(combat_combatants): for combatant in combat_combatants: diff --git a/2d/role_playing_game/screens/combat/Combat.tscn b/2d/role_playing_game/combat/Combat.tscn similarity index 84% rename from 2d/role_playing_game/screens/combat/Combat.tscn rename to 2d/role_playing_game/combat/Combat.tscn index 6eca6614..2f7388e1 100644 --- a/2d/role_playing_game/screens/combat/Combat.tscn +++ b/2d/role_playing_game/combat/Combat.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://screens/combat/Combat.gd" type="Script" id=1] -[ext_resource path="res://turn_combat/turn_queue/TurnQueue.tscn" type="PackedScene" id=2] +[ext_resource path="res://combat/Combat.gd" type="Script" id=1] +[ext_resource path="res://combat/TurnQueue.gd" type="Script" id=2] [ext_resource path="res://theme/theme.tres" type="Theme" id=3] -[ext_resource path="res://screens/combat/interface/UI.gd" type="Script" id=4] -[ext_resource path="res://screens/combat/interface/Info.tscn" type="PackedScene" id=5] +[ext_resource path="res://combat/interface/UI.gd" type="Script" id=4] +[ext_resource path="res://combat/interface/Info.tscn" type="PackedScene" id=5] [sub_resource type="GDScript" id=1] script/source = "extends Node2D @@ -21,7 +21,8 @@ script = ExtResource( 1 ) position = Vector2( 539, 275 ) script = SubResource( 1 ) -[node name="TurnQueue" parent="." instance=ExtResource( 2 )] +[node name="TurnQueue" type="Node" parent="."] +script = ExtResource( 2 ) combatants_list = NodePath("../Combatants") [node name="UI" type="Control" parent="."] diff --git a/2d/role_playing_game/turn_combat/turn_queue/TurnQueue.gd b/2d/role_playing_game/combat/TurnQueue.gd similarity index 93% rename from 2d/role_playing_game/turn_combat/turn_queue/TurnQueue.gd rename to 2d/role_playing_game/combat/TurnQueue.gd index 3f116920..0ae57a51 100644 --- a/2d/role_playing_game/turn_combat/turn_queue/TurnQueue.gd +++ b/2d/role_playing_game/combat/TurnQueue.gd @@ -1,7 +1,5 @@ extends Node -const combatant = preload("../combatants/Combatant.gd") - export(NodePath) var combatants_list var queue = [] setget set_queue var active_combatant = null setget _set_active_combatant @@ -43,7 +41,7 @@ func remove(combatant): func set_queue(new_queue): queue.clear() for node in new_queue: - if not node is combatant: + if not node is Combatant: continue queue.append(node) node.active = false diff --git a/2d/role_playing_game/turn_combat/combatants/Combatant.gd b/2d/role_playing_game/combat/combatants/Combatant.gd similarity index 97% rename from 2d/role_playing_game/turn_combat/combatants/Combatant.gd rename to 2d/role_playing_game/combat/combatants/Combatant.gd index b17f600c..f08ce7a3 100644 --- a/2d/role_playing_game/turn_combat/combatants/Combatant.gd +++ b/2d/role_playing_game/combat/combatants/Combatant.gd @@ -1,3 +1,4 @@ +class_name Combatant extends Node export(int) var damage = 1 diff --git a/2d/role_playing_game/combat/combatants/Combatant.tscn b/2d/role_playing_game/combat/combatants/Combatant.tscn new file mode 100644 index 00000000..0e7d562c --- /dev/null +++ b/2d/role_playing_game/combat/combatants/Combatant.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://combat/combatants/Combatant.gd" type="Script" id=1] +[ext_resource path="res://combat/combatants/Health.gd" type="Script" id=2] +[ext_resource path="res://combat/combatants/sprites/Sprite.tscn" type="PackedScene" id=3] + +[node name="Combatant" type="Node2D"] +script = ExtResource( 1 ) +damage = 2 + +[node name="Health" type="Node" parent="."] +script = ExtResource( 2 ) +life = 10 + +[node name="Sprite" parent="." instance=ExtResource( 3 )] diff --git a/2d/role_playing_game/turn_combat/combatants/health/Health.gd b/2d/role_playing_game/combat/combatants/Health.gd similarity index 100% rename from 2d/role_playing_game/turn_combat/combatants/health/Health.gd rename to 2d/role_playing_game/combat/combatants/Health.gd diff --git a/2d/role_playing_game/turn_combat/combatants/Opponent.gd b/2d/role_playing_game/combat/combatants/Opponent.gd similarity index 79% rename from 2d/role_playing_game/turn_combat/combatants/Opponent.gd rename to 2d/role_playing_game/combat/combatants/Opponent.gd index d7cfb08e..ccae355e 100644 --- a/2d/role_playing_game/turn_combat/combatants/Opponent.gd +++ b/2d/role_playing_game/combat/combatants/Opponent.gd @@ -1,10 +1,12 @@ -extends "Combatant.gd" +extends Combatant func set_active(value): .set_active(value) if not active: return + if not $Timer.is_inside_tree(): + return $Timer.start() yield($Timer, "timeout") var target diff --git a/2d/role_playing_game/turn_combat/combatants/Opponent.tscn b/2d/role_playing_game/combat/combatants/Opponent.tscn similarity index 59% rename from 2d/role_playing_game/turn_combat/combatants/Opponent.tscn rename to 2d/role_playing_game/combat/combatants/Opponent.tscn index 4620bc02..38a581f8 100644 --- a/2d/role_playing_game/turn_combat/combatants/Opponent.tscn +++ b/2d/role_playing_game/combat/combatants/Opponent.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://turn_combat/combatants/Combatant.tscn" type="PackedScene" id=1] -[ext_resource path="res://turn_combat/combatants/Opponent.gd" type="Script" id=2] -[ext_resource path="res://turn_combat/combatants/sprites/green.png" type="Texture" id=3] +[ext_resource path="res://combat/combatants/Combatant.tscn" type="PackedScene" id=1] +[ext_resource path="res://combat/combatants/Opponent.gd" type="Script" id=2] +[ext_resource path="res://combat/combatants/sprites/green.png" type="Texture" id=3] [node name="Opponent" instance=ExtResource( 1 )] script = ExtResource( 2 ) diff --git a/2d/role_playing_game/turn_combat/combatants/Player.tscn b/2d/role_playing_game/combat/combatants/Player.tscn similarity index 60% rename from 2d/role_playing_game/turn_combat/combatants/Player.tscn rename to 2d/role_playing_game/combat/combatants/Player.tscn index 11a968cf..0402edac 100644 --- a/2d/role_playing_game/turn_combat/combatants/Player.tscn +++ b/2d/role_playing_game/combat/combatants/Player.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://turn_combat/combatants/Combatant.tscn" type="PackedScene" id=1] +[ext_resource path="res://combat/combatants/Combatant.tscn" type="PackedScene" id=1] [node name="Player" instance=ExtResource( 1 )] diff --git a/2d/role_playing_game/turn_combat/combatants/health/Health.tscn b/2d/role_playing_game/combat/combatants/health/Health.tscn similarity index 51% rename from 2d/role_playing_game/turn_combat/combatants/health/Health.tscn rename to 2d/role_playing_game/combat/combatants/health/Health.tscn index 64cb3a61..46dd234f 100644 --- a/2d/role_playing_game/turn_combat/combatants/health/Health.tscn +++ b/2d/role_playing_game/combat/combatants/health/Health.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://turn_combat/combatants/health/Health.gd" type="Script" id=1] +[ext_resource path="res://combat/combatants/Health.gd" type="Script" id=1] [node name="Health" type="Node"] script = ExtResource( 1 ) diff --git a/2d/role_playing_game/screens/combat/actors/sprites/Sprite.tscn b/2d/role_playing_game/combat/combatants/sprites/Sprite.tscn similarity index 85% rename from 2d/role_playing_game/screens/combat/actors/sprites/Sprite.tscn rename to 2d/role_playing_game/combat/combatants/sprites/Sprite.tscn index f554162a..3b97dea5 100644 --- a/2d/role_playing_game/screens/combat/actors/sprites/Sprite.tscn +++ b/2d/role_playing_game/combat/combatants/sprites/Sprite.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://screens/combat/actors/sprites/shadow.png" type="Texture" id=1] -[ext_resource path="res://screens/combat/actors/sprites/blue.png" type="Texture" id=2] +[ext_resource path="res://combat/combatants/sprites/shadow.png" type="Texture" id=1] +[ext_resource path="res://combat/combatants/sprites/blue.png" type="Texture" id=2] [sub_resource type="Animation" id=1] resource_name = "take_damage" diff --git a/2d/role_playing_game/screens/combat/actors/sprites/blue.png b/2d/role_playing_game/combat/combatants/sprites/blue.png similarity index 100% rename from 2d/role_playing_game/screens/combat/actors/sprites/blue.png rename to 2d/role_playing_game/combat/combatants/sprites/blue.png diff --git a/2d/role_playing_game/screens/combat/actors/sprites/blue.png.import b/2d/role_playing_game/combat/combatants/sprites/blue.png.import similarity index 70% rename from 2d/role_playing_game/screens/combat/actors/sprites/blue.png.import rename to 2d/role_playing_game/combat/combatants/sprites/blue.png.import index 7c375295..dca21dae 100644 --- a/2d/role_playing_game/screens/combat/actors/sprites/blue.png.import +++ b/2d/role_playing_game/combat/combatants/sprites/blue.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/blue.png-127e2b8d7aa8f4a7572c4923c2b20228.stex" +path="res://.import/blue.png-8092cf6d59f8b71b187a850a15aa9759.stex" metadata={ "vram_texture": false } [deps] -source_file="res://screens/combat/actors/sprites/blue.png" -dest_files=[ "res://.import/blue.png-127e2b8d7aa8f4a7572c4923c2b20228.stex" ] +source_file="res://combat/combatants/sprites/blue.png" +dest_files=[ "res://.import/blue.png-8092cf6d59f8b71b187a850a15aa9759.stex" ] [params] diff --git a/2d/role_playing_game/screens/combat/actors/sprites/green.png b/2d/role_playing_game/combat/combatants/sprites/green.png similarity index 100% rename from 2d/role_playing_game/screens/combat/actors/sprites/green.png rename to 2d/role_playing_game/combat/combatants/sprites/green.png diff --git a/2d/role_playing_game/screens/combat/actors/sprites/green.png.import b/2d/role_playing_game/combat/combatants/sprites/green.png.import similarity index 69% rename from 2d/role_playing_game/screens/combat/actors/sprites/green.png.import rename to 2d/role_playing_game/combat/combatants/sprites/green.png.import index a5cac20f..efe0ef2d 100644 --- a/2d/role_playing_game/screens/combat/actors/sprites/green.png.import +++ b/2d/role_playing_game/combat/combatants/sprites/green.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/green.png-7937ec3931675b5dd0f218cbb8ae006a.stex" +path="res://.import/green.png-d2deadceb974a66b9f9b9df11dc41501.stex" metadata={ "vram_texture": false } [deps] -source_file="res://screens/combat/actors/sprites/green.png" -dest_files=[ "res://.import/green.png-7937ec3931675b5dd0f218cbb8ae006a.stex" ] +source_file="res://combat/combatants/sprites/green.png" +dest_files=[ "res://.import/green.png-d2deadceb974a66b9f9b9df11dc41501.stex" ] [params] diff --git a/2d/role_playing_game/screens/combat/actors/sprites/shadow.png b/2d/role_playing_game/combat/combatants/sprites/shadow.png similarity index 100% rename from 2d/role_playing_game/screens/combat/actors/sprites/shadow.png rename to 2d/role_playing_game/combat/combatants/sprites/shadow.png diff --git a/2d/role_playing_game/grid_movement/tilesets/grid/object.png.import b/2d/role_playing_game/combat/combatants/sprites/shadow.png.import similarity index 69% rename from 2d/role_playing_game/grid_movement/tilesets/grid/object.png.import rename to 2d/role_playing_game/combat/combatants/sprites/shadow.png.import index 22042b5b..66b562ab 100644 --- a/2d/role_playing_game/grid_movement/tilesets/grid/object.png.import +++ b/2d/role_playing_game/combat/combatants/sprites/shadow.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/object.png-f9ec4c5540ae154e2e73d50438312f26.stex" +path="res://.import/shadow.png-d8772fa49c8867b55809e76164b76188.stex" metadata={ "vram_texture": false } [deps] -source_file="res://grid_movement/tilesets/grid/object.png" -dest_files=[ "res://.import/object.png-f9ec4c5540ae154e2e73d50438312f26.stex" ] +source_file="res://combat/combatants/sprites/shadow.png" +dest_files=[ "res://.import/shadow.png-d8772fa49c8867b55809e76164b76188.stex" ] [params] diff --git a/2d/role_playing_game/screens/combat/interface/Info.tscn b/2d/role_playing_game/combat/interface/Info.tscn similarity index 62% rename from 2d/role_playing_game/screens/combat/interface/Info.tscn rename to 2d/role_playing_game/combat/interface/Info.tscn index efb862c4..514f385d 100644 --- a/2d/role_playing_game/screens/combat/interface/Info.tscn +++ b/2d/role_playing_game/combat/interface/Info.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://theme/labels/Title.tscn" type="PackedScene" id=1] +[ext_resource path="res://theme/fonts/montserrat_extra_bold_48.tres" type="DynamicFont" id=1] [node name="Info" type="PanelContainer"] margin_right = 409.0 @@ -17,12 +17,22 @@ margin_top = 7.0 margin_right = 402.0 margin_bottom = 232.0 -[node name="Name" parent="VBoxContainer" instance=ExtResource( 1 )] +[node name="Name" type="Label" parent="VBoxContainer"] margin_right = 395.0 margin_bottom = 110.0 size_flags_horizontal = 3 size_flags_vertical = 7 +custom_fonts/font = ExtResource( 1 ) +custom_colors/font_color = Color( 1, 1, 1, 1 ) +custom_colors/font_color_shadow = Color( 1, 0.596078, 0, 1 ) +custom_constants/shadow_offset_y = 5 text = "{name}" +align = 1 +autowrap = true +clip_text = true +__meta__ = { +"_edit_use_anchors_": false +} [node name="Health" type="ProgressBar" parent="VBoxContainer"] margin_top = 168.0 diff --git a/2d/role_playing_game/screens/combat/interface/UI.gd b/2d/role_playing_game/combat/interface/UI.gd similarity index 100% rename from 2d/role_playing_game/screens/combat/interface/UI.gd rename to 2d/role_playing_game/combat/interface/UI.gd diff --git a/2d/role_playing_game/screens/exploration/Exploration.tscn b/2d/role_playing_game/grid_movement/Exploration.tscn similarity index 97% rename from 2d/role_playing_game/screens/exploration/Exploration.tscn rename to 2d/role_playing_game/grid_movement/Exploration.tscn index 82a13650..13a2f6cf 100644 --- a/2d/role_playing_game/screens/exploration/Exploration.tscn +++ b/2d/role_playing_game/grid_movement/Exploration.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=11 format=2] -[ext_resource path="res://grid_movement/tilesets/grid_lines/grid_lines_tileset.tres" type="TileSet" id=1] -[ext_resource path="res://grid_movement/tilesets/grid/grid_tileset.tres" type="TileSet" id=2] +[ext_resource path="res://grid_movement/grid/lines/grid_lines_tileset.tres" type="TileSet" id=1] +[ext_resource path="res://grid_movement/grid/tiles/grid_tileset.tres" type="TileSet" id=2] [ext_resource path="res://grid_movement/grid/Grid.gd" type="Script" id=3] [ext_resource path="res://grid_movement/pawns/Character.tscn" type="PackedScene" id=4] -[ext_resource path="res://turn_combat/combatants/Player.tscn" type="PackedScene" id=5] -[ext_resource path="res://grid_movement/pawns/Character.gd" type="Script" id=6] -[ext_resource path="res://turn_combat/combatants/Opponent.tscn" type="PackedScene" id=7] +[ext_resource path="res://combat/combatants/Player.tscn" type="PackedScene" id=5] +[ext_resource path="res://grid_movement/pawns/Opponent.gd" type="Script" id=6] +[ext_resource path="res://combat/combatants/Opponent.tscn" type="PackedScene" id=7] [ext_resource path="res://dialogue/dialogue_player/DialoguePlayer.tscn" type="PackedScene" id=8] [ext_resource path="res://grid_movement/pawns/Pawn.gd" type="Script" id=9] [ext_resource path="res://dialogue/interface/Interface.tscn" type="PackedScene" id=10] diff --git a/2d/role_playing_game/grid_movement/tilesets/grid_lines/grid_lines.png b/2d/role_playing_game/grid_movement/grid/lines/grid_lines.png similarity index 100% rename from 2d/role_playing_game/grid_movement/tilesets/grid_lines/grid_lines.png rename to 2d/role_playing_game/grid_movement/grid/lines/grid_lines.png diff --git a/2d/role_playing_game/grid_movement/tilesets/grid/obstacle.png.import b/2d/role_playing_game/grid_movement/grid/lines/grid_lines.png.import similarity index 68% rename from 2d/role_playing_game/grid_movement/tilesets/grid/obstacle.png.import rename to 2d/role_playing_game/grid_movement/grid/lines/grid_lines.png.import index b66f37b5..ee93262c 100644 --- a/2d/role_playing_game/grid_movement/tilesets/grid/obstacle.png.import +++ b/2d/role_playing_game/grid_movement/grid/lines/grid_lines.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/obstacle.png-303025fbfb0bdc414a247e8ee1624a90.stex" +path="res://.import/grid_lines.png-52aa706884a3dba960110e63cdf54a8c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://grid_movement/tilesets/grid/obstacle.png" -dest_files=[ "res://.import/obstacle.png-303025fbfb0bdc414a247e8ee1624a90.stex" ] +source_file="res://grid_movement/grid/lines/grid_lines.png" +dest_files=[ "res://.import/grid_lines.png-52aa706884a3dba960110e63cdf54a8c.stex" ] [params] diff --git a/2d/role_playing_game/grid_movement/tilesets/grid_lines/grid_lines_tileset.tres b/2d/role_playing_game/grid_movement/grid/lines/grid_lines_tileset.tres old mode 100755 new mode 100644 similarity index 77% rename from 2d/role_playing_game/grid_movement/tilesets/grid_lines/grid_lines_tileset.tres rename to 2d/role_playing_game/grid_movement/grid/lines/grid_lines_tileset.tres index b795dada..496bb507 --- a/2d/role_playing_game/grid_movement/tilesets/grid_lines/grid_lines_tileset.tres +++ b/2d/role_playing_game/grid_movement/grid/lines/grid_lines_tileset.tres @@ -1,6 +1,6 @@ [gd_resource type="TileSet" load_steps=2 format=2] -[ext_resource path="res://grid_movement/tilesets/grid_lines/grid_lines.png" type="Texture" id=1] +[ext_resource path="res://grid_movement/grid/lines/grid_lines.png" type="Texture" id=1] [resource] diff --git a/2d/role_playing_game/grid_movement/tilesets/grid/actor.png b/2d/role_playing_game/grid_movement/grid/tiles/actor.png similarity index 100% rename from 2d/role_playing_game/grid_movement/tilesets/grid/actor.png rename to 2d/role_playing_game/grid_movement/grid/tiles/actor.png diff --git a/2d/role_playing_game/grid_movement/tilesets/grid/actor.png.import b/2d/role_playing_game/grid_movement/grid/tiles/actor.png.import similarity index 70% rename from 2d/role_playing_game/grid_movement/tilesets/grid/actor.png.import rename to 2d/role_playing_game/grid_movement/grid/tiles/actor.png.import index e241b790..8ff17e85 100644 --- a/2d/role_playing_game/grid_movement/tilesets/grid/actor.png.import +++ b/2d/role_playing_game/grid_movement/grid/tiles/actor.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/actor.png-147dff690f83be8a2c66a5bfa83da49f.stex" +path="res://.import/actor.png-c322bfa3077f1c55a7d6251f76155bcc.stex" metadata={ "vram_texture": false } [deps] -source_file="res://grid_movement/tilesets/grid/actor.png" -dest_files=[ "res://.import/actor.png-147dff690f83be8a2c66a5bfa83da49f.stex" ] +source_file="res://grid_movement/grid/tiles/actor.png" +dest_files=[ "res://.import/actor.png-c322bfa3077f1c55a7d6251f76155bcc.stex" ] [params] diff --git a/2d/role_playing_game/grid_movement/tilesets/grid/grid_tileset.tres b/2d/role_playing_game/grid_movement/grid/tiles/grid_tileset.tres old mode 100755 new mode 100644 similarity index 77% rename from 2d/role_playing_game/grid_movement/tilesets/grid/grid_tileset.tres rename to 2d/role_playing_game/grid_movement/grid/tiles/grid_tileset.tres index ff6917d6..927afd76 --- a/2d/role_playing_game/grid_movement/tilesets/grid/grid_tileset.tres +++ b/2d/role_playing_game/grid_movement/grid/tiles/grid_tileset.tres @@ -1,8 +1,8 @@ [gd_resource type="TileSet" load_steps=4 format=2] -[ext_resource path="res://grid_movement/tilesets/grid/actor.png" type="Texture" id=1] -[ext_resource path="res://grid_movement/tilesets/grid/obstacle.png" type="Texture" id=2] -[ext_resource path="res://grid_movement/tilesets/grid/object.png" type="Texture" id=3] +[ext_resource path="res://grid_movement/grid/tiles/actor.png" type="Texture" id=1] +[ext_resource path="res://grid_movement/grid/tiles/obstacle.png" type="Texture" id=2] +[ext_resource path="res://grid_movement/grid/tiles/object.png" type="Texture" id=3] [resource] diff --git a/2d/role_playing_game/grid_movement/tilesets/grid/object.png b/2d/role_playing_game/grid_movement/grid/tiles/object.png similarity index 100% rename from 2d/role_playing_game/grid_movement/tilesets/grid/object.png rename to 2d/role_playing_game/grid_movement/grid/tiles/object.png diff --git a/2d/role_playing_game/grid_movement/pawns/sprite.png.import b/2d/role_playing_game/grid_movement/grid/tiles/object.png.import similarity index 70% rename from 2d/role_playing_game/grid_movement/pawns/sprite.png.import rename to 2d/role_playing_game/grid_movement/grid/tiles/object.png.import index a356aa6b..ffcc5c69 100644 --- a/2d/role_playing_game/grid_movement/pawns/sprite.png.import +++ b/2d/role_playing_game/grid_movement/grid/tiles/object.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/sprite.png-e28cedc69371816a3468e6325b327ece.stex" +path="res://.import/object.png-105b8788e1883723a96438fd97d5db23.stex" metadata={ "vram_texture": false } [deps] -source_file="res://grid_movement/pawns/sprite.png" -dest_files=[ "res://.import/sprite.png-e28cedc69371816a3468e6325b327ece.stex" ] +source_file="res://grid_movement/grid/tiles/object.png" +dest_files=[ "res://.import/object.png-105b8788e1883723a96438fd97d5db23.stex" ] [params] diff --git a/2d/role_playing_game/grid_movement/tilesets/grid/obstacle.png b/2d/role_playing_game/grid_movement/grid/tiles/obstacle.png similarity index 100% rename from 2d/role_playing_game/grid_movement/tilesets/grid/obstacle.png rename to 2d/role_playing_game/grid_movement/grid/tiles/obstacle.png diff --git a/2d/role_playing_game/grid_movement/grid/tiles/obstacle.png.import b/2d/role_playing_game/grid_movement/grid/tiles/obstacle.png.import new file mode 100644 index 00000000..889f89fd --- /dev/null +++ b/2d/role_playing_game/grid_movement/grid/tiles/obstacle.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/obstacle.png-bd15bb10c9507019dfb2cad5661bca49.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://grid_movement/grid/tiles/obstacle.png" +dest_files=[ "res://.import/obstacle.png-bd15bb10c9507019dfb2cad5661bca49.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/2d/role_playing_game/grid_movement/pawns/Actor.gd b/2d/role_playing_game/grid_movement/pawns/Actor.gd index 4b4e4b06..7d457352 100644 --- a/2d/role_playing_game/grid_movement/pawns/Actor.gd +++ b/2d/role_playing_game/grid_movement/pawns/Actor.gd @@ -1,4 +1,4 @@ -extends "Pawn.gd" +extends Pawn onready var Grid = get_parent() var lost = false diff --git a/2d/role_playing_game/grid_movement/pawns/Actor.tscn b/2d/role_playing_game/grid_movement/pawns/Actor.tscn deleted file mode 100644 index 8521de4f..00000000 --- a/2d/role_playing_game/grid_movement/pawns/Actor.tscn +++ /dev/null @@ -1,83 +0,0 @@ -[gd_scene load_steps=5 format=2] - -[ext_resource path="res://grid_movement/pawns/Actor.gd" type="Script" id=1] -[ext_resource path="res://grid_movement/pawns/character.png" type="Texture" id=2] - -[sub_resource type="Animation" id=1] -resource_name = "bump" -length = 0.1 -step = 0.01 -tracks/0/type = "value" -tracks/0/path = NodePath("Pivot/Sprite:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 0.02, 0.04, 0.06, 0.08, 0.1 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ), -"update": 0, -"values": [ Vector2( 0, 0 ), Vector2( -1.5, -9 ), Vector2( 6.5, 2.5 ), Vector2( -11.5, 8.5 ), Vector2( 4, -5 ), Vector2( 0, 0 ) ] -} - -[sub_resource type="Animation" id=2] -resource_name = "walk" -length = 0.25 -step = 0.05 -tracks/0/type = "value" -tracks/0/path = NodePath("Pivot/Sprite:self_modulate") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = false -tracks/0/keys = { -"times": PoolRealArray( 0, 0.1, 0.25 ), -"transitions": PoolRealArray( 1, 1, 1 ), -"update": 0, -"values": [ Color( 1, 1, 1, 1 ), Color( 1, 0.9375, 0, 1 ), Color( 1, 1, 1, 1 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Pivot/Sprite:position") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0, 0.1, 0.15, 0.25 ), -"transitions": PoolRealArray( 1, 0.303143, 2.61003, 1 ), -"update": 0, -"values": [ Vector2( 1.43051e-06, -1.90735e-06 ), Vector2( 1.43051e-06, -1.90735e-06 ), Vector2( 0, -20 ), Vector2( 1.43051e-06, -1.90735e-06 ) ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("Pivot/Sprite:scale") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0, 0.05, 0.15, 0.25 ), -"transitions": PoolRealArray( 1, 0.354553, 1, 1 ), -"update": 0, -"values": [ Vector2( 1, 1 ), Vector2( 1.20007, 0.917384 ), Vector2( 0.916712, 1.13495 ), Vector2( 1, 1 ) ] -} - -[node name="Actor" type="Node2D"] -position = Vector2( 32, 32 ) -z_index = 1 -script = ExtResource( 1 ) -__meta__ = { -"_edit_group_": true -} - -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] -anims/bump = SubResource( 1 ) -anims/walk = SubResource( 2 ) - -[node name="Tween" type="Tween" parent="."] - -[node name="Pivot" type="Position2D" parent="."] - -[node name="Sprite" type="Sprite" parent="Pivot"] -texture = ExtResource( 2 ) -centered = false -offset = Vector2( -32, -32 ) diff --git a/2d/role_playing_game/grid_movement/pawns/Character.tscn b/2d/role_playing_game/grid_movement/pawns/Character.tscn index a13f9fb9..28cb9519 100644 --- a/2d/role_playing_game/grid_movement/pawns/Character.tscn +++ b/2d/role_playing_game/grid_movement/pawns/Character.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://grid_movement/pawns/Walker.gd" type="Script" id=1] -[ext_resource path="res://grid_movement/pawns/sprite.png" type="Texture" id=2] +[ext_resource path="res://grid_movement/pawns/character.png" type="Texture" id=2] [sub_resource type="Animation" id=1] resource_name = "bump" @@ -61,7 +61,7 @@ tracks/2/keys = { "values": [ Vector2( 1, 1 ), Vector2( 1.20007, 0.917384 ), Vector2( 0.916712, 1.13495 ), Vector2( 1, 1 ) ] } -[node name="Actor" type="Node2D"] +[node name="Character" type="Node2D"] position = Vector2( 32, 32 ) z_index = 1 script = ExtResource( 1 ) diff --git a/2d/role_playing_game/grid_movement/pawns/IdleActor.gd b/2d/role_playing_game/grid_movement/pawns/IdleActor.gd deleted file mode 100644 index 64bab0e8..00000000 --- a/2d/role_playing_game/grid_movement/pawns/IdleActor.gd +++ /dev/null @@ -1,8 +0,0 @@ -extends "Actor.gd" - -func _ready(): - set_process(false) - - -func get_input_direction(): - return Vector2.ZERO diff --git a/2d/role_playing_game/grid_movement/pawns/Character.gd b/2d/role_playing_game/grid_movement/pawns/Opponent.gd similarity index 90% rename from 2d/role_playing_game/grid_movement/pawns/Character.gd rename to 2d/role_playing_game/grid_movement/pawns/Opponent.gd index e8adacaa..4e682dd0 100644 --- a/2d/role_playing_game/grid_movement/pawns/Character.gd +++ b/2d/role_playing_game/grid_movement/pawns/Opponent.gd @@ -1,4 +1,4 @@ -extends "Pawn.gd" +extends Pawn #warning-ignore:unused_class_variable export(PackedScene) var combat_actor diff --git a/2d/role_playing_game/grid_movement/pawns/Pawn.gd b/2d/role_playing_game/grid_movement/pawns/Pawn.gd index dfe5d9fd..226005f7 100644 --- a/2d/role_playing_game/grid_movement/pawns/Pawn.gd +++ b/2d/role_playing_game/grid_movement/pawns/Pawn.gd @@ -1,3 +1,4 @@ +class_name Pawn extends Node2D enum CellType { ACTOR, OBSTACLE, OBJECT } diff --git a/2d/role_playing_game/grid_movement/pawns/RandomActor.gd b/2d/role_playing_game/grid_movement/pawns/RandomActor.gd deleted file mode 100644 index a0320d4a..00000000 --- a/2d/role_playing_game/grid_movement/pawns/RandomActor.gd +++ /dev/null @@ -1,16 +0,0 @@ -extends "Actor.gd" - -const DIRECTIONS = [-1, 1] - -func get_input_direction(): - if not active: - return Vector2() - var random_x = DIRECTIONS[randi() % DIRECTIONS.size()] - var random_y = DIRECTIONS[randi() % DIRECTIONS.size()] - - var random_axis = randi() % 2 - if random_axis > 0: - random_x = 0 - else: - random_y = 0 - return Vector2(random_x, random_y) diff --git a/2d/role_playing_game/grid_movement/pawns/Walker.gd b/2d/role_playing_game/grid_movement/pawns/Walker.gd index afeee08b..00134781 100644 --- a/2d/role_playing_game/grid_movement/pawns/Walker.gd +++ b/2d/role_playing_game/grid_movement/pawns/Walker.gd @@ -1,6 +1,6 @@ -extends "Pawn.gd" +extends Pawn -onready var Grid = get_parent() +onready var parent = get_parent() #warning-ignore:unused_class_variable export(PackedScene) var combat_actor #warning-ignore:unused_class_variable @@ -16,7 +16,7 @@ func _process(_delta): return update_look_direction(input_direction) - var target_position = Grid.request_move(self, input_direction) + var target_position = parent.request_move(self, input_direction) if target_position: move_to(target_position) $Tween.start() diff --git a/2d/role_playing_game/grid_movement/pawns/sprite.png b/2d/role_playing_game/grid_movement/pawns/sprite.png deleted file mode 100755 index e619f6f11bf70c8f456578d813638b4cca866da8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!S^|7RT!A!0{aJ>p;|ztn847kW zlpkiOJ;hLQgduJTWB6=_v~>)XM?olZEK*`xz!bWk_Go(EorTVlK$cs$&dAK)nkYGuDHQ0-6c5 z6l`OY*UT88GjvLV{DK*n;t!wbGOqvg|9wI6e~wZ+VH8A9|g|79=m$>D#eliZ743Qro>^*YIA*b5ZZx?kFE zlInkCS=H=&FMYo*e0S>P=4nL_>li2R`}BSJqDvNq`^seso0Jb|&I3i2r>mdKI;Vst E0Mt>&YybcN diff --git a/2d/role_playing_game/grid_movement/tilesets/grid_lines/grid_lines.png.import b/2d/role_playing_game/grid_movement/tilesets/grid_lines/grid_lines.png.import deleted file mode 100644 index 543e9077..00000000 --- a/2d/role_playing_game/grid_movement/tilesets/grid_lines/grid_lines.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/grid_lines.png-151c8a0e38dd3f92e569d4b4f869a28e.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://grid_movement/tilesets/grid_lines/grid_lines.png" -dest_files=[ "res://.import/grid_lines.png-151c8a0e38dd3f92e569d4b4f869a28e.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/2d/role_playing_game/icon.png b/2d/role_playing_game/icon.png index 9c908f2376a6f130984abeb56be15145a3ed26af..bcd30cec1a70780396a4ec138dc4d6b8663002b8 100755 GIT binary patch literal 6104 zcmV;}7bob6P))Yn`c9wQRM@ zE!%f{>UUv$d}2~^L}o-NB9+Dd>aV`S6}yAuik)I&f&EE<*N)DC-RzpE!0>UL#u_W= zUvu21fdb)7PR~+QWAD1-Gz=_|LJuCs$-B+hc?Fm@Z*~n-Aeze(?b{w-s(r1=9|=^$ z@r+FS8U9cZz3wikvu^HuE#C zjQLn9NmxOnZJIVm0h#JxCQ*%MH$Mo?2I6%O!VK+w3l&gO2NQu6aD%NHXEqcdRDm0; z)qg%nFjX?uueAZP8E0`+U^Wm$SVgOEan4X64pb5tT!a|^p7o3>U{p#t+T@%CwT3Tv3ILV?JaR$E$F z4uMq2M8vV6dtd?VJZyx%1h5eU*ljxem9%|Vag(rPB2=Tj);Mjv95H93Ppt5vV|zy4 z-GQ(X12nJe+kX~wix^`~&$BE8VE92opeRbv634%pigzgZ$R^2=g^fr78!&*~(YOCR z<|bV~+I#EXP0KRzgJ&|EfAYn*A(H01{`|u(K>je@R4wS}R|Ple#_|69Z{NMrenzj; z`i)me<_{D$!KObXT{LZg`@GBp@xf>Tm0O3_p zisB^2x&&c_i_H80+akN%&Q<^bma_rFI(V-AcmC#|gmHq)!+^v69xn0+zx9i6-M>Xd z*gTA}DY54O{NQH}BF`oJWk_lfU2v;?O63l;OYOTNe z<_U6KA%uMJ@F{@l*JdRHl$oK_B&Yw|(h`qP2A_TPC|d_t`1A1peE3D2q``^dKQu1) zAXepb{>ymEAO1V{_MgO$zB_yJbl7froN;WJyi(xFpahFYEY8^sYu7W5Z84=Ge0`sx(M+T~KaLX0nCo>|^qel`j>aGQ?>wl^X zGgQTPx!W>PjR%iTzB?Uh$sYde7q#!T4cj$PK*{V~tx7aHrsZ&a&vcNYPD+CC+L5_} z&C2N<*r>+YaPsxH-;u_{f8)H6aWjVY-l}&TQzBG>ah4w>@}-FNcB`SATN%}6TzR(l z(P!Tf;pD&D!4m@)Y4t6`<2CY64{3J1M(tFuh6+Id9M1q}QqU4%wsNxbX5#+(H^#xde3jUqVKnmzKlarV#}yFMN32nNKAHvYC<} z&DaZgE4JT0QIq>5jpZvNJJ6*<&Z;Cm_$MxDBvW3NH5TxPf~p^{ksBnOWyfpOOZ93f z!@+gOFnR7vws+089DXkBHVoV2d)FMVWh_}nZ1I1VvhEF6)mig1uDlKBkJ5O|i`p-b z;YoELl0T!P{8XkbrJ;nUk7CQ_?Vj0anNsMeW!KXmFAwk!H(;N2jTlgyqYK z0JK|P5XR_4=FwCa97|$ZPvDfPiMib}$nH;uB@=Ty}U=djU z(tm$4d8R%FTzmKE=KI&&wu?(a@Q1;}pFAEvn*6=-BrxQ=%0dEW!hR0uHKZd zC`_PCzuivDwk>8W`|jZRjPs1V@Q=dqXWHlNy+3{X&ELLPqWv;G9yCArvv=6AIXt_iHd|`l}fuqINPy5E0H4|bBhnqta{?%*-;O?*8+PmGy zt8x36Zywy+C*Z$X5y~l^>^6~E*x2d{sIFzk@}Dc&EW>r3cC!Hn_s!FG&oV5Ym-!}5 zW=h$fb>rP@cx5s}g5e<-G1D)Ny^OQ-Xg8loYzvM{PIks{?Vi`!vuuwaTyy$Ic8T!$ z70#QB`+HpgW;bm1Uljf}O#$?8^_am>2X4!0_L~|w;R>s<9PYJEe2<@{p4&G-MgOA- zT2s4k9o}%ArXeJ~#AX^<+ZGE<({OAH4B87`5cZV<;4~d%)MNtyLFo#}pQ}0p? z!7uB7IA_SgIV-oBnt1@iILSLA0Mhke5SB!lJ4StEqbU$_l(a2p!xV&V!mH;$nfCXu z+lI+0SGVev7O2xn1B4_=wbEG7@LT}O@wc|;H-Cwewq-n*X{1q|?WdvKWNAW4qzFWS z(i8@Y7_hn;s#8;iHh?Heu)y^hpxT z6oBDLIygzDBSBOa#?x^VKoG`Qz!`TP8-Q~C?W}+$KdR8S46=^n4h?XrWPdsqVW6T& zRS_1GCV)5>1{w_qfVTa@rkJhyqQ!GBW91uFwjG44n?XuCJ4q@Er&EuJr9uiJzxP5; zwgR@J`Qp7?P)&mel$+=X+buurs zHSHtgV%suYY<4UDsBKWPGp^o!TCI+0!%E3iS|+JXgdJYAYT00Lg=xdhKZ6= zqZ*9CGFj8J`Yrpy10C1r_tROlEwj(0X*Lwq_p@%dDPO}rt$d@L@wlnIX&A+s0c^{% zOhZVe?0_e22IMO+PX^K1DAsF5#^E%5VnjC&y}ho31@`?xV=q-x55un4JUqWWe=L-u zia%-_LAZYZvzT$lV#cwg4Is*g0nY`XomnQFCOYdvfBj_sbQozOtcz6oo0H&V7-50I zIkS{`FgM?QJiq>7(s~MzlzKjum)%dc`!w`Y!j{cjJu~~vlFlL#N{J|+jOs;ABA831 z2*5lN6F)^Ad^d=sBmn(h=Z$+et{v_*JckS!cc1vjpUl!J(VBB>_i1QF;qJagV91aT zQw|YDaf$^^*8v#Wv1a1D3@{HR>LX0l`Qvx1)p%xvJGYJ-o}cp`OFN*hkb4^>*m<`rH3%p z`d;_vHVp+s|6<3H0G2MoKp5kD8rdVU^ahkXFv;^Cn7dN8fOH?(qrh%Hjjyui{* zAB)@M_+b=x+Rf~{hHKA*==M=)N;>MrF(&^9H$&LiF3pD9@Z1ow(GAt4k-z8KE0r}@ zLo>QPE88%^fHE_r9pFiJxT_E{jA9`rfcwYu`^cEx#`v%CYZ?sO#dGa2in*7{g#p-x zE0uLtLk*L4`X*H{dopMC9@o$h9)6cUU4|P*!?iuvnM~(h8Q;a|YwTmoWOvGmHvE!0 z6%Fu;*XU)h=9UZFA-a!jD~q>~QZdFn*KWA3>p8AtW#gqnPG|F*nAT;0v(NwcXOF%> z0n_$6H{Lk7|4ZlH`D{Yy)ZD25q5M76;(uJ1H(TaQgqgzr7vPG4IgZ(IUC(np_xa1v z`NZ^@0gmBg!^kumJ^0XaTiqLPU_p`!06Mfw-rF@zW;;9z)VT&6kCTE(b!D3sgYc{Q zpZ@O_h*w)IQlL#fF_-!DM>>F zc8TJ+$@oNK6|5E75=yv~XX%cjTN4WM5ut)@GQm z=zln8y}gyGXa4&%w5-%LY#Ajr@}w| zuk@Rr-Fh3f63yom;|vATBnDtP&8%|}gb`_;j9MsFoZB=we^EtV%Lt~j%#qZPh8Bh} zP1f$2RAEa&7^pZ>^5MR>HwQ%K?kR~_JZL+t<(UlR>zPQyo5thMP$!w91AmHT7?#t! z^DY(#0TLm3+9AcUS_59g*gLif?8S+AU=tyj$(qy9@*(=!fi5q*1`&;iDFHGzAO6q# zUN0cx$;|Dw{%5ECK()KfI|Sf(4U9*(^kW7hFw{ru;O61A77B37ZXMn-EQg3DvpIn1 zNw38JaL)S2*-u^~&^@%0NJ&9kN<&?bH=71BN^Lfs$W%}^no>L%wy_|LZ*6srWrIKMw1Ww7X)|wtah%Ad+Hf#5+EcK95&qh+F zTBe$)dKh@MYA9pa&uydg z-G6yyjUZAT&eixd#e&IDguYA@t!bUo>6+EhR@<~}UKGyA3y+6FX<9n6B2(#O0C5xn zK<0&jo6*&7PI4uB+%u)wq|!!S*feL28Z7>uV{spx522F_(CqLh@Tdi~bTdTFR_^LE#u3c~Zb zjAM-zBRd}Vng-|)aJ7n~V4hh*YXu}USPQYlx&CS>H(0lC zl?a~`M`|9Zr8ks|;YIsVnrx#7th9b|a;CMOKj{T$ovj7iyzn|{=w5EKTd6P&2BJhD zi{Vrdm`Sb#JKSxCPV ziY8-;4WpELd~%i~Y2v$QAKd`GTyclj9Lwdl$2Yf6%PdK0im7M$;?kPNqm}QxF_w*k zqQH10lqMJ(ZMH;bgR#;&o;J=tyis0r&c3ug?lk$erW?-XAWHMX^{1gFDNU@lSvGCQ#X0RBmL^u-ZrUZvC5?ph3t01cr2$XsfG49cgT zrJLQd;?#61S1lvMV7P4%i9YPJo>Gm8JBkTf2P?W?|Aaa(>2 zE;GQvfnDV%DMjOnTzL(K{@(J`b2Lf|F=K<;ry3Nu#Wb|jF&&4a0;7>oik4m@i{Ylp zi#L?S%J&t3-TR;IuZ))lVb0m!o`nizDLhtO!!lX7x4hU_h#4D(813HwR1U)Z#qk<= zDTNfi*t%hCN$Tm(WD+ll85VH>kQ((tQY}Vi_&M`GtXPc8uq@W?nyA2hE~7}VTI^01 z!wc09t!Xq8OUok-G5{z)MqLo;c?_TlV+)nFiozvL`7HIc8DmxYdBdRqP!hwJ-b7Ze zSb9VI+F}6BV;v=^138+L(k}6iHfmH{ZEuto4d7*)-6}Ad$gF=-7Q+iSA*7y6<*FO9 zi5)4Mh|;f4NfTZTN~QRA0N}oIYFAth!bJlxmQOv)kXZ_!Q7wjN7d{&ZqO!YxLwYuG z9VF?;k98ujF4~Xdj~X79sag+aB@FDX#u%=zitBAouQhxI703*0cZOG8|g=VZ+Aj e4#!Tp;{O39kGu5vPJzz=0000CB literal 2853 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 diff --git a/2d/role_playing_game/project.godot b/2d/role_playing_game/project.godot index 28afcd81..cf04dca4 100644 --- a/2d/role_playing_game/project.godot +++ b/2d/role_playing_game/project.godot @@ -8,6 +8,22 @@ config_version=4 +_global_script_classes=[ { +"base": "Node", +"class": "Combatant", +"language": "GDScript", +"path": "res://combat/combatants/Combatant.gd" +}, { +"base": "Node2D", +"class": "Pawn", +"language": "GDScript", +"path": "res://grid_movement/pawns/Pawn.gd" +} ] +_global_script_class_icons={ +"Combatant": "", +"Pawn": "" +} + [application] config/name="JRPG Demo" diff --git a/2d/role_playing_game/screens/combat/actors/Actor.tscn b/2d/role_playing_game/screens/combat/actors/Actor.tscn deleted file mode 100644 index 3bd19e91..00000000 --- a/2d/role_playing_game/screens/combat/actors/Actor.tscn +++ /dev/null @@ -1,14 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://turn_combat/combatants/Combatant.gd" type="Script" id=1] -[ext_resource path="res://turn_combat/combatants/health/Health.tscn" type="PackedScene" id=2] -[ext_resource path="res://screens/combat/actors/sprites/Sprite.tscn" type="PackedScene" id=3] - -[node name="Actor" type="Node2D"] -script = ExtResource( 1 ) -damage = 2 - -[node name="Health" parent="." instance=ExtResource( 2 )] -life = 10 - -[node name="Sprite" parent="." instance=ExtResource( 3 )] diff --git a/2d/role_playing_game/screens/combat/actors/Opponent.tscn b/2d/role_playing_game/screens/combat/actors/Opponent.tscn deleted file mode 100644 index 42fd4536..00000000 --- a/2d/role_playing_game/screens/combat/actors/Opponent.tscn +++ /dev/null @@ -1,39 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://screens/combat/actors/Actor.tscn" type="PackedScene" id=1] -[ext_resource path="res://screens/combat/actors/sprites/green.png" type="Texture" id=2] - -[sub_resource type="GDScript" id=1] -script/source = "extends \"res://turn_combat/combatants/Combatant.gd\" - -func set_active(value): - .set_active(value) - if not active: - return - - $Timer.start() - yield($Timer, \"timeout\") - var target - for actor in get_parent().get_children(): - if not actor == self: - target = actor - break - attack(target)" - -[node name="Opponent" instance=ExtResource( 1 )] -script = SubResource( 1 ) -damage = 3 -defense = 0 - -[node name="Health" parent="." index="0"] -life = 7 -max_life = 7 - -[node name="Body" parent="Sprite/Pivot" index="1"] -texture = ExtResource( 2 ) - -[node name="Timer" type="Timer" parent="." index="2"] -wait_time = 0.25 -one_shot = true - -[editable path="Sprite"] diff --git a/2d/role_playing_game/screens/combat/actors/Player.tscn b/2d/role_playing_game/screens/combat/actors/Player.tscn deleted file mode 100644 index 829a8979..00000000 --- a/2d/role_playing_game/screens/combat/actors/Player.tscn +++ /dev/null @@ -1,6 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://screens/combat/actors/Actor.tscn" type="PackedScene" id=1] - -[node name="Player" instance=ExtResource( 1 )] -defense = 2 diff --git a/2d/role_playing_game/screens/combat/actors/sprites/shadow.png.import b/2d/role_playing_game/screens/combat/actors/sprites/shadow.png.import deleted file mode 100644 index c9923b22..00000000 --- a/2d/role_playing_game/screens/combat/actors/sprites/shadow.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/shadow.png-3c36ca984d4b9e8eba8c422537f5ca42.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://screens/combat/actors/sprites/shadow.png" -dest_files=[ "res://.import/shadow.png-3c36ca984d4b9e8eba8c422537f5ca42.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/2d/role_playing_game/screens/combat/interface/ActorInfo.tscn b/2d/role_playing_game/screens/combat/interface/ActorInfo.tscn deleted file mode 100644 index de0c73eb..00000000 --- a/2d/role_playing_game/screens/combat/interface/ActorInfo.tscn +++ /dev/null @@ -1,36 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://theme/labels/Title.tscn" type="PackedScene" id=1] - -[node name="ActorInfo" type="PanelContainer"] -margin_right = 409.0 -margin_bottom = 239.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="VBoxContainer" type="VBoxContainer" parent="."] -margin_left = 7.0 -margin_top = 7.0 -margin_right = 402.0 -margin_bottom = 232.0 - -[node name="Name" parent="VBoxContainer" instance=ExtResource( 1 )] -margin_right = 395.0 -margin_bottom = 110.0 -size_flags_horizontal = 3 -size_flags_vertical = 7 -text = "{name}" - -[node name="Health" type="ProgressBar" parent="VBoxContainer"] -margin_top = 168.0 -margin_right = 395.0 -margin_bottom = 170.0 -size_flags_vertical = 6 -max_value = 10.0 -step = 1.0 -value = 5.0 -rounded = true -percent_visible = false diff --git a/2d/role_playing_game/theme/Theme.tscn b/2d/role_playing_game/theme/Theme.tscn deleted file mode 100644 index 012f194a..00000000 --- a/2d/role_playing_game/theme/Theme.tscn +++ /dev/null @@ -1,104 +0,0 @@ -[gd_scene load_steps=7 format=2] - -[ext_resource path="res://theme/theme.tres" type="Theme" id=1] -[ext_resource path="res://theme/labels/Title.tscn" type="PackedScene" id=2] -[ext_resource path="res://theme/fonts/montserrat_extra_bold_24.tres" type="DynamicFont" id=3] -[ext_resource path="res://theme/progressbar/foreground_stylebox_red.tres" type="StyleBox" id=4] -[ext_resource path="res://theme/progressbar/foreground_stylebox_blue.tres" type="StyleBox" id=5] - -[sub_resource type="GDScript" id=1] -script/source = "extends VBoxContainer - -func _ready(): - set_process(false) - -func _process(delta): - for p in get_children(): - $ProgressBarBlue.value += 10 * delta - $ProgressBarRed.value += 10 * delta - - -func _on_Button_button_down(): - set_process(true) - - -func _on_Button_button_up(): - set_process(false) -" - -[node name="Control" type="Control"] -margin_right = 1024.0 -margin_bottom = 600.0 -theme = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Panel" type="Panel" parent="."] -margin_left = 128.0 -margin_top = 64.0 -margin_right = 896.0 -margin_bottom = 536.0 - -[node name="Title" parent="Panel" instance=ExtResource( 2 )] -margin_right = 767.0 - -[node name="VBoxContainer" type="VBoxContainer" parent="Panel"] -margin_left = 128.0 -margin_top = 180.0 -margin_right = 524.0 -margin_bottom = 424.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -custom_constants/separation = 5 -script = SubResource( 1 ) - -[node name="Speed" type="Label" parent="Panel/VBoxContainer"] -margin_right = 396.0 -margin_bottom = 40.0 -custom_fonts/font = ExtResource( 3 ) -text = "Speed" - -[node name="ProgressBarRed" type="ProgressBar" parent="Panel/VBoxContainer"] -margin_top = 45.0 -margin_right = 396.0 -margin_bottom = 85.0 -custom_styles/fg = ExtResource( 4 ) -step = 1.0 -percent_visible = false - -[node name="BlankSpace" type="ReferenceRect" parent="Panel/VBoxContainer"] -margin_top = 90.0 -margin_right = 396.0 -margin_bottom = 154.0 -rect_min_size = Vector2( 0, 16 ) -size_flags_horizontal = 3 -size_flags_vertical = 3 - -[node name="Acceleration" type="Label" parent="Panel/VBoxContainer"] -margin_top = 159.0 -margin_right = 396.0 -margin_bottom = 199.0 -custom_fonts/font = ExtResource( 3 ) -text = "Acceleration" - -[node name="ProgressBarBlue" type="ProgressBar" parent="Panel/VBoxContainer"] -margin_top = 204.0 -margin_right = 396.0 -margin_bottom = 244.0 -custom_styles/fg = ExtResource( 5 ) -step = 1.0 -percent_visible = false - -[node name="Button" type="Button" parent="Panel"] -margin_left = 531.0 -margin_top = 258.0 -margin_right = 664.0 -margin_bottom = 377.0 -size_flags_horizontal = 2 -size_flags_vertical = 4 -size_flags_stretch_ratio = 0.0 -text = "Add" - -[connection signal="button_down" from="Panel/Button" to="Panel/VBoxContainer" method="_on_Button_button_down"] -[connection signal="button_up" from="Panel/Button" to="Panel/VBoxContainer" method="_on_Button_button_up"] diff --git a/2d/role_playing_game/theme/foreground_stylebox_blue.tres b/2d/role_playing_game/theme/foreground_stylebox_blue.tres new file mode 100644 index 00000000..a05b5b3e --- /dev/null +++ b/2d/role_playing_game/theme/foreground_stylebox_blue.tres @@ -0,0 +1,11 @@ +[gd_resource type="StyleBoxTexture" load_steps=2 format=2] + +[ext_resource path="res://theme/images/foreground_blue.png" type="Texture" id=1] + +[resource] +texture = ExtResource( 1 ) +region_rect = Rect2( 0, 0, 64, 64 ) +margin_left = 18.0 +margin_right = 18.0 +margin_top = 18.0 +margin_bottom = 18.0 diff --git a/2d/role_playing_game/theme/foreground_stylebox_red.tres b/2d/role_playing_game/theme/foreground_stylebox_red.tres new file mode 100644 index 00000000..16740729 --- /dev/null +++ b/2d/role_playing_game/theme/foreground_stylebox_red.tres @@ -0,0 +1,11 @@ +[gd_resource type="StyleBoxTexture" load_steps=2 format=2] + +[ext_resource path="res://theme/images/foreground_red.png" type="Texture" id=1] + +[resource] +texture = ExtResource( 1 ) +region_rect = Rect2( 0, 0, 64, 64 ) +margin_left = 18.0 +margin_right = 18.0 +margin_top = 20.0 +margin_bottom = 20.0 diff --git a/2d/role_playing_game/theme/progressbar/background.png b/2d/role_playing_game/theme/images/background.png similarity index 100% rename from 2d/role_playing_game/theme/progressbar/background.png rename to 2d/role_playing_game/theme/images/background.png diff --git a/2d/role_playing_game/theme/images/background.png.import b/2d/role_playing_game/theme/images/background.png.import new file mode 100644 index 00000000..ceae0b82 --- /dev/null +++ b/2d/role_playing_game/theme/images/background.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/background.png-18a7ab092343a1a2d858e1a344411242.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://theme/images/background.png" +dest_files=[ "res://.import/background.png-18a7ab092343a1a2d858e1a344411242.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/2d/role_playing_game/theme/button/button_rect.png b/2d/role_playing_game/theme/images/button_rect.png similarity index 100% rename from 2d/role_playing_game/theme/button/button_rect.png rename to 2d/role_playing_game/theme/images/button_rect.png diff --git a/2d/role_playing_game/theme/button/button_rect.png.import b/2d/role_playing_game/theme/images/button_rect.png.import similarity index 68% rename from 2d/role_playing_game/theme/button/button_rect.png.import rename to 2d/role_playing_game/theme/images/button_rect.png.import index c410e919..228a97aa 100644 --- a/2d/role_playing_game/theme/button/button_rect.png.import +++ b/2d/role_playing_game/theme/images/button_rect.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/button_rect.png-50631b7139a07837e9f4856772433e8e.stex" +path="res://.import/button_rect.png-b2c41a1b80f4932c0e158cb00f0366e3.stex" metadata={ "vram_texture": false } [deps] -source_file="res://theme/button/button_rect.png" -dest_files=[ "res://.import/button_rect.png-50631b7139a07837e9f4856772433e8e.stex" ] +source_file="res://theme/images/button_rect.png" +dest_files=[ "res://.import/button_rect.png-b2c41a1b80f4932c0e158cb00f0366e3.stex" ] [params] diff --git a/2d/role_playing_game/theme/button/button_rect_pressed.png b/2d/role_playing_game/theme/images/button_rect_pressed.png similarity index 100% rename from 2d/role_playing_game/theme/button/button_rect_pressed.png rename to 2d/role_playing_game/theme/images/button_rect_pressed.png diff --git a/2d/role_playing_game/theme/button/button_rect_pressed.png.import b/2d/role_playing_game/theme/images/button_rect_pressed.png.import similarity index 66% rename from 2d/role_playing_game/theme/button/button_rect_pressed.png.import rename to 2d/role_playing_game/theme/images/button_rect_pressed.png.import index f132fa5a..33017bc2 100644 --- a/2d/role_playing_game/theme/button/button_rect_pressed.png.import +++ b/2d/role_playing_game/theme/images/button_rect_pressed.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/button_rect_pressed.png-e5e25d3b6005d4ba5edf4354beb6dc06.stex" +path="res://.import/button_rect_pressed.png-412a6dd553cfc471e5f96826ccf6d434.stex" metadata={ "vram_texture": false } [deps] -source_file="res://theme/button/button_rect_pressed.png" -dest_files=[ "res://.import/button_rect_pressed.png-e5e25d3b6005d4ba5edf4354beb6dc06.stex" ] +source_file="res://theme/images/button_rect_pressed.png" +dest_files=[ "res://.import/button_rect_pressed.png-412a6dd553cfc471e5f96826ccf6d434.stex" ] [params] diff --git a/2d/role_playing_game/theme/progressbar/foreground_blue.png b/2d/role_playing_game/theme/images/foreground_blue.png similarity index 100% rename from 2d/role_playing_game/theme/progressbar/foreground_blue.png rename to 2d/role_playing_game/theme/images/foreground_blue.png diff --git a/2d/role_playing_game/theme/images/foreground_blue.png.import b/2d/role_playing_game/theme/images/foreground_blue.png.import new file mode 100644 index 00000000..9596f4ad --- /dev/null +++ b/2d/role_playing_game/theme/images/foreground_blue.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/foreground_blue.png-35d7e9646fc1e18e8f56dc08539244f0.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://theme/images/foreground_blue.png" +dest_files=[ "res://.import/foreground_blue.png-35d7e9646fc1e18e8f56dc08539244f0.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/2d/role_playing_game/theme/progressbar/foreground_red.png b/2d/role_playing_game/theme/images/foreground_red.png similarity index 100% rename from 2d/role_playing_game/theme/progressbar/foreground_red.png rename to 2d/role_playing_game/theme/images/foreground_red.png diff --git a/2d/role_playing_game/theme/images/foreground_red.png.import b/2d/role_playing_game/theme/images/foreground_red.png.import new file mode 100644 index 00000000..e5d2e913 --- /dev/null +++ b/2d/role_playing_game/theme/images/foreground_red.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/foreground_red.png-c23ba55805336ffe255b2be9b971baee.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://theme/images/foreground_red.png" +dest_files=[ "res://.import/foreground_red.png-c23ba55805336ffe255b2be9b971baee.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/2d/role_playing_game/theme/panel/panel_rect.png b/2d/role_playing_game/theme/images/panel_rect.png similarity index 100% rename from 2d/role_playing_game/theme/panel/panel_rect.png rename to 2d/role_playing_game/theme/images/panel_rect.png diff --git a/2d/role_playing_game/theme/panel/panel_rect.png.import b/2d/role_playing_game/theme/images/panel_rect.png.import similarity index 69% rename from 2d/role_playing_game/theme/panel/panel_rect.png.import rename to 2d/role_playing_game/theme/images/panel_rect.png.import index 8652c50e..7bbf031f 100644 --- a/2d/role_playing_game/theme/panel/panel_rect.png.import +++ b/2d/role_playing_game/theme/images/panel_rect.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/panel_rect.png-52b8de43da3f3ba3a0682eb789a33286.stex" +path="res://.import/panel_rect.png-eef2ae28539c58e6b551075147d16b2a.stex" metadata={ "vram_texture": false } [deps] -source_file="res://theme/panel/panel_rect.png" -dest_files=[ "res://.import/panel_rect.png-52b8de43da3f3ba3a0682eb789a33286.stex" ] +source_file="res://theme/images/panel_rect.png" +dest_files=[ "res://.import/panel_rect.png-eef2ae28539c58e6b551075147d16b2a.stex" ] [params] diff --git a/2d/role_playing_game/theme/labels/Title.tscn b/2d/role_playing_game/theme/labels/Title.tscn deleted file mode 100644 index 6e2521a9..00000000 --- a/2d/role_playing_game/theme/labels/Title.tscn +++ /dev/null @@ -1,18 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://theme/fonts/montserrat_extra_bold_48.tres" type="DynamicFont" id=1] - -[node name="Title" type="Label"] -margin_right = 113.0 -margin_bottom = 60.0 -custom_fonts/font = ExtResource( 1 ) -custom_colors/font_color = Color( 1, 1, 1, 1 ) -custom_colors/font_color_shadow = Color( 1, 0.596078, 0, 1 ) -custom_constants/shadow_offset_y = 5 -text = "Title" -align = 1 -autowrap = true -clip_text = true -__meta__ = { -"_edit_use_anchors_": false -} diff --git a/2d/role_playing_game/theme/progressbar/background.png.import b/2d/role_playing_game/theme/progressbar/background.png.import deleted file mode 100644 index 99681bea..00000000 --- a/2d/role_playing_game/theme/progressbar/background.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/background.png-db91f961480760b8bfa082076dc72dbd.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://theme/progressbar/background.png" -dest_files=[ "res://.import/background.png-db91f961480760b8bfa082076dc72dbd.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/2d/role_playing_game/theme/progressbar/foreground_blue.png.import b/2d/role_playing_game/theme/progressbar/foreground_blue.png.import deleted file mode 100644 index f859da1a..00000000 --- a/2d/role_playing_game/theme/progressbar/foreground_blue.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/foreground_blue.png-1208ba20a94923d82a7b0eacc6914552.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://theme/progressbar/foreground_blue.png" -dest_files=[ "res://.import/foreground_blue.png-1208ba20a94923d82a7b0eacc6914552.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/2d/role_playing_game/theme/progressbar/foreground_red.png.import b/2d/role_playing_game/theme/progressbar/foreground_red.png.import deleted file mode 100644 index e6786bec..00000000 --- a/2d/role_playing_game/theme/progressbar/foreground_red.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/foreground_red.png-60d00de182b78bd324a56c9f03008a15.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://theme/progressbar/foreground_red.png" -dest_files=[ "res://.import/foreground_red.png-60d00de182b78bd324a56c9f03008a15.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/2d/role_playing_game/theme/progressbar/foreground_stylebox_blue.tres b/2d/role_playing_game/theme/progressbar/foreground_stylebox_blue.tres deleted file mode 100755 index 49a20ad4..00000000 --- a/2d/role_playing_game/theme/progressbar/foreground_stylebox_blue.tres +++ /dev/null @@ -1,25 +0,0 @@ -[gd_resource type="StyleBoxTexture" load_steps=2 format=2] - -[ext_resource path="res://theme/progressbar/foreground_blue.png" type="Texture" id=1] - - -[resource] - -content_margin_left = -1.0 -content_margin_right = -1.0 -content_margin_top = -1.0 -content_margin_bottom = -1.0 -texture = ExtResource( 1 ) -region_rect = Rect2( 0, 0, 64, 64 ) -margin_left = 18.0 -margin_right = 18.0 -margin_top = 18.0 -margin_bottom = 18.0 -expand_margin_left = 0.0 -expand_margin_right = 0.0 -expand_margin_top = 0.0 -expand_margin_bottom = 0.0 -modulate_color = Color( 1, 1, 1, 1 ) -draw_center = true -_sections_unfolded = [ "Margin" ] - diff --git a/2d/role_playing_game/theme/progressbar/foreground_stylebox_red.tres b/2d/role_playing_game/theme/progressbar/foreground_stylebox_red.tres deleted file mode 100755 index a3ee2dfc..00000000 --- a/2d/role_playing_game/theme/progressbar/foreground_stylebox_red.tres +++ /dev/null @@ -1,25 +0,0 @@ -[gd_resource type="StyleBoxTexture" load_steps=2 format=2] - -[ext_resource path="res://theme/progressbar/foreground_red.png" type="Texture" id=1] - - -[resource] - -content_margin_left = -1.0 -content_margin_right = -1.0 -content_margin_top = -1.0 -content_margin_bottom = -1.0 -texture = ExtResource( 1 ) -region_rect = Rect2( 0, 0, 64, 64 ) -margin_left = 18.0 -margin_right = 18.0 -margin_top = 20.0 -margin_bottom = 20.0 -expand_margin_left = 0.0 -expand_margin_right = 0.0 -expand_margin_top = 0.0 -expand_margin_bottom = 0.0 -modulate_color = Color( 1, 1, 1, 1 ) -draw_center = true -_sections_unfolded = [ "Margin" ] - diff --git a/2d/role_playing_game/theme/theme.tres b/2d/role_playing_game/theme/theme.tres index ae516e2f..0df4957d 100644 --- a/2d/role_playing_game/theme/theme.tres +++ b/2d/role_playing_game/theme/theme.tres @@ -1,12 +1,12 @@ [gd_resource type="Theme" load_steps=14 format=2] [ext_resource path="res://theme/fonts/montserrat_extra_bold_32.tres" type="DynamicFont" id=1] -[ext_resource path="res://theme/button/button_rect.png" type="Texture" id=2] -[ext_resource path="res://theme/button/button_rect_pressed.png" type="Texture" id=3] +[ext_resource path="res://theme/images/button_rect.png" type="Texture" id=2] +[ext_resource path="res://theme/images/button_rect_pressed.png" type="Texture" id=3] [ext_resource path="res://theme/fonts/montserrat_extra_bold_24.tres" type="DynamicFont" id=4] -[ext_resource path="res://theme/panel/panel_rect.png" type="Texture" id=5] -[ext_resource path="res://theme/progressbar/background.png" type="Texture" id=6] -[ext_resource path="res://theme/progressbar/foreground_stylebox_red.tres" type="StyleBox" id=7] +[ext_resource path="res://theme/images/panel_rect.png" type="Texture" id=5] +[ext_resource path="res://theme/images/background.png" type="Texture" id=6] +[ext_resource path="res://theme/foreground_stylebox_red.tres" type="StyleBox" id=7] [sub_resource type="StyleBoxEmpty" id=1] resource_name = "button_focus_style" diff --git a/2d/role_playing_game/turn_combat/combatants/Combatant.tscn b/2d/role_playing_game/turn_combat/combatants/Combatant.tscn deleted file mode 100644 index 0f0e2d14..00000000 --- a/2d/role_playing_game/turn_combat/combatants/Combatant.tscn +++ /dev/null @@ -1,14 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://turn_combat/combatants/Combatant.gd" type="Script" id=1] -[ext_resource path="res://turn_combat/combatants/health/Health.tscn" type="PackedScene" id=2] -[ext_resource path="res://turn_combat/combatants/sprites/Sprite.tscn" type="PackedScene" id=3] - -[node name="Combatant" type="Node2D"] -script = ExtResource( 1 ) -damage = 2 - -[node name="Health" parent="." instance=ExtResource( 2 )] -life = 10 - -[node name="Sprite" parent="." instance=ExtResource( 3 )] diff --git a/2d/role_playing_game/turn_combat/combatants/sprites/Sprite.tscn b/2d/role_playing_game/turn_combat/combatants/sprites/Sprite.tscn deleted file mode 100644 index 7438b6f7..00000000 --- a/2d/role_playing_game/turn_combat/combatants/sprites/Sprite.tscn +++ /dev/null @@ -1,38 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://turn_combat/combatants/sprites/shadow.png" type="Texture" id=1] -[ext_resource path="res://turn_combat/combatants/sprites/blue.png" type="Texture" id=2] - -[sub_resource type="Animation" id=1] -resource_name = "take_damage" -length = 0.2 -step = 0.05 -tracks/0/type = "value" -tracks/0/path = NodePath("Pivot/Body:modulate") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 0.05, 0.1, 0.15, 0.2 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), -"update": 0, -"values": [ Color( 1, 1, 1, 1 ), Color( 3, 0.253906, 0.253906, 1 ), Color( 1, 1, 1, 1 ), Color( 3, 0.253906, 0.253906, 1 ), Color( 1, 1, 1, 1 ) ] -} - -[node name="Sprite" type="Node2D"] - -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] -anims/take_damage = SubResource( 1 ) - -[node name="Tween" type="Tween" parent="."] - -[node name="Pivot" type="Position2D" parent="."] - -[node name="Shadow" type="Sprite" parent="Pivot"] -position = Vector2( 0, -15 ) -texture = ExtResource( 1 ) - -[node name="Body" type="Sprite" parent="Pivot"] -position = Vector2( 0, -76 ) -texture = ExtResource( 2 ) diff --git a/2d/role_playing_game/turn_combat/combatants/sprites/blue.png b/2d/role_playing_game/turn_combat/combatants/sprites/blue.png deleted file mode 100755 index df06acce8702375b74c1ac5c65b2f43648cbe3e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1325 zcmeAS@N?(olHy`uVBq!ia0vp^4nRDcgBeIZ^~(j4OojnIA+A6ML+C1phW&Dxhh>tF zX=LwFNj#*Saa1v7k9^u8*`yWgJvYKctv(SULT$a@s+ltWx@6paP(vG7tgP zq#sgB0}293pcN6AbNq?fe4}(!p2R;9{CY_7>K^d z9R3k=_HtxamR;8@x~`dbTs3RIs@Zc}v-74#=M9tQ%Np%BG}^CgG+!~Szo6cH z)v)foe(gE6+6#J>XVhxW>sFjmt-hdEbzZgdoObCc)$+5d^kVDV4&L>iNf13QnlxA6LserVJ!=kE!M!QwE`ZY(J`@c@d=5^ zUEMvsebZ;mnmup9!j-F5uiby(;Hfi@9zS{d?D@-Auit$6`tAFVpTBwf3H$zPuLyq@v= zgX4`~K0eHUobIAxu&AX&@^Rf?hqg~|pRnwiV(?O0^2Ozio;xO(JQIGYUSg-`+Ttz0 z|M=qcWNa`ob=btvJ8hZU0Tv%1deF;M!02$9paXFuMHe_``3Ku6cb^bYs2i zlg$zj%4QX5{^b++z4OMuLt&3MO$h6L%m4Ai{N}fA%Zd~~TWz~p_lTqG=(jBqm1~#C zMf)r$`6+n(uhIH%Myvnm$(_9K-GBd4L5aHP8k z>W`cr)ytoBi1+U~?)_1C-=u{se{9OCj%ZB%kzTyz!sK+vODqhVOeRnNpyhQFRPK4Y L`njxgN@xNAB0Ggt diff --git a/2d/role_playing_game/turn_combat/combatants/sprites/blue.png.import b/2d/role_playing_game/turn_combat/combatants/sprites/blue.png.import deleted file mode 100644 index d8348ca7..00000000 --- a/2d/role_playing_game/turn_combat/combatants/sprites/blue.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/blue.png-1646430371c0817627bfbad8bb1bf0ab.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://turn_combat/combatants/sprites/blue.png" -dest_files=[ "res://.import/blue.png-1646430371c0817627bfbad8bb1bf0ab.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/2d/role_playing_game/turn_combat/combatants/sprites/green.png b/2d/role_playing_game/turn_combat/combatants/sprites/green.png deleted file mode 100755 index 55f4e5eb1012cbd09de95f21e4d7e45ce076ed1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1332 zcmeAS@N?(olHy`uVBq!ia0vp^4nRDcgBeIZ^~(j4Ott|&A+A71=qd(>28XD2-OxVm zxHgT@HkH_Jy~qhVG5wkmo$8@|YSEo~p&i;$J(>~i8j(G^;hj36J=&2STH!s~QJvc1 zy_%8T8ev`9VLh6WT^bSHIuYI4;XPWB-C7Ynn&DlVkv-ZGUE1M5ZZ}Y+c0{*Uco$f< zOEaQN3nCugr43RKQxMq$WP`Y11d#%AL3+Um&LD;h)wt;e!^Rg3o1Qandd{%%Ipc=s zOq-rDZhXeL;Thw4AbQHU{t4^)CoJopFs*ycy803GnupA*A2P4H&$a3S%gX!Qs~!N^ zEGzEuuDHju@-ENHdq6hJ@;iJ>Zwk&lD?j6`!t_(h(@rT*J*hJFgzB`@yc3RSO+3y& z@fd&qLEXNCdc6nrdJgFK9}(!;Z_syGuyeOb2N3Nt?c6KezFVYei*4f;+lI~d4V&!i zH`&*1w5#7>SGU2wcD-#45UsPVS!-LfL9%MSRMk4E$~DsEtEG#VSrjj|C|qn_yj-?m zv3bEFvx3F)xeHA5f#iIXyoCxm3luWvDrL+v%ABK=KGQG_h-Mh2%~VO5Zjd}xKWVB# z@-)@NDL{s5;$;1V$?EZwbmJ%L#ZOX?o2VN*Q6qMudThULY(Fp=XhiqvME3%bR#Y!A z8E8j9BDY&>?Y!upzy#!1666=mz|0~jBrGZ>E-57~BPXw*p{b>9YGz?+ZD;Qg6&({B z7oU)r+|}LF+c$m2tl9GxEL^#2_1gUh4xT#m=<$=M&z`@0_4>`1uiw7^`1$MipMR72 zcUl0GXoRPWV@SoVx3_|m<9sFD9;*L3b8B1fv2CxftPIxP7HjTz_t?2#*&BbpTX{S3 z`S-1r7Dfx=#n;`=dwXVvWpsZ0?g!$MD?4Y;F*JPME1Z&1zpn78!@AY~Cph}vZa=st z{X~P9C8I-jWL?^?8L7{vZ)IwD?DR5Qk3r;)<)b{OzN-I?5xh;%KqS@VmY&H9n*%}K~~Xx6P~`$)7YQWpnB=z{=NgB8Oob~+B3`i6Py_8 z@YS&V@Z1$lVO=vKnJ2#Ea%D7oW+Yr8zJf_+1;et_MGA*wSNbHZ%waurrNJO!^BcBv zD;U!o=O(f1%4Ic#bKmHazOqw0j6LtramEY>W~mDY%(;KGw9J#{pVo#~)pVOuxHJ9eA=Bbp_b zck}NMSbpWFokA3E$4geJ$0FHp7-xkxrtyNUXkas0z=(yp&*A}_?$ml@ z=cJlXSjD!4(K>~D!eX{3OtVuZ16Ht!Fng!61qhnL2yjqg$#d6CnzwfH9H7cI zlji|NR!^D>BtdMDdJuapm<{3rwE#sX&jV^-jSvKiKoCd^5<=kuZ3jt#OvZ~gTwXZ~ z=>Oo7AirP+MkX$99%U6(HFXV5Eo~iLJ$*wDPcLtuz{sfR+`RmPqL$Y7j?S*`p5FNj z7A{({blLJ1D_5;Pe&XcmOP8-)y>|Vy#ICNFj-!Sd)sv^^RJ9C4R3%#FzDtXSh z?B-98V#}4^bI)ul`}D_phJMk$B)bo*;p00i_>zopr0DY2q AO8@`> diff --git a/2d/role_playing_game/turn_combat/combatants/sprites/shadow.png.import b/2d/role_playing_game/turn_combat/combatants/sprites/shadow.png.import deleted file mode 100644 index 56db9036..00000000 --- a/2d/role_playing_game/turn_combat/combatants/sprites/shadow.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/shadow.png-0d089e013d2449a666ec492b25e627fe.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://turn_combat/combatants/sprites/shadow.png" -dest_files=[ "res://.import/shadow.png-0d089e013d2449a666ec492b25e627fe.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/2d/role_playing_game/turn_combat/turn_queue/TurnQueue.tscn b/2d/role_playing_game/turn_combat/turn_queue/TurnQueue.tscn deleted file mode 100644 index 59bb56e7..00000000 --- a/2d/role_playing_game/turn_combat/turn_queue/TurnQueue.tscn +++ /dev/null @@ -1,6 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://turn_combat/turn_queue/TurnQueue.gd" type="Script" id=1] - -[node name="TurnQueue" type="Node"] -script = ExtResource( 1 ) diff --git a/mono/2.5d/addons/node25d-cs/main_screen/.broken-cs-files/Viewport25D.cs b/mono/2.5d/addons/node25d-cs/main_screen/.broken-cs-files/Viewport25D.cs index c4bbc21d..61347272 100644 --- a/mono/2.5d/addons/node25d-cs/main_screen/.broken-cs-files/Viewport25D.cs +++ b/mono/2.5d/addons/node25d-cs/main_screen/.broken-cs-files/Viewport25D.cs @@ -24,8 +24,6 @@ public class Viewport25D : Control public async override void _Ready() { // Give Godot a chance to fully load the scene. Should take two frames. - //yield(get_tree(), "idle_frame"); - //yield(get_tree(), "idle_frame"); await ToSignal(GetTree(), "idle_frame"); await ToSignal(GetTree(), "idle_frame"); var editedSceneRoot = GetTree().EditedSceneRoot;