Skip to content

Commit

Permalink
Add a synagogue (#67000)
Browse files Browse the repository at this point in the history
* initial commit

* Update data/json/mapgen/synagogue.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/mapgen/synagogue.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* map updates

* Add torah ark

* Update data/json/mapgen/synagogue.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/furniture_and_terrain/furniture-storage.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update synagogue.json

* Add torah scroll

* Re-add roof

* Add some Judaica books

* Update data/json/items/book/misc.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/items/book/misc.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/items/book/misc.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/items/book/misc.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/items/book/misc.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/items/book/misc.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/items/book/misc.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/items/book/misc.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/items/book/misc.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/items/book/misc.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* linting

* Updating itemgroups, adding items

* Remove church palette to fix loot placement

* Further changes

* Additional edits

* remove kittel and kippah spawn from churches

* remove Hebrew plurals

* Typos

* Torah volume much too low

* Add rain gutter

* Update data/json/mapgen/synagogue.json

Co-authored-by: Procyonae <[email protected]>

* Update data/json/mapgen/synagogue.json

Co-authored-by: Procyonae <[email protected]>

* religion services -> religious services

* Spelling and dictionary additions

* reduce volume on Torak Ark

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Procyonae <[email protected]>
  • Loading branch information
3 people authored Jul 22, 2023
1 parent b241a79 commit 70b5d90
Show file tree
Hide file tree
Showing 18 changed files with 810 additions and 5 deletions.
29 changes: 29 additions & 0 deletions data/json/furniture_and_terrain/furniture-storage.json
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,35 @@
]
}
},
{
"type": "furniture",
"id": "f_torah_ark",
"name": "Torah Ark",
"description": "An ornately-carved cabinet designed to hold a Torah scroll. This one is decorated with a tree motif, referencing Proverbs 3:18.",
"symbol": "{",
"color": "i_brown",
"move_cost_mod": -1,
"coverage": 85,
"required_str": 9,
"flags": [ "CONTAINER", "FLAMMABLE", "PLACE_ITEM", "ORGANIC", "BLOCKSDOOR", "MOUNTABLE" ],
"deconstruct": {
"items": [ { "item": "2x4", "count": 20 }, { "item": "nail", "charges": [ 16, 24 ] }, { "item": "pipe", "count": 2 } ]
},
"max_volume": "100 L",
"bash": {
"str_min": 12,
"str_max": 40,
"sound": "smash!",
"sound_fail": "whump.",
"items": [
{ "item": "2x4", "count": [ 8, 12 ] },
{ "item": "nail", "charges": [ 8, 14 ] },
{ "item": "splinter", "count": [ 4, 10 ] },
{ "item": "pipe", "count": [ 0, 1 ] },
{ "item": "scrap", "count": [ 2, 5 ] }
]
}
},
{
"type": "furniture",
"id": "f_filing_cabinet",
Expand Down
24 changes: 24 additions & 0 deletions data/json/itemgroups/Clothing_Gear/clothing.json
Original file line number Diff line number Diff line change
Expand Up @@ -1636,6 +1636,9 @@
[ "holy_symbol", 20 ],
[ "kufi", 5 ],
[ "kippah", 5 ],
[ "tallit_katan", 5 ],
[ "tallit_gadol", 1 ],
{ "group": "tefillin_sets", "prob": 1 },
[ "headscarf", 5 ],
{ "item": "kirpan", "container-item": "sheath", "prob": 1 },
{ "item": "kirpan_cheap", "container-item": "sheath", "prob": 3 },
Expand Down Expand Up @@ -4560,5 +4563,26 @@
{ "item": "ring_signet", "prob": 30 },
{ "item": "tie_skinny", "prob": 20 }
]
},
{
"id": "tefillin_sets",
"type": "item_group",
"//": "tefillin sets",
"subtype": "distribution",
"items": [ { "group": "tefillin_right_hand", "prob": 1 }, { "group": "tefillin_left_hand", "prob": 1 } ]
},
{
"id": "tefillin_right_hand",
"type": "item_group",
"//": "tefillin sets",
"subtype": "collection",
"items": [ { "item": "tefillin_hand_r", "prob": 100 }, { "item": "tefillin_head", "prob": 100 } ]
},
{
"id": "tefillin_left_hand",
"type": "item_group",
"//": "tefillin sets",
"subtype": "collection",
"items": [ { "item": "tefillin_hand_l", "prob": 100 }, { "item": "tefillin_head", "prob": 100 } ]
}
]
52 changes: 50 additions & 2 deletions data/json/itemgroups/Locations_MapExtras/locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -1811,11 +1811,59 @@
{ "item": "cassock", "prob": 40 },
{ "item": "thawb", "prob": 10 },
{ "item": "kufi", "prob": 10 },
{ "item": "kittel", "prob": 10 },
{ "item": "kippah", "prob": 10 },
{ "item": "icon", "prob": 20 }
]
},
{
"type": "item_group",
"id": "synagogue",
"subtype": "distribution",
"entries": [
{ "group": "clothing_glasses", "prob": 20 },
{ "item": "child_book", "prob": 10 },
{ "item": "matches", "prob": 30, "charges": [ 0, 20 ] },
{ "item": "ref_matches", "prob": 30, "charges": [ 0, 32 ] },
{ "item": "coat_rain", "prob": 10 },
{ "item": "hood_rain", "prob": 10 },
{ "item": "purse", "prob": 30 },
{ "group": "jackets", "prob": 20 },
{ "item": "cane", "prob": 10 },
{ "item": "umbrella", "prob": 20 },
{ "group": "tefillin_sets", "prob": 10 },
{ "item": "essay_book", "prob": 6 },
{ "item": "poetry_book", "prob": 6 },
{ "item": "philosophy_book", "prob": 5 },
{ "group": "newspaper", "prob": 25 },
{ "item": "survivormap", "prob": 1 },
{ "group": "brochures", "prob": 10 },
{ "item": "holybook_tanakh", "prob": 38 },
{ "item": "book_judaica_siddur", "prob": 75 },
{ "item": "folding_poncho", "prob": 1 },
{ "item": "pocketwatch", "prob": 15 },
{ "item": "knitting_needles", "prob": 10 },
{ "item": "survnote", "prob": 1 },
{ "item": "kittel", "prob": 25 },
{ "item": "kippah", "prob": 50 },
{ "item": "tallit_gadol", "prob": 45 },
{ "item": "tallit_katan", "prob": 20 }
]
},
{
"type": "item_group",
"id": "synagogue_books",
"subtype": "distribution",
"entries": [
{ "item": "book_judaica_hardcover", "prob": 70 },
{ "item": "book_judaica_softcover", "prob": 50 },
{ "item": "book_judaica_siddur", "prob": 35 },
{ "item": "holybook_tanakh", "prob": 50 },
{ "item": "holybook_talmud", "prob": 20 },
{ "item": "essay_book", "prob": 25 },
{ "item": "poetry_book", "prob": 15 },
{ "group": "literature", "prob": 35 },
{ "item": "philosophy_book", "prob": 25 }
]
},
{
"type": "item_group",
"id": "toxic_dump_equipment",
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/Locations_MapExtras/mansion.json
Original file line number Diff line number Diff line change
Expand Up @@ -1632,6 +1632,7 @@
[ "kippah", 2 ],
[ "thawb", 1 ],
[ "kittel", 1 ],
[ "tallit_katan", 1 ],
[ "cassock", 1 ],
[ "robe", 5 ],
[ "eboshi", 1 ],
Expand Down
7 changes: 5 additions & 2 deletions data/json/itemgroups/books.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@
{ "item": "holybook_slack", "prob": 1 },
{ "item": "holybook_kallisti", "prob": 1 },
{ "item": "holybook_scientology", "prob": 1 },
{ "item": "holybook_satanic", "prob": 1 }
{ "item": "holybook_satanic", "prob": 1 },
{ "item": "book_judaica_siddur", "prob": 1 }
]
},
{
Expand Down Expand Up @@ -322,7 +323,9 @@
{ "item": "fermenting_book", "prob": 8 },
{ "item": "distilling_cookbook", "prob": 3 },
{ "item": "cookbook_bloodforgood", "prob": 2 },
{ "group": "memorial", "prob": 10 }
{ "group": "memorial", "prob": 10 },
{ "item": "book_judaica_hardcover", "prob": 5 },
{ "item": "book_judaica_softcover", "prob": 5 }
]
},
{
Expand Down
56 changes: 56 additions & 0 deletions data/json/items/armor/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -256,5 +256,61 @@
"covers": [ "torso", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ]
}
]
},
{
"id": "tefillin_hand_l",
"type": "ARMOR",
"name": { "str": "tefillin (left arm)", "str_pl": "sets of tefillin (left arm)" },
"description": "A set of leather straps attached to a wooden box, to fulfil the commandment written in Deuteronomy that states \"And you shall set these words of Mine upon your heart and upon your soul, and bind them for a sign upon your hand and they shall be for ornaments between your eyes.\" This one is for the left arm.",
"weight": "250 g",
"volume": "250 ml",
"price": 6400,
"price_postapoc": 250,
"to_hit": -2,
"material": [ "leather" ],
"symbol": "[",
"color": "light_gray",
"warmth": 0,
"flags": [ "OVERSIZE", "RESTRICT_HANDS", "ALLOWS_NATURAL_ATTACKS" ],
"material_thickness": 1.0,
"environmental_protection": 0,
"armor": [ { "encumbrance": 15, "coverage": 10, "covers": [ "hand_l", "arm_l" ] } ]
},
{
"id": "tefillin_hand_r",
"type": "ARMOR",
"name": { "str": "tefillin (right arm)", "str_pl": "sets of tefillin (right arm)" },
"description": "A set of leather straps attached to a wooden box, to fulfil the commandment written in Deuteronomy that states \"And you shall set these words of Mine upon your heart and upon your soul, and bind them for a sign upon your hand and they shall be for ornaments between your eyes.\" This one is for the right arm.",
"weight": "250 g",
"volume": "250 ml",
"price": 6400,
"price_postapoc": 250,
"to_hit": -2,
"material": [ "leather" ],
"symbol": "[",
"color": "light_gray",
"warmth": 0,
"flags": [ "OVERSIZE", "RESTRICT_HANDS", "ALLOWS_NATURAL_ATTACKS" ],
"material_thickness": 1.0,
"environmental_protection": 0,
"armor": [ { "encumbrance": 15, "coverage": 10, "covers": [ "hand_l", "arm_l" ] } ]
},
{
"id": "tefillin_head",
"type": "ARMOR",
"name": { "str": "tefillin (head)", "str_pl": "sets of tefillin (head)" },
"description": "A set of leather straps attached to a wooden box, to fulfil the commandment written in Deuteronomy that states \"And you shall set these words of Mine upon your heart and upon your soul, and bind them for a sign upon your hand and they shall be for ornaments between your eyes.\" This one is for the forehead.",
"weight": "200 g",
"volume": "250 ml",
"price": 6400,
"price_postapoc": 250,
"to_hit": -2,
"material": [ "leather" ],
"symbol": "[",
"color": "light_gray",
"warmth": 0,
"material_thickness": 1.0,
"environmental_protection": 0,
"armor": [ { "encumbrance": 15, "coverage": 10, "covers": [ "head" ] } ]
}
]
28 changes: 28 additions & 0 deletions data/json/items/armor/scarfs.json
Original file line number Diff line number Diff line change
Expand Up @@ -529,5 +529,33 @@
"environmental_protection": 0,
"flags": [ "OVERSIZE", "COLLAR", "ALLOWS_NATURAL_ATTACKS" ],
"armor": [ { "encumbrance": 10, "coverage": 85, "covers": [ "head" ] } ]
},
{
"id": "tallit_gadol",
"type": "TOOL_ARMOR",
"category": "clothing",
"symbol": "[",
"color": "blue",
"name": { "str_sp": "tallit gadol" },
"description": "A large prayer shawl worn by observant Jews during morning prayers and certain other occasions.",
"price": 25000,
"price_postapoc": 50,
"material": [ "wool" ],
"weight": "500 g",
"volume": "1 L",
"to_hit": -3,
"flags": [ "OUTER", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ],
"warmth": 45,
"environmental_protection": 2,
"material_thickness": 1,
"armor": [
{ "encumbrance": 5, "coverage": 50, "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ] },
{
"encumbrance": 5,
"coverage": 10,
"covers": [ "arm_l", "arm_r" ],
"specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r" ]
}
]
}
]
26 changes: 26 additions & 0 deletions data/json/items/armor/torso_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -1721,6 +1721,32 @@
}
]
},
{
"id": "tallit_katan",
"type": "ARMOR",
"name": { "str_sp": "tallit katan" },
"description": "A shirt with four tassels worn by observant Jews in deference to Deuteronomy 22:12, which commands the wearing of fringes on the corner of one's garments.",
"weight": "158 g",
"volume": "500 ml",
"price": 6000,
"price_postapoc": 50,
"material": [ "cotton" ],
"symbol": "[",
"looks_like": "tshirt",
"color": "white",
"warmth": 10,
"material_thickness": 0.1,
"flags": [ "VARSIZE", "SKINTIGHT" ],
"armor": [
{ "coverage": 90, "covers": [ "torso" ] },
{
"coverage": 100,
"covers": [ "arm_l", "arm_r" ],
"specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r" ]
},
{ "coverage": 50, "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_upper_l", "arm_upper_r" ] }
]
},
{
"id": "uttarasanga",
"type": "ARMOR",
Expand Down
Loading

0 comments on commit 70b5d90

Please sign in to comment.