Skip to content

Commit

Permalink
Basically, the build
Browse files Browse the repository at this point in the history
  • Loading branch information
outfrost committed Apr 27, 2021
1 parent 28bbe4d commit 10c79a3
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 9 deletions.
5 changes: 2 additions & 3 deletions character/PlayerCharacter.gd
Original file line number Diff line number Diff line change
Expand Up @@ -280,15 +280,13 @@ func take_damage(dmg: float, fire_dmg: float, ice_dmg: float, wind_dmg: float):
self.health = 75.0

func entered_lootable_range(lootable):
print_debug(lootable)
current_lootable = lootable

func exited_lootable_range(lootable):
if lootable == current_lootable:
current_lootable = null

func entered_interactive_range(interactive):
print_debug(interactive)
current_interactive = interactive

func exited_interactive_range(interactive):
Expand All @@ -301,7 +299,8 @@ func print_inventory():
print("%s (%d)" % [Item.type_str(entry), inventory[entry]])

func _process(delta):
DebugLabel.display(self, self.health)
# DebugLabel.display(self, self.health)
pass

func _update_health_display():
for heart in range($CanvasLayer/HealthBar.get_child_count()):
Expand Down
4 changes: 4 additions & 0 deletions environment/props/TableWide1.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ __meta__ = {
}

[node name="RecipeLabel" type="Label" parent="CanvasLayer/CraftingPanel"]
visible = false
margin_left = 300.0
margin_top = 150.0
margin_right = 510.0
Expand All @@ -238,3 +239,6 @@ custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
text = "Test"
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": false
}
6 changes: 3 additions & 3 deletions environment/props/TableWide2.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
[ext_resource path="res://game/ui-theme/font_large.tres" type="DynamicFont" id=6]
[ext_resource path="res://game/ui-theme/oinventoryitembackground.png" type="Texture" id=7]

[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 30, 5 )
[sub_resource type="CircleShape2D" id=3]
radius = 40.0

[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 30, 5 )
Expand All @@ -18,7 +18,7 @@ script = ExtResource( 2 )

[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 8 )
shape = SubResource( 1 )
shape = SubResource( 3 )

[node name="StaticBody2D" type="StaticBody2D" parent="."]

Expand Down
84 changes: 82 additions & 2 deletions game/menu/MainMenu.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ margin_top = -64.0
margin_right = 512.0
margin_bottom = -8.0
grow_vertical = 0
text = "v0.1.4"
text = "v0.1.5"
valign = 2
__meta__ = {
"_edit_use_anchors_": false
Expand Down Expand Up @@ -137,7 +137,38 @@ margin_left = 16.0
margin_top = 16.0
margin_right = -8.0
margin_bottom = -66.0
custom_fonts/normal_font = ExtResource( 1 )
custom_colors/default_color = Color( 0, 0, 0, 1 )
custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
bbcode_enabled = true
bbcode_text = "[center]A Ludum Dare 48 game
Art, animation
Zoe Anslow Gwilliam
Music, sound design
Marek Domagała
Programming, creative direction
Outfrost
Level design, programming
666Savior
[/center]"
text = "A Ludum Dare 48 game
Art, animation
Zoe Anslow Gwilliam
Music, sound design
Marek Domagała
Programming, creative direction
Outfrost
Level design, programming
666Savior
"
__meta__ = {
"_edit_use_anchors_": false
}
Expand All @@ -150,7 +181,42 @@ margin_left = 8.0
margin_top = 16.0
margin_right = -16.0
margin_bottom = -66.0
custom_fonts/normal_font = ExtResource( 1 )
custom_colors/default_color = Color( 0, 0, 0, 1 )
custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
bbcode_enabled = true
bbcode_text = "[center]
Font by
Poppy Works
CC BY 4.0
Godot Engine 3.3[/center]"
text = "
Font by
Poppy Works
CC BY 4.0
Godot Engine 3.3"
__meta__ = {
"_edit_use_anchors_": false
}
Expand Down Expand Up @@ -206,7 +272,21 @@ custom_fonts/normal_font = ExtResource( 1 )
custom_colors/default_color = Color( 0, 0, 0, 1 )
custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
bbcode_enabled = true
text = "Controls:"
text = "Keyboard and mouse controls:
W A S D ↑ ← ↓ → Move
Space Enter Mouse1 Attack
F L Use
Q E [ ] Cycle attack modifiers
Backspace Reset game and go back to menu
Gamepad controls:
Left stick Move
L2 R2 Attack
A Use
L1 R1 Cycle attack modifiers"
__meta__ = {
"_edit_use_anchors_": false
}
Expand Down
4 changes: 3 additions & 1 deletion project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ menu={
use={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":70,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":69,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":76,"unicode":0,"echo":false,"script":null)
]
}
move_up={
Expand Down Expand Up @@ -123,6 +123,8 @@ attack={
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":6,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":7,"pressure":0.0,"pressed":false,"script":null)
]
}
next_attack_mod={
Expand Down

0 comments on commit 10c79a3

Please sign in to comment.