diff --git a/cards/spawn_avenger.png b/cards/spawns/spawn_avenger.png similarity index 100% rename from cards/spawn_avenger.png rename to cards/spawns/spawn_avenger.png diff --git a/cards/spawn_avenger.png.import b/cards/spawns/spawn_avenger.png.import similarity index 68% rename from cards/spawn_avenger.png.import rename to cards/spawns/spawn_avenger.png.import index ecd2295..51652a7 100644 --- a/cards/spawn_avenger.png.import +++ b/cards/spawns/spawn_avenger.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/spawn_avenger.png-0e9b42e111ad47348fa2bb54082d25af.stex" +path="res://.import/spawn_avenger.png-cd9b828379453d9bb054328375ecaae2.stex" metadata={ "vram_texture": false } [deps] -source_file="res://cards/spawn_avenger.png" -dest_files=[ "res://.import/spawn_avenger.png-0e9b42e111ad47348fa2bb54082d25af.stex" ] +source_file="res://cards/spawns/spawn_avenger.png" +dest_files=[ "res://.import/spawn_avenger.png-cd9b828379453d9bb054328375ecaae2.stex" ] [params] diff --git a/cards/spawn_avenger.tscn b/cards/spawns/spawn_avenger.tscn similarity index 74% rename from cards/spawn_avenger.tscn rename to cards/spawns/spawn_avenger.tscn index cb4b8bf..2b202eb 100644 --- a/cards/spawn_avenger.tscn +++ b/cards/spawns/spawn_avenger.tscn @@ -1,9 +1,11 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://units/avenger.tscn" type="PackedScene" id=1] -[ext_resource path="res://cards/spawn_avenger.png" type="Texture" id=2] +[ext_resource path="res://units/basic/avenger.tscn" type="PackedScene" id=1] +[ext_resource path="res://cards/spawns/spawn_avenger.png" type="Texture" id=2] [ext_resource path="res://cards/base_card.tscn" type="PackedScene" id=3] + + [node name="spawn_avenger" instance=ExtResource( 3 )] title = "Avenger" portrait = ExtResource( 2 ) diff --git a/cards/spawn_breeze.png b/cards/spawns/spawn_breeze.png similarity index 100% rename from cards/spawn_breeze.png rename to cards/spawns/spawn_breeze.png diff --git a/cards/spawn_breeze.png.import b/cards/spawns/spawn_breeze.png.import similarity index 68% rename from cards/spawn_breeze.png.import rename to cards/spawns/spawn_breeze.png.import index af963ac..89a62d6 100644 --- a/cards/spawn_breeze.png.import +++ b/cards/spawns/spawn_breeze.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/spawn_breeze.png-a26105160ca2c20c3fe2cbf5112a5e38.stex" +path="res://.import/spawn_breeze.png-a93a60dc59f06695876880f3d8bd3f2f.stex" metadata={ "vram_texture": false } [deps] -source_file="res://cards/spawn_breeze.png" -dest_files=[ "res://.import/spawn_breeze.png-a26105160ca2c20c3fe2cbf5112a5e38.stex" ] +source_file="res://cards/spawns/spawn_breeze.png" +dest_files=[ "res://.import/spawn_breeze.png-a93a60dc59f06695876880f3d8bd3f2f.stex" ] [params] diff --git a/cards/spawn_breeze.tscn b/cards/spawns/spawn_breeze.tscn similarity index 74% rename from cards/spawn_breeze.tscn rename to cards/spawns/spawn_breeze.tscn index 69a5191..fbf6789 100644 --- a/cards/spawn_breeze.tscn +++ b/cards/spawns/spawn_breeze.tscn @@ -1,8 +1,10 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://cards/spawn_breeze.png" type="Texture" id=1] +[ext_resource path="res://cards/spawns/spawn_breeze.png" type="Texture" id=1] [ext_resource path="res://cards/base_card.tscn" type="PackedScene" id=2] -[ext_resource path="res://units/breeze.tscn" type="PackedScene" id=3] +[ext_resource path="res://units/basic/breeze.tscn" type="PackedScene" id=3] + + [node name="spawn_breeze" instance=ExtResource( 2 )] title = "Breeze" diff --git a/cards/spawn_commodore.png b/cards/spawns/spawn_commodore.png similarity index 100% rename from cards/spawn_commodore.png rename to cards/spawns/spawn_commodore.png diff --git a/cards/spawn_commodore.png.import b/cards/spawns/spawn_commodore.png.import similarity index 67% rename from cards/spawn_commodore.png.import rename to cards/spawns/spawn_commodore.png.import index 79c7ba1..2e08ea8 100644 --- a/cards/spawn_commodore.png.import +++ b/cards/spawns/spawn_commodore.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/spawn_commodore.png-66add408bdd33b45607203ba7d601c08.stex" +path="res://.import/spawn_commodore.png-4d80068ad26646b382c8ca96d0851450.stex" metadata={ "vram_texture": false } [deps] -source_file="res://cards/spawn_commodore.png" -dest_files=[ "res://.import/spawn_commodore.png-66add408bdd33b45607203ba7d601c08.stex" ] +source_file="res://cards/spawns/spawn_commodore.png" +dest_files=[ "res://.import/spawn_commodore.png-4d80068ad26646b382c8ca96d0851450.stex" ] [params] diff --git a/cards/spawn_commodore.tscn b/cards/spawns/spawn_commodore.tscn similarity index 74% rename from cards/spawn_commodore.tscn rename to cards/spawns/spawn_commodore.tscn index 47636d9..f2be10a 100644 --- a/cards/spawn_commodore.tscn +++ b/cards/spawns/spawn_commodore.tscn @@ -1,9 +1,11 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://cards/spawn_commodore.png" type="Texture" id=1] -[ext_resource path="res://units/commodore.tscn" type="PackedScene" id=2] +[ext_resource path="res://cards/spawns/spawn_commodore.png" type="Texture" id=1] +[ext_resource path="res://units/basic/commodore.tscn" type="PackedScene" id=2] [ext_resource path="res://cards/base_card.tscn" type="PackedScene" id=3] + + [node name="spawn_commorode" instance=ExtResource( 3 )] title = "Commodore" portrait = ExtResource( 1 ) diff --git a/cards/spawn_creeper.png b/cards/spawns/spawn_creeper.png similarity index 100% rename from cards/spawn_creeper.png rename to cards/spawns/spawn_creeper.png diff --git a/cards/spawn_creeper.png.import b/cards/spawns/spawn_creeper.png.import similarity index 68% rename from cards/spawn_creeper.png.import rename to cards/spawns/spawn_creeper.png.import index 2311069..3f5ac8b 100644 --- a/cards/spawn_creeper.png.import +++ b/cards/spawns/spawn_creeper.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/spawn_creeper.png-519e7a442f8730fa5b853c6fa7b94b52.stex" +path="res://.import/spawn_creeper.png-0bd27a75e44a34281fedae260cf4a1bf.stex" metadata={ "vram_texture": false } [deps] -source_file="res://cards/spawn_creeper.png" -dest_files=[ "res://.import/spawn_creeper.png-519e7a442f8730fa5b853c6fa7b94b52.stex" ] +source_file="res://cards/spawns/spawn_creeper.png" +dest_files=[ "res://.import/spawn_creeper.png-0bd27a75e44a34281fedae260cf4a1bf.stex" ] [params] diff --git a/cards/spawn_creeper.tscn b/cards/spawns/spawn_creeper.tscn similarity index 74% rename from cards/spawn_creeper.tscn rename to cards/spawns/spawn_creeper.tscn index 4380562..64fcdc1 100644 --- a/cards/spawn_creeper.tscn +++ b/cards/spawns/spawn_creeper.tscn @@ -1,8 +1,10 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://cards/base_card.tscn" type="PackedScene" id=1] -[ext_resource path="res://units/creeper.tscn" type="PackedScene" id=2] -[ext_resource path="res://cards/spawn_creeper.png" type="Texture" id=3] +[ext_resource path="res://units/basic/creeper.tscn" type="PackedScene" id=2] +[ext_resource path="res://cards/spawns/spawn_creeper.png" type="Texture" id=3] + + [node name="spawn_creeper" instance=ExtResource( 1 )] title = "Creeper" diff --git a/cards/spawn_falcon.png b/cards/spawns/spawn_falcon.png similarity index 100% rename from cards/spawn_falcon.png rename to cards/spawns/spawn_falcon.png diff --git a/cards/spawn_falcon.png.import b/cards/spawns/spawn_falcon.png.import similarity index 68% rename from cards/spawn_falcon.png.import rename to cards/spawns/spawn_falcon.png.import index 182a2d9..5d080f6 100644 --- a/cards/spawn_falcon.png.import +++ b/cards/spawns/spawn_falcon.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/spawn_falcon.png-0848e156a2fe111dbd3ccc9fed8dc60b.stex" +path="res://.import/spawn_falcon.png-a767dd2f95857afc30ca66c089ec4f3d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://cards/spawn_falcon.png" -dest_files=[ "res://.import/spawn_falcon.png-0848e156a2fe111dbd3ccc9fed8dc60b.stex" ] +source_file="res://cards/spawns/spawn_falcon.png" +dest_files=[ "res://.import/spawn_falcon.png-a767dd2f95857afc30ca66c089ec4f3d.stex" ] [params] diff --git a/cards/spawn_falcon.tscn b/cards/spawns/spawn_falcon.tscn similarity index 74% rename from cards/spawn_falcon.tscn rename to cards/spawns/spawn_falcon.tscn index 6dd101f..7888934 100644 --- a/cards/spawn_falcon.tscn +++ b/cards/spawns/spawn_falcon.tscn @@ -1,8 +1,10 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://cards/base_card.tscn" type="PackedScene" id=1] -[ext_resource path="res://cards/spawn_falcon.png" type="Texture" id=2] -[ext_resource path="res://units/falcon.tscn" type="PackedScene" id=3] +[ext_resource path="res://cards/spawns/spawn_falcon.png" type="Texture" id=2] +[ext_resource path="res://units/basic/falcon.tscn" type="PackedScene" id=3] + + [node name="spawn_falcon" instance=ExtResource( 1 )] title = "Falcon" diff --git a/cards/spawn_flea.png b/cards/spawns/spawn_flea.png similarity index 100% rename from cards/spawn_flea.png rename to cards/spawns/spawn_flea.png diff --git a/cards/spawn_flea.png.import b/cards/spawns/spawn_flea.png.import similarity index 69% rename from cards/spawn_flea.png.import rename to cards/spawns/spawn_flea.png.import index 3bf8f88..665c8d2 100644 --- a/cards/spawn_flea.png.import +++ b/cards/spawns/spawn_flea.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/spawn_flea.png-be5a9d99544b57d747f6693041905b91.stex" +path="res://.import/spawn_flea.png-aab4e50c12e85b8ad031c1c666372a01.stex" metadata={ "vram_texture": false } [deps] -source_file="res://cards/spawn_flea.png" -dest_files=[ "res://.import/spawn_flea.png-be5a9d99544b57d747f6693041905b91.stex" ] +source_file="res://cards/spawns/spawn_flea.png" +dest_files=[ "res://.import/spawn_flea.png-aab4e50c12e85b8ad031c1c666372a01.stex" ] [params] diff --git a/cards/spawn_flea.tscn b/cards/spawns/spawn_flea.tscn similarity index 75% rename from cards/spawn_flea.tscn rename to cards/spawns/spawn_flea.tscn index 188ce61..2256dd8 100644 --- a/cards/spawn_flea.tscn +++ b/cards/spawns/spawn_flea.tscn @@ -1,8 +1,10 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://cards/spawn_flea.png" type="Texture" id=1] +[ext_resource path="res://cards/spawns/spawn_flea.png" type="Texture" id=1] [ext_resource path="res://cards/base_card.tscn" type="PackedScene" id=2] -[ext_resource path="res://units/flea.tscn" type="PackedScene" id=3] +[ext_resource path="res://units/basic/flea.tscn" type="PackedScene" id=3] + + [node name="spawn_flea" instance=ExtResource( 2 )] title = "Flea" diff --git a/cards/spawn_jumper.png b/cards/spawns/spawn_jumper.png similarity index 100% rename from cards/spawn_jumper.png rename to cards/spawns/spawn_jumper.png diff --git a/cards/spawn_jumper.png.import b/cards/spawns/spawn_jumper.png.import similarity index 68% rename from cards/spawn_jumper.png.import rename to cards/spawns/spawn_jumper.png.import index d81857e..dae4957 100644 --- a/cards/spawn_jumper.png.import +++ b/cards/spawns/spawn_jumper.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/spawn_jumper.png-1f71a23fcc95a1c9b7932dc015425dc1.stex" +path="res://.import/spawn_jumper.png-abf4a1634eb889e8c69a2898b4ba336b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://cards/spawn_jumper.png" -dest_files=[ "res://.import/spawn_jumper.png-1f71a23fcc95a1c9b7932dc015425dc1.stex" ] +source_file="res://cards/spawns/spawn_jumper.png" +dest_files=[ "res://.import/spawn_jumper.png-abf4a1634eb889e8c69a2898b4ba336b.stex" ] [params] diff --git a/cards/spawn_jumper.tscn b/cards/spawns/spawn_jumper.tscn similarity index 74% rename from cards/spawn_jumper.tscn rename to cards/spawns/spawn_jumper.tscn index a2ce477..375f5d3 100644 --- a/cards/spawn_jumper.tscn +++ b/cards/spawns/spawn_jumper.tscn @@ -1,8 +1,10 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://units/jumper.tscn" type="PackedScene" id=1] +[ext_resource path="res://units/basic/jumper.tscn" type="PackedScene" id=1] [ext_resource path="res://cards/base_card.tscn" type="PackedScene" id=2] -[ext_resource path="res://cards/spawn_jumper.png" type="Texture" id=3] +[ext_resource path="res://cards/spawns/spawn_jumper.png" type="Texture" id=3] + + [node name="spawn_jumper" instance=ExtResource( 2 )] title = "Jumper" diff --git a/cards/spawn_trapper.png b/cards/spawns/spawn_trapper.png similarity index 100% rename from cards/spawn_trapper.png rename to cards/spawns/spawn_trapper.png diff --git a/cards/spawn_trapper.png.import b/cards/spawns/spawn_trapper.png.import similarity index 68% rename from cards/spawn_trapper.png.import rename to cards/spawns/spawn_trapper.png.import index 4441ab6..cefb702 100644 --- a/cards/spawn_trapper.png.import +++ b/cards/spawns/spawn_trapper.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/spawn_trapper.png-b66f0ec37cb8dddf6d2a59ce3a093aef.stex" +path="res://.import/spawn_trapper.png-652d35e9d55b90fa14f564311a6f1e8e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://cards/spawn_trapper.png" -dest_files=[ "res://.import/spawn_trapper.png-b66f0ec37cb8dddf6d2a59ce3a093aef.stex" ] +source_file="res://cards/spawns/spawn_trapper.png" +dest_files=[ "res://.import/spawn_trapper.png-652d35e9d55b90fa14f564311a6f1e8e.stex" ] [params] diff --git a/cards/spawn_trapper.tscn b/cards/spawns/spawn_trapper.tscn similarity index 74% rename from cards/spawn_trapper.tscn rename to cards/spawns/spawn_trapper.tscn index 3d99b88..f9b0df4 100644 --- a/cards/spawn_trapper.tscn +++ b/cards/spawns/spawn_trapper.tscn @@ -1,9 +1,11 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://cards/spawn_trapper.png" type="Texture" id=1] -[ext_resource path="res://units/trapper.tscn" type="PackedScene" id=2] +[ext_resource path="res://cards/spawns/spawn_trapper.png" type="Texture" id=1] +[ext_resource path="res://units/basic/trapper.tscn" type="PackedScene" id=2] [ext_resource path="res://cards/base_card.tscn" type="PackedScene" id=3] + + [node name="spawn_trapper" instance=ExtResource( 3 )] title = "Trapper" portrait = ExtResource( 1 ) diff --git a/cards/spawn_xander.png b/cards/spawns/spawn_xander.png similarity index 100% rename from cards/spawn_xander.png rename to cards/spawns/spawn_xander.png diff --git a/cards/spawn_xander.png.import b/cards/spawns/spawn_xander.png.import similarity index 68% rename from cards/spawn_xander.png.import rename to cards/spawns/spawn_xander.png.import index 5226872..f2c9c88 100644 --- a/cards/spawn_xander.png.import +++ b/cards/spawns/spawn_xander.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/spawn_xander.png-e850114739e91765be24759f7e950cde.stex" +path="res://.import/spawn_xander.png-751b178149f882dbc5c34e6ca5397b7b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://cards/spawn_xander.png" -dest_files=[ "res://.import/spawn_xander.png-e850114739e91765be24759f7e950cde.stex" ] +source_file="res://cards/spawns/spawn_xander.png" +dest_files=[ "res://.import/spawn_xander.png-751b178149f882dbc5c34e6ca5397b7b.stex" ] [params] diff --git a/cards/spawn_xander.tscn b/cards/spawns/spawn_xander.tscn similarity index 74% rename from cards/spawn_xander.tscn rename to cards/spawns/spawn_xander.tscn index 05fb64c..2c4b312 100644 --- a/cards/spawn_xander.tscn +++ b/cards/spawns/spawn_xander.tscn @@ -1,9 +1,11 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://units/xander.tscn" type="PackedScene" id=1] -[ext_resource path="res://cards/spawn_xander.png" type="Texture" id=2] +[ext_resource path="res://units/basic/xander.tscn" type="PackedScene" id=1] +[ext_resource path="res://cards/spawns/spawn_xander.png" type="Texture" id=2] [ext_resource path="res://cards/base_card.tscn" type="PackedScene" id=3] + + [node name="spawn_xander" instance=ExtResource( 3 )] title = "Xander" portrait = ExtResource( 2 ) diff --git a/decks/all.tscn b/decks/all.tscn index 5ca8aae..fceff76 100644 --- a/decks/all.tscn +++ b/decks/all.tscn @@ -1,67 +1,39 @@ [gd_scene load_steps=10 format=2] -[ext_resource path="res://cards/spawn_trapper.tscn" type="PackedScene" id=1] -[ext_resource path="res://cards/spawn_xander.tscn" type="PackedScene" id=2] -[ext_resource path="res://cards/spawn_breeze.tscn" type="PackedScene" id=3] -[ext_resource path="res://cards/spawn_jumper.tscn" type="PackedScene" id=4] -[ext_resource path="res://cards/spawn_flea.tscn" type="PackedScene" id=5] -[ext_resource path="res://cards/spawn_falcon.tscn" type="PackedScene" id=6] -[ext_resource path="res://cards/spawn_avenger.tscn" type="PackedScene" id=7] -[ext_resource path="res://cards/spawn_commodore.tscn" type="PackedScene" id=8] -[ext_resource path="res://cards/spawn_creeper.tscn" type="PackedScene" id=9] +[ext_resource path="res://cards/spawns/spawn_trapper.tscn" type="PackedScene" id=1] +[ext_resource path="res://cards/spawns/spawn_xander.tscn" type="PackedScene" id=2] +[ext_resource path="res://cards/spawns/spawn_breeze.tscn" type="PackedScene" id=3] +[ext_resource path="res://cards/spawns/spawn_jumper.tscn" type="PackedScene" id=4] +[ext_resource path="res://cards/spawns/spawn_flea.tscn" type="PackedScene" id=5] +[ext_resource path="res://cards/spawns/spawn_falcon.tscn" type="PackedScene" id=6] +[ext_resource path="res://cards/spawns/spawn_avenger.tscn" type="PackedScene" id=7] +[ext_resource path="res://cards/spawns/spawn_commodore.tscn" type="PackedScene" id=8] +[ext_resource path="res://cards/spawns/spawn_creeper.tscn" type="PackedScene" id=9] -[node name="Node2D" type="Node2D"] +[node name="deck" type="Node2D"] [node name="spawn_avenger" parent="." instance=ExtResource( 7 )] -margin_left = 0.0 -margin_top = 0.0 -margin_right = 180.0 -margin_bottom = 240.0 [node name="spawn_breeze" parent="." instance=ExtResource( 3 )] -margin_left = 200.0 -margin_top = 0.0 -margin_right = 380.0 -margin_bottom = 240.0 +position = Vector2( 200, 0 ) [node name="spawn_commorode" parent="." instance=ExtResource( 8 )] -margin_left = 400.0 -margin_top = 0.0 -margin_right = 580.0 -margin_bottom = 240.0 +position = Vector2( 400, 0 ) [node name="spawn_creeper" parent="." instance=ExtResource( 9 )] -margin_left = 600.0 -margin_top = 0.0 -margin_right = 780.0 -margin_bottom = 240.0 +position = Vector2( 600, 0 ) [node name="spawn_falcon" parent="." instance=ExtResource( 6 )] -margin_left = 800.0 -margin_top = 0.0 -margin_right = 980.0 -margin_bottom = 240.0 +position = Vector2( 800, 0 ) [node name="spawn_flea" parent="." instance=ExtResource( 5 )] -margin_left = 0.0 -margin_top = 300.0 -margin_right = 180.0 -margin_bottom = 540.0 +position = Vector2( 0, 300 ) [node name="spawn_jumper" parent="." instance=ExtResource( 4 )] -margin_left = 200.0 -margin_top = 300.0 -margin_right = 380.0 -margin_bottom = 540.0 +position = Vector2( 200, 300 ) [node name="spawn_trapper" parent="." instance=ExtResource( 1 )] -margin_left = 400.0 -margin_top = 300.0 -margin_right = 580.0 -margin_bottom = 540.0 +position = Vector2( 400, 300 ) [node name="spawn_xander" parent="." instance=ExtResource( 2 )] -margin_left = 600.0 -margin_top = 300.0 -margin_right = 780.0 -margin_bottom = 540.0 +position = Vector2( 600, 300 ) diff --git a/tests/hand_play_card.tscn b/tests/hand_play_card.tscn index b7a62b2..ef6c4a1 100644 --- a/tests/hand_play_card.tscn +++ b/tests/hand_play_card.tscn @@ -2,9 +2,10 @@ [ext_resource path="res://screens/battle/hand.gd" type="Script" id=1] [ext_resource path="res://arenas/anchor.tscn" type="PackedScene" id=2] -[ext_resource path="res://cards/spawn_breeze.tscn" type="PackedScene" id=3] +[ext_resource path="res://cards/spawns/spawn_breeze.tscn" type="PackedScene" id=3] [ext_resource path="res://theme/ui.tres" type="Theme" id=4] + [sub_resource type="GDScript" id=1] script/source = "extends Node2D diff --git a/tests/unit_combat.tscn b/tests/unit_combat.tscn index 87717ad..8794f0d 100644 --- a/tests/unit_combat.tscn +++ b/tests/unit_combat.tscn @@ -2,9 +2,10 @@ [ext_resource path="res://arenas/route.tscn" type="PackedScene" id=1] [ext_resource path="res://arenas/anchor.tscn" type="PackedScene" id=2] -[ext_resource path="res://units/trapper.tscn" type="PackedScene" id=3] -[ext_resource path="res://units/flea.tscn" type="PackedScene" id=4] -[ext_resource path="res://units/avenger.tscn" type="PackedScene" id=5] +[ext_resource path="res://units/basic/trapper.tscn" type="PackedScene" id=3] +[ext_resource path="res://units/basic/flea.tscn" type="PackedScene" id=4] +[ext_resource path="res://units/basic/avenger.tscn" type="PackedScene" id=5] + [node name="Node2D" type="Node2D"] diff --git a/tests/unit_move.tscn b/tests/unit_move.tscn index 8f23f07..5904239 100644 --- a/tests/unit_move.tscn +++ b/tests/unit_move.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://arenas/anchor.tscn" type="PackedScene" id=1] [ext_resource path="res://arenas/route.tscn" type="PackedScene" id=2] -[ext_resource path="res://units/creeper.tscn" type="PackedScene" id=3] +[ext_resource path="res://units/basic/creeper.tscn" type="PackedScene" id=3] [node name="Node2D" type="Node2D"] diff --git a/units/all.tscn b/units/all.tscn index 6def9ea..1501c87 100644 --- a/units/all.tscn +++ b/units/all.tscn @@ -1,81 +1,48 @@ [gd_scene load_steps=12 format=2] -[ext_resource path="res://units/avenger.tscn" type="PackedScene" id=1] -[ext_resource path="res://units/breeze.tscn" type="PackedScene" id=2] -[ext_resource path="res://units/commodore.tscn" type="PackedScene" id=3] -[ext_resource path="res://units/creeper.tscn" type="PackedScene" id=4] -[ext_resource path="res://units/flea.tscn" type="PackedScene" id=5] -[ext_resource path="res://units/jumper.tscn" type="PackedScene" id=6] -[ext_resource path="res://units/falcon.tscn" type="PackedScene" id=7] -[ext_resource path="res://units/xander.tscn" type="PackedScene" id=8] -[ext_resource path="res://units/trapper.tscn" type="PackedScene" id=9] +[ext_resource path="res://units/basic/avenger.tscn" type="PackedScene" id=1] +[ext_resource path="res://units/basic/breeze.tscn" type="PackedScene" id=2] +[ext_resource path="res://units/basic/commodore.tscn" type="PackedScene" id=3] +[ext_resource path="res://units/basic/creeper.tscn" type="PackedScene" id=4] +[ext_resource path="res://units/basic/flea.tscn" type="PackedScene" id=5] +[ext_resource path="res://units/basic/jumper.tscn" type="PackedScene" id=6] +[ext_resource path="res://units/basic/falcon.tscn" type="PackedScene" id=7] +[ext_resource path="res://units/basic/xander.tscn" type="PackedScene" id=8] +[ext_resource path="res://units/basic/trapper.tscn" type="PackedScene" id=9] [ext_resource path="res://units/heroes/rhino.tscn" type="PackedScene" id=10] [ext_resource path="res://units/heroes/tomahawk.tscn" type="PackedScene" id=11] [node name="Node2D" type="Node2D"] [node name="xander" parent="." instance=ExtResource( 8 )] -margin_left = 100.0 -margin_top = 730.0 -margin_right = 200.0 -margin_bottom = 830.0 +position = Vector2( 800, 900 ) [node name="falcon" parent="." instance=ExtResource( 7 )] -margin_left = 390.0 -margin_top = 730.0 -margin_right = 490.0 -margin_bottom = 830.0 +position = Vector2( 500, 900 ) [node name="trapper" parent="." instance=ExtResource( 9 )] -margin_left = 680.0 -margin_top = 730.0 -margin_right = 780.0 -margin_bottom = 830.0 +position = Vector2( 200, 900 ) [node name="avenger" parent="." instance=ExtResource( 1 )] -margin_left = 100.0 -margin_top = 300.0 -margin_right = 200.0 -margin_bottom = 400.0 +position = Vector2( 800, 700 ) [node name="breeze" parent="." instance=ExtResource( 2 )] -margin_left = 390.0 -margin_top = 300.0 -margin_right = 490.0 -margin_bottom = 400.0 +position = Vector2( 500, 700 ) [node name="commodore" parent="." instance=ExtResource( 3 )] -margin_left = 680.0 -margin_top = 300.0 -margin_right = 780.0 -margin_bottom = 400.0 +position = Vector2( 200, 700 ) [node name="creeper" parent="." instance=ExtResource( 4 )] -margin_left = 100.0 -margin_top = 510.0 -margin_right = 200.0 -margin_bottom = 610.0 +position = Vector2( 800, 500 ) [node name="flea" parent="." instance=ExtResource( 5 )] -margin_left = 390.0 -margin_top = 510.0 -margin_right = 490.0 -margin_bottom = 610.0 +position = Vector2( 500, 500 ) [node name="jumper" parent="." instance=ExtResource( 6 )] -margin_left = 680.0 -margin_top = 510.0 -margin_right = 780.0 -margin_bottom = 610.0 +position = Vector2( 200, 500 ) [node name="rhino" parent="." instance=ExtResource( 10 )] -margin_left = 100.0 -margin_top = 20.0 -margin_right = 200.0 -margin_bottom = 120.0 +position = Vector2( 600, 200 ) [node name="tomahawk" parent="." instance=ExtResource( 11 )] -margin_left = 390.0 -margin_top = 20.0 -margin_right = 490.0 -margin_bottom = 120.0 +position = Vector2( 198.222, 200 ) diff --git a/units/base_unit.tscn b/units/base_unit.tscn index dd7da7f..4a5749d 100644 --- a/units/base_unit.tscn +++ b/units/base_unit.tscn @@ -18,6 +18,7 @@ modulate = Color( 1, 0.3, 0.3, 1 ) position = Vector2( 0, 100 ) z_index = 20 z_as_relative = false +enemy = true [node name="move_hint" type="Line2D" parent="."] visible = false diff --git a/units/avenger.png b/units/basic/avenger.png similarity index 100% rename from units/avenger.png rename to units/basic/avenger.png diff --git a/units/avenger.png.import b/units/basic/avenger.png.import similarity index 71% rename from units/avenger.png.import rename to units/basic/avenger.png.import index 8a54bcc..df6ad11 100644 --- a/units/avenger.png.import +++ b/units/basic/avenger.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/avenger.png-c24cc4b776734cf8e4025d27b04aec04.stex" +path="res://.import/avenger.png-cbbbccfdc172b7920d132b98f0c80e7b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://units/avenger.png" -dest_files=[ "res://.import/avenger.png-c24cc4b776734cf8e4025d27b04aec04.stex" ] +source_file="res://units/basic/avenger.png" +dest_files=[ "res://.import/avenger.png-cbbbccfdc172b7920d132b98f0c80e7b.stex" ] [params] diff --git a/units/avenger.tscn b/units/basic/avenger.tscn similarity index 84% rename from units/avenger.tscn rename to units/basic/avenger.tscn index 5594044..beaeba4 100644 --- a/units/avenger.tscn +++ b/units/basic/avenger.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://units/base_unit.tscn" type="PackedScene" id=1] -[ext_resource path="res://units/avenger.png" type="Texture" id=2] +[ext_resource path="res://units/basic/avenger.png" type="Texture" id=2] [node name="avenger" instance=ExtResource( 1 )] sprite = ExtResource( 2 ) diff --git a/units/breeze.png b/units/basic/breeze.png similarity index 100% rename from units/breeze.png rename to units/basic/breeze.png diff --git a/units/breeze.png.import b/units/basic/breeze.png.import similarity index 71% rename from units/breeze.png.import rename to units/basic/breeze.png.import index 38b56fc..c9dc5c0 100644 --- a/units/breeze.png.import +++ b/units/basic/breeze.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/breeze.png-51b708eef4889210a47e43c23c1c0b34.stex" +path="res://.import/breeze.png-3e4bc40fc5f3e7babe61847fcbf3e1a3.stex" metadata={ "vram_texture": false } [deps] -source_file="res://units/breeze.png" -dest_files=[ "res://.import/breeze.png-51b708eef4889210a47e43c23c1c0b34.stex" ] +source_file="res://units/basic/breeze.png" +dest_files=[ "res://.import/breeze.png-3e4bc40fc5f3e7babe61847fcbf3e1a3.stex" ] [params] diff --git a/units/breeze.tscn b/units/basic/breeze.tscn similarity index 85% rename from units/breeze.tscn rename to units/basic/breeze.tscn index 2f5ba21..28e79bf 100644 --- a/units/breeze.tscn +++ b/units/basic/breeze.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://units/base_unit.tscn" type="PackedScene" id=1] -[ext_resource path="res://units/breeze.png" type="Texture" id=2] +[ext_resource path="res://units/basic/breeze.png" type="Texture" id=2] [node name="breeze" instance=ExtResource( 1 )] sprite = ExtResource( 2 ) diff --git a/units/commodore.png b/units/basic/commodore.png similarity index 100% rename from units/commodore.png rename to units/basic/commodore.png diff --git a/units/commodore.png.import b/units/basic/commodore.png.import similarity index 69% rename from units/commodore.png.import rename to units/basic/commodore.png.import index 912c471..8ea4b3a 100644 --- a/units/commodore.png.import +++ b/units/basic/commodore.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/commodore.png-309668d953db2def92c74e842e8de22e.stex" +path="res://.import/commodore.png-c71baf2b87219260d310da80f27d71c3.stex" metadata={ "vram_texture": false } [deps] -source_file="res://units/commodore.png" -dest_files=[ "res://.import/commodore.png-309668d953db2def92c74e842e8de22e.stex" ] +source_file="res://units/basic/commodore.png" +dest_files=[ "res://.import/commodore.png-c71baf2b87219260d310da80f27d71c3.stex" ] [params] diff --git a/units/commodore.tscn b/units/basic/commodore.tscn similarity index 84% rename from units/commodore.tscn rename to units/basic/commodore.tscn index 38e092f..b6ed9d1 100644 --- a/units/commodore.tscn +++ b/units/basic/commodore.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://units/base_unit.tscn" type="PackedScene" id=1] -[ext_resource path="res://units/commodore.png" type="Texture" id=2] +[ext_resource path="res://units/basic/commodore.png" type="Texture" id=2] [node name="commodore" instance=ExtResource( 1 )] sprite = ExtResource( 2 ) diff --git a/units/creeper.png b/units/basic/creeper.png similarity index 100% rename from units/creeper.png rename to units/basic/creeper.png diff --git a/units/creeper.png.import b/units/basic/creeper.png.import similarity index 71% rename from units/creeper.png.import rename to units/basic/creeper.png.import index 196ef8d..251190d 100644 --- a/units/creeper.png.import +++ b/units/basic/creeper.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/creeper.png-7243157a11730d7a85a5ddbef32e54aa.stex" +path="res://.import/creeper.png-c6660fbbdf75be8ab075895dec844d0a.stex" metadata={ "vram_texture": false } [deps] -source_file="res://units/creeper.png" -dest_files=[ "res://.import/creeper.png-7243157a11730d7a85a5ddbef32e54aa.stex" ] +source_file="res://units/basic/creeper.png" +dest_files=[ "res://.import/creeper.png-c6660fbbdf75be8ab075895dec844d0a.stex" ] [params] diff --git a/units/creeper.tscn b/units/basic/creeper.tscn similarity index 84% rename from units/creeper.tscn rename to units/basic/creeper.tscn index a9d4d9e..41a671b 100644 --- a/units/creeper.tscn +++ b/units/basic/creeper.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://units/base_unit.tscn" type="PackedScene" id=1] -[ext_resource path="res://units/creeper.png" type="Texture" id=2] +[ext_resource path="res://units/basic/creeper.png" type="Texture" id=2] [node name="creeper" instance=ExtResource( 1 )] sprite = ExtResource( 2 ) diff --git a/units/falcon.png b/units/basic/falcon.png similarity index 100% rename from units/falcon.png rename to units/basic/falcon.png diff --git a/units/falcon.png.import b/units/basic/falcon.png.import similarity index 71% rename from units/falcon.png.import rename to units/basic/falcon.png.import index d673438..4404e8c 100644 --- a/units/falcon.png.import +++ b/units/basic/falcon.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/falcon.png-a37cb90a2a263a68c1af0aead2c56a53.stex" +path="res://.import/falcon.png-1240b8e7e697b050c69bfe66f721109a.stex" metadata={ "vram_texture": false } [deps] -source_file="res://units/falcon.png" -dest_files=[ "res://.import/falcon.png-a37cb90a2a263a68c1af0aead2c56a53.stex" ] +source_file="res://units/basic/falcon.png" +dest_files=[ "res://.import/falcon.png-1240b8e7e697b050c69bfe66f721109a.stex" ] [params] diff --git a/units/falcon.tscn b/units/basic/falcon.tscn similarity index 57% rename from units/falcon.tscn rename to units/basic/falcon.tscn index b2ab2a2..97251c2 100644 --- a/units/falcon.tscn +++ b/units/basic/falcon.tscn @@ -1,15 +1,21 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://units/base_unit.tscn" type="PackedScene" id=1] +[ext_resource path="res://units/basic/falcon.png" type="Texture" id=2] [node name="falcon" instance=ExtResource( 1 )] +sprite = ExtResource( 2 ) base_move_points = 2 base_hull_points = 2 base_shield_points = 1 base_damage_points = 2 +[node name="sprite" parent="." index="0"] +texture = ExtResource( 2 ) + [node name="points" parent="." index="1"] move = 2 hull = 2 shield = 1 damage = 2 +enemy = true diff --git a/units/flea.png b/units/basic/flea.png similarity index 100% rename from units/flea.png rename to units/basic/flea.png diff --git a/units/flea.png.import b/units/basic/flea.png.import similarity index 71% rename from units/flea.png.import rename to units/basic/flea.png.import index 474a9fb..2fe2866 100644 --- a/units/flea.png.import +++ b/units/basic/flea.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/flea.png-1ef8cd01da711d2d64d018c24cc2bcbd.stex" +path="res://.import/flea.png-8846c718edb749fc0bb90a083e611d6d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://units/flea.png" -dest_files=[ "res://.import/flea.png-1ef8cd01da711d2d64d018c24cc2bcbd.stex" ] +source_file="res://units/basic/flea.png" +dest_files=[ "res://.import/flea.png-8846c718edb749fc0bb90a083e611d6d.stex" ] [params] diff --git a/units/flea.tscn b/units/basic/flea.tscn similarity index 85% rename from units/flea.tscn rename to units/basic/flea.tscn index 36bdb34..3aac7e6 100644 --- a/units/flea.tscn +++ b/units/basic/flea.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://units/base_unit.tscn" type="PackedScene" id=1] -[ext_resource path="res://units/flea.png" type="Texture" id=2] +[ext_resource path="res://units/basic/flea.png" type="Texture" id=2] [node name="flea" instance=ExtResource( 1 )] sprite = ExtResource( 2 ) diff --git a/units/jumper.png b/units/basic/jumper.png similarity index 100% rename from units/jumper.png rename to units/basic/jumper.png diff --git a/units/jumper.png.import b/units/basic/jumper.png.import similarity index 71% rename from units/jumper.png.import rename to units/basic/jumper.png.import index a7faa98..5bfc80c 100644 --- a/units/jumper.png.import +++ b/units/basic/jumper.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/jumper.png-393aa159bf8cb8acca1a340a25112080.stex" +path="res://.import/jumper.png-c3d351897ede8491c1d5147b9a65d425.stex" metadata={ "vram_texture": false } [deps] -source_file="res://units/jumper.png" -dest_files=[ "res://.import/jumper.png-393aa159bf8cb8acca1a340a25112080.stex" ] +source_file="res://units/basic/jumper.png" +dest_files=[ "res://.import/jumper.png-c3d351897ede8491c1d5147b9a65d425.stex" ] [params] diff --git a/units/jumper.tscn b/units/basic/jumper.tscn similarity index 85% rename from units/jumper.tscn rename to units/basic/jumper.tscn index f295736..95da8a9 100644 --- a/units/jumper.tscn +++ b/units/basic/jumper.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://units/base_unit.tscn" type="PackedScene" id=1] -[ext_resource path="res://units/jumper.png" type="Texture" id=2] +[ext_resource path="res://units/basic/jumper.png" type="Texture" id=2] [node name="jumper" instance=ExtResource( 1 )] sprite = ExtResource( 2 ) diff --git a/units/trapper.png b/units/basic/trapper.png similarity index 100% rename from units/trapper.png rename to units/basic/trapper.png diff --git a/units/trapper.png.import b/units/basic/trapper.png.import similarity index 71% rename from units/trapper.png.import rename to units/basic/trapper.png.import index 3b4d30e..c48e2b6 100644 --- a/units/trapper.png.import +++ b/units/basic/trapper.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/trapper.png-9257d6025ae78c0be8fcae80f8047320.stex" +path="res://.import/trapper.png-2bf1d62eabcf6ea917a74f39fa842cb4.stex" metadata={ "vram_texture": false } [deps] -source_file="res://units/trapper.png" -dest_files=[ "res://.import/trapper.png-9257d6025ae78c0be8fcae80f8047320.stex" ] +source_file="res://units/basic/trapper.png" +dest_files=[ "res://.import/trapper.png-2bf1d62eabcf6ea917a74f39fa842cb4.stex" ] [params] diff --git a/units/trapper.tscn b/units/basic/trapper.tscn similarity index 85% rename from units/trapper.tscn rename to units/basic/trapper.tscn index 3aa0bb7..9dd63c0 100644 --- a/units/trapper.tscn +++ b/units/basic/trapper.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://units/base_unit.tscn" type="PackedScene" id=1] -[ext_resource path="res://units/trapper.png" type="Texture" id=2] +[ext_resource path="res://units/basic/trapper.png" type="Texture" id=2] [node name="trapper" instance=ExtResource( 1 )] sprite = ExtResource( 2 ) diff --git a/units/xander.png b/units/basic/xander.png similarity index 100% rename from units/xander.png rename to units/basic/xander.png diff --git a/units/xander.png.import b/units/basic/xander.png.import similarity index 71% rename from units/xander.png.import rename to units/basic/xander.png.import index bc96330..19354da 100644 --- a/units/xander.png.import +++ b/units/basic/xander.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/xander.png-6d49d6ba9cc285330014dd8a8c2d2cff.stex" +path="res://.import/xander.png-b0ac5129ba77d93017a3d005640953bf.stex" metadata={ "vram_texture": false } [deps] -source_file="res://units/xander.png" -dest_files=[ "res://.import/xander.png-6d49d6ba9cc285330014dd8a8c2d2cff.stex" ] +source_file="res://units/basic/xander.png" +dest_files=[ "res://.import/xander.png-b0ac5129ba77d93017a3d005640953bf.stex" ] [params] diff --git a/units/xander.tscn b/units/basic/xander.tscn similarity index 85% rename from units/xander.tscn rename to units/basic/xander.tscn index 432ba21..8681e55 100644 --- a/units/xander.tscn +++ b/units/basic/xander.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://units/base_unit.tscn" type="PackedScene" id=1] -[ext_resource path="res://units/xander.png" type="Texture" id=2] +[ext_resource path="res://units/basic/xander.png" type="Texture" id=2] [node name="xander" instance=ExtResource( 1 )] sprite = ExtResource( 2 )