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.

Sign up for GitHub

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] fix blood as fuel stuff #62327

Merged
merged 5 commits into from
Dec 1, 2022
Merged

[Magiclysm] fix blood as fuel stuff #62327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
269d9dc
increase internal blood bank container to fit 3 standard blood units
MrDraMaster Nov 21, 2022
ca06867
bring decaying boneclub tainted blood in line with fuel_data
MrDraMaster Nov 21, 2022
aa6eee5
use 2l of tainted blood for scroll of acid resistance
MrDraMaster Nov 21, 2022
b5c4f30
add missing fuel_data to hblood material
MrDraMaster Nov 21, 2022
cadca20
replace repeated blood material data with a copy-from
MrDraMaster Nov 21, 2022
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
8 changes: 4 additions & 4 deletions data/mods/Magiclysm/bionics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "bio_fuel_cell_blood",
"type": "bionic",
"name": { "str": "Blood Power Generator" },
"description": "Embedded into your back and connected to your bionic power supply is a powerful spell focus able to consume blood from dead creatures to produce bionic power. It can store up to 100 mL of blood.",
"description": "Embedded into your back and connected to your bionic power supply is a powerful spell focus able to consume blood from dead creatures to produce bionic power. It can store up to 750 mL of blood.",
"occupied_bodyparts": [ [ "torso", 8 ] ],
"fuel_options": [ "blood", "dragon_blood", "tainted_blood", "hblood" ],
"fuel_efficiency": 0.6,
Expand All @@ -18,7 +18,7 @@
"category": "container",
"name": { "str": "internal blood bank" },
"description": "Internal tank for blood power generator bionic.",
"volume": "101 ml",
"volume": "751 ml",
"weight": "1 g",
"price": 0,
"material": [ "plastic" ],
Expand All @@ -30,8 +30,8 @@
"pocket_type": "CONTAINER",
"watertight": true,
"rigid": true,
"max_contains_volume": "100 ml",
"max_item_volume": "32 ml",
"max_contains_volume": "750 ml",
"max_item_volume": "250 ml",
"max_contains_weight": "1 kg",
"material_restriction": [ "blood", "dragon_blood", "tainted_blood", "hblood" ]
}
Expand Down
28 changes: 8 additions & 20 deletions data/mods/Magiclysm/materials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,26 +227,14 @@
"type": "material",
"id": "blood",
"name": "Blood",
"density": 1,
"specific_heat_liquid": 4.186,
"specific_heat_solid": 2.108,
"latent_heat": 333,
"edible": true,
"bash_resist": 0,
"cut_resist": 0,
"bullet_resist": 0,
"acid_resist": 0,
"fire_resist": 1,
"elec_resist": 0,
"chip_resist": 0,
"dmg_adj": [ "lightly damaged", "damaged", "very damaged", "thoroughly damaged" ],
"bash_dmg_verb": "damaged",
"cut_dmg_verb": "damaged",
"burn_data": [
{ "fuel": -100, "smoke": 1, "burn": 1 },
{ "fuel": -50, "smoke": 2, "burn": 1 },
{ "fuel": -10, "smoke": 2, "burn": 2 }
],
"copy-from": "blood",
"fuel_data": { "energy": "1 kJ" }
},
{
"type": "material",
"id": "hblood",
"name": "Human blood",
"copy-from": "hblood",
"fuel_data": { "energy": "1 kJ" }
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/recipes/alchemy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
"tools": [ [ [ "paint_brush", -1 ] ] ],
"components": [
[ [ "blood_tainted", 2000 ], [ "edible_blood", 8, "LIST" ], [ "dragon_blood", 2000 ] ],
[ [ "blood_tainted", 8 ], [ "edible_blood", 8, "LIST" ], [ "dragon_blood", 2000 ] ],
[ [ "any_strong_acid", 4, "LIST" ] ],
[ [ "water", 2 ], [ "water_clean", 2 ] ]
],
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/requirements/spell_components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"//": "Weapon materials and 1000 energy from blood suitable for the Decaying Boneclub spell",
"components": [
[ [ "bone", 3 ], [ "bone_demihuman", 3 ], [ "bone_human", 3 ], [ "bone_tainted", 6 ] ],
[ [ "blood", 4 ], [ "blood_tainted", 200 ], [ "dragon_blood", 20 ] ]
[ [ "blood", 4 ], [ "blood_tainted", 1 ], [ "dragon_blood", 20 ] ]
]
},
{
Expand Down