Skip to content

Commit 55cacbb

Browse files
committed
back out autocheese and the new advtools overlay
to be reverted after the point release
1 parent 191cdbe commit 55cacbb

File tree

6 files changed

+0
-245
lines changed

6 files changed

+0
-245
lines changed

advtools.lua

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
--@ module=true
22

33
local convo = reqscript('internal/advtools/convo')
4-
local fastcombat = reqscript('internal/advtools/fastcombat')
54
local party = reqscript('internal/advtools/party')
65

76
OVERLAY_WIDGETS = {
87
conversation=convo.AdvRumorsOverlay,
9-
fastcombat=fastcombat.AdvCombatOverlay,
108
}
119

1210
if dfhack_flags.module then

autocheese.lua

Lines changed: 0 additions & 187 deletions
This file was deleted.

changelog.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ Template for new versions:
2727
# Future
2828

2929
## New Tools
30-
- `autocheese`: automatically make cheese using barrels that have accumulated sufficient milk
3130

3231
## New Features
33-
- `advtools`: new overlay ``advtools.fastcombat``; allows you to skip combat animations and the announcement "More" button
3432

3533
## Fixes
3634
- `advtools`: fix dfhack-added conversation options not appearing in the ask whereabouts conversation tree

docs/advtools.rst

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,3 @@ enemies will gain the ``slay`` and ``kill`` keywords. It will also add
3535
additional conversation options for asking whereabouts of your relationships --
3636
in vanilla, you can only ask whereabouts of historical figures involved in
3737
rumors you personally witnessed or heard about.
38-
39-
``advtools.fastcombat``
40-
~~~~~~~~~~~~~~~~~~~~~~~
41-
42-
When enabled, this overlay will allow you to skip most combat animations,
43-
including the whooshes and projectiles travelling through the screen. It will
44-
also let you skip the announcements window when the "More" button is active,
45-
scrolling you to the very bottom with the first press, and skipping the window
46-
entirely with the second press. This drastically speeds up combat while still
47-
giving you the option not to skip the announcements. Skip keys are left mouse click,
48-
the SELECT button, the movement keys and combat-related keys that don't bring up a
49-
menu (such as bump attack). If clicking to skip past combat, it will only skip the
50-
announcements if you're clicking outside the announcements panel.

docs/autocheese.rst

Lines changed: 0 additions & 39 deletions
This file was deleted.

internal/control-panel/registry.lua

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ COMMANDS_BY_IDX = {
1818
{command='autobutcher target 10 10 14 2 BIRD_PEAFOWL_BLUE', group='automation', mode='run',
1919
desc='Enable if you usually want to raise peafowl.'},
2020
{command='autochop', group='automation', mode='enable'},
21-
{command='autocheese', group='automation', mode='repeat',
22-
params={'--time', '14', '--timeUnits', 'days', '--command', '[', 'autocheese', ']'}},
2321
{command='autoclothing', group='automation', mode='enable'},
2422
{command='autofarm', group='automation', mode='enable'},
2523
{command='autofarm threshold 150 grass_tail_pig', group='automation', mode='run',

0 commit comments

Comments
 (0)