Skip to content

Commit

Permalink
Merge pull request #15 from CleverRaven/master
Browse files Browse the repository at this point in the history 
ExpandedPrisonBreakJul02
  • Loading branch information
@xanderrootslayer
xanderrootslayer authored Jul 2, 2019
2 parents fd9dceb + 0d99a68 commit 3a581ab
Show file tree
Hide file tree
Showing 60 changed files with 694 additions and 212 deletions.
28 changes: 0 additions & 28 deletions data/json/game_balance.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,6 @@
"stype": "float",
"value": 18
},
{
"type": "EXTERNAL_OPTION",
"name": "GUN_DISPERSION_FLAT_PENALTY_PER_SKILL",
"info": "Flat penalty of dispersion per point of skill under max.",
"stype": "float",
"value": 3
},
{
"type": "EXTERNAL_OPTION",
"name": "GUN_DISPERSION_SKILL_THRESHOLD",
"info": "Skill threshold. Before used GUN_DISPERSION_MULT_PRE_SKILL_THRESHOLD + GUN_DISPERSION_MULT_POST_SKILL_THRESHOLD. After - only GUN_DISPERSION_MULT_POST_THRESHOLD.",
"stype": "float",
"value": 5
},
{
"type": "EXTERNAL_OPTION",
"name": "GUN_DISPERSION_MULT_PRE_SKILL_THRESHOLD",
"info": "Gun dispersion multiplier for lack of skill before threshold. GUN_DISPERSION_MULT_POST_SKILL_THRESHOLD will be added on top of it. GUN_DISPERSION_MULT_POST_SKILL_THRESHOLD=3.75 GUN_DISPERSION_MULT_POST_SKILL_THRESHOLD=1.25 means that zero skill character gets 3.75 + 1.25 = 5 extra weapon diseprsion multiplier.",
"stype": "float",
"value": 3.75
},
{
"type": "EXTERNAL_OPTION",
"name": "GUN_DISPERSION_MULT_POST_SKILL_THRESHOLD",
"info": "Gun dispersion multiplier for lack of skill after threshold. 1.25 means that character with skill level 5 gets 1.25 extra weapon dispersion multiplier.",
"stype": "float",
"value": 1.25
},
{
"type": "EXTERNAL_OPTION",
"name": "PLAYER_MAX_STAMINA",
Expand Down
8 changes: 4 additions & 4 deletions data/json/mapgen/garage_gas.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
" ",
" ",
" ",
" ",
" ... ",
" ... |22222222222222222222222222222222223 ",
" ... |..................................3 ",
" ... |...:..............................32223 ",
Expand All @@ -127,13 +127,13 @@
" ... |......................................3 ",
" ... |....................................=.3 ",
" ... |......................................3 ",
" |..................................3---3 ",
" ... |..................................3---3 ",
" |..................................3 ",
" |..................................3 ",
" |...........................&......3 ",
" |..................................3 ",
" |.................5----------------3 ",
" |.................3 ",
" |.................3----------------3 ",
" |.................5 ",
" |-----------------3 ",
" "
],
Expand Down
318 changes: 318 additions & 0 deletions data/json/mapgen/pawn_shop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,5 +284,323 @@
}
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "pawn_pf" ],
"weight": 1,
"object": {
"rows": [
".`''''`''''`''''`''''`..",
".`''''`''''`''''`''''`..",
".`''''`''''`''''`''''`..",
".`''''`''''`''''`''''`..",
".`''''`''''`''''`''''`..",
".....|--~~-~~-*-~~-|....",
".....|@ }|....",
".....|{ }|....",
".....|{ }|....",
".....|{ ddd|....",
".....|{ d $|....",
".....|{ Dh{|....",
".....|{ D {|....",
".....|{ d {|....",
".....|{ |....",
".....|--| |--+-|....",
".....|% ^ |{{ {|....",
".....|& | |> {{|....",
".....|-----*-------|....",
".........<''............",
"........................",
"........................",
"........................",
"........................"
],
"terrain": {
".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
" ": "t_floor",
"{": "t_floor",
"}": "t_floor",
"$": "t_floor",
"#": "t_floor",
"@": "t_floor",
"%": "t_floor",
"&": "t_floor",
"h": "t_floor",
"d": "t_floor",
"D": "t_floor",
">": "t_stairs_down",
"'": "t_pavement",
"`": "t_pavement_y",
"^": "t_door_c",
"+": "t_door_bar_locked",
"*": "t_door_locked_alarm",
"|": "t_wall_w",
"-": "t_wall_w",
"~": "t_window_alarm",
"<": "t_ladder_up"
},
"furniture": {
"d": "f_displaycase",
"D": "f_displaycase",
"h": "f_chair",
"%": "f_sink",
"{": "f_rack",
"$": "f_rack",
"}": "f_rack"
},
"toilets": { "&": { } },
"items": {
"}": { "item": "mussto_stringinst", "chance": 80 },
"{": { "item": "pawn_shop_electronics", "chance": 60, "repeat": [ 1, 3 ] },
"d": { "item": "elecsto_persele", "chance": 60, "repeat": [ 1, 3 ] },
"@": { "item": "armor_suit", "chance": 100 }
},
"place_loot": [
{ "item": "hammer", "x": 16, "y": 12 },
{ "item": "bat", "x": 17, "y": 12 },
{ "item": "chainsaw_off", "x": 16, "y": 11 },
{ "item": "radio_car", "x": 18, "y": 10 }
],
"place_vehicles": [ { "chance": 100, "fuel": 15, "vehicle": "motorcycle", "x": 13, "y": 2, "rotation": 0 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "pawn_pf_under" ],
"weight": 1,
"object": {
"rows": [
"........................",
"........................",
"........................",
"........................",
"........................",
"........|-------|.......",
"........|B b c|.......",
"........| M |.......",
"........|---+---|.......",
"........|t t|.......",
"........|t t|.......",
"........|t t|.......",
"........| hh |.......",
"........|s w w |.......",
"........| G s p|.......",
"........| |.......",
"........|+| fff|.......",
"........|<|-----|.......",
"........|-|.............",
"........................",
"........................",
"........................",
"........................",
"........................"
],
"terrain": {
".": "t_rock",
" ": "t_floor",
"b": "t_floor",
"c": "t_floor",
"B": "t_floor",
"M": "t_floor",
"f": "t_floor",
"h": "t_floor",
"t": "t_floor",
"s": "t_floor",
"p": "t_floor",
"w": "t_floor",
"G": "t_floor",
"<": "t_stairs_up",
"^": "t_door_c",
"+": "t_door_locked",
"|": "t_wall",
"-": "t_wall"
},
"furniture": {
"t": "f_table",
"f": "f_filing_cabinet",
"h": "f_chair",
"s": "f_stool",
"b": "f_crate_c",
"B": "f_bench",
"c": "f_counter",
"p": "f_drill_press"
},
"items": {
"t": { "item": "bondage", "chance": 60, "repeat": [ 2, 4 ] },
"f": { "item": "office", "chance": 80, "repeat": [ 1, 2 ] },
"G": { "item": "Gimp", "chance": 100 },
"M": { "item": "Maynard", "chance": 100 }
},
"place_loot": [
{ "item": "pitchfork", "chance": 100, "x": 15, "y": 15 },
{ "item": "stepladder", "chance": 100, "x": 11, "y": 16 },
{ "item": "m1911", "chance": 100, "x": 15, "y": 6 },
{ "item": "katana", "chance": 100, "x": 12, "y": 16 }
],
"liquids": { "w": { "liquid": "water", "amount": [ 1, 3 ] }, "h": { "liquid": "water", "amount": [ 1, 2 ] } },
"place_fields": [ { "field": "fd_blood", "x": 12, "y": 7 }, { "field": "fd_blood", "x": 10, "y": 6 } ],
"place_monster": [ { "monster": "mon_zombie_cop", "chance": 100, "x": 10, "y": 6 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "pawn_pf_roof",
"object": {
"fill_ter": "t_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" 222222222222222 ",
" |.............3 ",
" |..&=.........3 ",
" |.............3 ",
" |.............3 ",
" |.............3 ",
" |.............3 ",
" |.............3 ",
" |.............3 ",
" |...........X.3 ",
" |.............3 ",
" |.............3 ",
" |.............3 ",
" |--###--------3 ",
" #># ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ">": "t_ladder_down" },
"place_items": [ { "item": "roof_trash", "x": [ 6, 18 ], "y": [ 6, 18 ], "chance": 50, "repeat": [ 1, 3 ] } ],
"place_nested": [
{
"chunks": [
[ "null", 20 ],
[ "roof_2x2_utilities_b", 15 ],
[ "roof_2x2_utilities_c", 5 ],
[ "roof_2x2_utilities_d", 40 ],
[ "roof_2x2_utilities", 50 ],
[ "roof_2x2_golf", 20 ],
[ "roof_3x3_wine", 30 ]
],
"x": [ 6, 15 ],
"y": [ 7, 8 ]
},
{
"chunks": [
[ "null", 20 ],
[ "roof_4x4_party", 15 ],
[ "roof_4x4_utility", 40 ],
[ "roof_6x6_survivor", 20 ],
[ "roof_6x6_utility", 20 ]
],
"x": [ 6, 15 ],
"y": [ 10, 13 ]
}
]
}
},
{
"id": "my_precious",
"type": "item_group",
"subtype": "distribution",
"items": [
{ "group": "supplies_metal_precious", "prob": 70 },
{ "item": "money_bundle", "prob": 90 },
{ "item": "gold_watch", "prob": 30 },
{ "item": "gold_ear", "prob": 30 },
{ "item": "gold_bracelet", "prob": 30 },
{ "item": "diamond_ring", "prob": 20 },
{ "item": "diamond", "prob": 10 }
]
},
{
"id": "pawn_shop_electronics",
"type": "item_group",
"subtype": "distribution",
"items": [
{ "group": "elecsto_entapl" },
{ "group": "elecsto_cameras" },
{ "group": "elecsto_homapl" },
{ "group": "elecsto_pcs" }
]
},
{
"id": "armor_suit",
"type": "item_group",
"subtype": "collection",
"items": [
[ "helmet_plate", 100 ],
[ "boots_plate", 100 ],
[ "armguard_lightplate", 100 ],
[ "gloves_plate", 100 ],
[ "legguard_lightplate", 100 ],
[ "armor_plate", 100 ]
]
},
{
"id": "bondage",
"type": "item_group",
"subtype": "distribution",
"items": [
[ "leather_belt", 50 ],
[ "blindfold", 50 ],
[ "bondage_mask", 50 ],
[ "bondage_mask_zipped", 50 ],
[ "bondage_suit", 40 ],
[ "leather_collar", 50 ],
[ "vibrator", 50 ],
[ "bullwhip", 50 ],
[ "candle", 50 ],
[ "rope_6", 20 ],
[ "vibrator", 30 ],
[ "camisole", 25 ],
[ "panties", 40 ],
[ "bra", 40 ],
[ "hot_pants_leather", 30 ],
[ "boxer_shorts", 30 ],
[ "mag_porn", 20 ],
[ "briefs", 30 ],
{ "item": "cooking_oil", "prob": 20, "container-item": "bottle_plastic" },
[ "bikini_top_leather", 25 ],
[ "skirt_leather", 25 ],
[ "honey_bottled", 20 ],
[ "nanoskirt", 25 ],
[ "mag_dude", 20 ],
[ "chaps_leather", 25 ],
[ "novel_romance", 10 ],
[ "novel_erotic", 10 ],
[ "leather_cat_ears", 25 ],
[ "leather_cat_tail", 25 ],
[ "rope_30", 5 ]
]
},
{
"type": "item_group",
"id": "Gimp",
"subtype": "collection",
"items": [ { "item": "bondage_mask_zipped" }, { "item": "bondage_suit" }, { "item": "corpse" } ]
},
{
"type": "item_group",
"id": "Maynard",
"subtype": "collection",
"items": [
{ "item": "longshirt" },
{ "item": "wristwatch" },
{ "item": "pants" },
{ "item": "boxer_shorts" },
{ "item": "socks" },
{ "item": "boots" },
{ "item": "corpse" }
]
}
]
Loading

0 comments on commit 3a581ab

Please sign in to comment.