From 5ab456cc867e3c578fcdc2d7429ce0635b0570e7 Mon Sep 17 00:00:00 2001 From: Tandy Date: Sun, 27 Sep 2026 11:31:12 -0600 Subject: [PATCH 1/3] asdasd --- currency/inanimate/fertilizer.tres | 2 ++ currency/inanimate/water.tres | 2 ++ currency/sentient/doctor.tres | 8 +++++- thumbnails/fertilizer.jpg | 3 +++ thumbnails/fertilizer.jpg.import | 40 ++++++++++++++++++++++++++++++ thumbnails/water.jpg | 3 +++ thumbnails/water.jpg.import | 40 ++++++++++++++++++++++++++++++ 7 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 thumbnails/fertilizer.jpg create mode 100644 thumbnails/fertilizer.jpg.import create mode 100644 thumbnails/water.jpg create mode 100644 thumbnails/water.jpg.import diff --git a/currency/inanimate/fertilizer.tres b/currency/inanimate/fertilizer.tres index 25e9b40..1334a2a 100644 --- a/currency/inanimate/fertilizer.tres +++ b/currency/inanimate/fertilizer.tres @@ -2,9 +2,11 @@ [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_2mm5k"] [ext_resource type="Script" uid="uid://cthcf4w1il4h8" path="res://currency/inanimate_currency.gd" id="2_e2hgv"] +[ext_resource type="Texture2D" uid="uid://bcigrkc3l2kna" path="res://thumbnails/fertilizer.jpg" id="3_e2hgv"] [resource] script = ExtResource("2_e2hgv") name = "Fertilizer" description = "Definitely not poop. No way." +thumbnail = ExtResource("3_e2hgv") metadata/_custom_type_script = "uid://b3tqa2kc2bu0p" diff --git a/currency/inanimate/water.tres b/currency/inanimate/water.tres index 2a3b7ad..cad4ed3 100644 --- a/currency/inanimate/water.tres +++ b/currency/inanimate/water.tres @@ -2,9 +2,11 @@ [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_6tuon"] [ext_resource type="Script" uid="uid://cthcf4w1il4h8" path="res://currency/inanimate_currency.gd" id="1_s2pc4"] +[ext_resource type="Texture2D" uid="uid://ce6c7vo58pheb" path="res://thumbnails/water.jpg" id="3_xmeqh"] [resource] script = ExtResource("1_s2pc4") name = "Water" description = "It's the lifeblood of all living things! (Besides, y'know, blood)" +thumbnail = ExtResource("3_xmeqh") metadata/_custom_type_script = "uid://b3tqa2kc2bu0p" diff --git a/currency/sentient/doctor.tres b/currency/sentient/doctor.tres index 45d75de..65538da 100644 --- a/currency/sentient/doctor.tres +++ b/currency/sentient/doctor.tres @@ -13,6 +13,12 @@ [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_i7808"] +script = ExtResource("1_ohece") +currency = ExtResource("10_gs0ul") +amount = -1 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + [sub_resource type="Resource" id="Resource_60ga3"] script = ExtResource("1_ohece") currency = ExtResource("6_r8lqy") @@ -58,7 +64,7 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_8u0th") name = "Doctor" -production = Array[ExtResource("1_ohece")]([ExtResource("2_u3n2t"), ExtResource("3_yv5d2")]) +production = Array[ExtResource("1_ohece")]([ExtResource("2_u3n2t"), ExtResource("3_yv5d2"), SubResource("Resource_i7808")]) 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) diff --git a/thumbnails/fertilizer.jpg b/thumbnails/fertilizer.jpg new file mode 100644 index 0000000..d7dc6cf --- /dev/null +++ b/thumbnails/fertilizer.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5ddba4e95f17b6384e526cef59beeac8605ce885c89a9bfa16c07487acf4537 +size 33203 diff --git a/thumbnails/fertilizer.jpg.import b/thumbnails/fertilizer.jpg.import new file mode 100644 index 0000000..7bbc157 --- /dev/null +++ b/thumbnails/fertilizer.jpg.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bcigrkc3l2kna" +path="res://.godot/imported/fertilizer.jpg-8c90d5f4487c96d05f656cf12e5c48e0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://thumbnails/fertilizer.jpg" +dest_files=["res://.godot/imported/fertilizer.jpg-8c90d5f4487c96d05f656cf12e5c48e0.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/thumbnails/water.jpg b/thumbnails/water.jpg new file mode 100644 index 0000000..41c6b39 --- /dev/null +++ b/thumbnails/water.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52201459c08fcdda4ae9d707d98a47064b0228444b7f951ae67647b0ea208d72 +size 20720 diff --git a/thumbnails/water.jpg.import b/thumbnails/water.jpg.import new file mode 100644 index 0000000..6a5beb9 --- /dev/null +++ b/thumbnails/water.jpg.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ce6c7vo58pheb" +path="res://.godot/imported/water.jpg-0159a8cb4fe8b7fe7470068cf1563c56.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://thumbnails/water.jpg" +dest_files=["res://.godot/imported/water.jpg-0159a8cb4fe8b7fe7470068cf1563c56.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 From acc684dd7c542b260177a031764cfb78855db425 Mon Sep 17 00:00:00 2001 From: Tandy Date: Sun, 27 Sep 2026 12:33:49 -0600 Subject: [PATCH 2/3] asdasd --- currency/sentient/archer.tres | 10 +++++----- currency/sentient/calvary.tres | 10 +++++----- currency/sentient/doctor.tres | 14 +++++++------- currency/sentient/drunk.tres | 4 +++- currency/sentient/farmer.tres | 12 ++++++------ currency/sentient/kings_guard.tres | 8 ++++---- currency/sentient/knight.tres | 6 +++--- currency/sentient/mercenary.tres | 2 +- currency/sentient/messenger.tres | 6 +++--- currency/sentient/miner.tres | 28 +++++++++++++++++++--------- currency/sentient/spy.tres | 8 ++++---- currency/sentient/town_crier.tres | 17 ++++++++++++----- currency/sentient/wizard.tres | 22 ++++++++++++++-------- economy.tscn | 10 +++++++++- event.gd | 2 ++ project.godot | 2 ++ random events/death_by_bread.tres | 19 +++++++++++++++++++ random events/death_by_plague.tres | 20 ++++++++++++++++++++ random events/dino_death.tres | 19 +++++++++++++++++++ random events/plague_outbreak.tres | 3 ++- random events/plague_spread.tres | 25 +++++++++++++++++++++++++ test/death_by_bread.dtl | 4 ++++ test/death_by_bread.dtl.uid | 1 + test/death_by_plague.dtl | 2 ++ test/death_by_plague.dtl.uid | 1 + test/taunt.dtl | 2 -- 26 files changed, 192 insertions(+), 65 deletions(-) create mode 100644 random events/death_by_bread.tres create mode 100644 random events/death_by_plague.tres create mode 100644 random events/dino_death.tres create mode 100644 random events/plague_spread.tres create mode 100644 test/death_by_bread.dtl create mode 100644 test/death_by_bread.dtl.uid create mode 100644 test/death_by_plague.dtl create mode 100644 test/death_by_plague.dtl.uid diff --git a/currency/sentient/archer.tres b/currency/sentient/archer.tres index 6ff9ae0..d93ccd4 100644 --- a/currency/sentient/archer.tres +++ b/currency/sentient/archer.tres @@ -15,31 +15,31 @@ [sub_resource type="Resource" id="Resource_ui157"] script = ExtResource("1_m37xt") currency = ExtResource("5_2kil6") -amount = 10 +amount = 100 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_ah5vq"] script = ExtResource("1_m37xt") currency = ExtResource("6_qqxwu") -amount = 7 +amount = 70 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_2437s"] script = ExtResource("1_m37xt") currency = ExtResource("7_227pm") -amount = 5 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_n5gpp"] script = ExtResource("1_m37xt") currency = ExtResource("8_k5pub") -amount = 5 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_b1lqu"] script = ExtResource("1_m37xt") currency = ExtResource("9_i8mvc") -amount = 5 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] diff --git a/currency/sentient/calvary.tres b/currency/sentient/calvary.tres index ee61a95..6a4f023 100644 --- a/currency/sentient/calvary.tres +++ b/currency/sentient/calvary.tres @@ -15,31 +15,31 @@ [sub_resource type="Resource" id="Resource_ui157"] script = ExtResource("1_cnnt2") currency = ExtResource("5_fxi61") -amount = 10 +amount = 100 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_ah5vq"] script = ExtResource("1_cnnt2") currency = ExtResource("6_vf3g1") -amount = 7 +amount = 70 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_2437s"] script = ExtResource("1_cnnt2") currency = ExtResource("7_2uxum") -amount = 5 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_n5gpp"] script = ExtResource("1_cnnt2") currency = ExtResource("8_npspm") -amount = 5 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_b1lqu"] script = ExtResource("1_cnnt2") currency = ExtResource("9_j3ou3") -amount = 5 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] diff --git a/currency/sentient/doctor.tres b/currency/sentient/doctor.tres index 04cd104..4322c64 100644 --- a/currency/sentient/doctor.tres +++ b/currency/sentient/doctor.tres @@ -24,43 +24,43 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_60ga3"] script = ExtResource("1_ohece") currency = ExtResource("6_r8lqy") -amount = 2 +amount = 20 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_i5jpd"] script = ExtResource("1_ohece") currency = ExtResource("7_ck4s1") -amount = 20 +amount = 200 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_2l2nr"] script = ExtResource("1_ohece") currency = ExtResource("8_hu81m") -amount = 15 +amount = 150 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_6v7ae"] script = ExtResource("1_ohece") currency = ExtResource("9_w0d8m") -amount = 25 +amount = 250 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_iph2q"] script = ExtResource("1_ohece") currency = ExtResource("10_gs0ul") -amount = 15 +amount = 150 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_i8tft"] script = ExtResource("1_ohece") currency = ExtResource("11_0hope") -amount = 10 +amount = 100 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_j0xkl"] script = ExtResource("1_ohece") currency = ExtResource("12_gr03u") -amount = 10 +amount = 100 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] diff --git a/currency/sentient/drunk.tres b/currency/sentient/drunk.tres index 0b1bea0..c0faf62 100644 --- a/currency/sentient/drunk.tres +++ b/currency/sentient/drunk.tres @@ -1,15 +1,17 @@ [gd_resource type="Resource" script_class="SentientCurrency" format=3 uid="uid://dv834343s36af"] [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_b07i1"] +[ext_resource type="Script" uid="uid://cn8rc6jyllrf0" path="res://command.gd" id="1_du6k0"] [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://u6lls6n0xw3n" path="res://commands/move_command.tres" id="2_tge1j"] [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 +amount = 100 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] diff --git a/currency/sentient/farmer.tres b/currency/sentient/farmer.tres index 6a51baa..7ff786b 100644 --- a/currency/sentient/farmer.tres +++ b/currency/sentient/farmer.tres @@ -22,37 +22,37 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_p1wox"] script = ExtResource("1_35xhy") currency = ExtResource("5_uddvy") -amount = 5 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_bu4yr"] script = ExtResource("1_35xhy") currency = ExtResource("6_epa0v") -amount = 5 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_dynkd"] script = ExtResource("1_35xhy") currency = ExtResource("7_uh6l7") -amount = 10 +amount = 100 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_t37mv"] script = ExtResource("1_35xhy") currency = ExtResource("8_7lva1") -amount = 10 +amount = 100 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_ou8s7"] script = ExtResource("1_35xhy") currency = ExtResource("9_i5hpk") -amount = 5 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_4ts75"] script = ExtResource("1_35xhy") currency = ExtResource("10_n23mm") -amount = 20 +amount = 600 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] diff --git a/currency/sentient/kings_guard.tres b/currency/sentient/kings_guard.tres index 8a3e456..7f0d66f 100644 --- a/currency/sentient/kings_guard.tres +++ b/currency/sentient/kings_guard.tres @@ -14,25 +14,25 @@ [sub_resource type="Resource" id="Resource_1g3kj"] script = ExtResource("1_f1fuf") currency = ExtResource("5_bom44") -amount = 20 +amount = 200 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_kmdkm"] script = ExtResource("1_f1fuf") currency = ExtResource("6_y0tsi") -amount = 10 +amount = 100 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_3p8gt"] script = ExtResource("1_f1fuf") currency = ExtResource("7_1ptox") -amount = 15 +amount = 150 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_m16xj"] script = ExtResource("1_f1fuf") currency = ExtResource("8_t2htw") -amount = 5 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] diff --git a/currency/sentient/knight.tres b/currency/sentient/knight.tres index cfd145e..d5fbb8e 100644 --- a/currency/sentient/knight.tres +++ b/currency/sentient/knight.tres @@ -13,19 +13,19 @@ [sub_resource type="Resource" id="Resource_ui157"] script = ExtResource("1_626vc") currency = ExtResource("5_7d8n3") -amount = 10 +amount = 100 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_ah5vq"] script = ExtResource("1_626vc") currency = ExtResource("6_xlwb3") -amount = 7 +amount = 70 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_2437s"] script = ExtResource("1_626vc") currency = ExtResource("7_ds1y1") -amount = 5 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] diff --git a/currency/sentient/mercenary.tres b/currency/sentient/mercenary.tres index d8678b6..3d541e3 100644 --- a/currency/sentient/mercenary.tres +++ b/currency/sentient/mercenary.tres @@ -11,7 +11,7 @@ [sub_resource type="Resource" id="Resource_3og8x"] script = ExtResource("1_81xhi") currency = ExtResource("5_p4ceb") -amount = 20 +amount = 200 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] diff --git a/currency/sentient/messenger.tres b/currency/sentient/messenger.tres index 994dacb..fff461b 100644 --- a/currency/sentient/messenger.tres +++ b/currency/sentient/messenger.tres @@ -13,19 +13,19 @@ [sub_resource type="Resource" id="Resource_0idw0"] script = ExtResource("1_iy37t") currency = ExtResource("5_rq11v") -amount = 15 +amount = 150 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_l6nf4"] script = ExtResource("1_iy37t") currency = ExtResource("6_rptfm") -amount = 15 +amount = 150 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_7h38k"] script = ExtResource("1_iy37t") currency = ExtResource("7_mf0hi") -amount = 20 +amount = 200 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] diff --git a/currency/sentient/miner.tres b/currency/sentient/miner.tres index c363384..6ab65cd 100644 --- a/currency/sentient/miner.tres +++ b/currency/sentient/miner.tres @@ -8,34 +8,44 @@ [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://bnlnq4ucsgfxe" path="res://currency/inanimate/gold.tres" id="6_mxenu"] +[ext_resource type="Resource" uid="uid://ytteqojj7k1o" path="res://currency/inanimate/stone.tres" id="7_hgnp0"] [ext_resource type="Resource" uid="uid://crnhu4w6lfopb" path="res://currency/inanimate/beer.tres" id="7_tbpph"] +[sub_resource type="Resource" id="Resource_ifrlq"] +script = ExtResource("1_yn73g") +currency = ExtResource("6_mxenu") +amount = 1 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_v144q"] +script = ExtResource("1_yn73g") +currency = ExtResource("7_hgnp0") +amount = 2 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + [sub_resource type="Resource" id="Resource_bws7g"] script = ExtResource("1_yn73g") currency = ExtResource("5_eaivi") -amount = 15 +amount = 150 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_vxrsf"] script = ExtResource("1_yn73g") currency = ExtResource("6_4664q") -amount = 10 +amount = 100 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") +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_phc4h") name = "Miner" -production = Array[ExtResource("1_yn73g")]([ExtResource("2_8h62s"), ExtResource("3_2kvuq")]) +production = Array[ExtResource("1_yn73g")]([ExtResource("2_8h62s"), ExtResource("3_2kvuq"), SubResource("Resource_ifrlq"), SubResource("Resource_v144q")]) description = "we yearn for the mines, sire." -wants = Array[ExtResource("1_yn73g")]([SubResource("Resource_bws7g"), SubResource("Resource_vxrsf"), SubResource("Resource_sgbmh"), SubResource("Resource_u6o3i")]) +wants = Array[ExtResource("1_yn73g")]([SubResource("Resource_bws7g"), SubResource("Resource_vxrsf"), SubResource("Resource_sgbmh")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/spy.tres b/currency/sentient/spy.tres index ce9eac4..de08c7c 100644 --- a/currency/sentient/spy.tres +++ b/currency/sentient/spy.tres @@ -14,25 +14,25 @@ [sub_resource type="Resource" id="Resource_lljap"] script = ExtResource("1_wync1") currency = ExtResource("5_ssejx") -amount = 25 +amount = 250 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_dr7t1"] script = ExtResource("1_wync1") currency = ExtResource("6_dmqey") -amount = 10 +amount = 100 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_g2eqt"] script = ExtResource("1_wync1") currency = ExtResource("7_wnwuo") -amount = 15 +amount = 150 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_me530"] script = ExtResource("1_wync1") currency = ExtResource("8_jpoxk") -amount = 10 +amount = 100 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] diff --git a/currency/sentient/town_crier.tres b/currency/sentient/town_crier.tres index 2b485ea..5ee0e12 100644 --- a/currency/sentient/town_crier.tres +++ b/currency/sentient/town_crier.tres @@ -10,29 +10,36 @@ [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"] +[ext_resource type="Resource" uid="uid://bnlnq4ucsgfxe" path="res://currency/inanimate/gold.tres" id="11_lqdse"] [sub_resource type="Resource" id="Resource_t4qyg"] script = ExtResource("1_0qymk") currency = ExtResource("5_hkj46") -amount = 15 +amount = 150 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_mxenu"] script = ExtResource("1_0qymk") currency = ExtResource("6_s7hyh") -amount = 10 +amount = 100 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_hgnp0"] script = ExtResource("1_0qymk") currency = ExtResource("7_urykh") -amount = 5 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_ljdya"] script = ExtResource("1_0qymk") currency = ExtResource("8_lqdse") -amount = 15 +amount = 150 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_17ik3"] +script = ExtResource("1_0qymk") +currency = ExtResource("11_lqdse") +amount = 150 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] @@ -42,5 +49,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")]) +wants = Array[ExtResource("1_0qymk")]([SubResource("Resource_t4qyg"), SubResource("Resource_mxenu"), SubResource("Resource_hgnp0"), SubResource("Resource_ljdya"), SubResource("Resource_17ik3")]) metadata/_custom_type_script = "uid://hcvynq5fjypj" diff --git a/currency/sentient/wizard.tres b/currency/sentient/wizard.tres index 9cd964f..005cf95 100644 --- a/currency/sentient/wizard.tres +++ b/currency/sentient/wizard.tres @@ -14,52 +14,58 @@ [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_6krdv"] +script = ExtResource("1_05kyk") +currency = ExtResource("10_0ipx8") +amount = 2 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + [sub_resource type="Resource" id="Resource_60ga3"] script = ExtResource("1_05kyk") currency = ExtResource("5_g2km3") -amount = 2 +amount = 20 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_i5jpd"] script = ExtResource("1_05kyk") currency = ExtResource("6_aqv3t") -amount = 20 +amount = 200 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_2l2nr"] script = ExtResource("1_05kyk") currency = ExtResource("7_fu5ce") -amount = 15 +amount = 150 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_6v7ae"] script = ExtResource("1_05kyk") currency = ExtResource("8_rx02f") -amount = 25 +amount = 250 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_iph2q"] script = ExtResource("1_05kyk") currency = ExtResource("9_dc2dr") -amount = 15 +amount = 150 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_i8tft"] script = ExtResource("1_05kyk") currency = ExtResource("10_0ipx8") -amount = 10 +amount = 100 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_j0xkl"] script = ExtResource("1_05kyk") currency = ExtResource("11_1nkrr") -amount = 10 +amount = 50 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [resource] script = ExtResource("1_tds6s") name = "Wizard" -production = Array[ExtResource("1_05kyk")]([ExtResource("2_ud150"), ExtResource("3_mp872")]) +production = Array[ExtResource("1_05kyk")]([ExtResource("2_ud150"), ExtResource("3_mp872"), SubResource("Resource_6krdv")]) 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")]) diff --git a/economy.tscn b/economy.tscn index 4e1b247..8b70879 100644 --- a/economy.tscn +++ b/economy.tscn @@ -10,6 +10,7 @@ [ext_resource type="Resource" uid="uid://dn0c1pfq04obw" path="res://currency/sentient/farmer.tres" id="7_isn2b"] [ext_resource type="Resource" uid="uid://ihsvxienxbeu" path="res://currency/sentient/knight.tres" id="8_qb8iw"] [ext_resource type="Resource" uid="uid://l8osuuxl7exe" path="res://currency/sentient/archer.tres" id="9_4ywr4"] +[ext_resource type="Resource" uid="uid://b1tgtujqs5lnr" path="res://currency/sentient/doctor.tres" id="11_17ik3"] [sub_resource type="Resource" id="Resource_g3220"] script = ExtResource("2_tljx8") @@ -59,11 +60,18 @@ currency = ExtResource("9_4ywr4") amount = 15 metadata/_custom_type_script = "uid://dddyxbkq0ienn" +[sub_resource type="Resource" id="Resource_yg0ra"] +script = ExtResource("2_tljx8") +currency = ExtResource("11_17ik3") +amount = 2 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + [node name="Economy" type="Node" unique_id=1950923383] script = ExtResource("1_csm0v") -currencies = Array[ExtResource("2_tljx8")]([SubResource("Resource_g3220"), SubResource("Resource_bb1uu"), SubResource("Resource_vw3jp"), SubResource("Resource_xg8li"), SubResource("Resource_f6kxb"), SubResource("Resource_6u4g3"), SubResource("Resource_aqv3t"), SubResource("Resource_g2km3")]) +currencies = Array[ExtResource("2_tljx8")]([SubResource("Resource_g3220"), SubResource("Resource_bb1uu"), SubResource("Resource_vw3jp"), SubResource("Resource_xg8li"), SubResource("Resource_f6kxb"), SubResource("Resource_6u4g3"), SubResource("Resource_aqv3t"), SubResource("Resource_g2km3"), SubResource("Resource_yg0ra")]) [node name="SimulateTickTimer" type="Timer" parent="." unique_id=1726107261] unique_name_in_owner = true +wait_time = 2.0 [connection signal="timeout" from="SimulateTickTimer" to="." method="_on_timer_timeout"] diff --git a/event.gd b/event.gd index 04f7bda..a57d8d2 100644 --- a/event.gd +++ b/event.gd @@ -4,6 +4,8 @@ class_name Event @export var extra_mods: Array[Production] @export var timeline: DialogicTimeline @export var requirements: Array[Production] +@export var min_requirements: Array[Production] +@export var game_over_timeline: DialogicTimeline enum EventNature { Random, diff --git a/project.godot b/project.godot index f02b472..8a5adbd 100644 --- a/project.godot +++ b/project.godot @@ -33,6 +33,8 @@ directories/dtl_directory={ "cannot_consume": "res://cannot_consume.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", "double_agent": "res://test/double_agent.dtl", diff --git a/random events/death_by_bread.tres b/random events/death_by_bread.tres new file mode 100644 index 0000000..a76332b --- /dev/null +++ b/random events/death_by_bread.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="Event" format=3 uid="uid://i6w2h4vcofo3"] + +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_ywenm"] +[ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="2_l11d8"] +[ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="3_c5rl3"] +[ext_resource type="Resource" uid="uid://ca3vsopmi5w7h" path="res://test/death_by_bread.dtl" id="3_jcq6v"] +[ext_resource type="Resource" uid="uid://ervsee7ku1i2" path="res://currency/inanimate/bread.tres" id="3_l11d8"] + +[sub_resource type="Resource" id="Resource_ywenm"] +script = ExtResource("2_l11d8") +currency = ExtResource("3_l11d8") +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[resource] +script = ExtResource("3_c5rl3") +min_requirements = Array[ExtResource("2_l11d8")]([SubResource("Resource_ywenm")]) +game_over_timeline = ExtResource("3_jcq6v") +nature = 1 +metadata/_custom_type_script = "uid://diwdxofo6exg3" diff --git a/random events/death_by_plague.tres b/random events/death_by_plague.tres new file mode 100644 index 0000000..466f7d6 --- /dev/null +++ b/random events/death_by_plague.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="Event" format=3 uid="uid://cdr6e6je51kk0"] + +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_jla7f"] +[ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="2_nu416"] +[ext_resource type="Resource" uid="uid://bwrs2rwum4n2k" path="res://currency/abstract/plague.tres" id="3_nu416"] +[ext_resource type="Resource" uid="uid://dlh5k47h7iu3t" path="res://test/death_by_plague.dtl" id="3_oesbx"] +[ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="3_syra1"] + +[sub_resource type="Resource" id="Resource_g5mmb"] +script = ExtResource("2_nu416") +currency = ExtResource("3_nu416") +amount = 1000 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[resource] +script = ExtResource("3_syra1") +requirements = Array[ExtResource("2_nu416")]([SubResource("Resource_g5mmb")]) +game_over_timeline = ExtResource("3_oesbx") +nature = 1 +metadata/_custom_type_script = "uid://diwdxofo6exg3" diff --git a/random events/dino_death.tres b/random events/dino_death.tres new file mode 100644 index 0000000..1c9d5c4 --- /dev/null +++ b/random events/dino_death.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="Event" format=3 uid="uid://d5b2sa8a5wmm"] + +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_q7vcn"] +[ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="2_6dmg6"] +[ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="3_6uqyy"] +[ext_resource type="Resource" uid="uid://dk3wsnr3ku7ka" path="res://currency/sentient/royalty.tres" id="3_ed76l"] +[ext_resource type="Resource" uid="uid://dxjgtv26imfaf" path="res://test/dino ending.dtl" id="5_u3spd"] + +[sub_resource type="Resource" id="Resource_ed76l"] +script = ExtResource("2_6dmg6") +currency = ExtResource("3_ed76l") +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[resource] +script = ExtResource("3_6uqyy") +timeline = ExtResource("5_u3spd") +min_requirements = Array[ExtResource("2_6dmg6")]([SubResource("Resource_ed76l")]) +nature = 1 +metadata/_custom_type_script = "uid://diwdxofo6exg3" diff --git a/random events/plague_outbreak.tres b/random events/plague_outbreak.tres index 10dd48e..d777c59 100644 --- a/random events/plague_outbreak.tres +++ b/random events/plague_outbreak.tres @@ -2,6 +2,7 @@ [ext_resource type="Resource" uid="uid://bwrs2rwum4n2k" path="res://currency/abstract/plague.tres" id="1_3fl7i"] [ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="1_3pl45"] +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_rbw20"] [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="2_8da5x"] [ext_resource type="Resource" uid="uid://y4ssn47oa8tm" path="res://currency/inanimate/fertilizer.tres" id="3_ntq4i"] [ext_resource type="Resource" uid="uid://d0qksfwk3srhp" path="res://test/outbreak.dtl" id="4_8da5x"] @@ -9,7 +10,7 @@ [sub_resource type="Resource" id="Resource_ewcur"] script = ExtResource("2_8da5x") currency = ExtResource("1_3fl7i") -amount = 40 +amount = 240 metadata/_custom_type_script = "uid://dddyxbkq0ienn" [sub_resource type="Resource" id="Resource_227pm"] diff --git a/random events/plague_spread.tres b/random events/plague_spread.tres new file mode 100644 index 0000000..7c9e823 --- /dev/null +++ b/random events/plague_spread.tres @@ -0,0 +1,25 @@ +[gd_resource type="Resource" script_class="Event" format=3 uid="uid://c7cxsrtr66lp4"] + +[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_3b80u"] +[ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="2_3k0wj"] +[ext_resource type="Resource" uid="uid://bwrs2rwum4n2k" path="res://currency/abstract/plague.tres" id="3_3k0wj"] +[ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="3_nb7f6"] + +[sub_resource type="Resource" id="Resource_bagua"] +script = ExtResource("2_3k0wj") +currency = ExtResource("3_3k0wj") +amount = 1 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[sub_resource type="Resource" id="Resource_tdlem"] +script = ExtResource("2_3k0wj") +currency = ExtResource("3_3k0wj") +amount = 200 +metadata/_custom_type_script = "uid://dddyxbkq0ienn" + +[resource] +script = ExtResource("3_nb7f6") +modified_resource = SubResource("Resource_bagua") +requirements = Array[ExtResource("2_3k0wj")]([SubResource("Resource_tdlem")]) +nature = 1 +metadata/_custom_type_script = "uid://diwdxofo6exg3" diff --git a/test/death_by_bread.dtl b/test/death_by_bread.dtl new file mode 100644 index 0000000..943561c --- /dev/null +++ b/test/death_by_bread.dtl @@ -0,0 +1,4 @@ +Tsk tsk, seems you've been wasteful sire. +Our food stores have finally run dry, alas, it seems focusing so hard on {player_goal} has made you lose sight of the basic requirements of the human body. + +Better luck next time, {player_name}! \ No newline at end of file diff --git a/test/death_by_bread.dtl.uid b/test/death_by_bread.dtl.uid new file mode 100644 index 0000000..73994dc --- /dev/null +++ b/test/death_by_bread.dtl.uid @@ -0,0 +1 @@ +uid://ca3vsopmi5w7h diff --git a/test/death_by_plague.dtl b/test/death_by_plague.dtl new file mode 100644 index 0000000..5617ba3 --- /dev/null +++ b/test/death_by_plague.dtl @@ -0,0 +1,2 @@ +Oh no! Looks like the pestilence finally got to ya :P +Too bad, so sad, turns out unchecked disease is real real bad. \ No newline at end of file diff --git a/test/death_by_plague.dtl.uid b/test/death_by_plague.dtl.uid new file mode 100644 index 0000000..76dd544 --- /dev/null +++ b/test/death_by_plague.dtl.uid @@ -0,0 +1 @@ +uid://dlh5k47h7iu3t diff --git a/test/taunt.dtl b/test/taunt.dtl index 25a5d12..0656352 100644 --- a/test/taunt.dtl +++ b/test/taunt.dtl @@ -1,5 +1,3 @@ -set {special.archie_increment} = 7.0 - You've recived a letter from Archie Nemisye. if {special.archie_increment} == 1.0: "Howdy, nemisis! It's me, your Nemisye!" From 7efd7c5b179c69f605129e77361bdf20855cec37 Mon Sep 17 00:00:00 2001 From: Tandy Date: Sun, 27 Sep 2026 13:34:39 -0600 Subject: [PATCH 3/3] 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