Merge branch '0.34.11-r5'

Author: expwnent

CMakeLists.txt

@@ -59,7 +59,7 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "0.34.11")
-SET(DFHACK_RELEASE "r4" CACHE STRING "Current release revision.")
+SET(DFHACK_RELEASE "r5" CACHE STRING "Current release revision.")
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
 add_definitions(-DDFHACK_VERSION="${DFHACK_VERSION}")

Contributors.html

@@ -364,7 +364,7 @@ <h1 class="title">Contributors</h1>
 <li>RossM &lt;<a class="reference external" href="mailto:Ross&#64;Gnome">Ross&#64;Gnome</a>&gt;</li>
 <li>Tom Prince &lt;<a class="reference external" href="mailto:tom.prince&#64;ualberta.net">tom.prince&#64;ualberta.net</a>&gt;</li>
 <li>Jared Adams &lt;<a class="reference external" href="mailto:jaxad0127&#64;gmail.com">jaxad0127&#64;gmail.com</a>&gt;</li>
-<li>expwnent &lt;<a class="reference external" href="mailto:q309185&#64;gmail.com">q309185&#64;gmail.com</a>&gt;</li>
+<li>expwnent</li>
 <li>Erik Youngren &lt;<a class="reference external" href="mailto:artanis.00&#64;gmail.com">artanis.00&#64;gmail.com</a>&gt;</li>
 <li>Espen Wiborg &lt;<a class="reference external" href="mailto:espen.wiborg&#64;telio.no">espen.wiborg&#64;telio.no</a>&gt;</li>
 <li>Tim Walberg &lt;<a class="reference external" href="mailto:twalberg&#64;comcast.net">twalberg&#64;comcast.net</a>&gt;</li>
@@ -401,6 +401,7 @@ <h1 class="title">Contributors</h1>
 <li>Caldfir &lt;<a class="reference external" href="mailto:caldfir&#64;hotmail.com">caldfir&#64;hotmail.com</a>&gt;</li>
 <li>Antalia &lt;<a class="reference external" href="mailto:tamarakorr&#64;gmail.com">tamarakorr&#64;gmail.com</a>&gt;</li>
 <li>Angus Mezick &lt;<a class="reference external" href="mailto:amezick&#64;gmail.com">amezick&#64;gmail.com</a>&gt;</li>
+<li>PeridexisErrant &lt;<a class="reference external" href="mailto:PeridexisErrant&#64;gmail.com">PeridexisErrant&#64;gmail.com</a>&gt;</li>
 </ul>
 <p>And those are the cool people who made <strong>stonesense</strong>.</p>
 <ul class="simple">

Contributors.rst

@@ -24,7 +24,7 @@ The following is a list of people who have contributed to **DFHack**.
 - RossM <Ross@Gnome>
 - Tom Prince <[email protected]>
 - Jared Adams <[email protected]>
-- expwnent <[email protected]>
+- expwnent
 - Erik Youngren <[email protected]>
 - Espen Wiborg <[email protected]>
 - Tim Walberg <[email protected]>

NEWS

@@ -1,5 +1,9 @@
 DFHack future
 
+The future has not yet happened. Stay tuned!
+
+DFHack v0.34.11-r5
+
   Internals:
     - support for calling a lua function via a protobuf request (demonstrated by dfhack-run --lua).
     - support for basic filesystem operations (e.g. chdir, mkdir, rmdir, stat) in C++ and Lua
