From d33ffa77465cce5bd7cbfbc81b2599b42b2c9691 Mon Sep 17 00:00:00 2001 From: mschieber <morgane.schieber@etu.unistra.fr> Date: Sun, 15 Mar 2020 20:03:12 +0100 Subject: [PATCH] #81 add a informative label + script modifications on characterSelection --- cmi2/scenes/CharacterSelection.tscn | 4 ++-- cmi2/scenes/characterSelection.gd | 36 ++++++++++++++++++----------- cmi2/scenes/multiSelectMenu.gd | 2 +- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/cmi2/scenes/CharacterSelection.tscn b/cmi2/scenes/CharacterSelection.tscn index 50f1826..2664dde 100644 --- a/cmi2/scenes/CharacterSelection.tscn +++ b/cmi2/scenes/CharacterSelection.tscn @@ -449,7 +449,7 @@ custom_constants/margin_top = 20 custom_constants/margin_left = 80 custom_constants/margin_bottom = 20 -[node name="TextureButton" type="TextureButton" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/buttonPlayMargin"] +[node name="playButton" type="TextureButton" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/buttonPlayMargin"] margin_left = 80.0 margin_top = 20.0 margin_right = 382.0 @@ -461,7 +461,7 @@ texture_normal = ExtResource( 18 ) expand = true stretch_mode = 5 -[node name="playButton" type="Button" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/buttonPlayMargin"] +[node name="ouibon" type="Button" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/buttonPlayMargin"] visible = false margin_left = 80.0 margin_top = 20.0 diff --git a/cmi2/scenes/characterSelection.gd b/cmi2/scenes/characterSelection.gd index 35b074f..184faa4 100644 --- a/cmi2/scenes/characterSelection.gd +++ b/cmi2/scenes/characterSelection.gd @@ -15,6 +15,7 @@ var CHAR3 var CHAR4 var BACK var OPTIONS +var PLAY var CHARPIC1 = preload("res://assets/selectChar/charPic.jpg") var CHARPIC2 = preload("res://assets/selectChar/charPic.jpg") @@ -38,6 +39,7 @@ func _ready(): CHAR4 = $MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/ScrollContainer/GridContainer/char4 BACK = $MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer/back OPTIONS = $MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer/options + PLAY = $MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/buttonPlayMargin/playButton # Connect all the buttons CHAR1.connect("pressed", self, "characterSelected", ["char1"]) @@ -46,6 +48,7 @@ func _ready(): CHAR4.connect("pressed", self, "characterSelected", ["char4"]) BACK.connect("pressed", self, "buttonHeader", ["back"]) OPTIONS.connect("pressed", self, "buttonHeader", ["settings"]) + PLAY.connect("pressed", self, "buttonHeader", ["play"]) # Default character selected characterSelected("char1") @@ -64,7 +67,7 @@ func _process(delta): yWindow = get_viewport().size.y #var x = float(xWindow)*ratio var y = float(yWindow)*ratio-stat_size - print(stat_size) + #print(stat_size) #var brick_texture = anim_player.Frames.GetFrame("blue", 0); #anim_player.set_size(Vector2(y,y)) @@ -111,25 +114,25 @@ func characterSelected(character): if character == "char1": _setTextureCharacter(CHARPIC1) _setTextureProgress(SKILL_1, 45) - _setTextureProgress(SKILL_2, 15) - _setTextureProgress(SKILL_3, 76) - _setTextureProgress(SKILL_4, 54) + _setTextureProgress(SKILL_2, 78) + _setTextureProgress(SKILL_3, 39) + _setTextureProgress(SKILL_4, 27) _setAnimatedSpriteCharacter("char1/true_size_10",99) - _setNameCharacter("Madame Berceuse") + _setNameCharacter("Lady Lullaby") if character == "char2": _setTextureCharacter(CHARPIC2) - _setTextureProgress(SKILL_1, 27) - _setTextureProgress(SKILL_2, 75) - _setTextureProgress(SKILL_3, 63) - _setTextureProgress(SKILL_4, 32) + _setTextureProgress(SKILL_1, 68) + _setTextureProgress(SKILL_2, 43) + _setTextureProgress(SKILL_3, 87) + _setTextureProgress(SKILL_4, 41) _setAnimatedSpriteCharacter("char2/",1) _setNameCharacter("Monsieur Disco") if character == "char3": _setTextureCharacter(CHARPIC3) - _setTextureProgress(SKILL_1, 40) - _setTextureProgress(SKILL_2, 16) - _setTextureProgress(SKILL_3, 74) - _setTextureProgress(SKILL_4, 58) + _setTextureProgress(SKILL_1, 21) + _setTextureProgress(SKILL_2, 74) + _setTextureProgress(SKILL_3, 32) + _setTextureProgress(SKILL_4, 68) _setAnimatedSpriteCharacter("char3/angela",95) _setNameCharacter("Angela") if character == "char4": @@ -147,4 +150,9 @@ func buttonHeader(button_name): if button_name == "back": globals.load_new_scene("res://scenes/MultiSelectMenu.tscn") elif button_name == "settings": - globals.load_new_scene("res://scenes/Settings.tscn") \ No newline at end of file + globals.load_new_scene("res://scenes/Settings.tscn") + elif button_name == "play": + print("SEND THE USER AND THE CHARACTER TO THE SERVER") + print("THE SERVER WILL DO THE REST I THINK") + print("PUT THE GAME HERE") + print("AAAAAAAAAH") \ No newline at end of file diff --git a/cmi2/scenes/multiSelectMenu.gd b/cmi2/scenes/multiSelectMenu.gd index 6d8c8e1..f54bfd9 100644 --- a/cmi2/scenes/multiSelectMenu.gd +++ b/cmi2/scenes/multiSelectMenu.gd @@ -36,7 +36,7 @@ func _ready(): func selectedGame(button_name,playerNumber): var globals = get_node("/root/Globals") globals.NUMBER_OF_PLAYERS = playerNumber - globals.load_new_scene("res://scenes/MultiMode.tscn") + globals.load_new_scene("res://scenes/CharacterSelection.tscn") func buttonHeader(button_name): var globals = get_node("/root/Globals") -- GitLab