Merge pull request #147 from FARSCOPE-UKRAS-Festival-Game-Dev/fixes-f…

…or-1.0.7

Fixes for 1.0.7

Assets/credits.json

@@ -6,6 +6,7 @@
 		"Game Design",
 		"Story",
 		"Modellers",
+		"Testing",
 		"Administration",
 		"External Assets",
 		"With thanks to",
@@ -45,6 +46,9 @@
 		"Alex Smith",
 		"Wong Weijie"
 	],
+	"Testing": [
+		"Liam Fletcher"
+	],
 	"Administration": [
 		"Paul Harper",
 		"Michael Secker",
@@ -77,8 +81,8 @@
 		"Cave Drone: EminYILDRIM",
 		"fire crackling: daenerys",
 		"Waterfall: nsmusic",
-		"100% synthesis : unfa",
-		"Success.wav : Kagateni",
+		"Success.wav: Kagateni",
+		"computer inside: trouby",
 		"",
 		"Other Assets",
 		"Icons from Flaticon.com",

README.md

@@ -32,46 +32,46 @@ This project is licensed under the MIT License. See [License](License) for furth
 ## Credits
 
 ### Producers
-* Mickey Li,
-* Julian Hird,
+* Mickey Li
+* Julian Hird
 * Gabriella Miles
 
 ### Game Development
-* Julian Hird,
-* Mickey Li,
-* Wong Weijie,
-* Arturs Elksnis,
-* Kirsty Aquilina,
-* Peter Wharton,
-* Hendrik Eichhorn,
-* Zhun Chen Yek,
+* Julian Hird
+* Mickey Li
+* Wong Weijie
+* Arturs Elksnis
+* Kirsty Aquilina
+* Peter Wharton
+* Hendrik Eichhorn
+* Zhun Chen Yek
 * Mihai Anca
 
 ### Game Design
-* Gabriella Miles,
-* Valentina Lo Gatto,
-* Alex Smith,
+* Gabriella Miles
+* Valentina Lo Gatto
+* Alex Smith
 * Vimbai Gore-Strachan
 
 ### Story
-* Gabriella Miles,
-* Valentina Lo Gatto,
-* Alex Smith,
+* Gabriella Miles
+* Valentina Lo Gatto
+* Alex Smith
 * Julian Hird
 
 ### Modellers
-* Gabriella Miles,
-* Alex Smith,
+* Gabriella Miles
+* Alex Smith
 * Wong Weijie
 
 ### Testing
 * Liam Fletcher
 
 ### Thanks to
-* Paul Harper,
-* Michael Secker,
-* Aneta Taylor,
-* Prof Jonathan Rossiter,
-* Claire Asher,
+* Paul Harper
+* Michael Secker
+* Aneta Taylor
+* Prof Jonathan Rossiter
+* Claire Asher
 * UKRAS Robotics Festival 2021, ESPRC, FARSCOPE, University of Bristol, University of West England, Bristol Robotics Laboratory
 * Made with Godot - godotengine.org/license

Robot/ControlPanelElements/WhiskerPanel.gd

@@ -55,11 +55,6 @@ func _ready():
 
 	reset_analyse_anim()
 
-
-	#this fixes a bug with the animated texture, texture must play through at some point for one_shot to work correctly
-	#make texture invisible and let it play
-	whisker_reveal.texture.pause = false
-	whisker_reveal.visible = false
 
 
 func set_sensor_class(sclass):
@@ -129,15 +124,11 @@ func reset_analyse_anim():
 	whisker_analyse.texture = texture_output
 	whisker_wipe.visible = false
 	whisker_analyse.visible = false
-	whisker_reveal.texture.pause = true
-	whisker_reveal.texture.current_frame = 0
-	whisker_reveal.texture.fps = 16
+
 	remove_key_points()
 
 func play_analyse_anim():
 	reset_analyse_anim()
-	whisker_reveal.visible = true
-	whisker_reveal.texture.pause = false
 	whisker_anim.stop()#stop all animations other wise previously queued animations might play on top of each over
 	whisker_anim.clear_queue()
 	whisker_anim.play("whisker_reveal")

Robot/ControlPanelElements/WhiskerPanel.tscn

@@ -1,13 +1,29 @@
-[gd_scene load_steps=13 format=2]
+[gd_scene load_steps=29 format=2]
 
 [ext_resource path="res://Assets/Fonts/NormalTextFont.tres" type="DynamicFont" id=1]
 [ext_resource path="res://Assets/Images/reddot.png" type="Texture" id=2]
 [ext_resource path="res://Assets/Images/Whiskers.png" type="Texture" id=3]
 [ext_resource path="res://Robot/ControlPanelElements/WhiskerPanel.gd" type="Script" id=4]
-[ext_resource path="res://Assets/Images/WhiskerPanel.tres" type="Texture" id=5]
-[ext_resource path="res://Assets/Audio/effects/whisker1.wav" type="AudioStream" id=6]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_1.png" type="Texture" id=5]
+[ext_resource path="res://Assets/Audio/effects/whisker2.wav" type="AudioStream" id=6]
+[ext_resource path="res://Assets/Images/TactileInfoImages/FireWood.jpg" type="Texture" id=7]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_4.png" type="Texture" id=8]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_5.png" type="Texture" id=9]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_8.png" type="Texture" id=10]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_3.png" type="Texture" id=11]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_0.png" type="Texture" id=12]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_13.png" type="Texture" id=13]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_9.png" type="Texture" id=14]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_6.png" type="Texture" id=15]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_12.png" type="Texture" id=16]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_15.png" type="Texture" id=17]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_10.png" type="Texture" id=18]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_14.png" type="Texture" id=19]
 [ext_resource path="res://Robot/ControlPanelElements/WhiskerRevealImport.gd" type="Script" id=20]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_11.png" type="Texture" id=21]
 [ext_resource path="res://Assets/Images/WhiskerWipe.png" type="Texture" id=22]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_7.png" type="Texture" id=23]
