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

audio/787351__gertraut_hecher__medieval-dance-saltarello.wav.import

@@ -18,7 +18,7 @@ force/max_rate=false
 force/max_rate_hz=44100
 edit/trim=false
 edit/normalize=false
-edit/loop_mode=0
+edit/loop_mode=2
 edit/loop_begin=0
 edit/loop_end=-1
 compress/mode=2

currency/inanimate/beer.tres

@@ -1,7 +1,9 @@
 [gd_resource type="Resource" script_class="InanimateCurrency" format=3 uid="uid://crnhu4w6lfopb"]
 
 [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_apagg"]
+[ext_resource type="Script" uid="uid://cn8rc6jyllrf0" path="res://command.gd" id="1_voqdo"]
 [ext_resource type="Script" uid="uid://cthcf4w1il4h8" path="res://currency/inanimate_currency.gd" id="2_h7qij"]
+[ext_resource type="Resource" uid="uid://u6lls6n0xw3n" path="res://commands/move_command.tres" id="2_ihkss"]
 [ext_resource type="Texture2D" uid="uid://bplvus0ytk2f8" path="res://thumbnails/beer.png" id="3_h7qij"]
 
 [resource]

currency/sentient/archer.tres

@@ -15,31 +15,31 @@
 [sub_resource type="Resource" id="Resource_ui157"]
 script = ExtResource("1_m37xt")
 currency = ExtResource("5_2kil6")
-amount = 100
+amount = 10
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_ah5vq"]
 script = ExtResource("1_m37xt")
 currency = ExtResource("6_qqxwu")
-amount = 70
+amount = 7
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_2437s"]
 script = ExtResource("1_m37xt")
 currency = ExtResource("7_227pm")
-amount = 50
+amount = 5
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_n5gpp"]
 script = ExtResource("1_m37xt")
 currency = ExtResource("8_k5pub")
-amount = 50
+amount = 5
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_b1lqu"]
 script = ExtResource("1_m37xt")
 currency = ExtResource("9_i8mvc")
-amount = 50
+amount = 5
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]

currency/sentient/calvary.tres

@@ -15,31 +15,31 @@
 [sub_resource type="Resource" id="Resource_ui157"]
 script = ExtResource("1_cnnt2")
 currency = ExtResource("5_fxi61")
-amount = 100
+amount = 10
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_ah5vq"]
 script = ExtResource("1_cnnt2")
 currency = ExtResource("6_vf3g1")
-amount = 70
+amount = 7
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_2437s"]
 script = ExtResource("1_cnnt2")
 currency = ExtResource("7_2uxum")
-amount = 50
+amount = 5
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_n5gpp"]
 script = ExtResource("1_cnnt2")
 currency = ExtResource("8_npspm")
-amount = 50
+amount = 5
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_b1lqu"]
 script = ExtResource("1_cnnt2")
 currency = ExtResource("9_j3ou3")
-amount = 50
+amount = 5
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]

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"]
@@ -19,7 +17,6 @@
 [ext_resource type="Resource" uid="uid://dlxnbyiurne1s" path="res://currency/sentient/calvary.tres" id="14_ibwxy"]
 [ext_resource type="Resource" uid="uid://dk3wsnr3ku7ka" path="res://currency/sentient/royalty.tres" id="15_etlyf"]
 [ext_resource type="Resource" uid="uid://sq2lrgnfjugj" path="res://currency/sentient/mercenary.tres" id="16_dv7gf"]
-[ext_resource type="Resource" uid="uid://dq70tpr5osjkk" path="res://currency/sentient/messenger.tres" id="17_u1apl"]
 [ext_resource type="Resource" uid="uid://chsv8oeajty8j" path="res://currency/sentient/town_crier.tres" id="18_iltdy"]
 [ext_resource type="Resource" uid="uid://cwpk5e2exbgcr" path="res://currency/sentient/kings_guard.tres" id="19_30pip"]
 
