Skip to content

Commit

Permalink
Work-in-progress main menu and pause menu; bats can die now
Browse files Browse the repository at this point in the history
  • Loading branch information
svntax committed Jun 27, 2016
1 parent 2e89186 commit 6e6850d
Show file tree
Hide file tree
Showing 19 changed files with 89 additions and 9 deletions.
Binary file modified Scenes/cavebat.scn
Binary file not shown.
Binary file modified Scenes/debris_lump.scn
Binary file not shown.
Binary file added Scenes/main_menu.scn
Binary file not shown.
Binary file added Scenes/main_menu_ui.scn
Binary file not shown.
Binary file added Scenes/pause_menu_ui.scn
Binary file not shown.
Binary file modified Scenes/player.scn
Binary file not shown.
Binary file added Scenes/title_tilemap.scn
Binary file not shown.
11 changes: 7 additions & 4 deletions Scripts/auto_tile.gd
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,13 @@ func _fixed_process(delta):
var sprite = find_node("Sprite")
var pos = Vector2(sprite.get_pos().x + 16, sprite.get_pos().y + 16)
pos = get_pos()
var up = !space_state.intersect_ray( pos, Vector2(pos.x, pos.y - 32), [self]).empty()
var down = !space_state.intersect_ray( pos, Vector2(pos.x, pos.y + 32), [self]).empty()
var left = !space_state.intersect_ray( pos, Vector2(pos.x - 32, pos.y), [self]).empty()
var right = !space_state.intersect_ray( pos, Vector2(pos.x + 32, pos.y), [self]).empty()
var exceptions = get_tree().get_nodes_in_group("enemies")
exceptions.append(self)
exceptions.append(get_tree().get_root().get_node("Game").get_node("Player"))
var up = !space_state.intersect_ray( pos, Vector2(pos.x, pos.y - 32), exceptions).empty()
var down = !space_state.intersect_ray( pos, Vector2(pos.x, pos.y + 32), exceptions).empty()
var left = !space_state.intersect_ray( pos, Vector2(pos.x - 32, pos.y), exceptions).empty()
var right = !space_state.intersect_ray( pos, Vector2(pos.x + 32, pos.y), exceptions).empty()

#hard-coded for specific tileset
if(!up && down && left && right):
Expand Down
8 changes: 5 additions & 3 deletions Scripts/cavebat_controls.gd
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,11 @@ func checkCollision():
var other = get_collider()
if(other.get_instance_ID() == player.get_instance_ID()):
if(!dead):
dead = true
get_node("Particles2D").set_emitting(true)
get_node("CollisionShape2D").set_trigger(true)
kill()
get_parent().find_node("Lives").damage()
player.knockback(Vector2(velX, velY))

func kill():
dead = true
get_node("Particles2D").set_emitting(true)
get_node("CollisionShape2D").set_trigger(true)
11 changes: 11 additions & 0 deletions Scripts/main_menu_controls.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

extends VBoxContainer

func _ready():
pass

func _on_StartButton_pressed():
get_tree().change_scene("res://test_scene.scn")

func _on_QuitButton_pressed():
get_tree().quit()
31 changes: 31 additions & 0 deletions Scripts/pause_menu_controls.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

extends VBoxContainer

func _ready():
pass

func _draw():
draw_rect(Rect2(-2, -2, get_size().x+4, get_size().y+4), Color(255, 255, 255))
draw_rect(Rect2(-1, -1, get_size().x+2, get_size().y+2), Color(0, 0, 0))

func toggle():
if(get_index() != get_parent().get_child_count() - 1):
get_parent().move_child(self, get_parent().get_child_count() - 1)
show()
var w = get_viewport().get_rect().size.x
var h = get_viewport().get_rect().size.y
var player = get_tree().get_nodes_in_group("players")[0]
#var playerCam = get_parent().find_node("Player").find_node("Camera2D")
var playerCam = player.find_node("Camera2D")
var x = playerCam.get_camera_pos().x - (w / 4)
var y = playerCam.get_camera_pos().y - (h / 4)
set_pos(Vector2(x, y + 40))

func _on_YesButton_pressed():
get_tree().set_pause(false)
get_tree().change_scene("res://Scenes/main_menu.scn")
hide()

func _on_NoButton_pressed():
get_tree().set_pause(false)
hide()
6 changes: 5 additions & 1 deletion Scripts/player_controls.gd
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ func _input(event):
shootProjectile(event.pos)

func _fixed_process(delta):
#vel.x = 0
if(Input.is_action_pressed("UI_PAUSE")):
if(!get_tree().is_paused()):
var pauseMenu = get_parent().find_node("PauseMenuPopup")
pauseMenu.toggle()
get_tree().set_pause(true)

if(test_move(Vector2(0, 1))):
onGround = true
Expand Down
4 changes: 4 additions & 0 deletions Scripts/rock_controls.gd
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ func _fixed_process(delta):
debris.set_pos(Vector2(debrisX, debrisY))
get_parent().add_child(debris)
debris.spawnEarth()

if(other.is_in_group("enemies")):
other.kill()

queue_free()

func setVelocity(vx, vy):
Expand Down
11 changes: 10 additions & 1 deletion engine.cfg
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
[application]

name="Godot-Jam-Procedural"
main_scene="res://test_scene.scn"
main_scene="res://Scenes/main_menu.scn"
icon="res://icon.png"

[display]

width=800
height=600

[input]

UI_PAUSE=[key(Escape)]

[render]

default_clear_color=#ff000000
Binary file added font_theme.thm
Binary file not shown.
Binary file added m5x7.fnt
Binary file not shown.
Binary file added m5x7.ttf
Binary file not shown.
Binary file modified test_scene.scn
Binary file not shown.
16 changes: 16 additions & 0 deletions title_tileset.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<resource_file type="TileSet" subresource_count="2" version="2.0" version_name="Godot Engine v2.0.stable.official">
<ext_resource path="res://Sprites/dirtTile.png" type="Texture" index="0"></ext_resource>
<main_resource>
<string name="0/name"> "Tile1" </string>
<resource name="0/texture" external="0"> </resource>
<vector2 name="0/tex_offset"> 0, 0 </vector2>
<resource name="0/material"></resource> <rect2 name="0/region"> 0, 0, 0, 0 </rect2>
<vector2 name="0/occluder_offset"> 4, 4 </vector2>
<resource name="0/occluder"></resource> <vector2 name="0/navigation_offset"> 4, 4 </vector2>
<resource name="0/navigation"></resource> <vector2 name="0/shape_offset"> 0, 0 </vector2>
<array name="0/shapes" len="0" shared="false">
</array>

</main_resource>
</resource_file>

0 comments on commit 6e6850d

Please sign in to comment.