Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Magiclysm brown dragon #35636

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
95ff96a
Magiclysm - Brown Dragon added
ZhamelSeh Nov 18, 2019
8900561
Merge branch 'master' into Magiclysm_New_Dragons
ZhamelSeh Nov 19, 2019
17da389
Merge remote-tracking branch 'upstream/master' into Magiclysm_New_Dra…
ZhamelSeh Nov 20, 2019
75498b7
Brown dragon EQ protection balance
ZhamelSeh Nov 20, 2019
ae63780
Added XL variants of brown dragon armor
ZhamelSeh Nov 20, 2019
a2a50c3
Merge pull request #1 from ZhamelSeh/Magiclysm_New_Dragons
ZhamelSeh Nov 20, 2019
6273ac0
Delete dragonbreath.json
ZhamelSeh Nov 20, 2019
18fb78d
Add files via upload
ZhamelSeh Nov 20, 2019
3633f02
Brown dragon recipes
ZhamelSeh Nov 20, 2019
d2af384
Merge branch 'master' of https://github.com/ZhamelSeh/Cataclysm-DDA
ZhamelSeh Nov 20, 2019
84ffa45
Corrected dragon color for file.
ZhamelSeh Nov 20, 2019
1553a7d
XL spacing in names
ZhamelSeh Nov 21, 2019
53d6bd5
Cleaned up last reference to acid for brown dragons.
ZhamelSeh Nov 21, 2019
9afc019
Rename reference from kevlar to brown dragonhide.
ZhamelSeh Nov 21, 2019
a098ebb
Punctuation correction.
ZhamelSeh Nov 21, 2019
c6b2949
Update itemgroups.json
ZhamelSeh Nov 21, 2019
8c8428a
Merge remote-tracking branch 'upstream/master' into Magiclysm_Dragons
ZhamelSeh Nov 21, 2019
4d70dc2
Corrected JSON issue
ZhamelSeh Nov 21, 2019
d4751e8
Revert "Merge pull request #35577 from TJKing293/add-stone-pouch"
ZhamelSeh Nov 21, 2019
bc99fc1
Revert "Revert "Merge pull request #35577 from TJKing293/add-stone-po…
ZhamelSeh Nov 21, 2019
edb0b87
Correcting JSON issues
ZhamelSeh Nov 21, 2019
60d7c55
Sigh. More JSON fixes
ZhamelSeh Nov 21, 2019
43906d7
Merge remote-tracking branch 'upstream/master'
ZhamelSeh Nov 23, 2019
d113280
Merge branch 'master' into Magiclysm_Dragons
ZhamelSeh Nov 23, 2019
41840d7
Merge remote-tracking branch 'upstream/master'
ZhamelSeh Dec 5, 2019
136a37e
Merge branch 'master' into Magiclysm_Dragons
ZhamelSeh Dec 5, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions data/mods/Magiclysm/harvest.json
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,18 @@
{ "drop": "bone", "type": "bone", "mass_ratio": 0.1 }
]
},
{
"id": "dragon_brown",
"type": "harvest",
"entries": [
{ "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.1 },
{ "drop": "dragon_blood", "type": "flesh", "mass_ratio": 0.1 },
{ "drop": "meat_dragon", "type": "flesh", "mass_ratio": 0.18 },
{ "drop": "dragon_brown_scale", "type": "skin", "mass_ratio": 0.05 },
{ "drop": "brown_dragon_hide_raw", "type": "skin", "mass_ratio": 0.1 },
{ "drop": "bone", "type": "bone", "mass_ratio": 0.1 }
]
},
{
"id": "zombie",
"//": "your bog standard zombie",
Expand Down
44 changes: 43 additions & 1 deletion data/mods/Magiclysm/itemgroups/itemgroups.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "item_group",
"id": "dragon_books",
"//": "puts all the dragon books in one group, so it's easy to add more later",
"items": [ [ "black_dragons", 10 ] ]
"items": [ [ "black_dragons", 10 ], [ "brown_dragons", 10 ] ]
},
{
"type": "item_group",
Expand Down Expand Up @@ -241,6 +241,48 @@
{ "group": "spellbook_loot_2", "prob": 20 }
]
},
{
"type": "item_group",
"id": "lair_brown_dragon",
"//": "Stuff you would find in any dragon deeper lair level. Gold, jewelry, weapons etc. Should require a bit of a fight or risk to access.",
"items": [
{ "item": "bone_human", "prob": 30, "count-min": 1, "count-max": 5 },
{ "group": "archery", "prob": 1 },
{ "group": "jewelry_safe", "prob": 2 },
{ "group": "jewelry_front", "prob": 2 },
{ "group": "corpses", "prob": 20 },
{ "group": "remains_human_generic", "prob": 5, "count-min": 1, "count-max": 2 },
{ "group": "archery_ammo", "prob": 2, "count-min": 1, "count-max": 4 },
{ "group": "medieval", "prob": 1, "count-min": 1, "count-max": 2 },
{ "group": "medieval", "prob": 1, "count-min": 1, "count-max": 2 },
{ "group": "enchanted_combat_items", "prob": 1 }
]
},
{
"type": "item_group",
"id": "lair_brown_dragon_treasure",
"//": "Stuff you would find in any dragon treasure room or from a boss fight. Should require exceptional risk to access. Includes lower tier group, plus the best magic items.",
"items": [
{ "group": "lair_loot_generic", "prob": 80, "count": [ 2, 6 ] },
{ "item": "dragon_brown_scale", "count": [ 48, 120 ] },
{ "group": "enchanted_tokens_weapon", "prob": 30 },
{ "group": "enchanted_rings_common", "prob": 40 },
{ "group": "enchanted_rings_uncommon", "prob": 30 },
{ "group": "enchanted_rings_unusual", "prob": 20 },
{ "group": "enchanted_rings_rare", "prob": 10 },
{ "group": "enchanted_melee_weapons_plus1", "prob": 30 },
{ "group": "enchanted_melee_weapons_plus2", "prob": 10 },
{ "group": "enchanted_wands_minor", "prob": 40 },
{ "group": "enchanted_wands_lesser", "prob": 20 },
{ "group": "enchanted_wands_greater", "prob": 10 },
{ "group": "enchanted_masks", "prob": 10 },
{ "group": "enchanted_bracers_lesser", "prob": 20 },
{ "group": "enchanted_bracers_greater", "prob": 10 },
{ "group": "enchanted_boots", "prob": 15 },
{ "group": "enchanted_belts", "prob": 15 },
{ "group": "spellbook_loot_2", "prob": 20 }
]
},
{
"id": "enchanted_misc",
"type": "item_group",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/items/black_dragon_items.json
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
"category": "armor",
"name": "pair of black dragonhide gloves",
"name_plural": "pairs of black dragonhide gloves",
"description": "A pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
"description": "A pair of customized, black dragonhide gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
"weight": 230,
"volume": "750 ml",
"price": 180000,
Expand Down
Loading