RC 1HEADtrunk

23 files changed, 79 insertions, 85 deletions

diff --git a/.DS_Store b/.DS_Store
index a34ebd0..2fbf38c 100644
--- a/.DS_Store
+++ b/.DS_Store
diff --git a/assets/.DS_Store b/assets/.DS_Store
index bae1ad6..c9bd418 100644
--- a/assets/.DS_Store
+++ b/assets/.DS_Store
diff --git a/assets/audio/.DS_Store b/assets/audio/.DS_Store
new file mode 100644
index 0000000..a73c122
--- /dev/null
+++ b/assets/audio/.DS_Store
diff --git a/assets/audio/music/.DS_Store b/assets/audio/music/.DS_Store
new file mode 100644
index 0000000..5008ddf
--- /dev/null
+++ b/assets/audio/music/.DS_Store
diff --git a/assets/audio/music/untitled.mp3 b/assets/audio/music/credits.mp3
index 82f0d50..82f0d50 100644
--- a/assets/audio/music/untitled.mp3
+++ b/assets/audio/music/credits.mp3
diff --git a/assets/audio/music/credits.mp3.import b/assets/audio/music/credits.mp3.import
new file mode 100644
index 0000000..d5965f5
--- /dev/null
+++ b/assets/audio/music/credits.mp3.import
@@ -0,0 +1,15 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+path="res://.import/credits.mp3-3781f4884fb21ade1c70161e9ad968ff.mp3str"
+
+[deps]
+
+source_file="res://assets/audio/music/credits.mp3"
+dest_files=[ "res://.import/credits.mp3-3781f4884fb21ade1c70161e9ad968ff.mp3str" ]
+
+[params]
+
+loop=true
+loop_offset=0
diff --git a/assets/audio/music/game-demo.mp3 b/assets/audio/music/game-demo.mp3
deleted file mode 100644
index 0a0183c..0000000
--- a/assets/audio/music/game-demo.mp3
+++ /dev/null
diff --git a/assets/audio/music/game-demo.mp3.import b/assets/audio/music/game-demo.mp3.import
deleted file mode 100644
index 162463f..0000000
--- a/assets/audio/music/game-demo.mp3.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-path="res://.import/game-demo.mp3-e1f529ab4c53f3568d1b6c1c422a1459.mp3str"
-
-[deps]
-
-source_file="res://assets/audio/music/game-demo.mp3"
-dest_files=[ "res://.import/game-demo.mp3-e1f529ab4c53f3568d1b6c1c422a1459.mp3str" ]
-
-[params]
-
-loop=true
-loop_offset=0
diff --git a/assets/audio/music/menu.old.mp3 b/assets/audio/music/menu.old.mp3
deleted file mode 100644
index 0f3646d..0000000
--- a/assets/audio/music/menu.old.mp3
+++ /dev/null
diff --git a/assets/audio/music/menu.old.mp3.import b/assets/audio/music/menu.old.mp3.import
deleted file mode 100644
index b121b43..0000000
--- a/assets/audio/music/menu.old.mp3.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-path="res://.import/menu.old.mp3-eb8243af0a477ad1ad36a1859fa52c39.mp3str"
-
-[deps]
-
-source_file="res://assets/audio/music/menu.old.mp3"
-dest_files=[ "res://.import/menu.old.mp3-eb8243af0a477ad1ad36a1859fa52c39.mp3str" ]
-
-[params]
-
-loop=true
-loop_offset=0
diff --git a/assets/audio/music/untitled.mp3.import b/assets/audio/music/untitled.mp3.import
deleted file mode 100644
index 8ef4800..0000000
--- a/assets/audio/music/untitled.mp3.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-path="res://.import/untitled.mp3-098482a3d5ecec7c8496b4f1988334c1.mp3str"
-
-[deps]
-
-source_file="res://assets/audio/music/untitled.mp3"
-dest_files=[ "res://.import/untitled.mp3-098482a3d5ecec7c8496b4f1988334c1.mp3str" ]
-
-[params]
-
-loop=true
-loop_offset=0
diff --git a/assets/audio/music/~$game4.mp3.import b/assets/audio/music/~$game4.mp3.import
deleted file mode 100644
index 6e14e5e..0000000
--- a/assets/audio/music/~$game4.mp3.import
+++ /dev/null
@@ -1,13 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-valid=false
-
-[deps]
-
-source_file="res://assets/audio/music/~$game4.mp3"
-[params]
-
-loop=true
-loop_offset=0
diff --git a/assets/audio/sounds/.DS_Store b/assets/audio/sounds/.DS_Store
new file mode 100644
index 0000000..5008ddf
--- /dev/null
+++ b/assets/audio/sounds/.DS_Store
diff --git a/assets/audio/sounds/core_assets_sounds_shootBig.ogg b/assets/audio/sounds/core_assets_sounds_shootBig.ogg
deleted file mode 100644
index 9bc3bf0..0000000
--- a/assets/audio/sounds/core_assets_sounds_shootBig.ogg
+++ /dev/null
diff --git a/assets/audio/sounds/core_assets_sounds_shootBig.ogg.import b/assets/audio/sounds/core_assets_sounds_shootBig.ogg.import
deleted file mode 100644
index 9490ebd..0000000
--- a/assets/audio/sounds/core_assets_sounds_shootBig.ogg.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="ogg_vorbis"
-type="AudioStreamOGGVorbis"
-path="res://.import/core_assets_sounds_shootBig.ogg-05597ab5a77a3abf9fa273f77ffb85e6.oggstr"
-
-[deps]
-
-source_file="res://assets/audio/sounds/core_assets_sounds_shootBig.ogg"
-dest_files=[ "res://.import/core_assets_sounds_shootBig.ogg-05597ab5a77a3abf9fa273f77ffb85e6.oggstr" ]
-
-[params]
-
-loop=true
-loop_offset=0
diff --git a/export_presets.cfg b/export_presets.cfg
index 7d8626a..0ce78f6 100644
--- a/export_presets.cfg
+++ b/export_presets.cfg
@@ -400,8 +400,8 @@ keystore/release="/Users/minteck/Code/Foxperson Keys/fluff.keystore"
 keystore/release_user="fluff"
 keystore/release_password="w9AFUMuEj76XbKg73beDSDsPedwUwWAz"
 one_click_deploy/clear_previous_install=false
