From eb430aa7899655f3af7d5b48e48e04a9dd91550f Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Thu, 23 Jan 2025 22:03:51 +0200 Subject: [PATCH] fixed ectoplasm and probably got the game to shut op about missing textures --- .../textures/models/armor/robes_layer_1.png | Bin 0 -> 1589 bytes .../textures/models/armor/robes_layer_2.png | Bin 0 -> 1589 bytes .../powers/lato-powers/sun_damage.json | 52 +++---- .../powers/spirit-powers/ectodiff.json | 134 ++++++++++-------- 4 files changed, 100 insertions(+), 86 deletions(-) create mode 100755 src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_1.png create mode 100755 src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_2.png diff --git a/src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_1.png b/src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_1.png new file mode 100755 index 0000000000000000000000000000000000000000..d42a75f9421f2497a2a4fcd0bd9ded02fa133127 GIT binary patch literal 1589 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP<#}OhQNpofz1YAIzSnvB*-uL|HuXm!Qa_cfeC@Lz$3Dlfq`!?2s66>p0E}u zC|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*A)6lZz5IEGZjy}h6aEPZ%d v4t&-BYrLhwxFWBJcR|!B8mJKX#CV%Ii=Xe)o~6r+KpEZB)z4*}Q$iB}=5w@- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_2.png b/src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_2.png new file mode 100755 index 0000000000000000000000000000000000000000..d42a75f9421f2497a2a4fcd0bd9ded02fa133127 GIT binary patch literal 1589 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP<#}OhQNpofz1YAIzSnvB*-uL|HuXm!Qa_cfeC@Lz$3Dlfq`!?2s66>p0E}u zC|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*A)6lZz5IEGZjy}h6aEPZ%d v4t&-BYrLhwxFWBJcR|!B8mJKX#CV%Ii=Xe)o~6r+KpEZB)z4*}Q$iB}=5w@- literal 0 HcmV?d00001 diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/sun_damage.json b/src/main/resources/data/terraoriginum/powers/lato-powers/sun_damage.json index a987ec8..7e20e1e 100644 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/sun_damage.json +++ b/src/main/resources/data/terraoriginum/powers/lato-powers/sun_damage.json @@ -1,37 +1,37 @@ { - "condition": { - "type": "origins:and", - "conditions": [ - { - "inverted": true, - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "weapon.mainhand", - "weapon.offhand" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:umbrella" - } + "condition": { + "type": "origins:and", + "conditions": [ + { + "inverted": true, + "type": "origins:inventory", + "process_mode": "items", + "slots": [ + "weapon.mainhand", + "weapon.offhand" + ], + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "item": "terraoriginum:umbrella" + } + } + }, + { + "type": "origins:exposed_to_sun" } - }, - { - "type": "origins:exposed_to_sun" - } - ] - }, + ] + }, "type": "origins:damage_over_time", "interval": 15, "onset_delay": 1, "damage": 3, "damage_easy": 2, "damage_source": { - "name": "terraoriginum:burn_in_sun", - "unblockable": true, - "bypasses_armor": true + "name": "terraoriginum:burn_in_sun", + "unblockable": true, + "bypasses_armor": true }, "protection_enchantment": "terraoriginum:sun_protection", "protection_effectiveness": 1.1 - } \ No newline at end of file +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json index e24bafd..e5790f3 100644 --- a/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json +++ b/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json @@ -4,6 +4,76 @@ "entity_action": { "type": "origins:if_else_list", "actions": [ + { + "condition": { + "type": "origins:and", + "conditions": [ + { + "type": "origins:inventory", + "process_mode": "items", + "slots": [ + "armor.head" + ], + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "item": "terraoriginum:ghostly_helmet" + } + } + }, + { + "type": "origins:inventory", + "process_mode": "items", + "slots": [ + "armor.chest" + ], + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "item": "terraoriginum:ghostly_chestplate" + } + } + }, + { + "type": "origins:inventory", + "process_mode": "items", + "slots": [ + "armor.legs" + ], + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "item": "terraoriginum:ghostly_leggings" + } + } + }, + { + "type": "origins:inventory", + "process_mode": "items", + "slots": [ + "armor.feet" + ], + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "item": "terraoriginum:ghostly_boots" + } + } + } + ] + }, + "action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:change_resource", + "resource": "terraoriginum:spirit-powers/ectoplasm", + "change": 2, + "operation": "add" + } + ] + } + }, { "condition": { "type": "origins:brightness", @@ -24,71 +94,15 @@ }, { "condition": { - "type": "origins:and", - "conditions":[ + "type": "origins:or", + "conditions": [ { "type": "origins:brightness", "comparison": "<=", "compare_to": 0.17948718 - }, - { - "inverted": true, - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "armor.head" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:ghostly_helmet" - } - } - }, - { - "inverted": true, - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "armor.chest" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:ghostly_chestplate" - } - } - }, - { - "inverted": true, - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "armor.legs" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:ghostly_leggings" - } - } - }, - { - "inverted": true, - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "armor.feet" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:ghostly_boots" - } } - } - ] - }, + ] + }, "action": { "type": "origins:and", "actions": [