Skip to content

Commit

Permalink
Merge pull request CleverRaven#51471 from Night-Pryanik/balrog-mine
Browse files Browse the repository at this point in the history
New mine variant for Magiclysm
  • Loading branch information
Rivet-the-Zombie authored Oct 7, 2021
2 parents 644c2ec + 7c19157 commit 8cdc540
Show file tree
Hide file tree
Showing 9 changed files with 391 additions and 1 deletion.
20 changes: 20 additions & 0 deletions data/mods/Magiclysm/items/books.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,25 @@
"intelligence": 9,
"time": "45 m",
"fun": 0
},
{
"id": "textbook_mithril",
"type": "BOOK",
"name": { "str_sp": "ᚲᚨᚲ:ᚲᛟᚹᚨᛏ:ᛗᛁᚠᚱᛁᛚ" },
"description": "This book is written in a runic language unfamiliar to you. Fortunately, there are several very detailed pictures that demonstrate the process of forging a sword from an ingot of silvery metal. You get the impression that this is some sort of textbook for blacksmiths.",
"weight": "654 g",
"volume": "1250 ml",
"price": 6400,
"price_postapoc": 2250,
"material": [ "paper" ],
"symbol": "?",
"color": "blue",
"skill": "fabrication",
"required_level": 7,
"max_level": 10,
"proficiencies": [ { "proficiency": "prof_bladesmith", "time_factor": 0.2, "fail_factor": 0.3, "include_prereqs": false } ],
"intelligence": 9,
"time": "60 m",
"fun": -1
}
]
10 changes: 10 additions & 0 deletions data/mods/Magiclysm/items/melee.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,15 @@
"cutting": 35,
"relic_data": { "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "hit_you_effect": [ { "id": "wolfsbane" } ] } ] },
"price": 200000
},
{
"id": "longsword_mithril",
"copy-from": "longsword",
"type": "TOOL",
"name": { "str": "longsword" },
"description": "This is a classic medieval sword, the size being in-between the lighter arming sword and later two-handed swords. Thanks to the mysterious silvery metal it was forged from, it is stronger than tempered steel while weighing substantially less.",
"material": [ "mithril_metal" ],
"weight": "939 g",
"proportional": { "cutting": 1.5, "bashing": 0.7 }
}
]
4 changes: 3 additions & 1 deletion data/mods/Magiclysm/martialarts.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@
"gunblade",
"gram",
"flamesword",
"longsword_holy"
"longsword_holy",
"longsword_mithril"
]
}
},
Expand Down Expand Up @@ -208,6 +209,7 @@
"knife_rambo_plus_two",
"knife_trench_plus_one",
"knife_trench_plus_two",
"longsword_mithril",
"longsword_plus_one",
"longsword_plus_two",
"nodachi_plus_one",
Expand Down
19 changes: 19 additions & 0 deletions data/mods/Magiclysm/monster_attacks.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,24 @@
"hit_dmg_npc": "The %1$s crushes <npcname>'s %2$s with its greatclub!",
"no_dmg_msg_u": "The %1$s tries to crush your %2$s with its greatclub, but swings wide and stumbles.",
"no_dmg_msg_npc": "The %1$s tries to crush <npcname>'s %2$s with its greatclub, but swings wide and stumbles."
},
{
"type": "monster_attack",
"attack_type": "melee",
"id": "flaming_whip",
"cooldown": 20,
"move_cost": 500,
"range": 15,
"damage_max_instance": [ { "damage_type": "heat", "amount": 30, "armor_penetration": 3, "armor_multiplier": 0.5 } ],
"body_parts": [ [ "leg_l", 4 ], [ "leg_r", 4 ], [ "head", 2 ], [ "arm_l", 4 ], [ "arm_r", 4 ], [ "torso", 6 ] ],
"effects": [ { "id": "onfire", "duration": 1, "chance": 10, "affect_hit_bp": true } ],
"hit_dmg_u": "The %1$s lashes you with its flaming whip!",
"hit_dmg_npc": "The %1$s lashes <npcname> with its flaming whip!",
"miss_msg_u": "The %1$s lashes you with its flaming whip, but you dodge!",
"miss_msg_npc": "The %1$s lashes <npcname> with its flaming whip, but they dodge!",
"no_dmg_msg_u": "The %1$s lashes you with its flaming whip, but fails to penetrate your armor!",
"no_dmg_msg_npc": "The %1$s lashes <npcname> with its flaming whip, but fails to penetrate their armor!",
"dodgeable": true,
"no_adjacent": true
}
]
52 changes: 52 additions & 0 deletions data/mods/Magiclysm/monsters/monsters.json
Original file line number Diff line number Diff line change
Expand Up @@ -487,5 +487,57 @@
"anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE" ],
"zombify_into": "mon_were_zolf",
"flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE" ]
},
{
"id": "mon_balrog",
"type": "MONSTER",
"name": { "str": "fiery nightmare" },
"description": "A colossal figure which seems to consist entirely of shadows engulfed in flames. Its immense dark wings extend from wall to wall. Two eyes that resemble burning coals are gazing down on you with hatred. In one hand it holds a huge sword, in the other it has a many thonged whip, both glowing with red-hot flames.",
"default_faction": "nether",
"bodytype": "human",
"species": [ "UNKNOWN" ],
"volume": "875000 ml",
"weight": "300 kg",
"hp": 500,
"speed": 140,
"symbol": "B",
"color": "red",
"aggression": 100,
"morale": 100,
"melee_skill": 10,
"melee_dice": 7,
"melee_dice_sides": 5,
"melee_damage": [ { "damage_type": "heat", "amount": 20 } ],
"melee_cut": 10,
"armor_bash": 12,
"armor_cut": 12,
"armor_bullet": 25,
"bleed_rate": 0,
"vision_day": 83,
"vision_night": 60,
"harvest": "exempt",
"special_attacks": [
{
"id": "smash",
"move_cost": 110,
"cooldown": 8,
"min_mul": 0.8,
"damage_max_instance": [ { "damage_type": "heat", "amount": 18, "armor_multiplier": 0.7 } ]
},
{
"id": "impale",
"min_mul": 1.5,
"max_mul": 3,
"damage_max_instance": [ { "damage_type": "heat", "amount": 18, "armor_multiplier": 0.7 } ]
},
{
"id": "cut_throat",
"damage_max_instance": [ { "damage_type": "heat", "amount": 18, "armor_multiplier": 0.7 } ]
},
{ "id": "flaming_whip" }
],
"death_function": { "corpse_type": "NO_CORPSE", "message": "The %s melts away." },
"path_settings": { "avoid_traps": true, "avoid_sharp": true },
"flags": [ "SEES", "WARM", "BASHES", "DESTROYS", "NO_BREATHE", "PUSH_MON", "PUSH_VEH", "FIREY", "PATH_AVOID_DANGER_1" ]
}
]
21 changes: 21 additions & 0 deletions data/mods/Magiclysm/recipes.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,26 @@
[ [ "string_6", 1 ] ],
[ [ "rag", 2 ] ]
]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "longsword_mithril",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 8,
"time": "7 h",
"book_learn": [ [ "textbook_mithril", 7 ] ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_bladesmith" },
{ "proficiency": "prof_carving", "time_multiplier": 1.2, "fail_multiplier": 1, "learning_time_multiplier": 0.2 }
],
"using": [ [ "blacksmithing_standard", 16 ] ],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "hotcut", -1 ] ] ],
"components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "fur", 1 ], [ "leather", 1 ] ], [ [ "mithril_ingot", 4 ] ] ]
}
]
207 changes: 207 additions & 0 deletions data/mods/Magiclysm/worldgen/mine_balrog.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
[
{
"id": "balrog_mine_weapons",
"type": "item_group",
"subtype": "distribution",
"items": [
[ "longsword", 100 ],
[ "arming_sword", 100 ],
[ "zweihander", 100 ],
[ "broadsword", 100 ],
[ "spear_knife_superior", 100 ],
[ "spear_copper", 100 ],
[ "spear_steel", 100 ],
[ "halberd", 100 ],
[ "glaive", 100 ],
[ "pike", 100 ],
[ "pike_copper", 100 ],
[ "poleaxe", 100 ],
[ "2h_flail_steel", 100 ],
[ "battleaxe", 100 ],
[ "lucern_hammer", 100 ],
[ "mace", 100 ],
[ "morningstar", 100 ],
[ "warhammer", 100 ]
]
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "mine_balrog_west", "mine_balrog_central", "mine_balrog_east" ] ],
"object": {
"fill_ter": "t_rock_floor",
"rows": [
"########################################################################",
"########################################################################",
"########################################################################",
"########################################################################",
"########################################################################",
"################@@@@@###################################################",
"################@ > @###################################################",
"################@ @@###################################################",
"################@@@ @###################################################",
"################@@@@ ###################################################",
"################@@@@ ###################################################",
"################@@@@ ###################################################",
"################@@@ @###################################################",
"################@@ @@###################################################",
"################@ @@@@@@@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
"################ @@@@@@@ @@@ @@@@@@ @@@@@ @@ ",
"################@ @@@@@ @@@@@ @@@@ @@@ @@ @ **************************",
"################@ @@ @@@@@@@ @@ @@@@@ @@@@@ ",
"################@@ @@@@@@@@@@@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
"########################################################################",
"########################################################################",
"########################################################################",
"########################################################################",
"########################################################################"
],
"terrain": {
"@": [ [ "t_rock", 4 ], [ "t_rock_floor", 1 ] ],
"#": "t_rock",
"*": "t_railroad_track_small",
"!": "t_pillar",
">": "t_slope_down"
},
"items": { " ": { "item": "mine_equipment", "chance": 1 } },
"monsters": { " ": { "monster": "GROUP_MINER", "chance": 1, "density": 0.001 } }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "mine_balrog_-1_west", "mine_balrog_-1_central", "mine_balrog_-1_east" ] ],
"object": {
"fill_ter": "t_rock_floor",
"rows": [
"########################################################################",
"########################################################################",
"########################################################################",
"########################################################################",
"########################################################################",
"################xxxxx###################################################",
"################x < x###################################################",
"################x x####xxx####xxx####xxx####xxx####xxx####xxx#########",
"################$ xxxxxx$xxxxxx$xxxxxx$xxxxxx$xxxxxx$xxxxxx$xxxxxx####",
"################x xWW1 11 ! 11 WW11 W11 W11W 1 Wx####",
"################x x ! WW ! WW WWWW! Wx####",
"################x + ! WW ! ! W+ >#",
"################x + ! ! WW! ! ! ! W+ >#",
"################x x W ! WW !Wx####",
"################x x 1W !W11 11 WWW11 ! 11WW 11W 1 Wx####",
"################$ xxxxxx$xxxxxx$xxxxxx$xxxxxx$xxxxxx$xxxxxx$xxxxxx####",
"################x x####xxx####xxx####xxx####xxx####xxx####xxx#########",
"################xWWWx###################################################",
"################xxxxx###################################################",
"########################################################################",
"########################################################################",
"########################################################################",
"########################################################################",
"########################################################################"
],
"terrain": {
"@": [ [ "t_rock", 4 ], [ "t_rock_floor", 1 ] ],
"#": "t_rock",
"+": "t_door_c",
">": "t_stairs_down",
"<": "t_slope_up",
"1": "t_column",
"x": "t_rock_wall"
},
"furniture": { "$": [ [ "f_grave_monument", 1 ], [ "f_statue", 4 ] ] },
"fields": { "W": { "field": "fd_web", "intensity": 3, "age": 10 } },
"items": {
"!": {
"item": {
"subtype": "collection",
"entries": [
{ "item": "helmet_plate", "prob": 50, "damage": 4 },
{ "item": "boots_plate", "prob": 75, "damage": 4 },
{ "item": "armguard_lightplate", "prob": 60, "damage": 4 },
{ "item": "gloves_plate", "prob": 40, "damage": 4 },
{ "item": "legguard_lightplate", "prob": 60, "damage": 4 },
{ "item": "armor_lightplate", "prob": 70, "damage": 4 },
{ "group": "balrog_mine_weapons", "prob": 70, "damage": 4 },
{ "item": "bone_human", "prob": 100, "damage": 4, "count": [ 10, 20 ] }
]
},
"chance": 100
}
}
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [
[ "mine_balrog_finale_nw", "mine_balrog_finale_n", "mine_balrog_finale_ne" ],
[ "mine_balrog_finale_sw", "mine_balrog_finale_s", "mine_balrog_finale_se" ]
],
"object": {
"fill_ter": "t_rock_floor",
"rows": [
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~$$$$$$$~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~###~~~~~~~~",
"~~~~~~~~~~~~~$$$$$~~~~$$$~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~###~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~####~~~~~~~~~~~~~~~~~~~~~~###~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~ ~~~~~~~~~~~ ~~~~~####~~~~~ ~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~ ~###~ ~~~~$$$$~~~ ~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~ ~~~~~ ~~~~~~~~~~~ ~~~~~~$$~~~~~~ ~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~ ~~~~~ ~~~~~~$$~~~~~~~~~~~~# ~~~~~~~~##xxxxx",
"~~~~~~~~~~~~~~~ ~~$~~ ~~~~~~~$$~~~~~~~~~~~~# + <x",
"~~~~~~~~~~~~~~~ ~~$~~~~~~~~~#####~~~~~~~~~~~~~~~~~~~~~# + <x",
"~~~~~~~~~~~~~~~ ~~$~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~##xxxxx",
"~~~~~~~~~~~~~~~ ~~$~~~~ ~~~~~~~~~~$$$$$~~~~~~~~~~~~~",
"~~~~~~$~~~~~~~~ ~~~~~~~ #~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~$~~~~~~~~ ~~##~~~ #~~~~~~~$~~~~~~~~~ ~~~~~###~~~~~~~~~~~~~~~~~~~~",
"~~~~~~$~~~~~~~~ #~~~~~~~$~~~####~~ ~~#######~~~~~~~",
"~~~~~~$~~~~~~~~ ~~~~~~~~$~~~####~~ ~~~~~~~~~~~~~~~~",
"~~~~~~$~~~~~~~~~~~~~~~~~~~~~~~~~$~~~~~~~~~~~#####~~~~~ ~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~#####~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~$~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~$~~~~~~~~~",
"~~~~~~~~~~~~~~~~##~~~~~~~~~~~~~~~~ ~#####~~~~~~~~~~~~~~~~~~~~~$~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~$~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~$~~~~~~~~~",
"~~~~~~~~~~~~~~$$$$$$$~~~~~~~##~~~~ ~~~~~~~$~~~~~~~~~~~~~~~~~~~$~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~#####~~~~ ~~~~~~~$~~~~~#######~~~~~~~$~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~##~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~$~~~~~~~~~ ~~~~~~~###~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~$~~~~~~~~~ ~~~#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~$~~~~~~~~~~~~~~$~~~~~~~~~ ~~~#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~$~~~~~~~~~~~~~~~~~~~~~~~~ ~~~#~~~~~~~~~~~~~#####~~~~~~~~~~~~~~~",
"~~~~~~~~~$~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~#####~~~~~~~~~~~~~~~",
"~~~~~~~~~$~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~#~~~~~~~~~~~ ~~~~~~~$$$$$$$~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~#~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~#~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~$~~~~~~#~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~$~~~~~~~~~~~~~~~~~~ ~~####~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~$~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~xxxxxxx+xxxxxxx~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~xxxxx xxxxx~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~x x x x~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~xC% + % + %cx~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~x x B x x~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~xxxxx ~~~ xxxxx~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~P~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
],
"terrain": {
"@": [ [ "t_rock", 4 ], [ "t_rock_floor", 1 ] ],
"#": "t_rock",
"<": "t_stairs_up",
"$": "t_lava",
"~": "t_hole",
"x": "t_rock_wall",
"+": "t_door_c"
},
"furniture": { "%": "f_statue", "C": "f_chest", "c": "f_chest" },
"item": { "C": { "item": "mithril_ingot", "chance": 100, "amount": 4 }, "c": { "item": "textbook_mithril", "chance": 100 } },
"traps": { "P": "tr_portal" },
"monster": { "B": { "monster": "mon_balrog" } }
}
}
]
Loading

0 comments on commit 8cdc540

Please sign in to comment.