Merge branch 'dave'

5 files changed, 156 insertions, 24 deletions

diff --git a/godot/scenes/Die.gd b/godot/scenes/Die.gd
index bae6c84..dcf165c 100644
--- a/godot/scenes/Die.gd
+++ b/godot/scenes/Die.gd
@@ -142,9 +142,8 @@ func _physics_process(delta):
 		revert_current_buff()
 		var last_buff = curr_buff
 		curr_buff = get_buff_from_upwards_side()
-		if last_buff == curr_buff && curr_buff == buff.stroke:
-			return
-		apply_buff()
+		if not(last_buff == curr_buff && curr_buff == buff.stroke):
+			apply_buff()
 
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
@@ -201,13 +200,16 @@ func get_buff_from_upwards_side():
 	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.gravity
 		
 	return buff.none
 
 
 func low_gravity():
-	gravity_scale = 0.2
+	gravity_scale = 0.3 * default_gravity
+	
+func low_gravity_revert():
+	gravity_scale = default_gravity
 
 func extra_stroke():
 	_game.revoke_stroke()
@@ -241,9 +243,20 @@ func ball_revert():
 	$BallShape.set_process(false)
 	$BallShape.disabled = true
 
-
+func buff_text():
+	match curr_buff:
+		buff.ball:
+			return ""
+		buff.bounce:
+			return "You're bouncy!"
+		buff.phase:
+			return "WooOOoOO you can phase through walls"
+		buff.gravity:
+			return "Warning, Low gravity!"
+	return ""
 
 func revert_current_buff():
+	$PowerUI/LabelBuff.text = ""
 	match curr_buff:
 		buff.ball:
 			ball_revert()
@@ -252,11 +265,11 @@ func revert_current_buff():
 		buff.phase:
 			phase_revert()
 		buff.gravity:
-			gravity_scale = default_gravity
+			low_gravity_revert()
 
 
 func apply_buff():
-	gravity_scale = default_gravity
+	$PowerUI/LabelBuff.text = buff_text()
 	match curr_buff:
 		buff.ball:
 			ball()
diff --git a/godot/scenes/Die.tscn b/godot/scenes/Die.tscn
index 5c96dbb..69727f1 100644
--- a/godot/scenes/Die.tscn
+++ b/godot/scenes/Die.tscn
@@ -1,8 +1,10 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=15 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]
 [ext_resource path="res://assets/textures/circles.png" type="Texture" id=3]
+[ext_resource path="res://assets/fonts/default_dynamicfont.tres" type="DynamicFont" id=4]
+[ext_resource path="res://assets/fonts/default_dynamicfontdata.tres" type="DynamicFontData" id=5]
 
 [sub_resource type="PhysicsMaterial" id=7]
 friction = 0.0
@@ -32,6 +34,18 @@ surfaces/0 = {
 [sub_resource type="SphereShape" id=6]
 radius = 0.1
 
+[sub_resource type="DynamicFont" id=8]
+size = 35
+font_data = ExtResource( 5 )
+
+[sub_resource type="Theme" id=9]
+ProgressBar/fonts/font = SubResource( 8 )
+
+[sub_resource type="Theme" id=10]
+Label/colors/font_color = Color( 0.933333, 0.654902, 0.0666667, 1 )
+Label/colors/font_color_shadow = Color( 0, 0, 0, 1 )
+Label/fonts/font = ExtResource( 4 )
+
 [node name="Die" type="RigidBody"]
 collision_layer = 3
 collision_mask = 3
@@ -147,13 +161,28 @@ margin_bottom = 40.0
 margin_left = 64.0
 margin_top = 44.0
 margin_right = 1185.0
-margin_bottom = 153.0
+margin_bottom = 113.0
+theme = SubResource( 9 )
+
+[node name="LabelBuff" type="Label" parent="PowerUI"]
+anchor_left = 0.689
+anchor_top = 0.068
+anchor_right = 0.914
+anchor_bottom = 0.081
+margin_left = -30.0
+margin_top = -30.0
+margin_right = 30.0
+margin_bottom = 30.0
+theme = SubResource( 10 )
+align = 2
+valign = 1
 
 [node name="PowerUI3D" type="Spatial" parent="."]
 
 [node name="Arrow" type="MeshInstance" parent="PowerUI3D"]
 
 [node name="SpriteCircles" type="Sprite3D" parent="PowerUI3D"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.506, 0 )
 cast_shadow = 0
 opacity = 0.43
 pixel_size = 0.0071
diff --git a/godot/scenes/Game.gd b/godot/scenes/Game.gd
index 09acc86..9a68659 100644
--- a/godot/scenes/Game.gd
+++ b/godot/scenes/Game.gd
@@ -83,6 +83,7 @@ func next_level():
 	post_game = false
 
 	current_level_id += 1
+
 	current_strokes = 0
 	
 	load_scene_by_index(current_level_id)
diff --git a/godot/scenes/Menu.tscn b/godot/scenes/Menu.tscn
index d5571a5..e77a18d 100644
--- a/godot/scenes/Menu.tscn
+++ b/godot/scenes/Menu.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=20 format=2]
 
 [ext_resource path="res://assets/theme.tres" type="Theme" id=1]
 [ext_resource path="res://scenes/Menu.gd" type="Script" id=2]
