Skip to content

Commit

Permalink
tweak acid bombs
Browse files Browse the repository at this point in the history
  • Loading branch information
pisskop committed May 24, 2018
1 parent 3413207 commit e9b968f
Show file tree
Hide file tree
Showing 11 changed files with 169 additions and 174 deletions.
59 changes: 5 additions & 54 deletions items/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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",
Expand All @@ -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": {
}
}
Expand Down
14 changes: 7 additions & 7 deletions items/armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" : {
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion items/explosives.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 0 additions & 10 deletions items/phaseout.json

This file was deleted.

21 changes: 11 additions & 10 deletions monsters/ant.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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" ],
Expand All @@ -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,
Expand All @@ -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",
Expand Down Expand Up @@ -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" ],
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
123 changes: 123 additions & 0 deletions phaseout.json
Original file line number Diff line number Diff line change
@@ -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 ] ]
]
}
]
15 changes: 0 additions & 15 deletions pk_critter_factions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading

0 comments on commit e9b968f

Please sign in to comment.