-version/code=12
-version/name="0.6.1.11"
+version/code=13
+version/name="0.6.2.4"
 version/min_sdk=19
 version/target_sdk=30
 package/unique_name="org.minteck.fluff"
diff --git a/src/Globals/global_SystemVariables.gd b/src/Globals/global_SystemVariables.gd
index 0b476d9..1608bec 100644
--- a/src/Globals/global_SystemVariables.gd
+++ b/src/Globals/global_SystemVariables.gd
@@ -32,20 +32,20 @@ var gameName = "Foxperson"
 
 # Put the "commercial" version of the game. The full version is crafted from
 # the release series + the "commercial" version.
-var gameVersion = "2.4"
+var gameVersion = "1"
 
 # Put the user-friendly release series name. This is what will be shown to the
 # end user
-var gameRelease = "Developer Beta"
+var gameRelease = "Release Candidate"
 
 # Put the internal release series version. It will be used to craft the internal
 # version name.
-var gameSeries = "0.6"
+var gameSeries = "0.7"
 
 # Do not touch this value, it is set automatically as part of the CI pipeline.
 var gameVerID = "dev"
 #var gameVerID = "135"
-#ver gameVerID = "136.2021.2.3.main"
+#var gameVerID = "157.3.4.2.gplay"
 
 # Put 'true' to enable various debugging options (including the OS version
 # info), or put 'false' to enable production-ready options.
