Skip to content

Commit 2502d46

Browse files
committed
light cleanup
1 parent e9987ef commit 2502d46

File tree

6 files changed

+2
-88
lines changed

6 files changed

+2
-88
lines changed

colonies.lua

+1-20
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,6 @@
11
-- List, create, or change wild colonies (eg honey bees)
22
-- By PeridexisErrant and Warmist
33

4-
local help = [====[
5-
6-
colonies
7-
========
8-
List vermin colonies, place honey bees, or convert all vermin
9-
to honey bees. Usage:
10-
11-
:colonies: List all vermin colonies on the map.
12-
:colonies place: Place a honey bee colony under the cursor.
13-
:colonies convert: Convert all existing colonies to honey bees.
14-
15-
The ``place`` and ``convert`` subcommands by default create or
16-
convert to honey bees, as this is the most commonly useful.
17-
However both accept an optional flag to use a different vermin
18-
type, for example ``colonies place ANT`` creates an ant colony
19-
and ``colonies convert TERMITE`` ends your beekeeping industry.
20-
21-
]====]
22-
234
local guidm = require('gui.dwarfmode')
245

256
function findVermin(target_verm)
@@ -71,7 +52,7 @@ local args = {...}
7152
local target_verm = args[2] or "HONEY_BEE"
7253

7354
if args[1] == 'help' or args[1] == '?' then
74-
print(help)
55+
print(dfhack.script_help())
7556
elseif args[1] == 'convert' then
7657
convert_vermin_to(target_verm)
7758
elseif args[1] == 'place' then

devel/light.lua

-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
-- an experimental lighting engine
2-
--[====[
32

4-
devel/light
5-
===========
6-
An experimental lighting engine for DF, using the `rendermax` plugin.
7-
8-
Call ``devel/light static`` to not recalculate lighting when in game.
9-
Press :kbd:`~` to recalculate lighting. Press :kbd:`\`` to exit.
10-
11-
]====]
12-
13-
local gui = require 'gui'
143
local guidm = require 'gui.dwarfmode'
154
local render = require 'plugins.rendermax'
165

docs/colonies.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ colonies
33

44
.. dfhack-tool::
55
:summary: Manipulate vermin colonies and hives.
6-
:tags: fort armok map
6+
:tags: adventure fort armok map
77

88
Usage
99
-----

gui/companion-order.lua

-24
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,4 @@
11
-- Issue orders to companions in Adventure mode
2-
--[====[
3-
4-
gui/companion-order
5-
===================
6-
A script to issue orders for companions. Select companions with lower case chars (green when selected), issue orders with upper
7-
case. Must be in look or talk mode to issue command on tile (e.g. move/equip/pick-up).
8-
9-
.. image:: /docs/images/companion-order.png
10-
11-
* move - orders selected companions to move to location. If companions are following they will move no more than 3 tiles from you.
12-
* equip - try to equip items on the ground.
13-
* pick-up - try to take items into hand (also wield)
14-
* unequip - remove and drop equipment
15-
* unwield - drop held items
16-
* wait - temporarily remove from party
17-
* follow - rejoin the party after "wait"
18-
* leave - remove from party (can be rejoined by talking)
19-
20-
Can be called with '-c' flag to display "cheating" commands.
21-
22-
* patch up - fully heals the companion
23-
* get in - rides e.g. minecart at cursor. Bit buggy as unit will teleport to the item when e.g. pushing it.
24-
25-
]====]
262

273
local gui = require 'gui'
284
local guidm = require 'gui.dwarfmode'

launch.lua

-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
-- Launch unit to cursor location
22
-- Based on propel.lua by Roses, molested by Rumrusher and I until this happened, sorry.
3-
--[====[
43

5-
launch
6-
======
7-
Activate with a cursor on screen and you will go there rapidly. Attack
8-
something first to ride them there.
9-
10-
]====]
114
local guidm = require('gui.dwarfmode')
125

136
function launch(unitSource,unitRider)

teleport.lua

-25
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,6 @@
22
-- author Putnam
33
-- edited by expwnent
44
--@module = true
5-
--[====[
6-
7-
teleport
8-
========
9-
Teleports a unit to given coordinates.
10-
11-
.. note::
12-
13-
`gui/teleport` is an in-game UI for this script.
14-
15-
Examples:
16-
17-
* prints ID of unit beneath cursor::
18-
19-
teleport -showunitid
20-
21-
* prints coordinates beneath cursor::
22-
23-
teleport -showpos
24-
25-
* teleports unit ``1234`` to ``56,115,26``
26-
27-
teleport -unit 1234 -x 56 -y 115 -z 26
28-
29-
]====]
305

316
local guidm = require('gui.dwarfmode')
327

0 commit comments

Comments
 (0)