@@ -38,7 +35,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 = 4
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_utj6b"]
@@ -47,18 +44,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")
@@ -107,12 +92,6 @@ currency = ExtResource("16_dv7gf")
 amount = 2
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
-[sub_resource type="Resource" id="Resource_c6wya"]
-script = ExtResource("1_qayfp")
-currency = ExtResource("17_u1apl")
-amount = 4
-metadata/_custom_type_script = "uid://dddyxbkq0ienn"
-
 [sub_resource type="Resource" id="Resource_c4cgt"]
 script = ExtResource("1_qayfp")
 currency = ExtResource("18_iltdy")
@@ -131,6 +110,7 @@ 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")])
 soldier = true
 metadata/_custom_type_script = "uid://hcvynq5fjypj"

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 = 20
+amount = 2
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_i5jpd"]
 script = ExtResource("1_ohece")
 currency = ExtResource("7_ck4s1")
-amount = 200
+amount = 20
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_2l2nr"]
 script = ExtResource("1_ohece")
 currency = ExtResource("8_hu81m")
-amount = 150
+amount = 15
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_6v7ae"]
 script = ExtResource("1_ohece")
 currency = ExtResource("9_w0d8m")
-amount = 250
+amount = 25
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_iph2q"]
 script = ExtResource("1_ohece")
 currency = ExtResource("10_gs0ul")
-amount = 150
+amount = 15
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_i8tft"]
 script = ExtResource("1_ohece")
 currency = ExtResource("11_0hope")
-amount = 100
+amount = 10
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_j0xkl"]
 script = ExtResource("1_ohece")
 currency = ExtResource("12_gr03u")
-amount = 100
+amount = 10
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]

currency/sentient/drunk.tres

@@ -8,16 +8,22 @@
 [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_uddvy"]
+script = ExtResource("1_b07i1")
+currency = ExtResource("5_a7r6n")
+amount = 1
+metadata/_custom_type_script = "uid://dddyxbkq0ienn"
+
 [sub_resource type="Resource" id="Resource_buevm"]
 script = ExtResource("1_b07i1")
 currency = ExtResource("5_a7r6n")
-amount = 100
+amount = 10
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]
 script = ExtResource("2_j265y")
 name = "Drunk"
-production = Array[ExtResource("1_b07i1")]([ExtResource("2_0dvy8"), ExtResource("3_0dvy8")])
+production = Array[ExtResource("1_b07i1")]([ExtResource("2_0dvy8"), ExtResource("3_0dvy8"), SubResource("Resource_uddvy")])
 description = "Will happily talk to you about all their problems."
 color = Color(0.80004877, 0.60784924, 0.18863755, 1)
 wants = Array[ExtResource("1_b07i1")]([SubResource("Resource_buevm")])

currency/sentient/farmer.tres

@@ -14,7 +14,7 @@
 [sub_resource type="Resource" id="Resource_i7808"]
 script = ExtResource("1_35xhy")
 currency = ExtResource("7_uh6l7")
-amount = 2
+amount = 3
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_bsgev"]
@@ -26,25 +26,25 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 [sub_resource type="Resource" id="Resource_dynkd"]
 script = ExtResource("1_35xhy")
 currency = ExtResource("7_uh6l7")
-amount = 100
+amount = 20
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_t37mv"]
 script = ExtResource("1_35xhy")
 currency = ExtResource("8_7lva1")
-amount = 100
+amount = 20
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_ou8s7"]
 script = ExtResource("1_35xhy")
 currency = ExtResource("9_i5hpk")
-amount = 50
+amount = 10
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_4ts75"]
 script = ExtResource("1_35xhy")
 currency = ExtResource("10_n23mm")
-amount = 2000
+amount = 400
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]

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 = 200
+amount = 40
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_kmdkm"]
 script = ExtResource("1_f1fuf")
 currency = ExtResource("6_y0tsi")
-amount = 100
+amount = 20
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_3p8gt"]
 script = ExtResource("1_f1fuf")
 currency = ExtResource("7_1ptox")
