MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed whitespace.

develop
Warmist 2015-02-24 20:28:49 +02:00
parent e9ab892369
commit 17fda7ffa0
1 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
plugins/building-hacks.cpp
Unescape Escape View File

@ -44,7 +44,7 @@ struct workshop_hack_data
//machine stuff //machine stuff
df::machine_tile_set connections; df::machine_tile_set connections;
df::power_info powerInfo; df::power_info powerInfo;
bool needs_power; bool needs_power;
//animation //animation
std::vector<std::vector<graphic_tile> > frames; std::vector<std::vector<graphic_tile> > frames;
bool machine_timing; //6 frames used in vanilla bool machine_timing; //6 frames used in vanilla
@ -81,54 +81,54 @@ struct work_hook : df::building_workshopst{
{ {
return getBuildStage() >= getMaxBuildStage(); return getBuildStage() >= getMaxBuildStage();
} }
bool get_current_power(df::power_info* info) bool get_current_power(df::power_info* info)
{ {
if (workshop_hack_data* def = find_def()) if (workshop_hack_data* def = find_def())
{ {
df::general_ref_creaturest* ref = static_cast<df::general_ref_creaturest*>(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE)); df::general_ref_creaturest* ref = static_cast<df::general_ref_creaturest*>(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE));
if (ref) if (ref)
{ {
info->produced = ref->anon_1; info->produced = ref->anon_1;
info->consumed = ref->anon_2; info->consumed = ref->anon_2;
return true; return true;
} }
else else
{ {
info->produced = def->powerInfo.produced; info->produced = def->powerInfo.produced;
info->consumed = def->powerInfo.consumed; info->consumed = def->powerInfo.consumed;
return true; return true;
} }
//try getting ref, if not return from def //try getting ref, if not return from def
} }
return false; return false;
} }
void set_current_power(int produced, int consumed) void set_current_power(int produced, int consumed)
{ {
if(machine.machine_id != -1) //if connected to machine, update the machine network production if(machine.machine_id != -1) //if connected to machine, update the machine network production
{ {
df::machine* target_machine = df::machine::find(machine.machine_id); df::machine* target_machine = df::machine::find(machine.machine_id);
if (target_machine) if (target_machine)
{ {
df::power_info old_power; df::power_info old_power;
get_current_power(&old_power); get_current_power(&old_power);
target_machine->min_power += consumed - old_power.consumed; target_machine->min_power += consumed - old_power.consumed;
target_machine->cur_power += produced - old_power.produced; target_machine->cur_power += produced - old_power.produced;
} }
} }
df::general_ref_creaturest* ref = static_cast<df::general_ref_creaturest*>(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE)); df::general_ref_creaturest* ref = static_cast<df::general_ref_creaturest*>(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE));
if (ref) if (ref)
{ {
ref->anon_1 = produced; ref->anon_1 = produced;
ref->anon_2 = consumed; ref->anon_2 = consumed;
} }
else else
{ {
ref = df::allocate<df::general_ref_creaturest>(); ref = df::allocate<df::general_ref_creaturest>();
ref->anon_1 = produced; ref->anon_1 = produced;
ref->anon_2 = consumed; ref->anon_2 = consumed;
general_refs.push_back(ref); general_refs.push_back(ref);
} }
} }
DEFINE_VMETHOD_INTERPOSE(uint32_t,getImpassableOccupancy,()) DEFINE_VMETHOD_INTERPOSE(uint32_t,getImpassableOccupancy,())
{ {
if(auto def = find_def()) if(auto def = find_def())
@ -141,12 +141,12 @@ struct work_hook : df::building_workshopst{
DEFINE_VMETHOD_INTERPOSE(void, getPowerInfo, (df::power_info *info)) DEFINE_VMETHOD_INTERPOSE(void, getPowerInfo, (df::power_info *info))
{ {
if (auto def = find_def()) if (auto def = find_def())
{ {
df::power_info power; df::power_info power;
get_current_power(info); get_current_power(info);
return; return;
} }
INTERPOSE_NEXT(getPowerInfo)(info); INTERPOSE_NEXT(getPowerInfo)(info);
} }
DEFINE_VMETHOD_INTERPOSE(df::machine_info*, getMachineInfo, ()) DEFINE_VMETHOD_INTERPOSE(df::machine_info*, getMachineInfo, ())
@ -159,8 +159,8 @@ struct work_hook : df::building_workshopst{
DEFINE_VMETHOD_INTERPOSE(bool, isPowerSource, ()) DEFINE_VMETHOD_INTERPOSE(bool, isPowerSource, ())
{ {
workshop_hack_data* def=find_def(); workshop_hack_data* def=find_def();
df::power_info power; df::power_info power;
get_current_power(&power); get_current_power(&power);
if (def && power.produced>0) if (def && power.produced>0)
return true; return true;
@ -217,11 +217,11 @@ struct work_hook : df::building_workshopst{
{ {
if (auto def = find_def()) if (auto def = find_def())
{ {
if (!def->needs_power) if (!def->needs_power)
return false; return false;
df::power_info power; df::power_info power;
get_current_power(&power); get_current_power(&power);
if (power.consumed == 0) if (power.consumed == 0)
return false; return false;
if(machine.machine_id==-1) if(machine.machine_id==-1)
return true; return true;
@ -378,7 +378,7 @@ static int addBuilding(lua_State* L)
newDefinition.impassible_fix=luaL_checkint(L,2); newDefinition.impassible_fix=luaL_checkint(L,2);
newDefinition.powerInfo.consumed=luaL_checkint(L,3); newDefinition.powerInfo.consumed=luaL_checkint(L,3);
newDefinition.powerInfo.produced=luaL_checkint(L,4); newDefinition.powerInfo.produced=luaL_checkint(L,4);
newDefinition.needs_power = luaL_optinteger(L, 5, 1); newDefinition.needs_power = luaL_optinteger(L, 5, 1);
//table of machine connection points //table of machine connection points
luaL_checktype(L,6,LUA_TTABLE); luaL_checktype(L,6,LUA_TTABLE);
lua_pushvalue(L,6); lua_pushvalue(L,6);
@ -417,35 +417,35 @@ static int addBuilding(lua_State* L)
} }
static void setPower(df::building_workshopst* workshop, int power_produced, int power_consumed) static void setPower(df::building_workshopst* workshop, int power_produced, int power_consumed)
{ {
work_hook* ptr = static_cast<work_hook*>(workshop); work_hook* ptr = static_cast<work_hook*>(workshop);
if (workshop_hack_data* def = ptr->find_def())//check if it's really hacked workshop if (workshop_hack_data* def = ptr->find_def())//check if it's really hacked workshop
{ {
ptr->set_current_power(power_produced, power_consumed); ptr->set_current_power(power_produced, power_consumed);
} }
} }
static int getPower(lua_State*L) static int getPower(lua_State*L)
{ {
auto workshop = Lua::CheckDFObject<df::building_workshopst>(L, 1); auto workshop = Lua::CheckDFObject<df::building_workshopst>(L, 1);
work_hook* ptr = static_cast<work_hook*>(workshop); work_hook* ptr = static_cast<work_hook*>(workshop);
if (!ptr) if (!ptr)
return 0; return 0;
if (workshop_hack_data* def = ptr->find_def())//check if it's really hacked workshop if (workshop_hack_data* def = ptr->find_def())//check if it's really hacked workshop
{ {
df::power_info info; df::power_info info;
ptr->get_current_power(&info); ptr->get_current_power(&info);
lua_pushinteger(L, info.produced); lua_pushinteger(L, info.produced);
lua_pushinteger(L, info.consumed); lua_pushinteger(L, info.consumed);
return 2; return 2;
} }
return 0; return 0;
} }
DFHACK_PLUGIN_LUA_FUNCTIONS{ DFHACK_PLUGIN_LUA_FUNCTIONS{
DFHACK_LUA_FUNCTION(setPower), DFHACK_LUA_FUNCTION(setPower),
DFHACK_LUA_END DFHACK_LUA_END
}; };
DFHACK_PLUGIN_LUA_COMMANDS{ DFHACK_PLUGIN_LUA_COMMANDS{
DFHACK_LUA_COMMAND(addBuilding), DFHACK_LUA_COMMAND(addBuilding),
DFHACK_LUA_COMMAND(getPower), DFHACK_LUA_COMMAND(getPower),
DFHACK_LUA_END DFHACK_LUA_END
}; };
static void enable_hooks(bool enable) static void enable_hooks(bool enable)