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

currency/sentient/dinosaur.tres

@@ -9,8 +9,6 @@
 [ext_resource type="Resource" uid="uid://dfj4jwdmff6bu" path="res://currency/sentient/spy.tres" id="4_bufop"]
 [ext_resource type="Resource" uid="uid://dmctedq3pav0t" path="res://currency/inanimate/corpse.tres" id="5_w8bqw"]
 [ext_resource type="Resource" uid="uid://dsohovjbf3s2p" path="res://currency/sentient/chicken.tres" id="6_eu6eo"]
-[ext_resource type="Resource" uid="uid://rdrcyvuvrp2m" path="res://currency/sentient/pig.tres" id="7_3kirj"]
-[ext_resource type="Resource" uid="uid://b5qok0rcalr" path="res://currency/sentient/cow.tres" id="8_8ofsn"]
 [ext_resource type="Resource" uid="uid://dpaj2dk3qm7ow" path="res://currency/sentient/miner.tres" id="9_2oxvv"]
 [ext_resource type="Resource" uid="uid://dn0c1pfq04obw" path="res://currency/sentient/farmer.tres" id="10_5ek7i"]
 [ext_resource type="Resource" uid="uid://l8osuuxl7exe" path="res://currency/sentient/archer.tres" id="11_ihb7i"]
@@ -38,7 +36,7 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 [sub_resource type="Resource" id="Resource_jihtj"]
 script = ExtResource("1_qayfp")
 currency = ExtResource("5_w8bqw")
-amount = 20
+amount = 15
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_utj6b"]
@@ -47,18 +45,6 @@ currency = ExtResource("6_eu6eo")
 amount = 10
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
-[sub_resource type="Resource" id="Resource_2b5sm"]
-script = ExtResource("1_qayfp")
-currency = ExtResource("7_3kirj")
-amount = 10
-metadata/_custom_type_script = "uid://dddyxbkq0ienn"
-
-[sub_resource type="Resource" id="Resource_yq4u0"]
-script = ExtResource("1_qayfp")
-currency = ExtResource("8_8ofsn")
-amount = 8
-metadata/_custom_type_script = "uid://dddyxbkq0ienn"
-
 [sub_resource type="Resource" id="Resource_hi66y"]
 script = ExtResource("1_qayfp")
 currency = ExtResource("9_2oxvv")
@@ -131,6 +117,6 @@ name = "Dinosaur"
 description = "*rawrs at you gayly and prehistorically*"
 thumbnail = ExtResource("3_bufop")
 color = Color(1, 0.48235294, 0, 1)
-wants = Array[ExtResource("1_qayfp")]([SubResource("Resource_unbv5"), SubResource("Resource_awlnm"), SubResource("Resource_jihtj"), SubResource("Resource_utj6b"), SubResource("Resource_2b5sm"), SubResource("Resource_yq4u0"), SubResource("Resource_hi66y"), SubResource("Resource_mf31s"), SubResource("Resource_gdovn"), SubResource("Resource_ts66k"), SubResource("Resource_gt1pn"), SubResource("Resource_evrxh"), SubResource("Resource_b1bj4"), SubResource("Resource_mjehd"), SubResource("Resource_c6wya"), SubResource("Resource_c4cgt"), SubResource("Resource_n7bnc")])
+wants = Array[ExtResource("1_qayfp")]([SubResource("Resource_unbv5"), SubResource("Resource_awlnm"), SubResource("Resource_jihtj"), SubResource("Resource_utj6b"), SubResource("Resource_hi66y"), SubResource("Resource_mf31s"), SubResource("Resource_gdovn"), SubResource("Resource_ts66k"), SubResource("Resource_gt1pn"), SubResource("Resource_evrxh"), SubResource("Resource_b1bj4"), SubResource("Resource_mjehd"), SubResource("Resource_c6wya"), SubResource("Resource_c4cgt"), SubResource("Resource_n7bnc")])
 soldier = true
 metadata/_custom_type_script = "uid://hcvynq5fjypj"

economy.tscn

@@ -28,7 +28,7 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 [sub_resource type="Resource" id="Resource_vw3jp"]
 script = ExtResource("2_tljx8")
 currency = ExtResource("4_yg0ra")
-amount = 200
+amount = 210
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_xg8li"]

letter_generation.gd

@@ -6,7 +6,7 @@ var OFFERS = [preload("res://letters/ask_solo.tres"), preload("res://letters/cou
 func try_generate_offer() -> bool:
 	var offer: Counteroffer = OFFERS.pick_random()
 	var currency: Production = Economy.currencies.pick_random()
-	var amount = min(randi_range(1, 10), currency.amount)
+	var amount = min(randi_range(1, 20), currency.amount)
 	var request = Production.new()
 	request.currency = currency.currency
 	request.amount = amount

random events/a_pig_flew.tres

@@ -2,34 +2,19 @@
 
 [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_puqnt"]
 [ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="1_unbcn"]
-[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")
+currency = ExtResource("3_unbcn")
 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")
 email_subject = "Pigs Fly?"
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/death_by_bread.tres

@@ -9,6 +9,7 @@
 [sub_resource type="Resource" id="Resource_ywenm"]
 script = ExtResource("2_l11d8")
 currency = ExtResource("3_l11d8")
+amount = 10
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]