Skip to content

Commit

Permalink
Merge pull request #72436 from GuardianDll/bloody_obsoletion
Browse files Browse the repository at this point in the history
obsolete tainted_blood
  • Loading branch information
Maleclypse authored Mar 17, 2024
2 parents 0bb4077 + 050ca5b commit 93fa5e6
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 20 deletions.
4 changes: 2 additions & 2 deletions data/mods/Magiclysm/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"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 750 mL of blood.",
"occupied_bodyparts": [ [ "torso", 8 ] ],
"fuel_options": [ "blood", "dragon_blood", "tainted_blood", "hblood" ],
"fuel_options": [ "blood", "dragon_blood", "blood_tainted", "hblood" ],
"fuel_efficiency": 0.6,
"exothermic_power_gen": true,
"time": "6 s",
Expand Down Expand Up @@ -33,7 +33,7 @@
"max_contains_volume": "750 ml",
"max_item_volume": "250 ml",
"max_contains_weight": "1 kg",
"material_restriction": [ "blood", "dragon_blood", "tainted_blood", "hblood" ]
"material_restriction": [ "blood", "dragon_blood", "blood_tainted", "hblood" ]
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Magiclysm/items/ammo_types.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
},
{
"type": "ammunition_type",
"id": "tainted_blood",
"id": "blood_tainted",
"name": "tainted blood",
"default": "tainted_blood"
"default": "blood_tainted"
},
{
"type": "ammunition_type",
Expand Down
6 changes: 4 additions & 2 deletions data/mods/Magiclysm/items/fuel.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@
"type": "AMMO",
"copy-from": "blood_tainted",
"name": { "str_sp": "tainted blood" },
"weight": "1048 mg",
"volume": "1 ml",
"symbol": "~",
"material": "tainted_blood",
"material": "blood_tainted",
"category": "fuel",
"ammo_type": "tainted_blood"
"ammo_type": "blood_tainted"
},
{
"type": "AMMO",
Expand Down
15 changes: 2 additions & 13 deletions data/mods/Magiclysm/items/obsolete.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
[
{
"type": "AMMO",
"id": "tainted_blood",
"name": { "str_sp": "tainted blood" },
"weight": "2 g",
"color": "magenta",
"container": "flask_glass",
"symbol": "~",
"description": "Blood from a blob corrupted creature. The surface of this black sludge undulates slowly as if agitated by a soft breeze.",
"price": 0,
"material": [ "tainted_blood" ],
"volume": "1 ml",
"phase": "liquid",
"category": "fuel",
"ammo_type": "tainted_blood"
"type": "MIGRATION",
"replace": "blood_tainted"
},
{
"id": "shotcestus",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
},
{
"type": "material",
"id": "tainted_blood",
"id": "blood_tainted",
"name": "Tainted blood",
"copy-from": "blood",
"fuel_data": { "energy": "5 kJ" }
Expand Down

0 comments on commit 93fa5e6

Please sign in to comment.