Skip to content

Commit 76e098b

Browse files
committed
Update MST Extra mod thanks to CV's work
1 parent 9f72357 commit 76e098b

File tree

12 files changed

+294
-101
lines changed

12 files changed

+294
-101
lines changed

Kenan-Modpack/MST_Extra/chargen/professions.json

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"type": "item_group",
1010
"subtype": "collection",
1111
"id": "quiver_javelin_prehistoric",
12-
"entries": [ { "item": "javelin_stone", "charges": 4 } ]
12+
"entries": [ { "item": "atlatl_dart_stone", "charges": 10 } ]
1313
},
1414
{
1515
"type": "profession",
@@ -26,7 +26,22 @@
2626
{ "level": 2, "name": "chemistry" },
2727
{ "level": 2, "name": "cooking" }
2828
],
29-
"proficiencies": [ "prof_fibers", "prof_fibers_rope", "prof_knapping", "prof_leatherworking" ],
29+
"proficiencies": [
30+
"prof_fibers",
31+
"prof_fibers_rope",
32+
"prof_tanning_basic",
33+
"prof_tanning",
34+
"prof_knapping",
35+
"prof_knapping_speed",
36+
"prof_leatherworking",
37+
"prof_metalworking",
38+
"prof_redsmithing",
39+
"prof_bowyery",
40+
"prof_fletching",
41+
"prof_carving",
42+
"prof_pottery",
43+
"prof_furriery"
44+
],
3045
"items": {
3146
"both": {
3247
"ammo": 100,
@@ -66,7 +81,7 @@
6681
{ "level": 2, "name": "stabbing" },
6782
{ "level": 1, "name": "dodge" }
6883
],
69-
"proficiencies": [ "prof_fibers", "prof_knapping" ],
84+
"proficiencies": [ "prof_fibers", "prof_fibers_rope", "prof_knapping", "prof_knapping_speed", "prof_carving" ],
7085
"traits": [ "ILLITERATE" ],
7186
"items": {
7287
"both": {
@@ -85,7 +100,7 @@
85100
"entries": [
86101
{ "item": "spear_stone", "custom-flags": [ "auto_wield" ] },
87102
{ "item": "primitive_knife", "container-item": "sheath" },
88-
{ "item": "javelin_bag", "contents-group": "quiver_javelin_prehistoric" }
103+
{ "item": "quiver_atlatl", "contents-group": "quiver_javelin_prehistoric" }
89104
]
90105
}
91106
}

Kenan-Modpack/MST_Extra/furniture_and_terrain/terrain.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
"name": "open leather door curtain",
175175
"description": "Hides from an animal hung up as a door. Could be easily taken down for supplies or placed somewhere else. These curtains are open, bundled and tied next to the doorway.",
176176
"symbol": "'",
177-
"looks_like": "t_door_curtain_o",
177+
"looks_like": "t_door_curtain_leather_c",
178178
"color": "dark_gray",
179179
"move_cost": 2,
180180
"roof": "t_flat_roof",
@@ -183,7 +183,7 @@
183183
"ter_set": "t_dirt",
184184
"items": [ { "item": "stick", "count": 1 }, { "item": "leather_tarp", "count": 1 }, { "item": "withered", "count": 12 } ]
185185
},
186-
"close": "t_door_curtain_leather_c",
186+
"close": "t_door_curtain_c",
187187
"bash": {
188188
"str_min": 1,
189189
"str_max": 8,

Kenan-Modpack/MST_Extra/items/ammo.json

Lines changed: 72 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"description": "Hefty round projectiles cast from lead, useful as ammunition for slings.",
77
"weight": "12 g",
88
"volume": "250 ml",
9-
"price": 100,
9+
"price": "1 USD",
1010
"bashing": 1,
1111
"material": [ "lead" ],
1212
"symbol": "=",
@@ -21,41 +21,83 @@
2121
"effects": [ "NEVER_MISFIRES" ]
2222
},
2323
{
24-
"id": "javelin_stone",
25-
"copy-from": "javelin",
24+
"id": "atlatl_dart_wood",
25+
"looks_like": "javelin",
2626
"type": "AMMO",
27-
"name": { "str": "stone javelin" },
28-
"//": "Avoids negative numbers caused by any future rebalancing of mainline item",
29-
"description": "A throwing spear with a stone spearhead. The grip area has also been carved and covered for better grip.",
30-
"material": [ "wood", "stone" ],
31-
"color": "light_gray",
27+
"name": { "str": "wooden atlatl dart" },
28+
"description": "A long, flexible dart for a spear-thrower, with a fire-hardened sharpened point.",
29+
"weight": "70 g",
30+
"volume": "100 ml",
31+
"longest_side": "138 cm",
32+
"color": "brown",
33+
"cutting": 6,
34+
"symbol": "/",
3235
"count": 1,
33-
"stack_size": 4,
34-
"ammo_type": "javelin",
35-
"range": 13,
36+
"ammo_type": "atlatl",
37+
"range": 15,
38+
"damage": { "damage_type": "stab", "amount": 11, "armor_penetration": 1 },
39+
"dispersion": 80,
40+
"loudness": 0,
41+
"thrown_damage": [ { "damage_type": "bash", "amount": 2 }, { "damage_type": "stab", "amount": 6 } ],
42+
"effects": [ "RECOVER_25" ],
43+
"flags": [ "SPEAR" ],
44+
"price": "10 USD",
45+
"price_postapoc": 75,
46+
"qualities": [ [ "COOK", 1 ] ]
47+
},
48+
{
49+
"id": "atlatl_dart_iron",
50+
"copy-from": "atlatl_dart_wood",
51+
"looks_like": "javelin_iron",
52+
"type": "AMMO",
53+
"name": { "str": "iron atlatl dart" },
54+
"description": "A long, flexible dart for a spear-thrower, with an iron spear point.",
55+
"weight": "170 g",
56+
"color": "light_gray",
57+
"bashing": 2,
58+
"cutting": 9,
59+
"range": 10,
60+
"damage": { "damage_type": "stab", "amount": 17, "armor_penetration": 3 },
61+
"thrown_damage": [ { "damage_type": "bash", "amount": 3 }, { "damage_type": "stab", "amount": 9 } ],
62+
"price": "25 USD",
63+
"price_postapoc": "1 USD",
64+
"effects": [ "RECOVER_40" ]
65+
},
66+
{
67+
"id": "atlatl_dart_stone",
68+
"copy-from": "atlatl_dart_wood",
69+
"looks_like": "javelin_stone",
70+
"type": "AMMO",
71+
"name": { "str": "stone atlatl dart" },
72+
"description": "A long, flexible dart for a spear-thrower, with a small stone spearhead.",
73+
"weight": "150 g",
74+
"color": "light_gray",
75+
"bashing": 1,
76+
"cutting": 7,
77+
"range": 10,
3678
"damage": { "damage_type": "stab", "amount": 13, "armor_penetration": 2 },
37-
"relative": { "weight": 100, "cutting": 2 },
38-
"proportional": { "price": 0.5, "bashing": 0.8 },
39-
"thrown_damage": [ { "damage_type": "bash", "amount": 4 }, { "damage_type": "stab", "amount": 13 } ],
40-
"flags": [ "FRAGILE_MELEE", "JAVELIN" ]
79+
"thrown_damage": [ { "damage_type": "bash", "amount": 1 }, { "damage_type": "stab", "amount": 7 } ],
80+
"price": "15 USD",
81+
"price_postapoc": 80,
82+
"effects": [ "RECOVER_30" ]
4183
},
4284
{
43-
"id": "javelin_copper",
44-
"copy-from": "javelin_iron",
85+
"id": "atlatl_dart_copper",
86+
"copy-from": "atlatl_dart_wood",
87+
"looks_like": "javelin_copper",
4588
"type": "AMMO",
46-
"name": { "str": "copper javelin" },
47-
"//": "Avoids negative numbers caused by any future rebalancing of mainline item",
48-
"description": "A copper-tipped throwing spear. The grip area has also been carved and covered for better grip.",
49-
"material": [ "wood", "copper" ],
89+
"name": { "str": "copper atlatl dart" },
90+
"description": "A long, flexible dart for a spear-thrower, with a copper spear point.",
91+
"weight": "200 g",
5092
"color": "light_red",
51-
"count": 1,
52-
"stack_size": 4,
53-
"ammo_type": "javelin",
54-
"damage": { "damage_type": "stab", "amount": 14, "armor_penetration": 2 },
55-
"relative": { "weight": 30 },
56-
"proportional": { "price": 0.5, "cutting": 0.85 },
57-
"thrown_damage": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "stab", "amount": 14 } ],
58-
"flags": [ "FRAGILE_MELEE", "JAVELIN" ]
93+
"bashing": 3,
94+
"cutting": 8,
95+
"range": 10,
96+
"damage": { "damage_type": "stab", "amount": 16, "armor_penetration": 2 },
97+
"thrown_damage": [ { "damage_type": "bash", "amount": 3 }, { "damage_type": "stab", "amount": 8 } ],
98+
"price": "20 USD",
99+
"price_postapoc": 90,
100+
"effects": [ "RECOVER_35" ]
59101
},
60102
{
61103
"type": "AMMO",
@@ -65,7 +107,7 @@
65107
"color": "brown",
66108
"name": { "str_sp": "pitch" },
67109
"description": "Sticky resin made from pine or birch tar. The adhesive isn't strong enough for heavy duty usages, but it can be used as a varnish or holding together small items, or for improvised repairs with the right tools.",
68-
"price": 900,
110+
"price": "9 USD",
69111
"material": [ "oil" ],
70112
"weight": "1 g",
71113
"volume": "250 ml",

Kenan-Modpack/MST_Extra/items/ammo_types.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[
22
{
3-
"id": "javelin",
4-
"name": "javelin",
5-
"default": "javelin",
3+
"id": "atlatl",
4+
"name": "atlatl dart",
5+
"default": "atlatl_dart_wood",
66
"type": "ammunition_type"
77
},
88
{

Kenan-Modpack/MST_Extra/items/armor.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,29 @@
146146
"warmth": 80,
147147
"material_thickness": 4,
148148
"environmental_protection": 1
149+
},
150+
{
151+
"id": "quiver_atlatl",
152+
"copy-from": "quiver",
153+
"type": "ARMOR",
154+
"name": { "str": "atlatl dart quiver" },
155+
"description": "A leather quiver worn at the waist, lengthened to hold atlatl darts. Activate to store up to 10 darts.",
156+
"weight": "400 g",
157+
"volume": "1 L",
158+
"coverage": 15,
159+
"encumbrance": 5,
160+
"pocket_data": [ { "ammo_restriction": { "atlatl": 10 }, "moves": 30 } ]
161+
},
162+
{
163+
"id": "quiver_birchbark_atlatl",
164+
"copy-from": "quiver_birchbark",
165+
"type": "ARMOR",
166+
"name": { "str": "birchbark atlatl dart quiver" },
167+
"description": "A quiver woven from strips of birch bark, worn at the waist, lengthened to hold atlatl darts. Activate to store up to 10 darts.",
168+
"weight": "800 g",
169+
"volume": "1 L",
170+
"coverage": 15,
171+
"encumbrance": 15,
172+
"pocket_data": [ { "ammo_restriction": { "atlatl": 10 }, "moves": 30 } ]
149173
}
150174
]

Kenan-Modpack/MST_Extra/items/generic.json

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,32 @@
11
[
2+
{
3+
"id": "javelin_stone",
4+
"copy-from": "javelin",
5+
"type": "GENERIC",
6+
"name": { "str": "stone javelin" },
7+
"description": "A throwing spear with a stone spearhead.",
8+
"material": [ "wood", "stone" ],
9+
"weight": "700 g",
10+
"color": "light_gray",
11+
"cutting": 13,
12+
"thrown_damage": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "stab", "amount": 14 } ],
13+
"price": "20 USD",
14+
"price_postapoc": "3 USD"
15+
},
16+
{
17+
"id": "javelin_copper",
18+
"copy-from": "javelin_iron",
19+
"type": "GENERIC",
20+
"name": { "str": "copper javelin" },
21+
"description": "A copper-tipped throwing spear.",
22+
"material": [ "wood", "copper" ],
23+
"weight": "1100 g",
24+
"color": "light_red",
25+
"cutting": 16,
26+
"thrown_damage": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "stab", "amount": 16 } ],
27+
"price": "90 USD",
28+
"price_postapoc": "5 USD"
29+
},
230
{
331
"type": "GENERIC",
432
"id": "makeshift_sled_frame_item",
@@ -12,7 +40,7 @@
1240
"volume": "3750 ml",
1341
"bashing": 5,
1442
"category": "veh_parts",
15-
"price": 500
43+
"price": "5 USD"
1644
},
1745
{
1846
"type": "GENERIC",
@@ -27,7 +55,7 @@
2755
"volume": "5 L",
2856
"bashing": 3,
2957
"category": "veh_parts",
30-
"price": 1000
58+
"price": "10 USD"
3159
},
3260
{
3361
"id": "beehive_empty",

Kenan-Modpack/MST_Extra/items/item_overrides.json

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,4 @@
11
[
2-
{
3-
"id": "javelin",
4-
"copy-from": "javelin",
5-
"type": "AMMO",
6-
"name": { "str": "wooden javelin" },
7-
"//": "Item type intentionally converted from GENERIC to AMMO",
8-
"volume": "250 ml",
9-
"count": 1,
10-
"stack_size": 4,
11-
"ammo_type": "javelin",
12-
"range": 15,
13-
"damage": { "damage_type": "stab", "amount": 11, "armor_penetration": 1 },
14-
"dispersion": 80,
15-
"loudness": 0,
16-
"thrown_damage": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "stab", "amount": 11 } ],
17-
"effects": [ "RECOVER_25" ],
18-
"flags": [ "FRAGILE_MELEE", "JAVELIN" ]
19-
},
20-
{
21-
"id": "javelin_iron",
22-
"copy-from": "javelin_iron",
23-
"type": "AMMO",
24-
"name": { "str": "iron javelin" },
25-
"//": "Item type intentionally converted from GENERIC to AMMO",
26-
"volume": "250 ml",
27-
"count": 1,
28-
"stack_size": 4,
29-
"ammo_type": "javelin",
30-
"range": 10,
31-
"damage": { "damage_type": "stab", "amount": 17, "armor_penetration": 3 },
32-
"dispersion": 80,
33-
"loudness": 0,
34-
"thrown_damage": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "stab", "amount": 17 } ],
35-
"effects": [ "RECOVER_30" ],
36-
"flags": [ "FRAGILE_MELEE", "JAVELIN" ]
37-
},
38-
{
39-
"id": "javelin_bag",
40-
"type": "ARMOR",
41-
"copy-from": "javelin_bag",
42-
"name": { "str": "javelin bag" },
43-
"pocket_data": [ { "ammo_restriction": { "javelin": 4 }, "moves": 25 } ]
44-
},
452
{
463
"id": "char_purifier",
474
"copy-from": "char_purifier",

Kenan-Modpack/MST_Extra/items/ranged.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
"material": [ "wood" ],
1313
"symbol": "(",
1414
"color": "brown",
15-
"ammo": "javelin",
15+
"ammo": "atlatl",
1616
"skill": "throw",
17+
"ranged_damage": { "damage_type": "stab", "amount": 10 },
1718
"range": 15,
1819
"dispersion": 120,
1920
"sight_dispersion": 140,
@@ -27,17 +28,19 @@
2728
"type": "GUN",
2829
"name": { "str": "makeshift crossbow" },
2930
"description": "A simple, handmade crossbow of the Skane style, with a wooden peg that is pushed up from underneath to loose the bowstring. Not as powerful as other crossbow designs, but it is easier to draw the bow back. Bolts fired from this weapon have a good chance of remaining intact for re-use.",
30-
"weight": "5456 g",
31+
"weight": "2185 g",
3132
"volume": "1 L",
32-
"price": "13 USD",
33+
"price": "15 USD",
34+
"price_postapoc": "10 USD",
3335
"bashing": 7,
3436
"material": [ "wood" ],
3537
"symbol": "(",
3638
"color": "green",
3739
"ammo": "bolt",
3840
"skill": "rifle",
39-
"min_strength": 6,
4041
"range": 6,
42+
"loudness": 8,
43+
"//": "What the green fuck have they done to crossbows in DDA?",
4144
"ranged_damage": { "damage_type": "stab", "amount": 3 },
4245
"dispersion": 500,
4346
"durability": 5,

0 commit comments

Comments
 (0)