Merge branch 'teaconmc:dev' into dev

LocusAzzurro · Dec 27, 2024 · 6c19a7e · 6c19a7e
2 parents 2ba2df7 + 2f6693c
commit 6c19a7e
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 0 deletions.
diff --git a/jiachen/data/amekawamiya/advancement/shards/attachment.json b/jiachen/data/amekawamiya/advancement/shards/attachment.json
@@ -0,0 +1,18 @@
+{
+  "criteria": {
+    "unlock": {
+      "conditions": {
+        "predicate": {
+          "node": "root"
+        }
+      },
+      "trigger": "thatskyinteractions:unlock_relationship"
+    }
+  },
+  "requirements": [
+    [ "unlock" ]
+  ],
+  "rewards": {
+    "function": "amekawamiya:shards/attachment"
+  }
+}
diff --git a/jiachen/data/amekawamiya/advancement/shards/fulfilment.json b/jiachen/data/amekawamiya/advancement/shards/fulfilment.json
@@ -0,0 +1,13 @@
+{
+  "criteria": {
+    "unlock": {
+      "trigger": "thatskyinteractions:completed_relationship"
+    }
+  },
+  "requirements": [
+    [ "unlock" ]
+  ],
+  "rewards": {
+    "function": "amekawamiya:shards/fulfilment"
+  }
+}
diff --git a/jiachen/data/amekawamiya/advancement/shards/lightseekers.json b/jiachen/data/amekawamiya/advancement/shards/lightseekers.json
@@ -0,0 +1,18 @@
+{
+  "criteria": {
+    "unlock": {
+      "conditions": {
+        "predicate": {
+          "amount": 1
+        }
+      },
+      "trigger": "thatskyinteractions:pickup_permanent"
+    }
+  },
+  "requirements": [
+    [ "unlock" ]
+  ],
+  "rewards": {
+    "function": "amekawamiya:shards/lightseekers"
+  }
+}
diff --git a/jiachen/data/amekawamiya/advancement/shards/the_light_beyond.json b/jiachen/data/amekawamiya/advancement/shards/the_light_beyond.json
@@ -0,0 +1,18 @@
+{
+  "criteria": {
+    "unlock": {
+      "conditions": {
+        "predicate": {
+          "amount": 20
+        }
+      },
+      "trigger": "thatskyinteractions:pickup_permanent"
+    }
+  },
+  "requirements": [
+    [ "unlock" ]
+  ],
+  "rewards": {
+    "function": "amekawamiya:shards/the_light_beyond"
+  }
+}
diff --git a/jiachen/data/amekawamiya/function/shards/attachment.mcfunction b/jiachen/data/amekawamiya/function/shards/attachment.mcfunction
@@ -0,0 +1 @@
+shard award @s thatskyinteractions:mf_carnival_fool
diff --git a/jiachen/data/amekawamiya/function/shards/fulfilment.mcfunction b/jiachen/data/amekawamiya/function/shards/fulfilment.mcfunction
@@ -0,0 +1 @@
+shard award @s thatskyinteractions:mf_carnival_fortune
diff --git a/jiachen/data/amekawamiya/function/shards/lightseekers.mcfunction b/jiachen/data/amekawamiya/function/shards/lightseekers.mcfunction
@@ -0,0 +1 @@
+shard award @s thatskyinteractions:mf_carnival_hermit
diff --git a/jiachen/data/amekawamiya/function/shards/the_light_beyond.mcfunction b/jiachen/data/amekawamiya/function/shards/the_light_beyond.mcfunction
@@ -0,0 +1 @@
+shard award @s thatskyinteractions:mf_carnival_star
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		shard award @s thatskyinteractions:mf_carnival_fool