Moved some files in folders

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]
 

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 )

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]
 

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"

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]
 

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 )

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]
 

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"

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]
 

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"

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]
 

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"

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]
 

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"

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]
 

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 )

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]
 

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 )

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 )

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
 

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"]
 

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"]
 

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 )

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

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]
 

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 )

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]
 

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 )

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]
 

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 )

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]
 

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 )

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]
 

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

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]
 

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 )

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]
 

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 )

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]
 

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 )

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]
 

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 )