multiple updates
This commit is contained in:
parent
d265ef4598
commit
246bdf0e98
@ -29,7 +29,7 @@ metadata/_edit_group_ = true
|
||||
shape = SubResource("WorldBoundaryShape2D_3u4a8")
|
||||
|
||||
[node name="RB_Crate" type="RigidBody2D" parent="."]
|
||||
position = Vector2(99, 190)
|
||||
position = Vector2(141, 231)
|
||||
rotation = 0.545383
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
@ -37,6 +37,15 @@ metadata/_edit_group_ = true
|
||||
shape = SubResource("RectangleShape2D_4vo4d")
|
||||
debug_color = Color(0.815686, 0.4, 0.207843, 0.419608)
|
||||
|
||||
[node name="RB_Crate2" type="RigidBody2D" parent="."]
|
||||
position = Vector2(531, 193)
|
||||
rotation = 0.545383
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="RB_Crate2"]
|
||||
shape = SubResource("RectangleShape2D_4vo4d")
|
||||
debug_color = Color(0.815686, 0.4, 0.207843, 0.419608)
|
||||
|
||||
[node name="level" type="Node2D" parent="."]
|
||||
|
||||
[node name="groundblock2" type="StaticBody2D" parent="level"]
|
||||
@ -48,7 +57,7 @@ position = Vector2(-1.5, 0)
|
||||
shape = SubResource("RectangleShape2D_cq7kj")
|
||||
|
||||
[node name="groundblock3" type="StaticBody2D" parent="level"]
|
||||
position = Vector2(404, 353)
|
||||
position = Vector2(404, 345)
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="level/groundblock3"]
|
||||
@ -57,7 +66,6 @@ shape = SubResource("RectangleShape2D_cq7kj")
|
||||
|
||||
[node name="groundblock" type="StaticBody2D" parent="level"]
|
||||
position = Vector2(124, 357)
|
||||
collision_layer = 2
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="level/groundblock"]
|
||||
@ -74,7 +82,7 @@ position = Vector2(-1.5, 0)
|
||||
shape = SubResource("RectangleShape2D_cq7kj")
|
||||
|
||||
[node name="CharacterBody2D" type="CharacterBody2D" parent="."]
|
||||
position = Vector2(155, 328)
|
||||
position = Vector2(82, 331)
|
||||
collision_mask = 3
|
||||
script = ExtResource("1_u4sui")
|
||||
metadata/_edit_group_ = true
|
||||
@ -83,7 +91,7 @@ metadata/_edit_group_ = true
|
||||
shape = SubResource("CircleShape2D_ubfw4")
|
||||
|
||||
[node name="Area2D" type="Area2D" parent="."]
|
||||
position = Vector2(260, 352)
|
||||
position = Vector2(624, 416)
|
||||
script = ExtResource("2_nfj1w")
|
||||
metadata/_edit_group_ = true
|
||||
|
||||
|
@ -2,7 +2,7 @@ extends CharacterBody2D
|
||||
|
||||
|
||||
const SPEED = 300.0
|
||||
const JUMP_VELOCITY = -300.0
|
||||
const JUMP_VELOCITY = -500.0
|
||||
const PUSH_FORCE = 50
|
||||
|
||||
# Get the gravity from the project settings to be synced with RigidBody nodes.
|
||||
|
@ -1,15 +1,31 @@
|
||||
extends Node2D
|
||||
|
||||
var totalCrates = 2
|
||||
var cratesCollected = 0
|
||||
var timeLimit = 10
|
||||
var timer:= Timer.new()
|
||||
|
||||
# Called when the node enters the scene tree for the first time.
|
||||
func _ready():
|
||||
pass # Replace with function body.
|
||||
add_child(timer)
|
||||
timer.wait_time = 1
|
||||
timer.one_shot = false
|
||||
timer.connect("timeout", secondCounter)
|
||||
timer.start()
|
||||
|
||||
func secondCounter():
|
||||
timeLimit -= 1
|
||||
if timeLimit <=0:
|
||||
print("You lose baby!")
|
||||
get_tree().reload_current_scene()
|
||||
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _process(delta):
|
||||
pass
|
||||
|
||||
|
||||
func _on_area_2d_areatrigger(effect, Object):
|
||||
func _on_area_2d_areatrigger(effect, body):
|
||||
print("Game Controller sees the trigger")
|
||||
if body is RigidBody2D:
|
||||
print("a crate entered trigger")
|
||||
cratesCollected +=1
|
||||
body.queue_free()
|
||||
if cratesCollected>=totalCrates:
|
||||
print("You win baby!")
|
||||
get_tree().reload_current_scene()
|
||||
|
@ -175,4 +175,4 @@ Anim={
|
||||
"zfar": 4000.01,
|
||||
"znear": 0.05
|
||||
}
|
||||
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Game/Crate")])
|
||||
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Game/SceneManager")])
|
||||
|
@ -175,4 +175,4 @@ Anim={
|
||||
"zfar": 4000.01,
|
||||
"znear": 0.05
|
||||
}
|
||||
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/CharacterBody2D/MarkerRight")])
|
||||
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Game/SceneManager")])
|
||||
|
@ -175,4 +175,4 @@ Anim={
|
||||
"zfar": 4000.01,
|
||||
"znear": 0.05
|
||||
}
|
||||
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Game/Crate")])
|
||||
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Game/SceneManager")])
|
||||
|
@ -4,7 +4,7 @@ dock_1_selected_tab_idx=0
|
||||
dock_2_selected_tab_idx=0
|
||||
dock_3_selected_tab_idx=0
|
||||
dock_4_selected_tab_idx=0
|
||||
dock_5_selected_tab_idx=0
|
||||
dock_5_selected_tab_idx=1
|
||||
dock_6_selected_tab_idx=0
|
||||
dock_7_selected_tab_idx=0
|
||||
dock_8_selected_tab_idx=0
|
||||
@ -32,7 +32,7 @@ dock_5="Inspector,Node,History"
|
||||
[EditorNode]
|
||||
|
||||
open_scenes=PackedStringArray("res://scenes/game.tscn", "res://scenes/character.tscn", "res://scenes/bullet.tscn", "res://scenes/crate.tscn")
|
||||
current_scene="res://scenes/character.tscn"
|
||||
current_scene="res://scenes/game.tscn"
|
||||
center_split_offset=0
|
||||
selected_default_debugger_tab_idx=1
|
||||
selected_main_editor_idx=2
|
||||
@ -41,9 +41,9 @@ selected_bottom_panel_item=0
|
||||
[ScriptEditor]
|
||||
|
||||
open_scripts=["res://scripts/bullet.gd", "res://scripts/CharacterBody2D.gd", "res://scripts/SceneManager.gd", "res://scripts/Trigger.gd"]
|
||||
selected_script="res://scripts/CharacterBody2D.gd"
|
||||
selected_script="res://scripts/bullet.gd"
|
||||
open_help=[]
|
||||
script_split_offset=70
|
||||
script_split_offset=243
|
||||
list_split_offset=0
|
||||
zoom_factor=1.0
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
ea4bc82a6ad023ab7ee23ee620429895
|
||||
::res://::1726506541
|
||||
::res://::1732568115
|
||||
icon.svg::CompressedTexture2D::9114977118871582245::1718541837::1718541843::1::::<><>::
|
||||
::res://assets/::1718552371
|
||||
::res://scenes/::1725933556
|
||||
|
@ -2,4 +2,3 @@ res://scenes/game.tscn
|
||||
res://scenes/character.tscn
|
||||
res://scenes/bullet.tscn
|
||||
res://scenes/crate.tscn
|
||||
res://scenes/platform.tscn
|
@ -175,4 +175,4 @@ Anim={
|
||||
"zfar": 4000.01,
|
||||
"znear": 0.05
|
||||
}
|
||||
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Game/Crate")])
|
||||
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Game/SceneManager")])
|
||||
|
@ -7,7 +7,7 @@ state={
|
||||
"folded_lines": Array[int]([]),
|
||||
"h_scroll_position": 0,
|
||||
"row": 41,
|
||||
"scroll_position": 41.0,
|
||||
"scroll_position": 31.0,
|
||||
"selection": false,
|
||||
"syntax_highlighter": "GDScript"
|
||||
}
|
||||
@ -17,16 +17,12 @@ state={
|
||||
state={
|
||||
"bookmarks": PackedInt32Array(),
|
||||
"breakpoints": PackedInt32Array(),
|
||||
"column": 17,
|
||||
"column": 0,
|
||||
"folded_lines": Array[int]([]),
|
||||
"h_scroll_position": 0,
|
||||
"row": 0,
|
||||
"row": 4,
|
||||
"scroll_position": 0.0,
|
||||
"selection": true,
|
||||
"selection_from_column": 11,
|
||||
"selection_from_line": 0,
|
||||
"selection_to_column": 17,
|
||||
"selection_to_line": 0,
|
||||
"selection": false,
|
||||
"syntax_highlighter": "GDScript"
|
||||
}
|
||||
|
||||
@ -49,11 +45,11 @@ state={
|
||||
state={
|
||||
"bookmarks": PackedInt32Array(),
|
||||
"breakpoints": PackedInt32Array(),
|
||||
"column": 19,
|
||||
"column": 21,
|
||||
"folded_lines": Array[int]([]),
|
||||
"h_scroll_position": 0,
|
||||
"row": 25,
|
||||
"scroll_position": 0.0,
|
||||
"row": 8,
|
||||
"scroll_position": 10.0,
|
||||
"selection": false,
|
||||
"syntax_highlighter": "GDScript"
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
[res://scenes/crate.tscn]
|
||||
|
||||
groups=[&"boxes"]
|
||||
|
||||
[res://scenes/game.tscn]
|
||||
|
||||
groups=[&"player"]
|
||||
|
||||
[res://scenes/crate.tscn]
|
||||
|
||||
groups=[&"boxes"]
|
||||
|
@ -19,7 +19,7 @@ dock_filesystem_split=0
|
||||
dock_filesystem_display_mode=0
|
||||
dock_filesystem_file_sort=0
|
||||
dock_filesystem_file_list_display_mode=1
|
||||
dock_filesystem_selected_paths=PackedStringArray("res://graphics/items/cannister.png")
|
||||
dock_filesystem_selected_paths=PackedStringArray("res://scenes/character.tscn")
|
||||
dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/", "res://graphics/", "res://graphics/items/")
|
||||
dock_bottom=[]
|
||||
dock_closed=[]
|
||||
@ -32,16 +32,16 @@ dock_5="Inspector,Node,History"
|
||||
[EditorNode]
|
||||
|
||||
open_scenes=PackedStringArray("res://scenes/game.tscn", "res://scenes/character.tscn", "res://scenes/bullet.tscn", "res://scenes/crate.tscn")
|
||||
current_scene="res://scenes/game.tscn"
|
||||
current_scene="res://scenes/character.tscn"
|
||||
center_split_offset=-252
|
||||
selected_default_debugger_tab_idx=0
|
||||
selected_main_editor_idx=0
|
||||
selected_bottom_panel_item=11
|
||||
selected_main_editor_idx=2
|
||||
selected_bottom_panel_item=9
|
||||
|
||||
[ScriptEditor]
|
||||
|
||||
open_scripts=["res://scripts/bullet.gd", "res://scripts/CharacterBody2D.gd", "res://scripts/gamecontroller.gd"]
|
||||
selected_script="res://scripts/gamecontroller.gd"
|
||||
selected_script="res://scripts/CharacterBody2D.gd"
|
||||
open_help=[]
|
||||
script_split_offset=70
|
||||
list_split_offset=0
|
||||
|
@ -1,5 +1,5 @@
|
||||
ea4bc82a6ad023ab7ee23ee620429895
|
||||
::res://::1726514291
|
||||
::res://::1733169990
|
||||
icon.svg::CompressedTexture2D::9114977118871582245::1721179661::1721179661::1::::<><>::
|
||||
::res://graphics/::1721682223
|
||||
Terrain (32x32).png::CompressedTexture2D::8707534964839485024::1721679370::1721679370::1::::<><>::
|
||||
|
@ -17,11 +17,11 @@ state={
|
||||
state={
|
||||
"bookmarks": PackedInt32Array(),
|
||||
"breakpoints": PackedInt32Array(),
|
||||
"column": 31,
|
||||
"column": 29,
|
||||
"folded_lines": Array[int]([]),
|
||||
"h_scroll_position": 0,
|
||||
"row": 46,
|
||||
"scroll_position": 31.0,
|
||||
"row": 71,
|
||||
"scroll_position": 57.0,
|
||||
"selection": false,
|
||||
"syntax_highlighter": "GDScript"
|
||||
}
|
||||
@ -35,7 +35,7 @@ state={
|
||||
"folded_lines": Array[int]([]),
|
||||
"h_scroll_position": 0,
|
||||
"row": 13,
|
||||
"scroll_position": 0.0,
|
||||
"scroll_position": 14.0,
|
||||
"selection": false,
|
||||
"syntax_highlighter": "GDScript"
|
||||
}
|
||||
|
@ -13,7 +13,7 @@ dock_split_2=0
|
||||
dock_split_3=0
|
||||
dock_hsplit_1=0
|
||||
dock_hsplit_2=270
|
||||
dock_hsplit_3=-270
|
||||
dock_hsplit_3=-417
|
||||
dock_hsplit_4=0
|
||||
dock_filesystem_split=0
|
||||
dock_filesystem_display_mode=0
|
||||
@ -36,7 +36,6 @@ current_scene="res://scenes/game.tscn"
|
||||
center_split_offset=-325
|
||||
selected_default_debugger_tab_idx=0
|
||||
selected_main_editor_idx=0
|
||||
selected_bottom_panel_item=11
|
||||
|
||||
[ScriptEditor]
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
ea4bc82a6ad023ab7ee23ee620429895
|
||||
::res://::1727115661
|
||||
::res://::1733773471
|
||||
icon.svg::CompressedTexture2D::9114977118871582245::1722277386::1722277386::1::::<><>::
|
||||
::res://graphics/::1722285155
|
||||
Terrain (32x32).png::CompressedTexture2D::8707534964839485024::1722277386::1722277386::1::::<><>::
|
||||
@ -17,12 +17,12 @@ player jump 48x48.png::CompressedTexture2D::1627608568707791839::1722277386::172
|
||||
player land 48x48.png::CompressedTexture2D::3499637713582873633::1722277386::1722277386::1::::<><>::
|
||||
::res://graphics/Player Run/::1722277386
|
||||
player run 48x48.png::CompressedTexture2D::1502492849971408816::1722277386::1722277386::1::::<><>::
|
||||
::res://scenes/::1724634527
|
||||
bullet.tscn::PackedScene::6880909734590904373::1724634489::0::1::::<><>::res://scripts/bullet.gd
|
||||
character.tscn::PackedScene::451838158579532324::1724634489::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://c0iiaebonyhh0::::res://graphics/Player Idle/Player Idle 48x48.png<>uid://xgoqfqmvorcx::::res://graphics/Player Jump/player jump 48x48.png<>uid://vn23qn3f0dvc::::res://graphics/Player Run/player run 48x48.png
|
||||
crate.tscn::PackedScene::41931541512830250::1724634489::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png
|
||||
game.tscn::PackedScene::1738196330916037717::1724634527::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dwb83f7uoweuy::::res://graphics/Terrain (32x32).png<>res://scripts/Trigger.gd<>uid://ukuu7p7vhlq::::res://scenes/crate.tscn<>uid://dvd1p6xue0ub2::::res://scenes/platform.tscn<>uid://dly4g7fvvtamm::::res://graphics/background/BG Image.png<>uid://cw50mfjp2np08::::res://graphics/background/Additional Sky.png<>uid://6olcj1w1svdg::::res://graphics/background/Additional Water.png
|
||||
platform.tscn::PackedScene::8641027994130079701::1724634489::0::1::::<><>::
|
||||
::res://scenes/::1727115683
|
||||
bullet.tscn::PackedScene::6880909734590904373::1727115683::0::1::::<><>::res://scripts/bullet.gd
|
||||
character.tscn::PackedScene::451838158579532324::1727115683::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://c0iiaebonyhh0::::res://graphics/Player Idle/Player Idle 48x48.png<>uid://xgoqfqmvorcx::::res://graphics/Player Jump/player jump 48x48.png<>uid://vn23qn3f0dvc::::res://graphics/Player Run/player run 48x48.png
|
||||
crate.tscn::PackedScene::41931541512830250::1727115683::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png
|
||||
game.tscn::PackedScene::1738196330916037717::1727115683::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dwb83f7uoweuy::::res://graphics/Terrain (32x32).png<>res://scripts/Trigger.gd<>uid://ukuu7p7vhlq::::res://scenes/crate.tscn<>uid://dvd1p6xue0ub2::::res://scenes/platform.tscn<>uid://dly4g7fvvtamm::::res://graphics/background/BG Image.png<>uid://cw50mfjp2np08::::res://graphics/background/Additional Sky.png<>uid://6olcj1w1svdg::::res://graphics/background/Additional Water.png
|
||||
platform.tscn::PackedScene::8641027994130079701::1727115683::0::1::::<><>::
|
||||
::res://scripts/::1722811640
|
||||
bullet.gd::GDScript::-1::1722277386::0::1::::<>Area2D<>::
|
||||
CharacterBody2D.gd::GDScript::-1::1722287010::0::1::::<>CharacterBody2D<>::
|
||||
|
@ -35,7 +35,7 @@ state={
|
||||
"folded_lines": Array[int]([]),
|
||||
"h_scroll_position": 0,
|
||||
"row": 13,
|
||||
"scroll_position": 14.0,
|
||||
"scroll_position": 0.0,
|
||||
"selection": false,
|
||||
"syntax_highlighter": "GDScript"
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user