forked from DFHack/dfhack
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'DFHack/dfhack/develop' into migrate_nes…
…tboxes_to_autobutcher
- Loading branch information
Showing
7 changed files
with
159 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
#include <cmath> | ||
|
||
#include "modules/Materials.h" | ||
#include "modules/Random.h" | ||
|
||
#include "df/inorganic_raw.h" | ||
#include "df/item_armorst.h" | ||
#include "df/item_constructed.h" | ||
#include "df/item_glovesst.h" | ||
#include "df/item_helmst.h" | ||
#include "df/item_pantsst.h" | ||
#include "df/item_shieldst.h" | ||
#include "df/item_shoesst.h" | ||
#include "df/item_toolst.h" | ||
#include "df/item_trapcompst.h" | ||
#include "df/item_weaponst.h" | ||
|
||
struct Mrng { | ||
Random::MersenneRNG rng; | ||
Mrng() { rng.init(); } | ||
}; | ||
|
||
static float get_random() { | ||
static Mrng mrng; | ||
return static_cast <float> (mrng.rng.drandom1()); | ||
} | ||
|
||
static int32_t get_material_size_for_melting(df::item_constructed *item, int32_t base_material_size, float production_stack_size) { | ||
const float melt_return_per_material_size = 0.3f, base_melt_recovery = 0.95f, loss_per_wear_level = 0.1f; | ||
|
||
if (item->mat_type != 0) // bail if not INORGANIC | ||
return base_material_size; | ||
|
||
float forging_cost_per_item; | ||
if (auto inorganic = df::inorganic_raw::find(item->mat_index); | ||
inorganic && inorganic->flags.is_set(df::inorganic_flags::DEEP_SPECIAL)) | ||
{ | ||
// adamantine items | ||
forging_cost_per_item = static_cast<float>(base_material_size) / production_stack_size; | ||
} else { | ||
// non adamantine items | ||
forging_cost_per_item = std::max(std::floor(static_cast<float>(base_material_size) / 3.0f), 1.0f); | ||
forging_cost_per_item /= production_stack_size; | ||
} | ||
|
||
float calculated_size = forging_cost_per_item / melt_return_per_material_size; | ||
float melt_recovery = base_melt_recovery - static_cast<float>(item->wear) * loss_per_wear_level; | ||
calculated_size *= melt_recovery; | ||
int32_t random_part = ((modff(calculated_size, &calculated_size) > get_random()) ? 1 : 0); | ||
return static_cast<int32_t>(calculated_size) + random_part; | ||
} | ||
|
||
#define DEFINE_MATERIAL_SIZE_FOR_MELTING_TWEAK(TYPE, PRODUCTION_STACK_SIZE) \ | ||
struct material_size_for_melting_##TYPE##_hook : df::item_##TYPE##st {\ | ||
typedef df::item_##TYPE##st interpose_base;\ | ||
DEFINE_VMETHOD_INTERPOSE(int32_t, getMaterialSizeForMelting, ()) {\ | ||
return get_material_size_for_melting(this, INTERPOSE_NEXT(getMaterialSizeForMelting)(), PRODUCTION_STACK_SIZE);\ | ||
}\ | ||
};\ | ||
IMPLEMENT_VMETHOD_INTERPOSE(material_size_for_melting_##TYPE##_hook, getMaterialSizeForMelting); | ||
|
||
DEFINE_MATERIAL_SIZE_FOR_MELTING_TWEAK(armor, 1.0f) | ||
DEFINE_MATERIAL_SIZE_FOR_MELTING_TWEAK(gloves, 2.0f) | ||
DEFINE_MATERIAL_SIZE_FOR_MELTING_TWEAK(shoes, 2.0f) | ||
DEFINE_MATERIAL_SIZE_FOR_MELTING_TWEAK(helm, 1.0f) | ||
DEFINE_MATERIAL_SIZE_FOR_MELTING_TWEAK(pants, 1.0f) | ||
DEFINE_MATERIAL_SIZE_FOR_MELTING_TWEAK(weapon, 1.0f) | ||
DEFINE_MATERIAL_SIZE_FOR_MELTING_TWEAK(trapcomp, 1.0f) | ||
DEFINE_MATERIAL_SIZE_FOR_MELTING_TWEAK(tool, 1.0f) |
Submodule scripts
updated
8 files
+4 −0 | changelog.txt | |
+1 −1 | docs/exterminate.rst | |
+4 −4 | docs/idle-crafting.rst | |
+1 −1 | docs/position.rst | |
+29 −0 | idle-crafting.lua | |
+2 −0 | internal/control-panel/registry.lua | |
+5 −1 | internal/quickfort/notes.lua | |
+1 −1 | modtools/reaction-trigger.lua |