- Rebalanced gifts

- Cribs real
Luke100000 · Oct 7, 2024 · c6a3ce5 · c6a3ce5
1 parent afab9c1
commit c6a3ce5
Show file tree

Hide file tree

Showing 20 changed files with 108 additions and 60 deletions.
diff --git a/common/src/main/resources/data/mca/gifts/archery.json b/common/src/main/resources/data/mca/gifts/archery.json
@@ -8,6 +8,10 @@
       "personality": "sensitive",
       "satisfaction_boost": -20
     },
+    {
+      "trait": "tough",
+      "satisfaction_boost": 15
+    },
     {
       "trait": "weak",
       "satisfaction_boost": -15

diff --git a/common/src/main/resources/data/mca/gifts/books.json b/common/src/main/resources/data/mca/gifts/books.json
@@ -2,7 +2,7 @@
   "conditions": [
     {
       "age_group": "child",
-      "satisfaction_boost": -20
+      "satisfaction_boost": -10
     },
     {
       "profession": "minecraft:librarian",

diff --git a/common/src/main/resources/data/mca/gifts/chest.json b/common/src/main/resources/data/mca/gifts/chest.json
@@ -1,6 +1,11 @@
 {
-  "conditions": [],
+  "conditions": [
+    {
+      "personality": "Greedy",
+      "satisfaction_boost": 10
+    }
+  ],
   "items": {
-    "minecraft:chest": 8
+    "minecraft:chest": 10
   }
 }
diff --git a/common/src/main/resources/data/mca/gifts/fish.json b/common/src/main/resources/data/mca/gifts/fish.json
@@ -8,10 +8,6 @@
       "age_group": "child",
       "satisfaction_boost": -20
     },
-    {
-      "gender": "female",
-      "satisfaction_boost": -5
-    },
     {
       "trait": "vegetarian",
       "satisfaction_boost": -5

diff --git a/common/src/main/resources/data/mca/gifts/flowers.json b/common/src/main/resources/data/mca/gifts/flowers.json
@@ -2,14 +2,6 @@
   "conditions": [
     {
       "age_group": "child",
-      "satisfaction_boost": 9
-    },
-    {
-      "gender": "male",
-      "satisfaction_boost": -2
-    },
-    {
-      "gender": "female",
       "satisfaction_boost": 10
     }
   ],
@@ -20,6 +12,6 @@
     "best": "gift.flowers.best"
   },
   "items": {
-    "#minecraft:flowers": 2
+    "#minecraft:flowers": 5
   }
 }
diff --git a/common/src/main/resources/data/mca/gifts/furnace.json b/common/src/main/resources/data/mca/gifts/furnace.json
@@ -10,10 +10,10 @@
     },
     {
       "profession": "minecraft:armorer",
-      "satisfaction_boost": 15
+      "satisfaction_boost": 10
     }
   ],
   "items": {
-    "minecraft:furnace": 8
+    "minecraft:furnace": 10
   }
 }
