Merge branch 'master' of ssh://git.sjkillen.ca:2222/sjkillen/everything_has_a_price_jam

event.gd

@@ -1,5 +1,6 @@
 extends Resource
 class_name Event
 @export var modified_resource: Production
+@export var extra_mods: Array[Production]
 @export var timeline: DialogicTimeline
 @export var requirements: Array[Production]

project.godot

@@ -26,6 +26,7 @@ LetterGeneration="*uid://d156m2y8b38qs"
 
 directories/dch_directory={}
 directories/dtl_directory={
+"a_pig_flew": "res://test/a_pig_flew.dtl",
 "asking for currency solo": "res://test/asking for currency solo.dtl",
 "bar_crawl": "res://test/bar_crawl.dtl",
 "blood_rain": "res://test/blood_rain.dtl",
@@ -35,6 +36,7 @@ directories/dtl_directory={
 "dino": "res://test/dino.dtl",
 "double_agent": "res://test/double_agent.dtl",
 "drought": "res://test/drought.dtl",
+"from_farmer_to_table": "res://test/from_farmer_to_table.dtl",
 "goldrush": "res://test/goldrush.dtl",
 "new intel": "res://test/new intel.dtl",
 "outbreak": "res://test/outbreak.dtl",

random events/a_pig_flew.tres

@@ -0,0 +1,33 @@
+[gd_resource type="Resource" script_class="Event" format=3 uid="uid://ddjairvlvswck"]
+
+[ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_puqnt"]
+[ext_resource type="Resource" uid="uid://b5qok0rcalr" path="res://currency/sentient/cow.tres" id="2_tqpw4"]
+[ext_resource type="Resource" uid="uid://dsohovjbf3s2p" path="res://currency/sentient/chicken.tres" id="3_unbcn"]
+[ext_resource type="Resource" uid="uid://rdrcyvuvrp2m" path="res://currency/sentient/pig.tres" id="4_k6ytv"]
+[ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="5_ks6hr"]
+[ext_resource type="Resource" uid="uid://dnfywi4qk5tj" path="res://test/a_pig_flew.dtl" id="6_tqpw4"]
+
+[sub_resource type="Resource" id="Resource_stddx"]
+script = ExtResource("1_puqnt")
+currency = ExtResource("2_tqpw4")
+amount = 15
+metadata/_custom_type_script = "uid://dddyxbkq0ienn"
+
+[sub_resource type="Resource" id="Resource_3520l"]
+script = ExtResource("1_puqnt")
+currency = ExtResource("3_unbcn")
+amount = 15
+metadata/_custom_type_script = "uid://dddyxbkq0ienn"
+
+[sub_resource type="Resource" id="Resource_wblg4"]
+script = ExtResource("1_puqnt")
+currency = ExtResource("4_k6ytv")
+amount = 15
+metadata/_custom_type_script = "uid://dddyxbkq0ienn"
+
+[resource]
+script = ExtResource("5_ks6hr")
+modified_resource = SubResource("Resource_wblg4")
+extra_mods = Array[ExtResource("1_puqnt")]([SubResource("Resource_stddx"), SubResource("Resource_3520l")])
+timeline = ExtResource("6_tqpw4")
+metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/from_farmer_to_table.tres

@@ -0,0 +1,54 @@
+[gd_resource type="Resource" script_class="Event" format=3 uid="uid://f7qw65154l20"]
+
+[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"]
+
+[sub_resource type="Resource" id="Resource_korph"]
+script = ExtResource("1_piiqm")
+currency = ExtResource("2_khbdk")
+amount = 15
+metadata/_custom_type_script = "uid://dddyxbkq0ienn"
+
+[sub_resource type="Resource" id="Resource_7vjbg"]
+script = ExtResource("1_piiqm")
+currency = ExtResource("3_4gw5s")
+amount = -15
+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
+metadata/_custom_type_script = "uid://dddyxbkq0ienn"
+
+[sub_resource type="Resource" id="Resource_uhb4h"]
+script = ExtResource("1_piiqm")
+currency = ExtResource("6_6f6jr")
+amount = 20
+metadata/_custom_type_script = "uid://dddyxbkq0ienn"
+
+[resource]
+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")])
+metadata/_custom_type_script = "uid://diwdxofo6exg3"

test/a_pig_flew.dtl

@@ -0,0 +1,7 @@
+Well the day has finally come {player_name}...
+
+Pigs are flying!\
+Cows are jumping over the moon!\
+Chickens are.. well they're just doing normal chicken things. But there sure are a lot of them!
+
+The moral of the story is we have a lot more farm animals now for some reason.

test/a_pig_flew.dtl.uid

@@ -0,0 +1 @@
+uid://dnfywi4qk5tj

test/from_farmer_to_table.dtl

@@ -0,0 +1,3 @@
+Sire! There's been a massacre!\
+The animals have risen up against our farmers!
+Oh well, dangers of the job I s'pose.

test/from_farmer_to_table.dtl.uid

@@ -0,0 +1 @@
+uid://dctqq013bc6rx