Skip to content

Commit

Permalink
Merge pull request #2 from CleverRaven/master
Browse files Browse the repository at this point in the history 
Syncing with Master
  • Loading branch information
@DericHuynh
DericHuynh authored Nov 15, 2020
2 parents 189776d + 165a25c commit e6175c2
Show file tree
Hide file tree
Showing 49 changed files with 46,121 additions and 23,160 deletions.
2 changes: 1 addition & 1 deletion data/json/items/gun/monster_gun.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"flags": [ "PRIMITIVE_RANGED_WEAPON", "NEVER_JAMS", "NONCONDUCTIVE", "NO_REPAIR", "WATERPROOF_GUN", "NO_SALVAGE", "NO_UNLOAD" ],
"skill": "throw",
"ammo_effects": [ "NO_PENETRATE_OBSTACLES" ],
"ranged_damage": { "damage_type": "bash", "amount": 1 },
"ranged_damage": { "damage_type": "bash", "amount": 4 },
"weight": "540 g",
"volume": "210 ml",
"longest_side": "75 mm",
Expand Down
40 changes: 20 additions & 20 deletions data/json/items/tool/musical_instruments.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"category": "tools",
"name": { "str": "banjo" },
"description": "A standard factory-made banjo. Looks to be in working condition.",
"weight": "2000 g",
"weight": "2800 g",
"volume": "3 L",
"longest_side": "95 cm",
"longest_side": "72 cm",
"price": 7500,
"price_postapoc": 500,
"to_hit": 2,
Expand Down Expand Up @@ -36,8 +36,8 @@
"name": { "str": "bone flute" },
"description": "A polished bone flute with five finger holes.",
"weight": "250 g",
"volume": "500 ml",
"longest_side": "35 cm",
"volume": "400 ml",
"longest_side": "32 cm",
"price": 5000,
"price_postapoc": 100,
"bashing": 2,
Expand Down Expand Up @@ -95,7 +95,7 @@
"category": "tools",
"name": { "str": "flute" },
"description": "A simple silver-plated flute.",
"weight": "250 g",
"weight": "440 g",
"volume": "500 ml",
"longest_side": "66 cm",
"price": 5000,
Expand Down Expand Up @@ -124,7 +124,7 @@
"category": "tools",
"name": { "str": "trumpet" },
"description": "A brass trumpet with only a few dents here and there.",
"weight": "1500 g",
"weight": "1100 g",
"volume": "2500 ml",
"longest_side": "50 cm",
"price": 7500,
Expand Down Expand Up @@ -154,9 +154,9 @@
"category": "tools",
"name": { "str": "ukulele" },
"description": "A small factory made ukulele. Looks to be in working condition.",
"weight": "350 g",
"weight": "600 g",
"volume": "2500 ml",
"longest_side": "55 cm",
"longest_side": "58 cm",
"price": 7500,
"price_postapoc": 250,
"to_hit": 2,
Expand Down Expand Up @@ -184,7 +184,7 @@
"category": "tools",
"name": { "str": "violin" },
"description": "A cheap, factory-made violin with a built-in holder for a bow. Still produces a nice sound.",
"weight": "1300 g",
"weight": "500 g",
"volume": "2500 ml",
"longest_side": "60 cm",
"price": 7500,
Expand Down Expand Up @@ -262,7 +262,7 @@
"price_postapoc": 150,
"material": [ "steel" ],
"volume": "250 ml",
"longest_side": "20 cm",
"longest_side": "18 cm",
"flags": [ "BELTED", "SLEEP_IGNORE" ],
"material_thickness": 1
},
Expand All @@ -271,7 +271,7 @@
"id": "acoustic_guitar",
"name": { "str": "acoustic guitar" },
"category": "tools",
"weight": "2500 g",
"weight": "2200 g",
"color": "brown",
"covers": [ "torso" ],
"to_hit": 2,
Expand All @@ -295,7 +295,7 @@
"price_postapoc": 250,
"material": [ "wood" ],
"volume": "6750 ml",
"longest_side": "100 cm",
"longest_side": "97 cm",
"warmth": 2,
"encumbrance": 27,
"bashing": 8,
Expand All @@ -308,7 +308,7 @@
"id": "guitar_electric",
"name": { "str": "electric guitar" },
"category": "tools",
"weight": "2250 g",
"weight": "3750 g",
"color": "red",
"covers": [ "torso" ],
"to_hit": 2,
Expand Down Expand Up @@ -337,7 +337,7 @@
"//": "Electric guitar less awesome when there's no electricity.",
"material": [ "wood", "iron" ],
"volume": "6750 ml",
"longest_side": "100 cm",
"longest_side": "97 cm",
"warmth": 2,
"encumbrance": 27,
"bashing": 8,
Expand All @@ -350,7 +350,7 @@
"id": "bagpipes",
"name": { "str_sp": "bagpipes" },
"category": "tools",
"weight": "2300 g",
"weight": "2500 g",
"color": "green",
"covers": [ "torso" ],
"to_hit": -2,
Expand All @@ -377,8 +377,8 @@
"price": 10000,
"price_postapoc": 500,
"material": [ "leather", "wood" ],
"volume": "4 L",
"longest_side": "23 cm",
"volume": "5 L",
"longest_side": "65 cm",
"encumbrance": 15,
"bashing": 4,
"flags": [ "BELTED", "SLEEP_IGNORE" ],
Expand All @@ -390,7 +390,7 @@
"id": "tuba",
"name": { "str": "tuba" },
"category": "tools",
"weight": "10000 g",
"weight": "13600 g",
"color": "yellow",
"covers": [ "torso" ],
"flags": [ "BELTED", "SLEEP_IGNORE" ],
Expand Down Expand Up @@ -425,7 +425,7 @@
"id": "saxophone",
"name": { "str": "saxophone" },
"category": "tools",
"weight": "2000 g",
"weight": "2200 g",
"color": "yellow",
"covers": [ "torso" ],
"flags": [ "BELTED", "SLEEP_IGNORE" ],
Expand Down Expand Up @@ -454,7 +454,7 @@
"price_postapoc": 250,
"material": [ "brass" ],
"volume": "4500 ml",
"longest_side": "64 cm",
"longest_side": "70 cm",
"encumbrance": 30,
"bashing": 12,
"coverage": 20,
Expand Down
72 changes: 37 additions & 35 deletions data/json/mapgen/necropolis/necropolis.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,18 @@
".q....| ooP|....s...qss_______,,_______ss..|------------|rssssssr8.",
".q....|;|--+----|--|es...qss________________ss..|rrrrrrrrrrrr|rssssssr8.",
".q..ssss|r =_______________,,_______ss..wc r|rssZZssr8.",
".q..shss|r =_______________,,_______ss..wc rr rr r|rssZZssr8.",
".q..snss|r =_______________,,_______ss..wc rr rr r|rssssssr8.",
".q..shss|r =________________________ss..|r [sssssssr8.",
".q..sЮss|r =_______________,,_______ss..wc rr rr r|rssZZssr8.",
".q..sЯss|r =_______________,,_______ss..wc rr rr r|rssssssr8.",
".q..sЮss|r =________________________ss..|r [sssssssr8.",
".q..ssss|r =_______________,,_______ss..wc rr [sssssssr8.",
".q......|----------|.....qss_______,,_______ss..wc rr cc r|rssssssr8.",
".q.......................qss_______,,_______ss..wc 6 r|rssZZssr8.",
".qQQQQQQQQQQQQQQQQQQQQQQQqss________________ss..|rcccr c r|rssZZssr8.",
"..........................ss_______,,_______ss..|-www-[[-www-|777777778."
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { "Ю": "t_sidewalk", "Я": "t_sidewalk" },
"furniture": { "Ю": "f_chair", "Я": "f_table" },
"toilets": { "t": { } },
"place_monsters": [
{ "monster": "GROUP_NECROPOLIS", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.1 },
Expand Down Expand Up @@ -176,7 +177,7 @@
".|-{{{-sss-ssssssM.MMMsMMmm]]]]]]]]]]]]]]]]]mmMMMMMs_M_M___,,_______sss."
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { },
"toilets": { "t": { } },
"place_monsters": [
{ "monster": "GROUP_NECROPOLIS", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.1 },
Expand Down Expand Up @@ -256,7 +257,7 @@
"..|P : | hhhhh |ss________________,________,________8........."
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { "l": "t_floor", "z": "t_floor" },
"toilets": { "t": { } },
"place_monsters": [
{ "monster": "GROUP_NECROPOLIS", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.1 },
Expand Down Expand Up @@ -339,13 +340,13 @@
".....|e | r[ ccccccccccc cccc|.sss....T.......ss...T......",
"..#..| EEEEE | r[ c|.sss............bss.........",
".....| EEEEE | r[ cc cc ZZ c|.sss............bss.........",
".....|zzEEEE | r[ rrrrrrrrr c c ZZ c|.sss............bss.........",
".....|zzEEEE | r[ rrrrrrrrr 6c 6c cV.sss........T.....ss........",
".....|zEEEEE | r[ rrrrrrrrr c c ZZ c|.sss............bss.........",
".....|zEEEEE | r[ rrrrrrrrr 6c 6c cV.sss........T.....ss........",
"....X| EEEEE | r[ cV.sss..............ss......T.",
".....|zzEEEzz| r[ cV.sss.............ssss.......",
".....|zzEEEzz| r[ rrrrrrrrr ZZ ZZ c c|.sss...T........ssssss......",
".....|zEEEEEz| r[ cV.sss.............ssss.......",
".....|zEEEEEz| r[ rrrrrrrrr ZZ ZZ c c|.sss...T........ssssss......",
".....| EEEEE + r[ rrrrrrrrr ZZ ZZ c c|.sss........aAassssssss.....",
".....|zzEEEE |--| c {c{.sss........aUasssssssssssss",
".....|zEEEEE |--| c {c{.sss........aUasssssssssssss",
".....|zz + Z{ ZZ c {{.sss........aUasssssssssssss",
".....|6 + rrrrrrrrr Z{{ ZZ {{{{sss........aAassssssss.....",
".....|-------| | rrrrrrrrr { { {{){|.sss...T........ssssss......",
Expand All @@ -361,7 +362,7 @@
"...........ss|r {{ {{{{sMsssssMsMMsMMMMMMMMMMMMMMMNNNMNNMNNNNNNMss....."
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { "Z": "t_floor", "z": "t_floor" },
"place_monsters": [
{ "monster": "GROUP_NECROPOLIS", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.1 },
{ "monster": "GROUP_NECROPOLIS", "x": [ 25, 46 ], "y": [ 1, 22 ], "density": 0.1 },
Expand Down Expand Up @@ -471,7 +472,7 @@
"..ss________________sss..........|c |---------| h @@ |--|.."
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { "z": "t_floor" },
"toilets": { "t": { } },
"place_items": [
{ "item": "building_rubble", "x": [ 0, 9 ], "y": [ 0, 4 ], "chance": 70 },
Expand Down Expand Up @@ -579,7 +580,7 @@
"......|-{{{{ssMsMssMssMMMMMMMmm]]]]]]]]]]]]]]]]]]]mmMMMMM.M..M..MM......"
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { },
"toilets": { "t": { } },
"place_monsters": [
{ "monster": "GROUP_NECROPOLIS", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.1 },
Expand Down Expand Up @@ -673,7 +674,7 @@
"........|BB|d@@d@@ n|sss________________________sss| jjjjjj D|l |ss"
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { "D": "t_floor", "l": "t_floor", "z": "t_floor" },
"toilets": { "t": { } },
"place_items": [
{ "item": "home_hw", "x": [ 12, 15 ], "y": [ 20, 21 ], "chance": 75 },
Expand Down Expand Up @@ -763,24 +764,24 @@
"sssssssssssssssssssssssssss__________________sssssssssssssssssssssssssss",
"ssssssssssssssssssssssssssss_________,,,,,,_ssssssssssssssssssssssssssss",
"..ss{{{{--|--|--|-----|sssss________________sss#######|--ww-++-ww---|sss",
"..ss{{ {@d|BB|BB|d@@ n|ss.ss_______,,_______ss##shhsss|hh chnnh|sss",
"..ss{{{@@ | t|t | @@ hwss.ss_______,,_______ss#shnnhss|nn chnnh|sss",
"..ss{ | S|S | wss.ss_______,,_______ss#shnnhsswnn h |sss",
"..ss{ |+-|-+| |ss.ss________________ssssshhssswhh n hcc |777",
"..ss{{ {@d|BB|BB|d@@ n|ss.ss_______,,_______ss##sЮЮsss|hh chnnh|sss",
"..ss{{{@@ | t|t | @@ hwss.ss_______,,_______ss#sЮЯЯЮss|nn chnnh|sss",
"..ss{ | S|S | wss.ss_______,,_______ss#sЮЯЯЮsswnn h |sss",
"..ss{ |+-|-+| |ss.ss________________sssssЮЮssswhh n hcc |777",
"..ss; f|f ;ss.ss_______,,_______sssssssssswcc h hc r|sss",
"..ss| nnnn | nnnn |ss.ss_______,,_______ss#sssssss|hh hc r|sss",
"..ss|-----|--|--|-----|ss.ss_______,,_______ss#sshhsss|nn h hc f|sss",
"..ss|n @@d|BB|BB|d@@ n|ss.ss________________ss#shnnhsswnn n hc f|sss",
"..sswh @@ | t|t | @@ hwss.ss_______,,_______ss#shnnhsswhh h hc c|sss",
"..ssw | S|S | wss.ss_______,,_______ss#sshhssswcc hc S|sss",
"..ss|-----|--|--|-----|ss.ss_______,,_______ss#ssЮЮsss|nn h hc f|sss",
"..ss|n @@d|BB|BB|d@@ n|ss.ss________________ss#sЮЯЯЮsswnn n hc f|sss",
"..sswh @@ | t|t | @@ hwss.ss_______,,_______ss#sЮЯЯЮsswhh h hc c|sss",
"..ssw | S|S | wss.ss_______,,_______ss#ssЮЮssswcc hc S|sss",
"..ss| |+-|-+| |ss.ss_______,,_______ss#sssssss| c r|sss",
"..ss; f|f ;ss.ss________________ssssssssss[ c r|sss",
"..ss| nnnn | nnnn |ss.ss_______,,_______ssssssssss[ |----|c-- -|sss",
"..ss|-----|--|--|-----|ss.ss_______,,_______ss#sssssss| + | c|sss",
"..ss|n @@d|BB|BB|d@@ n|ss.ss_______,,_______ss#sshhsssw |S t |c S|Dss",
"..sswh @@ | t|t | @@ hwss.ss________________ss#shnnhssw |----|c S|Dss",
"..ssw | S|S | wss.ss_______,,_______ss#shnnhssw + |c ;sss",
"..ss| |+-|-+| |ss.ss_______,,_______ss##shhsss| |S t |cOOff|797",
"..ss|n @@d|BB|BB|d@@ n|ss.ss_______,,_______ss#ssЮЮsssw |S t |c S|Dss",
"..sswh @@ | t|t | @@ hwss.ss________________ss#sЮЯЯЮssw |----|c S|Dss",
"..ssw | S|S | wss.ss_______,,_______ss#sЮЯЯЮssw + |c ;sss",
"..ss| |+-|-+| |ss.ss_______,,_______ss##sЮЮsss| |S t |cOOff|797",
"..ss; f|f ;ss.ss_______,,________ss#####ss|--|----|-----|sss",
"..ss| nnnnn | nnnn |ss.ss_______________________,__,_________________",
"..ss|--------|--------|ss.ss_______,,______________,,,,_________________",
Expand All @@ -790,7 +791,8 @@
"ss________________________ss_______,,______________,,,,_________________"
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { "Ю": "t_sidewalk", "Я": "t_sidewalk" },
"furniture": { "Ю": "f_chair", "Я": "f_table" },
"toilets": { "t": { } },
"place_items": [
{ "item": "traveler", "x": [ 17, 17 ], "y": [ 23, 23 ], "chance": 80 },
Expand Down Expand Up @@ -888,7 +890,7 @@
"___________________________________,,_______ss......C..................."
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { },
"toilets": { "t": { } },
"place_items": [
{ "item": "building_rubble", "x": [ 15, 23 ], "y": [ 0, 18 ], "chance": 70 },
Expand Down Expand Up @@ -997,7 +999,7 @@
".............###.s______,______,______,______s##s___,,___s|hnnh hnnh|ss"
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { "D": "t_floor", "l": "t_floor" },
"toilets": { "t": { } },
"place_items": [
{ "item": "traveler", "x": [ 13, 18 ], "y": [ 4, 4 ], "chance": 70 },
Expand Down Expand Up @@ -1115,7 +1117,7 @@
"____________,,____________ss_______,,_______ss__________________________"
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "Z": "t_floor", "l": "t_floor", "z": "t_floor" },
"terrain": { },
"place_monsters": [
{ "monster": "GROUP_NECROPOLIS", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.1 },
{ "monster": "GROUP_NECROPOLIS", "x": [ 25, 46 ], "y": [ 1, 22 ], "density": 0.1 },
Expand Down Expand Up @@ -1201,7 +1203,7 @@
"_____________________________s.......#.................................."
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { },
"toilets": { "t": { } },
"place_monsters": [
{ "monster": "GROUP_NECROPOLIS", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.1 },
Expand Down Expand Up @@ -1274,7 +1276,7 @@
"........................................................#..............."
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { "D": "t_floor" },
"toilets": { "t": { } },
"place_items": [
{ "item": "pool_table", "x": [ 18, 19 ], "y": [ 13, 16 ], "chance": 70 },
Expand Down Expand Up @@ -1336,7 +1338,7 @@
"............................________________ss.........................."
],
"palettes": [ "necropolis_a" ],
"terrain": { "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { },
"gaspumps": { "&": { } },
"place_monsters": [
{ "monster": "GROUP_NECROPOLIS", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.1 },
Expand Down Expand Up @@ -1389,7 +1391,7 @@
"..............#........................................................."
],
"palettes": [ "necropolis_a" ],
"terrain": { "&": "t_gas_pump", "D": "t_floor", "Z": "t_floor", "l": "t_floor", "u": "t_floor", "z": "t_floor" },
"terrain": { "z": "t_floor" },
"toilets": { "t": { } },
"place_vendingmachines": [ { "item_group": "vending_food", "x": 3, "y": 5 }, { "item_group": "vending_drink", "x": 4, "y": 5 } ],
"place_items": [
Expand Down
Loading

0 comments on commit e6175c2

Please sign in to comment.