diff --git a/maps/bug_teleporter.gd b/maps/bug_teleporter.gd index 7409bd5..3ecf5ca 100644 --- a/maps/bug_teleporter.gd +++ b/maps/bug_teleporter.gd @@ -3,4 +3,5 @@ extends Area2D func _on_Area2D_area_entered(area): - SceneManager.change_scene(load("res://menus/bug_world.tscn").instance()) + Audio.ac_music.stop() + Game.change_map(load("res://menus/bug_world.tscn")) diff --git a/maps/canopy.tscn b/maps/canopy.tscn index 09879da..ec7b098 100644 --- a/maps/canopy.tscn +++ b/maps/canopy.tscn @@ -31,7 +31,7 @@ [ext_resource path="res://maps/bug_teleporter.gd" type="Script" id=29] [sub_resource type="RectangleShape2D" id=2] -extents = Vector2( 8, 4 ) +extents = Vector2( 7.5, 20 ) [sub_resource type="RectangleShape2D" id=3] extents = Vector2( 224, 36 ) @@ -75,7 +75,7 @@ position = Vector2( 24, 176 ) position = Vector2( 752, 8 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D2"] -position = Vector2( 8, 4 ) +position = Vector2( 8.5, 20 ) shape = SubResource( 2 ) [node name="Area2D" type="Area2D" parent="."] diff --git a/menus/bug_world.gd b/menus/bug_world.gd new file mode 100644 index 0000000..451fe76 --- /dev/null +++ b/menus/bug_world.gd @@ -0,0 +1,5 @@ +extends Node2D + + +func _ready() -> void: + Fade.fade_in(Options.transition_speed_secs) diff --git a/menus/bug_world.tscn b/menus/bug_world.tscn index 289d8ae..989c808 100644 --- a/menus/bug_world.tscn +++ b/menus/bug_world.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=33 format=2] +[gd_scene load_steps=34 format=2] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=1] [ext_resource path="res://objects/hud/3d_text.tscn" type="PackedScene" id=2] @@ -10,6 +10,7 @@ [ext_resource path="res://graphics/player/wriggle.png" type="Texture" id=8] [ext_resource path="res://audio/music/BBBBBBBB.ogg" type="AudioStream" id=9] [ext_resource path="res://objects/enemy/antlion.tscn" type="PackedScene" id=10] +[ext_resource path="res://menus/bug_world.gd" type="Script" id=11] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) @@ -101,13 +102,13 @@ animations = [ { "speed": 15.0 } ] -[sub_resource type="DynamicFont" id=8] -font_data = ExtResource( 3 ) - [sub_resource type="SpatialMaterial" id=16] albedo_color = Color( 0.105882, 0.34902, 0.509804, 1 ) metallic = 0.46 +[sub_resource type="DynamicFont" id=8] +font_data = ExtResource( 3 ) + [sub_resource type="TextMesh" id=17] resource_local_to_scene = true material = SubResource( 16 ) @@ -117,6 +118,7 @@ pixel_size = 0.05 depth = 0.1 [node name="BugWorld" type="Node2D"] +script = ExtResource( 11 ) [node name="ColorRect" type="ColorRect" parent="."] material = SubResource( 1 ) @@ -132,7 +134,6 @@ texture = ExtResource( 8 ) position = Vector2( 89, 149 ) rotation = 0.785398 frames = SubResource( 24 ) -frame = 4 playing = true script = ExtResource( 5 ) speed = Vector2( 100, 100 ) @@ -142,7 +143,6 @@ position = Vector2( 78, 67 ) rotation = 0.785398 scale = Vector2( -1, 1 ) frames = SubResource( 24 ) -frame = 4 playing = true script = ExtResource( 5 ) speed = Vector2( -100, -100 ) @@ -151,7 +151,7 @@ speed = Vector2( -100, -100 ) position = Vector2( 181, 130 ) rotation = -0.785398 frames = SubResource( 24 ) -frame = 3 +frame = 5 playing = true script = ExtResource( 5 ) speed = Vector2( 100, -100 ) @@ -161,7 +161,7 @@ position = Vector2( 175, 22 ) rotation = 0.785398 scale = Vector2( -1, 1 ) frames = SubResource( 24 ) -frame = 3 +frame = 5 playing = true script = ExtResource( 5 ) speed = Vector2( -100, -100 ) @@ -169,17 +169,19 @@ speed = Vector2( -100, -100 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] position = Vector2( 192, 92 ) frames = SubResource( 35 ) +frame = 8 playing = true [node name="AnimatedSprite2" type="AnimatedSprite" parent="."] position = Vector2( 37, 107 ) frames = SubResource( 35 ) +frame = 8 playing = true [node name="AnimatedSprite3" type="AnimatedSprite" parent="."] position = Vector2( 222, 166 ) frames = SubResource( 35 ) -frame = 9 +frame = 7 playing = true [node name="DeathSplatter" parent="." instance=ExtResource( 6 )] @@ -196,6 +198,7 @@ scale_amount = 1.0 margin_top = -26.0 margin_right = 256.0 margin_bottom = 166.0 +text_material = SubResource( 16 ) anim = "bug world" [node name="TextMesh" parent="3DText/Viewport" index="0"]