diff --git a/data/mods/MindOverMatter/items/misc.json b/data/mods/MindOverMatter/items/misc.json index 92d81a3603b76..cb82192de70f9 100644 --- a/data/mods/MindOverMatter/items/misc.json +++ b/data/mods/MindOverMatter/items/misc.json @@ -62,6 +62,7 @@ "type": "ITEM", "id": "body_astral_projection", "copy-from": "corpse", + "volume": "81 L", "name": { "str_sp": "your body" }, "description": "Your body, lying on the ground while your spirit walks free. Hopefully nothing happens to it while you're gone.", "looks_like": "corpse_generic_human", diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index dce1a7f670a2c..cd197f8b3f769 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -2,7 +2,9 @@ { "type": "test_data", "known_bad": [ + "artifact_anchor", "broken_mech_recon", + "cosmic_dagwood", "coffee_raw", "coffee_raw_kentucky", "marloss_berry", diff --git a/data/mods/Xedra_Evolved/items/alchemy.json b/data/mods/Xedra_Evolved/items/alchemy.json index 1bcd9d5b95009..aee09733aa220 100644 --- a/data/mods/Xedra_Evolved/items/alchemy.json +++ b/data/mods/Xedra_Evolved/items/alchemy.json @@ -5,7 +5,7 @@ "id": "blackout_rage_drink", "looks_like": "cola", "name": { "str_sp": "Bored, the blackout rage drink" }, - "weight": "253 g", + "weight": "250 g", "color": "magenta", "addiction_type": "alcohol", "sleepiness_mod": 112, @@ -57,7 +57,7 @@ "comestible_type": "MED", "name": { "str_sp": "small blessing of Brigit" }, "description": "A small pill made from royal jelly, ash, and poppies. Blessed with prayers to Brigit over several hours. Will end any cold or flu instantaneously.", - "weight": "15 g", + "weight": "1 g", "volume": "1 ml", "price": "2 USD", "price_postapoc": "16 USD", @@ -152,7 +152,7 @@ "use_action": { "type": "cast_spell", "spell_id": "ghost_inflatable", "no_fail": true, "level": 0 }, "type": "ITEM", "subtypes": [ "COMESTIBLE" ], - "weight": "265 g", + "weight": "20 g", "quench": -1, "calories": 0, "volume": "250 ml", @@ -170,7 +170,7 @@ "name": { "str": "powder of revelation", "str_pl": "handfuls of powder of revelation" }, "description": "A dull grayish powder with a slight shimmering opalescence. When thrown it will fill the air and reveal the true form and existence of any creature whose form it coats.", "type": "ITEM", - "weight": "265 g", + "weight": "50 g", "volume": "250 ml", "symbol": ":", "container": "flask_glass", @@ -281,7 +281,7 @@ "category": "tools", "name": { "str": "Väinämöinen's Kantele, imitation", "str_pl": "Väinämöinen's Kanteles, imitation" }, "description": "A traditional Finnish string instrument. According to myth the first one was fashioned from a great pike's jawbone. Does it glimmer in the light? Do its notes echo and linger more than normal?", - "weight": "550 g", + "weight": "1 kg", "volume": "3000 ml", "longest_side": "46 cm", "price": "55 USD", @@ -314,7 +314,7 @@ "name": { "str": "life extension potion" }, "description": "A source of considerable wealth for the few alchemists talented enough to distill them, these potions are capable of adding decades to the lifespan of those who can afford the price of the rare and expensive ingredients they require. They are however not able to prolong a life indefinitely beyond its natural years, and you will need to find other means to achieve immortality, if that is your goal.", "weight": "50 g", - "volume": "2 ml", + "volume": "250 ml", "price": "150 cent", "price_postapoc": "5 USD", "material": [ "water" ], @@ -407,7 +407,7 @@ "name": { "str_sp": "Imbuement of the Trees" }, "description": "In a wooden bowl, Faewild and Dreamdross are mixed together along with ground-up leaves. The mixture has fae and human blood added to it and parts from the plant fae and then all mixed again until it's a uniform blend. The resulting mixture will eventually dissolve into a deep green liquid.", "weight": "50 g", - "volume": "2 ml", + "volume": "250 ml", "price": "150 cent", "price_postapoc": "200 USD", "material": [ "water" ], @@ -428,7 +428,7 @@ "name": { "str_sp": "Imbuement of the Earth" }, "description": ".", "weight": "50 g", - "volume": "2 ml", + "volume": "250 ml", "price": "150 cent", "price_postapoc": "200 USD", "material": [ "water" ], @@ -449,7 +449,7 @@ "name": { "str_sp": "Imbuement of the Waters" }, "description": ".", "weight": "50 g", - "volume": "2 ml", + "volume": "250 ml", "price": "150 cent", "price_postapoc": "200 USD", "material": [ "water" ], @@ -470,7 +470,7 @@ "name": { "str_sp": "Imbuement of the Winds" }, "description": ".", "weight": "50 g", - "volume": "2 ml", + "volume": "250 ml", "price": "150 cent", "price_postapoc": "200 USD", "material": [ "water" ], @@ -491,7 +491,7 @@ "name": { "str_sp": "Imbuement of the Flames" }, "description": "Heat Faewild and Dreamdross over a roaring fire and the mix in the ashes until you have a thick paste. That paste is mixed with parts taken from the Fair Folk and united with a dollop of fae, and human blood. The resulting mixture will eventually dissolve into a scarlet liquid that shines with its own light.", "weight": "50 g", - "volume": "2 ml", + "volume": "250 ml", "price": "150 cent", "price_postapoc": "200 USD", "material": [ "water" ], @@ -513,7 +513,7 @@ "name": { "str_sp": "Imbuement of Parchment" }, "description": "While looking in a mirror, Faewild and Dreamdross are ground to dust. That dust is mixed with parts taken from the Fair Folk and united with a dollop of fae, and human blood. The resulting mixture will eventually dissolve into what almost looks like liquid porcelain.", "weight": "50 g", - "volume": "2 ml", + "volume": "250 ml", "price": "150 cent", "price_postapoc": "200 USD", "material": [ "water" ], diff --git a/data/mods/Xedra_Evolved/items/armor/integrated.json b/data/mods/Xedra_Evolved/items/armor/integrated.json index 3cdd8ffc5921f..6c7baa178a7fe 100644 --- a/data/mods/Xedra_Evolved/items/armor/integrated.json +++ b/data/mods/Xedra_Evolved/items/armor/integrated.json @@ -182,7 +182,7 @@ "name": { "str": "vegetal cuticle" }, "description": "A pliable but hefty layer of living plant matter impregnated with various waxy polymers.", "weight": "2 kg", - "volume": "300 ml", + "volume": "3 L", "price": "0 cent", "price_postapoc": "0 cent", "material": [ "mut_wood", "veggy" ], @@ -212,7 +212,7 @@ "name": { "str_sp": "barkskin" }, "description": "A thin layer of bark covers your body.", "weight": "4 kg", - "volume": "400 ml", + "volume": "3 L", "price": "0 cent", "price_postapoc": "0 cent", "material": [ "mut_wood" ], @@ -320,7 +320,7 @@ "name": { "str_sp": "burning coals skin" }, "description": "Your skin has magical flames flaring out of it on occasion. You can operate in warmer climates than normal humans but begin to take damage from getting wet.", "weight": "1 kg", - "volume": "900 ml", + "volume": "3 L", "price": "0 cent", "price_postapoc": "0 cent", "material": [ "fae_flesh" ], @@ -349,7 +349,7 @@ "name": { "str_sp": "flaming skin" }, "description": "Your skin exudes magickal flames constantly, you can operate in almost any heat now without danger but rain may be a lethal threat.", "weight": "1 kg", - "volume": "900 ml", + "volume": "3 L", "price": "0 cent", "price_postapoc": "0 cent", "material": [ "fae_flesh" ], @@ -425,7 +425,7 @@ "name": { "str_sp": "liquid skin" }, "description": "Your skin has become vaguely gelatinous. Provides some extra bash defense and immunity to wet effects.", "weight": "1 kg", - "volume": "900 ml", + "volume": "3 L", "price": "0 cent", "price_postapoc": "0 cent", "material": [ "elemental_water" ], @@ -450,7 +450,7 @@ "name": { "str_sp": "wave skin" }, "description": "Your skin is completely replaced by magickal water. You have become immune to acid effects.", "weight": "1 kg", - "volume": "900 ml", + "volume": "3 L", "price": "0 cent", "price_postapoc": "0 cent", "material": [ "elemental_water" ], @@ -538,7 +538,6 @@ "category": "clothing", "name": { "str": "shadowstuff organ" }, "description": "You have an organ inside of your body that grows a material you can create improved versions of your body parts with. You must combine it with components taken from monsters with abilities you wish to gain and magickal essence.", - "to_hit": -1, "material": [ "flesh" ], "symbol": ")", "color": "light_gray", @@ -554,7 +553,7 @@ "name": { "str_sp": "cloud skin" }, "description": "Your skin is clearly separate from the air around you but has become its own weather system. If someone reaches out and touches you, they will clearly feel you but you look like someone might reach right through you.", "weight": "1 kg", - "volume": "900 ml", + "volume": "3 L", "price": "0 cent", "price_postapoc": "0 cent", "material": [ "fae_flesh" ], @@ -580,7 +579,7 @@ "name": { "str_sp": "storm skin" }, "description": "Your skin is a roiling storm. Your flexibility is greatly increased, your ability to ignore temperatures hot and cold have greatly increased but your ability to carry objects has been reduced.", "weight": "1 kg", - "volume": "900 ml", + "volume": "3 L", "price": "0 cent", "price_postapoc": "0 cent", "material": [ "fae_flesh" ], @@ -674,7 +673,7 @@ "name": { "str_sp": "porcelain skin" }, "description": "Your skin has smoothed and all your prior blemishes have faded away. This somewhat reduces wet effects and leads to a more durable yet harder to heal body.", "weight": "1 kg", - "volume": "900 ml", + "volume": "3 L", "price": "0 cent", "price_postapoc": "0 cent", "material": [ "glass" ], @@ -699,7 +698,7 @@ "name": { "str_sp": "latex skin" }, "description": "Your skin has become latex like. While it provides additional protection and attractiveness it also heals at a much slower rate.", "weight": "1 kg", - "volume": "900 ml", + "volume": "3 L", "price": "0 cent", "price_postapoc": "0 cent", "material": [ "thermo_resin" ], diff --git a/data/mods/Xedra_Evolved/items/artifact_grade_items.json b/data/mods/Xedra_Evolved/items/artifact_grade_items.json index c29729e60c16a..a8e25092ca808 100644 --- a/data/mods/Xedra_Evolved/items/artifact_grade_items.json +++ b/data/mods/Xedra_Evolved/items/artifact_grade_items.json @@ -60,7 +60,6 @@ "longest_side": "7 cm", "price": "55 USD", "price_postapoc": "2 USD 50 cent", - "to_hit": 1, "material": [ "monolith" ], "symbol": "o", "color": "brown", @@ -78,7 +77,7 @@ "name": { "str": "Boann's insignia" }, "description": "A small silver disk featuring a cow standing next to a river on one of its sides.", "weight": "310 g", - "volume": "10 ml", + "volume": "400 ml", "price": "23 USD", "price_postapoc": "3 USD 10 cent", "material": [ "silver" ], diff --git a/data/mods/Xedra_Evolved/items/biosignatures.json b/data/mods/Xedra_Evolved/items/biosignatures.json index 45bcf9061dc18..52633f7ce1e00 100644 --- a/data/mods/Xedra_Evolved/items/biosignatures.json +++ b/data/mods/Xedra_Evolved/items/biosignatures.json @@ -5,7 +5,7 @@ "id": "feces_bat", "name": { "str_sp": "guano" }, "copy-from": "feces_bird", - "weight": "750 g", + "weight": "150 g", "volume": "250 ml", "description": "A fresh pile of bat guano; this could probably be used to make some great fertilizer." } diff --git a/data/mods/Xedra_Evolved/items/book_lore.json b/data/mods/Xedra_Evolved/items/book_lore.json index dbd9d75897186..ceee075c314d7 100644 --- a/data/mods/Xedra_Evolved/items/book_lore.json +++ b/data/mods/Xedra_Evolved/items/book_lore.json @@ -27,7 +27,7 @@ "price_postapoc": "0 cent", "material": [ "paper" ], "flags": [ "TRADER_AVOID" ], - "weight": "3 g", + "weight": "1 g", "volume": "1 ml" }, { @@ -43,7 +43,7 @@ "price_postapoc": "0 cent", "material": [ "paper" ], "flags": [ "TRADER_AVOID" ], - "weight": "3 g", + "weight": "1 g", "volume": "1 ml", "required_level": 1, "intelligence": 6, diff --git a/data/mods/Xedra_Evolved/items/carnivore.json b/data/mods/Xedra_Evolved/items/carnivore.json index 78a2c18313c8d..6ca05405c1ce0 100644 --- a/data/mods/Xedra_Evolved/items/carnivore.json +++ b/data/mods/Xedra_Evolved/items/carnivore.json @@ -218,7 +218,7 @@ "id": "corpse_headless_bloodless", "copy-from": "corpse_painful", "name": { "str": "corpse" }, - "volume": "60 L", + "volume": "80 L", "description": "A dead body with its head missing. Considering what must have been required to remove the head, there is a surprising lack of blood.", "looks_like": "corpse_generic_human", "material": [ "hflesh" ], diff --git a/data/mods/Xedra_Evolved/items/cold_iron.json b/data/mods/Xedra_Evolved/items/cold_iron.json index c7fdea9ec4bba..3efbd35f1458e 100644 --- a/data/mods/Xedra_Evolved/items/cold_iron.json +++ b/data/mods/Xedra_Evolved/items/cold_iron.json @@ -6,7 +6,7 @@ "category": "spare_parts", "name": { "str": "cold iron ingot" }, "description": "A five-liter ingot of solid cold iron.", - "weight": "39365 g", + "weight": "37365 g", "volume": "5 L", "price": "100 USD", "price_postapoc": "2 USD", diff --git a/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json b/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json index 19e87e5071336..9ad850ad05bba 100644 --- a/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json +++ b/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json @@ -970,7 +970,7 @@ "color": "yellow", "calories": 5, "weight": "25 g", - "volume": "227 ml", + "volume": "257 ml", "material": [ "fruit_light" ], "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_CARRY_BOOST" ] }, @@ -990,7 +990,7 @@ "color": "brown", "fun": 0, "weight": "255 g", - "volume": "232 ml", + "volume": "262 ml", "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_MOOD_CLEAR" ] }, { @@ -1022,7 +1022,7 @@ "comestible_type": "FOOD", "color": "brown", "weight": "304 g", - "volume": "277 ml", + "volume": "377 ml", "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_WILD_TRAVEL_BOOST" ] }, { @@ -1040,7 +1040,7 @@ "comestible_type": "FOOD", "color": "brown", "weight": "304 g", - "volume": "277 ml", + "volume": "377 ml", "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_SLOWING_ARMOR" ] }, { @@ -1058,7 +1058,7 @@ "comestible_type": "FOOD", "color": "blue_red", "weight": "221 g", - "volume": "201 ml", + "volume": "221 ml", "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_SOCIAL_BOOST" ] }, { @@ -1076,7 +1076,7 @@ "comestible_type": "FOOD", "color": "red", "weight": "331 g", - "volume": "301 ml", + "volume": "341 ml", "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_HEAT_BLAST" ] }, { @@ -1094,7 +1094,7 @@ "comestible_type": "FOOD", "color": "white", "weight": "188 g", - "volume": "171 ml", + "volume": "191 ml", "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_ALTITUDE_SPEED" ] }, { @@ -1112,7 +1112,7 @@ "comestible_type": "FOOD", "color": "blue", "weight": "259 g", - "volume": "236 ml", + "volume": "266 ml", "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_COLD_RESIST" ] }, { @@ -1130,7 +1130,7 @@ "comestible_type": "FOOD", "color": "green", "weight": "302 g", - "volume": "275 ml", + "volume": "375 ml", "consumption_effect_on_conditions": [ "EOC_GOBLIN_CRAFT_SPEED_BOOST" ] }, { @@ -1148,7 +1148,7 @@ "comestible_type": "FOOD", "color": "blue", "weight": "259 g", - "volume": "236 ml", + "volume": "276 ml", "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_CALL_RAIN" ] }, { @@ -1191,7 +1191,7 @@ "comestible_type": "FOOD", "color": "brown", "weight": "314 g", - "volume": "286 ml", + "volume": "386 ml", "fun": -3, "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_ANIMAL_IGNORE" ] }, @@ -1283,7 +1283,7 @@ "comestible_type": "FOOD", "color": "light_gray", "weight": "330 g", - "volume": "300 ml", + "volume": "330 ml", "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_MEND_BONE" ] }, { @@ -1330,7 +1330,7 @@ "comestible_type": "FOOD", "color": "light_blue", "weight": "220 g", - "volume": "200 ml", + "volume": "220 ml", "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_CURE_DREAMLESS" ] }, { diff --git a/data/mods/Xedra_Evolved/items/corpses.json b/data/mods/Xedra_Evolved/items/corpses.json index 3390f19729951..1f2be39b9d2cb 100644 --- a/data/mods/Xedra_Evolved/items/corpses.json +++ b/data/mods/Xedra_Evolved/items/corpses.json @@ -50,7 +50,6 @@ "material": [ "qt_steel" ], "volume": "410 L", "weight": "498 kg", - "to_hit": -3, "flags": [ "TRADER_AVOID", "NO_REPAIR" ], "melee_damage": { "bash": 20, "cut": 15 } }, @@ -66,7 +65,6 @@ "material": [ "lc_steel", "dreamstuff" ], "volume": "210 L", "weight": "195 kg", - "to_hit": -2, "flags": [ "TRADER_AVOID", "NO_REPAIR" ], "melee_damage": { "bash": 10 } }, @@ -76,6 +74,7 @@ "//": "Changeling corpses.", "copy-from": "corpse", "name": { "str": "fae corpse" }, + "volume": "810 L", "description": "The dead body of a changeling. There are multiple bites across the body and numerous scratches. It looks like blood loss might have brought them down.", "looks_like": "corpse_generic_human", "material": [ "fae_flesh" ], diff --git a/data/mods/Xedra_Evolved/items/drugs.json b/data/mods/Xedra_Evolved/items/drugs.json index 57a37fbf9e778..02b0128ec86e1 100644 --- a/data/mods/Xedra_Evolved/items/drugs.json +++ b/data/mods/Xedra_Evolved/items/drugs.json @@ -75,7 +75,7 @@ "name": { "str_sp": "questionable blood treatment" }, "description": "This homemade blood treatment purports to reduce the cravings brought on by vampirism and if applied often and early to even reverse some stages of the disease. But vampires surely can't be real, can they?", "weight": "12 g", - "volume": "10ml", + "volume": "12ml", "price": "50 USD", "phase": "liquid", "price_postapoc": "20 USD", @@ -95,7 +95,7 @@ "comestible_type": "MED", "name": "cthonic poultice", "description": "A poultice made from the elements of the earth. You could use it to heal your wounds, if you were made of stone.", - "weight": "375 g", + "weight": "175 g", "volume": "250 ml", "price": "6 USD", "material": [ "dreamstuff" ], @@ -111,7 +111,7 @@ "comestible_type": "MED", "name": "verdant poultice", "description": "A poultice made from plant life. You could use it to heal your wounds, if you were grown from plants.", - "weight": "375 g", + "weight": "175 g", "volume": "250 ml", "price": "6 USD", "material": [ "dreamstuff" ], @@ -127,7 +127,7 @@ "comestible_type": "MED", "name": "cerulean poultice", "description": "A poultice made from the elements of the sea. You could use it to heal your wounds, if you were liquid as well.", - "weight": "375 g", + "weight": "175 g", "volume": "250 ml", "price": "6 USD", "material": [ "dreamstuff" ], @@ -143,7 +143,7 @@ "comestible_type": "MED", "name": { "str_sp": "charred sacrifice" }, "description": "A devotion to the powers of fire. You could use it to heal your wounds, if you were born of the flames.", - "weight": "375 g", + "weight": "175 g", "volume": "250 ml", "price": "6 USD", "material": [ "dreamstuff" ], @@ -159,7 +159,7 @@ "comestible_type": "MED", "name": { "str_sp": "doll repair paste" }, "description": "A paste made from paint and glue. You could use it to heal your wounds, if you were made in man's image.", - "weight": "375 g", + "weight": "175 g", "volume": "250 ml", "price": "6 USD", "material": [ "dreamstuff" ], @@ -175,7 +175,7 @@ "comestible_type": "MED", "name": { "str": "ethereal draught" }, "description": "A concoction made from honey and bread. You could use it to heal your wounds, if you were born of air and darkness.", - "weight": "375 g", + "weight": "175 g", "volume": "250 ml", "price": "6 USD", "material": [ "dreamstuff" ], @@ -191,7 +191,7 @@ "use_action": { "type": "cast_spell", "spell_id": "potion_recover_mana_xe", "no_fail": true, "level": 0 }, "type": "ITEM", "subtypes": [ "COMESTIBLE" ], - "weight": "265 g", + "weight": "245 g", "quench": 1, "calories": 0, "volume": "250ml", @@ -218,7 +218,7 @@ "material": [ "vampire_blood" ], "phase": "liquid", "charges": 1, - "weight": "6360 g", + "weight": "5360 g", "color": "red", "flags": [ "TRADER_AVOID", "INEDIBLE" ], "symbol": "~", @@ -244,7 +244,7 @@ "description": "Vampire blood that been forced to gain the ability to devour vampire blood to survive. Consuming it will allow you to devour vampire blood to gain power, like that vampire did before you caused their end.", "material": [ "vampire_blood" ], "flags": [ "TRADER_AVOID" ], - "weight": "265 g", + "weight": "235 g", "color": "red", "symbol": "~", "price_postapoc": "0 cent", diff --git a/data/mods/Xedra_Evolved/items/ethereal_items.json b/data/mods/Xedra_Evolved/items/ethereal_items.json index 9a829d73db24a..39ebf59e618be 100644 --- a/data/mods/Xedra_Evolved/items/ethereal_items.json +++ b/data/mods/Xedra_Evolved/items/ethereal_items.json @@ -582,7 +582,6 @@ "longest_side": "298 mm", "price": "0 cent", "price_postapoc": "0 cent", - "to_hit": -1, "material": [ "blood" ], "symbol": "O", "color": "red", diff --git a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json index 507b9c4d3b254..7e5605c845305 100644 --- a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json +++ b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json @@ -5,7 +5,7 @@ "subtypes": [ "TOOL" ], "category": "MED", "name": { "str": "abstract gracken improvement", "//~": "NO_I18N" }, - "weight": "2041 g", + "weight": "1900 g", "volume": "2500 ml", "material": [ "flesh", "shadowstuff" ], "symbol": "!", diff --git a/data/mods/Xedra_Evolved/items/gun_magazine.json b/data/mods/Xedra_Evolved/items/gun_magazine.json index 93c55ff621f86..d1c93ba32ed3f 100644 --- a/data/mods/Xedra_Evolved/items/gun_magazine.json +++ b/data/mods/Xedra_Evolved/items/gun_magazine.json @@ -43,7 +43,7 @@ "name": { "str": "AA-12 32-round drum magazine" }, "description": "A removable plastic 32-round drum magazine, for use with the HAMMER dual AA-12 turret system.", "weight": "1210 g", - "volume": "900 ml", + "volume": "1300 ml", "price": "45 USD", "price_postapoc": "1 USD", "material": [ "plastic" ], @@ -62,7 +62,7 @@ "name": { "str": "AA-12 vehicle drum magazine" }, "description": "A removable plastic 64-round drum magazine, for use with the AA-12 shotgun.", "weight": "2210 g", - "volume": "1800 ml", + "volume": "2300 ml", "price": "45 USD", "price_postapoc": "1 USD", "material": [ "plastic" ], diff --git a/data/mods/Xedra_Evolved/items/hedge_magic_items.json b/data/mods/Xedra_Evolved/items/hedge_magic_items.json index 8efe221ee7cab..0efddfc03ee33 100644 --- a/data/mods/Xedra_Evolved/items/hedge_magic_items.json +++ b/data/mods/Xedra_Evolved/items/hedge_magic_items.json @@ -126,7 +126,7 @@ "turns_per_charge": 25, "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "glamour_charge": 360 } } ], "weight": "100 g", - "volume": "50 ml", + "volume": "150 ml", "price": "50 USD", "price_postapoc": "50 cent", "material": [ "leather", "veggy" ], @@ -263,7 +263,6 @@ "volume": "4 L", "price": "245 USD", "price_postapoc": "7 USD 50 cent", - "to_hit": -1, "material": [ "fur", "bone" ], "symbol": "[", "looks_like": "cloak_leather", diff --git a/data/mods/Xedra_Evolved/items/inventor/consumables.json b/data/mods/Xedra_Evolved/items/inventor/consumables.json index 596f1447b604c..b4c6a89d2942c 100644 --- a/data/mods/Xedra_Evolved/items/inventor/consumables.json +++ b/data/mods/Xedra_Evolved/items/inventor/consumables.json @@ -23,7 +23,7 @@ "spoils_in": "24 hours", "symbol": "%", "price": "29 USD", - "//": "ever order one of those overpriced sandwiches at a restaurant?", + "//": "ever order one of those overpriced sandwiches at a restaurant? Strange density intended.", "fun": 60, "quench": 24, "calories": 900, @@ -57,7 +57,6 @@ "volume": "540 ml", "price": "10000 USD", "price_postapoc": "200 USD", - "to_hit": -1, "material": [ "mc_steel", "plastic" ], "symbol": "*", "color": "green", @@ -83,7 +82,6 @@ "volume": "270 ml", "price": "0 cent", "price_postapoc": "0 cent", - "to_hit": -1, "material": [ "mc_steel", "plastic" ], "symbol": "*", "color": "green", diff --git a/data/mods/Xedra_Evolved/items/inventor/explosive.json b/data/mods/Xedra_Evolved/items/inventor/explosive.json index 8f152dce3102a..3c91cfa0eefba 100644 --- a/data/mods/Xedra_Evolved/items/inventor/explosive.json +++ b/data/mods/Xedra_Evolved/items/inventor/explosive.json @@ -10,7 +10,6 @@ "volume": "200 ml", "price": "600 USD", "price_postapoc": "300 USD", - "to_hit": -1, "material": [ "lc_steel", "plastic" ], "symbol": "0", "explode_in_fire": false, @@ -37,7 +36,6 @@ "volume": "200 ml", "price": "0 cent", "price_postapoc": "0 cent", - "to_hit": -1, "material": [ "lc_steel", "plastic" ], "symbol": "*", "explode_in_fire": false, diff --git a/data/mods/Xedra_Evolved/items/melee.json b/data/mods/Xedra_Evolved/items/melee.json index eb7eb04ad6934..20cbc78085c08 100644 --- a/data/mods/Xedra_Evolved/items/melee.json +++ b/data/mods/Xedra_Evolved/items/melee.json @@ -236,7 +236,7 @@ "techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ], "flags": [ "DURABLE_MELEE", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "WOODEN_WEAPON" ], "weapon_category": [ "QUARTERSTAVES" ], - "proportional": { "weight": 0.6, "melee_damage": { "bash": 1.3 } }, + "proportional": { "weight": 0.5, "melee_damage": { "bash": 1.3 } }, "category": "weapons", "to_hit": { "grip": "weapon", "length": "long", "surface": "any", "balance": "good" }, "price_postapoc": "10 USD" @@ -249,7 +249,7 @@ "description": "A long quarterstaff, forged entirely from dreamdross. Twice as heavy than a wooden one, but lot sturdier, and still useful as a weapon. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "wood": "forged_dreamstuff" }, "//": "All dreamforged weapons are forged 100% from dreamdross. Wooden parts double their weight, but steel parts almost quarter their weight. 100% steel weapon like swords and knifes has too big benefit from it, so their damage is reduced respectively - the random properties will make them really good weapon anyway, but the basic stats will be sane enough.", - "proportional": { "melee_damage": { "bash": 2.5 } } + "proportional": { "melee_damage": { "bash": 2.5 }, "weight": 0.8 } }, { "type": "ITEM", @@ -258,7 +258,7 @@ "name": { "str": "dreamforged longsword" }, "description": "A longsword, forged entirely from dreamdross. It is much lighter than one made of steel, but applies much less force to its target. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "mc_steel": "forged_dreamstuff", "leather": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "cut": 0.5 } } + "proportional": { "melee_damage": { "cut": 0.5 }, "weight": 0.8 } }, { "type": "ITEM", @@ -267,7 +267,7 @@ "name": { "str": "dreamforged warhammer" }, "description": "A warhammer, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "steel": "forged_dreamstuff", "wood": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "bash": 1.2 } } + "proportional": { "melee_damage": { "bash": 1.2 }, "weight": 0.8 } }, { "type": "ITEM", @@ -276,7 +276,7 @@ "name": { "str": "dreamforged spear" }, "description": "A spear, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "steel": "forged_dreamstuff", "wood": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "stab": 1.2 } } + "proportional": { "melee_damage": { "stab": 1.2 }, "weight": 0.8 } }, { "type": "ITEM", @@ -285,7 +285,7 @@ "name": { "str": "dreamforged halberd" }, "description": "A two-handed halberd, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "steel": "forged_dreamstuff", "wood": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "cut": 1.1 } } + "proportional": { "melee_damage": { "cut": 1.1 }, "weight": 0.8 } }, { "type": "ITEM", @@ -294,7 +294,7 @@ "name": { "str": "dreamforged glaive" }, "description": "A two-handed glaive, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "steel": "forged_dreamstuff", "wood": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "cut": 1.1 } } + "proportional": { "melee_damage": { "cut": 1.1 }, "weight": 0.8 } }, { "type": "ITEM", @@ -303,7 +303,7 @@ "name": { "str_sp": "dreamforged naginata" }, "description": "A sturdy naginata, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "steel": "forged_dreamstuff", "wood": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "cut": 1.1 } } + "proportional": { "melee_damage": { "cut": 1.1 }, "weight": 0.8 } }, { "type": "ITEM", @@ -312,7 +312,7 @@ "name": { "str": "dreamforged mace" }, "description": "A light mace, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "steel": "forged_dreamstuff", "wood": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "bash": 0.9 } } + "proportional": { "melee_damage": { "bash": 0.9 }, "weight": 0.8 } }, { "type": "ITEM", @@ -321,7 +321,7 @@ "name": { "str": "dreamforged morningstar" }, "description": "A light morningstar, forged entirely from dreamdross. So light that you can't properly apply any force on it. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "steel": "forged_dreamstuff", "wood": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "bash": 0.9 } } + "proportional": { "melee_damage": { "bash": 0.9 }, "weight": 0.8 } }, { "type": "ITEM", @@ -330,7 +330,7 @@ "name": { "str": "dreamforged estoc" }, "description": "An estoc, forged entirely from dreamdross. So light that you can't properly apply any force on it. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "mc_steel": "forged_dreamstuff", "leather": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "stab": 0.5 } } + "proportional": { "melee_damage": { "stab": 0.5 }, "weight": 0.8 } }, { "type": "ITEM", @@ -339,7 +339,7 @@ "name": { "str": "dreamforged arming sword" }, "description": "An arming sword, forged entirely from dreamdross. So light that you can't properly apply any force on it. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "mc_steel": "forged_dreamstuff", "leather": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "cut": 0.5 } } + "proportional": { "melee_damage": { "cut": 0.5 }, "weight": 0.8 } }, { "type": "ITEM", @@ -348,7 +348,7 @@ "name": { "str": "dreamforged broadsword" }, "description": "A broadsword, forged entirely from dreamdross. So light that you can't properly apply any force on it. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "mc_steel": "forged_dreamstuff", "leather": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "cut": 0.5 } } + "proportional": { "melee_damage": { "cut": 0.5 }, "weight": 0.8 } }, { "type": "ITEM", @@ -357,7 +357,7 @@ "name": { "str": "dreamforged battle axe" }, "description": "A battle axe, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "steel": "forged_dreamstuff", "wood": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "cut": 0.7 } } + "proportional": { "melee_damage": { "cut": 0.7 }, "weight": 0.8 } }, { "type": "ITEM", @@ -366,7 +366,7 @@ "name": { "str_sp": "dreamforged katana" }, "description": "A katana, forged entirely from dreamdross. So light that you can't properly apply any force on it. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "mc_steel": "forged_dreamstuff", "leather": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "cut": 0.3 } } + "proportional": { "melee_damage": { "cut": 0.3 }, "weight": 0.8 } }, { "type": "ITEM", @@ -375,7 +375,7 @@ "name": { "str": "dreamforged army knife", "str_pl": "dreamforged army knives" }, "description": "A small military knife, forged entirely from dreamdross. You barely feel any weight. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "steel": "forged_dreamstuff", "plastic": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "stab": 0.6 } } + "proportional": { "melee_damage": { "stab": 0.6 }, "weight": 0.8 } }, { "type": "ITEM", @@ -384,7 +384,7 @@ "name": { "str": "dreamforged kris", "str_pl": "dreamforged krises" }, "description": "A small curved knife, forged entirely from dreamdross. You barely feel any weight. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "steel": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "bash": 0.3, "stab": 0.85 } } + "proportional": { "melee_damage": { "bash": 0.3, "stab": 0.85 }, "weight": 0.8 } }, { "type": "ITEM", @@ -393,7 +393,7 @@ "name": { "str": "dreamforged kukri" }, "description": "A small kukri, forged entirely from dreamdross. You barely feel any weight. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "mc_steel": "forged_dreamstuff", "wood": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "bash": 0.3, "stab": 0.9 } } + "proportional": { "melee_damage": { "bash": 0.3, "stab": 0.9 }, "weight": 0.8 } }, { "type": "ITEM", @@ -402,7 +402,7 @@ "name": { "str_sp": "dreamforged nodachi" }, "description": "A long nodachi, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "mc_steel": "forged_dreamstuff", "leather": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "cut": 0.3 } } + "proportional": { "melee_damage": { "cut": 0.3 }, "weight": 0.8 } }, { "type": "ITEM", @@ -411,7 +411,7 @@ "name": { "str": "dreamforged rapier" }, "description": "A short rapier, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "mc_steel": "forged_dreamstuff", "leather": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "stab": 0.65 } } + "proportional": { "melee_damage": { "stab": 0.65 }, "weight": 0.8 } }, { "type": "ITEM", @@ -420,7 +420,7 @@ "name": { "str_sp": "dreamforged tanto" }, "description": "A long tanto, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "steel": "forged_dreamstuff", "leather": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "stab": 0.3 } } + "proportional": { "melee_damage": { "stab": 0.3 }, "weight": 0.8 } }, { "type": "ITEM", @@ -429,7 +429,7 @@ "name": { "str_sp": "dreamforged wakizashi" }, "description": "A long wakizashi, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "mc_steel": "forged_dreamstuff", "leather": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "cut": 0.3 } } + "proportional": { "melee_damage": { "cut": 0.3 }, "weight": 0.8 } }, { "type": "ITEM", @@ -438,7 +438,7 @@ "name": { "str": "dreamforged zweihänder" }, "description": "A huge two-handed sword, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "mc_steel": "forged_dreamstuff", "leather": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "bash": 0.3, "cut": 0.6 } } + "proportional": { "melee_damage": { "bash": 0.3, "cut": 0.6 }, "weight": 0.8 } }, { "type": "ITEM", @@ -447,7 +447,7 @@ "name": { "str": "dreamforged khopesh", "str_pl": "dreamforged khopeshes" }, "description": "A light khopesh, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "bronze": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "bash": 0.3, "stab": 0.8 } } + "proportional": { "melee_damage": { "bash": 0.3, "stab": 0.8 }, "weight": 0.8 } }, { "type": "ITEM", @@ -456,7 +456,7 @@ "name": { "str": "dreamforged lucerne hammer" }, "description": "A lucerne hammer, forged entirely from dreamdross. The dreamdross grants it some minor magical properties, but you can't control their effects.", "replace_materials": { "steel": "forged_dreamstuff", "wood": "forged_dreamstuff" }, - "proportional": { "melee_damage": { "bash": 1.1, "stab": 0.9 } } + "proportional": { "melee_damage": { "bash": 1.1, "stab": 0.9 }, "weight": 0.8 } }, { "id": "dreamforged_knuckle", @@ -465,7 +465,7 @@ "name": { "str_sp": "dreamforged knuckles" }, "description": "A pair of thick dreamdross plates covering your proximal phalange. The dreamdross grants it some minor magical properties, but you can't control their effects.", "copy-from": "knuckle_impact", - "proportional": { "melee_damage": { "bash": 0.7 } }, + "proportional": { "melee_damage": { "bash": 0.7 }, "weight": 0.8 }, "replace_materials": { "steel": "forged_dreamstuff" } }, { @@ -476,7 +476,7 @@ "description": "A pair of fiery-red knuckles with tiny blades on the end. They are fed with your energy and the blood of your enemies, and will fuel different items with berserk properties.", "//": "You actually can use it with any weapon, because enchantment applied always, both when you wear it or if you wield it, but it doesn't matter, because iirc fists has one of the biggest attack speed in the game, which is the only thing that matter here.", "copy-from": "dreamforged_knuckle", - "proportional": { "melee_damage": { "bash": 0.5 } }, + "proportional": { "melee_damage": { "bash": 0.5 }, "weight": 0.8 }, "armor": [ { "encumbrance": 5, @@ -576,7 +576,7 @@ "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], "qualities": [ [ "HAMMER", 1 ] ], "flags": [ "DURABLE_MELEE", "ALWAYS_TWOHAND", "REACH_ATTACK", "NONCONDUCTIVE" ], - "volume": "20000 ml", + "volume": "23000 ml", "price": "500 USD", "price_postapoc": "5 USD", "faults": [ { "fault_group": "handle_long" } ], diff --git a/data/mods/Xedra_Evolved/items/melee_treesung.json b/data/mods/Xedra_Evolved/items/melee_treesung.json index e4007668371cf..7f224c215ed05 100644 --- a/data/mods/Xedra_Evolved/items/melee_treesung.json +++ b/data/mods/Xedra_Evolved/items/melee_treesung.json @@ -18,7 +18,7 @@ "name": { "str": "treesung long spear" }, "description": "A giant spear over three meters long, all formed from a single piece of wood, with twists and curves like it grew in place rather than being made.", "color": "green", - "proportional": { "melee_damage": { "stab": 1.5 } }, + "proportional": { "melee_damage": { "stab": 1.5 }, "weight": 0.8 }, "extend": { "flags": [ "WOODEN_WEAPON", "NO_REPAIR" ] } }, { @@ -30,7 +30,7 @@ "description": "A weapon with a long wooden handle connected to a knobby wooden head, all formed from a single piece of wood, with twists and curves like it grew in place rather than being made.", "color": "green", "material": [ { "type": "wood", "portion": 1 } ], - "proportional": { "melee_damage": { "bash": 0.9 } }, + "proportional": { "melee_damage": { "bash": 0.9 }, "weight": 0.8 }, "extend": { "flags": [ "WOODEN_WEAPON", "NO_REPAIR" ] } }, { @@ -42,7 +42,7 @@ "description": "A sturdy staff all formed from a single piece of wood, with twists and curves like it grew in place rather than being carved.", "color": "green", "material": [ { "type": "wood", "portion": 1 } ], - "proportional": { "melee_damage": { "bash": 1.1 } }, + "proportional": { "melee_damage": { "bash": 1.1 }, "weight": 0.8 }, "extend": { "flags": [ "WOODEN_WEAPON", "NO_REPAIR", "DURABLE_MELEE" ] } }, { @@ -54,7 +54,7 @@ "description": "A long hammer with a spike on one end, all formed from a single piece of wood, with twists and curves like it grew in place rather than being carved.", "color": "green", "material": [ { "type": "wood", "portion": 1 } ], - "proportional": { "melee_damage": { "bash": 1.1, "stab": 0.9 } }, + "proportional": { "melee_damage": { "bash": 1.1, "stab": 0.9 }, "weight": 0.8 }, "extend": { "flags": [ "WOODEN_WEAPON", "NO_REPAIR" ] } }, { @@ -66,7 +66,7 @@ "description": "A sturdy polearm with a curved blade, all formed from a single piece of wood, with twists and curves like it grew in place rather than being carved. You're not sure how long it will hold its edge, but it's surprisingly sharp.", "color": "green", "material": [ { "type": "wood", "portion": 1 } ], - "proportional": { "melee_damage": { "cut": 0.9 } }, + "proportional": { "melee_damage": { "cut": 0.9 }, "weight": 0.8 }, "extend": { "flags": [ "WOODEN_WEAPON", "NO_REPAIR" ] }, "delete": { "flags": [ "DURABLE_MELEE" ] } }, @@ -79,7 +79,7 @@ "description": "A large knife, all formed from a single piece of wood, with twists and curves like it grew in place rather than being carved. You're not sure how long it will hold its edge, but it's surprisingly sharp.", "color": "green", "material": [ { "type": "wood", "portion": 1 } ], - "proportional": { "melee_damage": { "stab": 0.9 } }, + "proportional": { "melee_damage": { "stab": 0.9 }, "weight": 0.8 }, "extend": { "flags": [ "WOODEN_WEAPON", "NO_REPAIR" ] } } ] diff --git a/data/mods/Xedra_Evolved/items/pets.json b/data/mods/Xedra_Evolved/items/pets.json index de9c22f14bbe9..adbc5e48e0173 100644 --- a/data/mods/Xedra_Evolved/items/pets.json +++ b/data/mods/Xedra_Evolved/items/pets.json @@ -6,7 +6,7 @@ "comestible_type": "FOOD", "name": { "str_sp": "purity crackers" }, "description": "An incredibly hard cracker. Squeezing it in your hand it feels as though your teeth might break before the cracker does. The packaging on the side shows a tall being feeding these crackers to a horned and four legged creature.", - "weight": "300 g", + "weight": "200 g", "volume": "250 ml", "price": "1 USD", "price_postapoc": "25 cent", diff --git a/data/mods/Xedra_Evolved/items/resources.json b/data/mods/Xedra_Evolved/items/resources.json index 2c3c3ae229618..94cd8cb9bc23b 100644 --- a/data/mods/Xedra_Evolved/items/resources.json +++ b/data/mods/Xedra_Evolved/items/resources.json @@ -81,13 +81,12 @@ "category": "spare_parts", "name": { "str": "scrap shadowstuff", "str_pl": "scraps of shadowstuff" }, "description": "A bulky assortment of small bits of scrap shadowstuff, possibly useful in ephemeral crafting.", - "weight": "5 g", + "weight": "1600 mg", "volume": "25 ml", "price": "5 USD", "price_postapoc": "10 cent", "count": 2, "stack_size": 10, - "//": "Density .5g/ml.", "material": [ "shadowstuff" ], "ammo_type": "scrap_shadowstuff", "symbol": ",", @@ -100,13 +99,12 @@ "category": "spare_parts", "name": { "str": "chunk shadowstuff", "str_pl": "scraps of shadowstuff" }, "description": "A bulky assortment of larger bits of scrap shadowstuff, possibly useful in ephemeral crafting.", - "weight": "5 g", - "volume": "25 ml", + "weight": "2000 mg", + "volume": "250 ml", "price": "5 USD", "price_postapoc": "10 cent", "count": 2, "stack_size": 10, - "//": "Density .5g/ml.", "material": [ "shadowstuff" ], "ammo_type": "components", "symbol": ",", @@ -374,14 +372,13 @@ "material": [ "obsidian" ], "ammo_type": "rock", "flags": [ "TRADER_AVOID", "NPC_THROWN" ], - "weight": "657 g", + "weight": "637 g", "volume": "250 ml", "longest_side": "8 cm", "damage": { "damage_type": "stab", "amount": 5 }, "range": 10, "dispersion": 14, "loudness": 0, - "to_hit": -1, "effects": [ "NEVER_MISFIRES", "NON_FOULING", "RECOVER_60" ], "melee_damage": { "stab": 3 } }, @@ -406,6 +403,7 @@ "id": "stormwrought_blood_itert", "copy-from": "rock", "name": { "str": "inert stormwrought blood", "str_pl": "doses of inert stormwrought blood" }, + "weight": "5 g", "color": "red", "material": [ "hblood" ], "looks_like": "blood", @@ -417,6 +415,7 @@ "copy-from": "rock", "name": { "str": "simmering stormwrought blood", "str_pl": "doses of simmering stormwrought blood" }, "color": "red", + "weight": "5 g", "material": [ "hblood" ], "looks_like": "blood", "description": "A ball of almost-solid blood with ripples across its surface. It has been exposed to the energies of the portal storms enough to be used in the ritual." diff --git a/data/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_eater.json b/data/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_eater.json index 8982fc3e5ebbd..5467583640fc5 100644 --- a/data/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_eater.json +++ b/data/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_eater.json @@ -7,7 +7,7 @@ "name": { "str": "deck of tarot cards", "str_pl": "decks of tarot cards" }, "description": "A deck of intricately designed tarot cards. When you lay out your future they seem to be trying to tell you to take a leap of faith.", "weight": "50 g", - "volume": "10 ml", + "volume": "50 ml", "price": "20 USD", "price_postapoc": "10 cent", "material": [ "forged_dreamstuff" ], @@ -22,7 +22,7 @@ "name": { "str": "occult seal" }, "description": "An intricate occult seal. When you glance at the bottom left corner you hear the sound of the ocean and smell the salty air of the sea, and sense a river flowing through each point of the seal.", "weight": "50 g", - "volume": "10 ml", + "volume": "50 ml", "price": "20 USD", "price_postapoc": "10 cent", "material": [ "forged_dreamstuff" ], @@ -38,7 +38,7 @@ "name": { "str": "hurricane lamp with thorns", "str_pl": "hurricane lamps with thorns" }, "description": "An old style hurricane lamp. The handle appears to made of vines covered in sharp thorns.", "weight": "50 g", - "volume": "10 ml", + "volume": "50 ml", "price": "20 USD", "price_postapoc": "10 cent", "material": [ "forged_dreamstuff" ], @@ -54,7 +54,7 @@ "name": { "str": "box of glass berries", "str_pl": "boxes of glass berries" }, "description": "A box full of glass berries, when you get distracted you find yourself crunching them in your mouth. Each one tastes like a mouthful of blood that slowly changes to espresso.", "weight": "50 g", - "volume": "10 ml", + "volume": "50 ml", "price": "20 USD", "price_postapoc": "10 cent", "material": [ "forged_dreamstuff" ], @@ -70,7 +70,7 @@ "name": { "str": "polaroid of a missing person", "str_pl": "polaroids of a missing person" }, "description": "A polaroid of someone you remember going missing before the Cataclysm. It caught a ton of media attention due to them being seen near what was shortly after identified as a thin place between dimensions. The more you stare at the picture, the more you begin to see wounds appear and disappear on the person. Sometimes they match your old scars.", "weight": "50 g", - "volume": "10 ml", + "volume": "50 ml", "price": "20 USD", "price_postapoc": "10 cent", "material": [ "forged_dreamstuff" ], diff --git a/data/mods/Xedra_Evolved/items/tools.json b/data/mods/Xedra_Evolved/items/tools.json index a364e243aaaea..a75d0013945cc 100644 --- a/data/mods/Xedra_Evolved/items/tools.json +++ b/data/mods/Xedra_Evolved/items/tools.json @@ -167,7 +167,7 @@ "name": { "str": "dreamforged time trap" }, "copy-from": "beartrap", "description": "A dreamdross mesh that condenses within the center. Use it to set it on the ground, creating a trap that will freeze anything that steps on it for several hours.", - "proportional": { "weight": 0.5 }, + "proportional": { "weight": 0.3 }, "price": "1000 USD", "price_postapoc": "20 USD", "material": [ "forged_dreamstuff" ], diff --git a/data/mods/Xedra_Evolved/items/vegetables.json b/data/mods/Xedra_Evolved/items/vegetables.json index 592d8ec3b8409..e7b2232f147a3 100644 --- a/data/mods/Xedra_Evolved/items/vegetables.json +++ b/data/mods/Xedra_Evolved/items/vegetables.json @@ -14,7 +14,7 @@ "price": "0 USD", "price_postapoc": "0 USD", "material": [ "veggy", "wood" ], - "volume": "1 L", + "volume": "2 L", "fun": -25 } ] diff --git a/data/mods/Xedra_Evolved/items/vehicle_parts.json b/data/mods/Xedra_Evolved/items/vehicle_parts.json index cb79c72dfa2f8..3230a68c0df9d 100644 --- a/data/mods/Xedra_Evolved/items/vehicle_parts.json +++ b/data/mods/Xedra_Evolved/items/vehicle_parts.json @@ -17,7 +17,7 @@ "name": { "str": "floral vessel" }, "symbol": "v", "description": { "str": "The parts of the floral vehicle that have to exist for code reasons.", "//~": "NO_I18N" }, - "volume": "1 L", + "volume": "2 L", "weight": "2 kg", "color": "green", "material": [ "veggy" ],