Merge branch 'develop' into sdl_console

Author: dhthwy

depends/lua/include/dfhack_llimits.h

@@ -57,6 +57,7 @@ struct lua_extra_state {
 #define luai_userstateopen(L) do { \
       luai_mutex(L) = (mutex_t*)malloc(sizeof(mutex_t)); \
       pthread_mutexattr_t attr; \
+      pthread_mutexattr_init(&attr); \
       pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); \
       pthread_mutex_init(luai_mutex(L), &attr); \
    } while (0)

docs/changelog.txt

@@ -63,6 +63,7 @@ Template for new versions:
 - `autobutcher`: don't run a scanning and marking cycle on the first tick of a fortress to allow for all custom configuration to be set first
 - `nestboxes`: don't consider eggs to be infertile just because the mother has left the nest; eggs can still hatch in this situation
 - `timestream`: adjust the incubation counter on fertile eggs so they hatch at the expected time
+- `timestream`: adjust the timeout on traps so they can be re-triggered at normal rates
 - `logistics`: don't ignore rotten items when applying stockpile logistics operations (e.g. autodump, autoclaim, etc.)
 
 ## Misc Improvements

library/Core.cpp

@@ -460,7 +460,10 @@ void get_commands(color_ostream &con, std::vector<std::string> &commands) {
 static bool try_autocomplete(color_ostream &con, const std::string &first, std::string &completed)
 {
     std::vector<std::string> commands, possible;
-    get_commands(con, commands);
+
+    // restore call to get_commands once we have updated the core lock to a deferred lock
+    // so calling Lua from the console thread won't deadlock if Lua is currently busy
+    //get_commands(con, commands);
     for (auto &command : commands)
         if (command.substr(0, first.size()) == first)
             possible.push_back(command);

plugins/timestream.cpp

@@ -30,6 +30,7 @@
 #include "df/activity_event_writest.h"
 #include "df/activity_event_worshipst.h"
 #include "df/building_nest_boxst.h"
+#include "df/building_trapst.h"
 #include "df/init.h"
 #include "df/item_eggst.h"
 #include "df/unit.h"
@@ -579,6 +580,21 @@ static void adjust_activities(color_ostream &out, int32_t timeskip) {
     }
 }
 
+static void adjust_buildings(color_ostream &out, int32_t timeskip) {
+    // decrement trap timers
+    for (df::building_trapst *tr : world->buildings.other.TRAP) {
+        decrement_counter(tr, &df::building_trapst::ready_timeout, timeskip);
+        // used by pressure plates to delay until the plate is triggerable again
+        // other trap types never set this to a value higher than 1 so it is safe to decrement here
+        decrement_counter(tr, &df::building_trapst::state, timeskip);
+    }
+
+    for (df::building *bld : world->buildings.all) {
+        // assumes age > 0, but that will become true very quickly for all new buildings
+        increment_counter(bld, &df::building::age, timeskip);
+    }
+}
+
 static void adjust_items(color_ostream &out, int32_t timeskip) {
     // increment incubation counters for fertile eggs in non-forbidden nestboxes
     for (df::building_nest_boxst *nb : world->buildings.other.NEST_BOX) {
@@ -636,6 +652,7 @@ static void do_cycle(color_ostream &out) {
 
     adjust_units(out, timeskip);
     adjust_activities(out, timeskip);
+    adjust_buildings(out, timeskip);
     adjust_items(out, timeskip);
 }