diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 4140e722..6358d6d5 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -17,15 +17,18 @@ Translations: GrbavaCigla Programming ----------- Monban -Moxvallix TheSecondReal0 TheRyeGuyWhoWillNowDie Darshadi +zapzoop0099 GrbavaCigla -Macmv NiceMicro Vainiovano +Damjan94 +jngo102 tooManyArguments +Moxvallix +Macmv Evolve2k Wandang Daniel071 @@ -45,11 +48,12 @@ Art --- Luke_Connor Moxvallix -Zughy rand_0moide PRIME Gai_ Orangemn6 +jngo102 +NiceMicro Game design ----------- diff --git a/src/assets/autoload/dlman.gd b/src/assets/autoload/dlman.gd new file mode 100644 index 00000000..a85da4cc --- /dev/null +++ b/src/assets/autoload/dlman.gd @@ -0,0 +1,29 @@ +extends Node + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" +var mapdata +# Called when the node enters the scene tree for the first time. +func _ready(): + set_network_master(1) +func distribute(): + var map = File.new() + map.open("user://maps/servermap.tscn", File.READ) + if not map.file_exists("user://maps/servermap.tscn"): + map.close() + map.open("res://assets/maps/test/test.tscn", File.READ) + mapdata = map.get_as_text() + rpc("recieve",mapdata) + recieve(mapdata) + map.close() +remotesync func recieve(data): + var localmap = File.new() + localmap.open("user://maps/currentmap.tscn", File.WRITE) + localmap.store_string(data) + localmap.close() + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass diff --git a/src/assets/autoload/network.gd b/src/assets/autoload/network.gd index cfe37668..fabffd31 100644 --- a/src/assets/autoload/network.gd +++ b/src/assets/autoload/network.gd @@ -13,7 +13,7 @@ var player_name: String setget toss, get_player_name puppet var peers: Array = [] puppet var names: Dictionary = {} var myID: int = 1 - +var rawmap signal server_started signal connection_handled @@ -75,6 +75,7 @@ func _player_connected(id) -> void: # remotely set myID var of new player to their network id # sync peer list of all players rset("peers", peers) + func _player_disconnected(id) -> void: peers.erase(id) diff --git a/src/assets/autoload/playermanager.gd b/src/assets/autoload/playermanager.gd index 73bfc932..ca997f68 100644 --- a/src/assets/autoload/playermanager.gd +++ b/src/assets/autoload/playermanager.gd @@ -23,12 +23,11 @@ var playerColors: Dictionary = {enabledRoles[0]: Color(1,0,0),# traitor enabledRoles[2]: Color(1,1,1)}# default var rng = RandomNumberGenerator.new() signal roles_assigned - +signal host_kill func _ready(): set_network_master(1) # warning-ignore:return_value_discarded GameManager.connect("state_changed", self, "state_changed") - func assigntasks(): for id in Network.peers: taskstoassign = tasks diff --git a/src/assets/main/maps.gd b/src/assets/main/maps.gd index a036e036..8db4701c 100644 --- a/src/assets/main/maps.gd +++ b/src/assets/main/maps.gd @@ -1,6 +1,6 @@ extends Node2D -var maps: Dictionary = {"lobby": {"dir": preload("res://assets/maps/lobby/lobby.tscn")}, "test": {"dir": preload("res://assets/maps/test/test.tscn")}} +var maps: Dictionary = {"lobby": {"dir": preload("res://assets/maps/lobby/lobby.tscn")}, "test": {"dir": load("user://maps/currentmap.tscn")}} signal spawn(position,frommap) diff --git a/src/assets/player/infiltrator.gd b/src/assets/player/infiltrator.gd index 475e9602..0b908f9c 100644 --- a/src/assets/player/infiltrator.gd +++ b/src/assets/player/infiltrator.gd @@ -75,9 +75,11 @@ func _kill_player(player: KinematicBody2D) -> void: """ Kill the player who is currently the target. """ + var target_sprite: AnimatedSprite = _target_player.get_node("Sprite") target_sprite.material.set_shader_param("line_color", Color.transparent) - emit_signal("kill", _target_player) + var kid = _target_player.id + set_reloaded(false) enable_killing(false) # kill_cooldown_timer.start() @@ -95,8 +97,9 @@ func _get_target() -> void: distance = temp_distance _target_player = player if _target_player != null: - var target_sprite: AnimatedSprite = _target_player.get_node("Sprite") - target_sprite.material.set_shader_param("line_color", Color.red) + pass + #var target_sprite: AnimatedSprite = _target_player.get_node("Sprite") + #target_sprite.material.set_shader_param("line_color", Color.red) func _instantiate_kill_gui() -> void: """ @@ -123,8 +126,9 @@ func _on_KillArea_body_exited(body: Node) -> void: Remove the outline from the body that exited the kill area. """ if player.main_player: - var sprite: AnimatedSprite = body.get_node("Sprite") - sprite.material.set_shader_param("line_color", Color.transparent) + #var sprite: AnimatedSprite = body.get_node("Sprite") + #sprite.material.set_shader_param("line_color", Color.transparent) + pass func _on_KillCooldownTimer_timeout() -> void: """ diff --git a/src/assets/player/player.gd b/src/assets/player/player.gd index f2234ff3..67af17a4 100644 --- a/src/assets/player/player.gd +++ b/src/assets/player/player.gd @@ -19,8 +19,10 @@ var movement = Vector2(0,0) # Only true when this is the player being controlled export var main_player = false #anim margin controls how big the player movement must be before animations are played -var x_anim_margin = 0.1 -var y_anim_margin = 0.1 +var x_anim_margin = 0.00 +var y_anim_margin = 0.00 +#whether the character faces in the right direction +var face_right = true # The input number is incremented on each _physics_process call. GDScript's int # type is int64_t which is enough for thousands of years of gameplay @@ -35,8 +37,10 @@ var input_queue: Array = [] func _ready(): # Set the sprite material for every player to be a duplicate of their # initial material so that outlines may be modified independently. + sprite.set_material(sprite.material.duplicate()) - + PlayerManager.connect("host_kill",self,"on_host_kill") + if "--server" in OS.get_cmdline_args(): main_player = false if main_player: @@ -78,7 +82,6 @@ func _checkRole(role: String) -> void: set_collision_layer_bit(2, true) if has_node("Infiltrator"): get_node("Infiltrator").queue_free() - func changeNameColor(role: String): match role: "traitor": @@ -136,17 +139,21 @@ func _physics_process(_delta): # We handle animations and stuff here if movement.x > x_anim_margin: - $Sprite.play("walk-h") - $Sprite.flip_h = false + $spritecollection/AnimationPlayer.play("h_move") + if not face_right: + face_right = true + $spritecollection.scale.x = -$spritecollection.scale.x elif movement.x < -x_anim_margin: - $Sprite.play("walk-h") - $Sprite.flip_h = true + $spritecollection/AnimationPlayer.play("h_move") + if face_right: + face_right = false + $spritecollection.scale.x = -$spritecollection.scale.x elif movement.y > y_anim_margin: - $Sprite.play("walk-down") + $spritecollection/AnimationPlayer.play("h_move") elif movement.y < -y_anim_margin: - $Sprite.play("walk-up") + $spritecollection/AnimationPlayer.play("h_move") else: - $Sprite.play("idle") + $spritecollection/AnimationPlayer.play("idle", 0.2) # Only called on the main player. Rerolls the player's unreceived inputs on top # of the server's player position diff --git a/src/assets/player/player.tscn b/src/assets/player/player.tscn index 47751630..c773855f 100644 --- a/src/assets/player/player.tscn +++ b/src/assets/player/player.tscn @@ -1,19 +1,17 @@ -[gd_scene load_steps=26 format=2] +[gd_scene load_steps=24 format=2] [ext_resource path="res://assets/player/player.gd" type="Script" id=1] -[ext_resource path="res://assets/player/textures/characters/black/walk-h/black-r-walk-4-4.png" type="Texture" id=2] -[ext_resource path="res://assets/player/textures/characters/black/walk-h/black-r-walk-3-4.png" type="Texture" id=3] -[ext_resource path="res://assets/player/textures/characters/black/walk-h/black-r-walk-2-4.png" type="Texture" id=4] -[ext_resource path="res://assets/player/textures/characters/black/walk-h/black-r-walk-1-4.png" type="Texture" id=5] -[ext_resource path="res://assets/player/textures/characters/black/black-proto-1.png" type="Texture" id=6] -[ext_resource path="res://assets/player/textures/characters/black/walk-v/black-down-2-4.png" type="Texture" id=7] -[ext_resource path="res://assets/player/textures/characters/black/walk-v/black-down-3-4.png" type="Texture" id=8] -[ext_resource path="res://assets/player/textures/characters/black/walk-v/black-down-1-4.png" type="Texture" id=9] -[ext_resource path="res://assets/player/textures/characters/black/walk-v/black-down-4-4.png" type="Texture" id=10] -[ext_resource path="res://assets/player/textures/characters/black/walk-v/black-up2-2-4.png" type="Texture" id=11] -[ext_resource path="res://assets/player/textures/characters/black/walk-v/black-up2-1-4.png" type="Texture" id=12] -[ext_resource path="res://assets/player/textures/characters/black/walk-v/black-up2-4-4.png" type="Texture" id=13] -[ext_resource path="res://assets/player/textures/characters/black/walk-v/black-up2-3-4.png" type="Texture" id=14] +[ext_resource path="res://assets/player/textures/characters/customizable/06-right-leg/brown-suit.png" type="Texture" id=2] +[ext_resource path="res://assets/player/textures/characters/customizable/03-mouth/mouth-concerned.png" type="Texture" id=3] +[ext_resource path="res://assets/player/textures/characters/customizable/02-body/body01.png" type="Texture" id=4] +[ext_resource path="res://assets/player/textures/characters/customizable/04-left-leg/brown-suit.png" type="Texture" id=5] +[ext_resource path="res://assets/player/textures/characters/customizable/11-hat-hair/brown-hat.png" type="Texture" id=6] +[ext_resource path="res://assets/player/textures/characters/customizable/01-left-arm/brown-suit.png" type="Texture" id=7] +[ext_resource path="res://assets/player/textures/characters/customizable/09-facial-hair/brown-eyebrows-sideburns.png" type="Texture" id=8] +[ext_resource path="res://assets/player/textures/characters/customizable/10-face-wear/sunglasses.png" type="Texture" id=9] +[ext_resource path="res://assets/player/textures/characters/customizable/08-right-arm/brown-suit.png" type="Texture" id=10] +[ext_resource path="res://assets/player/textures/characters/customizable/07-clothes/brown-suit.png" type="Texture" id=11] +[ext_resource path="res://assets/player/textures/characters/customizable/05-pants/brown-suit.png" type="Texture" id=12] [ext_resource path="res://assets/player/textures/light.png" type="Texture" id=15] [ext_resource path="res://assets/player/interactarea.gd" type="Script" id=16] [ext_resource path="res://assets/common/shaders/player.shader" type="Shader" id=17] @@ -37,37 +35,114 @@ light_mode = 2 [sub_resource type="CapsuleShape2D" id=5] radius = 12.0 -[sub_resource type="ShaderMaterial" id=6] -shader = ExtResource( 17 ) -shader_param/line_color = Color( 0, 0, 0, 0 ) -shader_param/line_thickness = 1.5 - -[sub_resource type="SpriteFrames" id=7] -animations = [ { -"frames": [ ExtResource( 6 ) ], -"loop": true, -"name": "idle", -"speed": 5.0 -}, { -"frames": [ ExtResource( 12 ), ExtResource( 11 ), ExtResource( 14 ), ExtResource( 13 ) ], -"loop": true, -"name": "walk-up", -"speed": 8.0 -}, { -"frames": [ ExtResource( 5 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 2 ) ], -"loop": true, -"name": "walk-h", -"speed": 5.0 -}, { -"frames": [ ExtResource( 9 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 10 ) ], -"loop": true, -"name": "walk-down", -"speed": 8.0 -} ] - -[sub_resource type="CanvasItemMaterial" id=8] +[sub_resource type="CanvasItemMaterial" id=6] light_mode = 2 +[sub_resource type="Animation" id=8] +resource_name = "h_move" +length = 0.4 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("04-l-leg:rotation_degrees") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3 ), +"transitions": PoolRealArray( 0.5, 2, 0.5, 2 ), +"update": 0, +"values": [ 0.0, -20.0, 0.0, 5.0 ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("06-r-leg:rotation_degrees") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3 ), +"transitions": PoolRealArray( 0.5, 2, 0.5, 2 ), +"update": 0, +"values": [ 0.0, 5.0, 0.0, -20.0 ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("08-r-arm:rotation_degrees") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3 ), +"transitions": PoolRealArray( 0.5, 2, 0.5, 2 ), +"update": 0, +"values": [ 0.0, 30.0, 0.0, -30.0 ] +} +tracks/3/type = "value" +tracks/3/path = NodePath("01-l-arm:rotation_degrees") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3 ), +"transitions": PoolRealArray( 0.5, 2, 0.5, 2 ), +"update": 0, +"values": [ 0.0, -30.0, 0.0, 30.0 ] +} + +[sub_resource type="Animation" id=7] +resource_name = "idle" +length = 0.3 +tracks/0/type = "value" +tracks/0/path = NodePath("01-l-arm:rotation_degrees") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0.3 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 0.0 ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("04-l-leg:rotation_degrees") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0.3 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 0.0 ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("06-r-leg:rotation_degrees") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0.3 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 0.0 ] +} +tracks/3/type = "value" +tracks/3/path = NodePath("08-r-arm:rotation_degrees") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/keys = { +"times": PoolRealArray( 0.3 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 0.0 ] +} + [node name="Player" type="KinematicBody2D" groups=[ "players", ]] @@ -103,6 +178,7 @@ material = SubResource( 6 ) position = Vector2( 0, -18 ) frames = SubResource( 7 ) animation = "walk-h" +frame = 3 playing = true [node name="MainLight" type="Light2D" parent="."] @@ -123,7 +199,7 @@ drag_margin_right = 0.65 drag_margin_bottom = 0.65 [node name="Label" type="Label" parent="."] -material = SubResource( 8 ) +material = SubResource( 6 ) margin_left = -250.0 margin_top = -75.0 margin_right = 250.0 @@ -133,5 +209,54 @@ align = 1 __meta__ = { "_edit_use_anchors_": false } + +[node name="spritecollection" type="Node2D" parent="."] +position = Vector2( 0, -26 ) +scale = Vector2( 0.05, 0.05 ) + +[node name="01-l-arm" type="Sprite" parent="spritecollection"] +position = Vector2( 140, 180 ) +texture = ExtResource( 7 ) +offset = Vector2( -140, -180 ) + +[node name="02-body" type="Sprite" parent="spritecollection"] +texture = ExtResource( 4 ) + +[node name="03-mouth" type="Sprite" parent="spritecollection"] +texture = ExtResource( 3 ) + +[node name="04-l-leg" type="Sprite" parent="spritecollection"] +position = Vector2( 110, 390 ) +texture = ExtResource( 5 ) +offset = Vector2( -110, -390 ) + +[node name="05-pants" type="Sprite" parent="spritecollection"] +texture = ExtResource( 12 ) + +[node name="06-r-leg" type="Sprite" parent="spritecollection"] +position = Vector2( -90, 390 ) +texture = ExtResource( 2 ) +offset = Vector2( 90, -390 ) + +[node name="07-clothes" type="Sprite" parent="spritecollection"] +texture = ExtResource( 11 ) + +[node name="08-r-arm" type="Sprite" parent="spritecollection"] +position = Vector2( -120, 180 ) +texture = ExtResource( 10 ) +offset = Vector2( 120, -180 ) + +[node name="09-r-facial-hair" type="Sprite" parent="spritecollection"] +texture = ExtResource( 8 ) + +[node name="10-face-wear" type="Sprite" parent="spritecollection"] +texture = ExtResource( 9 ) + +[node name="11-hat-hair" type="Sprite" parent="spritecollection"] +texture = ExtResource( 6 ) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="spritecollection"] +anims/h_move = SubResource( 8 ) +anims/idle = SubResource( 7 ) [connection signal="body_entered" from="interactarea" to="interactarea" method="_on_interactarea_body_entered"] [connection signal="body_exited" from="interactarea" to="interactarea" method="_on_interactarea_body_exited"] diff --git a/src/assets/player/textures/characters/customizable/01-left-arm/brown-suit.png b/src/assets/player/textures/characters/customizable/01-left-arm/brown-suit.png new file mode 100644 index 00000000..5acc98b2 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/01-left-arm/brown-suit.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:769c4e7e5376119c31a8d03312c97685cb73f52371266d161e0d6f87c71d6f74 +size 7717 diff --git a/src/assets/player/textures/characters/customizable/01-left-arm/brown-suit.png.import b/src/assets/player/textures/characters/customizable/01-left-arm/brown-suit.png.import new file mode 100644 index 00000000..5232eb89 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/01-left-arm/brown-suit.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/brown-suit.png-af789ad0cb43831be7197d1d00ceff72.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/01-left-arm/brown-suit.png" +dest_files=[ "res://.import/brown-suit.png-af789ad0cb43831be7197d1d00ceff72.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/src/assets/player/textures/characters/customizable/01-left-arm/white-shirt-red-sweater.png b/src/assets/player/textures/characters/customizable/01-left-arm/white-shirt-red-sweater.png new file mode 100644 index 00000000..6bf66f0b --- /dev/null +++ b/src/assets/player/textures/characters/customizable/01-left-arm/white-shirt-red-sweater.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5aa522bde0071190c823f02f22d689bd7070288f28918f6a1225f186af6b0e8f +size 8172 diff --git a/src/assets/player/textures/characters/customizable/01-left-arm/white-shirt-red-sweater.png.import b/src/assets/player/textures/characters/customizable/01-left-arm/white-shirt-red-sweater.png.import new file mode 100644 index 00000000..8c5ffce3 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/01-left-arm/white-shirt-red-sweater.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/white-shirt-red-sweater.png-ba37c803b9ff29a73dbfd2b4431bc398.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/01-left-arm/white-shirt-red-sweater.png" +dest_files=[ "res://.import/white-shirt-red-sweater.png-ba37c803b9ff29a73dbfd2b4431bc398.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/src/assets/player/textures/characters/customizable/02-body/body01.png b/src/assets/player/textures/characters/customizable/02-body/body01.png new file mode 100644 index 00000000..ccba9d08 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/02-body/body01.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de82124a2aeeebf87de9e654f460fe97f4406b771bfb46d4ec84d37ace89d3be +size 22968 diff --git a/src/assets/player/textures/characters/customizable/02-body/body01.png.import b/src/assets/player/textures/characters/customizable/02-body/body01.png.import new file mode 100644 index 00000000..667b58ce --- /dev/null +++ b/src/assets/player/textures/characters/customizable/02-body/body01.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/body01.png-d898a1189aff34292e21704236bc55a1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/02-body/body01.png" +dest_files=[ "res://.import/body01.png-d898a1189aff34292e21704236bc55a1.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/src/assets/player/textures/characters/customizable/02-body/body02.png b/src/assets/player/textures/characters/customizable/02-body/body02.png new file mode 100644 index 00000000..c2a92f27 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/02-body/body02.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:671baaf4702c54faf8ac0ffa96a8e7cbc3b6497b4334c6cf01d8a9d52444feaf +size 22779 diff --git a/src/assets/player/textures/characters/customizable/02-body/body02.png.import b/src/assets/player/textures/characters/customizable/02-body/body02.png.import new file mode 100644 index 00000000..8c366a7a --- /dev/null +++ b/src/assets/player/textures/characters/customizable/02-body/body02.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/body02.png-26419189cb8d75736334b36afbb45fb3.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/02-body/body02.png" +dest_files=[ "res://.import/body02.png-26419189cb8d75736334b36afbb45fb3.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/src/assets/player/textures/characters/customizable/03-mouth/mouth-concerned.png b/src/assets/player/textures/characters/customizable/03-mouth/mouth-concerned.png new file mode 100644 index 00000000..aec32caa --- /dev/null +++ b/src/assets/player/textures/characters/customizable/03-mouth/mouth-concerned.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c0faa25425a81dad8097030bd4568a2b67e86454dd9d0637f99af821653ef00 +size 4149 diff --git a/src/assets/player/textures/characters/customizable/03-mouth/mouth-concerned.png.import b/src/assets/player/textures/characters/customizable/03-mouth/mouth-concerned.png.import new file mode 100644 index 00000000..b797a276 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/03-mouth/mouth-concerned.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth-concerned.png-fcd7fd56695128c862b520eec914fcfc.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/03-mouth/mouth-concerned.png" +dest_files=[ "res://.import/mouth-concerned.png-fcd7fd56695128c862b520eec914fcfc.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/src/assets/player/textures/characters/customizable/03-mouth/mouth-smile.png b/src/assets/player/textures/characters/customizable/03-mouth/mouth-smile.png new file mode 100644 index 00000000..cf2501f0 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/03-mouth/mouth-smile.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25d1469e29beff418c146533e465c97d00edbe8fa0a2ea1e55e6d8d69539e4c7 +size 4516 diff --git a/src/assets/player/textures/characters/customizable/03-mouth/mouth-smile.png.import b/src/assets/player/textures/characters/customizable/03-mouth/mouth-smile.png.import new file mode 100644 index 00000000..8d8addef --- /dev/null +++ b/src/assets/player/textures/characters/customizable/03-mouth/mouth-smile.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mouth-smile.png-154bca95586300ea2385dd114bd74f12.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/03-mouth/mouth-smile.png" +dest_files=[ "res://.import/mouth-smile.png-154bca95586300ea2385dd114bd74f12.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/src/assets/player/textures/characters/customizable/04-left-leg/brown-suit.png b/src/assets/player/textures/characters/customizable/04-left-leg/brown-suit.png new file mode 100644 index 00000000..95b9e25f --- /dev/null +++ b/src/assets/player/textures/characters/customizable/04-left-leg/brown-suit.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48e8accccd792c25151e6848a1fb1ba990509cd779ab30646ea4d8c9d8e30de4 +size 6566 diff --git a/src/assets/player/textures/characters/customizable/04-left-leg/brown-suit.png.import b/src/assets/player/textures/characters/customizable/04-left-leg/brown-suit.png.import new file mode 100644 index 00000000..26b26c8a --- /dev/null +++ b/src/assets/player/textures/characters/customizable/04-left-leg/brown-suit.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/brown-suit.png-01b9d8327f9ae322bb718eedb300e2f7.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/04-left-leg/brown-suit.png" +dest_files=[ "res://.import/brown-suit.png-01b9d8327f9ae322bb718eedb300e2f7.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/src/assets/player/textures/characters/customizable/04-left-leg/white-shirt-red-sweater.png b/src/assets/player/textures/characters/customizable/04-left-leg/white-shirt-red-sweater.png new file mode 100644 index 00000000..7c780e26 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/04-left-leg/white-shirt-red-sweater.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e5114c6d3a11835132edf6d317b430a602a3a8f81566e656dc875f52de606f9 +size 5561 diff --git a/src/assets/player/textures/characters/customizable/04-left-leg/white-shirt-red-sweater.png.import b/src/assets/player/textures/characters/customizable/04-left-leg/white-shirt-red-sweater.png.import new file mode 100644 index 00000000..38a4335f --- /dev/null +++ b/src/assets/player/textures/characters/customizable/04-left-leg/white-shirt-red-sweater.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/white-shirt-red-sweater.png-5da19d34fc19cec8f56878022d68104e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/04-left-leg/white-shirt-red-sweater.png" +dest_files=[ "res://.import/white-shirt-red-sweater.png-5da19d34fc19cec8f56878022d68104e.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/src/assets/player/textures/characters/customizable/05-pants/brown-suit.png b/src/assets/player/textures/characters/customizable/05-pants/brown-suit.png new file mode 100644 index 00000000..f3b3733a --- /dev/null +++ b/src/assets/player/textures/characters/customizable/05-pants/brown-suit.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9040f93e77ff5cdb1815eddc7bd63eb7a090a8c77a05e69e6dbfc0372f734d3 +size 5700 diff --git a/src/assets/player/textures/characters/customizable/05-pants/brown-suit.png.import b/src/assets/player/textures/characters/customizable/05-pants/brown-suit.png.import new file mode 100644 index 00000000..9e9fec30 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/05-pants/brown-suit.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/brown-suit.png-d60e73b4e048e6ea52d1822fd304759b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/05-pants/brown-suit.png" +dest_files=[ "res://.import/brown-suit.png-d60e73b4e048e6ea52d1822fd304759b.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/src/assets/player/textures/characters/customizable/05-pants/white-shirt-red-sweater.png b/src/assets/player/textures/characters/customizable/05-pants/white-shirt-red-sweater.png new file mode 100644 index 00000000..55f77c05 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/05-pants/white-shirt-red-sweater.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c7fc6402aa78ee51e40cc6c9a119f30ad39aac75136abfde4979d3e1553c22a +size 5458 diff --git a/src/assets/player/textures/characters/customizable/05-pants/white-shirt-red-sweater.png.import b/src/assets/player/textures/characters/customizable/05-pants/white-shirt-red-sweater.png.import new file mode 100644 index 00000000..8903b830 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/05-pants/white-shirt-red-sweater.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/white-shirt-red-sweater.png-c75fa7fbfd6134fe3a2b7eda6a2acdae.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/05-pants/white-shirt-red-sweater.png" +dest_files=[ "res://.import/white-shirt-red-sweater.png-c75fa7fbfd6134fe3a2b7eda6a2acdae.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/src/assets/player/textures/characters/customizable/06-right-leg/brown-suit.png b/src/assets/player/textures/characters/customizable/06-right-leg/brown-suit.png new file mode 100644 index 00000000..d173ea6c --- /dev/null +++ b/src/assets/player/textures/characters/customizable/06-right-leg/brown-suit.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d6cd9e53b12fd24761a9cd09cb6de3ca3b0400ca22dd108c1fdc26cbce4d979 +size 6087 diff --git a/src/assets/player/textures/characters/customizable/06-right-leg/brown-suit.png.import b/src/assets/player/textures/characters/customizable/06-right-leg/brown-suit.png.import new file mode 100644 index 00000000..edff20af --- /dev/null +++ b/src/assets/player/textures/characters/customizable/06-right-leg/brown-suit.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/brown-suit.png-89d77243897b7e48963a0c72508e2301.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/06-right-leg/brown-suit.png" +dest_files=[ "res://.import/brown-suit.png-89d77243897b7e48963a0c72508e2301.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/src/assets/player/textures/characters/customizable/06-right-leg/white-shirt-red-sweater.png b/src/assets/player/textures/characters/customizable/06-right-leg/white-shirt-red-sweater.png new file mode 100644 index 00000000..ea1c8b70 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/06-right-leg/white-shirt-red-sweater.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7a2659ac932107ad39c00c886410ffebaeb6c764dfd119121141390939f8266 +size 5446 diff --git a/src/assets/player/textures/characters/customizable/06-right-leg/white-shirt-red-sweater.png.import b/src/assets/player/textures/characters/customizable/06-right-leg/white-shirt-red-sweater.png.import new file mode 100644 index 00000000..351a757c --- /dev/null +++ b/src/assets/player/textures/characters/customizable/06-right-leg/white-shirt-red-sweater.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/white-shirt-red-sweater.png-cccbd7ef1e1ab51c83b768eb28b7d2ad.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/06-right-leg/white-shirt-red-sweater.png" +dest_files=[ "res://.import/white-shirt-red-sweater.png-cccbd7ef1e1ab51c83b768eb28b7d2ad.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/src/assets/player/textures/characters/customizable/07-clothes/brown-suit.png b/src/assets/player/textures/characters/customizable/07-clothes/brown-suit.png new file mode 100644 index 00000000..79d6e683 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/07-clothes/brown-suit.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8bf59b8c9a2c1ccbfe4339af1f64f294adfe0e6b06f4ae4269111f901b8c5b5 +size 18675 diff --git a/src/assets/player/textures/characters/customizable/07-clothes/brown-suit.png.import b/src/assets/player/textures/characters/customizable/07-clothes/brown-suit.png.import new file mode 100644 index 00000000..edfa52f6 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/07-clothes/brown-suit.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/brown-suit.png-a726704c46c1531bcb1ee5dd81c7dd40.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/07-clothes/brown-suit.png" +dest_files=[ "res://.import/brown-suit.png-a726704c46c1531bcb1ee5dd81c7dd40.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/src/assets/player/textures/characters/customizable/07-clothes/white-shirt-red-sweater.png b/src/assets/player/textures/characters/customizable/07-clothes/white-shirt-red-sweater.png new file mode 100644 index 00000000..32d16d0d --- /dev/null +++ b/src/assets/player/textures/characters/customizable/07-clothes/white-shirt-red-sweater.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7f8a4e43a856c28cd5cd4854e7df36bfab856fd2785e7c75155db0f4a896d59 +size 14760 diff --git a/src/assets/player/textures/characters/customizable/07-clothes/white-shirt-red-sweater.png.import b/src/assets/player/textures/characters/customizable/07-clothes/white-shirt-red-sweater.png.import new file mode 100644 index 00000000..6d6c055f --- /dev/null +++ b/src/assets/player/textures/characters/customizable/07-clothes/white-shirt-red-sweater.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/white-shirt-red-sweater.png-70fd7dbb8743f9d05314d0527612e4bf.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/07-clothes/white-shirt-red-sweater.png" +dest_files=[ "res://.import/white-shirt-red-sweater.png-70fd7dbb8743f9d05314d0527612e4bf.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/src/assets/player/textures/characters/customizable/08-right-arm/brown-suit.png b/src/assets/player/textures/characters/customizable/08-right-arm/brown-suit.png new file mode 100644 index 00000000..7b16813d --- /dev/null +++ b/src/assets/player/textures/characters/customizable/08-right-arm/brown-suit.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8f4dcf730fb3c51a47334a84e73f038bb7222c1b1c88ddd40ee3403c61045bd +size 7725 diff --git a/src/assets/player/textures/characters/customizable/08-right-arm/brown-suit.png.import b/src/assets/player/textures/characters/customizable/08-right-arm/brown-suit.png.import new file mode 100644 index 00000000..bd226e0e --- /dev/null +++ b/src/assets/player/textures/characters/customizable/08-right-arm/brown-suit.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/brown-suit.png-5bb34e7e7c1c35f11b151b5d8985a5b8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/08-right-arm/brown-suit.png" +dest_files=[ "res://.import/brown-suit.png-5bb34e7e7c1c35f11b151b5d8985a5b8.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/src/assets/player/textures/characters/customizable/08-right-arm/white-shirt-red-sweater.png b/src/assets/player/textures/characters/customizable/08-right-arm/white-shirt-red-sweater.png new file mode 100644 index 00000000..0a84014e --- /dev/null +++ b/src/assets/player/textures/characters/customizable/08-right-arm/white-shirt-red-sweater.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5beb2589293072a4e8c0dbeefeb8e448a8128d0d2f02c5d521e367925b941a6 +size 8209 diff --git a/src/assets/player/textures/characters/customizable/08-right-arm/white-shirt-red-sweater.png.import b/src/assets/player/textures/characters/customizable/08-right-arm/white-shirt-red-sweater.png.import new file mode 100644 index 00000000..caf5b528 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/08-right-arm/white-shirt-red-sweater.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/white-shirt-red-sweater.png-d19e0758b46cad3a841604fc94b96f3c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/08-right-arm/white-shirt-red-sweater.png" +dest_files=[ "res://.import/white-shirt-red-sweater.png-d19e0758b46cad3a841604fc94b96f3c.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/src/assets/player/textures/characters/customizable/09-facial-hair/brown-eyebrows-sideburns.png b/src/assets/player/textures/characters/customizable/09-facial-hair/brown-eyebrows-sideburns.png new file mode 100644 index 00000000..9538150b --- /dev/null +++ b/src/assets/player/textures/characters/customizable/09-facial-hair/brown-eyebrows-sideburns.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c71e91fb8e161b4d455235ed5c2901bfdefda87917e424b54f0f397b1c50663 +size 7840 diff --git a/src/assets/player/textures/characters/customizable/09-facial-hair/brown-eyebrows-sideburns.png.import b/src/assets/player/textures/characters/customizable/09-facial-hair/brown-eyebrows-sideburns.png.import new file mode 100644 index 00000000..010c50ca --- /dev/null +++ b/src/assets/player/textures/characters/customizable/09-facial-hair/brown-eyebrows-sideburns.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/brown-eyebrows-sideburns.png-89ad3eda51618567629b69bb71821713.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/09-facial-hair/brown-eyebrows-sideburns.png" +dest_files=[ "res://.import/brown-eyebrows-sideburns.png-89ad3eda51618567629b69bb71821713.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/src/assets/player/textures/characters/customizable/09-facial-hair/red-eyebrow-sideburn.png b/src/assets/player/textures/characters/customizable/09-facial-hair/red-eyebrow-sideburn.png new file mode 100644 index 00000000..9b4b8c28 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/09-facial-hair/red-eyebrow-sideburn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0bb397250660e89d0e58767efe5604ac6b32e438675430e7817ee69b23354f4 +size 7954 diff --git a/src/assets/player/textures/characters/customizable/09-facial-hair/red-eyebrow-sideburn.png.import b/src/assets/player/textures/characters/customizable/09-facial-hair/red-eyebrow-sideburn.png.import new file mode 100644 index 00000000..8b9d13e3 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/09-facial-hair/red-eyebrow-sideburn.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/red-eyebrow-sideburn.png-70663c1ef954c690e1d37d87cb95e665.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/09-facial-hair/red-eyebrow-sideburn.png" +dest_files=[ "res://.import/red-eyebrow-sideburn.png-70663c1ef954c690e1d37d87cb95e665.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/src/assets/player/textures/characters/customizable/10-face-wear/glasses.png b/src/assets/player/textures/characters/customizable/10-face-wear/glasses.png new file mode 100644 index 00000000..803d058b --- /dev/null +++ b/src/assets/player/textures/characters/customizable/10-face-wear/glasses.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e57fda1225d294be2fcbcedbc1c57a65818f06f1da34ad7f015069208c97d13 +size 18312 diff --git a/src/assets/player/textures/characters/customizable/10-face-wear/glasses.png.import b/src/assets/player/textures/characters/customizable/10-face-wear/glasses.png.import new file mode 100644 index 00000000..cf8e99ef --- /dev/null +++ b/src/assets/player/textures/characters/customizable/10-face-wear/glasses.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/glasses.png-bdfc79a4a51b9a6ec1d217d0612bd684.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/10-face-wear/glasses.png" +dest_files=[ "res://.import/glasses.png-bdfc79a4a51b9a6ec1d217d0612bd684.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/src/assets/player/textures/characters/customizable/10-face-wear/sunglasses.png b/src/assets/player/textures/characters/customizable/10-face-wear/sunglasses.png new file mode 100644 index 00000000..e255475d --- /dev/null +++ b/src/assets/player/textures/characters/customizable/10-face-wear/sunglasses.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0bbd6cabf4e59e699667fdc4fe4026e2809586aab9f48c730225985addd070b +size 18515 diff --git a/src/assets/player/textures/characters/customizable/10-face-wear/sunglasses.png.import b/src/assets/player/textures/characters/customizable/10-face-wear/sunglasses.png.import new file mode 100644 index 00000000..20c6c53e --- /dev/null +++ b/src/assets/player/textures/characters/customizable/10-face-wear/sunglasses.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sunglasses.png-6cc8c2d0c4b26ddcf65b8ffe5b233b38.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/10-face-wear/sunglasses.png" +dest_files=[ "res://.import/sunglasses.png-6cc8c2d0c4b26ddcf65b8ffe5b233b38.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/src/assets/player/textures/characters/customizable/11-hat-hair/brown-hat.png b/src/assets/player/textures/characters/customizable/11-hat-hair/brown-hat.png new file mode 100644 index 00000000..a86526dc --- /dev/null +++ b/src/assets/player/textures/characters/customizable/11-hat-hair/brown-hat.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8cb7664d60aa9bbc0edeecdd0a1c3dc48188e3126e6e7fe6f71e76edb279674 +size 9896 diff --git a/src/assets/player/textures/characters/customizable/11-hat-hair/brown-hat.png.import b/src/assets/player/textures/characters/customizable/11-hat-hair/brown-hat.png.import new file mode 100644 index 00000000..581aafd4 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/11-hat-hair/brown-hat.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/brown-hat.png-7c2b339691bcb8ce7327430d35801abe.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/11-hat-hair/brown-hat.png" +dest_files=[ "res://.import/brown-hat.png-7c2b339691bcb8ce7327430d35801abe.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/src/assets/player/textures/characters/customizable/11-hat-hair/red-hair-bob.png b/src/assets/player/textures/characters/customizable/11-hat-hair/red-hair-bob.png new file mode 100644 index 00000000..1e00a9e0 --- /dev/null +++ b/src/assets/player/textures/characters/customizable/11-hat-hair/red-hair-bob.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98f7ecc5156869cacb4be4ad4456669380336257ad76111b9a098ae0033523ef +size 10664 diff --git a/src/assets/player/textures/characters/customizable/11-hat-hair/red-hair-bob.png.import b/src/assets/player/textures/characters/customizable/11-hat-hair/red-hair-bob.png.import new file mode 100644 index 00000000..841a260b --- /dev/null +++ b/src/assets/player/textures/characters/customizable/11-hat-hair/red-hair-bob.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/red-hair-bob.png-257d4db1efcc2c93ad9aa4f6ea103346.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/player/textures/characters/customizable/11-hat-hair/red-hair-bob.png" +dest_files=[ "res://.import/red-hair-bob.png-257d4db1efcc2c93ad9aa4f6ea103346.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/src/assets/ui/hud/defaulthud/rolescreen/rolescreen.gd b/src/assets/ui/hud/defaulthud/rolescreen/rolescreen.gd index 7a16d6db..9d22c5f8 100644 --- a/src/assets/ui/hud/defaulthud/rolescreen/rolescreen.gd +++ b/src/assets/ui/hud/defaulthud/rolescreen/rolescreen.gd @@ -19,7 +19,7 @@ func _clean_up(): for info in self.player_info: info.name_label.queue_free() - info.sprite.queue_free() + info.sprite_collection.queue_free() self.player_info.clear() func _on_roles_assigned(player_roles : Dictionary): @@ -52,7 +52,7 @@ func _on_roles_assigned(player_roles : Dictionary): $Label.set("custom_colors/font_color", PlayerManager.playerColors["detective"]) for info in self.player_info: self.add_child(info.name_label) - self.add_child(info.sprite) + self.add_child(info.sprite_collection) self.show() @@ -83,9 +83,28 @@ func _generate_info(player_roles: Dictionary, role_colors: Dictionary): if x_pos_start < 0: # there are too many players to fit in one row.. need to wrap to the next row pass - # assists with lowering every other player info + + var black_spacesuit_texture : Texture = preload("res://assets/player/textures/characters/black/black-proto-1.png") + + # assists with positioning player info var player_count = 0 + # gets the player sprites to be displayed + # or, displays the black spacesuit character, + # if the "spritecollection" node wasn't found + var player_group_members = get_tree().get_nodes_in_group("players") + var player_sprite_collection = Dictionary() + for player in player_group_members: + if player_roles.has(player.id): + var node = player.get_node(NodePath("spritecollection")) + if node != null: + player_sprite_collection[player.id] = node.duplicate(0) + else: + var sprite = Sprite.new() + sprite.texture = black_spacesuit_texture + player_sprite_collection[player.id] = sprite + + for id in filtered_ids: # draw player info with PLAYER_SPACE_WIDTH pixels in between var x_pos = x_pos_start + (PLAYER_SPACE_WIDTH * player_count) @@ -95,7 +114,10 @@ func _generate_info(player_roles: Dictionary, role_colors: Dictionary): if player_count % 2 == 0: y_offset = 20 - p_info.append(PlayerInfo.new(Vector2(x_pos, y_pos + y_offset), id, role_colors[player_roles[id]])) + p_info.append(PlayerInfo.new(Vector2(x_pos, y_pos + y_offset), + id, + role_colors[player_roles[id]], + player_sprite_collection[id])) player_count += 1 return p_info @@ -106,15 +128,16 @@ class PlayerInfo: # set the text outline color to black(useful when there are colorful backgrounds) label.set("custom_colors/font_color_shadow", Color(0,0,0,1)) label.set("custom_constants/shadow_as_outline", true) - - - - var player_texture : Texture = preload("res://assets/player/textures/characters/black/black-proto-1.png") var name_label : Label - var sprite : Sprite + var sprite_collection : Node2D - func _init(position: Vector2, id: int, player_name_color: Color): + func _init(position: Vector2, + id: int, + player_name_color: Color, + player_sprite_collection: Node2D): + + var player_name = String(Network.get_player_name(id)) self.name_label = Label.new() @@ -124,10 +147,8 @@ class PlayerInfo: _set_label_outline(self.name_label) - - self.sprite = Sprite.new() - self.sprite.texture = player_texture - self.sprite.set_position(position) + self.sprite_collection = player_sprite_collection + self.sprite_collection.set_position(position) # center the label above the player sprite var width = self.name_label.get_combined_minimum_size().x diff --git a/src/assets/ui/hud/defaulthud/startgamebutton.gd b/src/assets/ui/hud/defaulthud/startgamebutton.gd index c0094b73..d4b2ac0a 100644 --- a/src/assets/ui/hud/defaulthud/startgamebutton.gd +++ b/src/assets/ui/hud/defaulthud/startgamebutton.gd @@ -24,6 +24,7 @@ func _pressed(): # warning-ignore:return_value_discarded GameManager.transition(GameManager.State.Normal) text = "Back to Lobby" + Dlman.distribute() else: # warning-ignore:return_value_discarded GameManager.transition(GameManager.State.Lobby) diff --git a/src/assets/ui/mainmenu/mainmenu.tscn b/src/assets/ui/mainmenu/mainmenu.tscn index 252af573..a293efe1 100644 --- a/src/assets/ui/mainmenu/mainmenu.tscn +++ b/src/assets/ui/mainmenu/mainmenu.tscn @@ -189,6 +189,7 @@ margin_right = 704.0 margin_bottom = 215.0 [connection signal="returnToMainMenu" from="VBoxContainer/MarginContainer/MenuArea" to="VBoxContainer/MarginContainer/MenuArea" method="_on_MenuArea_returnToMainMenu"] [connection signal="pressed" from="VBoxContainer/MarginContainer/MenuArea/MainMenu/Control/CenterContainer/PlayGame" to="VBoxContainer/MarginContainer/MenuArea" method="_on_NewGame_pressed"] +[connection signal="pressed" from="VBoxContainer/MarginContainer/MenuArea/MainMenu/Control/CenterContainer/PlayGame" to="VBoxContainer/MarginContainer/MenuArea/MainMenu/Control/CenterContainer/PlayGame" method="_on_PlayGame_pressed"] [connection signal="pressed" from="VBoxContainer/MarginContainer/MenuArea/MainMenu/Control3/CenterContainer/Settings" to="VBoxContainer/MarginContainer/MenuArea" method="_on_Settings_pressed"] [connection signal="pressed" from="VBoxContainer/MarginContainer/MenuArea/MainMenu/Control5/CenterContainer/Quit" to="VBoxContainer/MarginContainer/MenuArea" method="_on_Quit_pressed"] diff --git a/src/project.godot b/src/project.godot index 533ac227..e9dde928 100644 --- a/src/project.godot +++ b/src/project.godot @@ -66,6 +66,7 @@ SceneManager="*res://assets/autoload/scenemanager.gd" UIManager="*res://assets/autoload/uimanager.gd" MapManager="*res://assets/autoload/mapmanager.gd" TaskManager="*res://assets/autoload/taskmanager.gd" +Dlman="*res://assets/autoload/dlman.gd" [display]