-amount = 150
+amount = 75
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_m16xj"]
 script = ExtResource("1_f1fuf")
 currency = ExtResource("8_t2htw")
-amount = 50
+amount = 15
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]

currency/sentient/knight.tres

@@ -13,19 +13,19 @@
 [sub_resource type="Resource" id="Resource_ui157"]
 script = ExtResource("1_626vc")
 currency = ExtResource("5_7d8n3")
-amount = 100
+amount = 20
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_ah5vq"]
 script = ExtResource("1_626vc")
 currency = ExtResource("6_xlwb3")
-amount = 70
+amount = 15
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_2437s"]
 script = ExtResource("1_626vc")
 currency = ExtResource("7_ds1y1")
-amount = 50
+amount = 25
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]

currency/sentient/mercenary.tres

@@ -11,7 +11,7 @@
 [sub_resource type="Resource" id="Resource_3og8x"]
 script = ExtResource("1_81xhi")
 currency = ExtResource("5_p4ceb")
-amount = 200
+amount = 50
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]

currency/sentient/messenger.tres

@@ -13,19 +13,19 @@
 [sub_resource type="Resource" id="Resource_0idw0"]
 script = ExtResource("1_iy37t")
 currency = ExtResource("5_rq11v")
-amount = 150
+amount = 15
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_l6nf4"]
 script = ExtResource("1_iy37t")
 currency = ExtResource("6_rptfm")
-amount = 150
+amount = 20
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_7h38k"]
 script = ExtResource("1_iy37t")
 currency = ExtResource("7_mf0hi")
-amount = 200
+amount = 25
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]

currency/sentient/miner.tres

@@ -27,19 +27,19 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 [sub_resource type="Resource" id="Resource_bws7g"]
 script = ExtResource("1_yn73g")
 currency = ExtResource("5_eaivi")
-amount = 150
+amount = 25
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_vxrsf"]
 script = ExtResource("1_yn73g")
 currency = ExtResource("6_4664q")
-amount = 100
+amount = 20
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_sgbmh"]
 script = ExtResource("1_yn73g")
 currency = ExtResource("7_tbpph")
-amount = 50
+amount = 15
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]

currency/sentient/spy.tres

@@ -14,25 +14,25 @@
 [sub_resource type="Resource" id="Resource_lljap"]
 script = ExtResource("1_wync1")
 currency = ExtResource("5_ssejx")
-amount = 250
+amount = 50
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_dr7t1"]
 script = ExtResource("1_wync1")
 currency = ExtResource("6_dmqey")
-amount = 100
+amount = 25
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_g2eqt"]
 script = ExtResource("1_wync1")
 currency = ExtResource("7_wnwuo")
-amount = 150
+amount = 35
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_me530"]
 script = ExtResource("1_wync1")
 currency = ExtResource("8_jpoxk")
-amount = 100
+amount = 20
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]

currency/sentient/town_crier.tres

@@ -15,13 +15,13 @@
 [sub_resource type="Resource" id="Resource_t4qyg"]
 script = ExtResource("1_0qymk")
 currency = ExtResource("5_hkj46")
-amount = 150
+amount = 25
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_mxenu"]
 script = ExtResource("1_0qymk")
 currency = ExtResource("6_s7hyh")
-amount = 100
+amount = 15
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_hgnp0"]
@@ -33,13 +33,13 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 [sub_resource type="Resource" id="Resource_ljdya"]
 script = ExtResource("1_0qymk")
 currency = ExtResource("8_lqdse")
-amount = 150
+amount = 30
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_17ik3"]
 script = ExtResource("1_0qymk")
 currency = ExtResource("11_lqdse")
-amount = 150
+amount = 25
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]

currency/sentient/wizard.tres

@@ -23,25 +23,25 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 [sub_resource type="Resource" id="Resource_60ga3"]
 script = ExtResource("1_05kyk")
 currency = ExtResource("5_g2km3")
