diff --git a/client/levels/endGame/EndGame.tscn b/client/levels/endGame/EndGame.tscn index a78bdc54d2a5a0029cfbfc3685691339b48bad7a..5fd8e573cd131d98b36887777fae52b5abb46946 100644 --- a/client/levels/endGame/EndGame.tscn +++ b/client/levels/endGame/EndGame.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=26 format=2] +[gd_scene load_steps=29 format=2] [ext_resource path="res://levels/endGame/endGame.gd" type="Script" id=1] [ext_resource path="res://levels/commons/assets/fondmain.png" type="Texture" id=2] @@ -16,6 +16,9 @@ [ext_resource path="res://levels/commons/themes/endgameLabel.tres" type="Theme" id=14] [ext_resource path="res://levels/commons/themes/endgameRankLabel.tres" type="Theme" id=15] [ext_resource path="res://levels/commons/fonts/montserrat/Montserrat-Regular.otf" type="DynamicFontData" id=16] +[ext_resource path="res://levels/endGame/assets/robotwin.png" type="Texture" id=17] +[ext_resource path="res://levels/endGame/assets/reggaewin.png" type="Texture" id=18] +[ext_resource path="res://levels/endGame/assets/metalwin.png" type="Texture" id=19] [sub_resource type="StreamTexture" id=1] flags = 4 @@ -96,7 +99,7 @@ stretch_mode = 1 visible = false anchor_right = 1.0 anchor_bottom = 1.0 -texture = ExtResource( 6 ) +texture = ExtResource( 18 ) expand = true stretch_mode = 1 @@ -104,7 +107,7 @@ stretch_mode = 1 visible = false anchor_right = 1.0 anchor_bottom = 1.0 -texture = ExtResource( 6 ) +texture = ExtResource( 17 ) expand = true stretch_mode = 1 @@ -112,7 +115,7 @@ stretch_mode = 1 visible = false anchor_right = 1.0 anchor_bottom = 1.0 -texture = ExtResource( 6 ) +texture = ExtResource( 19 ) expand = true stretch_mode = 1 @@ -120,7 +123,7 @@ stretch_mode = 1 visible = false anchor_right = 1.0 anchor_bottom = 1.0 -texture = ExtResource( 6 ) +texture = ExtResource( 5 ) expand = true stretch_mode = 1 diff --git a/client/levels/endGame/assets/metalwin.png b/client/levels/endGame/assets/metalwin.png new file mode 100644 index 0000000000000000000000000000000000000000..6b000a3640c804791daa2eb6ee2a87ad8cb1f56a Binary files /dev/null and b/client/levels/endGame/assets/metalwin.png differ diff --git a/client/levels/endGame/assets/metalwin.png.import b/client/levels/endGame/assets/metalwin.png.import new file mode 100644 index 0000000000000000000000000000000000000000..e2d740e08ee27e5c69e367c187ee29866eae3142 --- /dev/null +++ b/client/levels/endGame/assets/metalwin.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/metalwin.png-677b3541d187396bdce7be81ee417e91.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://levels/endGame/assets/metalwin.png" +dest_files=[ "res://.import/metalwin.png-677b3541d187396bdce7be81ee417e91.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/client/levels/endGame/assets/reggaewin.png b/client/levels/endGame/assets/reggaewin.png new file mode 100644 index 0000000000000000000000000000000000000000..6c40fda4ce07478d6d1df86b8e70dd6b1c426d0f Binary files /dev/null and b/client/levels/endGame/assets/reggaewin.png differ diff --git a/client/levels/endGame/assets/reggaewin.png.import b/client/levels/endGame/assets/reggaewin.png.import new file mode 100644 index 0000000000000000000000000000000000000000..f7c67a5ffa72ebe6faa2d42644a28f2c0483a493 --- /dev/null +++ b/client/levels/endGame/assets/reggaewin.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/reggaewin.png-e95df8bf9b765781825e4b192ca91b50.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://levels/endGame/assets/reggaewin.png" +dest_files=[ "res://.import/reggaewin.png-e95df8bf9b765781825e4b192ca91b50.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/client/levels/endGame/assets/robotwin.png b/client/levels/endGame/assets/robotwin.png new file mode 100644 index 0000000000000000000000000000000000000000..30049f162fb05d261f94d894063fe900bc8027a7 Binary files /dev/null and b/client/levels/endGame/assets/robotwin.png differ diff --git a/client/levels/endGame/assets/robotwin.png.import b/client/levels/endGame/assets/robotwin.png.import new file mode 100644 index 0000000000000000000000000000000000000000..b3bbebbc66cd849871de6e44184eff4fd62587a3 --- /dev/null +++ b/client/levels/endGame/assets/robotwin.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/robotwin.png-a3a1d4832a8b7412479cc9b1bad58f2a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://levels/endGame/assets/robotwin.png" +dest_files=[ "res://.import/robotwin.png-a3a1d4832a8b7412479cc9b1bad58f2a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/client/levels/endGame/endGame.gd b/client/levels/endGame/endGame.gd index be267eeae27c1b7022fbaab5043470a3dadb3464..90eb4128dbfb5dc2465cce007e6615833656cf20 100644 --- a/client/levels/endGame/endGame.gd +++ b/client/levels/endGame/endGame.gd @@ -49,7 +49,7 @@ func _ready(): # Display stats # On doit récupérer le personnage joué pour idCharacter - # En théorie 1 = Lullaby, 2 = Disco, 3 = Angela, 4 = WeedMan, 6 = Electrorobot, 5 = Metal, 0 = Default (dans l'optique où on propose un default) + # En théorie 1 = Lullaby, 2 = Disco, 3 = Angela, 4 = WeedMan, 5 = Metal, 6 = Electrorobot, 0 = Default (dans l'optique où on propose un default) var idCharacter = gamestate.players[get_tree().get_network_unique_id()]["skin"] # Nombre de personnage tué par le joueur courant var kills = gamestate.endGameStats["kills"] @@ -73,7 +73,7 @@ func buttonHeader(button_name): # Display win background func displayBg(charID): - if charID == 1: + if charID == 0: LULLABY.visible = true ANGELA.visible = false FRANKY.visible = false @@ -81,7 +81,15 @@ func displayBg(charID): METAL.visible = false ELECTRO.visible = false DEFAULT.visible = false - if charID == 2: + elif charID == 1: + LULLABY.visible = true + ANGELA.visible = false + FRANKY.visible = false + WEED.visible = false + METAL.visible = false + ELECTRO.visible = false + DEFAULT.visible = false + elif charID == 2: LULLABY.visible = false ANGELA.visible = false FRANKY.visible = true @@ -89,7 +97,7 @@ func displayBg(charID): METAL.visible = false ELECTRO.visible = false DEFAULT.visible = false - if charID == 3: + elif charID == 3: LULLABY.visible = false ANGELA.visible = true FRANKY.visible = false @@ -97,6 +105,30 @@ func displayBg(charID): METAL.visible = false ELECTRO.visible = false DEFAULT.visible = false + elif charID == 4: + LULLABY.visible = false + ANGELA.visible = false + FRANKY.visible = false + WEED.visible = true + METAL.visible = false + ELECTRO.visible = false + DEFAULT.visible = false + elif charID == 5: + LULLABY.visible = false + ANGELA.visible = false + FRANKY.visible = false + WEED.visible = false + METAL.visible = true + ELECTRO.visible = false + DEFAULT.visible = false + elif charID == 6: + LULLABY.visible = false + ANGELA.visible = false + FRANKY.visible = false + WEED.visible = false + METAL.visible = false + ELECTRO.visible = true + DEFAULT.visible = false # Display stats func displayStats(rank,nbPlayers,kills,message):