loot tables

alex-s168 · Jan 17, 2024 · 6c9289e · 6c9289e
1 parent e8ec9b7
commit 6c9289e
Show file tree

Hide file tree

Showing 11 changed files with 185 additions and 85 deletions.
diff --git a/common/src/main/kotlin/org/valkyrienskies/tournament/blockentity/SensorBlockEntity.kt b/common/src/main/kotlin/org/valkyrienskies/tournament/blockentity/SensorBlockEntity.kt
@@ -52,10 +52,11 @@ class SensorBlockEntity(pos: BlockPos, state: BlockState):
             .location
             .toJOML()
 
-        val value = lerp(1.0, 15.0, 1 - (start.distance(hit) / TournamentConfig.SERVER.sensorDistance))
+        println("start to end distance: ${start.distance(end)}")
+        println("start to hit distance: ${start.distance(hit)}")
 
         return if (clipResult.type != HitResult.Type.MISS) {
-            value.toInt()
+            ceil(lerp(1.0, 15.0, start.distance(hit) / TournamentConfig.SERVER.sensorDistance))
         } else {
             0
         }

diff --git a/common/src/main/resources/assets/vs_tournament/blockstates/fuel_container_full.json b/common/src/main/resources/assets/vs_tournament/blockstates/fuel_container_full.json
diff --git a/common/src/main/resources/assets/vs_tournament/blockstates/fuel_gauge.json b/common/src/main/resources/assets/vs_tournament/blockstates/fuel_gauge.json
diff --git a/common/src/main/resources/assets/vs_tournament/blockstates/hinge.json b/common/src/main/resources/assets/vs_tournament/blockstates/hinge.json
diff --git a/common/src/main/resources/assets/vs_tournament/blockstates/hinge_top.json b/common/src/main/resources/assets/vs_tournament/blockstates/hinge_top.json
diff --git a/common/src/main/resources/data/vs_tournament/loot_tables/blocks/balloon.json b/common/src/main/resources/data/vs_tournament/loot_tables/blocks/balloon.json
@@ -2,14 +2,64 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "vs_tournament:balloon"
+          "name": "minecraft:string",
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.5
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:string",
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.5
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:string",
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.5
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:redstone",
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.25
+            }
+          ]
         }
       ]
     }
   ]
-}
+}
diff --git a/common/src/main/resources/data/vs_tournament/loot_tables/blocks/balloon_unpowered.json b/common/src/main/resources/data/vs_tournament/loot_tables/blocks/balloon_unpowered.json
@@ -2,14 +2,49 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "vs_tournament:balloon_unpowered"
+          "name": "minecraft:string",
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.5
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:string",
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.5
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:string",
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.5
+            }
+          ]
         }
       ]
     }
   ]
-}
+}
diff --git a/common/src/main/resources/data/vs_tournament/loot_tables/blocks/prop_big.json b/common/src/main/resources/data/vs_tournament/loot_tables/blocks/prop_big.json
@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "bonus_rolls": 0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "vs_tournament:prop_big"
+        }
+      ],
+      "conditions": [
+      ]
+    }
+  ]
+}
diff --git a/common/src/main/resources/data/vs_tournament/loot_tables/blocks/prop_small.json b/common/src/main/resources/data/vs_tournament/loot_tables/blocks/prop_small.json
@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "bonus_rolls": 0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "vs_tournament:prop_big"
+        }
+      ],
+      "conditions": [
+      ]
+    }
+  ]
+}
diff --git a/common/src/main/resources/data/vs_tournament/loot_tables/gifts/grab_gun.json b/common/src/main/resources/data/vs_tournament/loot_tables/gifts/grab_gun.json
@@ -2,14 +2,29 @@
   "type": "minecraft:barter",
   "pools": [
     {
-      "rolls": 2,
+      "rolls": 1,
       "entries": [
         {
           "type": "minecraft:item",
           "name": "minecraft:diamond"
         }
       ]
     },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:diamond",
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.5
+            }
+          ]
+        }
+      ]
+    },
     {
       "rolls": 1,
       "entries": [

diff --git a/common/src/main/resources/data/vs_tournament/loot_tables/special/balloon_pop.json b/common/src/main/resources/data/vs_tournament/loot_tables/special/balloon_pop.json
@@ -2,14 +2,49 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 2.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "minecraft:string"
+          "name": "minecraft:string",
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.5
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:string",
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.5
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:string",
+          "conditions": [
+            {
+              "condition": "minecraft:random_chance",
+              "chance": 0.5
+            }
+          ]
         }
       ]
     }
   ]
-}
+}