From ef9c8efa70e8eeca16af471278879cd1dbc8f124 Mon Sep 17 00:00:00 2001 From: BlasterM5 <587879+BlasterM5@users.noreply.github.com> Date: Fri, 1 Mar 2024 01:10:59 -0500 Subject: [PATCH] Update LTS to 1.3.4 beta 1 * See main branch for changes --- data/ponyorigins/origin_layers/common.json | 11 +++ .../origin_layers/primary_talent.json | 4 +- .../origin_layers/secondary_talent.json | 4 +- .../ponyorigins/origins/races/abyssinian.json | 2 - data/ponyorigins/origins/races/alicorn.json | 2 - .../origins/races/changedling.json | 2 - .../ponyorigins/origins/races/changeling.json | 2 - data/ponyorigins/origins/races/chaos.json | 2 - .../origins/races/diamond_dog.json | 2 - data/ponyorigins/origins/races/dragon.json | 2 - .../ponyorigins/origins/races/earth_pony.json | 2 - data/ponyorigins/origins/races/goat.json | 2 - data/ponyorigins/origins/races/griffon.json | 2 - .../ponyorigins/origins/races/hippogriff.json | 2 - data/ponyorigins/origins/races/human.json | 4 -- data/ponyorigins/origins/races/kirin.json | 2 - data/ponyorigins/origins/races/minotaur.json | 2 - data/ponyorigins/origins/races/orinthian.json | 2 - data/ponyorigins/origins/races/pegasus.json | 2 - data/ponyorigins/origins/races/seapony.json | 2 - data/ponyorigins/origins/races/thestral.json | 2 - data/ponyorigins/origins/races/umbrum.json | 2 - data/ponyorigins/origins/races/unicorn.json | 2 - data/ponyorigins/origins/races/yak.json | 2 - data/ponyorigins/origins/races/zebra.json | 2 - data/ponyorigins/origins/talents/common.json | 9 +++ .../powers/common/diets/pescavore.json | 68 +++---------------- fabric.mod.json | 2 +- pack.mcmeta | 2 +- 29 files changed, 37 insertions(+), 109 deletions(-) create mode 100644 data/ponyorigins/origin_layers/common.json create mode 100644 data/ponyorigins/origins/talents/common.json diff --git a/data/ponyorigins/origin_layers/common.json b/data/ponyorigins/origin_layers/common.json new file mode 100644 index 0000000..1ba87c9 --- /dev/null +++ b/data/ponyorigins/origin_layers/common.json @@ -0,0 +1,11 @@ +{ + "order": 2, + "origins": [ + "ponyorigins:talents/common" + ], + "enabled": true, + "loading_priority": 1, + "name": "Common", + "default_origin": "ponyorigins:talents/common", + "auto_choose": true +} \ No newline at end of file diff --git a/data/ponyorigins/origin_layers/primary_talent.json b/data/ponyorigins/origin_layers/primary_talent.json index 2b1d4f6..858ef64 100644 --- a/data/ponyorigins/origin_layers/primary_talent.json +++ b/data/ponyorigins/origin_layers/primary_talent.json @@ -1,5 +1,5 @@ { - "order": 2, + "order": 3, "origins": [ { "condition": { @@ -30,7 +30,7 @@ } ], "enabled": true, - "loading_priority": 1, + "loading_priority": 2, "name": "Primary Talent", "gui_title": { "choose_origin": "Choose your Primary (Innate) Talent", diff --git a/data/ponyorigins/origin_layers/secondary_talent.json b/data/ponyorigins/origin_layers/secondary_talent.json index 597a68d..22fa724 100644 --- a/data/ponyorigins/origin_layers/secondary_talent.json +++ b/data/ponyorigins/origin_layers/secondary_talent.json @@ -1,5 +1,5 @@ { - "order": 3, + "order": 4, "origins": [ { "condition": { @@ -595,7 +595,7 @@ } ], "enabled": true, - "loading_priority": 2, + "loading_priority": 3, "name": "Secondary Talent", "gui_title": { "choose_origin": "Choose your Secondary (Cutie Mark) Talent", diff --git a/data/ponyorigins/origins/races/abyssinian.json b/data/ponyorigins/origins/races/abyssinian.json index 063ad35..ec67499 100644 --- a/data/ponyorigins/origins/races/abyssinian.json +++ b/data/ponyorigins/origins/races/abyssinian.json @@ -2,8 +2,6 @@ "name": "Abyssinian", "description": "Anthropomorphic cats from the deserts of Abyssinia.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/carnivore", "ponyorigins:common/nightvision", "origins:fall_immunity", diff --git a/data/ponyorigins/origins/races/alicorn.json b/data/ponyorigins/origins/races/alicorn.json index cc50c84..295672b 100644 --- a/data/ponyorigins/origins/races/alicorn.json +++ b/data/ponyorigins/origins/races/alicorn.json @@ -2,8 +2,6 @@ "name": "Alicorn", "description": "The apex pony race, a legendary combination of all three pony races, able to perform extraordinary feats of power.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/herbivore", "ponyorigins:common/diets/direct_eat", "ponyorigins:common/quadruped", diff --git a/data/ponyorigins/origins/races/changedling.json b/data/ponyorigins/origins/races/changedling.json index 2116b68..dfc9ca3 100644 --- a/data/ponyorigins/origins/races/changedling.json +++ b/data/ponyorigins/origins/races/changedling.json @@ -2,8 +2,6 @@ "name": "Changedling", "description": "A changeling's evolved form, caused by purging the tainted love taken from others and sharing the pure love received by others.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/quadruped", "ponyorigins:common/hooves", "ponyorigins:common/rideable", diff --git a/data/ponyorigins/origins/races/changeling.json b/data/ponyorigins/origins/races/changeling.json index 8672693..b093607 100644 --- a/data/ponyorigins/origins/races/changeling.json +++ b/data/ponyorigins/origins/races/changeling.json @@ -2,8 +2,6 @@ "name": "Changeling", "description": "Insectoid creature that infiltrates pony society and feeds on the love of others to survive.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/emotivore", "ponyorigins:common/quadruped", "ponyorigins:common/hooves", diff --git a/data/ponyorigins/origins/races/chaos.json b/data/ponyorigins/origins/races/chaos.json index fd3b9f9..c77ae7d 100644 --- a/data/ponyorigins/origins/races/chaos.json +++ b/data/ponyorigins/origins/races/chaos.json @@ -2,8 +2,6 @@ "name": "Chaos Creature", "description": "The chaos creature is best described by you, as there is no definitive form a chaos creature takes.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:chaos/chaos", "ponyorigins:chaos/randomizer", "ponyorigins:common/energy" diff --git a/data/ponyorigins/origins/races/diamond_dog.json b/data/ponyorigins/origins/races/diamond_dog.json index 4a8a66e..9d99b1f 100644 --- a/data/ponyorigins/origins/races/diamond_dog.json +++ b/data/ponyorigins/origins/races/diamond_dog.json @@ -2,8 +2,6 @@ "name": "Diamond Dog", "description": "A species of subterranean canines, diamond dogs are adept at digging underground.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/carnivore", "ponyorigins:common/nightvision", "ponyorigins:diamond_dog/dig", diff --git a/data/ponyorigins/origins/races/dragon.json b/data/ponyorigins/origins/races/dragon.json index b8b43fa..fd3798c 100644 --- a/data/ponyorigins/origins/races/dragon.json +++ b/data/ponyorigins/origins/races/dragon.json @@ -2,8 +2,6 @@ "name": "Dragon", "description": "Hatched in lava, born of fire, dragons are an unstoppable force in the world.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/lithovore", "ponyorigins:common/quadruped", "ponyorigins:common/talons", diff --git a/data/ponyorigins/origins/races/earth_pony.json b/data/ponyorigins/origins/races/earth_pony.json index 720b235..020ee35 100644 --- a/data/ponyorigins/origins/races/earth_pony.json +++ b/data/ponyorigins/origins/races/earth_pony.json @@ -2,8 +2,6 @@ "name": "Earth Pony", "description": "The most common pony, the backbone of Equestrian civilization, attuned to the earth.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/herbivore", "ponyorigins:common/diets/direct_eat", "ponyorigins:common/quadruped", diff --git a/data/ponyorigins/origins/races/goat.json b/data/ponyorigins/origins/races/goat.json index 1d4412f..9f4874c 100644 --- a/data/ponyorigins/origins/races/goat.json +++ b/data/ponyorigins/origins/races/goat.json @@ -2,8 +2,6 @@ "name": "Goat", "description": "A mundane denizen of Equestria. Goats can walk along the steepest of surfaces, and eat nearly anything edible.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/goat", "ponyorigins:common/diets/direct_eat", "ponyorigins:common/quadruped", diff --git a/data/ponyorigins/origins/races/griffon.json b/data/ponyorigins/origins/races/griffon.json index c0df382..80c52e1 100644 --- a/data/ponyorigins/origins/races/griffon.json +++ b/data/ponyorigins/origins/races/griffon.json @@ -2,8 +2,6 @@ "name": "Griffon", "description": "Front end of an eagle, back end of a lion, a fearsome predator of the skies.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/carnivore", "ponyorigins:common/quadruped", "ponyorigins:common/talons", diff --git a/data/ponyorigins/origins/races/hippogriff.json b/data/ponyorigins/origins/races/hippogriff.json index f9dddeb..97862d4 100644 --- a/data/ponyorigins/origins/races/hippogriff.json +++ b/data/ponyorigins/origins/races/hippogriff.json @@ -2,8 +2,6 @@ "name": "Hippogriff", "description": "Front end of an osprey, back end of a pony, a friendlier predator of the skies.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/pescavore", "ponyorigins:common/quadruped", "ponyorigins:common/talons", diff --git a/data/ponyorigins/origins/races/human.json b/data/ponyorigins/origins/races/human.json index 2f26d13..25bbbbc 100644 --- a/data/ponyorigins/origins/races/human.json +++ b/data/ponyorigins/origins/races/human.json @@ -1,10 +1,6 @@ { "name": "Human", "description": "A regular human. Your ordinary Minecraft experience awaits.", - "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd" - ], "icon": { "item": "minecraft:grass_block" }, diff --git a/data/ponyorigins/origins/races/kirin.json b/data/ponyorigins/origins/races/kirin.json index 83f8fd0..5239c1d 100644 --- a/data/ponyorigins/origins/races/kirin.json +++ b/data/ponyorigins/origins/races/kirin.json @@ -2,8 +2,6 @@ "name": "Kirin", "description": "Half unicorn, half dragon, the pony race from the East with a heart of fire.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/herbivore", "ponyorigins:common/diets/direct_eat", "ponyorigins:common/quadruped", diff --git a/data/ponyorigins/origins/races/minotaur.json b/data/ponyorigins/origins/races/minotaur.json index 9dd1dec..cc9b26d 100644 --- a/data/ponyorigins/origins/races/minotaur.json +++ b/data/ponyorigins/origins/races/minotaur.json @@ -2,8 +2,6 @@ "name": "Minotaur", "description": "An anthropomorphic creature with the strength and features of a bull and the body shape of a human.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/herbivore", "ponyorigins:common/hooves", "ponyorigins:minotaur/punch", diff --git a/data/ponyorigins/origins/races/orinthian.json b/data/ponyorigins/origins/races/orinthian.json index eb39f80..c9e96dc 100644 --- a/data/ponyorigins/origins/races/orinthian.json +++ b/data/ponyorigins/origins/races/orinthian.json @@ -2,8 +2,6 @@ "name": "Orinthian", "description": "Flightless, anthropomorphic birdlike creatures from Orinthia.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/talons", "origins:slow_falling", "ponyorigins:common/health/minus_two", diff --git a/data/ponyorigins/origins/races/pegasus.json b/data/ponyorigins/origins/races/pegasus.json index 179b9cf..dc70bbb 100644 --- a/data/ponyorigins/origins/races/pegasus.json +++ b/data/ponyorigins/origins/races/pegasus.json @@ -2,8 +2,6 @@ "name": "Pegasus", "description": "The winged pony race, born to fly.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/herbivore", "ponyorigins:common/diets/direct_eat", "ponyorigins:common/quadruped", diff --git a/data/ponyorigins/origins/races/seapony.json b/data/ponyorigins/origins/races/seapony.json index 3d58305..9abeb64 100644 --- a/data/ponyorigins/origins/races/seapony.json +++ b/data/ponyorigins/origins/races/seapony.json @@ -2,8 +2,6 @@ "name": "Seapony", "description": "The underwater pony race, masters of the sea. Automatically transforms into an Earth Pony when exiting the water.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/waterborn", "ponyorigins:common/diets/pescavore", "ponyorigins:common/quadruped", diff --git a/data/ponyorigins/origins/races/thestral.json b/data/ponyorigins/origins/races/thestral.json index f714c36..42970db 100644 --- a/data/ponyorigins/origins/races/thestral.json +++ b/data/ponyorigins/origins/races/thestral.json @@ -2,8 +2,6 @@ "name": "Thestral", "description": "The fly by night pony race, home to Equestria's caves.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/fructivore", "ponyorigins:common/quadruped", "ponyorigins:common/hooves", diff --git a/data/ponyorigins/origins/races/umbrum.json b/data/ponyorigins/origins/races/umbrum.json index d492214..17da3db 100644 --- a/data/ponyorigins/origins/races/umbrum.json +++ b/data/ponyorigins/origins/races/umbrum.json @@ -2,8 +2,6 @@ "name": "Umbrum", "description": "Unicorn-like shadow wraiths that stalk the dark corners of the world.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/quadruped", "ponyorigins:common/hooves", "ponyorigins:common/rideable", diff --git a/data/ponyorigins/origins/races/unicorn.json b/data/ponyorigins/origins/races/unicorn.json index e320dcc..76dead9 100644 --- a/data/ponyorigins/origins/races/unicorn.json +++ b/data/ponyorigins/origins/races/unicorn.json @@ -2,8 +2,6 @@ "name": "Unicorn", "description": "Home to Equestria's mountains and forests, Unicorns can change the world with their wide range of abilities.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/herbivore", "ponyorigins:common/diets/direct_eat", "ponyorigins:common/quadruped", diff --git a/data/ponyorigins/origins/races/yak.json b/data/ponyorigins/origins/races/yak.json index dab60db..f64d66e 100644 --- a/data/ponyorigins/origins/races/yak.json +++ b/data/ponyorigins/origins/races/yak.json @@ -2,8 +2,6 @@ "name": "Yak", "description": "Hardy creatures from Yakyakistan, yaks pride themselves on their unrelenting strength.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/herbivore", "ponyorigins:common/diets/direct_eat", "ponyorigins:common/quadruped", diff --git a/data/ponyorigins/origins/races/zebra.json b/data/ponyorigins/origins/races/zebra.json index 0aa9b68..6223673 100644 --- a/data/ponyorigins/origins/races/zebra.json +++ b/data/ponyorigins/origins/races/zebra.json @@ -2,8 +2,6 @@ "name": "Zebra", "description": "A culturally distinct race from the land of Zebrica. Similar to an earth pony, and yet, quite different.", "powers": [ - "ponyorigins:common/00", - "ponyorigins:common/orb_cd", "ponyorigins:common/diets/herbivore", "ponyorigins:common/diets/direct_eat", "ponyorigins:common/quadruped", diff --git a/data/ponyorigins/origins/talents/common.json b/data/ponyorigins/origins/talents/common.json new file mode 100644 index 0000000..d3f261b --- /dev/null +++ b/data/ponyorigins/origins/talents/common.json @@ -0,0 +1,9 @@ +{ + "name": "Common", + "description": "Common Powers, used by other powers to do various things", + "powers": [ + "ponyorigins:common/00", + "ponyorigins:common/orb_cd" + ], + "impact": 0 +} \ No newline at end of file diff --git a/data/ponyorigins/powers/common/diets/pescavore.json b/data/ponyorigins/powers/common/diets/pescavore.json index 68c1cb7..4d32ac5 100644 --- a/data/ponyorigins/powers/common/diets/pescavore.json +++ b/data/ponyorigins/powers/common/diets/pescavore.json @@ -123,41 +123,6 @@ "operation": "add" } }, - "not_seafood": { - "type": "origins:modify_food", - "item_condition": { - "inverted": true, - "type": "origins:ingredient", - "ingredient": [ - { - "tag": "minecraft:fishes" - }, - { - "tag": "c:raw_fishes" - }, - { - "tag": "c:cooked_fishes" - }, - { - "tag": "ponyorigins:seafood" - } - ] - }, - "food_modifier": { - "operation": "multiply_total", - "value": -0.5 - }, - "saturation_modifier": { - "operation": "multiply_total", - "value": -0.5 - }, - "entity_action": { - "type": "origins:change_resource", - "resource": "*:*_nutrition", - "change": -1, - "operation": "add" - } - }, "diet_risk_blocks": { "type": "origins:action_on_block_use", "block_condition": { @@ -483,9 +448,6 @@ } ] }, - { - "type": "origins:food" - }, { "inverted": true, "type": "origins:ingredient", @@ -736,28 +698,20 @@ "off_diet_risk": { "type": "origins:modify_food", "item_condition": { - "type": "origins:and", - "conditions": [ + "inverted": true, + "type": "origins:ingredient", + "ingredient": [ { - "inverted": true, - "type": "origins:ingredient", - "ingredient": [ - { - "tag": "minecraft:fishes" - }, - { - "tag": "c:raw_fishes" - }, - { - "tag": "c:cooked_fishes" - }, - { - "tag": "ponyorigins:seafood" - } - ] + "tag": "minecraft:fishes" + }, + { + "tag": "c:raw_fishes" }, { - "type": "origins:food" + "tag": "c:cooked_fishes" + }, + { + "tag": "ponyorigins:seafood" } ] }, diff --git a/fabric.mod.json b/fabric.mod.json index 2741475..adf598d 100644 --- a/fabric.mod.json +++ b/fabric.mod.json @@ -10,7 +10,7 @@ }, "name": "Pony Origins LTS", "id": "ponyorigins", - "version": "1.3.3-b1h2", + "version": "1.3.4-b1", "description": "Origins Replacement Mod, designed to compliment Mine Little Pony.", "license": "Unlicense", "icon": "pack.png", diff --git a/pack.mcmeta b/pack.mcmeta index ba377da..dcd60bc 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -3,7 +3,7 @@ "name": "Pony Origins LTS", "id": "ponyorigins", "pack_format": 10, - "version": "1.3.3-b1h2", + "version": "1.3.4-b1", "authors": [ "BlasterM5" ],