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

Jump to bottom

[RDY] Adds weapon chemical launcher and new fungicidal gas type as ammo #12765

Merged
merged 14 commits into from
Jul 2, 2015
Merged

[RDY] Adds weapon chemical launcher and new fungicidal gas type as ammo #12765

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3780b1a
Chemical Launcher Commits
skYYman Jun 23, 2015
415cbf0
suggested fixes and first terrain changes
skYYman Jun 23, 2015
faebdbc
typefixes and balancing, basis for terrain alterations
skYYman Jun 24, 2015
61a0b72
final commits for alpha version
skYYman Jun 24, 2015
28c5b0c
deleted leftover tabstops, fixed compiler issue, changed ammo type
skYYman Jun 24, 2015
401c156
more fixes
skYYman Jun 24, 2015
aec4e01
ammo type changes reverted, typos corrected
skYYman Jun 25, 2015
09d4f44
added effects on char with marloss/mycus threshold, added diff furn/ter
skYYman Jun 25, 2015
39770ce
tweaks, fixes - needs testing for balance now
skYYman Jun 25, 2015
0dfd529
BETA - general ammo for launcher
skYYman Jun 25, 2015
efbf03a
added RetroDays tileset support
skYYman Jun 25, 2015
c77226d
suggested fixes and balancing
skYYman Jun 25, 2015
cfd851c
new flag for gas-proof equipment
skYYman Jun 26, 2015
7324aef
code cleanup, outdoor age speedup balancing
skYYman Jun 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 25 additions & 0 deletions data/json/items/ammo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4410,6 +4410,31 @@
"dispersion" : 0,
"recoil" : 0,
"count" : 1
},
{ "type" : "AMMO",
"id" : "gas_fungicidal",
"category" : "chems",
"price" : 1200,
"name" : "sprayable fungicide",
"symbol" : "=",
"color" : "yellow",
"description" : "Fungicide enhanced with sulfur to create sprayable anti-fungal ammo for the chemical thrower.",
"material" : "hydrocarbons",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should probably give it some other material. "null" should be fine.
Hydrocarbons is for stuff that fuels fires really well.

"volume" : 1,
"weight" : 1,
"phase" : "liquid",
"bashing" : 1,
"cutting" : 0,
"to_hit" : 0,
"ammo_type" : "gas_fungicidal",
"casing" : "NULL",
"damage" : 0,
"pierce" : 0,
"range" : 4,
"dispersion" : 0,
"recoil" : 0,
"count" : 100,
"effects" : [ "GAS_FUNGICIDAL", "STREAM_GAS", "NEVER_MISFIRES"]
}

]
6 changes: 6 additions & 0 deletions data/json/items/ammo_types.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,5 +431,11 @@
"name" : "semi-charred fuel",
"default" : "unfinished_charcoal"
}
{
"type" : "ammunition_type",
"id" : "gas_fungicidal",
"name" : "fungicidal gas",
"default" : "gas_fungicidal"
}

]
26 changes: 26 additions & 0 deletions data/json/items/ranged.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5428,5 +5428,31 @@
"built_in_mods": ["m203", "rifle_scope", "muzzle_brake"],
"default_mods": ["pistol_grip", "rail_laser_sight"],
"valid_mod_locations": [[ "accessories", 10 ],[ "barrel", 10 ],[ "bore", 10 ],[ "conversion", 10 ],[ "grip", 10 ],[ "magazine", 10 ],[ "mechanism", 10 ],[ "muzzle", 10 ],[ "rail", 10 ],[ "sights", 10 ],[ "stock", 10 ],[ "underbarrel", 10 ]]
},
{
"id": "chemical_thrower",
"type": "GUN",
"symbol": "(",
"color": "dark_gray",
"name": "chemical thrower",
"description": "A bulky, self-made chemical sprayer with an internal conversion mechanism that allows all sorts of chemicals to be dispersed to your surroundings.",
"price": 15000,
"material": ["steel", "plastic"],
"flags": ["FIRE_100", "NEVER_JAMS"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fire 100 is quite a lot. With flamethrowers you can acquire the ammo easily by siphoning it from cars. Here you've got to craft every shot.

Fire 20 or 50 should be fine, unless you intend to make the gas very powerful.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought that one canister filling of 2000 units (so 20 uses) should be enough to eradicate one large patch of fungus. I can't really tell how the gas will spread by only looking at the code though, so I don't know when it would be considered overpowered. This thing shouldn't be the end-all anti-fungus tool.

"skill": "launcher",
"ammo": "gas_fungicidal",
"weight": 1150,
"volume": 25,
"bashing": 9,
"cutting": 0,
"to_hit": -1,
"ranged_damage": -5,
"dispersion": 300,
"sight_dispersion": 150,
"aim_speed" : 0,
"recoil": 0,
"durability": 6,
"clip_size": 2000,
"reload": 900
}
]
30 changes: 30 additions & 0 deletions data/json/recipes/recipe_ammo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4435,6 +4435,36 @@
[ "solder_wire", 200 ]
]
]
},{
"type" : "recipe",
"result": "gas_fungicidal",
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_OTHER",
"skill_used": "cooking",
"skills_required": [ "survival", 2 ],
"difficulty": 4,
"time": 5000,
"reversible": false,
"autolearn": false,
"book_learn": [["textbook_chemistry", 4] , ["adv_chemistry", 4] , [ "recipe_labchem", 4]],
"qualities":[
{"id":"CHEM","level":1,"amount":1}
], "tools": [
[
[ "fire", -1 ],
[ "toolset", 2 ],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bump up those numbers a bit. 2 is only enough heat to boil a cup of water.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, didn't really know what that number was supposed to be ^.^

[ "hotplate", 2 ],
[ "char_smoker", 1 ]
]
],
"components": [
[
[ "fungicide", 100 ]
],
[
[ "sulfur", 10 ]
]
]
}