@@ -6,6 +6,59 @@
 [ext_resource path="res://assets/Images/icons8-mausklick-links-26.png" type="Texture" id=4]
 [ext_resource path="res://assets/Images/icons8-esc-80.png" type="Texture" id=5]
 [ext_resource path="res://assets/Images/Tab.png" type="Texture" id=6]
+[ext_resource path="res://assets/fonts/format.otf" type="DynamicFontData" id=7]
+[ext_resource path="res://assets/fonts/theme_smalltext.tres" type="Theme" id=8]
+[ext_resource path="res://assets/fonts/theme_middletext.tres" type="Theme" id=9]
+
+[sub_resource type="DynamicFont" id=1]
+size = 55
+extra_spacing_bottom = -15
+font_data = ExtResource( 7 )
+
+[sub_resource type="StyleBoxFlat" id=2]
+content_margin_top = 10.0
+content_margin_bottom = 10.0
+bg_color = Color( 0.4, 0.337255, 0.313726, 0.32549 )
+
+[sub_resource type="StyleBoxFlat" id=3]
+content_margin_top = 10.0
+content_margin_bottom = 10.0
+bg_color = Color( 0.176471, 0.14902, 0.141176, 1 )
+
+[sub_resource type="StyleBoxFlat" id=4]
+content_margin_top = 10.0
+content_margin_bottom = 10.0
+bg_color = Color( 0.4, 0.337255, 0.313726, 1 )
+
+[sub_resource type="StyleBoxFlat" id=5]
+content_margin_top = 20.0
+content_margin_bottom = 20.0
+bg_color = Color( 0.290196, 0.247059, 0.231373, 1 )
+
+[sub_resource type="StyleBoxFlat" id=6]
+content_margin_top = 10.0
+content_margin_bottom = 10.0
+bg_color = Color( 0.176471, 0.14902, 0.141176, 1 )
+
+[sub_resource type="DynamicFontData" id=8]
+font_path = "res://assets/fonts/Roboto-Medium.ttf"
+
+[sub_resource type="DynamicFont" id=9]
+size = 23
+font_data = SubResource( 8 )
+
+[sub_resource type="StyleBoxFlat" id=7]
+bg_color = Color( 0.160784, 0.133333, 0.133333, 1 )
+
+[sub_resource type="Theme" id=10]
+Button/fonts/font = SubResource( 1 )
+Button/styles/disabled = SubResource( 2 )
+Button/styles/focus = SubResource( 3 )
+Button/styles/hover = SubResource( 4 )
+Button/styles/normal = SubResource( 5 )
+Button/styles/pressed = SubResource( 6 )
+Label/fonts/font = SubResource( 9 )
+Panel/styles/panel = SubResource( 7 )
 
 [node name="Menu" type="Control"]
 anchor_right = 1.0
@@ -57,18 +110,22 @@ anchor_left = 0.8
 anchor_top = 0.6
 anchor_right = 1.0
 anchor_bottom = 7.0
+margin_left = -86.0
+margin_top = -62.0
+margin_right = 75.0
 
 [node name="Label" type="Label" parent="Credits"]
-margin_right = 384.0
+margin_right = 545.0
 margin_bottom = 51.0
-theme = ExtResource( 1 )
+theme = ExtResource( 9 )
 text = "CREDITS"
 
 [node name="RichTextLabel" type="RichTextLabel" parent="Credits"]
+visible = false
 margin_top = 55.0
-margin_right = 384.0
+margin_right = 510.0
 margin_bottom = 370.0
-theme = ExtResource( 1 )
+theme = ExtResource( 9 )
 text = "PROGRAMMING
 [Celeste]
 [Ice]
@@ -92,13 +149,32 @@ https://freesound.org/s/586838/
 "
 fit_content_height = true
 
+[node name="Label2" type="Label" parent="Credits"]
+margin_top = 55.0
+margin_right = 545.0
+margin_bottom = 455.0
+theme = SubResource( 10 )
+text = "PROGRAMMING     [Celeste]
+                                 [IceLRemius]
+                                 [Perivesta]
+							ART                          [Scarabeaver]
+
+
+MUSIC FROM FREESOUND:ORG:
+
+Main Menu: \"Relaxing Music\" by Migfus20
+https://freesound.org/s/586538/
+
+In Game: \"Background Music\" by Migfus20
+https://freesound.org/s/586838/"
+
 [node name="Label2" type="Label" parent="."]
 anchor_left = 0.05
 anchor_top = 0.2
 anchor_right = 0.3
 anchor_bottom = 0.2
 margin_bottom = 51.0