+[ext_resource path="res://Assets/Images/whisker_reveal_overlay/reveal_sweep_2.png" type="Texture" id=24]
 
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 0.0
@@ -141,6 +157,7 @@ tracks/7/keys = {
 }
 
 [sub_resource type="Animation" id=4]
+step = 0.06
 tracks/0/type = "value"
 tracks/0/path = NodePath("AspectRatioContainer/Panel/CenterContainer/TextPanel/DisplayText:text")
 tracks/0/interp = 1
@@ -166,16 +183,16 @@ tracks/1/keys = {
 "values": [ 0.0, 1.0 ]
 }
 tracks/2/type = "value"
-tracks/2/path = NodePath("AspectRatioContainer/Panel/WhiskerReveal:visible")
+tracks/2/path = NodePath("AspectRatioContainer/Panel/WhiskerReveal:texture")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/imported = false
 tracks/2/enabled = true
 tracks/2/keys = {
-"times": PoolRealArray( 0, 1 ),
-"transitions": PoolRealArray( 1, 1 ),
-"update": 2,
-"values": [ true, false ]
+"times": PoolRealArray( 0, 0.06, 0.12, 0.18, 0.24, 0.3, 0.36, 0.42, 0.48, 0.54, 0.6, 0.66, 0.72, 0.78, 0.84, 0.9 ),
+"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ),
+"update": 1,
+"values": [ ExtResource( 12 ), ExtResource( 5 ), ExtResource( 24 ), ExtResource( 11 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 15 ), ExtResource( 23 ), ExtResource( 10 ), ExtResource( 14 ), ExtResource( 18 ), ExtResource( 21 ), ExtResource( 16 ), ExtResource( 13 ), ExtResource( 19 ), ExtResource( 17 ) ]
 }
 
 [node name="WhiskerPanel" type="Control"]
@@ -225,14 +242,14 @@ anchor_left = 0.021
 anchor_top = 0.196
 anchor_right = 0.886
 anchor_bottom = 0.813
+texture = ExtResource( 7 )
 expand = true
 stretch_mode = 7
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="WhiskerAnalyse" type="TextureRect" parent="AspectRatioContainer/Panel"]
-visible = false
 anchor_left = 0.022
 anchor_top = 0.196
 anchor_right = 0.884
@@ -245,10 +262,9 @@ __meta__ = {
 }
 
 [node name="WhiskerAnalyseWipe" type="TextureRect" parent="AspectRatioContainer/Panel"]
-visible = false
-anchor_left = 0.806
+anchor_left = 0.022
 anchor_top = 0.196
-anchor_right = 0.884
+anchor_right = 0.1
 anchor_bottom = 0.813
 margin_left = 2.90511
 margin_top = -0.182938
@@ -262,13 +278,12 @@ __meta__ = {
 }
 
 [node name="WhiskerReveal" type="TextureRect" parent="AspectRatioContainer/Panel"]
-visible = false
 anchor_left = 0.022
 anchor_top = 0.196
 anchor_right = 0.884
 anchor_bottom = 0.813
 margin_bottom = 3.05176e-05
-texture = ExtResource( 5 )
+texture = ExtResource( 17 )
 expand = true
 stretch_mode = 1
 script = ExtResource( 20 )
@@ -382,9 +397,9 @@ __meta__ = {
 }
 
 [node name="TextPanel" type="PanelContainer" parent="AspectRatioContainer/Panel/CenterContainer"]
-margin_left = 99.0
+margin_left = 108.0
 margin_top = 2.0
-margin_right = 267.0
+margin_right = 258.0
 margin_bottom = 43.0
 custom_styles/panel = SubResource( 2 )
 __meta__ = {
@@ -394,11 +409,11 @@ __meta__ = {
 [node name="DisplayText" type="Label" parent="AspectRatioContainer/Panel/CenterContainer/TextPanel"]
 margin_left = 20.0
 margin_top = 2.0
-margin_right = 148.0
+margin_right = 130.0
 margin_bottom = 34.0
 custom_fonts/font = ExtResource( 1 )
 custom_colors/font_color = Color( 0.0666667, 0.811765, 0.278431, 1 )
-text = "Analysing..."
+text = "Acquiring"
 align = 1
 valign = 1
 __meta__ = {

Utilities/Globals.gd

@@ -205,6 +205,12 @@ func free_game():
 func free_control_panel():
 	control_panel_ui.queue_free()
 	control_panel_loaded = false
+
+	book_overlay = null
+	joystick = null
+	dialog_popup = null
+	objective_popup = null
+	mission_popup  = null
 	print("control_panel_gone")
 
 func init_control_panel():