Expand Down
47 changes: 47 additions & 0 deletions data/json/recipes/recipe_weapon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6733,5 +6733,52 @@
["steel_chunk", 4],
["scrap", 12]]
]
},
{
"type" : "recipe",
"result": "chemical_thrower",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_RANGED",
"skill_used": "mechanics",
"skills_required": [[ "gun", 3 ], [ "cooking", 3]],
"difficulty": 7,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's quite a lot of requirements there.
I'd drop the gun requirement. Maybe change it to [[ "launchers", 1 ]] or 2.
And 5 mechanics would also be plenty - 7 is for complex, precise stuff. Since the thrower is really bulky, you could also make it more "makeshift".

Early availability is quite important for this kind of stuff, because later on it will be obsoleted by the chain lightning CBM.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point. Never actually got to the point where I had the chain lightning.

Althought the biggest argument for making this thing harder to craft is the fact that it will at some point defungify terrain and afaik there is nothing in the game yet, that does that.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fire does it very cheaply. Digging holes into fungal bed is a work-intensive, but precise method of fixing it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:D true
But fire is risky and hard to control and digging is only for masochists.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still, you can counter a fungal infestation by digging out a small area surrounding your useful stuff and then burning the rest.

"time": 12000,
"reversible": true,
"autolearn": true,
"qualities":[
{"id":"SAW_M_FINE","level":1,"amount":1},
{"id":"SCREW_FINE","level":1,"amount":1},
{"id":"HAMMER","level":2,"amount":1}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use 4 spaces rather than tabs.

],
"tools":
[
[
["goggles_welding", -1]
],
[
["oxy_torch", 80],
["welder", 400],
["welder_crude", 550],
["toolset", 550]
],
], "components": [
[
[ "pilot_light", 1 ]
],
[
[ "wrench", 1]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it supposed to consume the wrench for the construction? You probably want it as a tool quality, not something to be consumed.
If you want something to pump the fuel, foot crank seems to be the common choice. I think pneumatic rifle has it as a component.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I got inspired by this http://www.sharpe-art.com/wp-content/uploads/2009/12/ChemicalThrowerLayout.JPG

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrenches can be quire valuable here. Since the recipe involves welding, a pipe would be enough here.

Also, add a small or tiny metal tank to the recipe.

],
[
[ "pipe", 1 ]
],
[
[ "hose", 2 ]
],
[
[ "steel_lump", 1],
[ "steel_chunk", 4],
[ "scrap", 12]
],
]
}
]
6 changes: 6 additions & 0 deletions src/damage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,12 @@ void ammo_effects( const tripoint &p, const std::set<std::string> &effects )
}
}

if( effects.count( "GAS_FUNGICIDAL" ) > 0 ) {
for( auto &&pt : g->m.points_in_radius( p, 2, 0 ) ) {
g->m.add_field( pt, fd_fungicidal_gas, 3, 0 );
}
}

