Skip to content

Commit

Permalink
Merge pull request #71428 from Fris0uman/prof_retcon
Browse files Browse the repository at this point in the history
Revert stuff that should not have been added
  • Loading branch information
kevingranade authored Feb 2, 2024
2 parents c2806f4 + 668f315 commit 9ed0045
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 58 deletions.
4 changes: 1 addition & 3 deletions data/json/itemgroups/books.json
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,7 @@
{ "item": "holybook_sirach", "prob": 1 },
{ "item": "holybook_helliand", "prob": 1 },
{ "item": "holybook_biblechild_c", "prob": 25 },
{ "item": "holybook_biblechild_p", "prob": 50 },
{ "item": "holybook_odin", "prob": 10 },
{ "item": "holybook_asatru", "prob": 10 }
{ "item": "holybook_biblechild_p", "prob": 50 }
]
},
{
Expand Down
9 changes: 9 additions & 0 deletions data/json/items/book/anthology.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,14 @@
"longest_side": "20 cm",
"material": [ "paper" ],
"copy-from": "book_antho_tpl"
},
{
"id": "poetic_edda",
"type": "BOOK",
"name": { "str": "Poetic Edda", "str_pl": "copies of the Poetic Edda" },
"description": "The Poetic Edda is a collection of Old Norse narrative poems in alliterative verse recounting some of the stories of Norse mythology.",
"weight": "672 g",
"volume": "1368 ml",
"copy-from": "book_antho_tpl"
}
]
21 changes: 0 additions & 21 deletions data/json/items/book/spiritual.json
Original file line number Diff line number Diff line change
Expand Up @@ -1967,27 +1967,6 @@
"volume": "750 ml",
"copy-from": "holybook_abstract"
},
{
"id": "holybook_asatru",
"type": "BOOK",
"name": { "str": "The Asatru Edda: Sacred Lore of the North", "str_pl": "copies of The Asatru Edda: Sacred Lore of the North" },
"description": "A commercial-grade, hardcover English translation of The Asatru Edda. It serves as a modern guide to the religious and mythological beliefs of the followers and adherents of the contemporary revival of Norse paganism. This book contains a collection of poems, stories, rituals, and information about the gods, goddesses, heroes, and cosmology of the Norse tradition, from ancient writings and oral traditions.",
"weight": "672 g",
"volume": "1368 ml",
"copy-from": "holybook_abstract"
},
{
"id": "holybook_odin",
"type": "BOOK",
"name": {
"str": "The Odinist Edda: Sacred Lore of the North",
"str_pl": "copies of The Odinist Edda: Sacred Lore of the North"
},
"description": "A commercial-grade, hardcover English translation of The Odinist Edda. It can potentially serve as a modern guide to the religious and mythological beliefs of the contemporary revival of Norse paganism. This book contains a collection of poems, stories, rituals, and information about the gods, goddesses, heroes, and cosmology of the Norse tradition, from ancient writings and oral traditions.",
"weight": "672 g",
"volume": "1368 ml",
"copy-from": "holybook_abstract"
},
{
"id": "holybook_ginza",
"type": "BOOK",
Expand Down
10 changes: 10 additions & 0 deletions data/json/obsoletion_and_migration_0.I/migration_items.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,15 @@
"id": "rag",
"type": "MIGRATION",
"replace": "sheet_cotton"
},
{
"id": "holybook_odin",
"type": "MIGRATION",
"replace": "poetic_edda"
},
{
"id": "holybook_asatru",
"type": "MIGRATION",
"replace": "poetic_edda"
}
]
34 changes: 0 additions & 34 deletions data/json/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4334,40 +4334,6 @@
}
}
},
{
"type": "profession",
"id": "asatru_priest",
"name": { "male": "Gode", "female": "Gydje" },
"description": "As a spiritual leader of the Asatru Faith, you conducted your small community into ceremonies, rituals, sacrifices and feasts for the Norse Gods. You can't say if Ragnarok has come, but you'll surely fight like a warrior until your encounter with the Valkyries.",
"points": 0,
"skills": [ { "level": 2, "name": "speech" }, { "level": 1, "name": "melee" } ],
"items": {
"both": {
"entries": [
{ "item": "silver_ring" },
{ "item": "leather_belt" },
{ "item": "socks" },
{ "item": "boots" },
{ "item": "holybook_asatru" },
{ "group": "charged_smart_phone" },
{ "item": "holy_symbol", "variant": "odin_necklace1" },
{ "item": "bronze_knife", "container-item": "sheath" }
]
},
"male": {
"entries": [ { "item": "cloak" }, { "item": "tunic" }, { "item": "briefs" }, { "item": "pants", "variant": "pants_brown" } ]
},
"female": {
"entries": [
{ "item": "silver_hairpin" },
{ "item": "bra" },
{ "item": "dress" },
{ "item": "panties" },
{ "item": "altered_apron", "variant": "generic_apron_cotton" }
]
}
}
},
{
"type": "profession",
"id": "shinto_priest",
Expand Down

0 comments on commit 9ed0045

Please sign in to comment.