Skip to content

Commit

Permalink
Bunch of JSON fixes
Browse files Browse the repository at this point in the history 
Still can't figure out why the mod tileset and overlay stuff is spitting
out errors, my only guess is something on DDA's end because no sign that
the format is different enough to error, and it is definitely working.
  • Loading branch information
@chaosvolt
chaosvolt committed Dec 19, 2020
1 parent 50dead3 commit 410fd95
Show file tree
Hide file tree
Showing 24 changed files with 402 additions and 584 deletions.
28 changes: 14 additions & 14 deletions Arcana/effects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"type": "effect_type",
"id": "potion_numbness",
"name": [ "Intense Numbness" ],
"resist_effect": "talisman_warding",
"resist_effects": [ "talisman_warding" ],
"desc": [ "Your body feels incredibly numb and sluggish." ],
"remove_message": "The numbness fades.",
"//": "Only Mycus Adrenaline in this case can really shake off the sluggishness.",
Expand All @@ -36,7 +36,7 @@
"type": "effect_type",
"id": "potion_strength",
"name": [ "Strengthened" ],
"resist_effect": "talisman_warding",
"resist_effects": [ "talisman_warding" ],
"desc": [ "You feel mighty, like you could take on the world." ],
"remove_message": "The unnatural strength leaves your body.",
"decay_messages": [ [ "The strengthening effect of your potion is starting to fade.", "bad" ] ],
Expand Down Expand Up @@ -65,7 +65,7 @@
"id": "potion_speed",
"name": [ "Speedy" ],
"desc": [ "Your heart feels like it's beating dangerously fast, you can't even think about rest." ],
"resist_effect": "talisman_warding",
"resist_effects": [ "talisman_warding" ],
"remove_message": "Your heartbeat slows back down to a normal pace.",
"//": "Hinders relaxing, but paralysis and similar effects are too strong to prevent.",
"removes_effects": [ "relax_gas", "lack_sleep", "sleep" ],
Expand Down Expand Up @@ -94,7 +94,7 @@
"type": "effect_type",
"id": "potion_healing",
"name": [ "Elixir" ],
"resist_effect": "talisman_warding",
"resist_effects": [ "talisman_warding" ],
"desc": [ "Not immortality, but it still feels nice." ],
"remove_message": "The healing effect fades.",
"removes_effects": [ "infected", "fungus", "bleed", "common_cold", "flu", "tetanus", "redcells_anemia", "hypovolemia" ],
Expand All @@ -116,7 +116,7 @@
"type": "effect_type",
"id": "potion_vulnerary",
"name": [ "Vulnerary" ],
"resist_effect": "talisman_warding",
"resist_effects": [ "talisman_warding" ],
"desc": [ "You can feel a soothing sensation lingering after applying salve to your wounds." ],
"remove_message": "The vulnerary's after-effects fade.",
"removes_effects": [ "spores" ],
Expand All @@ -138,7 +138,7 @@
"type": "effect_type",
"id": "potion_incense",
"name": [ "Incense" ],
"resist_effect": "talisman_warding",
"resist_effects": [ "talisman_warding" ],
"desc": [ "Your mind feels energized, warding off fatigue." ],
"remove_message": "The incense's effect fades.",
"decay_messages": [ [ "The effects of the incense are fading.", "bad" ] ],
Expand All @@ -159,7 +159,7 @@
"id": "revenant_hunger",
"name": [ "Revenant Hunger" ],
"desc": [ "Immunity to food poisoning and parasites, increased hunger gain. Does not purge pre-existing conditions." ],
"resist_effect": "talisman_warding",
"resist_effects": [ "talisman_warding" ],
"remove_message": "Your craving for rotten food subsides.",
"blocks_effects": [ "poison", "badpoison", "foodpoison", "paralyzepoison", "bloodworms", "paincysts", "brainworms", "tapeworm" ],
"removes_effects": [ "hunger_full", "hunger_engorged" ],
Expand Down Expand Up @@ -546,7 +546,7 @@
"desc": [
"Immunity to food poisoning, parasites, and fungus. Increased hunger and thirst gain, with positive metabolic effects."
],
"resist_effect": "talisman_warding",
"resist_effects": [ "talisman_warding" ],
"remove_message": "The protective effect of your sanguine mark fades, leaving a momentary itch in your veins.",
"removes_effects": [
"nausea",
Expand Down Expand Up @@ -622,7 +622,7 @@
{
"type": "effect_type",
"id": "arcane_healing_side_effects",
"resist_effect": "talisman_warding",
"resist_effects": [ "talisman_warding" ],
"name": [
"Healing Fatigue",
"Healing Overexertion",
Expand Down Expand Up @@ -682,7 +682,7 @@
"id": "arcana_suppression",
"name": [ "Suppressed Fire" ],
"desc": [ "Reduces hunger and thirst gain, hinders stamina regen." ],
"resist_effect": "talisman_warding",
"resist_effects": [ "talisman_warding" ],
"remove_message": "The warmth within your body flares up as the suppression effect fades.",
"blocks_effects": [
"nausea",
Expand Down Expand Up @@ -803,7 +803,7 @@
"type": "effect_type",
"id": "archon_gaze_effect",
"//": "Regular Ward Against Evil will only protect you a bit, you need Holy Ward to actually stop the effect. This will be relevant once I add an encounter you can access after restoring the ritual blade.",
"resist_effect": "cleric_warding",
"resist_effects": [ "cleric_warding" ],
"name": [ "Glimpse of The Beyond" ],
"desc": [ "You caught the attention of something that doesn't belong in this world…" ],
"apply_message": "You feel cold inside…",
Expand Down Expand Up @@ -836,7 +836,7 @@
{
"type": "effect_type",
"id": "chalice_offering_side_effects",
"resist_effect": "talisman_warding",
"resist_effects": [ "talisman_warding" ],
"resist_traits": [ "PROF_CHALICE", "THRESH_VEIL" ],
"name": [
"",
Expand Down Expand Up @@ -896,7 +896,7 @@
{
"type": "effect_type",
"id": "blood_athame_side_effects",
"resist_effect": "talisman_warding",
"resist_effects": [ "talisman_warding" ],
"resist_traits": [ "PROF_SANGUINE", "THRESH_DRAGONBLOOD" ],
"//": "This won't kill you, but the health and stat penalties will make you wish it did later on down the line.",
"name": [ "", "Strange Anemia", "Strange Anemia", "Strange Anemia", "Strange Anemia", "Strange Anemia" ],
Expand Down Expand Up @@ -1052,7 +1052,7 @@
{
"type": "effect_type",
"id": "hermit_stage_2",
"\\": "AI tag marking The Hermit's quest progression, changing dialogue. Intended to be permanent. Also given to players for achievement tracking purposes."
"//": "AI tag marking The Hermit's quest progression, changing dialogue. Intended to be permanent. Also given to players for achievement tracking purposes."
},
{
"type": "effect_type",
Expand Down
121 changes: 79 additions & 42 deletions Arcana/item_groups/item_groups_vanilla.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,42 @@
{
"id": "homebooks",
"type": "item_group",
"items": [ [ "book_magicfordummies", 1 ], [ "book_potioncraft", 1 ], [ "book_scrollcraft", 1 ] ]
"subtype": "distribution",
"entries": [
{ "item": "book_magicfordummies", "prob": 1 },
{ "item": "book_potioncraft", "prob": 1 },
{ "item": "book_scrollcraft", "prob": 1 }
]
},
{
"id": "church",
"type": "item_group",
"items": [ [ "book_hexenhammer", 1 ], [ "book_scrollcraft", 1 ], [ "manual_cleansingflame", 1 ] ]
"subtype": "distribution",
"entries": [
{ "item": "book_hexenhammer", "prob": 1 },
{ "item": "book_scrollcraft", "prob": 1 },
{ "item": "manual_cleansingflame", "prob": 1 }
]
},
{
"id": "religious_books",
"type": "item_group",
"items": [ [ "book_hexenhammer", 1 ], [ "book_scrollcraft", 1 ], [ "book_sacrifice", 1 ] ]
"subtype": "distribution",
"entries": [
{ "item": "book_hexenhammer", "prob": 1 },
{ "item": "book_scrollcraft", "prob": 1 },
{ "item": "book_sacrifice", "prob": 1 }
]
},
{
"id": "mansion_books",
"type": "item_group",
"items": [ [ "book_magicfordummies", 5 ], [ "book_potioncraft", 3 ], [ "book_scrollcraft", 2 ] ]
"subtype": "distribution",
"entries": [
{ "item": "book_magicfordummies", "prob": 5 },
{ "item": "book_potioncraft", "prob": 3 },
{ "item": "book_scrollcraft", "prob": 2 }
]
},
{
"id": "mansion_bookcase",
Expand All @@ -28,24 +48,29 @@
{
"id": "exotic_books",
"type": "item_group",
"items": [ [ "book_hexenhammer", 5 ], [ "book_scrollcraft", 5 ], [ "book_sacrifice", 2 ] ]
"subtype": "distribution",
"entries": [
{ "item": "book_hexenhammer", "prob": 5 },
{ "item": "book_scrollcraft", "prob": 5 },
{ "item": "book_sacrifice", "prob": 2 }
]
},
{
"id": "rare_martial_arts_books",
"type": "item_group",
"items": [ [ "manual_cleansingflame", 1 ] ]
"subtype": "distribution",
"entries": [ { "item": "manual_cleansingflame", "prob": 1 } ]
},
{
"id": "SUS_chemistry_bookcase",
"type": "item_group",
"subtype": "collection",
"entries": [
{ "item": "book_potioncraft", "prob": 5 }
]
"entries": [ { "item": "book_potioncraft", "prob": 5 } ]
},
{
"id": "SUS_book_nonf_hard_spirit",
"type": "item_group",
"subtype": "distribution",
"entries": [
{ "item": "book_hexenhammer", "prob": 2 },
{ "item": "book_scrollcraft", "prob": 2 },
Expand All @@ -55,25 +80,28 @@
{
"id": "SUS_book_nonf_soft_occult",
"type": "item_group",
"entries": [
{ "group": "magic_books", "prob": 1 }
]
"subtype": "distribution",
"entries": [ { "group": "magic_books", "prob": 1 } ]
},
{
"id": "mansion_safe",
"type": "item_group",
"subtype": "collection",
"groups": [
"items": [
{ "group": "magic_consumables", "prob": 45 },
{ "group": "magic_items", "prob": 30 },
{ "group": "magic_tools", "prob": 15 },
{ "item": "arcanemap", "prob": 25 }
[ "arcanemap", 20 ]
]
},
{
"id": "cop_evidence",
"type": "item_group",
"items": [ [ "offering_chalice", 1 ], [ "blood_athame", 1 ] ]
"subtype": "distribution",
"entries": [
{ "item": "offering_chalice", "prob": 1 },
{ "item": "blood_athame", "prob": 1 }
]
},
{
"id": "creepy",
Expand All @@ -99,31 +127,33 @@
{
"id": "antique_rare",
"type": "item_group",
"items": [
[ "mana_gem", 3 ],
[ "offering_chalice", 2 ],
[ "blood_athame", 2 ],
[ "revenant_crown", 1 ],
[ "gauntlets_necro", 1 ],
[ "thunder_sigil", 1 ],
[ "brooch_iridescent", 3 ]
"subtype": "distribution",
"entries": [
{ "item": "mana_gem", "prob": 3 },
{ "item": "offering_chalice", "prob": 2 },
{ "item": "blood_athame", "prob": 2 },
{ "item": "revenant_crown", "prob": 1 },
{ "item": "gauntlets_necro", "prob": 1 },
{ "item": "thunder_sigil", "prob": 1 },
{ "item": "brooch_iridescent", "prob": 3 }
]
},
{
"id": "art",
"type": "item_group",
"items": [
[ "mana_gem", 2 ],
[ "offering_chalice", 3 ],
[ "revenant_crown", 3 ],
[ "gauntlets_necro", 1 ],
[ "thunder_sigil", 3 ],
[ "amulet_exotic", 2 ],
[ "brooch_iridescent", 2 ],
[ "totem_elecresist", 1 ],
[ "totem_clairvoyance", 1 ],
[ "totem_insight", 1 ],
[ "totem_lightning", 1 ]
"subtype": "distribution",
"entries": [
{ "item": "mana_gem", "prob": 2 },
{ "item": "offering_chalice", "prob": 3 },
{ "item": "revenant_crown", "prob": 3 },
{ "item": "gauntlets_necro", "prob": 1 },
{ "item": "thunder_sigil", "prob": 3 },
{ "item": "amulet_exotic", "prob": 2 },
{ "item": "brooch_iridescent", "prob": 2 },
{ "item": "totem_elecresist", "prob": 1 },
{ "item": "totem_clairvoyance", "prob": 1 },
{ "item": "totem_insight", "prob": 1 },
{ "item": "totem_lightning", "prob": 1 }
]
},
{
Expand Down Expand Up @@ -155,13 +185,19 @@
{
"id": "my_precious",
"type": "item_group",
"items": [ [ "book_hexenhammer", 10 ], [ "book_sacrifice", 10 ], [ "book_bloodmagic", 10 ] ]
"subtype": "distribution",
"entries": [
{ "item": "book_hexenhammer", "prob": 10 },
{ "item": "book_sacrifice", "prob": 10 },
{ "item": "book_bloodmagic", "prob": 10 }
]
},
{
"id": "spider",
"type": "item_group",
"items": [
[ "arcanemap", 5 ],
"subtype": "distribution",
"entries": [
{ "item": "arcanemap", "prob": 5 },
{ "group": "magic_tools", "prob": 1 },
{ "group": "magic_items", "prob": 1 },
{ "group": "magic_consumables", "prob": 1 },
Expand All @@ -186,13 +222,14 @@
{
"id": "rare",
"type": "item_group",
"items": [
"subtype": "distribution",
"entries": [
{ "group": "magic_books", "prob": 5 },
{ "group": "magic_consumables", "prob": 2 },
{ "group": "magic_tools", "prob": 2 },
{ "group": "magic_items", "prob": 1 },
[ "tindalos_whistle", 10 ],
[ "spatial_displacer", 5 ]
{ "item": "tindalos_whistle", "prob": 10 },
{ "item": "spatial_displacer", "prob": 5 }
]
},
{
Expand All @@ -201,7 +238,7 @@
"items": [ [ "offering_chalice", 1 ], [ "blood_athame", 1 ] ]
},
{
"id": "museum_primative",
"id": "museum_primitive",
"type": "item_group",
"items": [ [ "totem_cleric", 1 ], [ "totem_agile", 1 ], [ "totem_strength", 1 ], [ "totem_invis", 1 ] ]
},
Expand Down
Loading

0 comments on commit 410fd95

Please sign in to comment.