diff --git a/config/paxi/datapacks/InchlingOrigin/data/inchlingorigin/origins/inchling.json b/config/paxi/datapacks/InchlingOrigin/data/inchlingorigin/origins/inchling.json new file mode 100644 index 0000000..a2eaafc --- /dev/null +++ b/config/paxi/datapacks/InchlingOrigin/data/inchlingorigin/origins/inchling.json @@ -0,0 +1,12 @@ +{ + "name": "Inchling", + "description": "Of the shining needle.", + "icon": { + "item": "minecraft:arrow" + }, + "impact": 2, + "powers": [ + "inchlingorigin:kobito", + "origins:climbing" + ] +} diff --git a/config/paxi/datapacks/InchlingOrigin/data/inchlingorigin/powers/kobito.json b/config/paxi/datapacks/InchlingOrigin/data/inchlingorigin/powers/kobito.json new file mode 100644 index 0000000..a592495 --- /dev/null +++ b/config/paxi/datapacks/InchlingOrigin/data/inchlingorigin/powers/kobito.json @@ -0,0 +1,30 @@ +{ + "name": "Kobito", + "description": "You're tiny!", + "type": "origins:action_on_callback", + "entity_action_chosen": { + "type": "origins:and", + "actions": [ + { + "type": "origins:execute_command", + "command": "scale set pehkui:height 0.25 @s" + }, + { + "type": "origins:execute_command", + "command": "scale set pehkui:width 0.25 @s" + }, + { + "type": "origins:execute_command", + "command": "scale persist set pehkui:height true @s" + }, + { + "type": "origins:execute_command", + "command": "scale persist set pehkui:width true @s" + } + ] + }, + "entity_action_lost": { + "type": "origins:execute_command", + "command": "scale reset @s" + } +} \ No newline at end of file diff --git a/config/paxi/datapacks/InchlingOrigin/data/origins/origin_layers/origin.json b/config/paxi/datapacks/InchlingOrigin/data/origins/origin_layers/origin.json new file mode 100644 index 0000000..38cc292 --- /dev/null +++ b/config/paxi/datapacks/InchlingOrigin/data/origins/origin_layers/origin.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "origins": [ + "inchlingorigin:inchling" + ], + "enabled": true, + "allow_random": true +} \ No newline at end of file diff --git a/config/paxi/datapacks/InchlingOrigin/pack.mcmeta b/config/paxi/datapacks/InchlingOrigin/pack.mcmeta new file mode 100644 index 0000000..1c7649e --- /dev/null +++ b/config/paxi/datapacks/InchlingOrigin/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 15, + "description": "Adds new Inchling origin" + } +} diff --git a/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origin_layers/vocal_class.json b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origin_layers/vocal_class.json new file mode 100644 index 0000000..bc4e3ef --- /dev/null +++ b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origin_layers/vocal_class.json @@ -0,0 +1,13 @@ +{ + "name": "Class", + "origins": [ + "vocalwarfare:unrestrained", + "vocalwarfare:soldier", + "vocalwarfare:swordmaster" + ], + "order": 2, + "enabled": true, + "allow_random": true, + "missing_name": "None", + "missing_description": "You currently don't have a class selected." +} \ No newline at end of file diff --git a/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origins/soldier.json b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origins/soldier.json new file mode 100644 index 0000000..6e5ad9b --- /dev/null +++ b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origins/soldier.json @@ -0,0 +1,13 @@ +{ + "name": "Soldier", + "description": "A master of Vocal Warfare.", + "icon": { + "item": "minecraft:crossbow" + }, + "impact": 2, + "order": 1, + "powers": [ + "vocalwarfare:rumbletussin", + "vocalwarfare:new_school" + ] +} diff --git a/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origins/swordmaster.json b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origins/swordmaster.json new file mode 100644 index 0000000..7763071 --- /dev/null +++ b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origins/swordmaster.json @@ -0,0 +1,13 @@ +{ + "name": "Swordmaster", + "description": "While others asked for a gun pack, you studied the blade.", + "icon": { + "item": "minecraft:wooden_sword" + }, + "impact": 3, + "order": 1, + "powers": [ + "vocalwarfare:ripchordian", + "vocalwarfare:old_school" + ] +} diff --git a/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origins/unrestrained.json b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origins/unrestrained.json new file mode 100644 index 0000000..011816f --- /dev/null +++ b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origins/unrestrained.json @@ -0,0 +1,10 @@ +{ + "name": "Unrestrained", + "description": "Let none doubt your potential. (No effect)", + "icon": { + "item": "minecraft:stone" + }, + "impact": 0, + "order": 0, + "powers": [] +} diff --git a/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/new_school.json b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/new_school.json new file mode 100644 index 0000000..00a37b3 --- /dev/null +++ b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/new_school.json @@ -0,0 +1,17 @@ +{ + "name": "New School", + "description": "You'd never bring a sword to a gunfight. (Disables SlashBlade)", + "type": "origins:damage_over_time", + "interval": 1, + "damage": 999, + "condition": { + "type": "origins:equipped_item", + "equipment_slot": "mainhand", + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "tag": "vocalwarfare:slashblade" + } + } + } +} \ No newline at end of file diff --git a/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/old_school.json b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/old_school.json new file mode 100644 index 0000000..dfbb42f --- /dev/null +++ b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/old_school.json @@ -0,0 +1,17 @@ +{ + "name": "Old School", + "description": "Firearms are for cowards. (Disables TAC:Z)", + "type": "origins:damage_over_time", + "interval": 1, + "damage": 999, + "condition": { + "type": "origins:equipped_item", + "equipment_slot": "mainhand", + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "item": "tacz:modern_kinetic_gun" + } + } + } +} \ No newline at end of file diff --git a/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/ripchordian.json b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/ripchordian.json new file mode 100644 index 0000000..0be9739 --- /dev/null +++ b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/ripchordian.json @@ -0,0 +1,20 @@ +{ + "name": "Ripchordian", + "description": "You have more health. You run faster.", + "type": "origins:multiple", + "attribute_modifiers": { + "type": "origins:attribute", + "modifiers": [ + { + "attribute": "minecraft:generic.max_health", + "operation": "multiply_total", + "value": 0.33 + }, + { + "attribute": "minecraft:generic.movement_speed", + "operation": "addition", + "value": 0.05 + } + ] + } +} \ No newline at end of file diff --git a/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/rumbletussin.json b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/rumbletussin.json new file mode 100644 index 0000000..0353ab1 --- /dev/null +++ b/config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/rumbletussin.json @@ -0,0 +1,20 @@ +{ + "name": "Rümbletussin", + "description": "You tire less. You can regenerate §overy slowly§r.", + "type": "origins:multiple", + "regen": { + "type": "origins:action_over_time", + "interval": 200, + "entity_action": { + "type": "origins:heal", + "amount": 1 + } + }, + "stamina": { + "type": "origins:modify_exhaustion", + "modifier": { + "operation": "multiply_base", + "value": -0.25 + } + } +} \ No newline at end of file diff --git a/config/paxi/datapacks/VocalWarfare/pack.mcmeta b/config/paxi/datapacks/VocalWarfare/pack.mcmeta index fa35fa4..adc7787 100644 --- a/config/paxi/datapacks/VocalWarfare/pack.mcmeta +++ b/config/paxi/datapacks/VocalWarfare/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "pack_format": 15, - "description": "Data pack for FW modpack" + "description": "Data pack for VW modpack" } } diff --git a/index.toml b/index.toml index 5f384b0..bc63680 100644 --- a/index.toml +++ b/index.toml @@ -116,10 +116,58 @@ hash = "ead7084df212c5dd950b31dfe609bc6e9cf02f07267a1c0ab604dd104f596b40" file = "config/paxi/datapacks/ExtendedFeeding/pack.mcmeta" hash = "bd2a241fb29cdb0f8ad2da103d7502e198dd759d3db6c91c0c46c40f7b49d72a" +[[files]] +file = "config/paxi/datapacks/InchlingOrigin/data/inchlingorigin/origins/inchling.json" +hash = "1131223b0ac353d02d9b0be081678465e8a53e7441f302b016f84bf7fb554021" + +[[files]] +file = "config/paxi/datapacks/InchlingOrigin/data/inchlingorigin/powers/kobito.json" +hash = "85530f4795e1246d34e4cfcc6bd573715b8c5e38519a61d57b66ac7c1f0f7727" + +[[files]] +file = "config/paxi/datapacks/InchlingOrigin/data/origins/origin_layers/origin.json" +hash = "b76b5d0f70c30259829c1d28cd0b46815bcbb39b092fd2c02b46b1ccc9b046b1" + +[[files]] +file = "config/paxi/datapacks/InchlingOrigin/pack.mcmeta" +hash = "efc5d4309e27ed36838e8e7b4755e0b8c31015193534cc4e79d7aa0bc1cc0c6b" + [[files]] file = "config/paxi/datapacks/VocalWarfare/data/rats/recipes/assorted_vegetables.json" hash = "5e24b5aaf0a89cc6f4e3cfbabeabac08986ea2a71ee5145ad661497f6e2c6268" +[[files]] +file = "config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origin_layers/vocal_class.json" +hash = "caa1ea68bbd858de8f1ff63fec561faf164d064f21749cc50a5cce6320124204" + +[[files]] +file = "config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origins/soldier.json" +hash = "bcb19e5a3cba60eaae4e2cc83d5dbe4ee930ce5ce292f3a2994c4f196040c40c" + +[[files]] +file = "config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origins/swordmaster.json" +hash = "cdc1ae8d570e620ced81a9b950e8e5c0b9501e28de4f55832ce0f7d45ca089db" + +[[files]] +file = "config/paxi/datapacks/VocalWarfare/data/vocalwarfare/origins/unrestrained.json" +hash = "549c4f80dbbcda8713eed8c6db0476b8b04f1dfbf35b3ccea2e416cf6fc95e2c" + +[[files]] +file = "config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/new_school.json" +hash = "23728a50de16d348560600f9d99e180e848a53ce64394d5966d5225796373a94" + +[[files]] +file = "config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/old_school.json" +hash = "b10c6577b16fcaf2c1a4c6f559a4c9a36683ab03c3520a9ca4e845907a8efa93" + +[[files]] +file = "config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/ripchordian.json" +hash = "f264916abf2e200ca46a2b81d61f63a53cca780aaf1aa46ea07b238bfb65ad99" + +[[files]] +file = "config/paxi/datapacks/VocalWarfare/data/vocalwarfare/powers/rumbletussin.json" +hash = "30bc16f832e616835766eecabfbaa34f203b10d439dbad30190708381490ad66" + [[files]] file = "config/paxi/datapacks/VocalWarfare/data/vocalwarfare/recipes/altar/craft_mikos_shot.json" hash = "f2f59d8e575eea33dc88e9a168cf76cdd3c096ea7360d08c5a51be114994c400" @@ -138,7 +186,7 @@ hash = "2dc284b03a9584b8ab530d4dfebb0cbd3d6d086615670d8a879b34777448b87d" [[files]] file = "config/paxi/datapacks/VocalWarfare/pack.mcmeta" -hash = "c776469509e666d62ef909e3dfab864f7d9c5cc30a85ae2428d0fefacb5214c1" +hash = "563799e8c4177debee17032cbce20e329192dbb94396ad7e17d4c08e1a2ac386" [[files]] file = "config/paxi/resourcepacks/als-boss-rush.pw.toml" @@ -263,6 +311,10 @@ hash = "fd49e244a4ccec283ec5df45e64a2c14084c5b4f134c16e5b2b409c6dbb2e5d5" file = "kubejs/server_scripts/poor_recipes.js" hash = "7d55172621c99e6eb002b2bbc976a9f84d045c985a9888485e39249ef8c1948b" +[[files]] +file = "kubejs/server_scripts/tags.js" +hash = "b0a93570dc969f0ac81e69c096cb70b3d4450eedbabb0d394bd882c85ff4926f" + [[files]] file = "mods/alexs-caves.pw.toml" hash = "0cbc4b2c6b58b7a94f030ae84f18057e5dc78a17bad429f40b8884926a6ab233" diff --git a/kubejs/server_scripts/tags.js b/kubejs/server_scripts/tags.js new file mode 100644 index 0000000..6becad8 --- /dev/null +++ b/kubejs/server_scripts/tags.js @@ -0,0 +1,7 @@ +ServerEvents.tags('item', event => { + event.add('vocalwarfare:slashblade', 'slashblade:slashblade'); + event.add('vocalwarfare:slashblade', 'slashblade:slashblade_wood'); + event.add('vocalwarfare:slashblade', 'slashblade:slashblade_bamboo'); + event.add('vocalwarfare:slashblade', 'slashblade:slashblade_silverbamboo'); + event.add('vocalwarfare:slashblade', 'slashblade:slashblade_white'); +}); \ No newline at end of file diff --git a/pack.toml b/pack.toml index a9722e1..8d9a71a 100644 --- a/pack.toml +++ b/pack.toml @@ -1,12 +1,12 @@ name = "Vocal Warfare" author = "Hexugory" -version = "2.1.0" +version = "2.2.0" pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "07c9d5a6e627d9c5b9e92765b46a1e59fda480ba2b1766b25c51c719f1029ba2" +hash = "fda232ba78613b72225a00fbf4376b9d221ff461478d2650a4d5962ef6a7d7d4" [versions] forge = "47.3.0"