diff options
| -rw-r--r-- | godot/scenes/Die.gd | 25 | ||||
| -rw-r--r-- | godot/scenes/Die.tscn | 48 | ||||
| -rw-r--r-- | godot/scenes/Game.gd | 1 | ||||
| -rw-r--r-- | godot/scenes/levels/level1/level1.tscn | 18 | ||||
| -rw-r--r-- | godot/scenes/objects/GroundCollision.tscn | 11 |
5 files changed, 50 insertions, 53 deletions
diff --git a/godot/scenes/Die.gd b/godot/scenes/Die.gd index 558af14..f7d51d5 100644 --- a/godot/scenes/Die.gd +++ b/godot/scenes/Die.gd @@ -24,6 +24,14 @@ var previous_bounciness = 0 var _game: Game = null +enum buff { + none, + stroke, + bounce, + phase, + ball +} + # Called when the node enters the scene tree for the first time. func _ready(): Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) @@ -92,11 +100,9 @@ func _physics_process(delta): if dice_is_moving == true and angular_velocity.length() < 0.01 and linear_velocity.length() < 0.01: dice_is_moving = false - get_upwards_side() + get_buff_from_upwards_side() elif dice_is_moving == false and angular_velocity.length() >= 0.01 and linear_velocity.length() >= 0.01: dice_is_moving = true - - # Called every frame. 'delta' is the elapsed time since the previous frame. @@ -108,8 +114,17 @@ func _physics_process(delta): BUFFS """ -func get_upwards_side(): - return 0 +func get_buff_from_upwards_side(): + if $Plus1.get_overlapping_areas().size() > 0 || $Plus2.get_overlapping_areas().size() > 0: + return buff.stroke + if $Ball1.get_overlapping_areas().size() > 0 || $Ball2.get_overlapping_areas().size() > 0: + return buff.ball + if $Bounce1.get_overlapping_areas().size() > 0 || $Bounce2.get_overlapping_areas().size() > 0: + return buff.bounce + if $Phase1.get_overlapping_areas().size() > 0 || $Phase2.get_overlapping_areas().size() > 0: + return buff.phase + + return buff.none func extra_stroke(): diff --git a/godot/scenes/Die.tscn b/godot/scenes/Die.tscn index 89e6059..2887ddc 100644 --- a/godot/scenes/Die.tscn +++ b/godot/scenes/Die.tscn @@ -1,13 +1,8 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://scenes/Die.gd" type="Script" id=1] [ext_resource path="res://assets/game_objects/W8baseColor_Mat.material" type="Material" id=2] -[sub_resource type="PhysicsMaterial" id=3] - -[sub_resource type="ConvexPolygonShape" id=2] -points = PoolVector3Array( -0.0850063, -0.879389, -0.0282584, 0.0288993, 0.929375, 0.0289349, 0.0288993, 0.929375, -0.0289349, 0.929367, -0.0289314, 0.0289314, -0.0289784, -0.0289338, 0.929338, -0.929369, 0.028929, 0.028929, 0.0288993, -0.0289349, -0.929375, 0.0288993, -0.929375, 0.0289349, -0.0850063, 0.0282584, -0.879389, 0.0282247, 0.084959, 0.87945, 0.857489, 0.056933, -0.0855785, -0.879454, -0.0849424, 0.0282549, 0.0570775, -0.885814, -0.0571088, 0.0570775, -0.0571088, 0.885814, -0.0571532, 0.885743, -0.0571043, -0.0571532, 0.885743, 0.0571043, 0.0570775, 0.0571088, -0.885814, -0.885806, -0.057097, -0.057097, 0.879446, 0.0849494, 0.0282572, 0.857335, -0.0571018, -0.0855632, -0.0571532, 0.0571043, 0.885743, -0.0571532, -0.885743, 0.0571043, -0.885806, 0.057097, -0.057097, -0.0571532, -0.0571043, -0.885743, 0.0570775, 0.0571088, 0.885814, -0.0571532, -0.885743, -0.0571043, -0.0571532, 0.0571043, -0.885743, 0.0570775, -0.885814, 0.0571088, 0.0570775, 0.885814, 0.0571088, -0.0571532, -0.0571043, 0.885743, -0.885806, 0.057097, 0.057097, 0.0570775, 0.885814, -0.0571088, 0.0570775, -0.0571088, -0.885814, 0.857335, -0.0571018, 0.0855632, -0.885806, -0.057097, 0.057097, 0.857489, 0.056933, 0.0855785, 0.929425, 0.0287513, -0.0289333, 0.929367, -0.0289314, -0.0289314, -0.0289784, 0.929338, -0.0289338, 0.0288993, 0.0289349, -0.929375, -0.929369, -0.028929, -0.028929, -0.0283039, -0.87942, -0.0849561, 0.084933, 0.0282608, 0.879461, -0.0289784, 0.929338, 0.0289338, -0.0289784, -0.0289338, -0.929338, -0.0289784, 0.0289338, 0.929338, 0.0288993, -0.0289349, 0.929375, 0.0288993, -0.929375, -0.0289349, -0.0289784, -0.929338, 0.0289338, -0.929369, 0.028929, -0.028929, -0.0283039, 0.0849561, -0.87942, -0.879454, -0.0282549, 0.0849424, 0.879512, 0.0280816, 0.0849558, 0.879446, -0.0849494, -0.0282572, -0.0282988, -0.822574, 0.141805, 0.17021, 0.0280745, -0.794261, -0.879454, 0.0849424, -0.0282549, -0.0283039, 0.87942, 0.0849561, 0.0282247, 0.87945, -0.084959, 0.0282247, -0.084959, -0.87945, -0.879454, -0.0282549, -0.0849424, -0.0850063, 0.0282584, 0.879389, -0.0850063, 0.879389, 0.0282584, 0.084933, -0.0282608, 0.879461 ) - [sub_resource type="ArrayMesh" id=1] resource_name = "W8_Cone" surfaces/0 = { @@ -23,35 +18,21 @@ surfaces/0 = { "vertex_count": 68 } -[sub_resource type="SphereShape" id=4] - -[sub_resource type="SphereMesh" id=5] +[sub_resource type="ConvexPolygonShape" id=2] +points = PoolVector3Array( -0.0850063, -0.879389, -0.0282584, 0.0288993, 0.929375, 0.0289349, 0.0288993, 0.929375, -0.0289349, 0.929367, -0.0289314, 0.0289314, -0.0289784, -0.0289338, 0.929338, -0.929369, 0.028929, 0.028929, 0.0288993, -0.0289349, -0.929375, 0.0288993, -0.929375, 0.0289349, -0.0850063, 0.0282584, -0.879389, 0.0282247, 0.084959, 0.87945, 0.857489, 0.056933, -0.0855785, -0.879454, -0.0849424, 0.0282549, 0.0570775, -0.885814, -0.0571088, 0.0570775, -0.0571088, 0.885814, -0.0571532, 0.885743, -0.0571043, -0.0571532, 0.885743, 0.0571043, 0.0570775, 0.0571088, -0.885814, -0.885806, -0.057097, -0.057097, 0.879446, 0.0849494, 0.0282572, 0.857335, -0.0571018, -0.0855632, -0.0571532, 0.0571043, 0.885743, -0.0571532, -0.885743, 0.0571043, -0.885806, 0.057097, -0.057097, -0.0571532, -0.0571043, -0.885743, 0.0570775, 0.0571088, 0.885814, -0.0571532, -0.885743, -0.0571043, -0.0571532, 0.0571043, -0.885743, 0.0570775, -0.885814, 0.0571088, 0.0570775, 0.885814, 0.0571088, -0.0571532, -0.0571043, 0.885743, -0.885806, 0.057097, 0.057097, 0.0570775, 0.885814, -0.0571088, 0.0570775, -0.0571088, -0.885814, 0.857335, -0.0571018, 0.0855632, -0.885806, -0.057097, 0.057097, 0.857489, 0.056933, 0.0855785, 0.929425, 0.0287513, -0.0289333, 0.929367, -0.0289314, -0.0289314, -0.0289784, 0.929338, -0.0289338, 0.0288993, 0.0289349, -0.929375, -0.929369, -0.028929, -0.028929, -0.0283039, -0.87942, -0.0849561, 0.084933, 0.0282608, 0.879461, -0.0289784, 0.929338, 0.0289338, -0.0289784, -0.0289338, -0.929338, -0.0289784, 0.0289338, 0.929338, 0.0288993, -0.0289349, 0.929375, 0.0288993, -0.929375, -0.0289349, -0.0289784, -0.929338, 0.0289338, -0.929369, 0.028929, -0.028929, -0.0283039, 0.0849561, -0.87942, -0.879454, -0.0282549, 0.0849424, 0.879512, 0.0280816, 0.0849558, 0.879446, -0.0849494, -0.0282572, -0.0282988, -0.822574, 0.141805, 0.17021, 0.0280745, -0.794261, -0.879454, 0.0849424, -0.0282549, -0.0283039, 0.87942, 0.0849561, 0.0282247, 0.87945, -0.084959, 0.0282247, -0.084959, -0.87945, -0.879454, -0.0282549, -0.0849424, -0.0850063, 0.0282584, 0.879389, -0.0850063, 0.879389, 0.0282584, 0.084933, -0.0282608, 0.879461 ) [node name="Die" type="RigidBody"] -collision_mask = 3 -physics_material_override = SubResource( 3 ) script = ExtResource( 1 ) -[node name="CollisionShape" type="CollisionShape" parent="."] -shape = SubResource( 2 ) - -[node name="Cone" type="MeshInstance" parent="CollisionShape"] +[node name="MeshDie" type="MeshInstance" parent="."] mesh = SubResource( 1 ) -skeleton = NodePath("../../..") -material/0 = null - -[node name="BallShape" type="CollisionShape" parent="."] -visible = false -shape = SubResource( 4 ) -disabled = true - -[node name="Ball" type="MeshInstance" parent="BallShape"] -mesh = SubResource( 5 ) skeleton = NodePath("../..") material/0 = null +[node name="CollisionShapeDie" type="CollisionShape" parent="."] +shape = SubResource( 2 ) + [node name="CamRoot" type="Spatial" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 15.0578, 0 ) [node name="Horizontal" type="Spatial" parent="CamRoot"] @@ -59,18 +40,3 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 15.0578, 0 ) [node name="Camera" type="ClippedCamera" parent="CamRoot/Horizontal/Vertical"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 10.1285 ) -far = 8192.0 -margin = 0.57 -process_mode = 1 - -[node name="PowerUI" type="Control" parent="."] -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_right = 40.0 -margin_bottom = 40.0 - -[node name="PowerBar" type="ProgressBar" parent="PowerUI"] -margin_left = 102.0 -margin_top = 76.0 -margin_right = 768.0 -margin_bottom = 215.0 diff --git a/godot/scenes/Game.gd b/godot/scenes/Game.gd index 8b86263..f53c39a 100644 --- a/godot/scenes/Game.gd +++ b/godot/scenes/Game.gd @@ -60,6 +60,7 @@ func revoke_stroke(): func open_scoreboard(): + strokes_per_level[current_level_id] = current_strokes $Scoreboard.update_values(strokes_per_level, PAR) $Scoreboard.show() diff --git a/godot/scenes/levels/level1/level1.tscn b/godot/scenes/levels/level1/level1.tscn index 634d7bb..793b2c0 100644 --- a/godot/scenes/levels/level1/level1.tscn +++ b/godot/scenes/levels/level1/level1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=2] +[gd_scene load_steps=31 format=2] [ext_resource path="res://assets/game_objects/level1_BG_model.glb" type="PackedScene" id=1] [ext_resource path="res://assets/game_objects/level1_track_model.glb" type="PackedScene" id=2] @@ -7,6 +7,8 @@ [ext_resource path="res://assets/game_objects/beamTurret.glb" type="PackedScene" id=5] [ext_resource path="res://assets/game_objects/window(Clone).material" type="Material" id=6] [ext_resource path="res://scenes/Die.tscn" type="PackedScene" id=7] +[ext_resource path="res://scenes/objects/GoalZone.tscn" type="PackedScene" id=8] +[ext_resource path="res://scenes/objects/GroundCollision.tscn" type="PackedScene" id=9] [sub_resource type="ConcavePolygonShape" id=4] data = PoolVector3Array( 0.0073, 0.0938, -0.0073, 0.0138, 0.0563, -0.0138, 0.0169, 0.0563, -0.0098, 0.0169, 0.0563, -0.0098, 0.009, 0.0938, -0.0052, 0.0073, 0.0938, -0.0073, -0.0051, 0.0563, 0.0189, -0.0027, 0.0938, 0.01, 0, 0.0938, 0.0104, 0, 0.0938, 0.0104, 0, 0.0563, 0.0196, -0.0051, 0.0563, 0.0189, -0.0051, 0.0563, -0.0189, -0.0027, 0.0938, -0.01, -0.0052, 0.0938, -0.009, -0.0052, 0.0938, -0.009, -0.0098, 0.0563, -0.0169, -0.0051, 0.0563, -0.0189, 0.01, 0.0938, 0.0027, 0.0104, 0.0938, 0, 0.0196, 0.0563, 0, 0.0196, 0.0563, 0, 0.0189, 0.0563, 0.0051, 0.01, 0.0938, 0.0027, 0.009, 0.0938, 0.0052, 0.01, 0.0938, 0.0027, 0.0189, 0.0563, 0.0051, 0.0189, 0.0563, 0.0051, 0.0169, 0.0563, 0.0098, 0.009, 0.0938, 0.0052, 0.01, 0.0938, -0.0027, 0.0189, 0.0563, -0.0051, 0.0196, 0.0563, 0, 0.0196, 0.0563, 0, 0.0104, 0.0938, 0, 0.01, 0.0938, -0.0027, 0, 0.0563, 0.0196, 0, 0.0938, 0.0104, 0.0027, 0.0938, 0.01, 0.0027, 0.0938, 0.01, 0.0051, 0.0563, 0.0189, 0, 0.0563, 0.0196, 0, 0.0563, -0.0196, 0, 0.0938, -0.0104, -0.0027, 0.0938, -0.01, -0.0027, 0.0938, -0.01, -0.0051, 0.0563, -0.0189, 0, 0.0563, -0.0196, 0.0051, 0.0563, -0.0189, 0.0027, 0.0938, -0.01, 0, 0.0938, -0.0104, 0, 0.0938, -0.0104, 0, 0.0563, -0.0196, 0.0051, 0.0563, -0.0189, 0.0098, 0.0563, -0.0169, 0.0052, 0.0938, -0.009, 0.0027, 0.0938, -0.01, 0.0027, 0.0938, -0.01, 0.0051, 0.0563, -0.0189, 0.0098, 0.0563, -0.0169, -0.0169, 0.0563, 0.0098, -0.009, 0.0938, 0.0052, -0.0073, 0.0938, 0.0073, -0.0073, 0.0938, 0.0073, -0.0138, 0.0563, 0.0138, -0.0169, 0.0563, 0.0098, 0.0375, 0, -0.0375, 0.0375, 0.0188, -0.0375, -0.0375, 0.0188, -0.0375, -0.0375, 0.0188, -0.0375, -0.0375, 0, -0.0375, 0.0375, 0, -0.0375, -0.0189, 0.0563, -0.0051, -0.01, 0.0938, -0.0027, -0.0104, 0.0938, 0, -0.0104, 0.0938, 0, -0.0196, 0.0563, 0, -0.0189, 0.0563, -0.0051, -0.0098, 0.0563, -0.0169, -0.0052, 0.0938, -0.009, -0.0073, 0.0938, -0.0073, -0.0073, 0.0938, -0.0073, -0.0138, 0.0563, -0.0138, -0.0098, 0.0563, -0.0169, -0.0375, 0, 0.0375, 0.0375, 0, 0.0375, 0.0375, 0, -0.0375, 0.0375, 0, -0.0375, -0.0375, 0, -0.0375, -0.0375, 0, 0.0375, 0.0138, 0.0563, -0.0138, 0.0073, 0.0938, -0.0073, 0.0052, 0.0938, -0.009, 0.0052, 0.0938, -0.009, 0.0098, 0.0563, -0.0169, 0.0138, 0.0563, -0.0138, 0.0098, 0.0563, 0.0169, 0.0052, 0.0938, 0.009, 0.0073, 0.0938, 0.0073, 0.0073, 0.0938, 0.0073, 0.0138, 0.0563, 0.0138, 0.0098, 0.0563, 0.0169, -0.0169, 0.0563, -0.0098, -0.0138, 0.0563, -0.0138, -0.0073, 0.0938, -0.0073, -0.0073, 0.0938, -0.0073, -0.009, 0.0938, -0.0052, -0.0169, 0.0563, -0.0098, 0.009, 0.0938, -0.0052, 0.0169, 0.0563, -0.0098, 0.0189, 0.0563, -0.0051, 0.0189, 0.0563, -0.0051, 0.01, 0.0938, -0.0027, 0.009, 0.0938, -0.0052, -0.0375, 0, 0.0375, -0.0375, 0.0188, 0.0375, 0.0375, 0.0188, 0.0375, 0.0375, 0.0188, 0.0375, 0.0375, 0, 0.0375, -0.0375, 0, 0.0375, 0.0375, 0.0188, 0.0375, 0.0375, 0.0188, -0.0375, 0.0375, 0, -0.0375, 0.0375, 0, -0.0375, 0.0375, 0, 0.0375, 0.0375, 0.0188, 0.0375, 0.0073, 0.0938, 0.0073, 0.009, 0.0938, 0.0052, 0.0169, 0.0563, 0.0098, 0.0169, 0.0563, 0.0098, 0.0138, 0.0563, 0.0138, 0.0073, 0.0938, 0.0073, -0.0189, 0.0563, -0.0051, -0.0169, 0.0563, -0.0098, -0.009, 0.0938, -0.0052, -0.009, 0.0938, -0.0052, -0.01, 0.0938, -0.0027, -0.0189, 0.0563, -0.0051, -0.0196, 0.0563, 0, -0.0104, 0.0938, 0, -0.01, 0.0938, 0.0027, -0.01, 0.0938, 0.0027, -0.0189, 0.0563, 0.0051, -0.0196, 0.0563, 0, 0.01, 0.0938, -0.0027, 0.0104, 0.0938, 0, 0.01, 0.0938, 0.0027, 0.009, 0.0938, -0.0052, 0.01, 0.0938, -0.0027, 0.01, 0.0938, 0.0027, 0.009, 0.0938, -0.0052, 0.01, 0.0938, 0.0027, 0.009, 0.0938, 0.0052, 0.0073, 0.0938, -0.0073, 0.009, 0.0938, -0.0052, 0.009, 0.0938, 0.0052, 0.0073, 0.0938, -0.0073, 0.009, 0.0938, 0.0052, 0.0073, 0.0938, 0.0073, 0.0052, 0.0938, -0.009, 0.0073, 0.0938, -0.0073, 0.0073, 0.0938, 0.0073, 0.0052, 0.0938, -0.009, 0.0073, 0.0938, 0.0073, 0.0052, 0.0938, 0.009, 0.0027, 0.0938, -0.01, 0.0052, 0.0938, -0.009, 0.0052, 0.0938, 0.009, 0.0027, 0.0938, -0.01, 0.0052, 0.0938, 0.009, 0.0027, 0.0938, 0.01, 0, 0.0938, -0.0104, 0.0027, 0.0938, -0.01, 0.0027, 0.0938, 0.01, 0, 0.0938, -0.0104, 0.0027, 0.0938, 0.01, 0, 0.0938, 0.0104, -0.0027, 0.0938, -0.01, 0, 0.0938, -0.0104, 0, 0.0938, 0.0104, -0.0027, 0.0938, -0.01, 0, 0.0938, 0.0104, -0.0027, 0.0938, 0.01, -0.0052, 0.0938, -0.009, -0.0027, 0.0938, -0.01, -0.0027, 0.0938, 0.01, -0.0052, 0.0938, -0.009, -0.0027, 0.0938, 0.01, -0.0052, 0.0938, 0.009, -0.0073, 0.0938, -0.0073, -0.0052, 0.0938, -0.009, -0.0052, 0.0938, 0.009, -0.0073, 0.0938, -0.0073, -0.0052, 0.0938, 0.009, -0.0073, 0.0938, 0.0073, -0.009, 0.0938, -0.0052, -0.0073, 0.0938, -0.0073, -0.0073, 0.0938, 0.0073, -0.009, 0.0938, -0.0052, -0.0073, 0.0938, 0.0073, -0.009, 0.0938, 0.0052, -0.01, 0.0938, -0.0027, -0.009, 0.0938, -0.0052, -0.009, 0.0938, 0.0052, -0.01, 0.0938, -0.0027, -0.009, 0.0938, 0.0052, -0.01, 0.0938, 0.0027, -0.01, 0.0938, 0.0027, -0.0104, 0.0938, 0, -0.01, 0.0938, -0.0027, -0.0098, 0.0563, 0.0169, -0.0052, 0.0938, 0.009, -0.0027, 0.0938, 0.01, -0.0027, 0.0938, 0.01, -0.0051, 0.0563, 0.0189, -0.0098, 0.0563, 0.0169, 0.0051, 0.0563, 0.0189, 0.0027, 0.0938, 0.01, 0.0052, 0.0938, 0.009, 0.0052, 0.0938, 0.009, 0.0098, 0.0563, 0.0169, 0.0051, 0.0563, 0.0189, -0.0138, 0.0563, 0.0138, -0.0073, 0.0938, 0.0073, -0.0052, 0.0938, 0.009, -0.0052, 0.0938, 0.009, -0.0098, 0.0563, 0.0169, -0.0138, 0.0563, 0.0138, -0.0375, 0, 0.0375, -0.0375, 0, -0.0375, -0.0375, 0.0188, -0.0375, -0.0375, 0.0188, -0.0375, -0.0375, 0.0188, 0.0375, -0.0375, 0, 0.0375, -0.0189, 0.0563, 0.0051, -0.01, 0.0938, 0.0027, -0.009, 0.0938, 0.0052, -0.009, 0.0938, 0.0052, -0.0169, 0.0563, 0.0098, -0.0189, 0.0563, 0.0051, 0.0375, 0.0188, -0.0375, 0.0288, 0.0188, 0, 0.0278, 0.0188, -0.0074, 0.0375, 0.0188, -0.0375, 0.0278, 0.0188, -0.0074, 0.0249, 0.0188, -0.0144, 0.0375, 0.0188, -0.0375, 0.0249, 0.0188, -0.0144, 0.0203, 0.0188, -0.0203, 0.0375, 0.0188, -0.0375, 0.0203, 0.0188, -0.0203, 0.0144, 0.0188, -0.0249, 0.0375, 0.0188, -0.0375, 0.0144, 0.0188, -0.0249, 0.0074, 0.0188, -0.0278, 0.0375, 0.0188, -0.0375, 0.0074, 0.0188, -0.0278, 0, 0.0188, -0.0288, 0.0375, 0.0188, -0.0375, 0, 0.0188, -0.0288, -0.0074, 0.0188, -0.0278, 0.0375, 0.0188, -0.0375, 0.0375, 0.0188, 0.0375, 0.0288, 0.0188, 0, -0.0375, 0.0188, -0.0375, 0.0375, 0.0188, -0.0375, -0.0074, 0.0188, -0.0278, -0.0074, 0.0188, -0.0278, -0.0144, 0.0188, -0.0249, -0.0375, 0.0188, -0.0375, -0.0144, 0.0188, -0.0249, -0.0203, 0.0188, -0.0203, -0.0375, 0.0188, -0.0375, -0.0203, 0.0188, -0.0203, -0.0249, 0.0188, -0.0144, -0.0375, 0.0188, -0.0375, -0.0249, 0.0188, -0.0144, -0.0278, 0.0188, -0.0074, -0.0375, 0.0188, -0.0375, -0.0278, 0.0188, -0.0074, -0.0375, 0.0188, 0.0375, -0.0375, 0.0188, -0.0375, -0.0278, 0.0188, -0.0074, -0.0288, 0.0188, 0, -0.0375, 0.0188, 0.0375, 0.0278, 0.0188, 0.0074, 0.0288, 0.0188, 0, 0.0375, 0.0188, 0.0375, 0.0249, 0.0188, 0.0144, 0.0278, 0.0188, 0.0074, 0.0375, 0.0188, 0.0375, 0.0203, 0.0188, 0.0203, 0.0249, 0.0188, 0.0144, 0.0375, 0.0188, 0.0375, 0.0144, 0.0188, 0.0249, 0.0203, 0.0188, 0.0203, 0.0375, 0.0188, 0.0375, 0.0074, 0.0188, 0.0278, 0.0144, 0.0188, 0.0249, 0.0375, 0.0188, 0.0375, 0, 0.0188, 0.0288, 0.0074, 0.0188, 0.0278, 0.0375, 0.0188, 0.0375, -0.0074, 0.0188, 0.0278, 0, 0.0188, 0.0288, 0.0375, 0.0188, 0.0375, -0.0074, 0.0188, 0.0278, 0.0375, 0.0188, 0.0375, -0.0375, 0.0188, 0.0375, -0.0144, 0.0188, 0.0249, -0.0074, 0.0188, 0.0278, -0.0375, 0.0188, 0.0375, -0.0203, 0.0188, 0.0203, -0.0144, 0.0188, 0.0249, -0.0375, 0.0188, 0.0375, -0.0249, 0.0188, 0.0144, -0.0203, 0.0188, 0.0203, -0.0375, 0.0188, 0.0375, -0.0278, 0.0188, 0.0074, -0.0249, 0.0188, 0.0144, -0.0375, 0.0188, 0.0375, -0.0375, 0.0188, 0.0375, -0.0288, 0.0188, 0, -0.0278, 0.0188, 0.0074, 0.0074, 0.0188, 0.0278, 0.0051, 0.0563, 0.0189, 0.0098, 0.0563, 0.0169, 0.0098, 0.0563, 0.0169, 0.0144, 0.0188, 0.0249, 0.0074, 0.0188, 0.0278, 0, 0.0188, 0.0288, 0, 0.0563, 0.0196, 0.0051, 0.0563, 0.0189, 0.0051, 0.0563, 0.0189, 0.0074, 0.0188, 0.0278, 0, 0.0188, 0.0288, -0.0278, 0.0188, -0.0074, -0.0249, 0.0188, -0.0144, -0.0169, 0.0563, -0.0098, -0.0169, 0.0563, -0.0098, -0.0189, 0.0563, -0.0051, -0.0278, 0.0188, -0.0074, -0.0288, 0.0188, 0, -0.0278, 0.0188, -0.0074, -0.0189, 0.0563, -0.0051, -0.0189, 0.0563, -0.0051, -0.0196, 0.0563, 0, -0.0288, 0.0188, 0, -0.0288, 0.0188, 0, -0.0196, 0.0563, 0, -0.0189, 0.0563, 0.0051, -0.0189, 0.0563, 0.0051, -0.0278, 0.0188, 0.0074, -0.0288, 0.0188, 0, 0.0074, 0.0188, -0.0278, 0.0051, 0.0563, -0.0189, 0, 0.0563, -0.0196, 0, 0.0563, -0.0196, 0, 0.0188, -0.0288, 0.0074, 0.0188, -0.0278, 0.0144, 0.0188, 0.0249, 0.0098, 0.0563, 0.0169, 0.0138, 0.0563, 0.0138, 0.0138, 0.0563, 0.0138, 0.0203, 0.0188, 0.0203, 0.0144, 0.0188, 0.0249, 0.0138, 0.0563, 0.0138, 0.0169, 0.0563, 0.0098, 0.0249, 0.0188, 0.0144, 0.0249, 0.0188, 0.0144, 0.0203, 0.0188, 0.0203, 0.0138, 0.0563, 0.0138, -0.0249, 0.0188, -0.0144, -0.0203, 0.0188, -0.0203, -0.0138, 0.0563, -0.0138, -0.0138, 0.0563, -0.0138, -0.0169, 0.0563, -0.0098, -0.0249, 0.0188, -0.0144, -0.0278, 0.0188, 0.0074, -0.0189, 0.0563, 0.0051, -0.0169, 0.0563, 0.0098, -0.0169, 0.0563, 0.0098, -0.0249, 0.0188, 0.0144, -0.0278, 0.0188, 0.0074, -0.0144, 0.0188, -0.0249, -0.0098, 0.0563, -0.0169, -0.0138, 0.0563, -0.0138, -0.0138, 0.0563, -0.0138, -0.0203, 0.0188, -0.0203, -0.0144, 0.0188, -0.0249, 0.0144, 0.0188, -0.0249, 0.0098, 0.0563, -0.0169, 0.0051, 0.0563, -0.0189, 0.0051, 0.0563, -0.0189, 0.0074, 0.0188, -0.0278, 0.0144, 0.0188, -0.0249, 0.0203, 0.0188, -0.0203, 0.0138, 0.0563, -0.0138, 0.0098, 0.0563, -0.0169, 0.0098, 0.0563, -0.0169, 0.0144, 0.0188, -0.0249, 0.0203, 0.0188, -0.0203, -0.0144, 0.0188, 0.0249, -0.0098, 0.0563, 0.0169, -0.0051, 0.0563, 0.0189, -0.0051, 0.0563, 0.0189, -0.0074, 0.0188, 0.0278, -0.0144, 0.0188, 0.0249, -0.0249, 0.0188, 0.0144, -0.0169, 0.0563, 0.0098, -0.0138, 0.0563, 0.0138, -0.0138, 0.0563, 0.0138, -0.0203, 0.0188, 0.0203, -0.0249, 0.0188, 0.0144, 0.0169, 0.0563, -0.0098, 0.0249, 0.0188, -0.0144, 0.0278, 0.0188, -0.0074, 0.0278, 0.0188, -0.0074, 0.0189, 0.0563, -0.0051, 0.0169, 0.0563, -0.0098, -0.0203, 0.0188, 0.0203, -0.0138, 0.0563, 0.0138, -0.0098, 0.0563, 0.0169, -0.0098, 0.0563, 0.0169, -0.0144, 0.0188, 0.0249, -0.0203, 0.0188, 0.0203, 0, 0.0188, -0.0288, 0, 0.0563, -0.0196, -0.0051, 0.0563, -0.0189, -0.0051, 0.0563, -0.0189, -0.0074, 0.0188, -0.0278, 0, 0.0188, -0.0288, -0.0074, 0.0188, 0.0278, -0.0051, 0.0563, 0.0189, 0, 0.0563, 0.0196, 0, 0.0563, 0.0196, 0, 0.0188, 0.0288, -0.0074, 0.0188, 0.0278, 0.0189, 0.0563, 0.0051, 0.0196, 0.0563, 0, 0.0288, 0.0188, 0, 0.0288, 0.0188, 0, 0.0278, 0.0188, 0.0074, 0.0189, 0.0563, 0.0051, 0.0138, 0.0563, -0.0138, 0.0203, 0.0188, -0.0203, 0.0249, 0.0188, -0.0144, 0.0249, 0.0188, -0.0144, 0.0169, 0.0563, -0.0098, 0.0138, 0.0563, -0.0138, 0.0169, 0.0563, 0.0098, 0.0189, 0.0563, 0.0051, 0.0278, 0.0188, 0.0074, 0.0278, 0.0188, 0.0074, 0.0249, 0.0188, 0.0144, 0.0169, 0.0563, 0.0098, 0.0196, 0.0563, 0, 0.0189, 0.0563, -0.0051, 0.0278, 0.0188, -0.0074, 0.0278, 0.0188, -0.0074, 0.0288, 0.0188, 0, 0.0196, 0.0563, 0, -0.0074, 0.0188, -0.0278, -0.0051, 0.0563, -0.0189, -0.0098, 0.0563, -0.0169, -0.0098, 0.0563, -0.0169, -0.0144, 0.0188, -0.0249, -0.0074, 0.0188, -0.0278 ) @@ -62,8 +64,6 @@ points = PoolVector3Array( 0.639679, 0.116664, -0.364341, 0.828143, 0.2, 0.18101 [sub_resource type="ConvexPolygonShape" id=20] points = PoolVector3Array( -0.71742, 0.11773, -0.254227, -0.388641, 0.201786, -0.447582, -0.388641, 0.112117, -0.447582, -0.728268, 0.107464, 0.231456, -0.828143, 0.2, 0.181011, -0.599265, 0.197787, -0.408004, -0.717416, 0.201786, 0.195001, -0.514534, 0.11479, -0.48653, -0.828732, 0.113785, 0.181933, -0.78306, 0.196238, -0.110443, -0.817494, 0.116032, 0.0278944, -0.4, 0.199515, -0.489681, -0.514534, 0.199112, -0.48653, -0.73199, 0.196678, -0.228984, -0.639679, 0.116664, -0.364341, -0.4, 0.114388, -0.489681, -0.78306, 0.117664, -0.110443, -0.817494, 0.197871, 0.0278944, -0.639679, 0.197239, -0.364341, -0.73199, 0.117225, -0.228984, -0.599265, 0.116116, -0.408004 ) -[sub_resource type="BoxShape" id=3] - [sub_resource type="BoxShape" id=21] [sub_resource type="CylinderMesh" id=22] @@ -166,11 +166,11 @@ shape = SubResource( 19 ) transform = Transform( -1.222, 0, -2.22395e-06, 0, 30, 0, 2.22395e-06, 0, -1.222, -0.0397539, -6.27184, -6.92309 ) shape = SubResource( 20 ) -[node name="Area" type="Area" parent="Spatial/StaticBody level"] +[node name="GoalZone" parent="Spatial/StaticBody level" instance=ExtResource( 8 )] +transform = Transform( 0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, -0.000546885, -2.79064, -7.17821 ) -[node name="victorycollision" type="CollisionShape" parent="Spatial/StaticBody level/Area"] -transform = Transform( 0.121517, 0, 0, 0, 0.130879, 0, 0, 0, 0.121517, 0, -2.8502, -7.1767 ) -shape = SubResource( 3 ) +[node name="GroundCollision" parent="Spatial/StaticBody level" instance=ExtResource( 9 )] +transform = Transform( 6.07612, 0, 0, 0, 1, 0, 0, 0, 23.102, -0.012512, -2.87122, -3.3987 ) [node name="StaticBody turret" type="StaticBody" parent="Spatial"] transform = Transform( 0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, -0.0730354, -2.66775, -2.27479 ) @@ -194,6 +194,8 @@ shape = SubResource( 21 ) [node name="Beams1" type="StaticBody" parent="Spatial"] transform = Transform( 0.254558, 1.64636e-10, 0.0106066, -5.58794e-09, 0.015, 0, -0.254558, -1.64636e-10, 0.0106066, 0.128531, -2.11866, -2.47778 ) +collision_layer = 2 +collision_mask = 3 [node name="MeshInstance" type="MeshInstance" parent="Spatial/Beams1"] transform = Transform( -1.02354e-07, 0.8, 0, -2.34158, -3.49691e-08, 0, 0, 0, 0.8, 0, 0, 0 ) @@ -246,6 +248,8 @@ shape = SubResource( 21 ) [node name="Beams2" type="StaticBody" parent="Spatial"] transform = Transform( 0.254558, 1.64636e-10, -0.0106066, -5.58794e-09, 0.015, 0, 0.254558, 1.64636e-10, 0.0106066, -0.126502, -2.11866, -4.48365 ) +collision_layer = 3 +collision_mask = 3 [node name="MeshInstance" type="MeshInstance" parent="Spatial/Beams2"] transform = Transform( -1.02354e-07, 0.8, 0, -2.34158, -3.49691e-08, 0, 0, 0, 0.8, 0, 0, 0 ) diff --git a/godot/scenes/objects/GroundCollision.tscn b/godot/scenes/objects/GroundCollision.tscn new file mode 100644 index 0000000..9f98830 --- /dev/null +++ b/godot/scenes/objects/GroundCollision.tscn @@ -0,0 +1,11 @@ +[gd_scene load_steps=2 format=2] + +[sub_resource type="BoxShape" id=1] +extents = Vector3( 0.204438, 0.202656, 0.204615 ) + +[node name="GroundCollision" type="Area"] +collision_layer = 4 +collision_mask = 4 + +[node name="CollisionShape" type="CollisionShape" parent="."] +shape = SubResource( 1 ) |