Skip to content

Commit

Permalink
fd_fatigue --> fd_reality_tear
Browse files Browse the repository at this point in the history
  • Loading branch information
I-am-Erk committed Mar 31, 2024
1 parent 1e90ea8 commit 35e6cfb
Show file tree
Hide file tree
Showing 24 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion data/json/artifact/altered_object_active.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,6 @@
"flags": [ "IGNORE_WALLS", "NO_PROJECTILE", "NO_EXPLOSION_SFX" ],
"shape": "blast",
"effect": "remove_field",
"effect_str": "fd_sleepiness"
"effect_str": "fd_reality_tear"
}
]
2 changes: 1 addition & 1 deletion data/json/artifact/legacy_artifact_active.json
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
"effect": "attack",
"message": "",
"shape": "blast",
"field_id": "fd_sleepiness",
"field_id": "fd_reality_tear",
"field_chance": 1,
"min_field_intensity": 2,
"max_field_intensity": 2,
Expand Down
4 changes: 2 additions & 2 deletions data/json/field_type.json
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@
"display_field": true
},
{
"id": "fd_sleepiness",
"id": "fd_reality_tear",
"type": "field_type",
"legacy_enum_id": 20,
"intensity_levels": [
Expand All @@ -892,7 +892,7 @@
"monster_spawn_chance": 600,
"monster_spawn_count": 1,
"monster_spawn_radius": 1,
"monster_spawn_group": "GROUP_NETHER_SLEEPINESS_FIELD"
"monster_spawn_group": "GROUP_NETHER_REALITY_TEAR_FIELD"
}
],
"description_affix": "under",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
"type": "furniture",
"id": "f_LIXA_unfold_barrier",
"name": "wall of flat space",
"looks_like": "fd_sleepiness",
"looks_like": "fd_reality_tear",
"description": "From a distance, this looks like where the chamber ends; a flat wall, with a very detailed painting of a tunnel behind it. But as you get closer, you can see how it ripples, like lazy water, and notice angles of the space beyond that a flat image could never give.",
"symbol": "@",
"color": "light_gray",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/lab/lab_floorplans_finale1level.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
],
"palettes": [ "lab_palette", "lab_loot_research" ],
"furniture": { "C": "f_machinery_electronic", "R": "f_rack", "D": "f_desk" },
"fields": { "Q": { "field": "fd_sleepiness", "intensity": 3 } },
"fields": { "Q": { "field": "fd_reality_tear", "intensity": 3 } },
"terrain": { "r": "t_metal_floor", "Y": "t_thconc_floor_olight", "p": "t_metal_floor" },
"mapping": {
"R": { "item": [ { "item": "dimensional_anchor" }, { "item": "phase_immersion_suit" } ] },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/mi-go/mi-go_portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
[ "f_null", 90 ]
]
},
"fields": { "P": { "field": "fd_sleepiness", "intensity": 1, "age": 10 } },
"fields": { "P": { "field": "fd_reality_tear", "intensity": 1, "age": 10 } },
"place_monsters": [ { "monster": "GROUP_MI-GO_BASE_COMMON", "density": 0.1, "x": 8, "y": 10 } ],
"nested": {
"1": {
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/microlab/microlab_special_tiles.json
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
"palettes": [ "microlab" ],
"terrain": { "G": "t_card_science", "9": "t_reinforced_glass_shutter" },
"furniture": { "t": "f_counter", "p": "f_counter", "M": "f_server", "A": "f_xedra_antenna", "D": "f_desk" },
"fields": { "Q": { "field": "fd_sleepiness", "intensity": 3 } },
"fields": { "Q": { "field": "fd_reality_tear", "intensity": 3 } },
"item": {
"D": [ { "item": "artifact_scp_doc", "chance": 30 }, { "item": "monitoring_equipment_doc", "chance": 30 } ],
"m": { "item": "xedra_microphone", "chance": 90 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen_palettes/nether_monster_palette.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
"Z": "f_nm_nether_lichen"
},
"traps": { "P": "tr_portal" },
"fields": { "q": { "field": "fd_sleepiness", "intensity": 1 }, "Q": { "field": "fd_sleepiness", "intensity": 2 } }
"fields": { "q": { "field": "fd_reality_tear", "intensity": 1 }, "Q": { "field": "fd_reality_tear", "intensity": 2 } }
}
]
2 changes: 1 addition & 1 deletion data/json/monster_special_attacks/monster_deaths.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"shape": "blast",
"effect": "attack",
"max_level": 2,
"field_id": "fd_sleepiness",
"field_id": "fd_reality_tear",
"field_chance": 1,
"min_field_intensity": 1,
"field_intensity_increment": 1,
Expand Down
2 changes: 1 addition & 1 deletion data/json/monstergroups/nether.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
{
"type": "monstergroup",
"name": "GROUP_NETHER_SLEEPINESS_FIELD",
"name": "GROUP_NETHER_REALITY_TEAR_FIELD",
"default": "mon_blank",
"monsters": [
{ "monster": "mon_flying_polyp", "weight": 100, "cost_multiplier": 0 },
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Aftershock/maps/furniture.json
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@
"type": "furniture",
"id": "f_translocator_buoy",
"name": "translocator buoy",
"looks_like": "fd_sleepiness",
"looks_like": "fd_reality_tear",
"move_cost_mod": 0,
"description": "A near undetectable spatial distortion field centered around a free floating golden mote. Examining it from up close would let you encode it for use with a translocation device.",
"symbol": ",",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/DinoMod/mapgen/DinoLabFinale.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
],
"palettes": [ "lab_palette", "lab_loot_research" ],
"furniture": { "C": "f_machinery_electronic", "R": "f_rack", "D": "f_desk" },
"fields": { "Q": { "field": "fd_sleepiness", "intensity": 3 } },
"fields": { "Q": { "field": "fd_reality_tear", "intensity": 3 } },
"terrain": { "r": "t_metal_floor", "Y": "t_thconc_floor_olight", "p": "t_metal_floor", "z": "t_strconc_floor" },
"mapping": {
"R": { "item": [ { "item": "dimensional_anchor" }, { "item": "phase_immersion_suit" } ] },
Expand Down Expand Up @@ -181,7 +181,7 @@
],
"palettes": [ "lab_palette", "lab_loot_research" ],
"furniture": { "C": "f_machinery_electronic", "R": "f_rack", "D": "f_desk" },
"fields": { "Q": { "field": "fd_sleepiness", "intensity": 3 } },
"fields": { "Q": { "field": "fd_reality_tear", "intensity": 3 } },
"terrain": { "r": "t_metal_floor", "Y": "t_thconc_floor_olight", "p": "t_metal_floor", "~": "t_water_sh", "z": "t_water_sh" },
"mapping": {
"R": { "item": [ { "item": "dimensional_anchor" }, { "item": "phase_immersion_suit" } ] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@
]
},
"effect": [
{ "u_set_field": "fd_sleepiness", "radius": 0, "intensity": 3, "hit_player": false },
{ "u_set_field": "fd_reality_tear", "radius": 0, "intensity": 3, "hit_player": false },
{ "u_message": "As you unleash your powers, the air around you twists and warps in on itself.", "type": "bad" }
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"rows": [ "X" ],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"terrain": { "X": "t_nether_stone" },
"place_fields": [ { "field": "fd_sleepiness", "x": 0, "y": 0, "intensity": 3 } ]
"place_fields": [ { "field": "fd_reality_tear", "x": 0, "y": 0, "intensity": 3 } ]
}
}
]
4 changes: 2 additions & 2 deletions data/mods/MindOverMatter/mapgen/microlab_rooms.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@
"terrain": { "G": "t_card_science", "9": "t_reinforced_glass_shutter" },
"furniture": { "t": "f_counter", "M": "f_server", "A": "f_xedra_antenna", "D": "f_portal_stabilizer" },
"item": { "m": { "item": "xedra_microphone", "chance": 90 }, "s": { "item": "xedra_seismograph", "chance": 90 } },
"fields": { "Q": { "field": "fd_sleepiness", "intensity": 2 } },
"fields": { "Q": { "field": "fd_reality_tear", "intensity": 2 } },
"place_monster": [
{ "group": "GROUP_LAB", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 60, "repeat": [ 1, 5 ] },
{ "group": "GROUP_FERAL_TELEPORTER", "x": [ 3, 20 ], "y": [ 3, 20 ], "chance": 30, "repeat": [ 1, 2 ] },
{ "group": "GROUP_NETHER_SLEEPINESS_FIELD", "x": [ 10, 12 ], "y": [ 6, 7 ], "chance": 50, "repeat": [ 2, 3 ] }
{ "group": "GROUP_NETHER_REALITY_TEAR_FIELD", "x": [ 10, 12 ], "y": [ 6, 7 ], "chance": 50, "repeat": [ 2, 3 ] }
],
"computers": {
"7": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2471,7 +2471,7 @@
"object": {
"mapgensize": [ 1, 1 ],
"place_terrain": [ { "ter": "t_nether_water_sh", "x": 0, "y": 0 } ],
"place_fields": [ { "field": "fd_sleepiness", "x": 0, "y": 0, "intensity": 3 } ],
"place_fields": [ { "field": "fd_reality_tear", "x": 0, "y": 0, "intensity": 3 } ],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
}
},
Expand All @@ -2482,7 +2482,7 @@
"object": {
"mapgensize": [ 1, 1 ],
"place_terrain": [ { "ter": "t_strconc_floor", "x": 0, "y": 0 } ],
"place_fields": [ { "field": "fd_sleepiness", "x": 0, "y": 0, "intensity": 3 } ],
"place_fields": [ { "field": "fd_reality_tear", "x": 0, "y": 0, "intensity": 3 } ],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
}
},
Expand All @@ -2493,7 +2493,7 @@
"object": {
"mapgensize": [ 1, 1 ],
"place_terrain": [ { "ter": "t_floor", "x": 0, "y": 0 } ],
"place_fields": [ { "field": "fd_sleepiness", "x": 0, "y": 0, "intensity": 3 } ],
"place_fields": [ { "field": "fd_reality_tear", "x": 0, "y": 0, "intensity": 3 } ],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
},
{
"type": "monstergroup",
"name": "GROUP_NETHER_SLEEPINESS_FIELD",
"name": "GROUP_NETHER_REALITY_TEAR_FIELD",
"monsters": [ { "monster": "mon_nether_eater", "weight": 100, "cost_multiplier": 0 } ]
},
{
Expand Down
8 changes: 4 additions & 4 deletions data/mods/MindOverMatter/overmap/nether_crystal_field.json
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@
"furniture": { "N": [ [ "f_nether_crystal_structure", 1 ], [ "f_null", 1 ] ] },
"place_monsters": [ { "monster": "GROUP_CRYSTAL_FIELD_PSYCHOACTIVE", "x": [ 0, 1 ], "y": [ 0, 1 ], "chance": 50, "repeat": [ 1, 3 ] } ],
"place_fields": [
{ "field": "fd_sleepiness", "x": 0, "y": 1, "intensity": [ 2, 3 ] },
{ "field": "fd_sleepiness", "x": 1, "y": 0, "intensity": [ 2, 3 ] }
{ "field": "fd_reality_tear", "x": 0, "y": 1, "intensity": [ 2, 3 ] },
{ "field": "fd_reality_tear", "x": 1, "y": 0, "intensity": [ 2, 3 ] }
]
}
},
Expand All @@ -235,8 +235,8 @@
"furniture": { "N": [ [ "f_nether_crystal_structure", 1 ], [ "f_null", 1 ] ] },
"place_monsters": [ { "monster": "GROUP_CRYSTAL_FIELD_PSYCHOACTIVE", "x": [ 0, 1 ], "y": [ 0, 1 ], "chance": 50, "repeat": [ 1, 3 ] } ],
"place_fields": [
{ "field": "fd_sleepiness", "x": 0, "y": 0, "intensity": [ 2, 3 ] },
{ "field": "fd_sleepiness", "x": 1, "y": 1, "intensity": [ 2, 3 ] }
{ "field": "fd_reality_tear", "x": 0, "y": 0, "intensity": [ 2, 3 ] },
{ "field": "fd_reality_tear", "x": 1, "y": 1, "intensity": [ 2, 3 ] }
]
}
},
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Mythos-Creatures/monstergroups/nether.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
{
"type": "monstergroup",
"name": "GROUP_NETHER_SLEEPINESS_FIELD",
"name": "GROUP_NETHER_REALITY_TEAR_FIELD",
"default": "mon_blank",
"monsters": [
{ "monster": "mon_flying_polyp", "weight": 100, "cost_multiplier": 0 },
Expand Down
2 changes: 1 addition & 1 deletion data/mods/No_Hope/monster_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
},
{
"type": "monstergroup",
"name": "GROUP_NETHER_SLEEPINESS_FIELD",
"name": "GROUP_NETHER_REALITY_TEAR_FIELD",
"monsters": [ { "monster": "mon_staring_eye", "weight": 100, "cost_multiplier": 0 } ]
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/field_type.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const field_type_str_id fd_dazzling( "fd_dazzling" );
const field_type_str_id fd_electricity( "fd_electricity" );
const field_type_str_id fd_electricity_unlit( "fd_electricity_unlit" );
const field_type_str_id fd_extinguisher( "fd_extinguisher" );
const field_type_str_id fd_sleepiness( "fd_sleepiness" );
const field_type_str_id fd_reality_tear( "fd_reality_tear" );
const field_type_str_id fd_fire( "fd_fire" );
const field_type_str_id fd_fire_vent( "fd_fire_vent" );
const field_type_str_id fd_flame_burst( "fd_flame_burst" );
Expand Down
2 changes: 1 addition & 1 deletion src/field_type.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ extern const field_type_str_id fd_dazzling;
extern const field_type_str_id fd_electricity;
extern const field_type_str_id fd_electricity_unlit;
extern const field_type_str_id fd_extinguisher;
extern const field_type_str_id fd_sleepiness;
extern const field_type_str_id fd_reality_tear;
extern const field_type_str_id fd_fire;
extern const field_type_str_id fd_fire_vent;
extern const field_type_str_id fd_flame_burst;
Expand Down
12 changes: 6 additions & 6 deletions src/map_extras.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ static bool mx_portal_in( map &m, const tripoint &abs_sub )
switch( rng( 1, 6 ) ) {
//Mycus spreading through the portal
case 1: {
m.add_field( portal_location, fd_sleepiness, 3 );
m.add_field( portal_location, fd_reality_tear, 3 );
fungal_effects fe;
for( const tripoint &loc : m.points_in_radius( portal_location, 5 ) ) {
if( one_in( 3 ) ) {
Expand All @@ -1001,15 +1001,15 @@ static bool mx_portal_in( map &m, const tripoint &abs_sub )
}
//Netherworld monsters spawning around the portal
case 2: {
m.add_field( portal_location, fd_sleepiness, 3 );
m.add_field( portal_location, fd_reality_tear, 3 );
for( const tripoint &loc : m.points_in_radius( portal_location, 5 ) ) {
m.place_spawns( GROUP_NETHER_PORTAL, 15, loc.xy(), loc.xy(), 1, true );
}
break;
}
//Several cracks in the ground originating from the portal
case 3: {
m.add_field( portal_location, fd_sleepiness, 3 );
m.add_field( portal_location, fd_reality_tear, 3 );
for( int i = 0; i < rng( 1, 10 ); i++ ) {
tripoint end_location = { rng( 0, SEEX * 2 - 1 ), rng( 0, SEEY * 2 - 1 ), abs_sub.z };
std::vector<tripoint> failure = line_to( portal_location, end_location );
Expand All @@ -1021,7 +1021,7 @@ static bool mx_portal_in( map &m, const tripoint &abs_sub )
}
//Radiation from the portal killed the vegetation
case 4: {
m.add_field( portal_location, fd_sleepiness, 3 );
m.add_field( portal_location, fd_reality_tear, 3 );
const int rad = 5;
for( int i = p.x - rad; i <= p.x + rad; i++ ) {
for( int j = p.y - rad; j <= p.y + rad; j++ ) {
Expand Down Expand Up @@ -1062,7 +1062,7 @@ static bool mx_portal_in( map &m, const tripoint &abs_sub )
}

const tripoint portal_location = { p1 + tripoint( extra, abs_sub.z ) };
m.add_field( portal_location, fd_sleepiness, 3 );
m.add_field( portal_location, fd_reality_tear, 3 );

std::set<point> ignited;
place_fumarole( m, p1, p2, ignited );
Expand All @@ -1082,7 +1082,7 @@ static bool mx_portal_in( map &m, const tripoint &abs_sub )
}
//Anomaly caused by the portal and spawned an artifact
case 6: {
m.add_field( portal_location, fd_sleepiness, 3 );
m.add_field( portal_location, fd_reality_tear, 3 );
artifact_natural_property prop =
static_cast<artifact_natural_property>( rng( ARTPROP_NULL + 1, ARTPROP_MAX - 1 ) );
m.create_anomaly( portal_location, prop );
Expand Down
4 changes: 2 additions & 2 deletions src/map_field.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1661,7 +1661,7 @@ void map::player_in_field( Character &you )
}
}
}
if( ft == fd_sleepiness ) {
if( ft == fd_reality_tear ) {
// Assume the rift is on the ground for now to prevent issues with the player being unable access vehicle controls on the same tile due to teleportation.
if( !you.in_vehicle ) {
// Teleports you... somewhere.
Expand Down Expand Up @@ -1981,7 +1981,7 @@ void map::monster_in_field( monster &z )
cur.get_field_intensity() ) );
z.deal_damage( nullptr, bodypart_id( "torso" ), damage_instance( damage_electric, field_dmg ) );
}
if( cur_field_type == fd_sleepiness ) {
if( cur_field_type == fd_reality_tear ) {
if( rng( 0, 2 ) < cur.get_field_intensity() ) {
dam += cur.get_field_intensity();
teleport::teleport( z );
Expand Down

0 comments on commit 35e6cfb

Please sign in to comment.