Skip to content

Commit

Permalink
[Magiclysm] Remove duplicate religious professions (#79162)
Browse files Browse the repository at this point in the history 
* Update professions.json

* Redirect Lost Faith to vanilla professions, add books

* Reformat item field?

* Update data/mods/Magiclysm/scenarios.json

* Add scenario EoC

* Remove debug message

* Kick tests

---------

Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
  • Loading branch information
@Standing-Storm @GuardianDll
Standing-Storm and GuardianDll authored Jan 16, 2025
1 parent f14346c commit e4d1530
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 177 deletions.
175 changes: 0 additions & 175 deletions data/mods/Magiclysm/professions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,181 +78,6 @@
},
"traits": [ "DRUID" ]
},
{
"type": "profession",
"id": "priest_magic2",
"name": "Priest",
"description": "When the apocalypse struck you did everything you could to protect your parish faithful, but it appears that prayers were not enough. Now that they are all dead, you should probably find something more tangible to protect you.",
"points": 0,
"flags": [ "SCEN_ONLY" ],
"skills": [ { "level": 3, "name": "speech" } ],
"items": {
"both": {
"entries": [
{ "item": "pants" },
{ "item": "longshirt" },
{ "item": "socks" },
{ "item": "cassock" },
{ "item": "dress_shoes" },
{ "item": "holy_symbol" },
{ "item": "holybook_bible1" },
{ "item": "priest_beginner" },
{ "item": "mbag" },
{ "group": "charged_cell_phone" }
]
},
"male": { "entries": [ { "item": "briefs" } ] },
"female": { "entries": [ { "item": "bra" }, { "item": "panties" } ] }
}
},
{
"type": "profession",
"id": "shinto_priest_magic2",
"name": "Kannushi",
"description": "You were one of the maintainers of a Shinto shrine, performing rituals and sacred tasks. You preferred it when only the spirits of the dead inhabited your shrine, and not their rotting corpses.",
"points": 0,
"flags": [ "SCEN_ONLY" ],
"skills": [ { "level": 1, "name": "fabrication" }, { "level": 1, "name": "tailor" } ],
"items": {
"both": {
"entries": [
{ "item": "kariginu" },
{ "item": "eboshi" },
{ "item": "pants" },
{ "item": "tabi_dress" },
{ "item": "geta" },
{ "item": "holy_symbol" },
{ "item": "holybook_kojiki" },
{ "item": "priest_beginner" },
{ "item": "mbag" },
{ "group": "charged_cell_phone" }
]
},
"male": { "entries": [ { "item": "briefs" } ] },
"female": { "entries": [ { "item": "bra" }, { "item": "panties" } ] }
}
},
{
"type": "profession",
"id": "imam_magic2",
"name": { "male": "Imam", "female": "Mourchida" },
"description": "You spent much of your time prior to the apocalypse at the local mosque, studying the words of the Prophet and the Quran and guiding your community in prayer. Back then they came from far and wide to listen to you, now they come to eat your brains.",
"points": 0,
"flags": [ "SCEN_ONLY" ],
"//": "No knife, fire, or decent storage/armor. Skill points are countered.",
"skills": [ { "level": 2, "name": "speech" } ],
"items": {
"both": {
"entries": [
{ "item": "pants" },
{ "item": "socks" },
{ "item": "kufi" },
{ "item": "thawb" },
{ "item": "lowtops" },
{ "item": "holybook_quran" },
{ "item": "priest_beginner" },
{ "item": "mbag" },
{ "group": "charged_cell_phone" },
{ "item": "tshirt", "variant": "generic_tshirt" }
]
},
"male": { "entries": [ { "item": "briefs" } ] },
"female": { "entries": [ { "item": "bra" }, { "item": "panties" } ] }
}
},
{
"type": "profession",
"id": "rabbi_magic2",
"name": "Rabbi",
"description": "You were davening Shacharit in shul when the Cataclysm struck. You had always taught that God will restore life to the dead after Moshiach has come, but not like this!",
"points": 0,
"flags": [ "SCEN_ONLY" ],
"skills": [ { "level": 2, "name": "speech" }, { "level": 1, "name": "firstaid" } ],
"items": {
"both": {
"entries": [
{ "item": "pants" },
{ "item": "leather_belt" },
{ "item": "dress_shirt" },
{ "item": "socks" },
{ "item": "kittel" },
{ "item": "kippah" },
{ "item": "tallit_gadol" },
{ "item": "dress_shoes" },
{ "item": "holybook_talmud" },
{ "item": "holybook_tanakh" },
{ "item": "priest_beginner" },
{ "item": "mbag" },
{ "group": "charged_cell_phone" },
{ "item": "holy_symbol", "variant": "jewish_necklace1" }
]
},
"male": { "entries": [ { "item": "briefs" } ] },
"female": { "entries": [ { "item": "bra" }, { "item": "panties" } ] }
}
},
{
"type": "profession",
"id": "guru_magic2",
"name": "Guru",
"description": "You spent many years traveling the world, becoming wise and learned. Normally, you can answer any question, but even you are not quite sure what to do about the ravenous undead.",
"points": 2,
"flags": [ "SCEN_ONLY" ],
"//": "1.5 pts skills, cutting implement, and plenty of storage, so lack of fire only goes so far.",
"skills": [ { "level": 2, "name": "speech" }, { "level": 1, "name": "survival" } ],
"items": {
"both": {
"entries": [
{ "item": "jeans" },
{ "item": "socks" },
{ "item": "robe" },
{ "item": "turban" },
{ "item": "waterskin" },
{ "item": "pockknife" },
{ "item": "mbag" },
{ "item": "leathersandals" },
{ "item": "holy_symbol" },
{ "item": "wristwatch" },
{ "item": "priest_beginner" },
{ "group": "charged_cell_phone" },
{ "item": "tshirt", "variant": "generic_tshirt" }
]
},
"male": { "entries": [ { "item": "briefs" } ] },
"female": { "entries": [ { "item": "panties" } ] }
}
},
{
"type": "profession",
"id": "preacher_magic2",
"name": "Preacher",
"description": "You devoted your life to spreading the good word; always on the road, traveling from town to town. Now everything has gone to hell, you can't host your daily podcast, and the undead listening to your sermons don't seem particularly moved.",
"points": 2,
"flags": [ "SCEN_ONLY" ],
"//": "Storage + 2 points in skills, - no knife or fire.",
"skills": [ { "level": 2, "name": "speech" }, { "level": 1, "name": "driving" }, { "level": 1, "name": "computer" } ],
"items": {
"both": {
"entries": [
{ "item": "dress_shirt" },
{ "item": "pants" },
{ "item": "socks" },
{ "item": "dress_shoes" },
{ "item": "wristwatch" },
{ "item": "backpack" },
{ "item": "laptop" },
{ "item": "flyer" },
{ "item": "flyer" },
{ "item": "flyer" },
{ "item": "holy_symbol" },
{ "item": "priest_beginner" },
{ "group": "charged_cell_phone" }
]
},
"male": { "entries": [ { "item": "briefs" } ] },
"female": { "entries": [ { "item": "bra" }, { "item": "panties" } ] }
}
},
{
"type": "profession",
"id": "novice_necromancer",
Expand Down
14 changes: 12 additions & 2 deletions data/mods/Magiclysm/scenarios.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,19 @@
"flags": [ "LONE_START" ],
"points": 2,
"description": "You've been preaching your faith for a long time, but the recent events have begun to make you doubt it. Wandering in your temple, you just found books that may restore your faith or shatter it completely.",
"start_name": "Church",
"start_name": "Sanctuary",
"allowed_locs": [ "sloc_church" ],
"professions": [ "priest_magic2", "shinto_priest_magic2", "imam_magic2", "rabbi_magic2", "guru_magic2", "preacher_magic2" ]
"eoc": [ "EOC_MAGICLYSM_LOST_FAITH" ],
"professions": [ "priest", "shinto_priest", "imam", "rabbi", "guru", "preacher" ]
},
{
"type": "effect_on_condition",
"id": "EOC_MAGICLYSM_LOST_FAITH",
"eoc_type": "SCENARIO_SPECIFIC",
"effect": [
{ "u_spawn_item": "priest_beginner", "suppress_message": true },
{ "u_spawn_item": "priest_advanced", "suppress_message": true }
]
},
{
"type": "scenario",
Expand Down

0 comments on commit e4d1530

Please sign in to comment.