diff --git a/kubejs/data/tfg/dimension_type/venus.json b/kubejs/data/tfg/dimension_type/venus.json index 9795e2356..aa7b8af81 100644 --- a/kubejs/data/tfg/dimension_type/venus.json +++ b/kubejs/data/tfg/dimension_type/venus.json @@ -10,14 +10,8 @@ "infiniburn": "#minecraft:infiniburn_overworld", "logical_height": 384, "min_y": -64, - "monster_spawn_block_light_limit": 0, - "monster_spawn_light_level": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 15, - "min_inclusive": 0 - } - }, + "monster_spawn_block_light_limit": 15, + "monster_spawn_light_level": 7, "natural": true, "piglin_safe": true, "respawn_anchor_works": false, diff --git a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json index fd3a9e83c..7b8343f26 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json +++ b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json @@ -71,14 +71,6 @@ ], "has_precipitation": true, "spawn_costs": { - "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 - }, - "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 - }, "endermanoverhaul:nether_wastes_enderman": { "energy_budget": 0.05, "charge": 0.9 @@ -91,6 +83,10 @@ "energy_budget": 0.15, "charge": 0.7 }, + "primitivecreatures:golem_2": { + "energy_budget": 0.15, + "charge": 0.7 + }, "species:cliff_hanger": { "energy_budget": 0.15, "charge": 0.7 @@ -98,6 +94,10 @@ "minecraft:magma_cube": { "energy_budget": 0.15, "charge": 0.7 + }, + "minecraft:blaze": { + "energy_budget": 0.15, + "charge": 0.7 } }, "creature_spawn_probability": 0.0001, @@ -114,18 +114,6 @@ ], "misc": [], "monster": [ - { - "type": "endermanoverhaul:desert_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 - }, - { - "type": "endermanoverhaul:savanna_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 - }, { "type": "endermanoverhaul:nether_wastes_enderman", "maxCount": 1, @@ -136,13 +124,13 @@ "type": "minecraft:enderman", "maxCount": 1, "minCount": 1, - "weight": 20 + "weight": 10 }, { "type": "ad_astra:sulfur_creeper", - "maxCount": 3, + "maxCount": 2, "minCount": 1, - "weight": 100 + "weight": 50 }, { "type": "minecraft:magma_cube", @@ -150,6 +138,18 @@ "minCount": 2, "weight": 100 }, + { + "type": "minecraft:blaze", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, + { + "type": "primitivecreatures:golem_2", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, { "type": "species:cliff_hanger", "maxCount": 3, diff --git a/kubejs/server_scripts/tfg/venus/tags.venus.js b/kubejs/server_scripts/tfg/venus/tags.venus.js index 4e56b8a28..971bec9f9 100644 --- a/kubejs/server_scripts/tfg/venus/tags.venus.js +++ b/kubejs/server_scripts/tfg/venus/tags.venus.js @@ -132,12 +132,15 @@ function registerTFGVenusBiomeTags(event) { function registerTFGVenusEntityTypeTags(event) { const ENTITIES = [ 'minecraft:enderman', + 'minecraft:magma_cube', + 'minecraft:blaze', "endermanoverhaul:desert_enderman", "endermanoverhaul:savanna_enderman", "endermanoverhaul:nether_wastes_enderman", "ad_astra:sulfur_creeper", 'species:cliff_hanger', - 'species:trooper' + 'species:trooper', + 'primitivecreatures:golem_2' ] ENTITIES.forEach(entity => { @@ -150,6 +153,8 @@ function registerTFGVenusEntityTypeTags(event) { event.add('tfc:deals_slashing_damage', 'endermanoverhaul:savanna_enderman') event.add('tfc:deals_slashing_damage', 'endermanoverhaul:nether_wastes_enderman') event.add('tfc:deals_slashing_damage', 'species:cliff_hanger') + event.add('tfc:deals_crushing_damage', 'minecraft:magma_cube') + event.add('tfc:deals_crushing_damage', 'primitivecreatures:golem_2') } function registerTFGVenusPlacedFeatures(event) { diff --git a/kubejs/server_scripts/tfg/worldgen/entities.js b/kubejs/server_scripts/tfg/worldgen/entities.js index b4ea1c57c..c3e885a28 100644 --- a/kubejs/server_scripts/tfg/worldgen/entities.js +++ b/kubejs/server_scripts/tfg/worldgen/entities.js @@ -28,6 +28,7 @@ const NEW_MOB_MAX_HP = { "ad_astra:sulfur_creeper": 60, "species:cliff_hanger": 75, "species:trooper": 20, + "minecraft:blaze": 50, // europa mobs "endermanoverhaul:ice_spikes_enderman": 85, @@ -82,6 +83,12 @@ EntityEvents.spawned((event) => { case "ad_astra:venus": newHP = entity.maxHealth * 6; } } + else if (type === "primitivecreatures:golem_2") { + switch (dimension) { + // use default for beneath + case "ad_astra:venus": newHP = 80; + } + } if (newHP === 0) return;