diff --git a/src/arcade/ArcadeGame.gd b/src/arcade/ArcadeGame.gd index a6ebab1..cf6ca01 100644 --- a/src/arcade/ArcadeGame.gd +++ b/src/arcade/ArcadeGame.gd @@ -15,9 +15,8 @@ var candies := [] func _ready(): map_ease.clock = map_ease.time - for i in Shared.get_all_children(map_node): - if i.is_in_group("solid_map"): - wrap_tiles(i) + + scene() func _physics_process(delta): if map_ease.is_less: diff --git a/src/arcade/maps/1.tscn b/src/arcade/maps/1.tscn index 1510407..87c4b09 100644 --- a/src/arcade/maps/1.tscn +++ b/src/arcade/maps/1.tscn @@ -39,7 +39,6 @@ points = PoolVector2Array( 100, 100, 0, 100, 0, 0, 100, 0 ) [node name="Map" type="Node2D"] [node name="Back" type="Polygon2D" parent="." groups=["back"]] -visible = false color = Color( 1, 0, 0, 0.407843 ) polygon = PoolVector2Array( 600, 600, -600, 600, -600, -600, 600, -600 ) script = ExtResource( 1 ) diff --git a/src/arcade/maps/2.tscn b/src/arcade/maps/2.tscn index fba48b4..c78dd24 100644 --- a/src/arcade/maps/2.tscn +++ b/src/arcade/maps/2.tscn @@ -39,7 +39,6 @@ points = PoolVector2Array( 100, 100, 0, 100, 0, 0, 100, 0 ) [node name="Map" type="Node2D"] [node name="Back" type="Polygon2D" parent="." groups=["back"]] -visible = false color = Color( 1, 0, 0, 0.407843 ) polygon = PoolVector2Array( 600, 600, -600, 600, -600, -600, 600, -600 ) script = ExtResource( 1 ) diff --git a/src/arcade/maps/2a.tscn b/src/arcade/maps/2a.tscn new file mode 100644 index 0000000..2b6d5f2 --- /dev/null +++ b/src/arcade/maps/2a.tscn @@ -0,0 +1,65 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://src/class/shape/Rectangle.gd" type="Script" id=1] +[ext_resource path="res://media/image/box/box-100.png" type="Texture" id=2] +[ext_resource path="res://src/arcade/Candy.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/arcade/ArcadePlayer.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=5] + +[sub_resource type="OccluderPolygon2D" id=5] +polygon = PoolVector2Array( 100, 100, 0, 100, 0, 0, 100, 0 ) + +[sub_resource type="ConvexPolygonShape2D" id=1] +points = PoolVector2Array( 100, 100, 0, 100, 0, 0, 100, 0 ) + +[sub_resource type="TileSet" id=2] +0/name = "rect-100.png 0" +0/texture = ExtResource( 2 ) +0/tex_offset = Vector2( 0, 0 ) +0/modulate = Color( 0, 0, 0, 0 ) +0/region = Rect2( 0, 0, 100, 100 ) +0/tile_mode = 0 +0/occluder_offset = Vector2( 0, 0 ) +0/occluder = SubResource( 5 ) +0/navigation_offset = Vector2( 0, 0 ) +0/shape_offset = Vector2( 0, 0 ) +0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +0/shape = SubResource( 1 ) +0/shape_one_way = false +0/shape_one_way_margin = 1.0 +0/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 1 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +0/z_index = 0 + +[node name="Map" type="Node2D"] + +[node name="Back" type="Polygon2D" parent="." groups=["back"]] +color = Color( 1, 0, 0, 0.407843 ) +polygon = PoolVector2Array( 600, 600, -600, 600, -600, -600, 600, -600 ) +script = ExtResource( 1 ) +size = Vector2( 600, 600 ) + +[node name="SolidTileMap" parent="." instance=ExtResource( 5 )] +tile_set = SubResource( 2 ) +tile_data = PoolIntArray( -196612, 0, 0, -196611, 0, 0, -196610, 0, 0, -131076, 0, 0, -131075, 0, 0, -131074, 0, 0, -196606, 0, 0, -196605, 0, 0, -65540, 0, 0, -65539, 0, 0, -65538, 0, 0, -131070, 0, 0, -131069, 0, 0, 65537, 0, 0, 65538, 0, 0, 65539, 0, 0, 65540, 0, 0, 196603, 0, 0, 196604, 0, 0, 131076, 0, 0, 262139, 0, 0, 262140, 0, 0, 196612, 0, 0, 262145, 0, 0, 262146, 0, 0, 262147, 0, 0, 262148, 0, 0 ) +detail = 6 + +[node name="Player" parent="." instance=ExtResource( 4 )] +position = Vector2( -400, 150 ) + +[node name="Candy" parent="." instance=ExtResource( 3 )] +position = Vector2( -300, -450 ) + +[node name="Candy2" parent="." instance=ExtResource( 3 )] +position = Vector2( 250, 350 ) + +[node name="Candy3" parent="." instance=ExtResource( 3 )] +position = Vector2( 350, 50 ) + +[node name="Candy4" parent="." instance=ExtResource( 3 )] +position = Vector2( 300, -350 ) diff --git a/src/arcade/maps/3.tscn b/src/arcade/maps/3.tscn index 2e97c2c..baab6c5 100644 --- a/src/arcade/maps/3.tscn +++ b/src/arcade/maps/3.tscn @@ -39,7 +39,6 @@ points = PoolVector2Array( 100, 100, 0, 100, 0, 0, 100, 0 ) [node name="Map" type="Node2D"] [node name="Back" type="Polygon2D" parent="." groups=["back"]] -visible = false color = Color( 1, 0, 0, 0.407843 ) polygon = PoolVector2Array( 600, 600, -600, 600, -600, -600, 600, -600 ) script = ExtResource( 1 ) diff --git a/src/arcade/maps/3a.tscn b/src/arcade/maps/3a.tscn new file mode 100644 index 0000000..29b2a81 --- /dev/null +++ b/src/arcade/maps/3a.tscn @@ -0,0 +1,68 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://src/class/shape/Rectangle.gd" type="Script" id=1] +[ext_resource path="res://media/image/box/box-100.png" type="Texture" id=2] +[ext_resource path="res://src/arcade/Candy.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/arcade/ArcadePlayer.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=5] + +[sub_resource type="OccluderPolygon2D" id=5] +polygon = PoolVector2Array( 100, 100, 0, 100, 0, 0, 100, 0 ) + +[sub_resource type="ConvexPolygonShape2D" id=1] +points = PoolVector2Array( 100, 100, 0, 100, 0, 0, 100, 0 ) + +[sub_resource type="TileSet" id=2] +0/name = "rect-100.png 0" +0/texture = ExtResource( 2 ) +0/tex_offset = Vector2( 0, 0 ) +0/modulate = Color( 0, 0, 0, 0 ) +0/region = Rect2( 0, 0, 100, 100 ) +0/tile_mode = 0 +0/occluder_offset = Vector2( 0, 0 ) +0/occluder = SubResource( 5 ) +0/navigation_offset = Vector2( 0, 0 ) +0/shape_offset = Vector2( 0, 0 ) +0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +0/shape = SubResource( 1 ) +0/shape_one_way = false +0/shape_one_way_margin = 1.0 +0/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 1 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +0/z_index = 0 + +[node name="Map" type="Node2D"] + +[node name="Back" type="Polygon2D" parent="." groups=["back"]] +color = Color( 1, 0, 0, 0.407843 ) +polygon = PoolVector2Array( 600, 600, -600, 600, -600, -600, 600, -600 ) +script = ExtResource( 1 ) +size = Vector2( 600, 600 ) + +[node name="SolidTileMap" parent="." instance=ExtResource( 5 )] +tile_set = SubResource( 2 ) +tile_data = PoolIntArray( -327685, 0, 0, -327684, 0, 0, -327683, 0, 0, -393214, 0, 0, -393213, 0, 0, -393212, 0, 0, -196610, 0, 0, -196609, 0, 0, -262144, 0, 0, -262143, 0, 0, -6, 0, 0, -5, 0, 0, -2, 0, 0, -1, 0, 0, -65536, 0, 0, -65535, 0, 0, -65532, 0, 0, -65531, 0, 0, 65530, 0, 0, 65531, 0, 0, 65534, 0, 0, 65535, 0, 0, 0, 0, 0, 1, 0, 0, 4, 0, 0, 5, 0, 0, 262142, 0, 0, 262143, 0, 0, 196608, 0, 0, 196609, 0, 0, 393211, 0, 0, 393212, 0, 0, 393213, 0, 0, 327682, 0, 0, 327683, 0, 0, 327684, 0, 0 ) +detail = 6 + +[node name="Player" parent="." instance=ExtResource( 4 )] +position = Vector2( 350, 450 ) + +[node name="Candy" parent="." instance=ExtResource( 3 )] +position = Vector2( -350, 450 ) + +[node name="Candy2" parent="." instance=ExtResource( 3 )] +position = Vector2( -50, 250 ) + +[node name="Candy3" parent="." instance=ExtResource( 3 )] +position = Vector2( 0, -150 ) + +[node name="Candy4" parent="." instance=ExtResource( 3 )] +position = Vector2( 100, -450 ) + +[node name="Candy5" parent="." instance=ExtResource( 3 )] +position = Vector2( 500, -150 )