Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Merge branch 'CombatExoskeletonUpdate' of https://github.com/…
Browse files Browse the repository at this point in the history
…BalthazarArgall/Cataclysm-DDA into CombatExoskeletonUpdate"

This reverts commit 7b9b9b6, reversing
changes made to 3d13b2a.
BalthazarArgall committed Oct 20, 2023
1 parent 7b9b9b6 commit 572fe89
Showing 6 changed files with 2 additions and 249 deletions.
4 changes: 2 additions & 2 deletions data/json/professions.json
Original file line number Diff line number Diff line change
@@ -5372,8 +5372,8 @@
"points": 5,
"proficiencies": [ "prof_gunsmithing_basic", "prof_gun_cleaning" ],
"skills": [
{ "level": 7, "name": "gun" },
{ "level": 7, "name": "rifle" },
{ "level": 5, "name": "gun" },
{ "level": 5, "name": "rifle" },
{ "level": 4, "name": "pistol" },
{ "level": 3, "name": "melee" },
{ "level": 3, "name": "stabbing" },
Original file line number Diff line number Diff line change
@@ -61,7 +61,6 @@
"locations": [ "lake_surface" ],
"city_distance": [ 40, -1 ],
"occurrences": [ 100, 100 ],
"eoc": { "id": "EOC_DM_TOWER_GENERATE", "condition": { "mod_is_loaded": "defense_mode" } },
"flags": [ "DEFENSE_MODE", "GLOBALLY_UNIQUE", "LAKE" ]
}
]
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
"locations": [ "land" ],
"city_distance": [ 40, -1 ],
"occurrences": [ 100, 100 ],
"eoc": { "id": "EOC_DM_CUBICAL_GENERATE", "condition": { "mod_is_loaded": "defense_mode" } },
"flags": [ "DEFENSE_MODE", "GLOBALLY_UNIQUE" ]
}
]
144 changes: 0 additions & 144 deletions data/mods/Xedra_Evolved/items/alchemy.json
Original file line number Diff line number Diff line change
@@ -299,149 +299,5 @@
"color": "green_yellow",
"calories": 50,
"copy-from": "life_extension_potion"
},
{
"id": "plant_imbuement",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": { "str_sp": "Imbuement of the Trees" },
"description": ".",
"weight": "50 g",
"volume": "2 ml",
"price": "150 cent",
"price_postapoc": "200 USD",
"material": [ "water" ],
"symbol": "!",
"color": "light_cyan",
"container": "flask_glass",
"quench": 2,
"healthy": 7,
"fun": -30,
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the potion. Will not work on those too distant from humanity already.",
"effect_on_conditions": [ "become_plant_fae" ]
}
},
{
"id": "earth_imbuement",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": { "str_sp": "Imbuement of the Earth" },
"description": ".",
"weight": "50 g",
"volume": "2 ml",
"price": "150 cent",
"price_postapoc": "200 USD",
"material": [ "water" ],
"symbol": "!",
"color": "light_cyan",
"container": "flask_glass",
"quench": 2,
"healthy": 7,
"fun": -30,
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the potion. Will not work on those too distant from humanity already.",
"effect_on_conditions": [ "become_earth_fae" ]
}
},
{
"id": "water_imbuement",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": { "str_sp": "Imbuement of the Waters" },
"description": ".",
"weight": "50 g",
"volume": "2 ml",
"price": "150 cent",
"price_postapoc": "200 USD",
"material": [ "water" ],
"symbol": "!",
"color": "light_cyan",
"container": "flask_glass",
"quench": 2,
"healthy": 7,
"fun": -30,
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the potion. Will not work on those too distant from humanity already.",
"effect_on_conditions": [ "become_water_fae" ]
}
},
{
"id": "air_imbuement",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": { "str_sp": "Imbuement of the Winds" },
"description": ".",
"weight": "50 g",
"volume": "2 ml",
"price": "150 cent",
"price_postapoc": "200 USD",
"material": [ "water" ],
"symbol": "!",
"color": "light_cyan",
"container": "flask_glass",
"quench": 2,
"healthy": 7,
"fun": -30,
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the potion. Will not work on those too distant from humanity already.",
"effect_on_conditions": [ "become_air_fae" ]
}
},
{
"id": "fire_imbuement",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": { "str_sp": "Imbuement of the Flames" },
"description": ".",
"weight": "50 g",
"volume": "2 ml",
"price": "150 cent",
"price_postapoc": "200 USD",
"material": [ "water" ],
"symbol": "!",
"color": "light_cyan",
"container": "flask_glass",
"quench": 2,
"healthy": 7,
"fun": -30,
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the potion. Will not work on those too distant from humanity already.",
"effect_on_conditions": [ "become_fire_fae" ]
}
},
{
"id": "doll_imbuement",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": { "str_sp": "Imbuement of Parchment" },
"description": ".",
"weight": "50 g",
"volume": "2 ml",
"price": "150 cent",
"price_postapoc": "200 USD",
"material": [ "water" ],
"symbol": "!",
"color": "light_cyan",
"container": "flask_glass",
"quench": 2,
"healthy": 7,
"fun": -30,
"flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
"use_action": {
"type": "effect_on_conditions",
"description": "Drink the potion. Will not work on those too distant from humanity already.",
"effect_on_conditions": [ "become_doll_fae" ]
}
}
]
Original file line number Diff line number Diff line change
@@ -98,105 +98,5 @@
{ "u_add_effect": "mental_exhaustion", "intensity": 1, "duration": "192 hours" }
],
"false_effect": [ { "u_message": "Your thoughts are too scattered to unearth more secrets of the universe." } ]
},
{
"type": "effect_on_condition",
"id": "EOC_ALCHEMY5",
"condition": { "and": [ { "u_has_trait": "perk_ALCHEMY5" }, { "not": { "u_has_effect": "mental_exhaustion" } } ] },
"effect": [
{
"u_roll_remainder": [ "plant_imbuement", "earth_imbuement", "water_imbuement", "air_imbuement", "fire_imbuement", "doll_imbuement" ],
"type": "recipe",
"true_eocs": [ "EOC_SUCCESFUL_ROLL_REMAINDER_ALCHEMY" ],
"false_eocs": [ "EOC_COMPLETED_ROLL_REMAINDER_ALCHEMY" ]
},
{ "u_add_effect": "mental_exhaustion", "intensity": 1, "duration": "384 hours" }
],
"false_effect": [ { "u_message": "Your thoughts are too scattered to unearth more secrets of the universe." } ]
},
{
"type": "effect_on_condition",
"id": "become_fire_fae",
"condition": { "not": { "u_has_flag": "MUTATION_THRESHOLD" } },
"effect": [
{
"u_message": "You imbibed the concoction and you feel your soul merge with an alien power, becoming attuned to fire.",
"type": "good"
},
{ "u_add_trait": "SALAMANDER" },
{ "u_learn_recipe": "mutagen_flamekin" },
{ "u_learn_recipe": "charred_sacrifice" }
],
"false_effect": [ { "u_message": "The power attempts to take hold, but is rebuffed by something sinister within you." } ]
},
{
"type": "effect_on_condition",
"id": "become_doll_fae",
"condition": { "not": { "u_has_flag": "MUTATION_THRESHOLD" } },
"effect": [
{
"u_message": "You imbibed the concoction and you feel your soul merge with an alien power, becoming wierdly doll-like?."
},
{ "u_add_trait": "HOMULLUS" },
{ "u_learn_recipe": "mutagen_dollkin" },
{ "u_learn_recipe": "doll_repair_paste" }
],
"false_effect": [ { "u_message": "The power attempts to take hold, but is rebuffed by something sinister within you." } ]
},
{
"type": "effect_on_condition",
"id": "become_air_fae",
"condition": { "not": { "u_has_flag": "MUTATION_THRESHOLD" } },
"effect": [
{
"u_message": "You imbibed the concoction and you feel your soul merge with an alien power, becoming attuned to the winds."
},
{ "u_add_trait": "SYLPH" },
{ "u_learn_recipe": "mutagen_airkin" },
{ "u_learn_recipe": "ethereal_draught" }
],
"false_effect": [ { "u_message": "The power attempts to take hold, but is rebuffed by something sinister within you." } ]
},
{
"type": "effect_on_condition",
"id": "become_water_fae",
"condition": { "not": { "u_has_flag": "MUTATION_THRESHOLD" } },
"effect": [
{
"u_message": "You imbibed the concoction and you feel your soul merge with an alien power, becoming attuned to the waters."
},
{ "u_add_trait": "UNDINE" },
{ "u_learn_recipe": "mutagen_waterkin" },
{ "u_learn_recipe": "cerulean_poultice" }
],
"false_effect": [ { "u_message": "The power attempts to take hold, but is rebuffed by something sinister within you." } ]
},
{
"type": "effect_on_condition",
"id": "become_earth_fae",
"condition": { "not": { "u_has_flag": "MUTATION_THRESHOLD" } },
"effect": [
{
"u_message": "You imbibed the concoction and you feel your soul merge with an alien power, becoming attuned to the earth."
},
{ "u_add_trait": "IERDE" },
{ "u_learn_recipe": "mutagen_earthkin" },
{ "u_learn_recipe": "cthonic_poultice" }
],
"false_effect": [ { "u_message": "The power attempts to take hold, but is rebuffed by something sinister within you." } ]
},
{
"type": "effect_on_condition",
"id": "become_plant_fae",
"condition": { "not": { "u_has_flag": "MUTATION_THRESHOLD" } },
"effect": [
{
"u_message": "You imbibed the concoction and you feel your soul merge with an alien power, becoming attuned to the natural world."
},
{ "u_add_trait": "ARVORE" },
{ "u_learn_recipe": "mutagen_plantkin" },
{ "u_learn_recipe": "verdant_poultice" }
],
"false_effect": [ { "u_message": "The power attempts to take hold, but is rebuffed by something sinister within you." } ]
}
]
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@
"locations": [ "land" ],
"city_distance": [ 40, -1 ],
"occurrences": [ 100, 100 ],
"eoc": { "id": "EOC_DM_OFFICE_GENERATE", "condition": { "mod_is_loaded": "defense_mode" } },
"flags": [ "DEFENSE_MODE", "GLOBALLY_UNIQUE" ]
},
{

0 comments on commit 572fe89

Please sign in to comment.