From e09bc4c02eff07b5d27a1341dad42ff19671f429 Mon Sep 17 00:00:00 2001 From: Sagi Dayan Date: Sat, 28 Nov 2020 13:19:54 -0500 Subject: [PATCH] because --- assets/Tiles/SolidsTileMap.tscn | 2 +- src/GameWorld/GameWorld.gd | 4 +- src/GameWorld/Levels/Area1/Area12.tscn | 145 +++++++++++++++++++++---- src/Items/Torch.tscn | 2 +- src/Singletons/Stage.tscn | 2 + 5 files changed, 130 insertions(+), 25 deletions(-) diff --git a/assets/Tiles/SolidsTileMap.tscn b/assets/Tiles/SolidsTileMap.tscn index be6a5a0..bcba41f 100644 --- a/assets/Tiles/SolidsTileMap.tscn +++ b/assets/Tiles/SolidsTileMap.tscn @@ -233,9 +233,9 @@ points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) 0/z_index = 0 [node name="SolidsTileMap" type="TileMap"] +light_mask = 8 tile_set = SubResource( 35 ) cell_size = Vector2( 16, 16 ) collision_layer = 9 collision_mask = 0 -occluder_light_mask = 8 format = 1 diff --git a/src/GameWorld/GameWorld.gd b/src/GameWorld/GameWorld.gd index babd547..54a0bd5 100644 --- a/src/GameWorld/GameWorld.gd +++ b/src/GameWorld/GameWorld.gd @@ -23,7 +23,9 @@ var _level_resources := { var _levels = [ [_level_resources.pre_game, _level_resources.zones[1][0], _level_resources.zones[1][1]], ] - +# var _levels = [ +# [_level_resources.zones[1][1]], +# ] export var _current_zone_level: = Vector2(0,0) diff --git a/src/GameWorld/Levels/Area1/Area12.tscn b/src/GameWorld/Levels/Area1/Area12.tscn index 044e897..4be8132 100644 --- a/src/GameWorld/Levels/Area1/Area12.tscn +++ b/src/GameWorld/Levels/Area1/Area12.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=15 format=2] [ext_resource path="res://src/GameWorld/Levels/Area1/Area12.gd" type="Script" id=1] [ext_resource path="res://assets/Items/torch_ligt_texture.png" type="Texture" id=2] @@ -10,33 +10,89 @@ [ext_resource path="res://assets/Levels/Test/bg_0.png" type="Texture" id=12] [ext_resource path="res://assets/Tiles/FakeSolidsTileMap.tscn" type="PackedScene" id=19] -[sub_resource type="Animation" id=1] +[sub_resource type="Animation" id=2] resource_name = "idle" length = 10.0 loop = true tracks/0/type = "value" -tracks/0/path = NodePath("Light2D:energy") +tracks/0/path = NodePath(".:position") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 5 ), -"transitions": PoolRealArray( 1, 1 ), +"times": PoolRealArray( 0, 2.1, 4.1, 4.9, 5.1, 7.3, 8.6 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1 ), "update": 0, -"values": [ 1.69, 1.07 ] +"values": [ Vector2( -64.5, 30.75 ), Vector2( -50, 22.5 ), Vector2( -43.25, 29 ), Vector2( -36.5, 29.75 ), Vector2( -35.25, 16 ), Vector2( -50.75, 20.75 ), Vector2( -83.75, 22 ) ] } -tracks/1/type = "value" -tracks/1/path = NodePath("Light2D:position") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0, 5 ), -"transitions": PoolRealArray( 1, 1 ), + +[sub_resource type="Animation" id=3] +resource_name = "idle" +length = 10.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0.5, 1.4, 2.5, 3.9, 5.4, 7.1, 9 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1 ), "update": 0, -"values": [ Vector2( -27.75, 25 ), Vector2( -44.5, 26.5 ) ] +"values": [ Vector2( -50.75, 20.75 ), Vector2( -35.25, 16 ), Vector2( -64.5, 30.75 ), Vector2( -43.25, 29 ), Vector2( -36.5, 29.75 ), Vector2( -50, 22.5 ), Vector2( -83.75, 22 ) ] +} + +[sub_resource type="Animation" id=4] +resource_name = "idle" +length = 10.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 1.2, 2.9, 4.6, 4.9, 6.9, 8.3 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1 ), +"update": 0, +"values": [ Vector2( -64.5, 30.75 ), Vector2( -43.25, 29 ), Vector2( -50, 22.5 ), Vector2( -35.25, 16 ), Vector2( -36.5, 29.75 ), Vector2( -83.75, 22 ), Vector2( -50.75, 20.75 ) ] +} + +[sub_resource type="Animation" id=5] +resource_name = "idle" +length = 10.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 2.1, 4.1, 4.9, 5.1, 7.3, 8.6 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1 ), +"update": 0, +"values": [ Vector2( -64.5, 30.75 ), Vector2( -50, 22.5 ), Vector2( -43.25, 29 ), Vector2( -36.5, 29.75 ), Vector2( -35.25, 16 ), Vector2( -50.75, 20.75 ), Vector2( -83.75, 22 ) ] +} + +[sub_resource type="Animation" id=6] +resource_name = "idle" +length = 10.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 2.1, 4.1, 4.9, 5.1, 7.3, 8.6 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1 ), +"update": 0, +"values": [ Vector2( -64.5, 30.75 ), Vector2( -50, 22.5 ), Vector2( -43.25, 29 ), Vector2( -36.5, 29.75 ), Vector2( -35.25, 16 ), Vector2( -50.75, 20.75 ), Vector2( -83.75, 22 ) ] } [node name="Area12" type="Node2D"] @@ -63,16 +119,61 @@ scale = Vector2( 2, 2 ) texture = ExtResource( 12 ) [node name="Light2D" type="Light2D" parent="BG/Sprite"] -position = Vector2( -29.425, 25.15 ) +position = Vector2( -83.75, 22 ) texture = ExtResource( 2 ) -texture_scale = 5.0 -color = Color( 0.227451, 0.419608, 1, 1 ) -energy = 1.628 +texture_scale = 0.05 +energy = 5.0 range_item_cull_mask = 2048 -[node name="AnimationPlayer" type="AnimationPlayer" parent="BG/Sprite"] +[node name="AnimationPlayer" type="AnimationPlayer" parent="BG/Sprite/Light2D"] autoplay = "idle" -anims/idle = SubResource( 1 ) +anims/idle = SubResource( 2 ) + +[node name="Light2D2" type="Light2D" parent="BG/Sprite"] +position = Vector2( -83.75, 22 ) +texture = ExtResource( 2 ) +texture_scale = 0.05 +energy = 5.0 +range_item_cull_mask = 2048 + +[node name="AnimationPlayer" type="AnimationPlayer" parent="BG/Sprite/Light2D2"] +autoplay = "idle" +anims/idle = SubResource( 3 ) + +[node name="Light2D3" type="Light2D" parent="BG/Sprite"] +position = Vector2( -53.1765, 22.5147 ) +texture = ExtResource( 2 ) +texture_scale = 0.05 +energy = 5.0 +range_item_cull_mask = 2048 + +[node name="AnimationPlayer" type="AnimationPlayer" parent="BG/Sprite/Light2D3"] +autoplay = "idle" +anims/idle = SubResource( 4 ) + +[node name="Light2D4" type="Light2D" parent="BG/Sprite"] +visible = false +position = Vector2( -83.75, 22 ) +texture = ExtResource( 2 ) +texture_scale = 0.05 +energy = 5.0 +range_item_cull_mask = 2048 + +[node name="AnimationPlayer" type="AnimationPlayer" parent="BG/Sprite/Light2D4"] +autoplay = "idle" +anims/idle = SubResource( 5 ) + +[node name="Light2D5" type="Light2D" parent="BG/Sprite"] +visible = false +position = Vector2( -83.75, 22 ) +texture = ExtResource( 2 ) +texture_scale = 0.05 +energy = 5.0 +range_item_cull_mask = 2048 + +[node name="AnimationPlayer" type="AnimationPlayer" parent="BG/Sprite/Light2D5"] +autoplay = "idle" +anims/idle = SubResource( 6 ) [node name="Sprite2" type="Sprite" parent="BG"] modulate = Color( 0.266667, 0.360784, 0.411765, 1 ) diff --git a/src/Items/Torch.tscn b/src/Items/Torch.tscn index 01b1d04..1cc8f75 100644 --- a/src/Items/Torch.tscn +++ b/src/Items/Torch.tscn @@ -82,7 +82,7 @@ tracks/0/keys = { light_mask = 8 position = Vector2( 0, -12 ) frames = SubResource( 13 ) -frame = 11 +frame = 3 playing = true [node name="Light2D" type="Light2D" parent="AnimatedSprite"] diff --git a/src/Singletons/Stage.tscn b/src/Singletons/Stage.tscn index 7fb7336..1e23913 100644 --- a/src/Singletons/Stage.tscn +++ b/src/Singletons/Stage.tscn @@ -3,11 +3,13 @@ [ext_resource path="res://src/Singletons/Stage.gd" type="Script" id=1] [node name="Stage" type="CanvasLayer"] +layer = 0 script = ExtResource( 1 ) [node name="Tween" type="Tween" parent="."] [node name="ColorRect" type="ColorRect" parent="."] +light_mask = 8 anchor_right = 1.0 anchor_bottom = 1.0 color = Color( 0, 0, 0, 1 )