From 4e3d70cd61d5824e741490efc9a410271bfeeb01 Mon Sep 17 00:00:00 2001 From: minimata Date: Sat, 31 Jan 2026 21:39:23 +0100 Subject: [PATCH] lvl1 done --- resources/characters/duchex.tres | 19 +++++-------------- resources/characters/duke.tres | 15 +++++---------- resources/characters/king.tres | 13 ------------- resources/characters/queen.tres | 14 -------------- resources/traits/silent.tres | 9 +++++++++ resources/traits/talkative.tres | 9 +++++++++ scenes/character/chara_resource.gd | 2 +- scenes/main/main.tscn | 4 ++-- scenes/managers/masked_chara.gd | 2 +- 9 files changed, 32 insertions(+), 55 deletions(-) create mode 100644 resources/traits/silent.tres create mode 100644 resources/traits/talkative.tres diff --git a/resources/characters/duchex.tres b/resources/characters/duchex.tres index 838902f..75af8b0 100644 --- a/resources/characters/duchex.tres +++ b/resources/characters/duchex.tres @@ -2,11 +2,9 @@ [ext_resource type="Texture2D" uid="uid://dwy3kklywl0ci" path="res://assets/characters/Perso 1.png" id="1_tppor"] [ext_resource type="Script" uid="uid://bwam50qxikpw4" path="res://scenes/character/chara_resource.gd" id="2_cyb15"] +[ext_resource type="Resource" uid="uid://b6614fqoymxur" path="res://resources/traits/silent.tres" id="3_q0kni"] [ext_resource type="Script" uid="uid://cya40uohlvgbr" path="res://scenes/character/trait.gd" id="3_s53hh"] -[ext_resource type="Resource" uid="uid://cefwc4j3p7m3v" path="res://resources/traits/black.tres" id="4_tppor"] -[ext_resource type="Resource" uid="uid://blu5de2dhiu46" path="res://resources/traits/young.tres" id="5_cyb15"] -[ext_resource type="Resource" uid="uid://ct4iy75ai7lmy" path="res://resources/traits/enby.tres" id="6_tppor"] -[ext_resource type="Resource" uid="uid://b118uebk1ldog" path="res://resources/traits/noble.tres" id="7_03y2d"] +[ext_resource type="Resource" uid="uid://lhskiwag15k" path="res://resources/traits/talkative.tres" id="4_w5qmk"] [resource] script = ExtResource("2_cyb15") @@ -14,15 +12,8 @@ name = "Duchex" chara_sprite = ExtResource("1_tppor") mask_eyes_position = Vector2(59.355, 227) mask_mouth_position = Vector2(64.8, 432.04) -traits = Array[ExtResource("3_s53hh")]([ExtResource("4_tppor"), ExtResource("5_cyb15"), ExtResource("6_tppor"), ExtResource("7_03y2d")]) -preferences = Dictionary[int, int]({ -0: 0, -2: 0, -3: 0, -5: 0, -6: 2, -8: 2, -13: 0, -14: 3 +traits = Array[ExtResource("3_s53hh")]([ExtResource("4_w5qmk")]) +preferences = Dictionary[ExtResource("3_s53hh"), int]({ +ExtResource("3_q0kni"): 0 }) metadata/_custom_type_script = "uid://bwam50qxikpw4" diff --git a/resources/characters/duke.tres b/resources/characters/duke.tres index 8546199..609d1a5 100644 --- a/resources/characters/duke.tres +++ b/resources/characters/duke.tres @@ -3,10 +3,8 @@ [ext_resource type="Texture2D" uid="uid://spbjfmmk8o0s" path="res://assets/characters/Perso 3.png" id="1_d1fpd"] [ext_resource type="Script" uid="uid://bwam50qxikpw4" path="res://scenes/character/chara_resource.gd" id="2_ce0p8"] [ext_resource type="Script" uid="uid://cya40uohlvgbr" path="res://scenes/character/trait.gd" id="3_n21sh"] -[ext_resource type="Resource" uid="uid://cefwc4j3p7m3v" path="res://resources/traits/black.tres" id="4_d1fpd"] -[ext_resource type="Resource" uid="uid://blu5de2dhiu46" path="res://resources/traits/young.tres" id="5_12asi"] -[ext_resource type="Resource" uid="uid://bmx28vnfhcs8b" path="res://resources/traits/man.tres" id="6_12asi"] -[ext_resource type="Resource" uid="uid://b118uebk1ldog" path="res://resources/traits/noble.tres" id="7_d1fpd"] +[ext_resource type="Resource" uid="uid://lhskiwag15k" path="res://resources/traits/talkative.tres" id="3_tvmgq"] +[ext_resource type="Resource" uid="uid://b6614fqoymxur" path="res://resources/traits/silent.tres" id="5_tl7uu"] [resource] script = ExtResource("2_ce0p8") @@ -15,11 +13,8 @@ chara_sprite = ExtResource("1_d1fpd") mask_eyes_position = Vector2(-87.17, -459.345) mask_eyes_rotation = 0.11693705988361988 mask_mouth_position = Vector2(-60.07, -343.01) -traits = Array[ExtResource("3_n21sh")]([ExtResource("4_d1fpd"), ExtResource("5_12asi"), ExtResource("6_12asi"), ExtResource("7_d1fpd")]) -preferences = Dictionary[int, int]({ -5: 0, -6: 0, -8: 3, -11: 0 +traits = Array[ExtResource("3_n21sh")]([ExtResource("5_tl7uu")]) +preferences = Dictionary[ExtResource("3_n21sh"), int]({ +ExtResource("3_tvmgq"): 0 }) metadata/_custom_type_script = "uid://bwam50qxikpw4" diff --git a/resources/characters/king.tres b/resources/characters/king.tres index cd7d6bb..0829e09 100644 --- a/resources/characters/king.tres +++ b/resources/characters/king.tres @@ -3,10 +3,6 @@ [ext_resource type="Texture2D" uid="uid://c57s3oksagauh" path="res://assets/sprites/sprites by judas la carotte/sprite3 happy small.png" id="1_k1rnw"] [ext_resource type="Script" uid="uid://bwam50qxikpw4" path="res://scenes/character/chara_resource.gd" id="3_vvog1"] [ext_resource type="Script" uid="uid://cya40uohlvgbr" path="res://scenes/character/trait.gd" id="4_0s3fj"] -[ext_resource type="Resource" uid="uid://bc376om20da8m" path="res://resources/traits/royal.tres" id="7_0s3fj"] -[ext_resource type="Resource" uid="uid://cb8jguybr1tlj" path="res://resources/traits/white.tres" id="8_u46dm"] -[ext_resource type="Resource" uid="uid://bvophatys2o1o" path="res://resources/traits/old.tres" id="9_fvshn"] -[ext_resource type="Resource" uid="uid://bmx28vnfhcs8b" path="res://resources/traits/man.tres" id="10_hcmf1"] [resource] script = ExtResource("3_vvog1") @@ -16,13 +12,4 @@ mask_eyes_position = Vector2(-21.75, -274.015) mask_eyes_rotation = 0.06981317007977318 mask_mouth_position = Vector2(-7.63, -186.87) mask_mouth_rotation = -0.1884955592153878 -traits = Array[ExtResource("4_0s3fj")]([ExtResource("8_u46dm"), ExtResource("9_fvshn"), ExtResource("10_hcmf1"), ExtResource("7_0s3fj")]) -preferences = Dictionary[int, int]({ -4: 0, -6: 0, -11: 1, -12: 3, -13: 0, -14: 1 -}) metadata/_custom_type_script = "uid://bwam50qxikpw4" diff --git a/resources/characters/queen.tres b/resources/characters/queen.tres index 49927b0..99c696f 100644 --- a/resources/characters/queen.tres +++ b/resources/characters/queen.tres @@ -3,11 +3,6 @@ [ext_resource type="Texture2D" uid="uid://c726frtpkk1a8" path="res://assets/characters/Perso 2.png" id="1_d1164"] [ext_resource type="Script" uid="uid://bwam50qxikpw4" path="res://scenes/character/chara_resource.gd" id="2_g8bvo"] [ext_resource type="Script" uid="uid://cya40uohlvgbr" path="res://scenes/character/trait.gd" id="3_dkw07"] -[ext_resource type="Resource" uid="uid://bc376om20da8m" path="res://resources/traits/royal.tres" id="8_d1164"] -[ext_resource type="Resource" uid="uid://bvophatys2o1o" path="res://resources/traits/old.tres" id="8_j0xhd"] -[ext_resource type="Resource" uid="uid://cb8jguybr1tlj" path="res://resources/traits/white.tres" id="9_aywjr"] -[ext_resource type="Resource" uid="uid://dmd7gilnmcefr" path="res://resources/traits/woman.tres" id="10_tw1u2"] -[ext_resource type="Resource" uid="uid://deygyo2n88228" path="res://resources/traits/speaks_of_cats.tres" id="11_utmh4"] [resource] script = ExtResource("2_g8bvo") @@ -15,13 +10,4 @@ name = "Queen" chara_sprite = ExtResource("1_d1164") mask_eyes_position = Vector2(13.285, 181.09) mask_mouth_position = Vector2(26.595, 398.745) -traits = Array[ExtResource("3_dkw07")]([ExtResource("9_aywjr"), ExtResource("8_j0xhd"), ExtResource("10_tw1u2"), ExtResource("8_d1164"), ExtResource("11_utmh4")]) -preferences = Dictionary[int, int]({ -5: 2, -6: 0, -9: 2, -11: 3, -12: 0, -14: 3 -}) metadata/_custom_type_script = "uid://bwam50qxikpw4" diff --git a/resources/traits/silent.tres b/resources/traits/silent.tres new file mode 100644 index 0000000..68084a4 --- /dev/null +++ b/resources/traits/silent.tres @@ -0,0 +1,9 @@ +[gd_resource type="Resource" script_class="Trait" format=3 uid="uid://b6614fqoymxur"] + +[ext_resource type="Script" uid="uid://cya40uohlvgbr" path="res://scenes/character/trait.gd" id="1_750wv"] + +[resource] +script = ExtResource("1_750wv") +name = "silent" +stimulis = Array[int]([1]) +metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/resources/traits/talkative.tres b/resources/traits/talkative.tres new file mode 100644 index 0000000..eef3782 --- /dev/null +++ b/resources/traits/talkative.tres @@ -0,0 +1,9 @@ +[gd_resource type="Resource" script_class="Trait" format=3 uid="uid://lhskiwag15k"] + +[ext_resource type="Script" uid="uid://cya40uohlvgbr" path="res://scenes/character/trait.gd" id="1_rcjnw"] + +[resource] +script = ExtResource("1_rcjnw") +name = "talkative" +stimulis = Array[int]([1]) +metadata/_custom_type_script = "uid://cya40uohlvgbr" diff --git a/scenes/character/chara_resource.gd b/scenes/character/chara_resource.gd index 6ae000d..d1687dd 100644 --- a/scenes/character/chara_resource.gd +++ b/scenes/character/chara_resource.gd @@ -42,4 +42,4 @@ var mask_mouth_rotation : float = 0.0: @export_category("Traits and preferences") @export var traits: Array[Trait] -@export var preferences: Dictionary[Trait.Tag, Preference] +@export var preferences: Dictionary[Trait, Preference] diff --git a/scenes/main/main.tscn b/scenes/main/main.tscn index ae20e42..1cec1ab 100644 --- a/scenes/main/main.tscn +++ b/scenes/main/main.tscn @@ -28,8 +28,8 @@ [ext_resource type="Texture2D" uid="uid://c60m6ulhqcbga" path="res://assets/decor/BG.png" id="14_os81g"] [ext_resource type="Texture2D" uid="uid://dbpdehppn5h8v" path="res://assets/decor/entrance_bg_objects.png" id="15_1k3ck"] [ext_resource type="PackedScene" uid="uid://0rq12xgcteak" path="res://scenes/list/list.tscn" id="25_6llfj"] -[ext_resource type="Resource" uid="uid://dfguca2526tk6" path="res://resources/guests/queen_unmasked.tres" id="26_rofvo"] [ext_resource type="Resource" uid="uid://bfvky2dpu6vv0" path="res://resources/guests/duke_unmasked.tres" id="27_6w6mm"] +[ext_resource type="Resource" uid="uid://cfargib0urafc" path="res://resources/guests/duchex_unmasked.tres" id="27_62f45"] [ext_resource type="Resource" uid="uid://ca2fcdibf0mdm" path="res://resources/guests/queen_unracist.tres" id="28_r1bmu"] [ext_resource type="Resource" uid="uid://ctqdbo8xg3v88" path="res://resources/guests/duchex_cat.tres" id="29_6w6mm"] [ext_resource type="Script" uid="uid://bb0od2qqdx3or" path="res://scenes/main/ready_bell.gd" id="33_tbnf8"] @@ -378,7 +378,7 @@ character = NodePath("../Character") guest_list = NodePath("../GuestList") mask_list = NodePath("../MaskList") tables = [NodePath("../Table"), NodePath("../Table2"), NodePath("../Table3")] -lvl1_guest_1 = ExtResource("26_rofvo") +lvl1_guest_1 = ExtResource("27_62f45") lvl1_guest_2 = ExtResource("27_6w6mm") lvl2_guest_1 = ExtResource("28_r1bmu") lvl2_guest_2 = ExtResource("29_6w6mm") diff --git a/scenes/managers/masked_chara.gd b/scenes/managers/masked_chara.gd index f35cb81..466ae4d 100644 --- a/scenes/managers/masked_chara.gd +++ b/scenes/managers/masked_chara.gd @@ -44,7 +44,7 @@ func compute_score(other_guests: Array[MaskedChara]) -> float: strength *= face_mask.stimuli_multiplier trait_strength += strength - var preference = character.preferences.get(guest_trait.tag) if guest_trait.tag in character.preferences else CharacterResource.Preference.APPROVE + var preference = character.preferences.get(guest_trait) if guest_trait in character.preferences else CharacterResource.Preference.APPROVE var score_multiplier = pref_score_map.get(preference) if preference in pref_score_map else 1.0 guest_appreciation += trait_strength*score_multiplier