diff --git a/src/InterfaceElements/CreditsView.tscn b/src/InterfaceElements/CreditsView.tscn
index 94e25dd..4ac82b6 100644
--- a/src/InterfaceElements/CreditsView.tscn
+++ b/src/InterfaceElements/CreditsView.tscn
@@ -49,7 +49,7 @@ __meta__ = {
 
 [node name="Label" type="Label" parent="ScrollContainer"]
 margin_right = 961.0
-margin_bottom = 1153.0
+margin_bottom = 1255.0
 custom_fonts/font = SubResource( 1 )
 text = "{GameApplicationName}
     {GameApplicationRelease} {GameApplicationVersion}
@@ -62,8 +62,9 @@ Lead
 
 Support and Tips
     CrimsonFork
-    antoine62
+    emberflower
     Okusin
+    Cloudburst System
 
 Pixel Art
     Minteck
@@ -84,6 +85,8 @@ Sound Effects
     LittleRobotSoundFactory (under CC BY 3.0)
     Mindustry Team
 
+Thanks to everyone and everypony
+who contributed to the game,
 and thanks to you for playing!"
 script = ExtResource( 2 )
 
@@ -107,4 +110,5 @@ stream = ExtResource( 4 )
 volume_db = 5.0
 script = ExtResource( 5 )
 
+[connection signal="credits_off" from="." to="." method="_on_ColorRect_credits_off"]
 [connection signal="pressed" from="Button" to="." method="_on_Button_pressed"]
diff --git a/src/InterfaceElements/HUD.tscn b/src/InterfaceElements/HUD.tscn
index 893b036..65c398a 100644
--- a/src/InterfaceElements/HUD.tscn
+++ b/src/InterfaceElements/HUD.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=75 format=2]
+[gd_scene load_steps=76 format=2]
 
 [ext_resource path="res://assets/fonts.ttf" type="DynamicFontData" id=1]
 [ext_resource path="res://src/SceneScripts/HUD/HUD.gd" type="Script" id=2]
@@ -139,6 +139,10 @@ font_data = ExtResource( 1 )
 
 [sub_resource type="StyleBoxEmpty" id=42]
 
+[sub_resource type="DynamicFont" id=44]
+size = 20
+font_data = ExtResource( 1 )
+
 [node name="HUD" type="CanvasLayer"]
 script = ExtResource( 2 )
 __meta__ = {
@@ -886,6 +890,23 @@ custom_styles/focus = SubResource( 40 )
 custom_styles/disabled = SubResource( 41 )
 custom_styles/normal = SubResource( 42 )
 text = "Y"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="ReleaseCandidateNotice" type="Label" parent="."]
+anchor_left = 1.0
+anchor_right = 1.0
+margin_left = -570.0
+margin_top = 10.0
+margin_right = -10.0
+margin_bottom = 32.0
+custom_colors/font_color = Color( 1, 0.913725, 0, 1 )
+custom_fonts/font = SubResource( 44 )
+text = "Release Candidate - bug reports: youtrack.minteck.org"
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [connection signal="pressed" from="ScoreLabel" to="." method="_on_ScoreLabel_pressed"]
 [connection signal="button_down" from="StartButton" to="." method="_on_StartButton_button_down"]
diff --git a/src/InterfaceElements/Main.tscn b/src/InterfaceElements/Main.tscn
index 0270aa2..79745af 100644
--- a/src/InterfaceElements/Main.tscn
+++ b/src/InterfaceElements/Main.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=2]
+[gd_scene load_steps=17 format=2]
 
 [ext_resource path="res://src/SceneScripts/Main/TextureRect.gd" type="Script" id=1]
 [ext_resource path="res://src/SceneScripts/Main/Main.gd" type="Script" id=2]
@@ -14,6 +14,7 @@
 [ext_resource path="res://src/InterfaceElements/LicensesView.tscn" type="PackedScene" id=12]
 [ext_resource path="res://src/InterfaceElements/Player.tscn" type="PackedScene" id=13]
 [ext_resource path="res://src/InterfaceElements/Pause.tscn" type="PackedScene" id=14]
