Skip to content

Commit

Permalink
Level updates
Browse files Browse the repository at this point in the history
  • Loading branch information
oliver-ruehl committed Apr 15, 2017
1 parent 8a9a378 commit 5c9cbdf
Show file tree
Hide file tree
Showing 7 changed files with 97 additions and 46 deletions.
1 change: 0 additions & 1 deletion src/actors/enemies/soap_bubble/soap_bubble.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ trigger = false
visibility/blend_mode = 1
frames = SubResource( 2 )
animation = "default"
frame = 1
playing = true
modulate = Color( 1, 1, 1, 0.918033 )

Expand Down
46 changes: 39 additions & 7 deletions src/actors/enemies/sugarcubes_from_hell/sugarcubes_from_hell.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ points = Vector2Array( 18.4138, -16.5375, 20.5015, 1.67173, 9.71513, 10.7183, -3

[sub_resource type="SpriteFrames" id=2]

animations = [ { "frames":[ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 7 ) ], "loop":true, "name":"default", "speed":5.5 } ]
animations = [ {
"frames": [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 7 ) ],
"loop": true,
"name": "default",
"speed": 5.5
} ]

[sub_resource type="Animation" id=3]

Expand All @@ -28,22 +33,42 @@ tracks/0/type = "value"
tracks/0/path = NodePath("sprite:visibility/visible")
tracks/0/interp = 1
tracks/0/imported = false
tracks/0/keys = { "times":FloatArray( 0 ), "transitions":FloatArray( 1 ), "update":1, "values":[ false ] }
tracks/0/keys = {
"times": FloatArray( 0 ),
"transitions": FloatArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/1/type = "value"
tracks/1/path = NodePath(".:monitoring")
tracks/1/interp = 1
tracks/1/imported = false
tracks/1/keys = { "times":FloatArray( 0 ), "transitions":FloatArray( 1 ), "update":1, "values":[ false ] }
tracks/1/keys = {
"times": FloatArray( 0 ),
"transitions": FloatArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/2/type = "value"
tracks/2/path = NodePath(".:monitorable")
tracks/2/interp = 1
tracks/2/imported = false
tracks/2/keys = { "times":FloatArray( 0 ), "transitions":FloatArray( 1 ), "update":1, "values":[ false ] }
tracks/2/keys = {
"times": FloatArray( 0 ),
"transitions": FloatArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/3/type = "value"
tracks/3/path = NodePath("explosion_particle:config/emitting")
tracks/3/interp = 1
tracks/3/imported = false
tracks/3/keys = { "times":FloatArray( 0, 0.2 ), "transitions":FloatArray( 1, 1 ), "update":1, "values":[ true, false ] }
tracks/3/keys = {
"times": FloatArray( 0, 0.2 ),
"transitions": FloatArray( 1, 1 ),
"update": 1,
"values": [ true, false ]
}

[sub_resource type="Animation" id=4]

Expand All @@ -54,7 +79,12 @@ tracks/0/type = "value"
tracks/0/path = NodePath(".:extra_motion")
tracks/0/interp = 1
tracks/0/imported = false
tracks/0/keys = { "times":FloatArray( 0, 1 ), "transitions":FloatArray( -1.86607, -1.86607 ), "update":0, "values":[ Vector2( 0, -200 ), Vector2( 0, 200 ) ] }
tracks/0/keys = {
"times": FloatArray( 0, 1 ),
"transitions": FloatArray( -1.86607, -1.86607 ),
"update": 0,
"values": [ Vector2( 0, -200 ), Vector2( 0, 200 ) ]
}

[node name="sugarcube" type="Area2D"]

Expand All @@ -78,12 +108,13 @@ destroy_sound = "explode"
group = "enemy"
reset_bonus = true
shoot_interval = 1.2
health = 2

[node name="sprite" type="AnimatedSprite" parent="."]

frames = SubResource( 2 )
animation = "default"
frame = 5
frame = 2
playing = true

[node name="collision" type="CollisionPolygon2D" parent="."]
Expand Down Expand Up @@ -125,6 +156,7 @@ transform/rot = 21.1023
config/lifetime = 6.0
config/preprocess = 2.0
config/emitting = false
config/process_mode = 1

[connection signal="area_enter" from="." to="." method="_on_sugarcube_area_enter"]

Expand Down
1 change: 0 additions & 1 deletion src/actors/yan/yan.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ select_dialogbox = null

frames = SubResource( 2 )
animation = "default"
frame = 4
playing = true
__meta__ = {
"_edit_lock_": true
Expand Down
18 changes: 0 additions & 18 deletions src/levels/flyhome/flyhome.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -214,60 +214,49 @@ stream/volume_db = 2.0
[node name="sugarcube_0" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 1064.22, 57.0731 )
health = 2

[node name="sugarcube_1" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 1559, 160 )
health = 2

[node name="sugarcube_11" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 1511, 192 )
health = 2

[node name="sugarcube_12" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 1511, 128 )
health = 2

[node name="sugarcube_13" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 1551, 96 )
health = 2

[node name="sugarcube_14" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 1551, 224 )
health = 2

[node name="sugarcube_15" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 1551, 224 )
health = 2

[node name="sugarcube_2" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 1875.04, 69.971 )
health = 2

[node name="sugarcube_3" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 1873.81, 240.626 )
health = 2

[node name="sugarcube_4" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 2279, 168 )
motion = "zigzag"
health = 2

[node name="sugarcube_5" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 3177.96, 64.2795 )
transform/rot = 2.18057
motion = "zigzag"
health = 2

[node name="sugarcube_8" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

Expand All @@ -281,47 +270,40 @@ health = 8

transform/pos = Vector2( 2359, 232 )
motion = "zigzag"
health = 2

[node name="sugarcube_10" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 2359, 104 )
motion = "zigzag"
health = 2

[node name="sugarcube_6" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 3288.69, 150.402 )
transform/rot = 12.0878
motion = "zigzag"
health = 2

[node name="sugarcube_16" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 3247, 96 )
transform/scale = Vector2( 0.5, 0.5 )
motion = "zigzag"
health = 2

[node name="sugarcube_17" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 3343, 208 )
transform/rot = -9.75459
transform/scale = Vector2( 0.5, 0.5 )
motion = "zigzag"
health = 2

[node name="sugarcube_8 2" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 2359, 168 )
motion = "zigzag"
health = 2

[node name="sugarcube_7" parent="entities/enemies/sugarcubes" instance=ExtResource( 11 )]

transform/pos = Vector2( 3403.52, 254.98 )
motion = "zigzag"
health = 2

[node name="soap_bubbles" type="Node2D" parent="entities/enemies"]

Expand Down
17 changes: 7 additions & 10 deletions src/levels/forest/forest.tscn

Large diffs are not rendered by default.

57 changes: 49 additions & 8 deletions src/objects/rewards/random_coin.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,22 @@ tracks/0/type = "value"
tracks/0/path = NodePath("sprite:transform/pos")
tracks/0/interp = 1
tracks/0/imported = false
tracks/0/keys = { "times":FloatArray( 0, 2 ), "transitions":FloatArray( 0.25, 4 ), "update":0, "values":[ Vector2( 0.559145, -3.34028 ), Vector2( 0.559145, -13.3403 ) ] }
tracks/0/keys = {
"times": FloatArray( 0, 2 ),
"transitions": FloatArray( 0.25, 4 ),
"update": 0,
"values": [ Vector2( 0.559145, -3.34028 ), Vector2( 0.559145, -13.3403 ) ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("sprite:frame")
tracks/1/interp = 1
tracks/1/imported = false
tracks/1/keys = { "times":FloatArray( 0, 1, 2, 3 ), "transitions":FloatArray( 1, 1, 1, 1 ), "update":1, "values":[ 1, 2, 3, 3 ] }
tracks/1/keys = {
"times": FloatArray( 0, 1, 2, 3 ),
"transitions": FloatArray( 1, 1, 1, 1 ),
"update": 1,
"values": [ 1, 2, 3, 3 ]
}

[sub_resource type="Animation" id=2]

Expand All @@ -32,32 +42,62 @@ tracks/0/type = "value"
tracks/0/path = NodePath("sprite:frame")
tracks/0/interp = 1
tracks/0/imported = false
tracks/0/keys = { "times":FloatArray( 0 ), "transitions":FloatArray( 1 ), "update":0, "values":[ 0 ] }
tracks/0/keys = {
"times": FloatArray( 0 ),
"transitions": FloatArray( 1 ),
"update": 0,
"values": [ 0 ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("sprite:transform/pos")
tracks/1/interp = 1
tracks/1/imported = false
tracks/1/keys = { "times":FloatArray( 0, 4 ), "transitions":FloatArray( 1, 1 ), "update":0, "values":[ Vector2( 0.559145, -2.47515 ), Vector2( 0.559145, -12.4751 ) ] }
tracks/1/keys = {
"times": FloatArray( 0, 4 ),
"transitions": FloatArray( 1, 1 ),
"update": 0,
"values": [ Vector2( 0.559145, -2.47515 ), Vector2( 0.559145, -12.4751 ) ]
}
tracks/2/type = "value"
tracks/2/path = NodePath("sprite:visibility/self_opacity")
tracks/2/interp = 1
tracks/2/imported = false
tracks/2/keys = { "times":FloatArray( 0, 2.19, 3.98549 ), "transitions":FloatArray( 1, 1, 1 ), "update":0, "values":[ 1.0, 0.0, 0.0 ] }
tracks/2/keys = {
"times": FloatArray( 0, 2.19, 3.98549 ),
"transitions": FloatArray( 1, 1, 1 ),
"update": 0,
"values": [ 1.0, 0.0, 0.0 ]
}
tracks/3/type = "value"
tracks/3/path = NodePath("sprite:transform/rot")
tracks/3/interp = 1
tracks/3/imported = false
tracks/3/keys = { "times":FloatArray( 0, 3.98 ), "transitions":FloatArray( 1, 1 ), "update":0, "values":[ 0.0, -500.0 ] }
tracks/3/keys = {
"times": FloatArray( 0, 3.98 ),
"transitions": FloatArray( 1, 1 ),
"update": 0,
"values": [ 0.0, -500.0 ]
}
tracks/4/type = "value"
tracks/4/path = NodePath("sprite:transform/scale")
tracks/4/interp = 1
tracks/4/imported = false
tracks/4/keys = { "times":FloatArray( 0, 2.02 ), "transitions":FloatArray( 1, 1 ), "update":0, "values":[ Vector2( 1, 1 ), Vector2( 0.2, 0.2 ) ] }
tracks/4/keys = {
"times": FloatArray( 0, 2.02 ),
"transitions": FloatArray( 1, 1 ),
"update": 0,
"values": [ Vector2( 1, 1 ), Vector2( 0.2, 0.2 ) ]
}
tracks/5/type = "value"
tracks/5/path = NodePath("Particles2D:config/emitting")
tracks/5/interp = 1
tracks/5/imported = false
tracks/5/keys = { "times":FloatArray( 0, 0.0790673, 0.846486 ), "transitions":FloatArray( 1, 1, 1 ), "update":1, "values":[ false, true, false ] }
tracks/5/keys = {
"times": FloatArray( 0, 0.0790673, 0.846486 ),
"transitions": FloatArray( 1, 1, 1 ),
"update": 1,
"values": [ false, true, false ]
}

[sub_resource type="ColorRamp" id=3]

Expand Down Expand Up @@ -101,6 +141,7 @@ config/lifetime = 1.5
config/time_scale = 2.0
config/preprocess = 4.91377
config/emitting = false
config/process_mode = 1
config/half_extents = Vector2( 3, 3 )
config/explosiveness = 0.22
config/texture = ExtResource( 4 )
Expand Down
3 changes: 2 additions & 1 deletion src/scene_teleporter.gd
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ func _on_scene_teleporter_body_enter( body ):
print("You have the wing")
else:
print("Sorry, no wing")

body.set_process(false)
#find_node("teleporter_debug_label").set_text(scene_path)
if body.get_name() == "player":
var current = get_tree().get_current_scene().get_name()
global.last_pos[current[current.length()-1].to_int() - 3] = body.get_global_pos()
transition.fade_to(str(scene_path))

#transition.fade_to("res://" + scene_path)
#var tele1pos = get_node("/root/scn3/tele1/teleporter1").get_global_pos()
#var tele2pos = self.get_pos()
Expand Down

0 comments on commit 5c9cbdf

Please sign in to comment.