Merge branch 'cosmo-main'

src/main/resources/assets/terraoriginum/lang/en_us.json

@@ -195,7 +195,7 @@
     "power.terraoriginum.florian-powers/photosynthesis.name": "Photosynthesis",
     "power.terraoriginum.florian-powers/photosynthesis.description": "You are satiated when in the sun.",
     "power.terraoriginum.florian-powers/pocket_sand.name": "Pocket Sand",
-    "power.terraoriginum.florian-powers/pocket_sand.description": "As a protective measure, you keep sand in your pocket to temporarily blind an attacker",
+    "power.terraoriginum.florian-powers/pocket_sand.description": "As a protective measure, you keep sand in your pocket to temporarily blind an attacker.",
     "power.terraoriginum.florian-powers/aura_of_growth.name": "Growth Aura",
     "power.terraoriginum.florian-powers/aura_of_growth.description": "Crops around you grow at a faster rate.",
     "power.terraoriginum.florian-powers/bonemeal.name": "Bonemeal Body",
@@ -226,26 +226,26 @@
     //-----Monarch-----//
     "origin.terraoriginum.monarch.name": "Monarch",
     "origin.terraoriginum.monarch.description": "A prideful race that have bioengineered themselves to draw energy directly from the sun.",
-    "power.terraoriginum.monarchpowers/hyperefficient_blood.name": "Hyperefficient Blood",
+    "power.terraoriginum.monarch-powers/hyperefficient_blood.name": "Hyperefficient Blood",
-    "power.terraoriginum.monarchpowers/hyperefficient_blood.description": "Your blood is extremely efficient, destroying any poisons within your bloodstream before they have a chance to do any damage",
+    "power.terraoriginum.monarch-powers/hyperefficient_blood.description": "Your blood is extremely efficient, destroying any poisons within your bloodstream before they have a chance to do any damage",
-    "power.terraoriginum.monarchpowers/solar_energy.name": "Solar Energy",
+    "power.terraoriginum.monarch-powers/solar_energy.name": "Solar Energy",
-    "power.terraoriginum.monarchpowers/solar_energy.description": "You draw energy from the sun and store it within your body, and access it at will to use various abilities. But if you run out, your body will no longer be able to keep itself together",
+    "power.terraoriginum.monarch-powers/solar_energy.description": "You draw energy from the sun and store it within your body, and access it at will to use various abilities. But if you run out, your body will no longer be able to keep itself together",
-    "power.terraoriginum.monarchpowers/sun_fueled.name": "Sun Fueled",
+    "power.terraoriginum.monarch-powers/sun_fueled.name": "Sun Fueled",
-    "power.terraoriginum.monarchpowers/sun_fueled.description": "You have evolved to draw power from the sun, leading you to become more powerful during the day",
+    "power.terraoriginum.monarch-powers/sun_fueled.description": "You have evolved to draw power from the sun, leading you to become more powerful during the day",
-    "power.terraoriginum.monarchpowers/nuclear_rush.name": "Nuclear Rush",
+    "power.terraoriginum.monarch-powers/nuclear_rush.name": "Nuclear Rush",
-    "power.terraoriginum.monarchpowers/nuclear_rush.description": "using the sun energy stored within your body, you can temporarily start a weak thermonuclear reaction, pushing your body beyond the limitations of living flesh.",
+    "power.terraoriginum.monarch-powers/nuclear_rush.description": "using the sun energy stored within your body, you can temporarily start a weak thermonuclear reaction, pushing your body beyond the limitations of living flesh.",
-    "power.terraoriginum.monarchpowers/instant_transmission.name": "Instant Transmission",
+    "power.terraoriginum.monarch-powers/instant_transmission.name": "Instant Transmission",
-    "power.terraoriginum.monarchpowers/instant_transmission.description": "Use the thermonuclear energy stored in your body to erase the space between you and your target",
+    "power.terraoriginum.monarch-powers/instant_transmission.description": "Use the thermonuclear energy stored in your body to erase the space between you and your target",
-    "power.terraoriginum.monarchpowers/nyctophobia.name": "Nyctophobia",
+    "power.terraoriginum.monarch-powers/nyctophobia.name": "Nyctophobia",
-    "power.terraoriginum.monarchpowers/nyctophobia.description": "Your power is derived from the sun, making you weaker during the night",
+    "power.terraoriginum.monarch-powers/nyctophobia.description": "Your power is derived from the sun, making you weaker during the night",
-    "power.terraoriginum.monarchpowers/shining.name": "Shining",
+    "power.terraoriginum.monarch-powers/shining.name": "Shining",
-    "power.terraoriginum.monarchpowers/shining.description": "An entire lifetime of absorbing the sun's energy makes you radiate its light",
+    "power.terraoriginum.monarch-powers/shining.description": "An entire lifetime of absorbing the sun's energy makes you radiate its light",
-    "power.terraoriginum.monarchpowers/super_dash.name": "Super Dash",
+    "power.terraoriginum.monarch-powers/super_dash.name": "Super Dash",
-    "power.terraoriginum.monarchpowers/super_dash.description": "release a large portion of the solar energy stored within your body to create a large amount of thrust in whatever direction you are facing",
+    "power.terraoriginum.monarch-powers/super_dash.description": "release a large portion of the solar energy stored within your body to create a large amount of thrust in whatever direction you are facing",
-    "power.terraoriginum.monarchpowers/hydropetrification.name": "Hydropetrification",
+    "power.terraoriginum.monarch-powers/hydropetrification.name": "Hydropetrification",
-    "power.terraoriginum.monarchpowers/hydropetrification.description": "Your body's cells contain a high concentration of neutrinos to facilitate nuclear processes whithin itself, this causes your entire body to heavily slow down underwater",
+    "power.terraoriginum.monarch-powers/hydropetrification.description": "Your body's cells contain a high concentration of neutrinos to facilitate nuclear processes whithin itself, this causes your entire body to heavily slow down underwater",
-    "power.terraoriginum.monarchpowers/totem_fueled.name": "Totem Fueled",
+    "power.terraoriginum.monarch-powers/totem_fueled.name": "Totem Fueled",
-    "power.terraoriginum.monarchpowers/totem_fueled.description": "Craft a Sun Totem and hold it to get small amounts of sun energy even outside the sun",
+    "power.terraoriginum.monarch-powers/totem_fueled.description": "Craft a Sun Totem and hold it to get small amounts of sun energy even outside the sun",
 
     //-----Blight-----//
     "origin.terraoriginum.blight.name": "Blight",

src/main/resources/data/terraoriginum/powers/monarch-powers/nyctophobia.json

@@ -1,9 +1,29 @@
 {
   "type": "origins:action_over_time",
   "condition": {
+    "type": "origins:and",
+    "conditions": [
+    {
       "type": "origins:daytime",
       "inverted": true
     },
+    {
+      "type": "origins:inventory",
+      "inverted": true,
+            "process_mode": "items",
+            "slots": [
+              "weapon.mainhand",
+              "weapon.offhand"
+            ],
+            "item_condition": {
+              "type": "origins:ingredient",
+              "ingredient": {
+                "item": "terraoriginum:sun_totem"
+              }
+            }
+    }
+  ]
+},
     "entity_action": {
       "type": "origins:and",
       "actions": [{

src/main/resources/data/terraoriginum/powers/monarch-powers/solar_energy.json

@@ -2,7 +2,7 @@
     "type": "origins:resource",
     "min": 0,
     "max": 400,
-    "start_value": 10,
+    "start_value": 60,
     "hud_render": {
         "should_render": true,
         "sprite_location": "origins:textures/gui/community/huang/resource_bar_01.png",