-amount = 20
+amount = 10
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_i5jpd"]
 script = ExtResource("1_05kyk")
 currency = ExtResource("6_aqv3t")
-amount = 200
+amount = 100
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_2l2nr"]
 script = ExtResource("1_05kyk")
 currency = ExtResource("7_fu5ce")
-amount = 150
+amount = 50
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_6v7ae"]
 script = ExtResource("1_05kyk")
 currency = ExtResource("8_rx02f")
-amount = 250
+amount = 40
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_iph2q"]
@@ -59,7 +59,7 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 [sub_resource type="Resource" id="Resource_j0xkl"]
 script = ExtResource("1_05kyk")
 currency = ExtResource("11_1nkrr")
-amount = 50
+amount = 10
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]

economy.tscn

@@ -28,13 +28,13 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 [sub_resource type="Resource" id="Resource_vw3jp"]
 script = ExtResource("2_tljx8")
 currency = ExtResource("4_yg0ra")
-amount = 1000
+amount = 200
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_xg8li"]
 script = ExtResource("2_tljx8")
 currency = ExtResource("5_17ik3")
-amount = 5000
+amount = 500
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_f6kxb"]
@@ -46,25 +46,25 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 [sub_resource type="Resource" id="Resource_6u4g3"]
 script = ExtResource("2_tljx8")
 currency = ExtResource("7_isn2b")
-amount = 50
+amount = 5
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_aqv3t"]
 script = ExtResource("2_tljx8")
 currency = ExtResource("8_qb8iw")
-amount = 25
+amount = 4
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_g2km3"]
 script = ExtResource("2_tljx8")
 currency = ExtResource("9_4ywr4")
-amount = 15
+amount = 4
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_yg0ra"]
 script = ExtResource("2_tljx8")
 currency = ExtResource("11_17ik3")
-amount = 2
+amount = 1
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [node name="Economy" type="Node" unique_id=1950923383]

map.tscn

@@ -69,9 +69,11 @@ limit_bottom = 1592
 script = ExtResource("2_wijl4")
 
 [node name="PlayerGates" type="Area2D" parent="." unique_id=1387700911]
+unique_name_in_owner = true
+position = Vector2(968, 1498)
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerGates" unique_id=880212519]
-position = Vector2(967, 1469)
+position = Vector2(-1, -23)
 shape = SubResource("RectangleShape2D_bhunq")
 
 [node name="EnemyGates" type="Area2D" parent="." unique_id=92129502]
@@ -175,7 +177,7 @@ allegiance = ExtResource("5_71pa8")
 position = Vector2(854, 34)
 
 [node name="MemberSprite" parent="CharacterBody2D2" index="1" unique_id=283117283]
-currency = ExtResource("4_iw27f")
+currency = ExtResource("6_gqbix")
 allegiance = ExtResource("5_71pa8")
 
 [node name="CharacterBody2D3" parent="." unique_id=1323337635 instance=ExtResource("3_e0an3")]

project.godot

@@ -10,7 +10,7 @@ config_version=5
 
 [application]
 
-run/main_scene="uid://d1hx10534r452"
+run/main_scene="uid://dkui3dlb4vu1c"
 config/features=PackedStringArray("4.7")
 
 [autoload]

random events/bar_crawl.tres

@@ -9,12 +9,12 @@
 [sub_resource type="Resource" id="Resource_elpai"]
 script = ExtResource("2_iq8td")
 currency = ExtResource("1_dvejf")
-amount = 10
+amount = 4
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]
 script = ExtResource("1_qbpgq")
 modified_resource = SubResource("Resource_elpai")
 timeline = ExtResource("4_iq8td")
-email_subject = "What is this, an alien invasion movie?"
+email_subject = "Drunks I tell ya!"
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/chicken.tres

@@ -8,7 +8,7 @@
 [sub_resource type="Resource" id="Resource_hn66j"]
 script = ExtResource("2_x4t7o")
 currency = ExtResource("3_x4t7o")
-amount = 10
+amount = 1
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]

random events/dino.tres

