From 7efd7c5b179c69f605129e77361bdf20855cec37 Mon Sep 17 00:00:00 2001 From: Tandy Date: Sun, 27 Sep 2026 13:34:39 -0600 Subject: [PATCH] jnsgdfgjkl --- allegiance/bad.tres | 2 +- allegiance/good.tres | 2 +- currency/sentient/farmer.tres | 10 +++++-- currency/sentient/royalty.tres | 2 ++ event.gd | 1 + project.godot | 2 ++ random events/cave_in.tres | 36 +++++++++++++++++++++++++ random events/chicken.tres | 19 +++++++++++++ random events/dino_death.tres | 2 +- random events/doctor_is_in.tres | 19 +++++++++++++ random events/farmer_spawn.tres | 19 +++++++++++++ random events/from_farmer_to_table.tres | 23 ++++------------ random events/miner_spawn.tres | 19 +++++++++++++ random events/plague_spread.tres | 1 + random events/rainstorm.tres | 1 + random events/taunt.tres | 1 + random events/wood_grow.tres | 34 +++++++++++++++++++++++ test/cave_in.dtl | 3 +++ test/cave_in.dtl.uid | 1 + test/doctor_is_in.dtl | 5 ++++ test/doctor_is_in.dtl.uid | 1 + 21 files changed, 180 insertions(+), 23 deletions(-) create mode 100644 random events/cave_in.tres create mode 100644 random events/chicken.tres create mode 100644 random events/doctor_is_in.tres create mode 100644 random events/farmer_spawn.tres create mode 100644 random events/miner_spawn.tres create mode 100644 random events/wood_grow.tres create mode 100644 test/cave_in.dtl create mode 100644 test/cave_in.dtl.uid create mode 100644 test/doctor_is_in.dtl create mode 100644 test/doctor_is_in.dtl.uid diff --git a/allegiance/bad.tres b/allegiance/bad.tres index f1496f1..e83feb6 100644 --- a/allegiance/bad.tres +++ b/allegiance/bad.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_7dttr") -kingdom_name = "Baddica" +kingdom_name = "Rivaldom" color = Color(1, 0, 0, 1) metadata/_custom_type_script = "uid://dvu6aynwi8a0f" diff --git a/allegiance/good.tres b/allegiance/good.tres index fb3f0ec..123ee5c 100644 --- a/allegiance/good.tres +++ b/allegiance/good.tres @@ -4,6 +4,6 @@ [resource] script = ExtResource("1_crqh1") -kingdom_name = "Goodom" +kingdom_name = "You" color = Color(0, 0, 1, 1) metadata/_custom_type_script = "uid://dvu6aynwi8a0f" diff --git a/currency/sentient/farmer.tres b/currency/sentient/farmer.tres index 7ff786b..9c7a8e6 100644 --- a/currency/sentient/farmer.tres +++ b/currency/sentient/farmer.tres @@ -19,6 +19,12 @@ currency = ExtResource("7_uh6l7") amount = 2 metadata/_custom_type_script = "uid://dddyxbkq0ienn" +[sub_resource type="Resource" id="Resource_bsgev"] +script = ExtResource("1_35xhy") +currency = ExtResource("10_n23mm") +amount = -1 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + [sub_resource type="Resource" id="Resource_p1wox"] script = ExtResource("1_35xhy") currency = ExtResource("5_uddvy") @@ -52,13 +58,13 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_4ts75"] script = ExtResource("1_35xhy") currency = ExtResource("10_n23mm") -amount = 600 +amount = 2000 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_kipvp") name = "Farmer" -production = Array[ExtResource("1_35xhy")]([ExtResource("2_jkjll"), ExtResource("3_kfqfp"), SubResource("Resource_i7808")]) +production = Array[ExtResource("1_35xhy")]([ExtResource("2_jkjll"), ExtResource("3_kfqfp"), SubResource("Resource_i7808"), SubResource("Resource_bsgev")]) 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")]) diff --git a/currency/sentient/royalty.tres b/currency/sentient/royalty.tres index 5a80657..9344576 100644 --- a/currency/sentient/royalty.tres +++ b/currency/sentient/royalty.tres @@ -1,8 +1,10 @@ [gd_resource type="Resource" script_class="SentientCurrency" format=3 uid="uid://dk3wsnr3ku7ka"] +[ext_resource type="Script" uid="uid://cn8rc6jyllrf0" path="res://command.gd" id="1_4tnss"] [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_acsld"] [ext_resource type="Script" uid="uid://hcvynq5fjypj" path="res://currency/sentient_currency.gd" id="1_jo5ux"] [ext_resource type="Resource" uid="uid://boshkhnywnk27" path="res://currency/production/human_production_shared_1.tres" id="2_40pnt"] +[ext_resource type="Resource" uid="uid://u6lls6n0xw3n" path="res://commands/move_command.tres" id="2_dj4pj"] [ext_resource type="Resource" uid="uid://mgb7y1r3eapq" path="res://currency/production/human_production_shared_2.tres" id="3_xy04b"] [resource] diff --git a/event.gd b/event.gd index a57d8d2..a7618a8 100644 --- a/event.gd +++ b/event.gd @@ -6,6 +6,7 @@ class_name Event @export var requirements: Array[Production] @export var min_requirements: Array[Production] @export var game_over_timeline: DialogicTimeline +@export var skip_log: bool enum EventNature { Random, diff --git a/project.godot b/project.godot index 8a5adbd..2cbb715 100644 --- a/project.godot +++ b/project.godot @@ -31,12 +31,14 @@ directories/dtl_directory={ "bar_crawl": "res://test/bar_crawl.dtl", "blood_rain": "res://test/blood_rain.dtl", "cannot_consume": "res://cannot_consume.dtl", +"cave_in": "res://test/cave_in.dtl", "counteroffer request": "res://test/counteroffer request.dtl", "counteroffer_response": "res://counteroffer_response.dtl", "death_by_bread": "res://test/death_by_bread.dtl", "death_by_plague": "res://test/death_by_plague.dtl", "dino": "res://test/dino.dtl", "dino ending": "res://test/dino ending.dtl", +"doctor_is_in": "res://test/doctor_is_in.dtl", "double_agent": "res://test/double_agent.dtl", "drought": "res://test/drought.dtl", "from_farmer_to_table": "res://test/from_farmer_to_table.dtl", diff --git a/random events/cave_in.tres b/random events/cave_in.tres new file mode 100644 index 0000000..21e095a --- /dev/null +++ b/random events/cave_in.tres @@ -0,0 +1,36 @@ +[gd_resource type="Resource" script_class="Event" format=3 uid="uid://8qmtjwru0a5i"] + +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_qsp2f"] +[ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="2_dchj7"] +[ext_resource type="Resource" uid="uid://bnlnq4ucsgfxe" path="res://currency/inanimate/gold.tres" id="3_kiplq"] +[ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="3_mq4fu"] +[ext_resource type="Resource" uid="uid://dpaj2dk3qm7ow" path="res://currency/sentient/miner.tres" id="4_ccnp0"] +[ext_resource type="Resource" uid="uid://ytteqojj7k1o" path="res://currency/inanimate/stone.tres" id="5_jv6j0"] +[ext_resource type="Resource" uid="uid://cgrvmfayoqhsq" path="res://test/cave_in.dtl" id="7_ccnp0"] + +[sub_resource type="Resource" id="Resource_jv6j0"] +script = ExtResource("2_dchj7") +currency = ExtResource("3_kiplq") +amount = -50 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_kiplq"] +script = ExtResource("2_dchj7") +currency = ExtResource("4_ccnp0") +amount = -25 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_ccnp0"] +script = ExtResource("2_dchj7") +currency = ExtResource("5_jv6j0") +amount = 200 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[resource] +script = ExtResource("3_mq4fu") +modified_resource = SubResource("Resource_kiplq") +extra_mods = Array[ExtResource("2_dchj7")]([SubResource("Resource_jv6j0")]) +timeline = ExtResource("7_ccnp0") +requirements = Array[ExtResource("2_dchj7")]([SubResource("Resource_ccnp0")]) +probability = 0.05 +metadata/_custom_type_script = "uid://diwdxofo6exg3" diff --git a/random events/chicken.tres b/random events/chicken.tres new file mode 100644 index 0000000..f7cf782 --- /dev/null +++ b/random events/chicken.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="Event" format=3 uid="uid://tmxa5dwebc1j"] + +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_dcs6b"] +[ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="2_x4t7o"] +[ext_resource type="Resource" uid="uid://dsohovjbf3s2p" path="res://currency/sentient/chicken.tres" id="3_x4t7o"] +[ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="3_xv7ld"] + +[sub_resource type="Resource" id="Resource_hn66j"] +script = ExtResource("2_x4t7o") +currency = ExtResource("3_x4t7o") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[resource] +script = ExtResource("3_xv7ld") +modified_resource = SubResource("Resource_hn66j") +skip_log = true +probability = 0.15 +metadata/_custom_type_script = "uid://diwdxofo6exg3" diff --git a/random events/dino_death.tres b/random events/dino_death.tres index 1c9d5c4..a8aaa16 100644 --- a/random events/dino_death.tres +++ b/random events/dino_death.tres @@ -13,7 +13,7 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("3_6uqyy") -timeline = ExtResource("5_u3spd") min_requirements = Array[ExtResource("2_6dmg6")]([SubResource("Resource_ed76l")]) +game_over_timeline = ExtResource("5_u3spd") nature = 1 metadata/_custom_type_script = "uid://diwdxofo6exg3" diff --git a/random events/doctor_is_in.tres b/random events/doctor_is_in.tres new file mode 100644 index 0000000..68c0739 --- /dev/null +++ b/random events/doctor_is_in.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="Event" format=3 uid="uid://rsrv6x3fb4n3"] + +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_jipra"] +[ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="2_bkgr1"] +[ext_resource type="Resource" uid="uid://b1tgtujqs5lnr" path="res://currency/sentient/doctor.tres" id="3_bkgr1"] +[ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="3_lrgpp"] +[ext_resource type="Resource" uid="uid://h6h126cifboy" path="res://test/doctor_is_in.dtl" id="5_lrgpp"] + +[sub_resource type="Resource" id="Resource_w1adi"] +script = ExtResource("2_bkgr1") +currency = ExtResource("3_bkgr1") +amount = 1 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[resource] +script = ExtResource("3_lrgpp") +modified_resource = SubResource("Resource_w1adi") +timeline = ExtResource("5_lrgpp") +metadata/_custom_type_script = "uid://diwdxofo6exg3" diff --git a/random events/farmer_spawn.tres b/random events/farmer_spawn.tres new file mode 100644 index 0000000..dd2068d --- /dev/null +++ b/random events/farmer_spawn.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="Event" format=3 uid="uid://yjpiujd6qqn6"] + +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_u75su"] +[ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="2_etnwv"] +[ext_resource type="Resource" uid="uid://dn0c1pfq04obw" path="res://currency/sentient/farmer.tres" id="3_etnwv"] +[ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="3_smnog"] + +[sub_resource type="Resource" id="Resource_ksiai"] +script = ExtResource("2_etnwv") +currency = ExtResource("3_etnwv") +amount = 1 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[resource] +script = ExtResource("3_smnog") +modified_resource = SubResource("Resource_ksiai") +skip_log = true +probability = 0.4 +metadata/_custom_type_script = "uid://diwdxofo6exg3" diff --git a/random events/from_farmer_to_table.tres b/random events/from_farmer_to_table.tres index e2480d7..473135d 100644 --- a/random events/from_farmer_to_table.tres +++ b/random events/from_farmer_to_table.tres @@ -1,10 +1,9 @@ [gd_resource type="Resource" script_class="Event" format=3 uid="uid://f7qw65154l20"] +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_khbdk"] [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_piiqm"] [ext_resource type="Resource" uid="uid://dmctedq3pav0t" path="res://currency/inanimate/corpse.tres" id="2_khbdk"] [ext_resource type="Resource" uid="uid://dn0c1pfq04obw" path="res://currency/sentient/farmer.tres" id="3_4gw5s"] -[ext_resource type="Resource" uid="uid://b5qok0rcalr" path="res://currency/sentient/cow.tres" id="4_rfq60"] -[ext_resource type="Resource" uid="uid://rdrcyvuvrp2m" path="res://currency/sentient/pig.tres" id="5_x0khx"] [ext_resource type="Resource" uid="uid://dsohovjbf3s2p" path="res://currency/sentient/chicken.tres" id="6_6f6jr"] [ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="7_q4b6l"] [ext_resource type="Resource" uid="uid://dctqq013bc6rx" path="res://test/from_farmer_to_table.dtl" id="8_khbdk"] @@ -18,31 +17,19 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_7vjbg"] script = ExtResource("1_piiqm") currency = ExtResource("3_4gw5s") -amount = -15 +amount = -50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_u1m57"] script = ExtResource("1_piiqm") currency = ExtResource("3_4gw5s") -amount = 20 -metadata/_custom_type_script = "uid://dddyxbkq0ienn" - -[sub_resource type="Resource" id="Resource_biffg"] -script = ExtResource("1_piiqm") -currency = ExtResource("4_rfq60") -amount = 20 -metadata/_custom_type_script = "uid://dddyxbkq0ienn" - -[sub_resource type="Resource" id="Resource_i756o"] -script = ExtResource("1_piiqm") -currency = ExtResource("5_x0khx") -amount = 20 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_uhb4h"] script = ExtResource("1_piiqm") currency = ExtResource("6_6f6jr") -amount = 20 +amount = 200 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] @@ -50,5 +37,5 @@ script = ExtResource("7_q4b6l") modified_resource = SubResource("Resource_7vjbg") extra_mods = Array[ExtResource("1_piiqm")]([SubResource("Resource_korph")]) timeline = ExtResource("8_khbdk") -requirements = Array[ExtResource("1_piiqm")]([SubResource("Resource_u1m57"), SubResource("Resource_biffg"), SubResource("Resource_i756o"), SubResource("Resource_uhb4h")]) +requirements = Array[ExtResource("1_piiqm")]([SubResource("Resource_u1m57"), SubResource("Resource_uhb4h")]) metadata/_custom_type_script = "uid://diwdxofo6exg3" diff --git a/random events/miner_spawn.tres b/random events/miner_spawn.tres new file mode 100644 index 0000000..ce144f2 --- /dev/null +++ b/random events/miner_spawn.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="Event" format=3 uid="uid://c6k6tdackalie"] + +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_wse4b"] +[ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="2_tb5wc"] +[ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="3_36238"] +[ext_resource type="Resource" uid="uid://dpaj2dk3qm7ow" path="res://currency/sentient/miner.tres" id="3_tb5wc"] + +[sub_resource type="Resource" id="Resource_w0prn"] +script = ExtResource("2_tb5wc") +currency = ExtResource("3_tb5wc") +amount = 1 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[resource] +script = ExtResource("3_36238") +modified_resource = SubResource("Resource_w0prn") +skip_log = true +probability = 0.25 +metadata/_custom_type_script = "uid://diwdxofo6exg3" diff --git a/random events/plague_spread.tres b/random events/plague_spread.tres index 7c9e823..4387756 100644 --- a/random events/plague_spread.tres +++ b/random events/plague_spread.tres @@ -21,5 +21,6 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn" script = ExtResource("3_nb7f6") modified_resource = SubResource("Resource_bagua") requirements = Array[ExtResource("2_3k0wj")]([SubResource("Resource_tdlem")]) +skip_log = true nature = 1 metadata/_custom_type_script = "uid://diwdxofo6exg3" diff --git a/random events/rainstorm.tres b/random events/rainstorm.tres index f3b3134..10c6f1f 100644 --- a/random events/rainstorm.tres +++ b/random events/rainstorm.tres @@ -1,5 +1,6 @@ [gd_resource type="Resource" script_class="Event" format=3 uid="uid://cf2njiph5vn0n"] +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_52bip"] [ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="1_g4y32"] [ext_resource type="Resource" uid="uid://b8b6yr444ecdk" path="res://currency/inanimate/water.tres" id="1_lltnd"] [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="2_52bip"] diff --git a/random events/taunt.tres b/random events/taunt.tres index d62ead9..b64d576 100644 --- a/random events/taunt.tres +++ b/random events/taunt.tres @@ -1,6 +1,7 @@ [gd_resource type="Resource" script_class="Event" format=3 uid="uid://cqurm0kdk1ao"] [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_0o4pj"] +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_srqlu"] [ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="2_c2rsl"] [ext_resource type="Resource" uid="uid://du5glqfoifigj" path="res://test/taunt.dtl" id="3_c2rsl"] diff --git a/random events/wood_grow.tres b/random events/wood_grow.tres new file mode 100644 index 0000000..7d147ef --- /dev/null +++ b/random events/wood_grow.tres @@ -0,0 +1,34 @@ +[gd_resource type="Resource" script_class="Event" format=3 uid="uid://dxhr7s1qg608f"] + +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_41glf"] +[ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="2_xy5bw"] +[ext_resource type="Resource" uid="uid://b7vjuqkog7cxd" path="res://currency/inanimate/wood.tres" id="3_gmji7"] +[ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="3_onx7n"] +[ext_resource type="Resource" uid="uid://y4ssn47oa8tm" path="res://currency/inanimate/fertilizer.tres" id="4_pesmn"] + +[sub_resource type="Resource" id="Resource_pesmn"] +script = ExtResource("2_xy5bw") +currency = ExtResource("3_gmji7") +amount = 3 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_gmji7"] +script = ExtResource("2_xy5bw") +currency = ExtResource("4_pesmn") +amount = -50 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_in4ev"] +script = ExtResource("2_xy5bw") +currency = ExtResource("4_pesmn") +amount = 10 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[resource] +script = ExtResource("3_onx7n") +modified_resource = SubResource("Resource_gmji7") +extra_mods = Array[ExtResource("2_xy5bw")]([SubResource("Resource_pesmn")]) +requirements = Array[ExtResource("2_xy5bw")]([SubResource("Resource_in4ev")]) +skip_log = true +probability = 0.25 +metadata/_custom_type_script = "uid://diwdxofo6exg3" diff --git a/test/cave_in.dtl b/test/cave_in.dtl new file mode 100644 index 0000000..cf9da73 --- /dev/null +++ b/test/cave_in.dtl @@ -0,0 +1,3 @@ +Your Royaltyness!! There's been a cave in! + +We've lost some of your best miners! Not to mention a sizable amount of gold... \ No newline at end of file diff --git a/test/cave_in.dtl.uid b/test/cave_in.dtl.uid new file mode 100644 index 0000000..c0ec130 --- /dev/null +++ b/test/cave_in.dtl.uid @@ -0,0 +1 @@ +uid://cgrvmfayoqhsq diff --git a/test/doctor_is_in.dtl b/test/doctor_is_in.dtl new file mode 100644 index 0000000..c83c6b3 --- /dev/null +++ b/test/doctor_is_in.dtl @@ -0,0 +1,5 @@ +Sire? There's an odd person with a crow mask on the edge of town.\ +Claims they want to "cleanse us of the fithy blight sweeping across the land." +That's probably fine right?\ +They probably aren't the scout for an entire army of crow people coming to take over the kingdom,\ +right? \ No newline at end of file diff --git a/test/doctor_is_in.dtl.uid b/test/doctor_is_in.dtl.uid new file mode 100644 index 0000000..41faa20 --- /dev/null +++ b/test/doctor_is_in.dtl.uid @@ -0,0 +1 @@ +uid://h6h126cifboy