From a2939ae5cf935cf15cf29f2d95d9dba5f1d3f7da Mon Sep 17 00:00:00 2001 From: Tandy Date: Sat, 26 Sep 2026 18:20:53 -0600 Subject: [PATCH 1/3] njsgdjsfdjnfsdjk --- currency/currency.gd | 1 + currency/sentient/archer.tres | 37 ++++++++++++++++++++++ currency/sentient/calvary.tres | 37 ++++++++++++++++++++++ currency/sentient/chicken.tres | 1 + currency/sentient/cow.tres | 1 + currency/sentient/dinosaur.tres | 1 + currency/sentient/doctor.tres | 51 ++++++++++++++++++++++++++++++ currency/sentient/drunk.tres | 9 ++++++ currency/sentient/farmer.tres | 44 ++++++++++++++++++++++++++ currency/sentient/kings_guard.tres | 30 ++++++++++++++++++ currency/sentient/knight.tres | 23 ++++++++++++++ currency/sentient/lover.tres | 1 + currency/sentient/mercenary.tres | 9 ++++++ currency/sentient/messenger.tres | 23 ++++++++++++++ currency/sentient/miner.tres | 26 +++++++++++++++ currency/sentient/pig.tres | 1 + currency/sentient/royalty.tres | 1 + currency/sentient/spy.tres | 30 ++++++++++++++++++ currency/sentient/town_crier.tres | 29 +++++++++++++++++ currency/sentient/wizard.tres | 51 ++++++++++++++++++++++++++++++ project.godot | 1 - 21 files changed, 406 insertions(+), 1 deletion(-) diff --git a/currency/currency.gd b/currency/currency.gd index 72e18b4..1f0a1d5 100644 --- a/currency/currency.gd +++ b/currency/currency.gd @@ -6,3 +6,4 @@ class_name Currency @export_multiline var description = "no description of currency" @export var thumbnail: Texture2D @export var color: Color = Color.PINK +@export var wants: Array[Production] diff --git a/currency/sentient/archer.tres b/currency/sentient/archer.tres index b155381..a6c843e 100644 --- a/currency/sentient/archer.tres +++ b/currency/sentient/archer.tres @@ -4,10 +4,47 @@ [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_m37xt"] [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_b0duy"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_k672a"] +[ext_resource type="Resource" uid="uid://b8b6yr444ecdk" path="res://currency/inanimate/water.tres" id="5_2kil6"] +[ext_resource type="Resource" uid="uid://ervsee7ku1i2" path="res://currency/inanimate/bread.tres" id="6_qqxwu"] +[ext_resource type="Resource" uid="uid://bnlnq4ucsgfxe" path="res://currency/inanimate/gold.tres" id="7_227pm"] +[ext_resource type="Resource" uid="uid://ytteqojj7k1o" path="res://currency/inanimate/stone.tres" id="8_k5pub"] +[ext_resource type="Resource" uid="uid://b7vjuqkog7cxd" path="res://currency/inanimate/wood.tres" id="9_i8mvc"] + +[sub_resource type="Resource" id="Resource_ui157"] +script = ExtResource("1_m37xt") +currency = ExtResource("5_2kil6") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_ah5vq"] +script = ExtResource("1_m37xt") +currency = ExtResource("6_qqxwu") +amount = 7 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_2437s"] +script = ExtResource("1_m37xt") +currency = ExtResource("7_227pm") +amount = 5 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_n5gpp"] +script = ExtResource("1_m37xt") +currency = ExtResource("8_k5pub") +amount = 5 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_b1lqu"] +script = ExtResource("1_m37xt") +currency = ExtResource("9_i8mvc") +amount = 5 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_e7gnr") name = "Archer" production = Array[ExtResource("1_m37xt")]([ExtResource("2_b0duy"), ExtResource("3_k672a")]) description = "arrow go fweeewww" +color = Color(1.1310726e-06, 0.67725253, 0.15828604, 1) +wants = Array[ExtResource("1_m37xt")]([SubResource("Resource_ui157"), SubResource("Resource_ah5vq"), SubResource("Resource_2437s"), SubResource("Resource_n5gpp"), SubResource("Resource_b1lqu")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/calvary.tres b/currency/sentient/calvary.tres index 29649e1..7b804f0 100644 --- a/currency/sentient/calvary.tres +++ b/currency/sentient/calvary.tres @@ -4,10 +4,47 @@ [ext_resource type="Script" uid="uid://hcvynq5fjypj" path="res://currency/sentient_currency.gd" id="1_o1w50"] [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_hqcau"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_lyu7q"] +[ext_resource type="Resource" uid="uid://b8b6yr444ecdk" path="res://currency/inanimate/water.tres" id="5_fxi61"] +[ext_resource type="Resource" uid="uid://ervsee7ku1i2" path="res://currency/inanimate/bread.tres" id="6_vf3g1"] +[ext_resource type="Resource" uid="uid://bnlnq4ucsgfxe" path="res://currency/inanimate/gold.tres" id="7_2uxum"] +[ext_resource type="Resource" uid="uid://ytteqojj7k1o" path="res://currency/inanimate/stone.tres" id="8_npspm"] +[ext_resource type="Resource" uid="uid://b7vjuqkog7cxd" path="res://currency/inanimate/wood.tres" id="9_j3ou3"] + +[sub_resource type="Resource" id="Resource_ui157"] +script = ExtResource("1_cnnt2") +currency = ExtResource("5_fxi61") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_ah5vq"] +script = ExtResource("1_cnnt2") +currency = ExtResource("6_vf3g1") +amount = 7 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_2437s"] +script = ExtResource("1_cnnt2") +currency = ExtResource("7_2uxum") +amount = 5 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_n5gpp"] +script = ExtResource("1_cnnt2") +currency = ExtResource("8_npspm") +amount = 5 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_b1lqu"] +script = ExtResource("1_cnnt2") +currency = ExtResource("9_j3ou3") +amount = 5 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_o1w50") name = "Calvary" production = Array[ExtResource("1_cnnt2")]([ExtResource("2_hqcau"), ExtResource("3_lyu7q")]) description = "save a horse ride a cowboy or something." +color = Color(1, 0.14509805, 0.08627451, 1) +wants = Array[ExtResource("1_cnnt2")]([SubResource("Resource_ui157"), SubResource("Resource_ah5vq"), SubResource("Resource_2437s"), SubResource("Resource_n5gpp"), SubResource("Resource_b1lqu")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/chicken.tres b/currency/sentient/chicken.tres index 993b120..645429c 100644 --- a/currency/sentient/chicken.tres +++ b/currency/sentient/chicken.tres @@ -7,4 +7,5 @@ script = ExtResource("1_10o5k") name = "Chicken" description = "The evolved form of egg." +color = Color(1, 0.8980392, 0.23137255, 1) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/cow.tres b/currency/sentient/cow.tres index 1446570..a6ee29b 100644 --- a/currency/sentient/cow.tres +++ b/currency/sentient/cow.tres @@ -7,4 +7,5 @@ script = ExtResource("1_0c5xt") name = "Cow" description = "Moo" +color = Color(0.82329136, 0.82329136, 0.82329136, 1) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/dinosaur.tres b/currency/sentient/dinosaur.tres index c5124a7..ed84288 100644 --- a/currency/sentient/dinosaur.tres +++ b/currency/sentient/dinosaur.tres @@ -7,4 +7,5 @@ script = ExtResource("1_0dcki") name = "Dinosaur" description = "*rawrs at you gayly and prehistorically*" +color = Color(1, 0.48235294, 0, 1) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/doctor.tres b/currency/sentient/doctor.tres index 5514c9a..45d75de 100644 --- a/currency/sentient/doctor.tres +++ b/currency/sentient/doctor.tres @@ -5,6 +5,55 @@ [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_u3n2t"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_yv5d2"] [ext_resource type="Texture2D" uid="uid://bbcjo350ne8pv" path="res://thumbnails/doctor.jpg" id="5_e68kt"] +[ext_resource type="Resource" uid="uid://crnhu4w6lfopb" path="res://currency/inanimate/beer.tres" id="6_r8lqy"] +[ext_resource type="Resource" uid="uid://b8b6yr444ecdk" path="res://currency/inanimate/water.tres" id="7_ck4s1"] +[ext_resource type="Resource" uid="uid://ervsee7ku1i2" path="res://currency/inanimate/bread.tres" id="8_hu81m"] +[ext_resource type="Resource" uid="uid://bnlnq4ucsgfxe" path="res://currency/inanimate/gold.tres" id="9_w0d8m"] +[ext_resource type="Resource" uid="uid://bwrs2rwum4n2k" path="res://currency/abstract/plague.tres" id="10_gs0ul"] +[ext_resource type="Resource" uid="uid://by3dayfdpobpt" path="res://currency/inanimate/blood.tres" id="11_0hope"] +[ext_resource type="Resource" uid="uid://dmctedq3pav0t" path="res://currency/inanimate/corpse.tres" id="12_gr03u"] + +[sub_resource type="Resource" id="Resource_60ga3"] +script = ExtResource("1_ohece") +currency = ExtResource("6_r8lqy") +amount = 2 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_i5jpd"] +script = ExtResource("1_ohece") +currency = ExtResource("7_ck4s1") +amount = 20 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_2l2nr"] +script = ExtResource("1_ohece") +currency = ExtResource("8_hu81m") +amount = 15 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_6v7ae"] +script = ExtResource("1_ohece") +currency = ExtResource("9_w0d8m") +amount = 25 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_iph2q"] +script = ExtResource("1_ohece") +currency = ExtResource("10_gs0ul") +amount = 15 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_i8tft"] +script = ExtResource("1_ohece") +currency = ExtResource("11_0hope") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_j0xkl"] +script = ExtResource("1_ohece") +currency = ExtResource("12_gr03u") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_8u0th") @@ -12,4 +61,6 @@ name = "Doctor" production = Array[ExtResource("1_ohece")]([ExtResource("2_u3n2t"), ExtResource("3_yv5d2")]) description = "They're definitely not crow people. Don't question the masks. it's fine." thumbnail = ExtResource("5_e68kt") +color = Color(0, 0.9529412, 0, 1) +wants = Array[ExtResource("1_ohece")]([SubResource("Resource_60ga3"), SubResource("Resource_i5jpd"), SubResource("Resource_2l2nr"), SubResource("Resource_6v7ae"), SubResource("Resource_iph2q"), SubResource("Resource_i8tft"), SubResource("Resource_j0xkl")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/drunk.tres b/currency/sentient/drunk.tres index 58e0c69..0b1bea0 100644 --- a/currency/sentient/drunk.tres +++ b/currency/sentient/drunk.tres @@ -4,10 +4,19 @@ [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_0dvy8"] [ext_resource type="Script" uid="uid://hcvynq5fjypj" path="res://currency/sentient_currency.gd" id="2_j265y"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_0dvy8"] +[ext_resource type="Resource" uid="uid://crnhu4w6lfopb" path="res://currency/inanimate/beer.tres" id="5_a7r6n"] + +[sub_resource type="Resource" id="Resource_buevm"] +script = ExtResource("1_b07i1") +currency = ExtResource("5_a7r6n") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("2_j265y") name = "Drunk" production = Array[ExtResource("1_b07i1")]([ExtResource("2_0dvy8"), ExtResource("3_0dvy8")]) description = "Will happily talk to you about all their problems." +color = Color(0.80004877, 0.60784924, 0.18863755, 1) +wants = Array[ExtResource("1_b07i1")]([SubResource("Resource_buevm")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/farmer.tres b/currency/sentient/farmer.tres index 35e9078..4f3ce37 100644 --- a/currency/sentient/farmer.tres +++ b/currency/sentient/farmer.tres @@ -4,10 +4,54 @@ [ext_resource type="Script" uid="uid://hcvynq5fjypj" path="res://currency/sentient_currency.gd" id="1_kipvp"] [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_jkjll"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_kfqfp"] +[ext_resource type="Resource" uid="uid://b5qok0rcalr" path="res://currency/sentient/cow.tres" id="5_uddvy"] +[ext_resource type="Resource" uid="uid://rdrcyvuvrp2m" path="res://currency/sentient/pig.tres" id="6_epa0v"] +[ext_resource type="Resource" uid="uid://ervsee7ku1i2" path="res://currency/inanimate/bread.tres" id="7_uh6l7"] +[ext_resource type="Resource" uid="uid://b8b6yr444ecdk" path="res://currency/inanimate/water.tres" id="8_7lva1"] +[ext_resource type="Resource" uid="uid://dsohovjbf3s2p" path="res://currency/sentient/chicken.tres" id="9_i5hpk"] +[ext_resource type="Resource" uid="uid://y4ssn47oa8tm" path="res://currency/inanimate/fertilizer.tres" id="10_n23mm"] + +[sub_resource type="Resource" id="Resource_p1wox"] +script = ExtResource("1_35xhy") +currency = ExtResource("5_uddvy") +amount = 5 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_bu4yr"] +script = ExtResource("1_35xhy") +currency = ExtResource("6_epa0v") +amount = 5 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_dynkd"] +script = ExtResource("1_35xhy") +currency = ExtResource("7_uh6l7") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_t37mv"] +script = ExtResource("1_35xhy") +currency = ExtResource("8_7lva1") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_ou8s7"] +script = ExtResource("1_35xhy") +currency = ExtResource("9_i5hpk") +amount = 5 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_4ts75"] +script = ExtResource("1_35xhy") +currency = ExtResource("10_n23mm") +amount = 20 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_kipvp") name = "Farmer" production = Array[ExtResource("1_35xhy")]([ExtResource("2_jkjll"), ExtResource("3_kfqfp")]) description = "When something is farm, but more." +color = Color(0.43529412, 0.84705883, 1, 1) +wants = Array[ExtResource("1_35xhy")]([SubResource("Resource_p1wox"), SubResource("Resource_bu4yr"), SubResource("Resource_dynkd"), SubResource("Resource_t37mv"), SubResource("Resource_ou8s7"), SubResource("Resource_4ts75")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/kings_guard.tres b/currency/sentient/kings_guard.tres index c039fd8..2894fc9 100644 --- a/currency/sentient/kings_guard.tres +++ b/currency/sentient/kings_guard.tres @@ -4,10 +4,40 @@ [ext_resource type="Script" uid="uid://hcvynq5fjypj" path="res://currency/sentient_currency.gd" id="1_y7sat"] [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_s3h3i"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_3jtdd"] +[ext_resource type="Resource" uid="uid://bnlnq4ucsgfxe" path="res://currency/inanimate/gold.tres" id="5_bom44"] +[ext_resource type="Resource" uid="uid://ervsee7ku1i2" path="res://currency/inanimate/bread.tres" id="6_y0tsi"] +[ext_resource type="Resource" uid="uid://b8b6yr444ecdk" path="res://currency/inanimate/water.tres" id="7_1ptox"] +[ext_resource type="Resource" uid="uid://crnhu4w6lfopb" path="res://currency/inanimate/beer.tres" id="8_t2htw"] + +[sub_resource type="Resource" id="Resource_1g3kj"] +script = ExtResource("1_f1fuf") +currency = ExtResource("5_bom44") +amount = 20 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_kmdkm"] +script = ExtResource("1_f1fuf") +currency = ExtResource("6_y0tsi") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_3p8gt"] +script = ExtResource("1_f1fuf") +currency = ExtResource("7_1ptox") +amount = 15 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_m16xj"] +script = ExtResource("1_f1fuf") +currency = ExtResource("8_t2htw") +amount = 5 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_y7sat") name = "King Guard" production = Array[ExtResource("1_f1fuf")]([ExtResource("2_s3h3i"), ExtResource("3_3jtdd")]) description = "better hope these guys are loyal." +color = Color(0.54509807, 0, 1, 1) +wants = Array[ExtResource("1_f1fuf")]([SubResource("Resource_1g3kj"), SubResource("Resource_kmdkm"), SubResource("Resource_3p8gt"), SubResource("Resource_m16xj")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/knight.tres b/currency/sentient/knight.tres index 422d4ef..40f8523 100644 --- a/currency/sentient/knight.tres +++ b/currency/sentient/knight.tres @@ -4,10 +4,33 @@ [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_sa77c"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_xhy5h"] [ext_resource type="Script" uid="uid://hcvynq5fjypj" path="res://currency/sentient_currency.gd" id="4_7d8n3"] +[ext_resource type="Resource" uid="uid://b8b6yr444ecdk" path="res://currency/inanimate/water.tres" id="5_7d8n3"] +[ext_resource type="Resource" uid="uid://ervsee7ku1i2" path="res://currency/inanimate/bread.tres" id="6_xlwb3"] +[ext_resource type="Resource" uid="uid://bnlnq4ucsgfxe" path="res://currency/inanimate/gold.tres" id="7_ds1y1"] + +[sub_resource type="Resource" id="Resource_ui157"] +script = ExtResource("1_626vc") +currency = ExtResource("5_7d8n3") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_ah5vq"] +script = ExtResource("1_626vc") +currency = ExtResource("6_xlwb3") +amount = 7 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_2437s"] +script = ExtResource("1_626vc") +currency = ExtResource("7_ds1y1") +amount = 5 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("4_7d8n3") name = "Knight" production = Array[ExtResource("1_626vc")]([ExtResource("2_sa77c"), ExtResource("3_xhy5h")]) description = "Nighty night Knight" +color = Color(0.54901963, 0, 0, 1) +wants = Array[ExtResource("1_626vc")]([SubResource("Resource_ui157"), SubResource("Resource_ah5vq"), SubResource("Resource_2437s")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/lover.tres b/currency/sentient/lover.tres index c393919..fcd82cd 100644 --- a/currency/sentient/lover.tres +++ b/currency/sentient/lover.tres @@ -11,4 +11,5 @@ name = "Lover" production = Array[ExtResource("1_8hvx0")]([ExtResource("2_xggvw"), ExtResource("3_8a0mj")]) description = "Romeo and Juliet? Romiet? Julieo?" +color = Color(0.9999934, 0.2775343, 0.50037557, 1) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/mercenary.tres b/currency/sentient/mercenary.tres index faa070a..255accb 100644 --- a/currency/sentient/mercenary.tres +++ b/currency/sentient/mercenary.tres @@ -4,10 +4,19 @@ [ext_resource type="Script" uid="uid://hcvynq5fjypj" path="res://currency/sentient_currency.gd" id="1_m8i4c"] [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_x1puw"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_yveov"] +[ext_resource type="Resource" uid="uid://bnlnq4ucsgfxe" path="res://currency/inanimate/gold.tres" id="5_p4ceb"] + +[sub_resource type="Resource" id="Resource_3og8x"] +script = ExtResource("1_81xhi") +currency = ExtResource("5_p4ceb") +amount = 20 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_m8i4c") name = "Mercenary" production = Array[ExtResource("1_81xhi")]([ExtResource("2_x1puw"), ExtResource("3_yveov")]) description = "For some reason I always think of masonry when I read this word." +color = Color(0.36862746, 0.3019608, 0.7529412, 1) +wants = Array[ExtResource("1_81xhi")]([SubResource("Resource_3og8x")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/messenger.tres b/currency/sentient/messenger.tres index 5abfaef..6942b1a 100644 --- a/currency/sentient/messenger.tres +++ b/currency/sentient/messenger.tres @@ -4,10 +4,33 @@ [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_iy37t"] [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_demtt"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_mxgt6"] +[ext_resource type="Resource" uid="uid://bnlnq4ucsgfxe" path="res://currency/inanimate/gold.tres" id="5_rq11v"] +[ext_resource type="Resource" uid="uid://b8b6yr444ecdk" path="res://currency/inanimate/water.tres" id="6_rptfm"] +[ext_resource type="Resource" uid="uid://ervsee7ku1i2" path="res://currency/inanimate/bread.tres" id="7_mf0hi"] + +[sub_resource type="Resource" id="Resource_0idw0"] +script = ExtResource("1_iy37t") +currency = ExtResource("5_rq11v") +amount = 15 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_l6nf4"] +script = ExtResource("1_iy37t") +currency = ExtResource("6_rptfm") +amount = 15 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_7h38k"] +script = ExtResource("1_iy37t") +currency = ExtResource("7_mf0hi") +amount = 20 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_egwdx") name = "Messenger" production = Array[ExtResource("1_iy37t")]([ExtResource("2_demtt"), ExtResource("3_mxgt6")]) description = "Like a carrier pigeon, but worse at their job." +color = Color(0.6574991, 0.8582606, 1, 1) +wants = Array[ExtResource("1_iy37t")]([SubResource("Resource_0idw0"), SubResource("Resource_l6nf4"), SubResource("Resource_7h38k")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/miner.tres b/currency/sentient/miner.tres index 413f483..8053b70 100644 --- a/currency/sentient/miner.tres +++ b/currency/sentient/miner.tres @@ -4,10 +4,36 @@ [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_yn73g"] [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_8h62s"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_2kvuq"] +[ext_resource type="Resource" uid="uid://b8b6yr444ecdk" path="res://currency/inanimate/water.tres" id="5_eaivi"] +[ext_resource type="Resource" uid="uid://ervsee7ku1i2" path="res://currency/inanimate/bread.tres" id="6_4664q"] +[ext_resource type="Resource" uid="uid://crnhu4w6lfopb" path="res://currency/inanimate/beer.tres" id="7_tbpph"] + +[sub_resource type="Resource" id="Resource_bws7g"] +script = ExtResource("1_yn73g") +currency = ExtResource("5_eaivi") +amount = 15 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_vxrsf"] +script = ExtResource("1_yn73g") +currency = ExtResource("6_4664q") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_sgbmh"] +script = ExtResource("1_yn73g") +currency = ExtResource("7_tbpph") +amount = 5 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_u6o3i"] +script = ExtResource("1_yn73g") +metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_phc4h") name = "Miner" production = Array[ExtResource("1_yn73g")]([ExtResource("2_8h62s"), ExtResource("3_2kvuq")]) description = "we yearn for the mines, sire." +wants = Array[ExtResource("1_yn73g")]([SubResource("Resource_bws7g"), SubResource("Resource_vxrsf"), SubResource("Resource_sgbmh"), SubResource("Resource_u6o3i")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/pig.tres b/currency/sentient/pig.tres index 79d08e0..6352665 100644 --- a/currency/sentient/pig.tres +++ b/currency/sentient/pig.tres @@ -7,4 +7,5 @@ script = ExtResource("1_g345f") name = "Pig" description = "Oink Oink." +color = Color(0.99999994, 0.5224684, 0.6292804, 1) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/royalty.tres b/currency/sentient/royalty.tres index b3feea4..5a80657 100644 --- a/currency/sentient/royalty.tres +++ b/currency/sentient/royalty.tres @@ -10,4 +10,5 @@ script = ExtResource("1_jo5ux") name = "Royalty" production = Array[ExtResource("1_acsld")]([ExtResource("2_40pnt"), ExtResource("3_xy04b")]) description = "Well look at you up on your high horse (or I suppose more accurately chair)." +color = Color(0.30911273, 1.997426e-05, 0.26303148, 1) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/spy.tres b/currency/sentient/spy.tres index 2fa94cd..6dfa9d0 100644 --- a/currency/sentient/spy.tres +++ b/currency/sentient/spy.tres @@ -4,10 +4,40 @@ [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_wync1"] [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_30yvg"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_pvkom"] +[ext_resource type="Resource" uid="uid://bnlnq4ucsgfxe" path="res://currency/inanimate/gold.tres" id="5_ssejx"] +[ext_resource type="Resource" uid="uid://ervsee7ku1i2" path="res://currency/inanimate/bread.tres" id="6_dmqey"] +[ext_resource type="Resource" uid="uid://b8b6yr444ecdk" path="res://currency/inanimate/water.tres" id="7_wnwuo"] +[ext_resource type="Resource" uid="uid://crnhu4w6lfopb" path="res://currency/inanimate/beer.tres" id="8_jpoxk"] + +[sub_resource type="Resource" id="Resource_lljap"] +script = ExtResource("1_wync1") +currency = ExtResource("5_ssejx") +amount = 25 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_dr7t1"] +script = ExtResource("1_wync1") +currency = ExtResource("6_dmqey") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_g2eqt"] +script = ExtResource("1_wync1") +currency = ExtResource("7_wnwuo") +amount = 15 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_me530"] +script = ExtResource("1_wync1") +currency = ExtResource("8_jpoxk") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_ou6ev") name = "Spy" production = Array[ExtResource("1_wync1")]([ExtResource("2_30yvg"), ExtResource("3_pvkom")]) description = "this... is a bucket." +color = Color(0.2784093, 0, 0.63105136, 1) +wants = Array[ExtResource("1_wync1")]([SubResource("Resource_lljap"), SubResource("Resource_dr7t1"), SubResource("Resource_g2eqt"), SubResource("Resource_me530")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/town_crier.tres b/currency/sentient/town_crier.tres index e905cde..ab683bb 100644 --- a/currency/sentient/town_crier.tres +++ b/currency/sentient/town_crier.tres @@ -4,6 +4,34 @@ [ext_resource type="Script" uid="uid://hcvynq5fjypj" path="res://currency/sentient_currency.gd" id="1_an3bl"] [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_0o8mq"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_xknsl"] +[ext_resource type="Resource" uid="uid://ervsee7ku1i2" path="res://currency/inanimate/bread.tres" id="5_hkj46"] +[ext_resource type="Resource" uid="uid://b7vjuqkog7cxd" path="res://currency/inanimate/wood.tres" id="6_s7hyh"] +[ext_resource type="Resource" uid="uid://ytteqojj7k1o" path="res://currency/inanimate/stone.tres" id="7_urykh"] +[ext_resource type="Resource" uid="uid://b8b6yr444ecdk" path="res://currency/inanimate/water.tres" id="8_lqdse"] + +[sub_resource type="Resource" id="Resource_t4qyg"] +script = ExtResource("1_0qymk") +currency = ExtResource("5_hkj46") +amount = 15 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_mxenu"] +script = ExtResource("1_0qymk") +currency = ExtResource("6_s7hyh") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_hgnp0"] +script = ExtResource("1_0qymk") +currency = ExtResource("7_urykh") +amount = 5 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_ljdya"] +script = ExtResource("1_0qymk") +currency = ExtResource("8_lqdse") +amount = 15 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_an3bl") @@ -12,4 +40,5 @@ production = Array[ExtResource("1_0qymk")]([ExtResource("2_0o8mq"), ExtResource( description = "Hear Ye! Hear Ye! Extra! Extra! Come Get It While It's Hot Off The Medieval Presses!" +wants = Array[ExtResource("1_0qymk")]([SubResource("Resource_t4qyg"), SubResource("Resource_mxenu"), SubResource("Resource_hgnp0"), SubResource("Resource_ljdya")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/wizard.tres b/currency/sentient/wizard.tres index d3139c2..a509853 100644 --- a/currency/sentient/wizard.tres +++ b/currency/sentient/wizard.tres @@ -4,10 +4,61 @@ [ext_resource type="Script" uid="uid://hcvynq5fjypj" path="res://currency/sentient_currency.gd" id="1_tds6s"] [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_ud150"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_mp872"] +[ext_resource type="Resource" uid="uid://crnhu4w6lfopb" path="res://currency/inanimate/beer.tres" id="5_g2km3"] +[ext_resource type="Resource" uid="uid://b8b6yr444ecdk" path="res://currency/inanimate/water.tres" id="6_aqv3t"] +[ext_resource type="Resource" uid="uid://ervsee7ku1i2" path="res://currency/inanimate/bread.tres" id="7_fu5ce"] +[ext_resource type="Resource" uid="uid://bnlnq4ucsgfxe" path="res://currency/inanimate/gold.tres" id="8_rx02f"] +[ext_resource type="Resource" uid="uid://bwrs2rwum4n2k" path="res://currency/abstract/plague.tres" id="9_dc2dr"] +[ext_resource type="Resource" uid="uid://by3dayfdpobpt" path="res://currency/inanimate/blood.tres" id="10_0ipx8"] +[ext_resource type="Resource" uid="uid://dmctedq3pav0t" path="res://currency/inanimate/corpse.tres" id="11_1nkrr"] + +[sub_resource type="Resource" id="Resource_60ga3"] +script = ExtResource("1_05kyk") +currency = ExtResource("5_g2km3") +amount = 2 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_i5jpd"] +script = ExtResource("1_05kyk") +currency = ExtResource("6_aqv3t") +amount = 20 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_2l2nr"] +script = ExtResource("1_05kyk") +currency = ExtResource("7_fu5ce") +amount = 15 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_6v7ae"] +script = ExtResource("1_05kyk") +currency = ExtResource("8_rx02f") +amount = 25 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_iph2q"] +script = ExtResource("1_05kyk") +currency = ExtResource("9_dc2dr") +amount = 15 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_i8tft"] +script = ExtResource("1_05kyk") +currency = ExtResource("10_0ipx8") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_j0xkl"] +script = ExtResource("1_05kyk") +currency = ExtResource("11_1nkrr") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_tds6s") name = "Wizard" production = Array[ExtResource("1_05kyk")]([ExtResource("2_ud150"), ExtResource("3_mp872")]) description = "FIREBALL!!!" +color = Color(0, 0, 0.79607844, 1) +wants = Array[ExtResource("1_05kyk")]([SubResource("Resource_60ga3"), SubResource("Resource_i5jpd"), SubResource("Resource_2l2nr"), SubResource("Resource_6v7ae"), SubResource("Resource_iph2q"), SubResource("Resource_i8tft"), SubResource("Resource_j0xkl")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/project.godot b/project.godot index b7186f5..9934ab1 100644 --- a/project.godot +++ b/project.godot @@ -124,4 +124,3 @@ dialogic_default_action={ [rendering] rendering_device/driver.windows="d3d12" -renderer/rendering_method="gl_compatibility" From e7111384130f5e6ffa53f569b22b44962a04006e Mon Sep 17 00:00:00 2001 From: Spencer Killen Date: Sat, 26 Sep 2026 19:28:23 -0600 Subject: [PATCH 2/3] . --- gui/currency_inspector_panel.gd | 4 ++++ member_inspector_panel.gd | 24 +++++++++++++++++++++++- member_inspector_panel.tscn | 28 ++++++++++++++++++++++++++++ project.godot | 1 + test/test_economy.tscn | 6 ++++++ user_context.gd | 1 + 6 files changed, 63 insertions(+), 1 deletion(-) diff --git a/gui/currency_inspector_panel.gd b/gui/currency_inspector_panel.gd index f3e5eb5..b1a9d1e 100644 --- a/gui/currency_inspector_panel.gd +++ b/gui/currency_inspector_panel.gd @@ -4,8 +4,12 @@ var currency: Currency = null func _ready() -> void: UserContext.currency_inspect.connect(currency_inspect) + UserContext.member_inspect.connect(member_inspect) update() +func member_inspect(_m: CurrencyMemberSprite): + visible = false + func currency_inspect(c: Currency): currency = c update() diff --git a/member_inspector_panel.gd b/member_inspector_panel.gd index c5cf846..3e91e2d 100644 --- a/member_inspector_panel.gd +++ b/member_inspector_panel.gd @@ -3,8 +3,30 @@ extends "res://gui/currency_inspector_panel.gd" @export var member: CurrencyMemberSprite func _ready() -> void: + UserContext.currency_inspect.connect(currency_inspect) UserContext.member_inspect.connect(member_inspect) - + update() + func member_inspect(m: CurrencyMemberSprite): + if member != null: + member.tree_exiting.disconnect(member_left) member = m currency = m.currency + m.tree_exiting.connect(member_left) + update() + +func member_left(): + member = null + visible = false + +func currency_inspect(_c: Currency): + visible = false + +func update(): + super() + if member != null: + %Allegiance.text = member.allegiance.kingdom_name + %CurrencyMemberSprite.currency = member.currency + %CurrencyMemberSprite.allegiance = member.allegiance + %CurrencyMemberSprite.sync() + diff --git a/member_inspector_panel.tscn b/member_inspector_panel.tscn index 6b2ea77..ebf1bbb 100644 --- a/member_inspector_panel.tscn +++ b/member_inspector_panel.tscn @@ -2,6 +2,34 @@ [ext_resource type="PackedScene" uid="uid://75htlmk51oo" path="res://gui/currency_inspector_panel.tscn" id="1_x0sea"] [ext_resource type="Script" uid="uid://cjhnvflx56hjj" path="res://member_inspector_panel.gd" id="2_yfo1o"] +[ext_resource type="PackedScene" uid="uid://coebykrbnhlif" path="res://currency/members/MemberSprite.tscn" id="3_2bpjt"] [node name="MemberInspectorPanel" unique_id=169191981 instance=ExtResource("1_x0sea")] script = ExtResource("2_yfo1o") + +[node name="Label" type="Label" parent="VBoxContainer" parent_id_path=PackedInt32Array(362599487) index="5" unique_id=310762327] +layout_mode = 2 + +[node name="Label2" type="Label" parent="VBoxContainer" parent_id_path=PackedInt32Array(362599487) index="6" unique_id=1729672621] +layout_mode = 2 +text = "Allegiance: " + +[node name="Allegiance" type="Label" parent="VBoxContainer" parent_id_path=PackedInt32Array(362599487) index="7" unique_id=601264471] +unique_name_in_owner = true +layout_mode = 2 + +[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer" parent_id_path=PackedInt32Array(362599487) index="8" unique_id=214625865] +layout_mode = 2 +theme_override_constants/margin_left = 50 +theme_override_constants/margin_top = 50 +theme_override_constants/margin_right = 50 +theme_override_constants/margin_bottom = 50 + +[node name="CurrencyMemberSprite" parent="VBoxContainer/MarginContainer" index="0" unique_id=283117283 instance=ExtResource("3_2bpjt")] +unique_name_in_owner = true +custom_minimum_size = Vector2(75, 75) +custom_maximum_size = Vector2(75, 75) +layout_mode = 2 + +[node name="Bribes" type="Label" parent="VBoxContainer" parent_id_path=PackedInt32Array(362599487) index="9" unique_id=807570934] +layout_mode = 2 diff --git a/project.godot b/project.godot index b7186f5..7b90190 100644 --- a/project.godot +++ b/project.godot @@ -20,6 +20,7 @@ Economy="*uid://dnpioqaes87yb" Random="*uid://cu3n7igqstbxi" UserContext="*uid://0a08ucta58lp" GameState="*uid://bohql2ihaumsa" +LetterGeneration="*uid://d156m2y8b38qs" [dialogic] diff --git a/test/test_economy.tscn b/test/test_economy.tscn index ec20e7e..505b07b 100644 --- a/test/test_economy.tscn +++ b/test/test_economy.tscn @@ -4,6 +4,7 @@ [ext_resource type="PackedScene" uid="uid://desvyn6e28oar" path="res://gui/production_chart.tscn" id="2_jd86c"] [ext_resource type="PackedScene" uid="uid://dx3y20p75chkj" path="res://gui/production_ledger_scroll.tscn" id="3_n4oyp"] [ext_resource type="PackedScene" uid="uid://75htlmk51oo" path="res://gui/currency_inspector_panel.tscn" id="4_7ya5o"] +[ext_resource type="PackedScene" uid="uid://dsmh4uua1avgp" path="res://member_inspector_panel.tscn" id="5_i7808"] [ext_resource type="PackedScene" uid="uid://vanflt5jr7tx" path="res://gui/inbox_panel.tscn" id="5_n4oyp"] [ext_resource type="PackedScene" uid="uid://coebykrbnhlif" path="res://currency/members/MemberSprite.tscn" id="6_vua3v"] [ext_resource type="Resource" uid="uid://ihsvxienxbeu" path="res://currency/sentient/knight.tres" id="7_s0mui"] @@ -69,6 +70,11 @@ text = "OpenInbox" [node name="CurrencyInspectorPanel" parent="." unique_id=169191981 instance=ExtResource("4_7ya5o")] layout_mode = 1 +[node name="MemberInspectorPanel" parent="." unique_id=1641024074 instance=ExtResource("5_i7808")] +layout_mode = 1 +offset_left = -189.0 +offset_right = -189.0 + [node name="InboxPanel" parent="." unique_id=534578339 instance=ExtResource("5_n4oyp")] layout_mode = 1 diff --git a/user_context.gd b/user_context.gd index 15e96e7..7947a6e 100644 --- a/user_context.gd +++ b/user_context.gd @@ -19,6 +19,7 @@ func select_focused_member(): return selected_member = candidate selected_member_change.emit(selected_member) + UserContext.member_inspect.emit(selected_member) func focused_member() -> CurrencyMemberSprite: if focused_members.size() == 0: From 39972761ea450150e6f6baece9cf5ba2f1a32d5c Mon Sep 17 00:00:00 2001 From: Spencer Killen Date: Sat, 26 Sep 2026 19:58:03 -0600 Subject: [PATCH 3/3] . --- bribe_button.gd | 15 +++++++++++++++ bribe_button.gd.uid | 1 + economy.gd | 9 +++++++++ gui/bribe_button.tscn | 9 +++++++++ gui/currency_inspector_panel.gd | 6 ++++++ gui/currency_inspector_panel.tscn | 25 +++++++++++++------------ member_inspector_panel.gd | 22 ++++++++++++++++++++++ member_inspector_panel.tscn | 6 ++++++ project.godot | 1 + 9 files changed, 82 insertions(+), 12 deletions(-) create mode 100644 bribe_button.gd create mode 100644 bribe_button.gd.uid create mode 100644 gui/bribe_button.tscn diff --git a/bribe_button.gd b/bribe_button.gd new file mode 100644 index 0000000..bd76a36 --- /dev/null +++ b/bribe_button.gd @@ -0,0 +1,15 @@ +extends Button + +@export var bribe: Production + +signal bribe_succees + +func _ready() -> void: + sync() + +func sync(): + text = str(bribe.amount) + " of " + bribe.currency.name + +func _on_pressed() -> void: + if Economy.do_bribing(bribe): + bribe_succees.emit() diff --git a/bribe_button.gd.uid b/bribe_button.gd.uid new file mode 100644 index 0000000..cb7df12 --- /dev/null +++ b/bribe_button.gd.uid @@ -0,0 +1 @@ +uid://olr6663hny8n diff --git a/economy.gd b/economy.gd index 7f21028..947a287 100644 --- a/economy.gd +++ b/economy.gd @@ -17,6 +17,15 @@ func get_currency(c: Currency) -> Production: currencies.append(p) return p +func do_bribing(p: Production) -> bool: + produce(negate_production(p)) + return true + +func negate_production(p: Production) -> Production: + var pp := p.duplicate() + pp.amount = -pp.amount + return pp + func sync_currency(): var did_remove := true while did_remove: diff --git a/gui/bribe_button.tscn b/gui/bribe_button.tscn new file mode 100644 index 0000000..6ca6c6b --- /dev/null +++ b/gui/bribe_button.tscn @@ -0,0 +1,9 @@ +[gd_scene format=3 uid="uid://dqb4a1igddv71"] + +[ext_resource type="Script" uid="uid://olr6663hny8n" path="res://bribe_button.gd" id="1_2abdb"] + +[node name="BribeButton" type="Button" unique_id=1084248382] +text = "< num > of < currency >" +script = ExtResource("1_2abdb") + +[connection signal="pressed" from="." to="." method="_on_pressed"] diff --git a/gui/currency_inspector_panel.gd b/gui/currency_inspector_panel.gd index b1a9d1e..0b554a7 100644 --- a/gui/currency_inspector_panel.gd +++ b/gui/currency_inspector_panel.gd @@ -23,10 +23,16 @@ func update(): %CurrencyDescription.text = currency.description for child in %ProductionsList.get_children(): child.queue_free() + %word.visible = currency.production.size() > 0 for production in currency.production: var display := preload("res://gui/production_display.tscn").instantiate() display.production = production %ProductionsList.add_child(display) + if currency.thumbnail != null: + %CurrrencyImage.visible = true + %CurrrencyImage.texture = currency.thumbnail + else: + %CurrrencyImage.visible = false func _on_close_button_pressed() -> void: visible = false diff --git a/gui/currency_inspector_panel.tscn b/gui/currency_inspector_panel.tscn index eff7f63..d437f63 100644 --- a/gui/currency_inspector_panel.tscn +++ b/gui/currency_inspector_panel.tscn @@ -1,14 +1,7 @@ [gd_scene format=3 uid="uid://75htlmk51oo"] [ext_resource type="Script" uid="uid://bkptc7j6c1r7p" path="res://gui/currency_inspector_panel.gd" id="1_tj5vo"] - -[sub_resource type="Gradient" id="Gradient_jd7cj"] - -[sub_resource type="GradientTexture2D" id="GradientTexture2D_y6nab"] -gradient = SubResource("Gradient_jd7cj") - -[sub_resource type="CanvasTexture" id="CanvasTexture_4sc8i"] -diffuse_texture = SubResource("GradientTexture2D_y6nab") +[ext_resource type="Texture2D" uid="uid://bplvus0ytk2f8" path="res://thumbnails/beer.png" id="2_p4bd1"] [node name="CurrencyInspectorPanel" type="Control" unique_id=169191981] custom_minimum_size = Vector2(0, 100) @@ -39,19 +32,27 @@ grow_horizontal = 2 unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 0 +theme_override_font_sizes/font_size = 25 text = "< Selected Currency >" -[node name="CurrrencyImage" type="TextureRect" parent="VBoxContainer" unique_id=1066520786] -unique_name_in_owner = true +[node name="CenterContainer" type="CenterContainer" parent="VBoxContainer" unique_id=1252469629] layout_mode = 2 -texture = SubResource("CanvasTexture_4sc8i") + +[node name="CurrrencyImage" type="TextureRect" parent="VBoxContainer/CenterContainer" unique_id=1066520786] +unique_name_in_owner = true +custom_minimum_size = Vector2(250, 250) +custom_maximum_size = Vector2(250, 250) +layout_mode = 2 +texture = ExtResource("2_p4bd1") [node name="CurrencyDescription" type="Label" parent="VBoxContainer" unique_id=543173020] unique_name_in_owner = true layout_mode = 2 -text = "< Description of currency >" +text = "< Description of currency >< Description of currency >< Description of currency >< Description of currency >< Description of currency >< Description of currency >< Description of currency >< Description of currency >< Description of currency >< Description of currency >< Description of currency >" +autowrap_mode = 3 [node name="word" type="Label" parent="VBoxContainer" unique_id=835011658] +unique_name_in_owner = true layout_mode = 2 text = "Production:" diff --git a/member_inspector_panel.gd b/member_inspector_panel.gd index 3e91e2d..e0dd381 100644 --- a/member_inspector_panel.gd +++ b/member_inspector_panel.gd @@ -19,6 +19,23 @@ func member_left(): member = null visible = false +func clear_bribes(): + for child in %BribesList.get_children(): + child.queue_free() + +func bribe_success(): + member.allegiance = preload("res://allegiance/good.tres") + member.sync() + update() + +func load_bribes(): + for p in member.currency.wants: + var btn := preload("res://gui/bribe_button.tscn").instantiate() + btn.bribe = p + btn.bribe_succees.connect(bribe_success) + %BribesList.add_child(btn) + + func currency_inspect(_c: Currency): visible = false @@ -29,4 +46,9 @@ func update(): %CurrencyMemberSprite.currency = member.currency %CurrencyMemberSprite.allegiance = member.allegiance %CurrencyMemberSprite.sync() + clear_bribes() + %Bribes.visible = false + if member.allegiance != preload("res://allegiance/good.tres"): + load_bribes() + %Bribes.visible = true diff --git a/member_inspector_panel.tscn b/member_inspector_panel.tscn index ebf1bbb..0722179 100644 --- a/member_inspector_panel.tscn +++ b/member_inspector_panel.tscn @@ -32,4 +32,10 @@ custom_maximum_size = Vector2(75, 75) layout_mode = 2 [node name="Bribes" type="Label" parent="VBoxContainer" parent_id_path=PackedInt32Array(362599487) index="9" unique_id=807570934] +unique_name_in_owner = true +layout_mode = 2 +text = "Bribe with" + +[node name="BribesList" type="VBoxContainer" parent="VBoxContainer" parent_id_path=PackedInt32Array(362599487) index="10" unique_id=476203914] +unique_name_in_owner = true layout_mode = 2 diff --git a/project.godot b/project.godot index dfdea1a..7b90190 100644 --- a/project.godot +++ b/project.godot @@ -125,3 +125,4 @@ dialogic_default_action={ [rendering] rendering_device/driver.windows="d3d12" +renderer/rendering_method="gl_compatibility"