@@ -16,4 +16,5 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 script = ExtResource("1_sui6i")
 modified_resource = SubResource("Resource_d0euj")
 timeline = ExtResource("4_1x1ll")
+email_subject = ". . ."
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/doctor_is_in.tres

@@ -16,4 +16,5 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 script = ExtResource("3_lrgpp")
 modified_resource = SubResource("Resource_w1adi")
 timeline = ExtResource("5_lrgpp")
+email_subject = "Crow People?"
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/double_agent.tres

@@ -16,4 +16,5 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 script = ExtResource("1_d1mhu")
 modified_resource = SubResource("Resource_o2lrv")
 timeline = ExtResource("4_53otq")
+email_subject = "Spy!"
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/drought.tres

@@ -23,4 +23,5 @@ script = ExtResource("1_ut0k2")
 modified_resource = SubResource("Resource_v1fts")
 timeline = ExtResource("4_rh8yf")
 requirements = Array[ExtResource("2_rh8yf")]([SubResource("Resource_2kil6")])
+email_subject = "I'm thirsty..."
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/farmer_spawn.tres

@@ -15,5 +15,5 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 script = ExtResource("3_smnog")
 modified_resource = SubResource("Resource_ksiai")
 skip_log = true
-probability = 0.4
+probability = 0.05
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/from_farmer_to_table.tres

@@ -11,25 +11,25 @@
 [sub_resource type="Resource" id="Resource_korph"]
 script = ExtResource("1_piiqm")
 currency = ExtResource("2_khbdk")
-amount = 15
+amount = 5
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_7vjbg"]
 script = ExtResource("1_piiqm")
 currency = ExtResource("3_4gw5s")
-amount = -50
+amount = -5
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_u1m57"]
 script = ExtResource("1_piiqm")
 currency = ExtResource("3_4gw5s")
-amount = 50
+amount = 5
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [sub_resource type="Resource" id="Resource_uhb4h"]
 script = ExtResource("1_piiqm")
 currency = ExtResource("6_6f6jr")
-amount = 200
+amount = 20
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]
@@ -39,4 +39,5 @@ extra_mods = Array[ExtResource("1_piiqm")]([SubResource("Resource_korph")])
 timeline = ExtResource("8_khbdk")
 requirements = Array[ExtResource("1_piiqm")]([SubResource("Resource_u1m57"), SubResource("Resource_uhb4h")])
 probability = 0.1
+email_subject = "The chickens have risen!"
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/gold_rush.tres

@@ -24,4 +24,5 @@ script = ExtResource("3_84pag")
 modified_resource = SubResource("Resource_vkoyk")
 timeline = ExtResource("4_5iq3f")
 requirements = Array[ExtResource("2_5iq3f")]([SubResource("Resource_qqxwu")])
+email_subject = "GOOOOOOLLLLD!!!"
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/miner_spawn.tres

@@ -15,5 +15,5 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 script = ExtResource("3_36238")
 modified_resource = SubResource("Resource_w0prn")
 skip_log = true
-probability = 0.25
+probability = 0.02
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/newsboy_caps.tres

