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

Random.gd

@@ -1,4 +1,4 @@
 extends Node
 
 func dialogic_random(a: int, b: int):
-	Dialogic.VAR.set_variable("RNG", randi_range(a, b))
+	Dialogic.VAR.set_variable("RNG_1_4", randi_range(a, b))

project.godot

@@ -24,25 +24,29 @@ UserContext="*uid://0a08ucta58lp"
 
 directories/dch_directory={}
 directories/dtl_directory={
-"basic npc dialogue layout": "res://test/basic npc dialogue layout.dtl",
+"asking for currency solo": "res://test/asking for currency solo.dtl",
+"counteroffer request": "res://test/counteroffer request.dtl",
 "random life expense letter": "res://test/random life expense letter.dtl",
-"timeline": "res://test/timeline.dtl"
+"timeline": "res://test/timeline.dtl",
+"union reps letters": "res://test/union reps letters.dtl"
 }
 layout/style_directory={}
 variables={
-"RNG": "",
+"RNG": 0,
-"RNG_1_4": "",
+"RNG_1_4": 0,
 "for_timeline_calls": {
-"requested_amount": "",
+"requested_amount": 69,
-"requested_currency": "",
+"requested_currency": "dollareedoos",
-"requestee_class": "",
+"requestee_class": "people",
-"requestee_name": ""
+"requestee_name": "john nameman"
 },
-"player_goal": "",
+"kingdom_name": "coolland",
-"player_name": ""
+"player_goal": "killing",
+"player_name": "Player Gaymerman"
 }
 layout/style_list=[]
 layout/default_style="Default"
+glossary/default_case_sensitive=true
 
 [display]
 

test/asking for currency solo.dtl

@@ -1,4 +1,5 @@
 # Provide all variables in the "for_timeline_calls" folder when calling
+do Random.dialogic_random(1, 4)
 
 You've received a letter from {for_timeline_calls.requestee_name} the {for_timeline_calls.requestee_class}.
 if {RNG_1_4} == 1.0:
@@ -8,7 +9,7 @@ if {RNG_1_4} == 1.0:
 elif {RNG_1_4} == 2.0:
 	"Hello sire, I hope this message finds you well.\
 	I've done some reflecting, and I believe my services are worth at least another {for_timeline_calls.requested_amount} {for_timeline_calls.requested_currency}."
-	"I'll expect it posthaste, otherwise you may consider my service to you at an end.""
+	"I'll expect it posthaste, otherwise you may consider my service to you at an end."
 elif {RNG_1_4} == 3.0:
 	"Eyyy, royalty dude!\
 	Is it coooool if I have another {for_timeline_calls.requested_amount} {for_timeline_calls.requested_currency}..? I think that'd be pretty cooooool man \:)"

test/counteroffer request.dtl

@@ -0,0 +1,24 @@
+# Provide all variables in the "for_timeline_calls" folder when calling
+do Random.dialogic_random(1, 4)
+
+You've received a letter from {for_timeline_calls.requestee_name}.
+if {RNG_1_4} == 1.0:
+	"Greetings your majesty. {for_timeline_calls.requestee_name} the {for_timeline_calls.requestee_class} here."
+	"I've recently recived an offer from Sir Archie Nemisye for my services.. and I'm afraid it is [i]much[/i] higher than what I'm currently reciving."
+	"I'm nothing if not a (mostly) loyal subject however, so if you should see fit to match that ammount ({for_timeline_calls.requested_amount} {for_timeline_calls.requested_currency} to be exact), I will gladly stay in your service."
+
+elif {RNG_1_4} == 2.0:
+	"Oi, kingman."
+	"I've just got word that Mr. Nemisye from way over yonder in Rivaldom that I'd be gettin' a whee bit more coin if I happened to provide move my enterprising self over there instead."
+	"Gimme {for_timeline_calls.requested_amount} {for_timeline_calls.requested_currency}, elsewise, I'm not stickin' around."
+	"- {for_timeline_calls.requestee_name} the {for_timeline_calls.requestee_class}"
+
+elif {RNG_1_4} == 3.0:
+	"Dear {player_name},\
+	I'm writing to express a desire for greater compensation in exchange my loyal service to {kingdom_name}."
+	"I've recently recived a letter from the court of Nemisye expressing that they believe my services would be much more highly valued in their kingdom. While I have served you for many years, I must admit this offer is tempting."
+	"As much as it pains me, I will be forced to abandon {kingdom_name} unless you're willing to provide me with {for_timeline_calls.requested_amount} {for_timeline_calls.requested_currency}. A fair stipend, I think."
+	Sincerely,\
+	{for_timeline_calls.requestee_name} the {for_timeline_calls.requestee_class}
+
+else:

test/counteroffer request.dtl.uid

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

test/random life expense letter.dtl

@@ -1,4 +1,5 @@
 # Provide all variables in the "for_timeline_calls" folder when calling
+do Random.dialogic_random(1, 4)
 
 You've received a letter from {for_timeline_calls.requestee_name} the {for_timeline_calls.requestee_class}.
 if {RNG_1_4} == 1.0:

test/union reps letters.dtl

@@ -0,0 +1,21 @@
+# Provide all variables in the "for_timeline_calls" folder when calling
+do Random.dialogic_random(1, 3)
+
+You've received a letter from {for_timeline_calls.requestee_name}.
+if {RNG_1_4} == 1.0:
+	"Greetings from the guild of {for_timeline_calls.requestee_class}s your highness."
+	"My name is {for_timeline_calls.requestee_name} and I'm writing to you on behalf of all of us to ask for more {for_timeline_calls.requested_currency}. The amount you've seen fit to provide us with thus far is, frankly, insulting."
+	"We demand at least {for_timeline_calls.requested_amount} {for_timeline_calls.requested_currency} as soon as possible, otherwise we will need to consider taking more serious action."
+
+elif {RNG_1_4} == 2.0:
+	"Hello {player_name}, this is {for_timeline_calls.requestee_name} writing to you on behalf of all {for_timeline_calls.requestee_class}s in the kingdom of {kingdom_name}. I hope this message finds you well."
+	"We've come to realise that your compensation for our workforce is far less than we believe we're worth, and would like to request a greater wage for all of us."
+	"After much consideration, we've decided that {for_timeline_calls.requested_amount} {for_timeline_calls.requested_currency} should be enough."
+
+elif {RNG_1_4} == 3.0:
+	"'Ello from the union of {for_timeline_calls.requestee_class}s 'yer highness.\
+	Forgive the informality, I'm none too good at writin' myself, but the people says that I'm real persuasive."
+	"Me and some o' the other smart blokes have had a little chin wag and we figure you ain't payin' us enough."
+	"{for_timeline_calls.requested_amount} {for_timeline_calls.requested_amount} oughtta keep us happy for now, elsewise we might just look into other options ferr who's rulin' us."
+
+else:

test/union reps letters.dtl.uid

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