Skip to content

Commit 3bfc005

Browse files
DukePaulAtreid3sgithub-actions[bot]ehughsbairdCMDadabo
authored
Misc. Catholic Stuff (#83361)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ehughsbaird <[email protected]> Co-authored-by: Chris Dadabo <[email protected]>
1 parent 31c2335 commit 3bfc005

File tree

12 files changed

+78
-66
lines changed

12 files changed

+78
-66
lines changed

data/json/itemgroups/Clothing_Gear/clothing.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,8 +1637,7 @@
16371637
[ "straw_hat", 5 ],
16381638
[ "straw_fedora", 5 ],
16391639
[ "cassock", 1 ],
1640-
[ "zucchetto", 1 ],
1641-
[ "cape_catholic", 1 ],
1640+
[ "priest_collar", 1 ],
16421641
[ "nun_habit", 1 ],
16431642
[ "nun_wimple", 1 ],
16441643
[ "holy_symbol", 20 ],
@@ -2455,8 +2454,7 @@
24552454
{ "item": "abaya", "prob": 1 },
24562455
{ "item": "kittel", "prob": 1 },
24572456
{ "item": "cassock", "prob": 1 },
2458-
{ "item": "zucchetto", "prob": 1 },
2459-
{ "item": "cape_catholic", "prob": 1 },
2457+
{ "item": "priest_collar", "prob": 1 },
24602458
{ "item": "nun_habit", "prob": 1 },
24612459
{ "item": "nun_wimple", "prob": 1 },
24622460
{ "item": "robe", "prob": 5 },

data/json/itemgroups/Locations_MapExtras/locations.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,9 @@
501501
[ "santa_dress_short", 2 ],
502502
[ "cheerleader_dress", 10 ],
503503
[ "ninja_dress_sleeveless", 1 ],
504+
[ "sinister_dress_short", 1 ],
505+
[ "priest_collar", 1 ],
506+
[ "witch_dress_short", 1 ],
504507
{ "item": "short_dress", "variant": "sinister", "prob": 1 },
505508
{ "item": "short_dress_sleeved", "variant": "witch_black", "prob": 1 },
506509
[ "maid_dress_short", 5 ],
@@ -1736,8 +1739,7 @@
17361739
{ "item": "bead_bracelet", "prob": 3 },
17371740
{ "item": "bead_necklace", "prob": 3 },
17381741
{ "item": "cassock", "prob": 40 },
1739-
{ "item": "cape_catholic", "prob": 20 },
1740-
{ "item": "zucchetto", "prob": 20 },
1742+
{ "item": "priest_collar", "prob": 20 },
17411743
{ "item": "nun_habit", "prob": 35 },
17421744
{ "item": "nun_wimple", "prob": 35 },
17431745
{ "item": "thawb", "prob": 10 },

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,8 +601,7 @@
601601
[ "niqab", 2 ],
602602
[ "abaya", 2 ],
603603
[ "cassock", 1 ],
604-
[ "zucchetto", 1 ],
605-
[ "cape_catholic", 1 ],
604+
[ "priest_collar", 1 ],
606605
[ "eboshi", 1 ],
607606
[ "kariginu", 2 ],
608607
[ "kimono", 2 ],
@@ -1560,6 +1559,7 @@
15601559
[ "leather_collar", 20 ],
15611560
[ "bondage_mask", 30 ],
15621561
[ "gloves_claws", 15 ],
1562+
[ "priest_collar", 10 ],
15631563
[ "gloves_fingerless", 10 ],
15641564
[ "maid_hat", 10 ],
15651565
[ "santa_hat", 5 ],

data/json/itemgroups/Locations_MapExtras/mansion.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,7 @@
704704
[ "leather_cat_ears", 5 ],
705705
[ "leather_cat_tail", 5 ],
706706
[ "leather_collar", 5 ],
707+
[ "priest_collar", 2 ],
707708
[ "rope_30", 5 ],
708709
{ "item": "fog_machine", "prob": 5, "charges": [ 0, 56 ] },
709710
{ "group": "costume_undergarments_women", "prob": 20 },

data/json/items/armor/cloaks.json

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,34 +1658,6 @@
16581658
"material_thickness": 2.5,
16591659
"color": "blue"
16601660
},
1661-
{
1662-
"id": "cape_catholic",
1663-
"type": "ITEM",
1664-
"subtypes": [ "ARMOR" ],
1665-
"name": { "str": "ferraiolo" },
1666-
"description": "A long, crimson cape that reaches the ankles. Worn by Catholic priests for ceremonious occasions.",
1667-
"weight": "1500 g",
1668-
"volume": "6 L",
1669-
"price": "500 USD",
1670-
"price_postapoc": "3 USD",
1671-
"material": [ "cotton" ],
1672-
"symbol": "]",
1673-
"looks_like": "cloak",
1674-
"color": "red",
1675-
"warmth": 15,
1676-
"material_thickness": 0.5,
1677-
"flags": [ "OVERSIZE", "BELTED" ],
1678-
"armor": [
1679-
{ "encumbrance": 6, "coverage": 95, "covers": [ "torso", "arm_r", "arm_l" ] },
1680-
{
1681-
"covers": [ "leg_l", "leg_r" ],
1682-
"coverage": 95,
1683-
"encumbrance": 6,
1684-
"specifically_covers": [ "leg_draped_l", "leg_draped_r" ],
1685-
"layers": [ "BELTED" ]
1686-
}
1687-
]
1688-
},
16891661
{
16901662
"id": "grass_cloak",
16911663
"type": "ITEM",

data/json/items/armor/hats.json

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,26 +1294,6 @@
12941294
{ "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ], "specifically_covers": [ "head_crown" ] }
12951295
]
12961296
},
1297-
{
1298-
"id": "zucchetto",
1299-
"type": "ITEM",
1300-
"subtypes": [ "ARMOR" ],
1301-
"name": { "str": "zucchetto" },
1302-
"description": "A small, crimson skullcap. Traditionally worn by Catholic priests.",
1303-
"weight": "100 g",
1304-
"volume": "300 ml",
1305-
"price": "100 USD",
1306-
"price_postapoc": "50 cent",
1307-
"material": [ "cotton" ],
1308-
"symbol": "[",
1309-
"looks_like": "hat_cotton",
1310-
"color": "red",
1311-
"warmth": 3,
1312-
"material_thickness": 0.2,
1313-
"armor": [
1314-
{ "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ], "specifically_covers": [ "head_crown" ] }
1315-
]
1316-
},
13171297
{
13181298
"id": "kufi",
13191299
"type": "ITEM",

data/json/items/armor/jewelry.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,6 +1269,13 @@
12691269
"color": "yellow",
12701270
"weight": 100
12711271
},
1272+
{
1273+
"id": "rosary",
1274+
"name": { "str": "rosary", "str_pl": "rosaries" },
1275+
"description": "A necklace made of a fine gold chain, with 59 beads and crucifix on the end. The Rosary is a sort of ritual prayer primarily done by Roman Catholics. It consists of 5 decades, each made up of 10 Hail Marys, each followed by one Lord's Prayer. It is said that praying a whole Rosary sends 1000 souls to Heaven.",
1276+
"color": "yellow",
1277+
"weight": 15
1278+
},
12721279
{
12731280
"id": "jewish_necklace",
12741281
"name": { "str": "Star of David necklace" },
@@ -1283,6 +1290,14 @@
12831290
"color": "yellow",
12841291
"weight": 5
12851292
},
1293+
{
1294+
"id": "saint_necklace",
1295+
"expand_snippets": true,
1296+
"name": { "str": "Saint Medallion" },
1297+
"description": "A necklace made of a fine gold chain with a medallion bearing the image of a Catholic saint. The back reads \"<catholic_saints>\".",
1298+
"color": "yellow",
1299+
"weight": 5
1300+
},
12861301
{
12871302
"id": "buddhist_necklace",
12881303
"name": { "str": "Dharmachakra necklace" },
@@ -1757,6 +1772,21 @@
17571772
"color": "dark_gray",
17581773
"flags": [ "NO_WEAR_EFFECT" ]
17591774
},
1775+
{
1776+
"id": "priest_collar",
1777+
"type": "ITEM",
1778+
"subtypes": [ "ARMOR" ],
1779+
"name": { "str": "clerical collar" },
1780+
"description": "A white plastic collar worn by Christian clergymen (or women). Although it is most commonly associated with Catholic Priests, it is also worn by Anglicans, Lutherans, Presbyterians, and Methodists. It represents the belief that the wearer is eternally bound in service to God",
1781+
"weight": "100 g",
1782+
"volume": "100 ml",
1783+
"price": "0 USD",
1784+
"price_postapoc": "25 cent",
1785+
"material": [ "plastic" ],
1786+
"symbol": "-",
1787+
"color": "white",
1788+
"flags": [ "NO_WEAR_EFFECT" ]
1789+
},
17601790
{
17611791
"id": "wristwatch",
17621792
"type": "ITEM",

data/json/items/armor/torso_clothes.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,9 +1001,9 @@
10011001
"type": "ITEM",
10021002
"subtypes": [ "ARMOR" ],
10031003
"name": { "str": "pocket shirt" },
1004-
"description": "A white button-down shirt with long sleeves and a pocket on the front. Looks professional!",
1004+
"description": "A button-down shirt with long sleeves and a pocket on the front. Looks professional!",
10051005
"//": "delete button shirt variants",
1006-
"variants": [ ],
1006+
"variants": [ { "id": "black", "name": { "str": "black dress shirt" }, "append": true, "description": "This one is black" } ],
10071007
"pocket_data": [
10081008
{
10091009
"pocket_type": "CONTAINER",

data/json/monsterdrops/clothing_halloween.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,7 @@
382382
{
383383
"collection": [
384384
{ "item": "cassock", "damage": [ 1, 4 ] },
385-
{ "item": "cape_catholic", "prob": 95, "damage": [ 1, 4 ] },
386-
{ "item": "zucchetto", "prob": 85, "damage": [ 1, 4 ] },
385+
{ "item": "priest_collar", "prob": 95, "damage": [ 1, 4 ] },
387386
{ "group": "costume_masks", "prob": 25, "damage": [ 1, 4 ] },
388387
{ "item": "leather_belt", "prob": 75, "damage": [ 1, 4 ] },
389388
{ "group": "shirts_unisex", "damage": [ 1, 4 ] },

data/json/obsoletion_and_migration_0.J/migration_items.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,16 @@
139139
"id": "atomic_coffeepot",
140140
"replace": "coffeemaker"
141141
},
142+
{
143+
"type": "MIGRATION",
144+
"id": "cape_catholic",
145+
"replace": "cloak_vampire_red"
146+
},
147+
{
148+
"type": "MIGRATION",
149+
"id": "zuchetto",
150+
"replace": "kippah"
151+
},
142152
{
143153
"type": "MIGRATION",
144154
"id": "homewrecker",

0 commit comments

Comments
 (0)