diff --git a/items/ammo.json b/items/ammo.json index 965a3f6..8624135 100644 --- a/items/ammo.json +++ b/items/ammo.json @@ -240,31 +240,6 @@ "id": "acidbomb_large", "type": "AMMO", "category": "weapons", - "name": "large acidbomb", - "description": "There is enough frothing fluid inside this acidbomb to coat a relatively large area with fields of acid.", - "weight": 1640, - "volume": 2, - "price": 10000, - "to_hit": -1, - "bashing": 8, - "material": [ "glass" ], - "symbol": "*", - "color": "i_green", - "ammo_type": "thrown", - "flags": [ "ACT_ON_RANGED_HIT", "RECOVER_9" ], - "emits": [ "emit_acid_large" ], - "countdown_interval": 7, - "countdown_destroy": true, - "countdown_action": { - "type": "explosion", - "explosion": { - } - } - }, - { - "id": "acidbomb_medium", - "type": "AMMO", - "category": "weapons", "name": "medium acidbomb", "description": "There is enough frothing fluid inside this acidbomb to coat a relatively large area with sprays of acid.", "weight": 1231, @@ -277,8 +252,8 @@ "color": "i_ltgreen", "ammo_type": "thrown", "flags": [ "ACT_ON_RANGED_HIT", "RECOVER_9" ], - "emits": [ "emit_acid_medium" ], - "countdown_interval": 7, + "emits": [ "emit_acid_large" ], + "countdown_interval": 8, "countdown_destroy": true, "countdown_action": { "type": "explosion", @@ -302,36 +277,12 @@ "color": "green", "ammo_type": "thrown", "flags": [ "ACT_ON_RANGED_HIT", "RECOVER_9" ], - "emits": [ "emit_acid_small" ], - "countdown_interval": 7, - "countdown_destroy": true, - "countdown_action": { - "type": "explosion", - "explosion": { - } - } - }, - { - "id": "acidbomb_micro", - "type": "AMMO", - "category": "weapons", - "name": "micro acidbomb", - "description": "A single glass flask filled with caustic chemicals. When exposed to the air they will spray out in every direction, creating a modest field of acid.", - "weight": 285, - "volume": 1, - "price": 4500, - "to_hit": -1, - "bashing": 8, - "material": [ "glass" ], - "symbol": "*", - "color": "ltgreen", - "ammo_type": "thrown", - "flags": [ "ACT_ON_RANGED_HIT", "RECOVER_9" ], - "emits": [ "emit_acid_trail_slow" ], - "countdown_interval": 13, + "emits": [ "emit_acid_small", "emit_acid_trail_slow" ], + "countdown_interval": 21, "countdown_destroy": true, "countdown_action": { "type": "explosion", + "no_deactivate_msg": "The acid bubbles caustically.", "explosion": { } } diff --git a/items/armor.json b/items/armor.json index 19ae5be..a692a1e 100644 --- a/items/armor.json +++ b/items/armor.json @@ -123,21 +123,21 @@ "type": "TOOL_ARMOR", "category": "armor", "name": "powered marine armor", - "description": "A rusty red suit of exoskeleton armor; not powered by UPS, but by plutonium and charged ionic impulses. Granting the user more strength and running speed at the cost of potential protection and dexterity, this 'late-stage prototype' was deemed fit for field testing under 'abnormal or otherwise abhorrent' conditions against 'both electric and bionic spectrums'. Burdensome without its power, this suit will, unlike most powered armor, not prevent the use of clothing over it due to its encased seromotors, though it may be uncomfortable to do so.", + "description": "A rusty red suit of exoskeleton armor; not powered by UPS, but by plutonium and charged ionic impulses. Granting the user more strength and running speed at the cost of potential protection and dexterity, this 'late-stage prototype' was deemed fit for field testing under 'abnormal or otherwise abhorrent' conditions against 'both the electronic and bionic spectrums'. Burdensome without its power, this suit will, unlike most powered armor, not prevent the use of clothing over it due to its encased seromotors, though it may be uncomfortable to do so.", "weight": 8764, "volume": 76, "price": 15000000, "material": [ "spess_plastic", "hardsteel" ], "symbol": "[", "color": "ltred", - "initial_charges": 20, + "initial_charges": 25, "covers": [ "TORSO", "LEGS", "FEET", "ARMS", "HANDS" ], "coverage": 100, "encumbrance": 38, "storage": 14, "warmth": 40, "material_thickness": 2, - "environmental_protection": 7, + "environmental_protection": 6, "max_charges": 1000, "ammo": "plutonium", "artifact_data" : { @@ -158,19 +158,19 @@ "type": "TOOL_ARMOR", "category": "armor", "name": "powered marine armor (on)", - "description": "A rusty red suit of exoskeleton armor; not powered by UPS, but by plutonium and charged ionic impulses. Granting the user more strength and speed at the cost of potential protection and dexterity, this 'late-stage prototype' was deemed fit for field testing under 'abnormal or otherwise abhorrent' conditions against 'both electric and bionic spectrums'. While on it offers increased resistance to 'biologically generated waves and electrostatic impulses', as well as improving running speed and strength.", + "description": "A rusty red suit of exoskeleton armor; not powered by UPS, but by plutonium and charged ionic impulses. Granting the user more strength and speed at the cost of potential protection and dexterity, this 'late-stage prototype' was deemed fit for field testing under 'abnormal or otherwise abhorrent' conditions against 'both the electronic and bionic spectrums'. While on it offers increased resistance to 'biologically generated waves and electrostatic impulses', as well as improving running speed and strength.", "weight": 8764, "volume": 76, - "price": 1300000, + "price": 15000000, "material": [ "spess_plastic", "hardsteel" ], "symbol": "[", "color": "ltred", "covers": [ "TORSO", "LEGS", "FEET", "ARMS", "HANDS" ], "coverage": 100, - "encumbrance": 22, + "encumbrance": 24, "storage": 14, "warmth": 25, - "material_thickness": 4, + "material_thickness": 3, "environmental_protection": 8, "max_charges": 1000, "turns_per_charge": 6, diff --git a/items/explosives.json b/items/explosives.json index 899783b..819076e 100644 --- a/items/explosives.json +++ b/items/explosives.json @@ -25,7 +25,7 @@ "id": "manhack_firebomb_act", "type": "TOOL", "category": "weapons", - "name": "manhack acidbomb", + "name": "manhack firebomb", "description": "This is an acidbomb fitted into a manhack and rigged so the manhack can self-activate it. Due to the manhack exploding the effective radius is somewhat larger.", "weight": 180, "volume": 1, diff --git a/items/phaseout.json b/items/phaseout.json deleted file mode 100644 index 62ce5db..0000000 --- a/items/phaseout.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "id": "mon_ant_queen_firebug", - "type": "MONSTER", - "//": "Obsolete, kept for savegame compatibility.", - "copy-from": "mon_ant_queen", - "name": "queen ant", - "description": "A colossal red ant with a bulging, bloated thorax. It moves slowly and deliberately, tending to nearby eggs and continually laying more. Its antennae seem almost aesthetic, or at the least not used for sensing . . ." - } -] diff --git a/monsters/ant.json b/monsters/ant.json index e8f794f..aa5396d 100644 --- a/monsters/ant.json +++ b/monsters/ant.json @@ -459,7 +459,7 @@ "copy-from": "mon_ant_acid_queen", "name": "acidic ant queen", "description": "An enormous brown ant with an elongated, pulsating abdomen. It seems more interested in tending its eggs than using acid . . .", - "default_faction": "ant_acid", + "default_faction": "ant", "species": [ "INSECT" ], "diff": 16, "size": "LARGE", @@ -480,10 +480,11 @@ "armor_cut": 20, "vision_day": 5, "vision_night": 10, - "starting_ammo": { "bot_ant_acid_ultralisk": 2 }, + "starting_ammo": { "bot_ant_acid_ultralisk": 1 }, "special_attacks": [ - [ "ANTQUEEN", 3 ], [ "GRENADIER_ELITE", 5 ], + [ "ANTQUEEN", 3 ], + [ "UPGRADE", 3 ], [ "scrib", 20 ] ], "emit_fields": [ "emit_acid_small" ], @@ -498,7 +499,7 @@ "copy-from": "mon_ant_acid_larva", "name": "acidic larval ant", "description": "A squirming yellow grub that seems to be oozing liquid from both ends of its body. It has soft-looking chitin - kind of like a crab.", - "default_faction": "ant_acid", + "default_faction": "ant", "species": [ "INSECT" ], "size": "SMALL", "hp": 20, @@ -524,7 +525,7 @@ "edit-mode": "overwrite", "name": "giant acidic ant", "description": "An almost blind monstrous red ant with a swollen abdomen, that ends with a small orifice at the tip. Glistening liquid seems to drip out periodically.", - "default_faction": "ant_acid_hack", + "default_faction": "ant_hack", "species": [ "INSECT" ], "diff": 13, "size": "MEDIUM", @@ -572,7 +573,7 @@ ], "upgrades":{ "into_group": "GROUP_ANT_ACID_UPGRADE", - "half_life": 7 + "half_life": 5 }, "anger_triggers": [ "FRIEND_DIED", "HURT", "FIRE" ], "death_function": [ "ACID", "NORMAL" ], @@ -584,7 +585,7 @@ "type": "MONSTER", "name": "giant acidic ant", "description": "An almost blind monstrous red ant with a swollen abdomen, that ends with a small orifice at the tip. Glistening liquid seems to drip out periodically.", - "default_faction": "ant_acid_hack", + "default_faction": "ant_hack", "species": [ "INSECT" ], "diff": 13, "size": "MEDIUM", @@ -641,7 +642,7 @@ "copy-from": "mon_ant_acid_soldier", "name": "acidic soldier ant", "description": "A massive, woolly brown ant that towers over the worker ants with a giant head crest. Along with its huge mandibles, a corrosive liquid seeps from the end of its bloated abdomen, which prevents it from climbing.", - "default_faction": "ant_acid_hack", + "default_faction": "ant_hack", "species": [ "INSECT" ], "diff": 25, "size": "MEDIUM", @@ -700,7 +701,7 @@ "name": "kwama", "description": "You don't know what this thing is, but the ants treat it as one of their own. Its head looks like a maggot, completely devoid of pincers and with three beady eyes staring in different directions. While it typically travels on its four limbs, it occasionally stands upon its hind limbs to gaze about. It claws clumsily with the three grasping digits on each limb.", "species": "INSECT", - "default_faction": "ant_acid_hack", + "default_faction": "ant_hack", "symbol": "A", "color": "red", "size": "MEDIUM", @@ -738,7 +739,7 @@ "name": "ultralisk", "description": "The size of an elephant, this massive protector of the hive sports a cut-resistant chitin, and four razor-sharp mandibles and a dangling appendage on its head that drips a filthy green fluid, negating its ability to smell. Not completely acid-proof, these monstrosities tend to live short, brutal lives once fully matured.", "species": "INSECT", - "default_faction": "ant_acid_hack", + "default_faction": "ant_hack", "symbol": "A", "color": "green_red", "size": "HUGE", diff --git a/phaseout.json b/phaseout.json new file mode 100644 index 0000000..11bf3fb --- /dev/null +++ b/phaseout.json @@ -0,0 +1,123 @@ +[ + { + "id": "mon_ant_queen_firebug", + "type": "MONSTER", + "//": "Obsolete, kept for savegame compatibility.", + "copy-from": "mon_ant_queen", + "name": "queen ant", + "description": "A colossal red ant with a bulging, bloated thorax. It moves slowly and deliberately, tending to nearby eggs and continually laying more. Its antennae seem almost aesthetic, or at the least not used for sensing . . ." + }, + { + "id": "acidbomb_micro", + "type": "AMMO", + "category": "weapons", + "name": "micro acidbomb", + "description": "A single glass flask filled with caustic chemicals. When exposed to the air they will spray out in every direction, creating a modest field of acid.", + "weight": 285, + "volume": 1, + "price": 4500, + "to_hit": -1, + "bashing": 8, + "material": [ "glass" ], + "symbol": "*", + "color": "ltgreen", + "ammo_type": "thrown", + "flags": [ "ACT_ON_RANGED_HIT", "RECOVER_9" ], + "emits": [ "emit_acid_trail_slow" ], + "countdown_interval": 18, + "countdown_destroy": true, + "countdown_action": { + "type": "explosion", + "no_deactivate_msg": "The acid bubbles caustically.", + "explosion": { + } + } + }, + { + "type": "recipe", + "result": "acidbomb_micro", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_EXPLOSIVE", + "skill_used": "fabrication", + "difficulty": 10, + "time": 900, + "reversible": true, + "autolearn": true, + "components": [ + [ [ "clay_canister", 1 ], [ "flask_glass", 1 ] ], + [ [ "acid", 1 ] ], + [ [ "string_6", 1 ] ], + [ [ "rag", 1 ] ] + ] + }, + { + "id": "acidbomb_medium", + "type": "AMMO", + "category": "weapons", + "name": "large acidbomb", + "description": "There is enough frothing fluid inside this acidbomb to coat a relatively large area with fields of acid.", + "weight": 1640, + "volume": 2, + "price": 10000, + "to_hit": -1, + "bashing": 8, + "material": [ "glass" ], + "symbol": "*", + "color": "i_green", + "ammo_type": "thrown", + "flags": [ "ACT_ON_RANGED_HIT", "RECOVER_9" ], + "emits": [ "emit_acid_large" ], + "countdown_interval": 8, + "countdown_destroy": true, + "countdown_action": { + "type": "explosion", + "no_deactivate_msg": "The acid bubbles caustically.", + "explosion": { + } + } + }, + { + "id": "emit_acid_medium", + "type": "emit", + "//": "A medium spray of acid. (example: acidbomb medium)", + "field": "fd_acid", + "density": 2, + "qty": 9 + }, + { + "type": "recipe", + "result": "acidbomb_medium", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_EXPLOSIVE", + "skill_used": "fabrication", + "difficulty": 3, + "time": 1800, + "reversible": true, + "autolearn": true, + "components": [ + [ [ "bottle_glass", 1 ] ], + [ [ "clay_canister", 1 ], [ "flask_glass", 1 ] ], + [ [ "acid", 4 ] ], + [ [ "string_36", 1 ] ], + [ [ "rag", 2 ] ] + ] + }, + { + "type": "recipe", + "result": "acidbomb_medium", + "id_suffix": "jar", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_EXPLOSIVE", + "skill_used": "fabrication", + "difficulty": 10, + "time": 1800, + "reversible": true, + "autolearn": true, + "components": [ + [ [ "jar_glass", 2 ], [ "clay_canister", 4 ], [ "flask_glass", 4 ] ], + [ [ "acid", 4 ] ], + [ [ "string_36", 1 ] ], + [ [ "rag", 3 ] ] + ] + } +] diff --git a/pk_critter_factions.json b/pk_critter_factions.json index e5d96da..8d9efa0 100644 --- a/pk_critter_factions.json +++ b/pk_critter_factions.json @@ -82,21 +82,6 @@ "base_faction": "ant", "by_mood": [ "ant_male" ] }, - { - "type": "MONSTER_FACTION", - "name": "ant_acid", - "//": "work around the antqueen redesign, makes larvae upgrade to ants that will not devolve into larvae. Effectively weakens queen power.", - "base_faction": "insect", - "neutral": [ "small_animal" ], - "by_mood": [ "insect", "zombie", "triffid", "spore" ] - }, - { - "type": "MONSTER_FACTION", - "name": "ant_acid_hack", - "//": "work around the antqueen redesign, makes larvae upgrade to ants that will not devolve into larvae. Effectively weakens queen power. Not sure if needed.", - "base_faction": "ant_acid", - "friendly": [ "ant_acid" ] - }, { "type": "MONSTER_FACTION", "name": "triffid", diff --git a/pk_emit.json b/pk_emit.json index 6944f4e..83b2c23 100644 --- a/pk_emit.json +++ b/pk_emit.json @@ -81,13 +81,14 @@ "type": "emit", "//": "light acid trail (example: giant slug)", "field": "fd_acid", - "density": 1, + "qty": 1, + "density": 2, "chance": 90 }, { "id": "emit_slime_trail", "type": "emit", - "//": "light acid trail (example: snail man)", + "//": "light slime trail (example: snail man)", "field": "fd_slime", "density": 2, "chance": 75 @@ -222,14 +223,6 @@ "density": 2, "qty": 2 }, - { - "id": "emit_acid_medium", - "type": "emit", - "//": "A medium spray of acid. (example: acidbomb medium)", - "field": "fd_acid", - "density": 2, - "qty": 9 - }, { "id": "emit_acid_large", "type": "emit", diff --git a/pk_professions.json b/pk_professions.json index 6bcc22f..8a7b18e 100644 --- a/pk_professions.json +++ b/pk_professions.json @@ -155,13 +155,13 @@ "type": "profession", "ident": "mutant_crafter", "name": "MuCo Lab Assistant", - "description": "You were a staff member for the clinical tests for a new product called 'mutagen' when the bombs fell. In the chaos you grabbed some gear and left the others.", + "description": "You were a staff member for the clinical tests of a new product called 'mutagen' when the bombs fell. In the chaos you grabbed some gear and left the others.", "points": 4, "skills": [ { "name": "computer", "level": 3 }, { "name": "cooking", "level": 2 }, + { "name": "firstaid", "level": 2 }, { "name": "survival", "level": 1 }, - { "name": "firstaid", "level": 1 }, { "name": "speech", "level": 1 } ], "items": { @@ -205,7 +205,7 @@ { "type": "profession", "ident": "a pisskop", - "name": "pk, on an average day", + "name": "Generation Xer", "description": "You are a rakishly handsome young person who was in their late-20s 20 years ago. In good shape, and with a perchant for hording sentimental items, you set off on Z-day much as you did any other day . . .", "points": 4, "//": "gotta keep in mind balance . . .", diff --git a/pk_recipe.json b/pk_recipe.json index b7fa57e..fff74b5 100644 --- a/pk_recipe.json +++ b/pk_recipe.json @@ -828,23 +828,6 @@ [ [ "rag", 1 ] ] ] }, - { - "type": "recipe", - "result": "acidbomb_micro", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "fabrication", - "difficulty": 0, - "time": 900, - "reversible": true, - "autolearn": true, - "components": [ - [ [ "clay_canister", 1 ], [ "flask_glass", 1 ] ], - [ [ "acid", 1 ] ], - [ [ "string_6", 1 ] ], - [ [ "rag", 1 ] ] - ] - }, { "type": "recipe", "result": "acidbomb_small", @@ -857,14 +840,14 @@ "autolearn": true, "components": [ [ [ "jar_glass", 1 ], [ "clay_canister", 2 ], [ "flask_glass", 2 ] ], - [ [ "acid", 2 ] ], + [ [ "acid", 2 ], [ "chem_sulphuric_acid", 1 ] ], [ [ "string_6", 2 ] ], [ [ "rag", 1 ] ] ] }, { "type": "recipe", - "result": "acidbomb_medium", + "result": "acidbomb_large", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", @@ -874,47 +857,11 @@ "autolearn": true, "components": [ [ [ "bottle_glass", 1 ], [ "clay_canister", 3 ], [ "flask_glass", 3 ] ], - [ [ "acid", 3 ] ], + [ [ "acid", 3 ], [ "chem_sulphuric_acid", 2 ] ], [ [ "string_6", 2 ] ], [ [ "rag", 2 ] ] ] }, - { - "type": "recipe", - "result": "acidbomb_large", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "fabrication", - "difficulty": 3, - "time": 1800, - "reversible": true, - "autolearn": true, - "components": [ - [ [ "bottle_glass", 1 ] ], - [ [ "clay_canister", 1 ], [ "flask_glass", 1 ] ], - [ [ "acid", 4 ] ], - [ [ "string_36", 1 ] ], - [ [ "rag", 2 ] ] - ] - }, - { - "type": "recipe", - "result": "acidbomb_large", - "id_suffix": "jar", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "fabrication", - "difficulty": 3, - "time": 1800, - "reversible": true, - "autolearn": true, - "components": [ - [ [ "jar_glass", 2 ], [ "clay_canister", 4 ], [ "flask_glass", 4 ] ], - [ [ "acid", 4 ] ], - [ [ "string_36", 1 ] ], - [ [ "rag", 3 ] ] - ] - }, { "type": "recipe", "result": "bot_fungal_boil_egg", diff --git a/spawns/pk_itemlist_edit.json b/spawns/pk_itemlist_edit.json index 46ae450..d0609fe 100644 --- a/spawns/pk_itemlist_edit.json +++ b/spawns/pk_itemlist_edit.json @@ -29,7 +29,8 @@ [ "candle_smoke", 12 ], [ "lobotomizer", 1 ], [ "dr_stem_cell", 1 ], - [ "oxy_torch", 1 ] + [ "oxy_torch", 1 ], + [ "molotov_micro", 4 ] ] }, { @@ -386,7 +387,8 @@ [ "candle_smoke", 8 ], [ "1st_aid_survivor", 20 ], [ "medical_gauze", 4 ], - [ "dr_stem_cell", 1 ] + [ "dr_stem_cell", 1 ], + [ "molotov_micro", 5 ] ] }, { @@ -593,9 +595,9 @@ { "group": "prefab_chems", "prob": 1 }, { "item": "bot_manhack_fire", "prob": 2 }, { "item": "bot_manhack", "prob": 10 }, - { "item": "acidbomb_medium", "prob": 2 }, - { "item": "acidbomb_small", "prob": 4 }, - { "item": "acidbomb_micro", "prob": 5 } + { "item": "acidbomb_medium", "prob": 3 }, + { "item": "acidbomb_small", "prob": 5 }, + { "item": "molotov_micro", "prob": 3 } ] }, { @@ -703,7 +705,8 @@ [ "lobotomizer", 1 ], [ "vortex_stone", 4 ], [ "dr_stem_cell", 1 ], - [ "bomblet_launcher_brute", 1 ] + [ "bomblet_launcher_brute", 1 ], + [ "molotov_micro", 2 ] ] }, { @@ -969,7 +972,8 @@ [ "tinyweldtank", 4 ], [ "ref_lighter_dare", 5 ], [ "fridge_cargo", 3 ], - [ "oxy_torch", 5 ] + [ "oxy_torch", 5 ], + [ "molotov_micro", 5 ] ] }, { @@ -1049,7 +1053,8 @@ [ "1st_aid_survivor", 30 ], [ "medical_gauze", 25 ], [ "vortex_stone", 4 ], - [ "dr_stem_cell", 1 ] + [ "dr_stem_cell", 1 ], + [ "molotov_micro", 8 ] ] }, {