From 31850a0f5c62c818aa13bebd00c852ceaecd8462 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sat, 27 Jan 2024 21:18:42 +0000
Subject: [PATCH] Add a trap to the changling hive using the new potion

---
 .../chests/changeling_hive_trap.json          | 204 ++++++++++++++++++
 .../changeling_hive/trapped/offshoot2.nbt     | Bin 0 -> 1204 bytes
 .../changeling_hive/side_passages.json        |   9 +
 3 files changed, 213 insertions(+)
 create mode 100644 src/main/resources/data/unicopia/loot_tables/chests/changeling_hive_trap.json
 create mode 100644 src/main/resources/data/unicopia/structures/changeling_hive/trapped/offshoot2.nbt

diff --git a/src/main/resources/data/unicopia/loot_tables/chests/changeling_hive_trap.json b/src/main/resources/data/unicopia/loot_tables/chests/changeling_hive_trap.json
new file mode 100644
index 00000000..2dac1a86
--- /dev/null
+++ b/src/main/resources/data/unicopia/loot_tables/chests/changeling_hive_trap.json
@@ -0,0 +1,204 @@
+{
+  "type": "minecraft:chest",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:tipped_arrow",
+          "functions": [
+            { "function": "minecraft:set_potion", "id": "unicopia:short_morph_earth" },
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 3.0,
+                "max": 9.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "weight": 3
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:tipped_arrow",
+          "functions": [
+            { "function": "minecraft:set_potion", "id": "unicopia:short_morph_unicorn" },
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 3.0,
+                "max": 9.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "weight": 1
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:tipped_arrow",
+          "functions": [
+            { "function": "minecraft:set_potion", "id": "unicopia:short_morph_pegasus" },
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 3.0,
+                "max": 9.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "weight": 1
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:tipped_arrow",
+          "functions": [
+            { "function": "minecraft:set_potion", "id": "unicopia:short_morph_bat" },
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 3.0,
+                "max": 9.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "weight": 1
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:tipped_arrow",
+          "functions": [
+            { "function": "minecraft:set_potion", "id": "unicopia:short_morph_kirin" },
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 3.0,
+                "max": 9.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "weight": 1
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:tipped_arrow",
+          "functions": [
+            { "function": "minecraft:set_potion", "id": "unicopia:short_morph_hippogriff" },
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 3.0,
+                "max": 9.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "weight": 1
+        },
+        
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:tipped_arrow",
+          "functions": [
+            { "function": "minecraft:set_potion", "id": "unicopia:long_morph_earth" },
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 3.0,
+                "max": 9.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "weight": 5
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:tipped_arrow",
+          "functions": [
+            { "function": "minecraft:set_potion", "id": "unicopia:long_morph_unicorn" },
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 3.0,
+                "max": 9.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "weight": 2
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:tipped_arrow",
+          "functions": [
+            { "function": "minecraft:set_potion", "id": "unicopia:long_morph_pegasus" },
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 3.0,
+                "max": 9.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "weight": 2
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:tipped_arrow",
+          "functions": [
+            { "function": "minecraft:set_potion", "id": "unicopia:long_morph_bat" },
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 3.0,
+                "max": 9.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "weight": 2
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:tipped_arrow",
+          "functions": [
+            { "function": "minecraft:set_potion", "id": "unicopia:long_morph_kirin" },
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 3.0,
+                "max": 9.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "weight": 2
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:tipped_arrow",
+          "functions": [
+            { "function": "minecraft:set_potion", "id": "unicopia:long_morph_hippogriff" },
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 3.0,
+                "max": 9.0,
+                "type": "minecraft:uniform"
+              }
+            }
+          ],
+          "weight": 2
+        }
+      ],
+      "rolls": 6.0
+    }
+  ]
+}
diff --git a/src/main/resources/data/unicopia/structures/changeling_hive/trapped/offshoot2.nbt b/src/main/resources/data/unicopia/structures/changeling_hive/trapped/offshoot2.nbt
new file mode 100644
index 0000000000000000000000000000000000000000..497a7b7d9fa58ceb76e5d94d6d61d6f653796a2b
GIT binary patch
literal 1204
zcmV;l1WWrLiwFP!00000|K*xZkK;4|hMmOu{#XPO`~l#)_dRn&hy&tUd0I~=yPc#;
zTt@H@_{*F~cIvj<Huf{(NJiDD)$8|pk~nTMnnH+N$g%xPM?#4C^=^8_(<{kEraRM`
zR*z!da*;gj`t_%=nBM%8i)i1Ec2Fc<w=fd%Xq3^%5tkWx%mg6g>WPmT0WvOD{03G8
zGSZPrfV0iGoNdPCY%?xrn{hd(z}aS8&Nkz6wi%bR&A6ODyIl1I3mFMAv4a&HU!kKX
z06qcm34l)sd_v$8-tk#txqMFEAmeh5fO7<#<sF~v9tnIT@R7hLK4yIDn9n%|&M|O~
zfpY?!6X2Wx=L9$>z&QoZDR54Kb9%>liRE(6fKLW|GT@T~Rt{J>U=@H>09FB5C190+
zRRUH8SQTJZfK`L}TmzpP_|(9s0X_}zX@E}yeC92@Vl8D{_arvsy9e;G0?-qJ9-DDF
z+l=qK+vj6*u5)_24*(h8_p*;=Gp_S40V@V9oAEt6_<UmElYmSLoNdN;AMSHbflmf}
zGQi3~PY!wt&{Ke(67-ayrvg0{=&3<Z4SE{T(|{gv{Owy;KVS18<6BpKtN^eAzzPA&
zW_;_ak99f*AmdwCeLfPfBw$IviUBJIESvGIt3ICu_$0t50jw0TQoynq-}>zH$$(D=
zSUKp)K~DjC3eZ!69-DEk2_;}vfK`E>8uZwVYi`tl)c{rlSPfv!oAexKn;|`}`5XXN
z09XNFg@6?TRtQ*jZS}45KA#BqNWhYSB>^i2tQfFjz)Aos0jvbDQou?9D+4_l=*dA(
z4tfgEQ-Gcl^pv2d0zDPzsX<Tuh92MA>ti*5)d1GKT|c9R3x9J6K_&tj7b^rk5%7sX
zkA21uK*q(2K_<DwiWV}LJ#ry)xnJ?ZbGOSUyW_KzarNY&CkH(R=qW%?33^J<Q-Pie
z^wglI20abP2s`&d#&^B@dIHd6pJ83jAz($ICjvbZ^hnSXgP!CK85b)BJ@)y_cP;yR
za?q25o&xj~pr-^q)f+OGtYqPt$af9iW(pB?4<-}w$G+{1$cBEmQx7|x3E8P<Eq*w3
z?YiH$>cjd;bz8k_yY1?!{X@SW+l^lB)i|o{oZk2SPW*_{V<yVSwo|*+t4ICZc6vRi
zNAp3oLngv@BfdI+_OacL>LnA2QNvansI+jWa5-Dk)86Ml_r3XT-f!{!MY|r&`2GsA
zGK1Q`I(~C@+_d9fccUH_zVO5aHv8Wkbi3?dPVapBN%v}}jnVUER1~84b?EncnE$(K
zIwoV+zx*lUN3|REbgbkr^AUM>fp1OQ2{h`v)2Q(<JgT)`9Y@>1mj~gxG~M?vdeEC=
zZ6-2hjGCs!Mo2RprVo;-bUF|dzCW0!GxuC;hIaqb4tn*}_n)o-*)(m`@O(j#T8-xP
z?ndCqInv{<AI|S?<m8J!b)D3{zE%4VyZtKg*4@6dTTg1Qh1^V|PHo?wPu{M5o~GDg
zG>6@dZP^d4?xxAr_MJ%QU0xl|B{wtrdU!sWZnt09ES%K4SG!YYK9_EpNR&S*qkh-J
SIFAtZ-{N1WM??XJC;$L+YD;7Q

literal 0
HcmV?d00001

diff --git a/src/main/resources/data/unicopia/worldgen/template_pool/changeling_hive/side_passages.json b/src/main/resources/data/unicopia/worldgen/template_pool/changeling_hive/side_passages.json
index 2c4bb501..0a5bd470 100644
--- a/src/main/resources/data/unicopia/worldgen/template_pool/changeling_hive/side_passages.json
+++ b/src/main/resources/data/unicopia/worldgen/template_pool/changeling_hive/side_passages.json
@@ -117,6 +117,15 @@
       },
       "weight": 3
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "unicopia:changeling_hive/trapped/offshoot2",
+        "processors": "unicopia:changeling_hive_decay",
+        "projection": "rigid"
+      },
+      "weight": 3
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",