diff --git a/engine.cfg b/engine.cfg index da93434..e6d936f 100644 --- a/engine.cfg +++ b/engine.cfg @@ -7,8 +7,12 @@ icon="res://art/rocket.png" [display] -width=1920 -height=1080 +width=800 +height=600 +fullscreen=false +stretch_mode="viewport" +stretch_aspect="ignore" +resizable=true [input] diff --git a/game/earth/Earth.tscn b/game/earth/Earth.tscn index 34ac78d..30f9373 100644 --- a/game/earth/Earth.tscn +++ b/game/earth/Earth.tscn @@ -5,12 +5,12 @@ [sub_resource type="CircleShape2D" id=1] custom_solver_bias = 0.0 -radius = 200.0 +radius = 80.0 [sub_resource type="CircleShape2D" id=2] custom_solver_bias = 0.0 -radius = 800.0 +radius = 300.0 [node name="Earth" type="KinematicBody2D"] @@ -27,7 +27,7 @@ __meta__ = { [node name="Sprite" type="Sprite" parent="."] -transform/scale = Vector2( 0.5, 0.5 ) +transform/scale = Vector2( 0.2, 0.2 ) texture = ExtResource( 1 ) [node name="EarthCollision" type="CollisionShape2D" parent="."] diff --git a/game/earth/EarthArea.tscn b/game/earth/EarthArea.tscn index 888ce62..752e998 100644 --- a/game/earth/EarthArea.tscn +++ b/game/earth/EarthArea.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=1] -[ext_resource path="res://eartharea.gd" type="Script" id=1] +[ext_resource path="res://game/earth/eartharea.gd" type="Script" id=1] [sub_resource type="CircleShape2D" id=1] diff --git a/game/gui/menu/Menu.tscn b/game/gui/menu/Menu.tscn index 4f95d6a..a63a243 100644 --- a/game/gui/menu/Menu.tscn +++ b/game/gui/menu/Menu.tscn @@ -3,9 +3,9 @@ [ext_resource path="res://art/starfield.jpg" type="Texture" id=1] [ext_resource path="res://game/gui/menu/Menu.gd" type="Script" id=2] [ext_resource path="res://fonts/computerspeakfont.fnt" type="BitmapFont" id=3] -[ext_resource path="res://art/rocket.png" type="Texture" id=4] -[ext_resource path="res://art/1311069131-800px.png" type="Texture" id=5] -[ext_resource path="res://art/Earth-800px.png" type="Texture" id=6] +[ext_resource path="res://art/Earth-800px.png" type="Texture" id=4] +[ext_resource path="res://art/rocket.png" type="Texture" id=5] +[ext_resource path="res://art/1311069131-800px.png" type="Texture" id=6] [sub_resource type="Animation" id=1] @@ -18,18 +18,18 @@ tracks/0/path = NodePath(".:transform/pos") tracks/0/interp = 1 tracks/0/imported = false tracks/0/keys = { -"times": FloatArray( 0, 10 ), -"transitions": FloatArray( 1, 1 ), +"times": FloatArray( -0.8, 0, 10 ), +"transitions": FloatArray( 1, 1, 1 ), "update": 0, -"values": [ Vector2( -170.357, 855.319 ), Vector2( 2050, 855.319 ) ] +"values": [ Vector2( -140.47, 493.711 ), Vector2( -270.814, 493.711 ), Vector2( 977.99, 489.507 ) ] } [node name="MenuButtonsVbox" type="Node2D"] [node name="SpaceBG" type="Sprite" parent="."] -transform/pos = Vector2( 955.795, 531.653 ) -transform/scale = Vector2( 1.94871, 1.12392 ) +transform/pos = Vector2( 400, 300 ) +transform/scale = Vector2( 0.8, 0.8 ) texture = ExtResource( 1 ) [node name="VButtonArray" type="VBoxContainer" parent="."] @@ -38,10 +38,10 @@ focus/ignore_mouse = false focus/stop_mouse = true size_flags/horizontal = 2 size_flags/vertical = 2 -margin/left = 547.0 -margin/top = 450.0 -margin/right = 1322.0 -margin/bottom = 942.0 +margin/left = 200.0 +margin/top = 200.0 +margin/right = 600.0 +margin/bottom = 500.0 alignment = 0 script/script = ExtResource( 2 ) @@ -54,8 +54,8 @@ size_flags/vertical = 3 size_flags/stretch_ratio = 5.0 margin/left = 0.0 margin/top = 0.0 -margin/right = 775.0 -margin/bottom = 161.0 +margin/right = 400.0 +margin/bottom = 97.0 custom_fonts/font = ExtResource( 3 ) toggle_mode = false click_on_press = true @@ -73,9 +73,9 @@ size_flags/horizontal = 2 size_flags/vertical = 3 size_flags/stretch_ratio = 5.0 margin/left = 0.0 -margin/top = 165.0 -margin/right = 775.0 -margin/bottom = 326.0 +margin/top = 101.0 +margin/right = 400.0 +margin/bottom = 198.0 custom_fonts/font = ExtResource( 3 ) toggle_mode = false click_on_press = true @@ -93,9 +93,9 @@ size_flags/horizontal = 2 size_flags/vertical = 3 size_flags/stretch_ratio = 5.0 margin/left = 0.0 -margin/top = 330.0 -margin/right = 775.0 -margin/bottom = 492.0 +margin/top = 202.0 +margin/right = 400.0 +margin/bottom = 300.0 custom_fonts/font = ExtResource( 3 ) toggle_mode = false click_on_press = true @@ -105,12 +105,18 @@ text = "Quit" flat = true items = [ ] +[node name="Earth" type="Sprite" parent="."] + +transform/pos = Vector2( 104.066, 471.499 ) +transform/scale = Vector2( 0.385749, 0.385749 ) +texture = ExtResource( 4 ) + [node name="RocketSprite" type="Sprite" parent="."] -transform/pos = Vector2( -170.357, 855.319 ) +transform/pos = Vector2( -270.814, 493.711 ) transform/rot = -90.0 transform/scale = Vector2( 0.3, 0.3 ) -texture = ExtResource( 4 ) +texture = ExtResource( 5 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="RocketSprite"] @@ -125,15 +131,15 @@ autoplay = "move" [node name="Label" type="Label" parent="."] -rect/scale = Vector2( 10, 10 ) +rect/scale = Vector2( 5, 5 ) focus/ignore_mouse = true focus/stop_mouse = true size_flags/horizontal = 2 size_flags/vertical = 0 -margin/left = 298.0 -margin/top = 165.0 -margin/right = 436.0 -margin/bottom = 179.0 +margin/left = 50.0 +margin/top = 30.0 +margin/right = 188.0 +margin/bottom = 44.0 text = "Monero Moon Launch" percent_visible = 1.0 lines_skipped = 0 @@ -141,14 +147,8 @@ max_lines_visible = -1 [node name="Moon" type="Sprite" parent="."] -transform/pos = Vector2( 1752.97, 778.702 ) -transform/scale = Vector2( 0.385749, 0.385749 ) -texture = ExtResource( 5 ) - -[node name="Earth" type="Sprite" parent="."] - -transform/pos = Vector2( 105.917, 976.718 ) -transform/scale = Vector2( 0.385749, 0.385749 ) +transform/pos = Vector2( 765.781, 384.52 ) +transform/scale = Vector2( 0.2, 0.2 ) texture = ExtResource( 6 ) [connection signal="pressed" from="VButtonArray/PlayButton" to="VButtonArray" method="_on_PlayButton_pressed"] diff --git a/game/levels/1/Level1.tscn b/game/levels/1/Level1.tscn index eeeaefb..7756b2c 100644 --- a/game/levels/1/Level1.tscn +++ b/game/levels/1/Level1.tscn @@ -80,21 +80,21 @@ motion/mirroring = Vector2( 0, 0 ) [node name="Sun" type="Sprite" parent="ParallaxBackground/SunParallax"] -transform/pos = Vector2( 581.094, 214.012 ) +transform/pos = Vector2( 550.787, 1053.52 ) transform/scale = Vector2( 0.181912, 0.181912 ) texture = ExtResource( 4 ) [node name="Earth" parent="." instance=ExtResource( 5 )] -transform/pos = Vector2( 211.028, 755.178 ) +transform/pos = Vector2( 118.524, 868.706 ) [node name="Rocket" parent="." instance=ExtResource( 6 )] -transform/pos = Vector2( 433.782, 663.086 ) +transform/pos = Vector2( 213.8, 843.193 ) transform/rot = 290.0 [node name="Moon" parent="." instance=ExtResource( 7 )] -transform/pos = Vector2( 1138.31, 163.589 ) +transform/pos = Vector2( 507.748, 533.687 ) diff --git a/game/moon/Moon.tscn b/game/moon/Moon.tscn index 0ac7936..214d097 100644 --- a/game/moon/Moon.tscn +++ b/game/moon/Moon.tscn @@ -6,12 +6,12 @@ [sub_resource type="CircleShape2D" id=1] custom_solver_bias = 0.0 -radius = 80.0 +radius = 40.0 [sub_resource type="CircleShape2D" id=2] custom_solver_bias = 0.0 -radius = 300.0 +radius = 100.0 [node name="Moon" type="KinematicBody2D"] @@ -26,7 +26,7 @@ script/script = ExtResource( 1 ) [node name="Sprite" type="Sprite" parent="."] -transform/scale = Vector2( 0.2, 0.2 ) +transform/scale = Vector2( 0.1, 0.1 ) texture = ExtResource( 2 ) [node name="MoonCollision" type="CollisionShape2D" parent="."] diff --git a/game/rocket/Rocket.tscn b/game/rocket/Rocket.tscn index a5e6f06..42ddb21 100644 --- a/game/rocket/Rocket.tscn +++ b/game/rocket/Rocket.tscn @@ -6,10 +6,10 @@ [ext_resource path="res://art/skull.png" type="Texture" id=4] [ext_resource path="res://art/explosjon3.png" type="Texture" id=5] -[sub_resource type="ConvexPolygonShape2D" id=1] +[sub_resource type="ConvexPolygonShape2D" id=7] custom_solver_bias = 0.0 -points = Vector2Array( -11.3815, 0.727529, -10.5982, -4.33918, -6.21178, -8.37972, -0.572069, -11.1376, 5.06765, -8.76453, 9.76742, -4.9164, 10.7074, 0.535122, 6.12636, 10.0797, -6.34531, 10.0372 ) +points = Vector2Array( -4.89815, 0.875571, -5.36714, -2.00446, -3.67879, -4.03967, -0.302076, -5.69089, 2.23045, -4.30848, 4.01261, -2.27326, 4.2002, 0.721969, 2.69944, 4.4852, -3.39739, 4.4852 ) [sub_resource type="ColorRamp" id=2] @@ -33,20 +33,20 @@ tracks/0/keys = { "values": [ 0, 13 ] } -[sub_resource type="ConvexPolygonShape2D" id=4] - -custom_solver_bias = 0.0 -points = Vector2Array( -0.383606, -41.7704, 7.97868, -32.9347, 17.1299, -17.7879, 18.3921, 2.72333, 11.7654, 32.3858, -12.0592, 32.7013, -18.8438, 2.72333, -15.8459, -16.0524, -10.0081, -29.4636 ) - [sub_resource type="ConvexPolygonShape2D" id=5] custom_solver_bias = 0.0 -points = Vector2Array( 8.6098, 32.5436, 10.5032, 39.3281, -10.6392, 39.3281, -8.43033, 32.5436 ) +points = Vector2Array( 0.1129, -20.6224, 5.52394, -13.5026, 8.51425, -3.81968, 7.94466, 4.43927, 4.45329, 13.0309, -4.87095, 12.983, -7.51745, 4.61906, -8.57324, -4.38927, -5.57625, -13.4988 ) + +[sub_resource type="ConvexPolygonShape2D" id=6] + +custom_solver_bias = 0.0 +points = Vector2Array( 3.80623, 13.3545, 4.77682, 19.1781, -4.72856, 19.2484, -3.63505, 13.3545 ) [node name="Rocket" type="RigidBody2D"] input/pickable = false -shapes/0/shape = SubResource( 1 ) +shapes/0/shape = SubResource( 7 ) shapes/0/transform = Matrix32( 1.51812, 0, 0, 3.70819, 0.571488, 1.47728 ) shapes/0/trigger = false collision/layers = 1 @@ -76,7 +76,7 @@ __meta__ = { config/amount = 200 config/lifetime = 1.2 config/process_mode = 1 -config/offset = Vector2( 0, 20 ) +config/offset = Vector2( 0, 10 ) params/direction = 0.0 params/spread = 30.0 params/linear_velocity = 45.0 @@ -89,7 +89,7 @@ params/tangential_accel = 0.0 params/damping = 0.0 params/initial_angle = 0.0 params/initial_size = 1.0 -params/final_size = 1.03 +params/final_size = 1.17 params/hue_variation = 2.0 params/anim_speed_scale = 1.0 params/anim_initial_pos = 0.0 @@ -98,7 +98,7 @@ color/color_ramp = SubResource( 2 ) [node name="RocketSprite" type="Sprite" parent="."] -transform/scale = Vector2( 0.1, 0.1 ) +transform/scale = Vector2( 0.05, 0.05 ) texture = ExtResource( 2 ) [node name="ShipCollision" type="CollisionPolygon2D" parent="."] @@ -107,7 +107,7 @@ visibility/visible = false transform/pos = Vector2( 0.571488, 1.47728 ) transform/scale = Vector2( 1.51812, 3.70819 ) build_mode = 0 -polygon = Vector2Array( -11.3815, 0.727529, -10.5982, -4.33918, -6.21178, -8.37972, -0.572069, -11.1376, 5.06765, -8.76453, 9.76742, -4.9164, 10.7074, 0.535122, 6.12636, 10.0797, -6.34531, 10.0372 ) +polygon = Vector2Array( -4.89815, 0.875571, -5.36714, -2.00446, -3.67879, -4.03967, -0.302076, -5.69089, 2.23045, -4.30848, 4.01261, -2.27326, 4.2002, 0.721969, 2.69944, 4.4852, -3.39739, 4.4852 ) shape_range = Vector2( 0, 0 ) trigger = false @@ -148,11 +148,13 @@ max_lines_visible = -1 [node name="SkullSprite" type="Sprite" parent="."] +visibility/visible = false transform/scale = Vector2( 0.1, 0.1 ) texture = ExtResource( 4 ) [node name="ExplosionSprite" type="Sprite" parent="."] +visibility/visible = false texture = ExtResource( 5 ) vframes = 4 hframes = 4 @@ -171,7 +173,7 @@ autoplay = "" [node name="ShipArea" type="Area2D" parent="."] input/pickable = true -shapes/0/shape = SubResource( 4 ) +shapes/0/shape = SubResource( 5 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 0 ) shapes/0/trigger = false gravity_vec = Vector2( 0, 1 ) @@ -182,14 +184,14 @@ angular_damp = 1.0 [node name="ShipAreaCollision" type="CollisionPolygon2D" parent="ShipArea"] build_mode = 0 -polygon = Vector2Array( -10.0081, -29.4636, -15.8459, -16.0524, -18.8438, 2.72333, -12.0592, 32.7013, 11.7654, 32.3858, 18.3921, 2.72333, 17.1299, -17.7879, 7.97868, -32.9347, -0.383606, -41.7704 ) +polygon = Vector2Array( -5.57625, -13.4988, -8.57324, -4.38927, -7.51745, 4.61906, -4.87095, 12.983, 4.45329, 13.0309, 7.94466, 4.43927, 8.51425, -3.81968, 5.52394, -13.5026, 0.1129, -20.6224 ) shape_range = Vector2( 0, 0 ) trigger = false [node name="FootArea" type="Area2D" parent="."] input/pickable = true -shapes/0/shape = SubResource( 5 ) +shapes/0/shape = SubResource( 6 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 0 ) shapes/0/trigger = false gravity_vec = Vector2( 0, 1 ) @@ -200,7 +202,7 @@ angular_damp = 1.0 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="FootArea"] build_mode = 0 -polygon = Vector2Array( -8.43033, 32.5436, -10.6392, 39.3281, 10.5032, 39.3281, 8.6098, 32.5436 ) +polygon = Vector2Array( -3.63505, 13.3545, -4.72856, 19.2484, 4.77682, 19.1781, 3.80623, 13.3545 ) shape_range = Vector2( 0, 0 ) trigger = false diff --git a/game/rocket/rocket.gd b/game/rocket/rocket.gd index 112934f..f07de42 100644 --- a/game/rocket/rocket.gd +++ b/game/rocket/rocket.gd @@ -1,7 +1,7 @@ extends RigidBody2D -var thrust = Vector2(0, 450) -var torque = 20000 +var thrust = Vector2(0, 350) +var torque = 5000 var shipoverlaps var footoverlaps var deathtimer @@ -37,12 +37,15 @@ func _process(delta): shipoverlaps = get_node("ShipArea").get_overlapping_bodies() footoverlaps = get_node("FootArea").get_overlapping_bodies() if (shipoverlaps.size() > 1): + print("Ship overlaps") get_node("SkullSprite").show() get_node("RocketSprite").hide() death() else: get_node("SkullSprite").hide() for i in footoverlaps: + if (get_linear_velocity().length() > 30 and i.get_name() != "Rocket"): + death() if(i.get_name() == "Moon"): get_node("SkullSprite").show()