MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2845 from dawnmist/orders/remove-silver-crossbow-from-military 

Remove silver crossbow work-order from library/military
develop
Myk 2023-02-08 11:19:47 -08:00 committed by GitHub
parent 201fec6873 1f38b294cb
commit ccf57fd961
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
data/orders/military.json
Unescape Escape View File

@ -1138,42 +1138,6 @@
"job" : "MakeWeapon",
"material" : "INORGANIC:SILVER"
},
{
"amount_left" : 1,
"amount_total" : 1,
"frequency" : "Daily",
"id" : 64,
"is_active" : false,
"is_validated" : false,
"item_conditions" :
[
{
"condition" : "AtLeast",
"item_type" : "BAR",
"material" : "INORGANIC:SILVER",
"value" : 20
},
{
"condition" : "AtLeast",
"item_type" : "BAR",
"material" : "COAL",
"value" : 100
},
{
"condition" : "AtMost",
"flags" :
[
"metal"
],
"item_subtype" : "ITEM_WEAPON_CROSSBOW",
"item_type" : "WEAPON",
"value" : 10
}
],
"item_subtype" : "ITEM_WEAPON_CROSSBOW",
"job" : "MakeWeapon",
"material" : "INORGANIC:SILVER"
},
{
"amount_left" : 1,
"amount_total" : 1,
@ -1656,12 +1620,6 @@
"item_type" : "WEAPON",
"material" : "INORGANIC:STEEL",
"value" : 10
},
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:SILVER",
"value" : 5
}
],
"item_subtype" : "ITEM_WEAPON_CROSSBOW",
@ -2357,12 +2315,6 @@
"material" : "INORGANIC:STEEL",
"value" : 30
},
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:SILVER",
"value" : 5
},
{
"condition" : "AtMost",
"flags" :
@ -3068,12 +3020,6 @@
"material" : "INORGANIC:STEEL",
"value" : 30
},
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:SILVER",
"value" : 5
},
{
"condition" : "AtMost",
"flags" :
@ -3856,12 +3802,6 @@
"material" : "INORGANIC:STEEL",
"value" : 30
},
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:SILVER",
"value" : 5
},
{
"condition" : "AtMost",
"flags" :
@ -4734,12 +4674,6 @@
"material" : "INORGANIC:STEEL",
"value" : 30
},
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:SILVER",
"value" : 5
},
{
"condition" : "AtMost",
"flags" :

1
docs/changelog.txt
Unescape Escape View File

@ -49,6 +49,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- `clean`: new hotkey for `spotclean`: Ctrl-C
- `autobutcher`: changed defaults from 5 females / 1 male to 4 females / 2 males so a single unfortunate accident doesn't leave players without a mating pair
- `autobutcher`: now immediately loads races available at game start into the watchlist
- `orders`: recipe for silver crossbows removed from ``library/military`` as it is not a vanilla recipe, but is available in ``library/military_include_artifact_materials``
## Documentation