why do i use git for things that don't need it? // AreMine and modifi…

…cations
row454 · Nov 29, 2021 · 7d338b9 · 7d338b9
1 parent 13b5dd6
commit 7d338b9
Show file tree

Hide file tree

Showing 10 changed files with 135 additions and 17 deletions.
diff --git a/src/main/resources/data/customsmp/origins/flying_squirrel.json b/src/main/resources/data/customsmp/origins/flying_squirrel.json
@@ -0,0 +1,24 @@
+{
+    "name": "Flying Squirrel",
+    "description": "The Flying Squirrel has great mobility. It also does other stuff ig.",
+    "powers": [
+        "origins:more_exhaustion",
+        "customsmp:climbing",
+        "customsmp:speed",
+        "origins:elytra",
+        "origins:fall_immunity",
+        "origins:vegetarian",
+        "origins:velvet_paws",
+        "customsmp:very_small",
+        "customsmp:jump",
+        "origins:cat_vision",
+        "customsmp:sunlight",
+        "customsmp:jump_boost",
+        "customsmp:frail_body"
+    ],
+    "icon": {
+        "item": "oak_sapling",
+        "amount": 1
+    },
+    "impact": 2
+}
diff --git a/src/main/resources/data/customsmp/origins/nue.json b/src/main/resources/data/customsmp/origins/nue.json
@@ -2,7 +2,6 @@
     "name": "Nue",
     "description": "The Nue is a yokai made of various animals that has super-natural powers",
     "powers": [
-        "customsmp:arrows_hurt",
         "customsmp:blinding",
         "customsmp:night_swimming",
         "customsmp:photosensitivity",

diff --git a/src/main/resources/data/customsmp/powers/bite.json b/src/main/resources/data/customsmp/powers/bite.json
@@ -33,12 +33,8 @@
         "cooldown": 1,
         "type": "origins:self_action_on_hit",
         "entity_action": {
-            "type": "origins:delay",
-            "tick": 1,
-            "action": {
-                "type": "origins:toggle",
-                "power": "customsmp:bite_toggle"
-            }
+            "type": "origins:toggle",
+            "power": "customsmp:bite_toggle"
         },
         "condition": {
             "type": "origins:and",

diff --git a/src/main/resources/data/customsmp/powers/climbing.json b/src/main/resources/data/customsmp/powers/climbing.json
@@ -1,4 +1,6 @@
 {
+  "name": "Climbing",
+  "description": "You can climb thing with your little arms!",
   "type": "origins:climbing",
   "hold_condition": {
     "type": "origins:or",

diff --git a/src/main/resources/data/customsmp/powers/moonlight.json b/src/main/resources/data/customsmp/powers/moonlight.json
@@ -1,6 +1,6 @@
 {
     "name": "Moonlight",
-    "description": "The moon reminds you of the infinite expanse of space and time making him understand more about life. You get night vision and speed II at night.",
+    "description": "You get night vision and speed II at night.",
     "type": "origins:multiple",
     "night_vision": {
         "condition": {

diff --git a/src/main/resources/data/customsmp/powers/night_glowing.json b/src/main/resources/data/customsmp/powers/night_glowing.json
@@ -0,0 +1,18 @@
+{
+    "name": "Glows at night",
+    "description": "I think you know what this does",
+    "type": "origins:action_over_time",
+    "condition": {
+        "inverted": true,
+        "type": "origins:daytime"
+    },
+    "entity_action": {
+        "type": "origins:apply_effect",
+        "effect": {
+            "effect": "minecraft:glowing",
+            "amplifier": 0,
+            "duration": 100
+        }
+    },
+    "interval": 80
+}
diff --git a/src/main/resources/data/customsmp/powers/only_heavy_armor.json b/src/main/resources/data/customsmp/powers/only_heavy_armor.json
@@ -6,21 +6,21 @@
     "head": {
         "type": "origins:armor_value",
         "inverted": false,
-        "comparison": "<=",
-        "compare_to": 2
+        "comparison": "<",
+        "compare_to": 3
     },
     "chest": {
 		"type": "origins:or",
+        "inverted": true,
 		"conditions": [
 			{
 				"type": "origins:armor_value",
 				"inverted": false,
-				"comparison": "<=",
-				"compare_to": 7
+				"comparison": ">=",
+				"compare_to": 8
 			},
 			{
 				"type": "origins:ingredient",
-				"inverted": "true",
 				"ingredient": {
 						"item": "minecraft:elytra"
 				}
@@ -32,14 +32,14 @@
     "legs": {
         "type": "origins:armor_value",
         "inverted": false,
-        "comparison": "<=",
-        "compare_to": 5
+        "comparison": "<",
+        "compare_to": 6
     },
     "feet": {
         "type": "origins:armor_value",
         "inverted": false,
-        "comparison": "<=",
-        "compare_to": 2
+        "comparison": "<",
+        "compare_to": 3
     }
 
 }
diff --git a/src/main/resources/data/customsmp/powers/sunlight.json b/src/main/resources/data/customsmp/powers/sunlight.json
@@ -0,0 +1,39 @@
+{
+    "name": "Moonlight",
+    "description": "You get slowness I and weakness 1 in the day.",
+    "type": "origins:multiple",
+    "slowness": {
+        "type": "origins:stacking_status_effect",
+        "min_stacks": 0,
+        "max_stacks": 1,
+        "duration_per_stack": 60,
+        "tick_rate": 20,
+        "effect": {
+            "effect": "minecraft:slowness",
+            "is_ambient": true,
+            "amplifier": 0,
+            "show_particles": true,
+            "show_icon": true
+        },
+        "condition": {
+            "type": "origins:daytime"
+        }
+    },
+    "weakness": {
+        "type": "origins:stacking_status_effect",
+        "min_stacks": 0,
+        "max_stacks": 1,
+        "duration_per_stack": 60,
+        "tick_rate": 20,
+        "effect": {
+            "effect": "minecraft:weakness",
+            "is_ambient": true,
+            "amplifier": 0,
+            "show_particles": true,
+            "show_icon": true
+        },
+        "condition": {
+            "type": "origins:daytime"
+        }
+    }
+}
diff --git a/src/main/resources/data/customsmp/powers/very_small.json b/src/main/resources/data/customsmp/powers/very_small.json
@@ -0,0 +1,39 @@
+{
+    "name": "Short",
+    "description": "I hate midgets.",
+    "type": "origins:action_on_callback",
+    "entity_action_chosen": {
+        "type": "origins:and",
+        "actions": [
+            {
+                "type": "origins:execute_command",
+                "command": "scale set pehkui:height 0.25"
+            },
+            {
+                "type": "origins:execute_command",
+                "command": "scale set pehkui:width 0.25"
+            },
+            {
+                "type": "origins:execute_command",
+                "command": "scale persist set true"
+            }
+        ]
+    },
+    "entity_action_lost": {
+        "type": "origins:and",
+        "actions": [
+            {
+                "type": "origins:execute_command",
+                "command": "scale set pehkui:height 1"
+            },
+            {
+                "type": "origins:execute_command",
+                "command": "scale set pehkui:width 1"
+            },
+            {
+                "type": "origins:execute_command",
+                "command": "scale persist set false"
+            }
+        ]
+    }
+}
diff --git a/src/main/resources/data/origins/origin_layers/origin.json b/src/main/resources/data/origins/origin_layers/origin.json
@@ -8,6 +8,7 @@
     "customsmp:locator",
     "customsmp:panda",
     "customsmp:winged_cat",
+    "customsmp:flying_squirrel",
     "customsmp:seagull",
     "customsmp:village_overseer",
     "origins:phantom"