Skip to content

Commit

Permalink
Merge pull request #431 from linewriter1024/field-rename
Browse files Browse the repository at this point in the history
Change fd_reality_tear back to fd_fatigue
  • Loading branch information
chaosvolt authored May 30, 2024
2 parents cc2d0ca + 5e0bb2e commit 3881751
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Arcana/ammo_effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"check_sees": true,
"check_sees_radius": 3
},
"trail": { "field_type": "fd_reality_tear", "intensity_min": 1, "intensity_max": 1, "chance": 5 },
"trail": { "field_type": "fd_fatigue", "intensity_min": 1, "intensity_max": 1, "chance": 5 },
"explosion": { "power": 750, "distance_factor": 0.6 },
"do_emp_blast": true
},
Expand All @@ -102,7 +102,7 @@
"id": "AMMO_RIFT_FOCUS_SLEEPINESS",
"type": "ammo_effect",
"//": "In practice this is less risk of fatigue than the fission anomaly inlay, because it's only called once at the point of impact instead of all down the path it travels.",
"aoe": { "field_type": "fd_reality_tear", "intensity_min": 1, "intensity_max": 1, "chance": 5 }
"aoe": { "field_type": "fd_fatigue", "intensity_min": 1, "intensity_max": 1, "chance": 5 }
},
{
"id": "AMMO_RIFT_FOCUS_TINDALOS",
Expand Down
2 changes: 1 addition & 1 deletion Arcana/furniture_and_terrain/ter_furn_transform.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"field": [
{
"result": [ "fd_null" ],
"valid_field": [ "fd_reality_tear" ],
"valid_field": [ "fd_fatigue" ],
"message": "The fabric of reality around you weaves itself back together."
}
],
Expand Down
2 changes: 1 addition & 1 deletion Arcana/overmap_and_mapgen/mapgen_variants.json
Original file line number Diff line number Diff line change
Expand Up @@ -2269,7 +2269,7 @@
{ "item": "recipe_lab_arcana", "x": 20, "y": 11, "chance": 100 },
{ "item": "id_science", "x": 20, "y": 12, "chance": 100 }
],
"place_fields": [ { "x": 8, "y": 8, "field": "fd_reality_tear", "intensity": 1 } ],
"place_fields": [ { "x": 8, "y": 8, "field": "fd_fatigue", "intensity": 1 } ],
"place_monster": [
{ "monster": "mon_secubot", "x": 18, "y": 18 },
{ "monster": "mon_science_bot", "x": 19, "y": 13 },
Expand Down
4 changes: 2 additions & 2 deletions Arcana/spells/spells_aftermath.json
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@
"valid_targets": [ "ground" ],
"min_aoe": 4,
"max_aoe": 4,
"field_id": "fd_reality_tear",
"field_id": "fd_fatigue",
"field_chance": 100,
"min_field_intensity": 1,
"max_field_intensity": 1
Expand Down Expand Up @@ -999,7 +999,7 @@
"effect": "attack",
"shape": "blast",
"message": "",
"field_id": "fd_reality_tear",
"field_id": "fd_fatigue",
"field_chance": 2,
"min_field_intensity": 2,
"max_field_intensity": 2,
Expand Down
2 changes: 1 addition & 1 deletion Arcana/spells/spells_sanguine_marks.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"final_energy_cost": 22,
"energy_increment": -4.4,
"damage_type": "pure",
"field_id": "fd_reality_tear",
"field_id": "fd_fatigue",
"field_chance": 100,
"min_field_intensity": 1,
"max_field_intensity": 1
Expand Down

0 comments on commit 3881751

Please sign in to comment.