From 66bd27f0785c00502ac5c3d19742eadf5a72a631 Mon Sep 17 00:00:00 2001 From: The Horscht Date: Wed, 26 Feb 2020 17:21:43 +0100 Subject: [PATCH] Disable angery mode, add mod author prob setting --- changelog.txt | 4 ++++ files/biomes/coalmine.lua | 4 +++- files/biomes/crypt.lua | 4 +++- files/biomes/excavationsite.lua | 7 +++++-- files/biomes/pyramid.lua | 4 +++- files/biomes/rainforest.lua | 7 +++++-- files/biomes/snowcastle.lua | 4 +++- files/biomes/snowcave.lua | 4 +++- files/biomes/vault.lua | 7 +++++-- files/entities/anvil/anvil.xml | 8 ++++---- package.json | 2 +- 11 files changed, 39 insertions(+), 16 deletions(-) diff --git a/changelog.txt b/changelog.txt index b7bcc2d..15ccd92 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +v1.4.7: +- Added support for other mod authors to influence anvil spawn probability +- Removed the anvil damage check again because it triggered even though nothing was damaged... + v1.4.6: - Anvil damage detection is working again (albeit slightly different) and statues are willing to get angry again - Added smithing animation! diff --git a/files/biomes/coalmine.lua b/files/biomes/coalmine.lua index 1eabb5d..7985fe7 100644 --- a/files/biomes/coalmine.lua +++ b/files/biomes/coalmine.lua @@ -20,8 +20,10 @@ if probability_to_replace_pixelscene > 1 then print("max_prob for coalmine: " .. max_prob) end +local probability = ANVIL_OF_DESTINY_PROB or get_probability_value_for_inserting(g_pixel_scene_02, probability_to_replace_pixelscene) + table.insert(g_pixel_scene_02, { - prob = get_probability_value_for_inserting(g_pixel_scene_02, probability_to_replace_pixelscene), + prob = probability, material_file = "mods/anvil_of_destiny/files/loader_scenes/coalmine.png", visual_file = "", background_file = "", diff --git a/files/biomes/crypt.lua b/files/biomes/crypt.lua index a06cd9c..7593f2d 100644 --- a/files/biomes/crypt.lua +++ b/files/biomes/crypt.lua @@ -20,8 +20,10 @@ if probability_to_replace_pixelscene > 1 then print("max_prob for crypt: " .. max_prob) end +local probability = ANVIL_OF_DESTINY_PROB or get_probability_value_for_inserting(g_pixel_scene_03, probability_to_replace_pixelscene) + table.insert(g_pixel_scene_03, { - prob = get_probability_value_for_inserting(g_pixel_scene_03, probability_to_replace_pixelscene), + prob = probability, material_file = "mods/anvil_of_destiny/files/loader_scenes/crypt.png", visual_file = "", background_file = "", diff --git a/files/biomes/excavationsite.lua b/files/biomes/excavationsite.lua index 54fc611..5dc07d6 100644 --- a/files/biomes/excavationsite.lua +++ b/files/biomes/excavationsite.lua @@ -20,8 +20,11 @@ if probability_to_replace_pixelscene > 1 then print("max_prob for excavationsite: " .. max_prob) end +local probability1 = ANVIL_OF_DESTINY_PROB or get_probability_value_for_inserting(g_pixel_scene_04, probability_to_replace_pixelscene) +local probability2 = ANVIL_OF_DESTINY_PROB or get_probability_value_for_inserting(g_pixel_scene_04_alt, probability_to_replace_pixelscene) + table.insert(g_pixel_scene_04, { - prob = get_probability_value_for_inserting(g_pixel_scene_04, probability_to_replace_pixelscene), + prob = probability1, material_file = "mods/anvil_of_destiny/files/loader_scenes/excavationsite.png", visual_file = "", background_file = "", @@ -29,7 +32,7 @@ table.insert(g_pixel_scene_04, { }) table.insert(g_pixel_scene_04_alt, { - prob = get_probability_value_for_inserting(g_pixel_scene_04_alt, probability_to_replace_pixelscene), + prob = probability2, material_file = "mods/anvil_of_destiny/files/loader_scenes/excavationsite.png", visual_file = "", background_file = "", diff --git a/files/biomes/pyramid.lua b/files/biomes/pyramid.lua index f4b4ec9..b360b92 100644 --- a/files/biomes/pyramid.lua +++ b/files/biomes/pyramid.lua @@ -20,8 +20,10 @@ if probability_to_replace_pixelscene > 1 then print("max_prob for pyramid: " .. max_prob) end +local probability = ANVIL_OF_DESTINY_PROB or get_probability_value_for_inserting(g_pixel_scene_03, probability_to_replace_pixelscene) + table.insert(g_pixel_scene_03, { - prob = get_probability_value_for_inserting(g_pixel_scene_03, probability_to_replace_pixelscene), + prob = probability, material_file = "mods/anvil_of_destiny/files/loader_scenes/pyramid.png", visual_file = "", background_file = "", diff --git a/files/biomes/rainforest.lua b/files/biomes/rainforest.lua index 57291ef..c3ce5d3 100644 --- a/files/biomes/rainforest.lua +++ b/files/biomes/rainforest.lua @@ -20,8 +20,11 @@ if probability_to_replace_pixelscene > 1 then print("max_prob for rainforest: " .. max_prob) end +local probability1 = ANVIL_OF_DESTINY_PROB or get_probability_value_for_inserting(g_pixel_scene_01, probability_to_replace_pixelscene) +local probability2 = ANVIL_OF_DESTINY_PROB or get_probability_value_for_inserting(g_pixel_scene_02, probability_to_replace_pixelscene) + table.insert(g_pixel_scene_01, { - prob = get_probability_value_for_inserting(g_pixel_scene_01, probability_to_replace_pixelscene), + prob = probability1, material_file = "mods/anvil_of_destiny/files/loader_scenes/rainforest_v.png", visual_file = "", background_file = "", @@ -29,7 +32,7 @@ table.insert(g_pixel_scene_01, { }) table.insert(g_pixel_scene_02, { - prob = get_probability_value_for_inserting(g_pixel_scene_02, probability_to_replace_pixelscene), + prob = probability2, material_file = "mods/anvil_of_destiny/files/loader_scenes/rainforest_h.png", visual_file = "", background_file = "", diff --git a/files/biomes/snowcastle.lua b/files/biomes/snowcastle.lua index 86969b5..1c8a513 100644 --- a/files/biomes/snowcastle.lua +++ b/files/biomes/snowcastle.lua @@ -20,8 +20,10 @@ if probability_to_replace_pixelscene > 1 then print("max_prob for snowcastle: " .. max_prob) end +local probability = ANVIL_OF_DESTINY_PROB or get_probability_value_for_inserting(g_pixel_scene_02, probability_to_replace_pixelscene) + table.insert(g_pixel_scene_02, { - prob = get_probability_value_for_inserting(g_pixel_scene_02, probability_to_replace_pixelscene), + prob = probability, material_file = "mods/anvil_of_destiny/files/loader_scenes/snowcastle.png", visual_file = "", background_file = "", diff --git a/files/biomes/snowcave.lua b/files/biomes/snowcave.lua index b9be2c9..22d4928 100644 --- a/files/biomes/snowcave.lua +++ b/files/biomes/snowcave.lua @@ -20,8 +20,10 @@ if probability_to_replace_pixelscene > 1 then print("max_prob for snowcave: " .. max_prob) end +local probability = ANVIL_OF_DESTINY_PROB or get_probability_value_for_inserting(g_pixel_scene_02, probability_to_replace_pixelscene) + table.insert(g_pixel_scene_02, { - prob = get_probability_value_for_inserting(g_pixel_scene_02, probability_to_replace_pixelscene), + prob = probability, material_file = "mods/anvil_of_destiny/files/loader_scenes/snowcave.png", visual_file = "", background_file = "", diff --git a/files/biomes/vault.lua b/files/biomes/vault.lua index f998068..42c0d24 100644 --- a/files/biomes/vault.lua +++ b/files/biomes/vault.lua @@ -20,8 +20,11 @@ if probability_to_replace_pixelscene > 1 then print("max_prob for vault: " .. max_prob) end +local probability1 = ANVIL_OF_DESTINY_PROB or get_probability_value_for_inserting(g_pixel_scene_01, probability_to_replace_pixelscene) +local probability2 = ANVIL_OF_DESTINY_PROB or get_probability_value_for_inserting(g_pixel_scene_02, probability_to_replace_pixelscene) + table.insert(g_pixel_scene_01, { - prob = get_probability_value_for_inserting(g_pixel_scene_01, probability_to_replace_pixelscene), + prob = probability1, material_file = "mods/anvil_of_destiny/files/loader_scenes/vault_v.png", visual_file = "", background_file = "", @@ -29,7 +32,7 @@ table.insert(g_pixel_scene_01, { }) table.insert(g_pixel_scene_02, { - prob = get_probability_value_for_inserting(g_pixel_scene_02, probability_to_replace_pixelscene), + prob = probability2, material_file = "mods/anvil_of_destiny/files/loader_scenes/vault_h.png", visual_file = "mods/anvil_of_destiny/files/loader_scenes/vault_h_visual.png", background_file = "", diff --git a/files/entities/anvil/anvil.xml b/files/entities/anvil/anvil.xml index b59465e..01e68bb 100644 --- a/files/entities/anvil/anvil.xml +++ b/files/entities/anvil/anvil.xml @@ -154,7 +154,7 @@ - - + --> - - + -->