+[ext_resource path="res://assets/audio/music/credits.mp3" type="AudioStream" id=15]
 
 [sub_resource type="Curve2D" id=1]
 _data = {
@@ -69,6 +70,11 @@ autoplay = true
 script = ExtResource( 6 )
 effective_volume_db = 1.0
 
+[node name="CreditsMusic" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 15 )
+script = ExtResource( 6 )
+effective_volume_db = -1.0
+
 [node name="DeathSound" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 8 )
 volume_db = 5.0
@@ -112,6 +118,7 @@ script = ExtResource( 6 )
 [connection signal="finished" from="GameMusic" to="." method="_on_GameMusic_finished"]
 [connection signal="timeout" from="DifficultyAdapterTimer" to="." method="_on_DifficultyAdapterTimer_timeout"]
 [connection signal="credits_event" from="HUD" to="." method="_on_HUD_credits_event"]
+[connection signal="credits_on" from="HUD" to="." method="_on_HUD_credits_on"]
 [connection signal="license_event" from="HUD" to="." method="_on_HUD_license_event"]
 [connection signal="points_giveaway" from="HUD" to="." method="_on_HUD_points_giveaway"]
 [connection signal="pwned" from="HUD" to="." method="_on_HUD_pwned"]
@@ -119,4 +126,5 @@ script = ExtResource( 6 )
 [connection signal="pause" from="Pause" to="." method="_on_Pause_pause"]
 [connection signal="quit" from="Pause" to="." method="_on_Pause_quit"]
 [connection signal="resume" from="Pause" to="." method="_on_Pause_resume"]
+[connection signal="credits_off" from="CreditsViewOuter/CreditsView" to="." method="_on_CreditsView_credits_off"]
 [connection signal="timeout" from="PwnedTimer" to="." method="_on_PwnedTimer_timeout"]
diff --git a/src/SceneScripts/CreditsLicense/CreditsView.gd b/src/SceneScripts/CreditsLicense/CreditsView.gd
index 5b718ba..5cc1098 100644
--- a/src/SceneScripts/CreditsLicense/CreditsView.gd
+++ b/src/SceneScripts/CreditsLicense/CreditsView.gd
@@ -25,8 +25,10 @@
 # Credits screen script
 
 extends ColorRect
+signal credits_off
 
 # Go back to the main menu if the "back" button is pressed.
 func _on_Button_pressed():
+	emit_signal("credits_off")
 	$ClickButtonSound.play(0)
 	self.hide()
diff --git a/src/SceneScripts/HUD/HUD.gd b/src/SceneScripts/HUD/HUD.gd
index 148514e..98f04ab 100644
--- a/src/SceneScripts/HUD/HUD.gd
+++ b/src/SceneScripts/HUD/HUD.gd
@@ -31,6 +31,7 @@ signal credits_event  # Signal sent to show CreditsView
 signal license_event  # Signal sent to show LicensesView
 signal points_giveaway  # Signal sent to give points after a challenge
 signal pwned  # Easter egg
+signal credits_on  # Viewing credits page
 
 export var completedChallenges = []  # An array containing all the localized
 									 # titles of the challenges the player
@@ -302,6 +303,7 @@ func _on_MessageTimer_timeout():
 
 # Show the CreditsView
 func _on_CreditsButton_pressed():
+	emit_signal("credits_on")
 	$ClickButtonSound.play(0)
 	emit_signal("credits_event")
 
diff --git a/src/SceneScripts/Main/Main.gd b/src/SceneScripts/Main/Main.gd
index 57dd7f5..8ade6d5 100644
--- a/src/SceneScripts/Main/Main.gd
+++ b/src/SceneScripts/Main/Main.gd
@@ -34,7 +34,8 @@ export var startingLife = 5
 var mob_spawn_rate
 export var startingMobSpeed = 1.0
 var playing = false
-export var score_multiplier = 0.5
+export var score_multiplier = 0.25
+var initial_score_multiplier
 var target
 var rotation
 var delta
@@ -46,6 +47,8 @@ var gameMusic = "game1"
 var gameName = SystemVariables.gameName
 
 func _ready():
+	initial_score_multiplier = score_multiplier
+	
 	if SystemVariables.gameArcadeMode:
 		$IncrementalLoadTimer.wait_time = .001
 		$ColorRect/DykOuter.hide()
@@ -166,7 +169,7 @@ func new_game():
 	score = 0
 	life = startingLife
 	$Player.scale = Vector2(life / 5.0, life / 5.0)
-	score_multiplier = 0.5
+	score_multiplier = initial_score_multiplier
 	$HUD.set_score_mutiplier("x" + str(score_multiplier))
 	$MobTimer.wait_time = startingMobSpeed
 	$Player.start($StartPosition.position)
@@ -369,3 +372,15 @@ func _on_HUD_pwned():
 		$Player.pwned = true
 		$HUD.pwnedOn()
 		pwnedOn = true
+
+func _on_HUD_credits_on():
+	$MenuMusic.effective_volume_db = -INF
+	$CreditsMusic.play(0)
+	pass
+
+
+func _on_CreditsView_credits_off():
+	$CreditsMusic.stop()
+	$MenuMusic.effective_volume_db = 0.0
+	$MenuMusic.play(0)
+	pass