Skip to content

Commit

Permalink
show ball again; make portal collision shape smaller
Browse files Browse the repository at this point in the history
  • Loading branch information
dulvui committed Jan 13, 2024
1 parent 69afdcf commit 02a0177
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
3 changes: 1 addition & 2 deletions game/src/actors/ball/base-ball/Ball.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,10 @@ tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ Vector3( 0.01, 0.01, 0.01 ) ]
"values": [ Vector3( 1, 1, 1 ) ]
}

[node name="Ball" type="RigidBody" groups=["ball"]]
visible = false
collision_layer = 2
collision_mask = 3
mass = 6.28
Expand Down
2 changes: 1 addition & 1 deletion game/src/actors/portal/Portal.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ collision_layer = 2
collision_mask = 2

[node name="CollisionShape" type="CollisionShape" parent="Area"]
transform = Transform( -1.74846e-07, -0.5, 0, 4, -2.18557e-08, 0, 0, 0, 4, 0, 0, 0 )
transform = Transform( -1.31134e-07, -0.5, 0, 3, -2.18557e-08, 0, 0, 0, 3, 0, 0, 0 )
shape = SubResource( 2 )

[connection signal="body_entered" from="Area" to="." method="_on_Area_body_entered"]
9 changes: 7 additions & 2 deletions game/src/levels/Level121.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
[node name="LevelBase2" instance=ExtResource( 1 )]

[node name="Ball" parent="." index="2"]
transform = Transform( 0.01, 0, 0, 0, 0.01, 0, 0, 0, 0.01, 7.94765, 19.8625, 0 )
visible = true
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7.94765, 31.312, 0 )
collision_mask = 1

[node name="Portal1" parent="Portals" index="1"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.45429, 26.0437, 0 )

[node name="Portal2" parent="Portals" index="2"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.21247, 12.3613, 0 )
3 changes: 1 addition & 2 deletions game/src/levels/base-level/LevelBase.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,7 @@ anims/TopbarFadeIn = SubResource( 19 )
[node name="Base" parent="." instance=ExtResource( 2 )]

[node name="Ball" parent="." instance=ExtResource( 5 )]
transform = Transform( 0.01, 0, 0, 0, 0.01, 0, 0, 0, 0.01, 7.94765, 19.8625, 0 )
visible = true
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7.94765, 19.8625, 0 )
physics_material_override = SubResource( 15 )
contacts_reported = 0
contact_monitor = false
Expand Down
3 changes: 1 addition & 2 deletions game/src/levels/base-level2/LevelBase2.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ anims/TopbarFadeIn = SubResource( 19 )
[node name="Tween" type="Tween" parent="."]

[node name="Ball" parent="." instance=ExtResource( 1 )]
transform = Transform( 0.01, 0, 0, 0, 0.01, 0, 0, 0, 0.01, 7.94765, 19.8625, 0 )
visible = true
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7.94765, 19.8625, 0 )
physics_material_override = SubResource( 15 )
contacts_reported = 0
contact_monitor = false
Expand Down

0 comments on commit 02a0177

Please sign in to comment.