-theme = ExtResource( 1 )
+theme = ExtResource( 9 )
 text = "HOW TO PLAY"
 align = 1
 
@@ -115,7 +191,7 @@ rect_min_size = Vector2( 480, 80 )
 
 [node name="TextureRect" type="TextureRect" parent="VBoxContainer2/Control"]
 anchor_top = 0.15
-anchor_right = 0.4
+anchor_right = 0.5
 anchor_bottom = 0.85
 texture = ExtResource( 3 )
 stretch_mode = 6
@@ -124,6 +200,7 @@ stretch_mode = 6
 anchor_left = 0.4
 anchor_right = 1.0
 anchor_bottom = 1.0
+theme = ExtResource( 8 )
 text = "Move the mouse to look around."
 valign = 1
 
@@ -135,7 +212,7 @@ rect_min_size = Vector2( 480, 80 )
 
 [node name="TextureRect" type="TextureRect" parent="VBoxContainer2/Control2"]
 anchor_top = 0.15
-anchor_right = 0.4
+anchor_right = 0.5
 anchor_bottom = 0.85
 texture = ExtResource( 4 )
 stretch_mode = 6
@@ -144,6 +221,8 @@ stretch_mode = 6
 anchor_left = 0.4
 anchor_right = 1.0
 anchor_bottom = 1.0
+margin_right = 242.0
+theme = ExtResource( 8 )
 text = "Use Left Click and drag the mouse backwards to power up the shot."
 valign = 1
 autowrap = true
@@ -156,7 +235,7 @@ rect_min_size = Vector2( 480, 80 )
 
 [node name="TextureRect" type="TextureRect" parent="VBoxContainer2/Control3"]
 anchor_top = 0.15
-anchor_right = 0.4
+anchor_right = 0.5
 anchor_bottom = 0.85
 texture = ExtResource( 4 )
 stretch_mode = 6
@@ -165,6 +244,8 @@ stretch_mode = 6
 anchor_left = 0.4
 anchor_right = 1.0
 anchor_bottom = 1.0
+margin_right = 261.0
+theme = ExtResource( 8 )
 text = "Release the Mouse Button to shoot."
 valign = 1
 autowrap = true
@@ -183,9 +264,10 @@ rect_min_size = Vector2( 480, 80 )
 
 [node name="TextureRect" type="TextureRect" parent="VBoxContainer2/Control5"]
 anchor_top = 0.15
-anchor_right = 0.4
+anchor_right = 0.5
 anchor_bottom = 0.85
-margin_bottom = 24.0
+margin_top = -13.0
+margin_bottom = 11.0
 texture = ExtResource( 5 )
 stretch_mode = 4
 
@@ -193,6 +275,8 @@ stretch_mode = 4
 anchor_left = 0.4
 anchor_right = 1.0
 anchor_bottom = 1.0
+margin_right = 214.0
+theme = ExtResource( 8 )
 text = "Press Escape to Pause the game"
 valign = 1
 autowrap = true
@@ -205,9 +289,12 @@ rect_min_size = Vector2( 480, 80 )
 
 [node name="TextureRect" type="TextureRect" parent="VBoxContainer2/Control6"]
 anchor_top = 0.15
-anchor_right = 0.4
+anchor_right = 0.5
 anchor_bottom = 0.85
-margin_bottom = 24.0
+margin_left = 2.0
+margin_top = -14.0
+margin_right = 2.0
+margin_bottom = 10.0
 texture = ExtResource( 6 )
 stretch_mode = 4
 
@@ -215,6 +302,8 @@ stretch_mode = 4
 anchor_left = 0.4
 anchor_right = 1.0
 anchor_bottom = 1.0
+margin_right = 293.0
+theme = ExtResource( 8 )
 text = "Press Tab to see your current score"
 valign = 1
 autowrap = true
diff --git a/godot/scenes/levels/MainMenu.tscn b/godot/scenes/levels/MainMenu.tscn
index 8b435df..b78bd7f 100644
--- a/godot/scenes/levels/MainMenu.tscn
+++ b/godot/scenes/levels/MainMenu.tscn
@@ -65,7 +65,7 @@ stream = ExtResource( 4 )
 autoplay = true
 
 [node name="Background" type="MeshInstance" parent="."]
-transform = Transform( 93.7897, 0, 0, 0, 1, 0, 0, 0, 93.7897, 0, -3.21632, 0 )
+transform = Transform( 100, 0, 0, 0, 1, 0, 0, 0, 100, 0, -3.21632, 0 )
 mesh = SubResource( 1 )
 skin = SubResource( 5 )
 material/0 = null