Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.6.2 COZY #1

Merged
merged 1 commit into from
Jun 11, 2024
Merged

v0.6.2 COZY #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/artificer/powers/artificer/artificer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
},
{
"type": "origins:add_velocity",
"z": 2,
"z": 1,
"space": "local"
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/artificer/powers/artificer/artificer_stun.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"actions": [
{
"type": "origins:add_velocity",
"y": 1,
"y": 0.5,
"space": "local"
},
{
Expand Down
18 changes: 9 additions & 9 deletions data/scorch/functions/shield.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
summon armor_stand ^ ^ ^2 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^ ^1 ^2 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^ ^2 ^2 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^-1 ^ ^2 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^-1 ^1 ^2 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^-1 ^2 ^2 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^1 ^ ^2 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^1 ^1 ^2 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^1 ^2 ^2 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^ ^ ^1.25 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^ ^1 ^1.25 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^ ^2 ^1.25 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^-1 ^ ^1.25 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^-1 ^1 ^1.25 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^-1 ^2 ^1.25 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^1 ^ ^1.25 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^1 ^1 ^1.25 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
summon armor_stand ^1 ^2 ^1.25 {NoGravity:1b,Tags:["flame_shield"],Invisible:1b}
power grant @e[tag=flame_shield] scorch:armor_stand_shield
1 change: 1 addition & 0 deletions data/scorch/origins/scorch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"powers": [
"scorch:scorch",
"scorch:core",
"scorch:counter",
"scorch:thermite_launcher",
"scorch:firewall",
"scorch:thermal_shield",
Expand Down
1 change: 0 additions & 1 deletion data/scorch/origins/titan_kits/counter_ready.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"name": "Counter Ready",
"unchoosable": true,
"description": "Have your Counter ready on spawn",
"icon": "minecraft:lightning_rod",
"loading_priority": 1,
Expand Down
62 changes: 62 additions & 0 deletions data/scorch/powers/armor_stand_counter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"type": "origins:multiple",
"counter": {
"type": "origins:action_over_time",
"interval": 10,
"entity_action": {
"type": "origins:and",
"actions": [
{
"type": "origins:area_of_effect",
"shape": "cube",
"radius": 8,
"bientity_action": {
"type": "origins:and",
"actions": [
{
"type": "origins:target_action",
"action": {
"type": "origins:damage",
"damage_type": "minecraft:magic",
"amount": 2,
"source": {
"bypasses_armor": true,
"fire": false,
"magic": false,
"unblockable": true,
"name": "magic"
}
}
}
]
},
"bientity_condition": {
"type": "origins:target_condition",
"condition": {
"type": "origins:origin",
"origin": "scorch:scorch",
"layer": "origins:origin",
"inverted": true
}
}
},
{
"type": "origins:execute_command",
"command": "particle minecraft:campfire_cosy_smoke ~ ~ ~ 2.5 2 2.5 0 50"
},
{
"type": "origins:execute_command",
"command": "particle minecraft:electric_spark ~ ~ ~ 2.5 2 2.5 0 50"
},
{
"type": "origins:delay",
"ticks": 160,
"action": {
"type": "origins:execute_command",
"command": "kill @s"
}
}
]
}
}
}
11 changes: 9 additions & 2 deletions data/scorch/powers/armor_stand_shield.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,16 @@
"actions": [
{
"type": "origins:damage",
"amount": 20,
"amount": 10,
"damage_type": "minecraft:lava",
"source": { "fire": true, "name": "shield" }
"source": {
"fire": true,
"bypasses_armor": false,
"out_of_world": false,
"magic": false,
"unblockable": false,
"name": "shield"
}
},
{
"type": "origins:set_on_fire",
Expand Down
2 changes: 1 addition & 1 deletion data/scorch/powers/armor_stand_trap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"type": "origins:target_action",
"action": {
"type": "origins:damage",
"amount": 10,
"amount": 5,
"damage_type": "minecraft:lava",
"source": {
"fire": true,
Expand Down
32 changes: 32 additions & 0 deletions data/scorch/powers/core.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,37 @@
"resource": "*:core_core_bar"
}
}
},
"grant_counter": {
"type": "origins:action_over_time",
"interval": 20,
"entity_action": {
"type": "origins:and",
"actions": [
{
"type": "origins:change_resource",
"resource": "*:counter_counter",
"change": 1,
"operation": "add"
}
]
},
"condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:resource",
"compare_to": 30,
"comparison": "==",
"resource": "*:*_core_bar"
},
{
"type": "origins:resource",
"compare_to": 1,
"comparison": "!=",
"resource": "*:counter_counter"
}
]
}
}
}
76 changes: 76 additions & 0 deletions data/scorch/powers/counter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"name": "Counter",
"description": "After charging your core enough you are given a counter, repelling enemys",
"type": "origins:multiple",
"counter_active": {
"type": "origins:active_self",
"key": {
"key": "key.loadToolbarActivator"
},
"entity_action": {
"type": "origins:spawn_entity",
"entity_type": "minecraft:armor_stand",
"tag": "{Tags:[\"Counter\"],Invisible:1b}",
"entity_action": {
"type": "origins:and",
"actions": [
{
"type": "origins:grant_power",
"power": "scorch:armor_stand_counter",
"source": "scorch:counter"
}
]
}
}
},
"counter": {
"type": "origins:resource",
"max": 1,
"min": 0,
"hud_render": {
"should_render": true,
"bar_index": 2,
"sprite_location": "origins:textures/gui/resource_bar.png"
}
},
"counter_action": {
"type": "origins:active_self",
"key": {
"key": "key.loadToolbarActivator"
},
"entity_action": {
"type": "origins:and",
"actions": [
{
"type": "origins:change_resource",
"change": 5,
"operation": "add",
"resource": "*:core_core_bar"
},
{
"type": "origins:change_resource",
"change": 0,
"operation": "set",
"resource": "*:*_counter"
}
]
}
},
"condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:resource",
"compare_to": 100,
"comparison": "<",
"resource": "*:core_core_bar"
},
{
"type": "origins:resource",
"compare_to": 1,
"comparison": "!=",
"resource": "*:*_counter"
}
]
}
}
23 changes: 22 additions & 1 deletion data/scorch/powers/titan_kit/counter_ready.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,26 @@
"hidden": true,
"name": "Counter Ready",
"description": "Have your Counter ready on spawn",
"type": "origins:multiple"
"type": "origins:multiple",
"overcore": {
"type": "origins:action_on_callback",
"entity_action_chosen": {
"type": "origins:change_resource",
"resource": "*:counter_counter",
"change": 1,
"operation": "add"
},
"entity_action_added": {
"type": "origins:change_resource",
"resource": "*:counter_counter",
"change": 1,
"operation": "add"
},
"entity_action_respawned": {
"type": "origins:change_resource",
"resource": "*:counter_counter",
"change": 1,
"operation": "add"
}
}
}
2 changes: 1 addition & 1 deletion data/scorch/powers/trap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
},
"recharge": {
"type": "origins:action_over_time",
"interval": 200,
"interval": 300,
"entity_action": {
"type": "origins:change_resource",
"change": 1,
Expand Down