@@ -8,7 +12,6 @@ DFHack future
     - Lua API for running arbitrary DFHack commands
     - support for multiple raw/init.d/*.lua init scripts in one save.
     - eventful now has a more friendly way of making custom sidebars
-    - new plugin: building-hacks. Allows to add custom functionality and/or animations to buildings. 
     - on Linux and OSX the console now supports moving the cursor back and forward by a whole word.
 
   New scripts:
@@ -21,7 +24,6 @@ DFHack future
     - dfstatus: show an overview of critical stock quantities, including food, drinks, wood, and bars.
 
   New commands:
-    - move the 'grow', 'extirpate' and 'immolate' commands as 'plant' subcommands
     - 'plant create' - spawn a new shrub under the cursor
     - command-prompt: a dfhack command prompt in df.
 
@@ -34,8 +36,11 @@ DFHack future
     - rendermax: replace the renderer with something else. Most interesting is "rendermax light"- a lighting engine for df.
     - stockflow (by eswald): queues manager jobs of the configured type based on the state of a stockpile.
     - embark-tools: implementations of Embark Anywhere, Nano Embark, and a few other embark-related utilities
+    - building-hacks: Allows to add custom functionality and/or animations to buildings. 
+    - petcapRemover: triggers pregnancies in creatures so that you can effectively raise the default pet population cap from the default 50
 
   Misc improvements:
+    - plant: move the 'grow', 'extirpate' and 'immolate' commands as 'plant' subcommands
     - digfort: improved csv parsing, add start() comment handling
     - exterminate: allow specifying a caste (exterminate gob:male)
     - createitem: in adventure mode it now defaults to the controlled unit as maker.

Readme.html

@@ -1397,6 +1397,8 @@ Subcommands that persist until disabled or DF quit:
 
 :adamantine-cloth-wear: Prevents adamantine clothing from wearing out while being worn (bug 6481).
 
+:confirm-embark: Adds a prompt before embarking (on the "prepare carefully" screen).
+
 fix-armory
 ----------
 
@@ -2068,6 +2070,20 @@ Tools:
 * ``sand``: Displays an indicator when sand is present in the currently-selected area, similar to the default clay/stone indicators.
 * ``sticky``: Maintains the selected local area while navigating the world map
 
+petcapRemover
+-------------
+
+This plugin allows you to remove or raise the pet population cap. In vanilla DF, pets will not reproduce unless the population is below 50 and the number of children of that species is below a certain percentage. This plugin allows removing the second restriction and removing or raising the first. Pets still require PET or PET_EXOTIC tags in order to reproduce. Type help petcapRemover for exact usage. In order to make population more stable and avoid sudden population booms as you go below the raised population cap, this plugin counts pregnancies toward the new population cap. It can still go over, but only in the case of multiple births.
+
+`petcapRemover`
+ cause pregnancies now and schedule the next check
+`petcapRemover every n`
+ set how often in ticks the plugin checks for possible pregnancies
+`petcapRemover cap n`
+ set the new cap to n. if n = 0, no cap
+`petcapRemover pregtime n`
+ sets the pregnancy duration to n ticks. natural pregnancies are 300000 ticks for the current race and 200000 for everyone else
+
 misery
 ------
 When enabled, every new negative dwarven thought will be multiplied by a factor (2 by default).

Readme.rst

@@ -182,7 +182,7 @@ enum _filetype {
 namespace DFHack {
     namespace Filesystem {
         DFHACK_EXPORT bool chdir (std::string path);
-        DFHACK_EXPORT char * getcwd ();
+        DFHACK_EXPORT std::string getcwd ();
         DFHACK_EXPORT bool mkdir (std::string path);
         DFHACK_EXPORT bool rmdir (std::string path);
         DFHACK_EXPORT bool stat (std::string path, STAT_STRUCT &info);

library/include/modules/Filesystem.h

@@ -54,14 +54,18 @@ bool DFHack::Filesystem::chdir (std::string path)
     return !(bool)::chdir(path.c_str());
 }
 
-char * DFHack::Filesystem::getcwd ()
+std::string DFHack::Filesystem::getcwd ()
 {
     char *path;
     char buf[LFS_MAXPATHLEN];
-    if ((path = ::getcwd(buf, LFS_MAXPATHLEN)) == NULL)
-        return NULL;
-    else
-        return path;
+    std::string result = "";
+#ifdef _WIN32
+    if ((path = ::_getcwd(buf, LFS_MAXPATHLEN)) != NULL)
+#else
+    if ((path = ::getcwd(buf, LFS_MAXPATHLEN)) != NULL)
+#endif
+        result = buf;
+    return result;
 }
 
 bool DFHack::Filesystem::mkdir (std::string path)
@@ -88,7 +92,7 @@ bool DFHack::Filesystem::rmdir (std::string path)
 }
 
 #ifdef _WIN32
-_filetype *mode2type (unsigned short mode) {
+_filetype mode2type (unsigned short mode) {
 #else
 _filetype mode2type (mode_t mode) {
 #endif

library/modules/Filesystem.cpp

@@ -167,6 +167,7 @@ if (BUILD_SUPPORTED)
     DFHACK_PLUGIN(command-prompt command-prompt.cpp)
     DFHACK_PLUGIN(building-hacks building-hacks.cpp LINK_LIBRARIES lua)
     DFHACK_PLUGIN(embark-tools embark-tools.cpp)
+    DFHACK_PLUGIN(petcapRemover petcapRemover.cpp)
 endif()
 
 # this is the skeleton plugin. If you want to make your own, make a copy and then change it