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

Merge pull request #2725 from StormCrow42/no-platinum-weapons 

No platinum weapons
develop
Myk 2023-01-26 13:10:51 -08:00 committed by GitHub
parent a767a917fa 38706ff02a
commit a27a06e9e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4982 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1066,105 +1066,6 @@
"job" : "MakeAmmo", "job" : "MakeAmmo",
"material" : "INORGANIC:IRON" "material" : "INORGANIC:IRON"
}, },
{
"amount_left" : 1,
"amount_total" : 1,
"frequency" : "Daily",
"id" : 31,
"is_active" : false,
"is_validated" : false,
"item_conditions" :
[
{
"condition" : "AtLeast",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{
"condition" : "AtLeast",
"item_type" : "BAR",
"material" : "COAL",
"value" : 100
},
{
"condition" : "AtMost",
"item_subtype" : "ITEM_WEAPON_MACE",
"item_type" : "WEAPON",
"material" : "INORGANIC:PLATINUM",
"value" : 10
}
],
"item_subtype" : "ITEM_WEAPON_MACE",
"job" : "MakeWeapon",
"material" : "INORGANIC:PLATINUM"
},
{
"amount_left" : 1,
"amount_total" : 1,
"frequency" : "Daily",
"id" : 32,
"is_active" : false,
"is_validated" : false,
"item_conditions" :
[
{
"condition" : "AtLeast",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{
"condition" : "AtLeast",
"item_type" : "BAR",
"material" : "COAL",
"value" : 100
},
{
"condition" : "AtMost",
"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
"item_type" : "WEAPON",
"material" : "INORGANIC:PLATINUM",
"value" : 10
}
],
"item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
"job" : "MakeWeapon",
"material" : "INORGANIC:PLATINUM"
},
{
"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:PLATINUM",
"value" : 20
},
{
"condition" : "AtLeast",
"item_type" : "BAR",
"material" : "COAL",
"value" : 100
},
{
"condition" : "AtMost",
"item_subtype" : "ITEM_WEAPON_CROSSBOW",
"item_type" : "WEAPON",
"material" : "INORGANIC:PLATINUM",
"value" : 10
}
],
"item_subtype" : "ITEM_WEAPON_CROSSBOW",
"job" : "MakeWeapon",
"material" : "INORGANIC:PLATINUM"
},
{ {
"amount_left" : 1, "amount_left" : 1,
"amount_total" : 1, "amount_total" : 1,
@ -1174,12 +1075,6 @@
"is_validated" : false, "is_validated" : false,
"item_conditions" : "item_conditions" :
[ [
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtLeast", "condition" : "AtLeast",
"item_type" : "BAR", "item_type" : "BAR",
@ -1216,12 +1111,6 @@
"is_validated" : false, "is_validated" : false,
"item_conditions" : "item_conditions" :
[ [
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtLeast", "condition" : "AtLeast",
"item_type" : "BAR", "item_type" : "BAR",
@ -1270,12 +1159,6 @@
"material" : "COAL", "material" : "COAL",
"value" : 100 "value" : 100
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtMost", "condition" : "AtMost",
"flags" : "flags" :
@ -1563,12 +1446,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtMost", "condition" : "AtMost",
"item_subtype" : "ITEM_WEAPON_MACE", "item_subtype" : "ITEM_WEAPON_MACE",
@ -1608,12 +1485,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtMost", "condition" : "AtMost",
"item_subtype" : "ITEM_WEAPON_HAMMER_WAR", "item_subtype" : "ITEM_WEAPON_HAMMER_WAR",
@ -1786,12 +1657,6 @@
"material" : "INORGANIC:STEEL", "material" : "INORGANIC:STEEL",
"value" : 10 "value" : 10
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "LessThan", "condition" : "LessThan",
"item_type" : "BAR", "item_type" : "BAR",
@ -2198,12 +2063,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtMost", "condition" : "AtMost",
"flags" : "flags" :
@ -2258,12 +2117,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtMost", "condition" : "AtMost",
"flags" : "flags" :
@ -2510,12 +2363,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtMost", "condition" : "AtMost",
"flags" : "flags" :
@ -2937,12 +2784,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
}
], ],
"item_subtype" : "ITEM_WEAPON_MACE", "item_subtype" : "ITEM_WEAPON_MACE",
"job" : "MakeWeapon", "job" : "MakeWeapon",
@ -2987,12 +2828,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtMost", "condition" : "AtMost",
"flags" : "flags" :
@ -3239,12 +3074,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtMost", "condition" : "AtMost",
"flags" : "flags" :
@ -3697,12 +3526,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtMost", "condition" : "AtMost",
"flags" : "flags" :
@ -3763,12 +3586,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtMost", "condition" : "AtMost",
"flags" : "flags" :
@ -4045,12 +3862,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtMost", "condition" : "AtMost",
"flags" : "flags" :
@ -4557,12 +4368,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtMost", "condition" : "AtMost",
"flags" : "flags" :
@ -4629,12 +4434,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "LessThan", "condition" : "LessThan",
"item_type" : "BAR", "item_type" : "BAR",
@ -4941,12 +4740,6 @@
"material" : "INORGANIC:SILVER", "material" : "INORGANIC:SILVER",
"value" : 5 "value" : 5
}, },
{
"condition" : "LessThan",
"item_type" : "BAR",
"material" : "INORGANIC:PLATINUM",
"value" : 5
},
{ {
"condition" : "AtMost", "condition" : "AtMost",
"flags" : "flags" :

4971
data/orders/military_include_artifact_materials.json
View File

File diff suppressed because it is too large Load Diff

12
docs/plugins/orders.rst
Unescape Escape View File

@ -106,7 +106,7 @@ produces weapons and armor:
- smelting for platinum, silver, steel, bronze, bismuth bronze, and copper (and - smelting for platinum, silver, steel, bronze, bismuth bronze, and copper (and
their dependencies) their dependencies)
- bronze/bismuth bronze/copper bolts - bronze/bismuth bronze/copper bolts
- platinum/silver/steel/iron/bismuth bronze/bronze/copper weapons and armor, - silver/steel/iron/bismuth bronze/bronze/copper weapons and armor,
with checks to ensure only the best available materials are being used with checks to ensure only the best available materials are being used
If you set a stockpile to take weapons and armor of less than masterwork quality If you set a stockpile to take weapons and armor of less than masterwork quality
@ -117,6 +117,16 @@ Make sure you have a lot of fuel (or magma forges and furnaces) before you turn
This file should only be imported, of course, if you need to equip a military. This file should only be imported, of course, if you need to equip a military.
:source:`library/military <data/orders/military_include_artifact_materials.json>`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
As above, but this collection will also allow creation of platinum blunt weapons.
Normally these are only created by artifact moods, work orders can't be created
manually for them.
- platinum/silver/steel/iron/bismuth bronze/bronze/copper weapons and armor,
with checks to ensure only the best available materials are being used
:source:`library/smelting <data/orders/smelting.json>` :source:`library/smelting <data/orders/smelting.json>`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~