diff --git a/client/levels/hud/assets/angelahud.png.import b/client/levels/hud/assets/angelahud.png.import new file mode 100644 index 0000000000000000000000000000000000000000..85dd647d0eef916251b8899aa783316dfd9d2178 --- /dev/null +++ b/client/levels/hud/assets/angelahud.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/angelahud.png-d75518b9ba59c8caea28b37a09d910b3.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://levels/hud/assets/angelahud.png" +dest_files=[ "res://.import/angelahud.png-d75518b9ba59c8caea28b37a09d910b3.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/hud/assets/disco.png b/client/levels/hud/assets/disco.png deleted file mode 100644 index 6b43e635bd325deebf2c41f62797f86c6cd74cda..0000000000000000000000000000000000000000 Binary files a/client/levels/hud/assets/disco.png and /dev/null differ diff --git a/client/levels/hud/assets/discohud.png.import b/client/levels/hud/assets/discohud.png.import new file mode 100644 index 0000000000000000000000000000000000000000..a8c6a49aa6991df49de75e7b1734ce3064bdc443 --- /dev/null +++ b/client/levels/hud/assets/discohud.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/discohud.png-2022a181700f522510ea9d108ae2904f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://levels/hud/assets/discohud.png" +dest_files=[ "res://.import/discohud.png-2022a181700f522510ea9d108ae2904f.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/hud/assets/electrohud.png.import b/client/levels/hud/assets/electrohud.png.import new file mode 100644 index 0000000000000000000000000000000000000000..689784344727faec3884228c11bb035e7e06d548 --- /dev/null +++ b/client/levels/hud/assets/electrohud.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/electrohud.png-c88ab5b153d167b1359ca381e6b1066d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://levels/hud/assets/electrohud.png" +dest_files=[ "res://.import/electrohud.png-c88ab5b153d167b1359ca381e6b1066d.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/hud/assets/lullabyhud.png.import b/client/levels/hud/assets/lullabyhud.png.import new file mode 100644 index 0000000000000000000000000000000000000000..791152271e43db36cc079ea7f85c610759f2d457 --- /dev/null +++ b/client/levels/hud/assets/lullabyhud.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/lullabyhud.png-6179bb97d587387d3ede1bf6718a85fb.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://levels/hud/assets/lullabyhud.png" +dest_files=[ "res://.import/lullabyhud.png-6179bb97d587387d3ede1bf6718a85fb.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/hud/assets/metalhud.png.import b/client/levels/hud/assets/metalhud.png.import new file mode 100644 index 0000000000000000000000000000000000000000..4565b7dc59b7044fd8f5e686616f7908adb52f58 --- /dev/null +++ b/client/levels/hud/assets/metalhud.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/metalhud.png-59b0e80ceb95dd13d6acbc69e55e7014.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://levels/hud/assets/metalhud.png" +dest_files=[ "res://.import/metalhud.png-59b0e80ceb95dd13d6acbc69e55e7014.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/hud/assets/reaggehud.png.import b/client/levels/hud/assets/reaggehud.png.import new file mode 100644 index 0000000000000000000000000000000000000000..3d0ac4ecae0250ba397c4c8f5ef2b4a3d9aee82f --- /dev/null +++ b/client/levels/hud/assets/reaggehud.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/reaggehud.png-8e05ca58e2d4f1886158b154833bcf95.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://levels/hud/assets/reaggehud.png" +dest_files=[ "res://.import/reaggehud.png-8e05ca58e2d4f1886158b154833bcf95.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/hud/hud.gd b/client/levels/hud/hud.gd index cda4818b26e6cdaf3600248b5f49aa732b8c5270..3bc43ef4eb09aa7a7f4348f663e34ee69c4d97ed 100644 --- a/client/levels/hud/hud.gd +++ b/client/levels/hud/hud.gd @@ -27,8 +27,8 @@ func _ready(): nbKills = $MarginContainer/VBoxContainer/bas/lastHit/VBoxContainer/kills inventory = $MarginContainer/VBoxContainer/bas/stats/inventaire/obj displayListPlayer() - displayNbKills() - showInventory("res://models/icon.png") + displayNbKills(0) + showInventory("res://models/player/playerArrow/playerArrow.png") func _input(ev): if ev is InputEventKey : @@ -104,8 +104,8 @@ func displayUser(name,img): userName.text = name userImg.texture = load(img) -func displayNbKills(): - nbKills.text = str(int(nbKills.text) + 1) +func displayNbKills(value): + nbKills.text = str(value) func showInventory(img): inventory.texture = load(img) diff --git a/client/levels/hud/hud.tscn b/client/levels/hud/hud.tscn index 53fb9b1794c4084ef0935c244e6588a349a9836e..a860765d6d9628a38efadecbade18fac8b90e865 100644 --- a/client/levels/hud/hud.tscn +++ b/client/levels/hud/hud.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=31 format=2] +[gd_scene load_steps=32 format=2] [ext_resource path="res://levels/hud/hud.gd" type="Script" id=1] [ext_resource path="res://levels/hud/hudListPlayers.tres" type="StyleBox" id=2] @@ -11,22 +11,19 @@ [ext_resource path="res://levels/commons/themes/mostPlayedCharaTitle.tres" type="Theme" id=9] [ext_resource path="res://levels/hud/hp_hud.gd" type="Script" id=10] [ext_resource path="res://levels/hudSettings/hudsettings.gd" type="Script" id=11] +[ext_resource path="res://levels/hud/pic_hud.gd" type="Script" id=12] [sub_resource type="StreamTexture" id=1] flags = 4 -load_path = "res://.import/hud_bg2.png-3c6e0009587ce068b78ff42b6d42129a.stex" [sub_resource type="StreamTexture" id=2] flags = 4 -load_path = "res://.import/hud_bg1.png-c137c7c9656bbc9c3f36f041e130cb80.stex" [sub_resource type="StreamTexture" id=3] flags = 4 -load_path = "res://.import/disco.png-7887829e2bd295b181d2ab6939359ff1.stex" [sub_resource type="StreamTexture" id=4] flags = 4 -load_path = "res://.import/case.png-3b77851e53283d3fff3d8edc79644146.stex" [sub_resource type="StreamTexture" id=5] @@ -168,6 +165,7 @@ rect_min_size = Vector2( 75, 75 ) texture = SubResource( 3 ) expand = true stretch_mode = 5 +script = ExtResource( 12 ) [node name="name" type="Label" parent="MarginContainer/VBoxContainer/bas/stats/VBoxContainer"] margin_top = 79.0 diff --git a/client/levels/hud/pic_hud.gd b/client/levels/hud/pic_hud.gd new file mode 100644 index 0000000000000000000000000000000000000000..039f713b077a61f0d9f50b348ab183ab9c00d7c9 --- /dev/null +++ b/client/levels/hud/pic_hud.gd @@ -0,0 +1,17 @@ +extends TextureRect + +func _ready(): + var my_id = get_tree().get_network_unique_id() + + var skinId = gamestate.players[my_id]["skin"] + var skins = { + 1: "res://models/pics/lullabyhud.png", + 2: "res://models/pics/discohud.png", + 3: "res://models/pics/angelahud.png", + 4: "res://models/pics/reaggehud.png", + 5: "res://models/pics/metalhud.png", + 6: "res://models/pics/electrohud.png" + } + + if (skinId >= 1 && skinId <= 6): + set_texture(load(skins[skinId])) diff --git a/client/levels/hud/pseudo_hud.gd b/client/levels/hud/pseudo_hud.gd index d3f5d2944b8cacd4a49b9e0314b9e473ebd2eb79..491698c8cb73bb6854545575a484935bb9f7d60f 100644 --- a/client/levels/hud/pseudo_hud.gd +++ b/client/levels/hud/pseudo_hud.gd @@ -1,10 +1,5 @@ extends Label -const GAMEPATH = "/root/game/" - -var posId -var player - func _ready(): var my_id = get_tree().get_network_unique_id() diff --git a/client/models/icon.png b/client/models/icon.png deleted file mode 100644 index 2b658158b6a2211b656d83fee35e3941e5ad376a..0000000000000000000000000000000000000000 Binary files a/client/models/icon.png and /dev/null differ diff --git a/client/models/pics/angelahud.png b/client/models/pics/angelahud.png new file mode 100644 index 0000000000000000000000000000000000000000..36e62e9969ad97dcdb972819123953607d4fa081 Binary files /dev/null and b/client/models/pics/angelahud.png differ diff --git a/client/models/pics/angelahud.png.import b/client/models/pics/angelahud.png.import new file mode 100644 index 0000000000000000000000000000000000000000..70e50d09aaef444dc7a6be1aace747a7ccb0eb48 --- /dev/null +++ b/client/models/pics/angelahud.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/angelahud.png-f3efdc64af5b259c3c533912ce0da344.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://models/pics/angelahud.png" +dest_files=[ "res://.import/angelahud.png-f3efdc64af5b259c3c533912ce0da344.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/models/pics/discohud.png b/client/models/pics/discohud.png new file mode 100644 index 0000000000000000000000000000000000000000..92bffbbc6fd1c0d2fc9599ae38a05e85a7f76d07 Binary files /dev/null and b/client/models/pics/discohud.png differ diff --git a/client/levels/hud/assets/disco.png.import b/client/models/pics/discohud.png.import similarity index 70% rename from client/levels/hud/assets/disco.png.import rename to client/models/pics/discohud.png.import index a6dd86208f5a8dc39fbe308dbc0c439840fd886b..d713e4e6efed5d63f216d4380c58cda9b7c10f36 100644 --- a/client/levels/hud/assets/disco.png.import +++ b/client/models/pics/discohud.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/disco.png-597137d38f0d280df481819f2f65ef60.stex" +path="res://.import/discohud.png-f3eec2c6d399c919dc8993c805350cf5.stex" metadata={ "vram_texture": false } [deps] -source_file="res://levels/hud/assets/disco.png" -dest_files=[ "res://.import/disco.png-597137d38f0d280df481819f2f65ef60.stex" ] +source_file="res://models/pics/discohud.png" +dest_files=[ "res://.import/discohud.png-f3eec2c6d399c919dc8993c805350cf5.stex" ] [params] diff --git a/client/models/pics/electrohud.png b/client/models/pics/electrohud.png new file mode 100644 index 0000000000000000000000000000000000000000..a643df41909e207a81404b87d6c4fc25505a5033 Binary files /dev/null and b/client/models/pics/electrohud.png differ diff --git a/client/models/pics/electrohud.png.import b/client/models/pics/electrohud.png.import new file mode 100644 index 0000000000000000000000000000000000000000..15902685a46b38cd2c5a8dc99bff966f3ccd3a18 --- /dev/null +++ b/client/models/pics/electrohud.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/electrohud.png-2935f03996d008eab2cad7f1701ebd68.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://models/pics/electrohud.png" +dest_files=[ "res://.import/electrohud.png-2935f03996d008eab2cad7f1701ebd68.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/models/pics/lullabyhud.png b/client/models/pics/lullabyhud.png new file mode 100644 index 0000000000000000000000000000000000000000..291fc931718d17a74be8fd3f97789b8d5699ef6f Binary files /dev/null and b/client/models/pics/lullabyhud.png differ diff --git a/client/models/pics/lullabyhud.png.import b/client/models/pics/lullabyhud.png.import new file mode 100644 index 0000000000000000000000000000000000000000..edeeddc9d956dd79f298b004a7a78ca29c4d2b4d --- /dev/null +++ b/client/models/pics/lullabyhud.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/lullabyhud.png-2d7faf46500bc9231de9fe9289089abb.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://models/pics/lullabyhud.png" +dest_files=[ "res://.import/lullabyhud.png-2d7faf46500bc9231de9fe9289089abb.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/models/pics/metalhud.png b/client/models/pics/metalhud.png new file mode 100644 index 0000000000000000000000000000000000000000..e2dc2be1b46004ee44def2e3c0b71c895ce8827e Binary files /dev/null and b/client/models/pics/metalhud.png differ diff --git a/client/models/icon.png.import b/client/models/pics/metalhud.png.import similarity index 70% rename from client/models/icon.png.import rename to client/models/pics/metalhud.png.import index 5db8c9d0b777b6730ddd9245a307d6a0dd0fd379..0053dfd0efe28cb5cb33e91f15fd30bb1e26bfcc 100644 --- a/client/models/icon.png.import +++ b/client/models/pics/metalhud.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/icon.png-efaa2af14617fe3f60d966f4e1ebca97.stex" +path="res://.import/metalhud.png-e651786b104114081f4f2a634a9af4d8.stex" metadata={ "vram_texture": false } [deps] -source_file="res://models/icon.png" -dest_files=[ "res://.import/icon.png-efaa2af14617fe3f60d966f4e1ebca97.stex" ] +source_file="res://models/pics/metalhud.png" +dest_files=[ "res://.import/metalhud.png-e651786b104114081f4f2a634a9af4d8.stex" ] [params] diff --git a/client/models/pics/reaggehud.png b/client/models/pics/reaggehud.png new file mode 100644 index 0000000000000000000000000000000000000000..31b33624dc835635ee632877b7aa3f8954d6f381 Binary files /dev/null and b/client/models/pics/reaggehud.png differ diff --git a/client/models/pics/reaggehud.png.import b/client/models/pics/reaggehud.png.import new file mode 100644 index 0000000000000000000000000000000000000000..166b82b1849787530d84f8b7a7e3f39ad46fb7d9 --- /dev/null +++ b/client/models/pics/reaggehud.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/reaggehud.png-118599e78d64c177f9254413ff7df825.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://models/pics/reaggehud.png" +dest_files=[ "res://.import/reaggehud.png-118599e78d64c177f9254413ff7df825.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