Merge remote-tracking branch 'mraof/quest_systems' into upcoming-content

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -36,6 +36,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - Sulfur Pools and Cast Iron features in Heat Lands
 - Wooden Lamp and Heat Lamp blocks, used in Wood and Heat lands respectively
 - Chocolatey Cake - the most scrumptious cake in the entire world!
+- New dialogue system that uses a gui screen, replacing the chat-based system
+- Dialogue in this new system is data-driven, and can be defined or tweaked through datapacks
+- New dialogue
+- Carapacian pawns now have dialogue
 
 ### Changed
 
@@ -59,6 +63,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - Black Sand now generates in Heat lands
 - Updated Textures of Cast Iron blocks
 - Steel Beams are now alchemized with Iron Blocks instead of Cast Iron Blocks
+- Existing consort dialogue have been ported to the new dialogue system with some tweaks
 
 ### Fixed
 
@@ -69,14 +74,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - All walls will now connect with each other properly
 - Fixed name typos for some chess castle blocks
 - Area effect blocks now save their effect as a string id instead of an int id
+- Improved grammar on some dialogues
 
 ### Removed
 
 - Uncarved Wood no longer has a tooltip
 
 ### Contributors for this release
 
-- rose_bushes_, hadean, glubtier, ScarabOasis, Dweblenod, Boxfox, DORO, Akisephila, Vinnelli, Riotmode, pavizi, sipher
+- rose_bushes_, hadean, glubtier, ScarabOasis, Dweblenod, Boxfox, DORO, Akisephila, Vinnelli, Riotmode, pavizi, sipher, kirderf1
 
 ## [Unreleased]
 

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/constant_nakking.json

@@ -0,0 +1,14 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.constant_nakking"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/constant_thipping.json

@@ -0,0 +1,14 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.constant_thipping"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/dread_waiting.json

@@ -0,0 +1,14 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.dread_waiting"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/dreamer/explain_dreamers.1.json

@@ -0,0 +1,20 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.dreamer.explain_dreamers.1"
+      }
+    ],
+    "responses": [
+      {
+        "message": "minestuck.arrow",
+        "next_dialogue": "minestuck:carapacian_soldier/dreamer/explain_dreamers.2"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/dreamer/explain_dreamers.2.json

@@ -0,0 +1,14 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.dreamer.explain_dreamers.2"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/dreamer/start.json

@@ -0,0 +1,39 @@
+{
+  "conditioned_nodes": [
+    {
+      "condition": {
+        "type": "minestuck:player_entered"
+      },
+      "node": {
+        "messages": [
+          {
+            "type": "entity",
+            "message": "minestuck.dots"
+          },
+          {
+            "type": "description",
+            "message": "minestuck.dialogue.carapacian_soldier.dreamer.start.familiar"
+          }
+        ],
+        "responses": [
+          {
+            "message": "minestuck.dialogue.carapacian_soldier.dreamer.start.who",
+            "next_dialogue": "minestuck:carapacian_soldier/dreamer/explain_dreamers.1"
+          }
+        ]
+      }
+    }
+  ],
+  "default_node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.dreamer.start.unfamiliar"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/enemy.json

@@ -0,0 +1,14 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.enemy"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/forlorn.json

@@ -0,0 +1,14 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.forlorn"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/glub_glub.json

@@ -0,0 +1,14 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.glub_glub"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/not_so_bad.1.json

@@ -0,0 +1,20 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.not_so_bad.1"
+      }
+    ],
+    "responses": [
+      {
+        "message": "minestuck.arrow",
+        "next_dialogue": "minestuck:carapacian_soldier/not_so_bad.2"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/not_so_bad.2.json

@@ -0,0 +1,20 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.not_so_bad.2"
+      }
+    ],
+    "responses": [
+      {
+        "message": "minestuck.arrow",
+        "next_dialogue": "minestuck:carapacian_soldier/not_so_bad.3"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/not_so_bad.3.json

@@ -0,0 +1,20 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.not_so_bad.3"
+      }
+    ],
+    "responses": [
+      {
+        "message": "minestuck.arrow",
+        "next_dialogue": "minestuck:carapacian_soldier/not_so_bad.4"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/not_so_bad.4.json

@@ -0,0 +1,14 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.not_so_bad.4"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/propaganda.json

@@ -0,0 +1,14 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.propaganda"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/rain_sleet_or_snow.json

@@ -0,0 +1,14 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.rain_sleet_or_snow"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/sword_barter/bad_mood.json

@@ -0,0 +1,14 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.sword_barter.bad_mood"
+      }
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/minestuck/dialogue/carapacian_soldier/sword_barter/barter.json

@@ -0,0 +1,52 @@
+{
+  "node": {
+    "messages": [
+      {
+        "type": "entity",
+        "message": "minestuck.dots"
+      },
+      {
+        "type": "description",
+        "message": "minestuck.dialogue.carapacian_soldier.sword_barter.barter"
+      }
+    ],
+    "responses": [
+      {
+        "condition": {
+          "type": "minestuck:item_tag_match_exclude",
+          "exclusion_item": "minestuck:regisword",
+          "tag": "minecraft:swords"
+        },
+        "fail_tooltip": "minestuck.dialogue.carapacian_soldier.sword_barter.barter.give_item.condition",
+        "hide_if_failed": false,
+        "message": {
+          "arguments": [
+            "matched_item"
+          ],
+          "key": "minestuck.dialogue.carapacian_soldier.sword_barter.barter.give_item"
+        },
+        "next_dialogue": {
+          "id": "minestuck:carapacian_soldier/sword_barter/thanks",
+          "player_message": "minestuck.dialogue.carapacian_soldier.sword_barter.barter.give_item.reply",
+          "set_as_entrypoint": false
+        },
+        "triggers": [
+          {
+            "type": "minestuck:set_npc_matched_item"
+          },
+          {
+            "type": "minestuck:give_item",
+            "item": "minestuck:regisword"
+          },
+          {
+            "type": "minestuck:set_dialogue",
+            "new_path": "minestuck:carapacian_soldier/sword_barter/thanks"
+          }
+        ]
+      },
+      {
+        "message": "minestuck.dialogue.carapacian_soldier.sword_barter.barter.not_yet"
+      }
+    ]
+  }
+}