diff --git a/Thoughts.md b/Thoughts.md index d2c97be..4569ceb 100644 --- a/Thoughts.md +++ b/Thoughts.md @@ -106,3 +106,6 @@ soul black smith and more should get better loot uhhhhhhhh guns spawn now but pretty shitty +ammo spawn more ammount +guns more frequently + diff --git a/rearmed_gun_datapack.zip b/rearmed_gun_datapack.zip new file mode 100644 index 0000000..c8f5112 Binary files /dev/null and b/rearmed_gun_datapack.zip differ diff --git a/rearmed_gun_datapack/data/neoforge/loot_modifiers/global_loot_modifiers.json b/rearmed_gun_datapack/data/neoforge/loot_modifiers/global_loot_modifiers.json new file mode 100644 index 0000000..5883d17 --- /dev/null +++ b/rearmed_gun_datapack/data/neoforge/loot_modifiers/global_loot_modifiers.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "entries": [ + "rearmed:tier1_sidearms", + "rearmed:tier2_rifles_shotguns", + "rearmed:tier3_heavy_rare" + ] +} diff --git a/rearmed_gun_datapack/data/rearmed/loot_modifiers/tier1_sidearms.json b/rearmed_gun_datapack/data/rearmed/loot_modifiers/tier1_sidearms.json new file mode 100644 index 0000000..39a1429 --- /dev/null +++ b/rearmed_gun_datapack/data/rearmed/loot_modifiers/tier1_sidearms.json @@ -0,0 +1,131 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "cataclysm:chests/burning_arena/burning_arena" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "cataclysm:chests/ancient_factory/ancient_factory" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "cataclysm:chests/soul_black_smith/soul_black_smith" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/bandit_towers/bandit_towers_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/bandit_village/bandit_village_supply" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/foundry/foundry_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise_seven_seas:chests/pirate_junk/pirate_junk_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise_seven_seas:chests/small_yacht/small_yacht_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "aquamirae:chests/camp_barrel" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "aquamirae:chests/maze_camp_chest" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "aquamirae:chests/ship_1" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "aquamirae:chests/ship_2" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/illager_campsite/illager_campsite_supply" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/illager_windmill/illager_windmill_barrels" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/illager_fort/illager_fort_barrels" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/illager_corsair/illager_corsair_supply" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/illager_galley/illager_galley_supply" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/mining_complex/mining_complex_barrel" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/mining_system/mining_system_barrels" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/scorched_mines/scorched_mines_barrels" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/plague_asylum/plague_asylum_barrels" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/plague_asylum/plague_asylum_storage" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/merchant_campsite/merchant_campsite_supply" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/undead_pirate_ship/undead_pirate_ship_barrels" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/undead_pirate_ship/undead_pirate_ship_supply" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/foundry/foundry_chains" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/foundry/foundry_passage_normal" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise_seven_seas:chests/corsair_corvette/corsair_corvette_barrels" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise_seven_seas:chests/corsair_corvette/corsair_corvette_normal" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "aquamirae:stashes/pirate_pouch" + } + ] + } + ], + "table": "rearmed:inject/tier1_sidearms" +} \ No newline at end of file diff --git a/rearmed_gun_datapack/data/rearmed/loot_modifiers/tier2_rifles_shotguns.json b/rearmed_gun_datapack/data/rearmed/loot_modifiers/tier2_rifles_shotguns.json new file mode 100644 index 0000000..bd5cca2 --- /dev/null +++ b/rearmed_gun_datapack/data/rearmed/loot_modifiers/tier2_rifles_shotguns.json @@ -0,0 +1,95 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "cataclysm:chests/cursed_pyramid/cursed_pyramid_tomb" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "cataclysm:chests/cursed_pyramid/cursed_pyramid_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "cataclysm:chests/sunken_city/sunken_city_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/heavenly_rider/heavenly_rider_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/heavenly_challenger/heavenly_challenger_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise_seven_seas:chests/unicorn_galleon/unicorn_galleon_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise_seven_seas:chests/victory_frigate/victory_frigate_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "aquamirae:chests/frozen_chest" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/illager_fort/illager_fort_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/illager_corsair/illager_corsair_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/illager_galley/illager_galley_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/mechanical_nest/mechanical_nest_equipment" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/mechanical_nest/mechanical_nest_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/mining_complex/mining_complex_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/mining_system/mining_system_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/scorched_mines/scorched_mines_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/plague_asylum/plague_asylum_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/small_blimp/small_blimp_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/undead_pirate_ship/undead_pirate_ship_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise_seven_seas:chests/corsair_corvette/corsair_corvette_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "aquamirae:stashes/treasure_pouch" + } + ] + } + ], + "table": "rearmed:inject/tier2_rifles_shotguns" +} \ No newline at end of file diff --git a/rearmed_gun_datapack/data/rearmed/loot_modifiers/tier3_heavy_rare.json b/rearmed_gun_datapack/data/rearmed/loot_modifiers/tier3_heavy_rare.json new file mode 100644 index 0000000..ca7c42e --- /dev/null +++ b/rearmed_gun_datapack/data/rearmed/loot_modifiers/tier3_heavy_rare.json @@ -0,0 +1,35 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "cataclysm:chests/cursed_pyramid/cursed_pyramid_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "cataclysm:chests/sunken_city/sunken_city_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "aquamirae:chests/frozen_chest" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/heavenly_conqueror/heavenly_conqueror_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/mechanical_nest/mechanical_nest_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "dungeons_arise:chests/small_blimp/small_blimp_treasure" + } + ] + } + ], + "table": "rearmed:inject/tier3_heavy_rare" +} \ No newline at end of file diff --git a/rearmed_gun_datapack/data/rearmed/loot_table/inject/tier1_sidearms.json b/rearmed_gun_datapack/data/rearmed/loot_table/inject/tier1_sidearms.json new file mode 100644 index 0000000..bb8eb0c --- /dev/null +++ b/rearmed_gun_datapack/data/rearmed/loot_table/inject/tier1_sidearms.json @@ -0,0 +1,147 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:empty", + "weight": 60 + }, + { + "type": "minecraft:item", + "weight": 6, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:glock_17\",GunFireMode:\"SEMI\"}" + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 6, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:m1911\",GunFireMode:\"SEMI\"}" + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 5, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:deagle\",GunFireMode:\"SEMI\"}" + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 4, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:uzi\",GunFireMode:\"AUTO\"}" + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 3, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:cz75\",GunFireMode:\"SEMI\"}" + } + } + ] + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:empty", + "weight": 50 + }, + { + "type": "minecraft:item", + "weight": 15, + "name": "tacz:ammo", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{AmmoId:\"tacz:9mm\"}" + } + }, + { + "function": "minecraft:set_count", + "count": { + "min": 16, + "max": 32 + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 15, + "name": "tacz:ammo", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{AmmoId:\"tacz:45acp\"}" + } + }, + { + "function": "minecraft:set_count", + "count": { + "min": 16, + "max": 32 + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 8, + "name": "tacz:ammo", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{AmmoId:\"tacz:50ae\"}" + } + }, + { + "function": "minecraft:set_count", + "count": { + "min": 16, + "max": 32 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/rearmed_gun_datapack/data/rearmed/loot_table/inject/tier2_rifles_shotguns.json b/rearmed_gun_datapack/data/rearmed/loot_table/inject/tier2_rifles_shotguns.json new file mode 100644 index 0000000..67265d3 --- /dev/null +++ b/rearmed_gun_datapack/data/rearmed/loot_table/inject/tier2_rifles_shotguns.json @@ -0,0 +1,216 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:empty", + "weight": 55 + }, + { + "type": "minecraft:item", + "weight": 6, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:ak47\",GunFireMode:\"AUTO\"}" + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 6, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:m4a1\",GunFireMode:\"AUTO\"}" + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 5, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:hk_mp5a5\",GunFireMode:\"AUTO\"}" + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 5, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:m870\",GunFireMode:\"SEMI\"}" + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 4, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:spas_12\",GunFireMode:\"SEMI\"}" + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 4, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:m700\",GunFireMode:\"SEMI\"}" + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 3, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:kar98\",GunFireMode:\"SEMI\"}" + } + } + ] + } + ] + }, + { + "rolls": { + "min": 1, + "max": 2 + }, + "entries": [ + { + "type": "minecraft:empty", + "weight": 35 + }, + { + "type": "minecraft:item", + "weight": 15, + "name": "tacz:ammo", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{AmmoId:\"tacz:762x39\"}" + } + }, + { + "function": "minecraft:set_count", + "count": { + "min": 16, + "max": 48 + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 15, + "name": "tacz:ammo", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{AmmoId:\"tacz:556x45\"}" + } + }, + { + "function": "minecraft:set_count", + "count": { + "min": 16, + "max": 48 + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 10, + "name": "tacz:ammo", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{AmmoId:\"tacz:12g\"}" + } + }, + { + "function": "minecraft:set_count", + "count": { + "min": 16, + "max": 48 + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 6, + "name": "tacz:ammo", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{AmmoId:\"tacz:792x57\"}" + } + }, + { + "function": "minecraft:set_count", + "count": { + "min": 16, + "max": 48 + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 6, + "name": "tacz:ammo", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{AmmoId:\"tacz:30_06\"}" + } + }, + { + "function": "minecraft:set_count", + "count": { + "min": 16, + "max": 48 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/rearmed_gun_datapack/data/rearmed/loot_table/inject/tier3_heavy_rare.json b/rearmed_gun_datapack/data/rearmed/loot_table/inject/tier3_heavy_rare.json new file mode 100644 index 0000000..144c025 --- /dev/null +++ b/rearmed_gun_datapack/data/rearmed/loot_table/inject/tier3_heavy_rare.json @@ -0,0 +1,134 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:empty", + "weight": 70 + }, + { + "type": "minecraft:item", + "weight": 4, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:ai_awp\",GunFireMode:\"BOLT\"}" + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 3, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:m249\",GunFireMode:\"AUTO\"}" + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 3, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:m107\",GunFireMode:\"BOLT\"}" + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 2, + "name": "tacz:modern_kinetic_gun", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{GunId:\"tacz:rpg7\",GunFireMode:\"SEMI\"}" + } + } + ] + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:empty", + "weight": 55 + }, + { + "type": "minecraft:item", + "weight": 15, + "name": "tacz:ammo", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{AmmoId:\"tacz:338\"}" + } + }, + { + "function": "minecraft:set_count", + "count": { + "min": 16, + "max": 32 + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 10, + "name": "tacz:ammo", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{AmmoId:\"tacz:50bmg\"}" + } + }, + { + "function": "minecraft:set_count", + "count": { + "min": 8, + "max": 16 + } + } + ] + }, + { + "type": "minecraft:item", + "weight": 5, + "name": "tacz:ammo", + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "minecraft:custom_data": "{AmmoId:\"tacz:rpg_rocket\"}" + } + }, + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 2 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/rearmed_gun_datapack/pack.mcmeta b/rearmed_gun_datapack/pack.mcmeta new file mode 100644 index 0000000..dbe9d94 --- /dev/null +++ b/rearmed_gun_datapack/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 48, + "description": "gun loot injects for Thoryx: Rearmed" + } +}