Skip to content

Commit

Permalink
Merge pull request #131 from Kenshut/кое-что-интерес
Browse files Browse the repository at this point in the history 
Сценарий "безопасное место" теперь безопасен. Крыши можно сломать. Нпс более адекватно относятся к угрозе
  • Loading branch information
@AtomicFox556
AtomicFox556 authored Nov 7, 2023
2 parents 182eae7 + 1aa8853 commit 86d8d02
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 19 deletions.
30 changes: 15 additions & 15 deletions data/json/furniture_and_terrain/terrain-roofs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"color": "dark_gray",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": true }
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
},
{
"type": "terrain",
Expand All @@ -125,7 +125,7 @@
"color": "dark_gray",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAMMABLE", "FLAT" ],
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": true }
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
},
{
"type": "terrain",
Expand All @@ -137,7 +137,7 @@
"color": "green",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAMMABLE", "FLAT" ],
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": true }
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
},
{
"type": "terrain",
Expand All @@ -149,7 +149,7 @@
"color": "yellow",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAMMABLE" ],
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": true }
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
},
{
"type": "terrain",
Expand All @@ -161,7 +161,7 @@
"color": "light_gray",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": true }
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
},
{
"type": "terrain",
Expand All @@ -173,7 +173,7 @@
"color": "white",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT", "FLAMMABLE" ],
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": true }
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
},
{
"type": "terrain",
Expand Down Expand Up @@ -204,7 +204,7 @@
"color": "brown",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT" ],
"bash": { "str_min": 100, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": true }
"bash": { "str_min": 100, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
},
{
"type": "terrain",
Expand Down Expand Up @@ -234,7 +234,7 @@
"sound_vol": 8,
"sound_fail_vol": 4,
"ter_set": "t_hole",
"bash_below": true
"bash_below": false
}
},
{
Expand All @@ -256,7 +256,7 @@
"sound_vol": 15,
"sound_fail_vol": 10,
"ter_set": "t_hole",
"bash_below": true
"bash_below": false
}
},
{
Expand All @@ -269,7 +269,7 @@
"color": "dark_gray",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
"bash": { "str_min": 100, "str_max": 400, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": true }
"bash": { "str_min": 100, "str_max": 400, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
},
{
"type": "terrain",
Expand All @@ -281,7 +281,7 @@
"color": "brown",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAMMABLE", "FLAT" ],
"bash": { "str_min": 50, "str_max": 400, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": true }
"bash": { "str_min": 50, "str_max": 400, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
},
{
"type": "terrain",
Expand All @@ -293,7 +293,7 @@
"color": "brown",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "FLAT" ],
"bash": { "str_min": 50, "str_max": 400, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": true }
"bash": { "str_min": 50, "str_max": 400, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
},
{
"type": "terrain",
Expand All @@ -305,7 +305,7 @@
"color": "dark_gray",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
"bash": { "str_min": 200, "str_max": 500, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": true }
"bash": { "str_min": 200, "str_max": 500, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
},
{
"type": "terrain",
Expand All @@ -317,7 +317,7 @@
"color": "green",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAMMABLE" ],
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": true }
"bash": { "str_min": 30, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
},
{
"type": "terrain",
Expand All @@ -328,6 +328,6 @@
"color": "red",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
"bash": { "str_min": 48, "str_max": 80, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": true }
"bash": { "str_min": 48, "str_max": 80, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
}
]
2 changes: 1 addition & 1 deletion data/json/mapgen/cabin.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"-----------GG-----------"
],
"palettes": [ { "distribution": [ [ "cabin_palette", 1 ], [ "cabin_palette_abandoned", 1 ] ] } ],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": 7, "y": 4 } ],
"place_loot": [ { "group": "corpse_generic_human", "x": 7, "y": 4, "chance": 100 } ],
"place_nested": [ { "chunks": [ [ "KINDRED_Darren_Cooper_spawn", 20 ], [ "null", 80 ] ], "x": 12, "y": 14 } ]
}
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/farm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
{ "item": "tools_common", "chance": 50 }
]
},
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 3 ] } ]
"place_loot": [ { "group": "corpse_generic_human", "x": [ 2, 22 ], "y": [ 2, 22 ], "chance": 100 } ]
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/common_chat/TALK_COMMON_OTHER.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
],
"opinion": { "trust": -4, "fear": 3, "value": -1, "anger": 4 }
},
"failure": { "topic": "TALK_DENY_FOLLOW", "effect": "deny_follow", "opinion": { "trust": 4, "value": -5, "anger": 10 } }
"failure": { "topic": "TALK_DENY_FOLLOW", "effect": "deny_follow", "opinion": { "trust": 4, "value": -5, "anger": 20 } }
},
{ "switch": true, "default": true, "text": "Nevermind.", "topic": "TALK_NONE" }
]
Expand Down
1 change: 0 additions & 1 deletion data/json/scenarios.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@
"sloc_horse_ranch",
"sloc_lighthouse_ground",
"sloc_lodge_ground",
"sloc_freshwater_research_station",
"sloc_light_industry_scen"
],
"start_name": "Safe Building",
Expand Down

0 comments on commit 86d8d02

Please sign in to comment.