Merge branch 'cosmo-main' of https://github.com/BigGaemer/terra-originum into cosmo-main

This commit is contained in:
CosmoOrSth
2025-01-24 01:52:27 +05:30
4 changed files with 100 additions and 86 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@@ -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
}
}

View File

@@ -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": [