diff options
| -rw-r--r-- | client/menu/character_menu.gd | 29 | ||||
| -rw-r--r-- | client/menu/character_menu.tscn | 36 | ||||
| -rw-r--r-- | client/player/character/character.tscn | 1 |
3 files changed, 58 insertions, 8 deletions
diff --git a/client/menu/character_menu.gd b/client/menu/character_menu.gd index 36bc52e8..66975a19 100644 --- a/client/menu/character_menu.gd +++ b/client/menu/character_menu.gd @@ -15,14 +15,41 @@ # extends Control -@onready var character: Character = $Character +@onready var character: Character = $Node3D/Character @onready var num_hairstyles := character.hairstyles.keys().size() @onready var back_button := $VBoxContainer/bottom_panel/back +@onready var map: Map = $Node3D/Map func _ready(): $VBoxContainer/top_panel/a/username.text = Global.profile["username"] character.select_hairstyle(Global.profile["character"]) Global.focus_first_button(self) + init_map() + +func init_map(): + var map_tile = func (t): match t: + ".": return "floor" + "=": return "counter" + "s": return "stove" + "c": return "chair" + "t": return "table" + "o": return "oven" + "#": return "wall" + _: push_error("unknown tile: ", t) + var tiles = [ + "...............", + "###############", + "=oo==ss===.ctc#", + "..............#", + ".............=#", + ".............=#", + ".............=#" + ].map(func (l): return Array(l.split("")).map(map_tile)) + var gt = func (e): return null if e[1] >= tiles.size() else null if e[0] >= tiles[e[1]].size() else tiles[e[1]][e[0]] + var co = Vector2i(floor(tiles[0].size() / 2), floor(tiles.size() - 2)) + for y in tiles.size(): + for x in tiles[y].size(): + map.set_tile(Vector2i(x,y) - co, gt.call([x,y]), [[x,y-1],[x-1,y],[x,y+1],[x+1,y]].map(gt)) func _input(_event): if Input.is_action_just_pressed("ui_cancel"): diff --git a/client/menu/character_menu.tscn b/client/menu/character_menu.tscn index 5428b2e4..b68cb528 100644 --- a/client/menu/character_menu.tscn +++ b/client/menu/character_menu.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=10 format=3 uid="uid://1f7xpirm5d28"] +[gd_scene load_steps=11 format=3 uid="uid://1f7xpirm5d28"] [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_ak2pw"] [ext_resource type="Script" path="res://menu/character_menu.gd" id="1_brhd1"] +[ext_resource type="PackedScene" uid="uid://b4gone8fu53r7" path="res://map/map.tscn" id="3_6mc88"] [ext_resource type="PackedScene" uid="uid://b3hhir2fvnunu" path="res://player/character/character.tscn" id="3_odq7n"] [ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="4_c0ocf"] [ext_resource type="Texture2D" uid="uid://35rd5gamtyqm" path="res://menu/arrow.svg" id="5_kvd7k"] @@ -23,16 +24,37 @@ grow_vertical = 2 theme = ExtResource("1_ak2pw") script = ExtResource("1_brhd1") -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +[node name="Node3D" type="Node3D" parent="."] + +[node name="WorldEnvironment" type="WorldEnvironment" parent="Node3D"] environment = SubResource("Environment_ex25y") -[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(0.857401, 0, 0.514649, -0.15367, 0.954381, 0.256012, -0.491171, -0.298591, 0.818287, 2.76633, 1, 1.90733) +[node name="Camera3D" type="Camera3D" parent="Node3D"] +transform = Transform3D(1, 0, 0, 0, 0.977046, 0.21303, 0, -0.21303, 0.977046, 0, 1.137, 2.703) +fov = 41.8 + +[node name="Map" parent="Node3D" instance=ExtResource("3_6mc88")] +transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, 0, 0, 0) + +[node name="Character" parent="Node3D" instance=ExtResource("3_odq7n")] + +[node name="SpotLight3D" type="SpotLight3D" parent="Node3D"] +transform = Transform3D(0.631535, -0.571246, 0.524254, 0.0428654, 0.700843, 0.712026, -0.774162, -0.427197, 0.467093, 1.79161, 3.07541, 1.58055) +light_energy = 2.689 +spot_range = 20.159 +spot_angle = 17.9256 -[node name="Camera3D" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.75, 1.75) +[node name="SpotLight3D2" type="SpotLight3D" parent="Node3D"] +transform = Transform3D(0.32457, 0.109091, -0.93955, 0.0604837, 0.9889, 0.135716, 0.943926, -0.100877, 0.314369, -5.22608, 2.10824, 2.35824) +light_energy = 2.689 +spot_range = 20.159 +spot_angle = 17.9256 -[node name="Character" parent="." instance=ExtResource("3_odq7n")] +[node name="SpotLight3D3" type="SpotLight3D" parent="Node3D"] +transform = Transform3D(0.114088, -0.0173997, 0.993318, 0.0610452, 0.99808, 0.0104718, -0.991594, 0.0594426, 0.114931, 8.10732, 0.437069, 2.35824) +light_energy = 2.689 +spot_range = 20.159 +spot_angle = 17.9256 [node name="VBoxContainer" type="VBoxContainer" parent="."] layout_mode = 1 diff --git a/client/player/character/character.tscn b/client/player/character/character.tscn index d55296a5..e4a2af66 100644 --- a/client/player/character/character.tscn +++ b/client/player/character/character.tscn @@ -627,6 +627,7 @@ libraries = { [node name="Walking" type="CPUParticles3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.2) +emitting = false amount = 2 lifetime = 0.5 lifetime_randomness = 0.5 |