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

currency/sentient/dinosaur.tres

@@ -3,6 +3,7 @@
 [ext_resource type="Script" uid="uid://hcvynq5fjypj" path="res://currency/sentient_currency.gd" id="1_0dcki"]
 [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_qayfp"]
 [ext_resource type="Resource" uid="uid://6xylw7p78fvf" path="res://currency/sentient/wizard.tres" id="3_2x36w"]
+[ext_resource type="Texture2D" uid="uid://c4snl0k8eu4n5" path="res://thumbnails/dino.jpg" id="3_bufop"]
 [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"]
@@ -126,6 +127,7 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 script = ExtResource("1_0dcki")
 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")])
 metadata/_custom_type_script = "uid://hcvynq5fjypj"

currency/sentient/farmer.tres

@@ -11,6 +11,12 @@
 [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_i7808"]
+script = ExtResource("1_35xhy")
+currency = ExtResource("7_uh6l7")
+amount = 2
+metadata/_custom_type_script = "uid://dddyxbkq0ienn"
+
 [sub_resource type="Resource" id="Resource_p1wox"]
 script = ExtResource("1_35xhy")
 currency = ExtResource("5_uddvy")
@@ -50,7 +56,7 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 [resource]
 script = ExtResource("1_kipvp")
 name = "Farmer"
-production = Array[ExtResource("1_35xhy")]([ExtResource("2_jkjll"), ExtResource("3_kfqfp")])
+production = Array[ExtResource("1_35xhy")]([ExtResource("2_jkjll"), ExtResource("3_kfqfp"), SubResource("Resource_i7808")])
 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")])

project.godot

@@ -40,6 +40,7 @@ directories/dtl_directory={
 "from_farmer_to_table": "res://test/from_farmer_to_table.dtl",
 "goldrush": "res://test/goldrush.dtl",
 "new intel": "res://test/new intel.dtl",
+"newsboy_caps": "res://test/newsboy_caps.dtl",
 "outbreak": "res://test/outbreak.dtl",
 "outro": "res://test/outro.dtl",
 "outro but you win actually": "res://test/outro but you win actually.dtl",

random events/newsboy_caps.tres

@@ -0,0 +1,26 @@
+[gd_resource type="Resource" script_class="Event" format=3 uid="uid://byienlsc413ra"]
+
+[ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_2ebyl"]
+[ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="2_7uy82"]
+[ext_resource type="Resource" uid="uid://dq70tpr5osjkk" path="res://currency/sentient/messenger.tres" id="2_ho2g0"]
+[ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="3_8y6t6"]
+[ext_resource type="Resource" uid="uid://8annrf4d7a2n" path="res://test/newsboy_caps.dtl" id="5_8y6t6"]
+
+[sub_resource type="Resource" id="Resource_u1vo1"]
+script = ExtResource("1_2ebyl")
+currency = ExtResource("2_ho2g0")
+amount = 15
+metadata/_custom_type_script = "uid://dddyxbkq0ienn"
+
+[sub_resource type="Resource" id="Resource_p3a4f"]
+script = ExtResource("1_2ebyl")
+currency = ExtResource("3_8y6t6")
+amount = 15
+metadata/_custom_type_script = "uid://dddyxbkq0ienn"
+
+[resource]
+script = ExtResource("2_7uy82")
+modified_resource = SubResource("Resource_p3a4f")
+extra_mods = Array[ExtResource("1_2ebyl")]([SubResource("Resource_u1vo1")])
+timeline = ExtResource("5_8y6t6")
+metadata/_custom_type_script = "uid://diwdxofo6exg3"

test/newsboy_caps.dtl

@@ -0,0 +1,7 @@
+Extra! Extra!\
+Sire! Sire! You've gotta hear!
+Newsboy caps are back in style!\
+We've got a flashmob at the gates made up entirely of Criers and Messangers!\
+Never will mail go undelivered again!
+They're just like me!\
+Extra! Extra!

test/newsboy_caps.dtl.uid

@@ -0,0 +1 @@
+uid://8annrf4d7a2n

thumbnails/attributions/attributions.txt

@@ -5,3 +5,5 @@ beer.png - from: "Straight beer glass.png" by Etamme, https://commons.wikimedia.
 bread.jpg - cropped from: "Bread on blue plate from an angle.jpg" by Kansattica, https://commons.wikimedia.org/wiki/File:Bread_on_blue_plate_from_an_angle.jpg, licensed under https://creativecommons.org/licenses/by/4.0/
 
 doctor.jpg - cropped from: "Effect inferno 2022 movie frame 01.jpg" by Sergey A. Demidov, https://commons.wikimedia.org/wiki/File:Effect_inferno_2022_movie_frame_01.jpg, licensed under https://creativecommons.org/licenses/by/4.0/
+
+dino.jpg - cropped from: "Dino cosumes at Knockengorroch 2023.jpeg" by Sara Thomas, https://commons.wikimedia.org/wiki/File:Dino_cosumes_at_Knockengorroch_2023.jpeg, licensed under https://creativecommons.org/licenses/by/4.0/

thumbnails/dino.jpg.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c4snl0k8eu4n5"
+path="res://.godot/imported/dino.jpg-9bb8574a9aff5590cbd8265f55c761d9.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://thumbnails/dino.jpg"
+dest_files=["res://.godot/imported/dino.jpg-9bb8574a9aff5590cbd8265f55c761d9.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