Skip to content

Commit 7d338b9

Browse files
committed
why do i use git for things that don't need it? // AreMine and modifications
1 parent 13b5dd6 commit 7d338b9

File tree

10 files changed

+135
-17
lines changed

10 files changed

+135
-17
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"name": "Flying Squirrel",
3+
"description": "The Flying Squirrel has great mobility. It also does other stuff ig.",
4+
"powers": [
5+
"origins:more_exhaustion",
6+
"customsmp:climbing",
7+
"customsmp:speed",
8+
"origins:elytra",
9+
"origins:fall_immunity",
10+
"origins:vegetarian",
11+
"origins:velvet_paws",
12+
"customsmp:very_small",
13+
"customsmp:jump",
14+
"origins:cat_vision",
15+
"customsmp:sunlight",
16+
"customsmp:jump_boost",
17+
"customsmp:frail_body"
18+
],
19+
"icon": {
20+
"item": "oak_sapling",
21+
"amount": 1
22+
},
23+
"impact": 2
24+
}

src/main/resources/data/customsmp/origins/nue.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "Nue",
33
"description": "The Nue is a yokai made of various animals that has super-natural powers",
44
"powers": [
5-
"customsmp:arrows_hurt",
65
"customsmp:blinding",
76
"customsmp:night_swimming",
87
"customsmp:photosensitivity",

src/main/resources/data/customsmp/powers/bite.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,8 @@
3333
"cooldown": 1,
3434
"type": "origins:self_action_on_hit",
3535
"entity_action": {
36-
"type": "origins:delay",
37-
"tick": 1,
38-
"action": {
39-
"type": "origins:toggle",
40-
"power": "customsmp:bite_toggle"
41-
}
36+
"type": "origins:toggle",
37+
"power": "customsmp:bite_toggle"
4238
},
4339
"condition": {
4440
"type": "origins:and",

src/main/resources/data/customsmp/powers/climbing.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"name": "Climbing",
3+
"description": "You can climb thing with your little arms!",
24
"type": "origins:climbing",
35
"hold_condition": {
46
"type": "origins:or",

src/main/resources/data/customsmp/powers/moonlight.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Moonlight",
3-
"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.",
3+
"description": "You get night vision and speed II at night.",
44
"type": "origins:multiple",
55
"night_vision": {
66
"condition": {
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"name": "Glows at night",
3+
"description": "I think you know what this does",
4+
"type": "origins:action_over_time",
5+
"condition": {
6+
"inverted": true,
7+
"type": "origins:daytime"
8+
},
9+
"entity_action": {
10+
"type": "origins:apply_effect",
11+
"effect": {
12+
"effect": "minecraft:glowing",
13+
"amplifier": 0,
14+
"duration": 100
15+
}
16+
},
17+
"interval": 80
18+
}

src/main/resources/data/customsmp/powers/only_heavy_armor.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
"head": {
77
"type": "origins:armor_value",
88
"inverted": false,
9-
"comparison": "<=",
10-
"compare_to": 2
9+
"comparison": "<",
10+
"compare_to": 3
1111
},
1212
"chest": {
1313
"type": "origins:or",
14+
"inverted": true,
1415
"conditions": [
1516
{
1617
"type": "origins:armor_value",
1718
"inverted": false,
18-
"comparison": "<=",
19-
"compare_to": 7
19+
"comparison": ">=",
20+
"compare_to": 8
2021
},
2122
{
2223
"type": "origins:ingredient",
23-
"inverted": "true",
2424
"ingredient": {
2525
"item": "minecraft:elytra"
2626
}
@@ -32,14 +32,14 @@
3232
"legs": {
3333
"type": "origins:armor_value",
3434
"inverted": false,
35-
"comparison": "<=",
36-
"compare_to": 5
35+
"comparison": "<",
36+
"compare_to": 6
3737
},
3838
"feet": {
3939
"type": "origins:armor_value",
4040
"inverted": false,
41-
"comparison": "<=",
42-
"compare_to": 2
41+
"comparison": "<",
42+
"compare_to": 3
4343
}
4444

4545
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"name": "Moonlight",
3+
"description": "You get slowness I and weakness 1 in the day.",
4+
"type": "origins:multiple",
5+
"slowness": {
6+
"type": "origins:stacking_status_effect",
7+
"min_stacks": 0,
8+
"max_stacks": 1,
9+
"duration_per_stack": 60,
10+
"tick_rate": 20,
11+
"effect": {
12+
"effect": "minecraft:slowness",
13+
"is_ambient": true,
14+
"amplifier": 0,
15+
"show_particles": true,
16+
"show_icon": true
17+
},
18+
"condition": {
19+
"type": "origins:daytime"
20+
}
21+
},
22+
"weakness": {
23+
"type": "origins:stacking_status_effect",
24+
"min_stacks": 0,
25+
"max_stacks": 1,
26+
"duration_per_stack": 60,
27+
"tick_rate": 20,
28+
"effect": {
29+
"effect": "minecraft:weakness",
30+
"is_ambient": true,
31+
"amplifier": 0,
32+
"show_particles": true,
33+
"show_icon": true
34+
},
35+
"condition": {
36+
"type": "origins:daytime"
37+
}
38+
}
39+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"name": "Short",
3+
"description": "I hate midgets.",
4+
"type": "origins:action_on_callback",
5+
"entity_action_chosen": {
6+
"type": "origins:and",
7+
"actions": [
8+
{
9+
"type": "origins:execute_command",
10+
"command": "scale set pehkui:height 0.25"
11+
},
12+
{
13+
"type": "origins:execute_command",
14+
"command": "scale set pehkui:width 0.25"
15+
},
16+
{
17+
"type": "origins:execute_command",
18+
"command": "scale persist set true"
19+
}
20+
]
21+
},
22+
"entity_action_lost": {
23+
"type": "origins:and",
24+
"actions": [
25+
{
26+
"type": "origins:execute_command",
27+
"command": "scale set pehkui:height 1"
28+
},
29+
{
30+
"type": "origins:execute_command",
31+
"command": "scale set pehkui:width 1"
32+
},
33+
{
34+
"type": "origins:execute_command",
35+
"command": "scale persist set false"
36+
}
37+
]
38+
}
39+
}

src/main/resources/data/origins/origin_layers/origin.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"customsmp:locator",
99
"customsmp:panda",
1010
"customsmp:winged_cat",
11+
"customsmp:flying_squirrel",
1112
"customsmp:seagull",
1213
"customsmp:village_overseer",
1314
"origins:phantom"

0 commit comments

Comments
 (0)