summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gavrilov2012-09-17 14:59:59 +0400
committerAlexander Gavrilov2012-09-17 14:59:59 +0400
commit82e870c8ddc9b64370c3828d1d4807306ac72887 (patch)
tree25477841b4e451aba3f2f52a4d6010befdf76b6e
parentf2fde21b10c087fd95948a5f40ef972ac6688718 (diff)
downloaddfhack-82e870c8ddc9b64370c3828d1d4807306ac72887.tar.gz
dfhack-82e870c8ddc9b64370c3828d1d4807306ac72887.tar.bz2
dfhack-82e870c8ddc9b64370c3828d1d4807306ac72887.tar.xz
Move siege engine out of devel.
-rw-r--r--NEWS10
-rw-r--r--plugins/CMakeLists.txt1
-rw-r--r--plugins/devel/CMakeLists.txt1
-rw-r--r--plugins/siege-engine.cpp (renamed from plugins/devel/siege-engine.cpp)0
-rw-r--r--scripts/gui/siege-engine.lua1
5 files changed, 8 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 43707f9a..4294bedb 100644
--- a/NEWS
+++ b/NEWS
@@ -53,9 +53,11 @@ DFHack v0.34.11-r2 (UNRELEASED)
When activated, implements a pressure plate modification that detects power in gear
boxes built on the four adjacent N/S/W/E tiles. The gui/power-meter script implements
the build configuration UI.
- New Siege Engine plugin (INCOMPLETE):
+ New Siege Engine plugin:
When enabled and configured via gui/siege-engine, allows aiming siege engines
- at a designated rectangular area across Z levels. Also supports loading catapults
- with non-boulder projectiles, taking from a stockpile, and restricting operator
- skill range, like with ordinary workshops.
+ at a designated rectangular area with 360 degree fire range and across Z levels.
+ Also supports loading catapults with non-boulder projectiles, taking from a stockpile,
+ and restricting operator skill range like with ordinary workshops.
+ Disclaimer: not in any way to undermine the future siege update from Toady, but the aiming
+ logic of existing engines hasn't been updated since 2D, and is almost useless as/is.
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 6e207385..8511d86c 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -119,6 +119,7 @@ if (BUILD_SUPPORTED)
DFHACK_PLUGIN(sort sort.cpp LINK_LIBRARIES lua)
DFHACK_PLUGIN(steam-engine steam-engine.cpp)
DFHACK_PLUGIN(power-meter power-meter.cpp LINK_LIBRARIES lua)
+ DFHACK_PLUGIN(siege-engine siege-engine.cpp LINK_LIBRARIES lua)
# not yet. busy with other crud again...
#DFHACK_PLUGIN(versionosd versionosd.cpp)
endif()
diff --git a/plugins/devel/CMakeLists.txt b/plugins/devel/CMakeLists.txt
index 39e8f7b6..134d5cb6 100644
--- a/plugins/devel/CMakeLists.txt
+++ b/plugins/devel/CMakeLists.txt
@@ -18,7 +18,6 @@ DFHACK_PLUGIN(stripcaged stripcaged.cpp)
DFHACK_PLUGIN(rprobe rprobe.cpp)
DFHACK_PLUGIN(nestboxes nestboxes.cpp)
DFHACK_PLUGIN(vshook vshook.cpp)
-DFHACK_PLUGIN(siege-engine siege-engine.cpp LINK_LIBRARIES lua)
IF(UNIX)
DFHACK_PLUGIN(ref-index ref-index.cpp)
ENDIF()
diff --git a/plugins/devel/siege-engine.cpp b/plugins/siege-engine.cpp
index 3b95aba3..3b95aba3 100644
--- a/plugins/devel/siege-engine.cpp
+++ b/plugins/siege-engine.cpp
diff --git a/scripts/gui/siege-engine.lua b/scripts/gui/siege-engine.lua
index 47043cbb..7a76d767 100644
--- a/scripts/gui/siege-engine.lua
+++ b/scripts/gui/siege-engine.lua
@@ -21,6 +21,7 @@ local item_choices = {
{ caption = 'trap components', item_type = df.item_type.TRAPCOMP },
{ caption = 'bins', item_type = df.item_type.BIN },
{ caption = 'barrels', item_type = df.item_type.BARREL },
+ { caption = 'cages', item_type = df.item_type.CAGE },
{ caption = 'anything', item_type = -1 },
}