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

project.godot

@@ -47,6 +47,7 @@ directories/dtl_directory={
 "random life expense letter": "res://test/random life expense letter.dtl",
 "sending recruitment offer to individual npc": "res://test/sending recruitment offer to individual npc.dtl",
 "talking to npcs": "res://test/talking to npcs.dtl",
+"taunt": "res://test/taunt.dtl",
 "timeline": "res://test/timeline.dtl",
 "union reps letters": "res://test/union reps letters.dtl",
 "wizard": "res://test/wizard.dtl"
@@ -67,6 +68,7 @@ variables={
 "player_goal": "killing",
 "player_name": "Player Gaymerman",
 "special": {
+"archie_increment": 1,
 "renamed_kingdom": "",
 "spy_name": ""
 }

random events/taunt.tres

@@ -0,0 +1,10 @@
+[gd_resource type="Resource" script_class="Event" format=3 uid="uid://cqurm0kdk1ao"]
+
+[ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="1_0o4pj"]
+[ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="2_c2rsl"]
+[ext_resource type="Resource" uid="uid://du5glqfoifigj" path="res://test/taunt.dtl" id="3_c2rsl"]
+
+[resource]
+script = ExtResource("2_c2rsl")
+timeline = ExtResource("3_c2rsl")
+metadata/_custom_type_script = "uid://diwdxofo6exg3"

random events/wizard.tres

@@ -3,6 +3,7 @@
 [ext_resource type="Script" uid="uid://diwdxofo6exg3" path="res://event.gd" id="1_kjsek"]
 [ext_resource type="Resource" uid="uid://6xylw7p78fvf" path="res://currency/sentient/wizard.tres" id="1_wgvj8"]
 [ext_resource type="Script" uid="uid://dddyxbkq0ienn" path="res://currency/production.gd" id="2_8hlcg"]
+[ext_resource type="Resource" uid="uid://b4y6p8k4m8chh" path="res://test/wizard.dtl" id="4_8hlcg"]
 
 [sub_resource type="Resource" id="Resource_iwd2d"]
 script = ExtResource("2_8hlcg")
@@ -13,4 +14,5 @@ metadata/_custom_type_script = "uid://dddyxbkq0ienn"
 [resource]
 script = ExtResource("1_kjsek")
 modified_resource = SubResource("Resource_iwd2d")
+timeline = ExtResource("4_8hlcg")
 metadata/_custom_type_script = "uid://diwdxofo6exg3"

test/dino ending.dtl

@@ -2,4 +2,11 @@ Wha-
 [wait time="2.0"]
 [b]I WALKED AWAY FOR LIKE 2 MINUTES[/b]
 [i][b]HOW THE HELL DID YOU GET EATEN BY A DINOSAUR?!!?[/b][/i]
+if {special.archie_increment} >= 4.0:
+	[wait time="1.0"]
+	You've recived a letter from Archie Nemisye.
+	"Well, guess I didn't need to bother with feeding you do the dinos anyway! Nice job numb-nuts!"
+	~~ From the Court of Archie Nemisye ~~\
+	~~ With All His Highness' Respect ~~
+	[wait time="2.0"]
 congarjulations,, yourr did it and unlooked the secrt dino ending 🦖🦖🦖🦖🦖

test/taunt.dtl

@@ -0,0 +1,41 @@
+set {special.archie_increment} = 7.0
+
+You've recived a letter from Archie Nemisye.
+if {special.archie_increment} == 1.0:
+	"Howdy, nemisis! It's me, your Nemisye!"
+	"(Heh, see what I did there? Clever huh?)"
+	"Aaaanyway, I hope you're ready to get [i]totally freakin' [b]shredded[/b][/i] by my awesome army.
+elif {special.archie_increment} == 2.0:
+	"How've you been lately anyway? We haven't spoken in a while."
+	"Come to think of it, I'm not sure we've ever even spoken in the first place!"
+elif {special.archie_increment} == 3.0:
+	"I do hope you're getting these, by the way."\
+	"As much as I positively [i][b]despise[b][i] you and your {player_goal} ways. You may well be the only other in the land who can relate to me and my [i]royally[/i] blasé existance."
+elif {special.archie_increment} == 4.0:
+	"I dunno, gets awful lonely being king, so one must find ways to entertain oneself. Even if it means fraternizing with one's worst enemy!"
+	"Lucky for you though, you won't need to bother with that for much longer, I'll have you thrown to the dinos once [i]I'm[/i] in charge!"
+elif {special.archie_increment} == 5.0:
+	"You are getting these aren't you? Very un-rulerly of you to simply leave mail [i]without[/i] a reply."
+	"I suppose maybe I'll just need to come over there and confront you myself once I've had my way with your troops."
+elif {special.archie_increment} == 6.0:
+	"Okay well now this lack of response is just plain rude."
+else:
+	"I suppose diplomacy really isn't your strongsuit huh? Well I guess that's alright, just another thing I get to be better than you at!"
+
+
+
+~~ From the Court of Archie Nemisye ~~\
+~~ With All His Highness' Respect ~~
+
+if {special.archie_increment} == 4.0:
+	"P.S.\
+	I was lying about the whole feeding you to dinosaur's part."
+elif {special.archie_increment} == 7.0
+	"P.S.\
+	This is the last time you'll hear from me, frankly it's late and I'm getting tired of writing these letters."
+	"Goodnight, sleep loose, let the bed bugs eat you alive or something.\
+	\
+	- Archie"
+set {special.archie_increment} += 1.0
+
+# If special.archie_increment >= 7 then set the probability of the taunt event to zero

test/taunt.dtl.uid

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