Compare commits

..

1 commit

Author SHA1 Message Date
Sagi Dayan 4b9d3a0b1b A bit more polish on lighing + started a level 2020-10-31 23:39:43 -04:00
7 changed files with 93 additions and 8 deletions

View file

@ -506,9 +506,18 @@ tracks/6/keys = {
}
[node name="Goblin" type="KinematicBody2D"]
light_mask = 2
collision_layer = 2147483650
collision_mask = 15
script = ExtResource( 2 )
num_of_hits = 3
walking_speed = 20.0
attack_cool_down = 0.1
patroler = true
idle_interval = 0.5
idle_time = 0.2
dont_fall_patrol = true
gravity = 500.0
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
visible = false

View file

@ -23,7 +23,6 @@ signal jumping
signal died
var _velocity: Vector2 = Vector2.ZERO
var _landing_position:Vector2 = Vector2.ZERO
var _is_wall_jumping := false
var _alive := true
var _can_dash := true

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=18 format=2]
[gd_scene load_steps=19 format=2]
[ext_resource path="res://src/Actors/DashParticles_right.tscn" type="PackedScene" id=1]
[ext_resource path="res://src/Actors/Player.gd" type="Script" id=2]
@ -410,6 +410,70 @@ tracks/4/keys = {
"values": [ true ]
}
[sub_resource type="Animation" id=12]
resource_name = "land"
length = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("Sprite:frame")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ 73 ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("Sprite:vframes")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ 13 ]
}
tracks/2/type = "value"
tracks/2/path = NodePath("Sprite:hframes")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ 8 ]
}
tracks/3/type = "value"
tracks/3/path = NodePath("Sprite:position")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ Vector2( 0, -8 ) ]
}
tracks/4/type = "value"
tracks/4/path = NodePath("Sprite/SordRange/CollisionShape2D:disabled")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}
[sub_resource type="Animation" id=9]
length = 0.1
tracks/0/type = "value"
@ -619,7 +683,7 @@ texture = ExtResource( 7 )
texture_scale = 3.07
color = Color( 0.87451, 0.976471, 0.984314, 1 )
range_height = -2048.0
range_item_cull_mask = 15
range_item_cull_mask = 7
shadow_enabled = true
shadow_item_cull_mask = 15
@ -629,7 +693,7 @@ position = Vector2( 0, -8 )
texture = ExtResource( 8 )
vframes = 13
hframes = 8
frame = 33
frame = 73
[node name="SordRange" type="Area2D" parent="Sprite"]
position = Vector2( -8, 8 )
@ -651,6 +715,7 @@ anims/die = SubResource( 5 )
anims/fall = SubResource( 6 )
anims/idle = SubResource( 7 )
anims/jump = SubResource( 8 )
anims/land = SubResource( 12 )
anims/pre_jump = SubResource( 9 )
anims/run = SubResource( 10 )
anims/wall_slide = SubResource( 11 )

View file

@ -1,4 +1,4 @@
extends Level
func _enter_tree() -> void:
func ready() -> void:
$AmbiantLighting.change_light("AREA1")

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=10 format=2]
[gd_scene load_steps=11 format=2]
[ext_resource path="res://src/GameWorld/Levels/Area1/Area11.gd" type="Script" id=1]
[ext_resource path="res://src/GameWorld/AmbiantLighting.tscn" type="PackedScene" id=2]
@ -9,6 +9,7 @@
[ext_resource path="res://src/Items/Torch.tscn" type="PackedScene" id=7]
[ext_resource path="res://src/Actors/Goblin.tscn" type="PackedScene" id=8]
[ext_resource path="res://src/Scripts/SpawnPoint.tscn" type="PackedScene" id=9]
[ext_resource path="res://src/Items/Coin.tscn" type="PackedScene" id=10]
[node name="Area11" type="Node2D"]
script = ExtResource( 1 )
@ -37,6 +38,15 @@ tile_data = PoolIntArray( 1310725, 0, 0, 1310726, 0, 0, 1310729, 0, 0, 1310730,
[node name="Coins" type="Node2D" parent="."]
[node name="Coin" parent="Coins" instance=ExtResource( 10 )]
position = Vector2( 89, 90 )
[node name="Coin2" parent="Coins" instance=ExtResource( 10 )]
position = Vector2( 89, 107 )
[node name="Coin3" parent="Coins" instance=ExtResource( 10 )]
position = Vector2( 128, 333 )
[node name="Tourches" type="Node2D" parent="."]
[node name="Torch" parent="Tourches" instance=ExtResource( 7 )]

View file

@ -225,6 +225,7 @@ frame = 2
texture = ExtResource( 4 )
texture_scale = 1.5
color = Color( 1, 0.976471, 0.878431, 1 )
range_item_cull_mask = 1025
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
visible = false

View file

@ -79,9 +79,10 @@ tracks/0/keys = {
[node name="Torch" type="Node2D"]
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
light_mask = 8
position = Vector2( 0, -12 )
frames = SubResource( 13 )
frame = 4
frame = 5
playing = true
[node name="Light2D" type="Light2D" parent="AnimatedSprite"]
@ -91,7 +92,7 @@ texture_scale = 5.285
color = Color( 0.945098, 0.419608, 0.160784, 1 )
range_item_cull_mask = 1033
shadow_enabled = true
shadow_item_cull_mask = 1033
shadow_item_cull_mask = 1038
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
autoplay = "halo"