Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dialogue edits and additions #588

Merged
merged 9 commits into from
Apr 10, 2024
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
- Added Cruxite block set
- 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

### Changed

Expand Down
168 changes: 142 additions & 26 deletions src/main/generated/resources/assets/minestuck/lang/en_us.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"node": {
"message": "minestuck.dialogue.consort.blown_away"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"node": {
"messages": [
{
"type": "entity",
"message": "minestuck.dialogue.consort.book_purpose.buy_my_products.a"
},
{
"type": "entity",
"message": "minestuck.dialogue.consort.book_purpose.buy_my_products.b"
},
{
"type": "description",
"message": "minestuck.dialogue.consort.book_purpose.buy_my_products.description"
}
],
"responses": [
{
"condition": {
"type": "minestuck:list",
"conditions": [
{
"type": "minestuck:always_true"
}
],
"list_type": "none"
},
"fail_tooltip": "minestuck.dialogue.consort.book_purpose.buy_my_products.not_purchase",
"hide_if_failed": false,
"message": "minestuck.dialogue.consort.book_purpose.buy_my_products.purchase"
},
{
"message": "minestuck.dialogue.consort.book_purpose.buy_my_products.decline"
},
{
"message": "minestuck.dialogue.consort.book_purpose.buy_my_products.decline_hard"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"node": {
"messages": [
{
"type": "entity",
"message": "minestuck.dialogue.consort.book_purpose.fact_2.a"
},
{
"type": "entity",
"message": "minestuck.dialogue.consort.book_purpose.fact_2.b"
}
],
"responses": [
{
"message": "minestuck.dialogue.consort.book_purpose.fact_2.request_more",
"next_dialogue": {
"id": "minestuck:consort/book_purpose/buy_my_products",
"reply_messages": [],
"set_as_entrypoint": true
}
},
{
"message": "minestuck.dialogue.goodbye"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"node": {
"message": "minestuck.dialogue.consort.book_purpose.start.1",
"responses": [
{
"message": "minestuck.arrow",
"next_dialogue": "minestuck:consort/book_purpose/start.2"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"node": {
"message": "minestuck.dialogue.consort.book_purpose.start.2",
"responses": [
{
"message": "minestuck.dialogue.consort.book_purpose.start.2.disagree",
"next_dialogue": {
"id": "minestuck:consort/book_purpose/unenlightened",
"player_message": "minestuck.dialogue.consort.book_purpose.start.2.disagree.reply",
"set_as_entrypoint": false
}
},
{
"message": "minestuck.dialogue.consort.book_purpose.start.2.continue",
"next_dialogue": "minestuck:consort/book_purpose/fact_2"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"node": {
"message": "minestuck.dialogue.consort.book_purpose.unenlightened",
"responses": [
{
"message": "minestuck.arrow",
"next_dialogue": "minestuck:consort/book_purpose/buy_my_products"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
{
"node": {
"message": "minestuck.dialogue.consort.bunny_birthday"
"message": "minestuck.dialogue.consort.bunny_birthday",
"responses": [
{
"message": "minestuck.dots"
},
{
"message": "minestuck.dialogue.consort.bunny_birthday.question",
"next_dialogue": {
"id": "minestuck:consort/bunny_birthday.whatever",
"player_message": "minestuck.dialogue.consort.bunny_birthday.question.reply",
"set_as_entrypoint": false
}
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"node": {
"message": "minestuck.dialogue.consort.bunny_birthday.whatever",
"responses": [
{
"message": "minestuck.dots"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
{
"node": {
"message": "minestuck.dialogue.consort.camel.no_camel"
"messages": [
{
"type": "entity",
"message": "minestuck.dialogue.consort.camel.no_camel"
},
{
"type": "description",
"message": {
"arguments": [
"entity_type"
],
"key": "minestuck.dialogue.consort.camel.no_camel.desc"
}
}
]
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"conditioned_nodes": [
{
"condition": {
"type": "minestuck:player_boondollars",
"amount": 1000
},
"node": {
"message": "minestuck.dialogue.consort.college.1",
"responses": [
{
"message": "minestuck.arrow",
"next_dialogue": "minestuck:consort/college.2"
}
]
}
}
],
"default_node": {
"message": "minestuck.dialogue.consort.college.poor"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"node": {
"message": "minestuck.dialogue.consort.consort_wood_carving"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"node": {
"message": "minestuck.dialogue.consort.creepy_trees.1",
"responses": [
{
"message": "minestuck.arrow",
"next_dialogue": "minestuck:consort/creepy_trees.2"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"node": {
"message": "minestuck.dialogue.consort.creepy_trees.2"
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"node": {
"message": "minestuck.dialogue.consort.cult.after_invitation",
"responses": [
{
"message": "minestuck.dialogue.consort.cult.after_invitation.no",
"next_dialogue": "minestuck:consort/cult/later"
},
{
"condition": {
"type": "minestuck:player_item",
"item": "minestuck:native_sulfur"
},
"message": "minestuck.dialogue.consort.cult.after_invitation.start",
"next_dialogue": "minestuck:consort/cult/disappointment",
"triggers": [
{
"type": "minestuck:set_flag",
"flag": "has_sulfur",
"player_specific": true
}
]
},
{
"message": "minestuck.dialogue.consort.cult.after_invitation.candy_question",
"next_dialogue": "minestuck:consort/cult/disappointment"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"node": {
"message": "minestuck.dialogue.consort.cult.disappointment",
"responses": [
{
"condition": {
"type": "minestuck:item_tag_match",
"tag": "minestuck:magic_weapon"
},
"message": {
"arguments": [
"matched_item"
],
"key": "minestuck.dialogue.consort.cult.disappointment.argue"
},
"next_dialogue": "minestuck:consort/cult/exchange"
},
{
"message": "minestuck.dialogue.consort.cult.disappointment.resign"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"conditioned_nodes": [
{
"condition": {
"type": "minestuck:flag",
"flag": "has_sulfur"
},
"node": {
"message": "minestuck.dialogue.consort.cult.exchange.exchange.proceed",
"responses": [
{
"condition": {
"type": "minestuck:list",
"conditions": [
{
"type": "minestuck:player_item",
"amount": 10,
"item": "minestuck:native_sulfur"
},
{
"type": "minestuck:player_item",
"item": "minecraft:goat_horn"
}
],
"list_type": "all"
},
"hide_if_failed": false,
"message": "minestuck.dialogue.consort.cult.exchange.give_items",
"next_dialogue": "minestuck:consort/cult/pleased",
"triggers": [
{
"type": "minestuck:take_item",
"amount": 10,
"item": "minestuck:native_sulfur"
},
{
"type": "minestuck:take_item",
"item": "minecraft:goat_horn"
},
{
"type": "minestuck:give_item",
"item": "minestuck:long_forgotten_warhorn"
},
{
"type": "minestuck:set_dialogue",
"new_path": "minestuck:consort/cult/later"
}
]
}
]
}
}
],
"default_node": {
"message": "minestuck.dialogue.consort.cult.exchange.exchange.decline"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"node": {
"message": {
"arguments": [
"entity_sound"
],
"key": "minestuck.dialogue.consort.cult.later"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"node": {
"message": "minestuck.dialogue.consort.cult.pleased"
}
}
Loading