2011-12-31 04:48:42 -07:00
|
|
|
#include "Core.h"
|
2012-01-15 13:54:14 -07:00
|
|
|
#include "Console.h"
|
2016-08-10 21:50:00 -06:00
|
|
|
#include "DataDefs.h"
|
2012-01-15 13:54:14 -07:00
|
|
|
#include "Export.h"
|
|
|
|
#include "PluginManager.h"
|
2012-10-04 19:14:50 -06:00
|
|
|
#include "modules/Units.h"
|
|
|
|
#include "modules/Maps.h"
|
2012-01-11 09:17:25 -07:00
|
|
|
|
2016-08-10 21:50:00 -06:00
|
|
|
#include "df/map_block.h"
|
2012-01-11 09:17:25 -07:00
|
|
|
#include "df/unit.h"
|
2014-08-01 07:45:23 -06:00
|
|
|
#include "df/unit_action.h"
|
2016-08-10 21:50:00 -06:00
|
|
|
#include "df/unit_relationship_type.h"
|
2016-03-10 04:37:57 -07:00
|
|
|
#include "df/units_other_id.h"
|
2016-08-10 21:50:00 -06:00
|
|
|
#include "df/world.h"
|
2012-01-11 09:17:25 -07:00
|
|
|
|
|
|
|
using std::string;
|
|
|
|
using std::vector;
|
2014-08-01 07:45:23 -06:00
|
|
|
|
2011-10-06 19:53:58 -06:00
|
|
|
using namespace DFHack;
|
2014-08-01 07:45:23 -06:00
|
|
|
using namespace df::enums;
|
2011-10-06 19:53:58 -06:00
|
|
|
|
2012-02-21 10:19:17 -07:00
|
|
|
DFHACK_PLUGIN("fastdwarf");
|
2013-09-30 03:19:51 -06:00
|
|
|
DFHACK_PLUGIN_IS_ENABLED(active);
|
2014-12-06 16:47:35 -07:00
|
|
|
REQUIRE_GLOBAL(world);
|
|
|
|
using df::global::debug_turbospeed; // not required
|
2013-09-30 03:19:51 -06:00
|
|
|
|
2012-10-04 19:14:50 -06:00
|
|
|
static bool enable_fastdwarf = false;
|
|
|
|
static bool enable_teledwarf = false;
|
|
|
|
|
2012-03-10 04:55:42 -07:00
|
|
|
DFhackCExport command_result plugin_shutdown ( color_ostream &out )
|
2011-10-06 19:53:58 -06:00
|
|
|
{
|
2014-08-01 07:45:23 -06:00
|
|
|
if (debug_turbospeed)
|
|
|
|
*debug_turbospeed = false;
|
2011-10-06 19:53:58 -06:00
|
|
|
return CR_OK;
|
|
|
|
}
|
|
|
|
|
2012-03-10 04:55:42 -07:00
|
|
|
DFhackCExport command_result plugin_onupdate ( color_ostream &out )
|
2011-10-06 19:53:58 -06:00
|
|
|
{
|
2012-10-04 19:14:50 -06:00
|
|
|
// do we even need to do anything at all?
|
|
|
|
if (!enable_fastdwarf && !enable_teledwarf)
|
|
|
|
return CR_OK;
|
|
|
|
|
|
|
|
// make sure the world is actually loaded
|
|
|
|
if (!world || !world->map.block_index)
|
2012-03-31 19:46:17 -06:00
|
|
|
{
|
2012-08-20 20:18:39 -06:00
|
|
|
enable_fastdwarf = enable_teledwarf = false;
|
2011-10-06 19:53:58 -06:00
|
|
|
return CR_OK;
|
2012-03-31 19:46:17 -06:00
|
|
|
}
|
2012-10-04 19:14:50 -06:00
|
|
|
|
|
|
|
for (size_t i = 0; i < world->units.active.size(); i++)
|
|
|
|
{
|
|
|
|
df::unit *unit = world->units.active[i];
|
|
|
|
// citizens only
|
|
|
|
if (!Units::isCitizen(unit))
|
|
|
|
continue;
|
|
|
|
|
2012-10-04 19:17:33 -06:00
|
|
|
if (enable_teledwarf) do
|
2012-08-20 20:18:39 -06:00
|
|
|
{
|
2012-10-04 19:14:50 -06:00
|
|
|
// skip dwarves that are dragging creatures or being dragged
|
2016-08-10 21:50:00 -06:00
|
|
|
if ((unit->relationship_ids[df::unit_relationship_type::Draggee] != -1) ||
|
|
|
|
(unit->relationship_ids[df::unit_relationship_type::Dragger] != -1))
|
2012-10-04 19:20:35 -06:00
|
|
|
break;
|
2012-10-04 19:14:50 -06:00
|
|
|
|
|
|
|
// skip dwarves that are following other units
|
2016-08-10 21:50:00 -06:00
|
|
|
if (unit->following != 0)
|
2012-10-04 19:20:35 -06:00
|
|
|
break;
|
2012-10-04 19:14:50 -06:00
|
|
|
|
2012-10-06 02:40:46 -06:00
|
|
|
// skip unconscious units
|
|
|
|
if (unit->counters.unconscious > 0)
|
|
|
|
break;
|
|
|
|
|
2014-08-01 07:45:23 -06:00
|
|
|
// don't do anything if the dwarf isn't going anywhere
|
|
|
|
if (!unit->pos.isValid() || !unit->path.dest.isValid() || unit->pos == unit->path.dest) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-10-04 19:17:33 -06:00
|
|
|
// make sure source and dest map blocks are valid
|
2012-10-06 02:40:46 -06:00
|
|
|
auto old_occ = Maps::getTileOccupancy(unit->pos);
|
|
|
|
auto new_occ = Maps::getTileOccupancy(unit->path.dest);
|
|
|
|
if (!old_occ || !new_occ)
|
2012-10-04 19:20:35 -06:00
|
|
|
break;
|
2012-10-04 19:14:50 -06:00
|
|
|
|
|
|
|
// clear appropriate occupancy flags at old tile
|
|
|
|
if (unit->flags1.bits.on_ground)
|
|
|
|
// this is technically wrong, but the game will recompute this as needed
|
2012-10-06 02:40:46 -06:00
|
|
|
old_occ->bits.unit_grounded = 0;
|
2012-10-04 19:14:50 -06:00
|
|
|
else
|
2012-10-06 02:40:46 -06:00
|
|
|
old_occ->bits.unit = 0;
|
2012-10-04 19:14:50 -06:00
|
|
|
|
|
|
|
// if there's already somebody standing at the destination, then force the unit to lay down
|
2012-10-06 02:40:46 -06:00
|
|
|
if (new_occ->bits.unit)
|
2012-10-04 19:14:50 -06:00
|
|
|
unit->flags1.bits.on_ground = 1;
|
|
|
|
|
|
|
|
// set appropriate occupancy flags at new tile
|
|
|
|
if (unit->flags1.bits.on_ground)
|
2012-10-06 02:40:46 -06:00
|
|
|
new_occ->bits.unit_grounded = 1;
|
2012-10-04 19:14:50 -06:00
|
|
|
else
|
2012-10-06 02:40:46 -06:00
|
|
|
new_occ->bits.unit = 1;
|
2012-10-04 19:14:50 -06:00
|
|
|
|
|
|
|
// move unit to destination
|
2012-10-06 02:40:46 -06:00
|
|
|
unit->pos = unit->path.dest;
|
|
|
|
unit->path.path.clear();
|
2016-03-10 04:37:57 -07:00
|
|
|
|
|
|
|
//move unit's riders(including babies) to destination
|
|
|
|
if (unit->flags1.bits.ridden)
|
|
|
|
{
|
|
|
|
for (size_t j = 0; j < world->units.other[units_other_id::ANY_RIDER].size(); j++)
|
|
|
|
{
|
|
|
|
df::unit *rider = world->units.other[units_other_id::ANY_RIDER][j];
|
2016-08-10 21:50:00 -06:00
|
|
|
if (rider->relationship_ids[df::unit_relationship_type::RiderMount] == unit->id)
|
2016-03-10 04:37:57 -07:00
|
|
|
rider->pos = unit->pos;
|
|
|
|
}
|
|
|
|
}
|
2012-10-04 19:17:33 -06:00
|
|
|
} while (0);
|
2014-08-01 07:45:23 -06:00
|
|
|
|
|
|
|
if (enable_fastdwarf)
|
|
|
|
{
|
|
|
|
for (size_t i = 0; i < unit->actions.size(); i++)
|
|
|
|
{
|
|
|
|
df::unit_action *action = unit->actions[i];
|
|
|
|
switch (action->type)
|
|
|
|
{
|
2018-04-06 00:18:15 -06:00
|
|
|
case unit_action_type::None:
|
|
|
|
break;
|
2014-08-01 07:45:23 -06:00
|
|
|
case unit_action_type::Move:
|
2020-03-02 21:29:53 -07:00
|
|
|
action->data.Move.timer = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
break;
|
|
|
|
case unit_action_type::Attack:
|
2014-09-27 18:47:27 -06:00
|
|
|
// Attacks are executed when timer1 reaches zero, which will be
|
|
|
|
// on the following tick.
|
2020-03-02 21:29:53 -07:00
|
|
|
if (action->data.Attack.timer1 > 1)
|
|
|
|
action->data.Attack.timer1 = 1;
|
2014-09-27 18:47:27 -06:00
|
|
|
// Attack actions are completed, and new ones generated, when
|
2014-11-25 10:30:25 -07:00
|
|
|
// timer2 reaches zero.
|
2020-03-02 21:29:53 -07:00
|
|
|
if (action->data.Attack.timer2 > 1)
|
|
|
|
action->data.Attack.timer2 = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
break;
|
2014-11-25 10:30:25 -07:00
|
|
|
case unit_action_type::HoldTerrain:
|
2020-03-02 21:29:53 -07:00
|
|
|
action->data.HoldTerrain.timer = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
break;
|
|
|
|
case unit_action_type::Climb:
|
2020-03-02 21:29:53 -07:00
|
|
|
action->data.Climb.timer = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
break;
|
|
|
|
case unit_action_type::Job:
|
2020-03-02 21:29:53 -07:00
|
|
|
action->data.Job.timer = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
// could also patch the unit->job.current_job->completion_timer
|
|
|
|
break;
|
|
|
|
case unit_action_type::Talk:
|
2020-03-02 21:29:53 -07:00
|
|
|
action->data.Talk.timer = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
break;
|
|
|
|
case unit_action_type::Unsteady:
|
2020-03-02 21:29:53 -07:00
|
|
|
action->data.Unsteady.timer = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
break;
|
|
|
|
case unit_action_type::Dodge:
|
2020-03-02 21:29:53 -07:00
|
|
|
action->data.Dodge.timer = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
break;
|
|
|
|
case unit_action_type::Recover:
|
2020-03-02 21:29:53 -07:00
|
|
|
action->data.Recover.timer = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
break;
|
|
|
|
case unit_action_type::StandUp:
|
2020-03-02 21:29:53 -07:00
|
|
|
action->data.StandUp.timer = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
break;
|
|
|
|
case unit_action_type::LieDown:
|
2020-03-02 21:29:53 -07:00
|
|
|
action->data.LieDown.timer = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
break;
|
|
|
|
case unit_action_type::Job2:
|
2020-03-02 21:29:53 -07:00
|
|
|
action->data.Job2.timer = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
// could also patch the unit->job.current_job->completion_timer
|
|
|
|
break;
|
|
|
|
case unit_action_type::PushObject:
|
2020-03-02 21:29:53 -07:00
|
|
|
action->data.PushObject.timer = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
break;
|
|
|
|
case unit_action_type::SuckBlood:
|
2020-03-02 21:29:53 -07:00
|
|
|
action->data.SuckBlood.timer = 1;
|
2014-08-01 07:45:23 -06:00
|
|
|
break;
|
2018-04-06 00:18:15 -06:00
|
|
|
case unit_action_type::Jump:
|
|
|
|
case unit_action_type::ReleaseTerrain:
|
|
|
|
case unit_action_type::Parry:
|
|
|
|
case unit_action_type::Block:
|
|
|
|
case unit_action_type::HoldItem:
|
|
|
|
case unit_action_type::ReleaseItem:
|
|
|
|
break;
|
2014-08-01 07:45:23 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2011-10-06 19:53:58 -06:00
|
|
|
}
|
|
|
|
return CR_OK;
|
|
|
|
}
|
|
|
|
|
2012-03-10 04:55:42 -07:00
|
|
|
static command_result fastdwarf (color_ostream &out, vector <string> & parameters)
|
2011-10-06 19:53:58 -06:00
|
|
|
{
|
2012-10-17 06:57:14 -06:00
|
|
|
if (parameters.size() > 2)
|
|
|
|
return CR_WRONG_USAGE;
|
2012-10-04 19:14:50 -06:00
|
|
|
|
2012-10-17 06:57:14 -06:00
|
|
|
if ((parameters.size() == 1) || (parameters.size() == 2))
|
2012-10-04 19:14:50 -06:00
|
|
|
{
|
|
|
|
if (parameters.size() == 2)
|
|
|
|
{
|
|
|
|
if (parameters[1] == "0")
|
|
|
|
enable_teledwarf = false;
|
|
|
|
else if (parameters[1] == "1")
|
|
|
|
enable_teledwarf = true;
|
|
|
|
else
|
2012-10-17 06:57:14 -06:00
|
|
|
return CR_WRONG_USAGE;
|
2012-08-20 20:18:39 -06:00
|
|
|
}
|
2012-10-04 19:14:50 -06:00
|
|
|
else
|
|
|
|
enable_teledwarf = false;
|
|
|
|
if (parameters[0] == "0")
|
|
|
|
{
|
2012-08-20 20:18:39 -06:00
|
|
|
enable_fastdwarf = false;
|
2014-08-01 07:45:23 -06:00
|
|
|
if (debug_turbospeed)
|
|
|
|
*debug_turbospeed = false;
|
2012-10-04 19:14:50 -06:00
|
|
|
}
|
|
|
|
else if (parameters[0] == "1")
|
|
|
|
{
|
2012-08-20 20:18:39 -06:00
|
|
|
enable_fastdwarf = true;
|
2014-08-01 07:45:23 -06:00
|
|
|
if (debug_turbospeed)
|
|
|
|
*debug_turbospeed = false;
|
2012-08-20 20:18:39 -06:00
|
|
|
}
|
2012-10-04 19:14:50 -06:00
|
|
|
else if (parameters[0] == "2")
|
|
|
|
{
|
2014-08-01 07:45:23 -06:00
|
|
|
if (debug_turbospeed)
|
2012-10-04 19:14:50 -06:00
|
|
|
{
|
|
|
|
enable_fastdwarf = false;
|
2014-08-01 07:45:23 -06:00
|
|
|
*debug_turbospeed = true;
|
2012-10-04 19:14:50 -06:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
out.print("Speed level 2 not available.\n");
|
|
|
|
return CR_FAILURE;
|
|
|
|
}
|
2012-08-20 20:18:39 -06:00
|
|
|
}
|
2011-10-06 19:53:58 -06:00
|
|
|
else
|
2012-10-17 06:57:14 -06:00
|
|
|
return CR_WRONG_USAGE;
|
2011-10-27 22:22:07 -06:00
|
|
|
}
|
2012-10-04 19:14:50 -06:00
|
|
|
|
2013-09-30 03:19:51 -06:00
|
|
|
active = enable_fastdwarf || enable_teledwarf;
|
|
|
|
|
2012-10-04 19:14:50 -06:00
|
|
|
out.print("Current state: fast = %d, teleport = %d.\n",
|
2014-08-01 07:45:23 -06:00
|
|
|
(debug_turbospeed && *debug_turbospeed) ? 2 : (enable_fastdwarf ? 1 : 0),
|
2012-10-04 19:14:50 -06:00
|
|
|
enable_teledwarf ? 1 : 0);
|
2011-10-06 19:53:58 -06:00
|
|
|
|
|
|
|
return CR_OK;
|
|
|
|
}
|
|
|
|
|
2013-09-30 03:19:51 -06:00
|
|
|
DFhackCExport command_result plugin_enable ( color_ostream &out, bool enable )
|
|
|
|
{
|
|
|
|
if (active != enable)
|
|
|
|
{
|
|
|
|
active = enable_fastdwarf = enable;
|
|
|
|
enable_teledwarf = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return CR_OK;
|
|
|
|
}
|
|
|
|
|
2012-03-10 04:55:42 -07:00
|
|
|
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
|
2011-10-06 19:53:58 -06:00
|
|
|
{
|
|
|
|
commands.push_back(PluginCommand("fastdwarf",
|
2015-11-09 20:37:45 -07:00
|
|
|
"let dwarves teleport and/or finish jobs instantly",
|
2012-08-20 20:18:39 -06:00
|
|
|
fastdwarf, false,
|
2012-10-04 19:14:50 -06:00
|
|
|
"fastdwarf: make dwarves faster.\n"
|
2012-08-20 20:18:39 -06:00
|
|
|
"Usage:\n"
|
2012-10-04 19:14:50 -06:00
|
|
|
" fastdwarf <speed> (tele)\n"
|
|
|
|
"Valid values for speed:\n"
|
|
|
|
" * 0 - Make dwarves move and work at standard speed.\n"
|
|
|
|
" * 1 - Make dwarves move and work at maximum speed.\n"
|
|
|
|
" * 2 - Make ALL creatures move and work at maximum speed.\n"
|
|
|
|
"Valid values for (tele):\n"
|
|
|
|
" * 0 - Disable dwarf teleportation (default)\n"
|
|
|
|
" * 1 - Make dwarves teleport to their destinations instantly.\n"
|
2012-08-20 20:18:39 -06:00
|
|
|
));
|
2015-02-14 20:53:06 -07:00
|
|
|
|
2011-10-06 19:53:58 -06:00
|
|
|
return CR_OK;
|
|
|
|
}
|