@@ -2,25 +2,18 @@
 
 [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
+amount = 4
 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")
+email_subject = "I Finally Have a Social Life!"
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/plague_outbreak.tres

@@ -16,7 +16,7 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 [sub_resource type="Resource" id="Resource_227pm"]
 script = ExtResource("2_8da5x")
 currency = ExtResource("3_ntq4i")
-amount = 1000
+amount = 100
 metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 
 [resource]
@@ -24,4 +24,5 @@ script = ExtResource("1_3pl45")
 modified_resource = SubResource("Resource_ewcur")
 timeline = ExtResource("4_8da5x")
 requirements = Array[ExtResource("2_8da5x")]([SubResource("Resource_227pm")])
+email_subject = "Dark Days Ahead"
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/rainstorm.tres

@@ -16,4 +16,5 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 script = ExtResource("1_g4y32")
 modified_resource = SubResource("Resource_vc37c")
 timeline = ExtResource("4_0thrt")
+email_subject = "It's Raining! :D"
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/taunt.tres

@@ -9,4 +9,5 @@
 script = ExtResource("2_c2rsl")
 timeline = ExtResource("3_c2rsl")
 probability = 0.05
+email_subject = "Heya >:)"
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/wizard.tres

@@ -16,4 +16,5 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 script = ExtResource("1_kjsek")
 modified_resource = SubResource("Resource_iwd2d")
 timeline = ExtResource("4_8hlcg")
+email_subject = "Great Ooogaly Boogaly!"
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/wood_grow.tres

@@ -30,5 +30,5 @@ 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
+probability = 0.1
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

test/timeline.dtl

@@ -4,6 +4,8 @@ wow time for some character setup so cool
 Hello {player_name}! Welcome to the land of Twokingdom!
 You, sire, are the ruler of {kingdom_name}; the most glorious kingdom in all the lands!
 ...Rivaled only of course by Rivaldom, ruled by your sworn arch-nemesis "Archie Nemisye."
+But thankfully you won't need to worry about him for long.\
+Rivaldom is in your sights, and it will undoubtedly be won before long.
 #You knew of course that your kingdom was superior, because you had far more...
 #- Gold
 #- Food
@@ -15,7 +17,7 @@ You, sire, are the ruler of {kingdom_name}; the most glorious kingdom in all the
 #- Food
 #- Rocks
 # Same deal as the first, this is just to counter-balance it/add some more interesting options for play
-Your main goal as a ruler.. the thing you wanted more than anything else was\:
+Your main passion as a ruler.. the thing that drove you more than anything else was\:
 [text_input var="player_goal"]
 # Display this in some sort of message at the end for the winner
 And you'd do whatever it took to force {player_goal} onto Rivaldom as well. No matter the price.

troup.gd

@@ -4,10 +4,12 @@ extends CharacterBody2D
 const SPEED = 700.0
 const JUMP_VELOCITY = -400.0
 @export var target : Node2D
+@export var enemTarget : Node2D
 
 func _ready() -> void:
 	
 	UserContext.    set_target_for     .    connect(set_target_for)
+	enemTarget = %PlayerGates
 
 func set_target_for(who: CurrencyMemberSprite, t: Node2D):
 	if %MemberSprite == who:
@@ -46,29 +48,23 @@ func combat(target):
 		Economy.log.emit("A " + p.currency.name +" died in combat!")
 		self.queue_free()
 		
-#func _Direction() -> Vector2:
-	#self.position = self.position.move_toward(target.transform.position, speed * delta)
 	
 func _physics_process(delta: float) -> void:
+	if %MemberSprite.get_allegiance() == "Rivaldom" and %MemberSprite.get_combat() == true and target != enemTarget:
+		target = enemTarget
+	elif %MemberSprite.get_allegiance() == "You" and target == enemTarget:
+		removed_target()
+		
 	if target != null:
-		#print(self.global_position.distance_to(target.global_position))
 		var _num = abs(abs(self.global_position) - abs(target.global_position))
-	#print(num)
 		var direction = (target.global_position - self.global_position).normalized() * SPEED * delta
-		#if (num > Vector2(2,2)):
 		if (self.global_position.distance_to(target.global_position) > 25):
 			self.velocity = direction
-			#self.global_position = self.global_position.move_toward(target.global_position, SPEED * delta)
 		elif (target.is_class("CharacterBody2D")):
-			print("is SentientCurrency")
-			print(target.name)
-			print(target.get_node("MemberSprite").get_allegiance())
 			if (target.get_node("MemberSprite").get_allegiance() != get_node("MemberSprite").get_allegiance() ):
-				#print("different Allegience: "+ target.get_node("CurrencyMemberSprite").alligence)
 				combat(target)
 			removed_target()
+			
 		else:
-			print("Removed Target")
 			removed_target()
-			#target = null
 		move_and_slide()