diff --git a/common/src/main/resources/data/mca/gifts/golden_carrot.json b/common/src/main/resources/data/mca/gifts/golden_carrot.json
@@ -2,11 +2,15 @@
   "conditions": [
     {
       "profession": "minecraft:cleric",
-      "satisfaction_boost": 5
+      "satisfaction_boost": 15
     },
     {
       "profession": "minecraft:farmer",
-      "satisfaction_boost": 15
+      "satisfaction_boost": 5
+    },
+    {
+      "personality": "Greedy",
+      "satisfaction_boost": 10
     }
   ],
   "items": {

diff --git a/common/src/main/resources/data/mca/gifts/heart_of_the_sea.json b/common/src/main/resources/data/mca/gifts/heart_of_the_sea.json
@@ -1,12 +1,12 @@
 {
   "conditions": [
-    {
-      "gender": "female",
-      "satisfaction_boost": 30
-    },
     {
       "profession": "minecraft:fisherman",
       "satisfaction_boost": 20
+    },
+    {
+      "personality": "Greedy",
+      "satisfaction_boost": 10
     }
   ],
   "items": {

diff --git a/common/src/main/resources/data/mca/gifts/hoes.json b/common/src/main/resources/data/mca/gifts/hoes.json
@@ -6,9 +6,9 @@
     }
   ],
   "items": {
-    "minecraft:netherite_hoe": 1000,
-    "minecraft:diamond_hoe": 20,
-    "minecraft:iron_hoe": 15,
+    "minecraft:netherite_hoe": 100000,
+    "minecraft:diamond_hoe": 25,
+    "minecraft:iron_hoe": 20,
     "minecraft:golden_hoe": 15,
     "minecraft:stone_hoe": 10,
     "minecraft:wooden_hoe": 5

diff --git a/common/src/main/resources/data/mca/gifts/music_discs.json b/common/src/main/resources/data/mca/gifts/music_discs.json
@@ -1,7 +1,9 @@
 {
   "conditions": [],
   "items": {
-    "minecraft:music_disc_pigstep": 2,
+    "minecraft:music_disc_pigstep": 20,
+    "minecraft:music_disc_otherside": 20,
+    "minecraft:music_disc_relic": 20,
     "#minecraft:creeper_drop_music_discs": 15
   }
 }
diff --git a/common/src/main/resources/data/mca/gifts/nautilus_shell.json b/common/src/main/resources/data/mca/gifts/nautilus_shell.json
@@ -1,12 +1,12 @@
 {
   "conditions": [
-    {
-      "gender": "female",
-      "satisfaction_boost": 30
-    },
     {
       "profession": "minecraft:fisherman",
       "satisfaction_boost": 20
+    },
+    {
+      "personality": "Greedy",
+      "satisfaction_boost": 10
     }
   ],
   "items": {

diff --git a/common/src/main/resources/data/mca/gifts/pickaxes.json b/common/src/main/resources/data/mca/gifts/pickaxes.json
@@ -1,10 +1,5 @@
 {
-  "conditions": [
-    {
-      "profession": "mca:miner",
-      "satisfaction_boost": 20
-    }
-  ],
+  "conditions": [],
   "items": {
     "minecraft:netherite_pickaxe": 30,
     "minecraft:diamond_pickaxe": 25,

diff --git a/common/src/main/resources/data/mca/gifts/rich_blocks.json b/common/src/main/resources/data/mca/gifts/rich_blocks.json
@@ -1,12 +1,51 @@
 {
-  "conditions": [],
+  "conditions": [
+    {
+      "personality": "Greedy",
+      "satisfaction_boost": 15
+    }
+  ],
   "items": {
     "minecraft:netherite_block": 100,
     "minecraft:diamond_block": 80,
     "minecraft:emerald_block": 60,
     "minecraft:gold_block": 60,
     "minecraft:iron_block": 40,
     "minecraft:lapis_block": 40,
+    "minecraft:waxed_cut_copper": 30,
+    "minecraft:waxed_cut_copper_stairs": 30,
+    "minecraft:waxed_cut_copper_slab": 30,
+    "minecraft:cut_copper": 25,
+    "minecraft:cut_copper_stairs": 25,
+    "minecraft:cut_copper_slab": 25,
+    "minecraft:waxed_copper_block": 20,
+    "minecraft:copper_block": 15,
+    "minecraft:waxed_exposed_cut_copper": 30,
+    "minecraft:waxed_exposed_cut_copper_stairs": 30,
+    "minecraft:waxed_exposed_cut_copper_slab": 30,
+    "minecraft:exposed_cut_copper": 25,
+    "minecraft:exposed_copper_stairs": 25,
+    "minecraft:exposed_copper_slab": 25,
+    "minecraft:waxed_exposed_copper": 20,
+    "minecraft:exposed_copper": 15,
+    "minecraft:waxed_weathered_cut_copper": 30,
+    "minecraft:waxed_weathered_cut_copper_stairs": 30,
+    "minecraft:waxed_weathered_cut_copper_slab": 30,
+    "minecraft:weathered_cut_copper": 25,
+    "minecraft:weathered_copper_stairs": 25,
+    "minecraft:weathered_copper_slab": 25,
+    "minecraft:waxed_weathered_copper": 20,
+    "minecraft:weathered_copper": 15,
+    "minecraft:waxed_oxidized_cut_copper": 30,
+    "minecraft:waxed_oxidized_cut_copper_stairs": 30,
+    "minecraft:waxed_oxidized_cut_copper_slab": 30,
+    "minecraft:oxidized_cut_copper": 25,
+    "minecraft:oxidized_copper_stairs": 25,
+    "minecraft:oxidized_copper_slab": 25,
+    "minecraft:waxed_oxidized_copper": 20,
+    "minecraft:oxidized_copper": 15,
+    "minecraft:amethyst_block": 30,
+    "minecraft:amethyst_cluster": 20,
     "minecraft:coal_block": 10,
     "mca:rose_gold_block": 50
   }

diff --git a/common/src/main/resources/data/mca/gifts/rich_ores.json b/common/src/main/resources/data/mca/gifts/rich_ores.json
@@ -1,13 +1,20 @@
 {
-  "conditions": [],
+  "conditions": [
+    {
+      "personality": "Greedy",
+      "satisfaction_boost": 15
+    }
+  ],
   "items": {
     "minecraft:netherite_ingot": 30,
     "minecraft:diamond": 25,
     "minecraft:emerald": 20,
-    "minecraft:gold_ingot": 20,
+    "minecraft:gold_ingot": 25,
     "minecraft:iron_ingot": 15,
     "minecraft:lapis_lazuli": 10,
-    "minecraft:coal": 10,
-    "mca:rose_gold_ingot": 25
+    "minecraft:amethyst_shard": 15,
+    "minecraft:copper_ingot": 5,
+    "minecraft:coal": 5,
+    "mca:rose_gold_ingot": 20
   }
 }
diff --git a/common/src/main/resources/data/mca/gifts/shovels.json b/common/src/main/resources/data/mca/gifts/shovels.json
@@ -1,11 +1,11 @@
 {
   "conditions": [],
   "items": {
-    "minecraft:netherite_shovel": 2,
-    "minecraft:diamond_shovel": 2,
-    "minecraft:iron_shovel": 1,
-    "minecraft:golden_shovel": 1,
-    "minecraft:stone_shovel": 1,
+    "minecraft:netherite_shovel": 30,
+    "minecraft:diamond_shovel": 25,
+    "minecraft:iron_shovel": 20,
+    "minecraft:golden_shovel": 15,
+    "minecraft:stone_shovel": 10,
     "minecraft:wooden_shovel": 5
   }
 }
diff --git a/common/src/main/resources/data/mca/gifts/stews.json b/common/src/main/resources/data/mca/gifts/stews.json
@@ -2,7 +2,7 @@
   "conditions": [
     {
       "profession": "minecraft:farmer",
-      "satisfaction_boost": 5
+      "satisfaction_boost": 10
     }
   ],
   "items": {

diff --git a/common/src/main/resources/data/mca/gifts/swords.json b/common/src/main/resources/data/mca/gifts/swords.json
@@ -8,9 +8,13 @@
       "personality": "sensitive",
       "satisfaction_boost": -20
     },
+    {
+      "trait": "tough",
+      "satisfaction_boost": 15
+    },
     {
       "trait": "weak",
-      "satisfaction_boost": -20
+      "satisfaction_boost": -15
     }
   ],
   "responses": {
@@ -21,10 +25,10 @@
   },
   "items": {
     "minecraft:netherite_sword": 30,
-    "minecraft:diamond_sword": 20,
+    "minecraft:diamond_sword": 25,
     "minecraft:iron_sword": 20,
-    "minecraft:golden_sword": 10,
-    "minecraft:stone_sword": 5,
-    "minecraft:wooden_sword": 0
+    "minecraft:golden_sword": 15,
+    "minecraft:stone_sword": 10,
+    "minecraft:wooden_sword": 5
   }
 }
diff --git a/common/src/main/resources/data/mca/gifts/trident.json b/common/src/main/resources/data/mca/gifts/trident.json
@@ -6,6 +6,6 @@
     }
   ],
   "items": {
-    "minecraft:trident": 15
+    "minecraft:trident": 25
   }
 }
diff --git a/common/src/main/resources/data/mca/gifts/woods.json b/common/src/main/resources/data/mca/gifts/woods.json
@@ -2,13 +2,13 @@
   "conditions": [
     {
       "profession": "mca:lumberjack",
-      "satisfaction_boost": 5
+      "satisfaction_boost": 10
     }
   ],
   "items": {
     "#minecraft:crimson_stems": 5,
-    "#minecraft:warped_stems": 4,
-    "#minecraft:planks": 1,
-    "#minecraft:logs": 2
+    "#minecraft:warped_stems": 5,
+    "#minecraft:planks": 5,
+    "#minecraft:logs": 5
   }
 }
diff --git a/common/src/main/resources/data/mca/gifts/wool.json b/common/src/main/resources/data/mca/gifts/wool.json
@@ -7,6 +7,6 @@
   ],
   "items": {
     "#minecraft:carpets": 5,
-    "#minecraft:wool": 3
+    "#minecraft:wool": 5
   }
 }