if( effects.count( "SMOKE" ) > 0 ) {
for( auto &&pt : g->m.points_in_radius( p, 1, 0 ) ) {
g->m.add_field( pt, fd_smoke, 3, 0 );
Expand Down
52 changes: 46 additions & 6 deletions src/field.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,13 @@ void game::init_fields()
{"", "", ""}, '&', -1,
{c_white, c_yellow, c_red}, {true, true, true}, {false, false, false}, MINUTES(50),
{0,0,0}
},

{
"fd_fungicidal_gas",
{_("hazy cloud"),_("fungicidal gas"),_("thick fungicidal gas")}, '8', 8,
{c_white, c_ltgray, c_dkgray}, {true, true, false}, {false, true, true}, MINUTES(30),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could also alter the time here. The MINUTES(30) is the average time it takes for the field to decay by 1 density.

{0,0,0}
}

};
Expand Down Expand Up @@ -753,7 +760,7 @@ bool map::process_fields_in_submap( submap *const current_submap,
// because the only trap we're checking for is brazier
const auto &ter = map_tile.get_ter_t();
const auto &frn = map_tile.get_furn_t();

const auto &trp = map_tile.get_trap();
// We've got ter/furn cached, so let's use that
const bool is_sealed = ter_furn_has_flag( ter, frn, TFLAG_SEALED ) &&
Expand Down Expand Up @@ -1004,7 +1011,7 @@ bool map::process_fields_in_submap( submap *const current_submap,
// The fire feeds on the ground itself until max density.
time_added += 4 - cur->getFieldDensity();
smoke += 2;
if( cur->getFieldDensity() > 1 &&
if( cur->getFieldDensity() > 1 &&
one_in( 200 - cur->getFieldDensity() * 50 ) ) {
destroy( p, true );
}
Expand All @@ -1013,7 +1020,7 @@ bool map::process_fields_in_submap( submap *const current_submap,
// The fire feeds on the ground itself until max density.
time_added += 5 - cur->getFieldDensity();
smoke += 2;
if( cur->getFieldDensity() > 1 &&
if( cur->getFieldDensity() > 1 &&
one_in( 200 - cur->getFieldDensity() * 50 ) ) {
ter_set( p, t_dirt );
furn_set( p, f_ash );
Expand All @@ -1030,7 +1037,7 @@ bool map::process_fields_in_submap( submap *const current_submap,
} else {
// Don't fuel raging fires or they'll burn forever
// as they can produce small fires above themselves
int new_density = std::max( cur->getFieldDensity(),
int new_density = std::max( cur->getFieldDensity(),
fire_there->getFieldDensity() );
// Allow smaller fires to combine
if( new_density < 3 &&
Expand Down Expand Up @@ -1162,7 +1169,7 @@ bool map::process_fields_in_submap( submap *const current_submap,
// Our iterator will start at end_i + 1 and increment from there and then wrap around.
// This guarantees it will check all neighbors, starting from a random one
const size_t end_i = (size_t)rng( 0, neighs.size() - 1 );
for( size_t i = ( end_i + 1 ) % neighs.size();
for( size_t i = ( end_i + 1 ) % neighs.size();
i != end_i; i = ( i + 1 ) % neighs.size() ) {
if( one_in( cur->getFieldDensity() * 2 ) ) {
// Skip some processing to save on CPU
Expand Down Expand Up @@ -1659,6 +1666,11 @@ bool map::process_fields_in_submap( submap *const current_submap,
//Legacy Stuff
case fd_rubble:
make_rubble( p );
break;

case fd_fungicidal_gas:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want to de-fungify terrain, it would be in this block

dirty_transparency_cache = true;
spread_gas( cur, p, curtype, 50, 30 );
break;

default:
Expand Down Expand Up @@ -2071,6 +2083,23 @@ void map::player_in_field( player &u )
}
break;

case fd_fungicidal_gas:
// Fungicidal gas makes you cough.
// Thick fungicidal gas has a chance to poison you.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if you've crossed a fungal threshold like mycus or marloss? Shouldn't it be doing extra damage/poison to you?

{
bool inhaled = false;
if( cur->getFieldDensity() == 3 && !inside ) {
inhaled = u.add_env_effect("poison", bp_mouth, 5, 30);
} else if( cur->getFieldDensity() == 2 && !inside ) {
inhaled = u.add_env_effect("smoke", bp_mouth, 2, 7);
}
if( inhaled ) {
// player does not know how the npc feels, so no message.
u.add_msg_if_player(m_bad, _("You feel sick from inhaling the %s"), cur->name().c_str());
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't do anything with the inhaled variable.

break;

default:
//Suppress warnings
break;
Expand Down Expand Up @@ -2366,9 +2395,20 @@ void map::monster_in_field( monster &z )
z.moves -= rng( 10 * density, 30 * density );
dam += rng( 0, 10 * density );
}

break;

case fd_fungicidal_gas:
if( z.type->in_species("FUNGUS") ) {
const int density = cur->getFieldDensity();
z.moves -= rng( 10 * density, 30 * density );
dam += rng( 10, 15 * density );
}
/* const auto &ter = maptile.get_ter_t();
if( ter == t_fungus ) {
submap.set_ter = t_dirt;
}*/
break;

default:
//Suppress warnings
break;
Expand Down
1 change: 1 addition & 0 deletions src/field.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ enum field_id : int {
fd_hot_air2,
fd_hot_air3,
fd_hot_air4,
fd_fungicidal_gas,
num_fields
};

Expand Down
6 changes: 5 additions & 1 deletion src/map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3011,7 +3011,7 @@ std::pair<bool, bool> map::bash_ter_furn( const tripoint &p, const int str,
if( !sound.empty() && !silent ) {
sounds::sound( p, sound_volume, sound, false, "bash", sound );
}

return std::pair<bool, bool>( smashed_something, success );
}

Expand Down Expand Up @@ -3382,6 +3382,10 @@ void map::shoot( const tripoint &p, int &dam,
add_field(p, fd_fire, rng(1, 2), 0 );
}

if (ammo_effects.count("STREAM_GAS") && !one_in(3)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something more descriptive would be better. Something like "FUNGICIDAL_STREAM" or "FUNGICIDAL_TRAIL".

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

STREAM_FUNGICIDE, or maybe STREAM_ANTIFUNGAL?

add_field(p, fd_fungicidal_gas, rng(1, 2), 0 );
}

if (ammo_effects.count("STREAM_BIG") && !one_in(4)) {
add_field(p, fd_fire, 2, 0 );
}
Expand Down