From 8f2779040cc2ba5c403ff976253d3c92e662d453 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Wed, 15 Jan 2020 18:20:18 +0100 Subject: [PATCH 1/4] Update cground3x3.json --- data/json/mapgen/cground3x3.json | 233 +++++++++++++++++++------------ 1 file changed, 141 insertions(+), 92 deletions(-) diff --git a/data/json/mapgen/cground3x3.json b/data/json/mapgen/cground3x3.json index 7ee6e86fc9755..0c214a2edb30e 100644 --- a/data/json/mapgen/cground3x3.json +++ b/data/json/mapgen/cground3x3.json @@ -22,83 +22,135 @@ ], "fill_ter": "t_floor", "rows": [ - ",7,,,,,,7,*,,7,,,7,,*,7,,7,,7,* _________ 7 ,,,7,*,7,,,7,,,,*7,,,*,,", - ",,,,*7,,||||v||||||v|||,*,,,,7, _________ *,,,7,,,,,,,*,,,,7,,,,*,7,*", - "7,,*,G,7|^.fff.^|ddddd|,,7,*, __________7* ,,7,,,,,*,,7,,,,,*,,,,7,,,,7", + ",7,,,,,,7,*,,7,,,7,,*,7,,,,,7,* _________ 7 ,,,,,*,,,,,,,,,,*,,,,*,,", + ",,,,*7,,||||v||||||v|||,*,,,,,, _________ *,,,7,,,,,,,*,,,,7,,7,*,,,*", + "7,,*,G,7|^.fff.^|ddddd|,,7,*, __________7* ,,7,,,,,*,,77,,,,*,,,,7,,,,7", ",,G,,,,t|.d.?..X|d..hdv7,, __________ ||||||||||||||vv||vv||vv||||,", "G* G,G*|.dddd.Y|dh..dv,,*, ___________F |???|T+.a|^...............^|7", - " 7 ,v..?.?..|.....v,,,,* ___________ v?.?|||.S|.bnb.bnb.bnb.bnb.v,", - ",G G G 7v.......+.ff.g|,,7, ____________ v...|T+.S|.bnb.bnb.bnb.bnb.v*", - ",* G|hh..bbb|.||+||,,, ____________F |..n|||.S|.bnb|bnb.bnb.bnb.|7", - "G,G G G,||||+||||+|..Y||| _____________ ||..n|T+..|.bnb.bnb.bnb.bnb.||", - "7 * ,,|???.|ST|.d.....|_______________ *|^...|||+||..................|", - " G G *G|?n..|..|hd.....+ _____________ |.........|Y.bbbb.bbbb....nh.v", - "G G |?...|a.|fd...bb| _______________+..g......+..nnnn.nnnn....nh.v", - "7,G G G|...^||+|||^..||| _____________ |+||||||+||..bbbb.bbbb....nh.v", - "G,*; *,,|a.......g||+||*, _____________ |<..OOcc.a|a.................|", - ",7 ;;G7*v..hh|fh..@@.M|7,* _____________ |||.......U.....bnb.bnb.bnb.||", + " ;7 ; ,v..?.?..|.....v,,,,* ___________ v?.?|||.S|.bnb.bnb.bnb.bnb.v,", + ",G;G G;7v.......+.ff.g|,,7, ____________ v...|T+.S|.bnb.bnb.bnb.bnb.v*", + ",*;;; G|hh..bbb|.||+||,,7 ____________F |..n|||.S|.bnb|bnb.bnb.bnb.|7", + "G,G G;G,||||+||||+|..Y||| _____________ ||..n|T+..|.bnbCbnb.bnb.bnb.||", + "7 ;;*;,,|???.|ST|.d.....|_______________ *|^...|||+||..................|", + " G G7;*G|?n..|..|hd.....+ _____________ |.........|Y.bbbb.bbbb....nh.v", + "G; ; G ;|?...|a.|fd...bb| _______________+..g......+..nnnn.nnnn....nh.v", + "7,G G ;G|...^||+|||^..||| _____________ |+||||||+||..bbbb.bbbb....nh.v", + "G,*;;*,,|a.......g||+||*, _____________ |<..OOcc.a|a.................|", + ",7 ;;G7*v..hh|fh..@@.M|7,* _____________ |||.......U....Cbnb.bnb.bnb.||", ",*G ;*,,v..nn|fdd....Mv,,,,____________ F*|e.SSsu..U....|bnb.bnb.bnb.|7", - "7, ; G,7|c.hh|df@.@@.@v,*,7,___________ *ve.cccu..U.....bnb.bnb.bnb.v,", + ",, ; G,7|c.hh|df@.@@.@v,*,7,___________ *ve.ccCu..U.....bnb.bnb.bnb.v,", ",,*; ,*,|u...|dh@....@v,,,,,__________* vu.......U.....bnb.bnb.bnb.v*", ",7 ;;7,*|uSOe|dh^.@@.a|,7,*,__________ F |uucccu..|.$$.............^|,", ",*, ;;,7|||||||||||v|||,,*,*__________ * ||||||||+|+|||vv||vv||vv||||,", - "*,,* ;;;; *,,*7,,7,*,7,*,,,7,_________ * HDDD_|<....| ;; ; ,,7", - "7,,,* ;;;;;;;;*,,,,7,7,,7,*,, _____________m____+..hnh| ooooooooooooo ,", - ",*,7,,,*7, ;;;;;;;;; *,*,,*,7, ________ *,,HR_DD|..hnh| ;; ", - "*,,,,7,,*,7,,7,* ;;;;;;7,*,,,, ________ ,,7,HHHHH|||v||| ooooooooooooooo", - ",7,*,,,7,7,*,,,7,,*,7;;;;;7,*,________,,*,*,,7,,7 ; ;; ; ;; ", + "*,,* ;;;; *,,*7,,7,*77,*,,,7,_________ * HDDD_|<....|,, ;; , ; ,,7", + ",,,,* ;;;;;;;;*,,,,,,7,,7,*,, _____________m____+..hnh|,*oooooooooooo ,", + ",*,,,,,*,, ;;;;;;;;; *,*,,*,7, ________ *,,HR_DD|..hnh|,7, ;; * , ", + "*,,,,7,,*,,,,7,* ;;;;;;7,*,,,, ________ ,,7,HHHHH|||v|||,,,ooooooooooooo", + ",,,*,,,77,,*,,,7,,*,7;;;;;7,*,________,,*,*,,7,,7 ; ,*;; ; ;; ", ",*,,,7,*,,*,7*,,,7,,*,, ;;;;7,________7,*,,,*, ; oooooooooooooooooooo ", - "*7,7,,*,,7,,*,7,*,,7,,*,7 ;;;;________*,,7*,7 ; ; ;; ; ", + "*,,7,,*,,7,,*,,,*,,,,,*,7 ;;;;________*,,7*,7 ; ; ;; ; ", ",,*,,,7,*,t*7,*,,7*,*7,,,*,,7________7*,,,* ooooooooooooooooooooooooo,*", - "||vvv||vv||vvv|||||||,,*,,7,,________,,,*7, ;; ; ; ;; ,7,", + "||vvv||vv||vvv|||||||,,*,,7,,________,,,*7, ;; * ; , ; ;; ,7,", "|^....a..Y....^|llll|*,7,,,*,________*,,,* oooooooooooooooooooooooooo,,,", - "|.l@@..h...@@l.|....|7,,,*,,7________,7,,; ; ;; ; ; *,7", - "v.....bnnb.....|.lll|,*,7,7,___________* oooooooooooooooooooooooooooo ,", - "|.l@@.bnnb.@@l.|+||||,7,,,*,_____________ ; ; ;; ; ;; ", - "|.....h.h......|.???|*,,7,7,________*,,*_oooooooooooooooooooooooooooooo ", - "|.l@@......@@l.....?|,7,,*,*________,7, _ ;; ; ; ;; ; ", + "|.l@@..h...@@l.|....|7,,,*,,7________,7,,; , ; ;; ; ; *,7", + "v.....bnnb.....|.lll|,*,,,77___________* oooooooooooooooooooooooooooo ,", + "|.l@@.bnnb.@@l.|+||||,7,,,*,_____________ ; , ; ;; * ; ;; ", + "|.....h.h......|.???|*,,7,,,________*,___oooooooooooooooooooooooooooooo ", + "|.l@@....C.@@l.....?|,7,,*,*________,,, _ ;; ; , ; ;; ; ", "v......h............v*,,7,,________*,*,, oooooooooooooooooooooooooooooo", - "|.l@@.bnnb.@@l.nn..^|7,,*,*________7,,*,7 ; ; ; ;; ; ", + "|.l@@.bnnb.@@l.nn..^|7,,*,*________77,*,, ; * ; ; ;; ; ", "|.....bnnb.....||++||,,7,__________*,7,,,* ooooooooooooooooooooooooooooo", - "|.l@@...h..@@l.| __ *,*, ___________,*,*7,* ; ; ;; ; * ", - "v.....h........v __ 7 _____________*,,*,,*, ooooooooooooooooooooo 7,, ", - "|^...^....????.|* __________________7,*,,7,,,,7,,7 ; ;; ,,*,7,*,,7", - "|||+|||++|||||||,,, _____*,*7_______,*7,,*,*,,,*,,*ooooooooo,7,,,,*,,*,", - " |h.p|....|,*7,,,*,, ___*,,,,____BBBB,,*7,,7,*7,,7,,,7,*7,*,,*,,7,,,7,,", - " |.h.|?..nv*,,*,7,,*,____,,7*,,___NNNN7*,,7,,,,*,,,,* *,,*,,7*,,*,*,*,,7", - " |h.L|?..nv,7,,*,*7,,___,7*,,7*___BBBB,,7,,*,7,,,*,,7,,,7,,*,*,7,,,7,*,,", - " |h.L|^...|,*,7,7*,,*___*,,,*,,_______,*,,7, *,,7*,*,,7,,*,,7,,,*,,,,,7,", - "|||+|||++|||||||,,*, ___,,*7,________,,7,,,*,7,*,,,7,,,*,,,*,,7,,,7* 7,,", - "|nn..a....???.^|*7, ____________i__ *,,,,*,,,*7,,*,,*,7,||vv||||v|||,,*", - "v..............v, __________________ * 7,,*,*,,7,,7,*,,|euuO|h..@@|,7,", - "|.l@@..bb..@@l.| __ __________________* *,,7,,*, ______+....+...hl|,*,", - "|......nnh.....||++||,7* BNB_____________ , _______ |n..?|n...l|,,7", - "|.l@@.hnn..@@l.Y...^|7,,7* BNB_____BNB_____________ ,,,|n..?|n..@@|*,,", - "v......bb...........v,*,*,7 BNB ___ BNB *, ______ *,,7,*||h.?|||||||,*,", - "|.l@@......@@l.....?|,7,,,* BNB __* BNB ,7*,,,*,,,7,,*,,7,|...+...@@|*7,", - "|......bb......|.???|*,*,,7*, ___7 BNB*,,,7*,7,,,,*7,,,*,v...|h...l|,,*", - "|.l@@..nnh.@@l.|+||||7,,,*,,7* __*,, *,,7*,,,,*,,*,,,*,7,,|a.^|nn..l|7,7", - "v.....hnn......|.lll|,*,,7,,*, __,7*,,*,,,7,,*,,,7,,,,,*,7||+||.h.@@|,7,", - "|.l@@..bb..@@l.|....|*,7*,,, ,7___,,*7 7*,,*7,,7,,*,,,7,,,|n.h|||||||7,*", - "|^.......h....^|llll|7,*,,7,*,* __*,,,*,,7,,*,,,,,7,,*,,7,|.....|pL|*,,7", - "||vvv||vv||vvv|||||||,*,7,*,,7, __,7*,,7*,*7,7,,7,,,,,7,*,|@...@||+|,7,,", - "7,*,,7,,7*t,,*,7,*,,*,7*|||v|||v++v|||v|||,,,,7,,,7,*,,,,7|@lhl@|t;;*,,7", - ",,7,,*7,,,,7*,,*,,7,,*,,|T+.+T|^..a|T+.+T|7,7,,7,,*,,7*,,,|||v|||;;,7*,,", - ",*,,7,,*,7*,,7,,7,*,7,,7|||.|||S..S|||.|||,*,,*,,7,,*,,7,*,7,,,7,,*,*,7,", - "7,*,,*,,*,,7,*,,,,*,,,*,|T+.+T|S..S|T+.+T|t7,,7,,,*,7,,*,,,,,7,*,,,,,,*,", - ",,7,,,*7,,*,*,,7*,7*,7,*|||.|||S..S|||.|||,,*,,*,,7,,,7,,7*,,*,,7,*,,7,,", - "*,,*7*,,,7,,7,*,,,*,,*,,v^....+....+....^v*,,,,,7,*,,*,,*,,7,,,,*,7,,*,,", - "7,,,*,,7,,,*,,,7,*,,,,7|||+|+||b..b||+|+|||,7,,*,,,,7,,*7,,*,,7,,,,,7,,,", - ",*7,,7,*,,7,,*,*,,7 *,*|!..|..|b..b|..|..!|,*,7,,7,*,*,,,,7,,,*,,7*,,,,*", - "7,,*,,,,7,*,,7,,,*,,,7,|||.||.|b..b|.||.|||7,,,,*,,7,,7,,*,,7,,7,,,,*,7,", - "*,*,,7,*,,7,,*,,7,,*,*,|!..|!.|Y..Y|.!|..!|*,,*,7,,*,,*,7,,,,*,,,,,7,,,*", - ",,7,*,,,,*,,,7,*,,,7,,,||v|||!|..^.|!|||v||,,7,*,,,,7,,,,*,7,,,*,7,,,7,,", - "7,,,7,*,7,*7,*,7,,*,,7,*,,7*||||vv||||,7*,,7*,,7,*,,*,7*,,,,*,7,,,*7,*,," + "|.l@@...h..@@l.| __ *,*, ___________,*,*,,* ; ; ;; ; * ", + "v.....h........v __ 7 _____________*,,*7,,*,ooooooooooooooooooooo 7,, ", + "|^...^....????.|* __________________7,*,,* , ; ; * ;; ; ", + "|||+|||++|||||||,,, _____*,*7_______,*7,,,oooooooooooooooooooooo,,*,,*,", + " |h.p|....|,*7,,7*,, ___*,,,,____BBBB,,*,, ; ; ; ,, ; ", + " |.h.|?..nv*,,*,7,,*,____,,7*,,___NNNN7*,,7,oooooooooooooooooooooooo*,,7", + " |h.L|?..nv,7,,*,*,,,___,7*,,7*___BBBB,,,7 ;; ,, , ; ; ; ", + " |h.L|^...|,*,,,7*,,*___*,,,*,,_______,*,,ooooooooooooooooooooooooooo,7,", + "|||+|||++|||||||,,*, ___,,*7,________,,,, , ;; * ; ; ; , ; ", + "|nn..a....???.^|*7, ____________i__ *,,,oooooooooooooooooooooooooooooo*", + "v..............v, __________________ _;_ ; , ; ,,, ; ; , ; ", + "|.l@@..bb..@@l.| __ _______________;___oooooooooo,,,7*ooooooooooooooo,", + "|......nnh.....||++||,7* BNB_______;___;_; ,,*,, ; ;; ; ", + "|.l@@.hnn..@@l.Y...^|7,,7* BNB_____BNB__;_oooooooo,7,oooooooooooooooo,,", + "v......bb...........v,*,*,7 BNB ___ BNB *, __;; ; , ; , ; ; ", + "|.l@@....C.@@l.....?|,7,,,* BNB __* BNB ,7*ooooooooooooooooooooooooo,*7,", + "|......bb......|.???|*,*,,7*, ___7 BNB*,, , ; ; *; , ,, ; ", + "|.l@@..nnh.@@l.|+||||7,,,*,,7* __*,, *,,7ooooooooooooooooooooooooooooo,,", + "v.....hnn......|.lll|,*,,7,,*, __,7*,,*,,, ;; ; ; , ;; ; ", + "|.l@@..bb..@@l.|....|*,7*,,, ,7___,,*7 7oooooooooooooooooooooooooooooo,*", + "|^.......h....^|llll|7,*,,7,*,* __*,,,*,,7 * ,, ; ; , ;; ,,,", + "||vvv||vv||vvv|||||||,*,7,*,,7, __,7*,,7*,*oooooooooooooooooooooooo ,7,,", + "7,*,,7,,7*t,,*,7,*,,*,7*|||v|||v++v|||v||| , ; * ,, , ,,,,*", + ",,7,,*7,,,,7*,,*,,7,,*,,|T+.+T|^..a|T+.+T|7,7oooooooooooooooooooo;;,7*,,", + ",*,,7,,*,7*,77,,7,*,7,,7|||.|||S..S|||.||| ;; ; ; * ,,,,", + ",,*,,*,,*,,7,*,,,,*,,,*,|T+.+T|S..S|T+.+T|t7,,ooooooooooooooooooooooooo,", + ",,7,,,*7,,*,*,,7*,7*,7,*|||.|||S..S|||.||| ; ; ; ; ", + "*,,*7*,,,7,,,,*,,,*,,*,,v^....+....+....^v*,,ooooooooooooooooooooooooo,,", + ",,,,*,,,,,,*,,,,,*,,,,7|||+|+||b..b||+|+||| ;; , ; ; ; ", + ",*7,,7,*,,7,,*,,,,7 *,*|!..|..|b..b|..|..!|,oooooooooooooooooooooooooooo", + ",,,*,,,77,*,,,,,,*,,,7,|||.||.|b..b|.||.||| , * ; ; * ;; ", + "*,,,,7,*,,,,,*,,,,,*,*,|!..|!.|Y..Y|.!|..!|*,,oooooooooooooooooooooooo,*", + ",,,,*,,,,,,,,,,*,,,7,,,||v|||!|..^.|!|||v||,,,,, ; ; ; ,,,,,", + ",,,,,,,,,,*,,,,,,,*,,7,*,,7*||||vv||||,7*,,7*,,,*,,oooooooooooooo,,,7,*," ], "palettes": [ "cground" ], - "place_vehicles": [ { "vehicle": "bus", "x": 33, "y": [ 18, 18 ], "chance": 100, "status": 4, "rotation": 90 } ], - "place_npcs": [ { "class": "godco_cook", "x": [ 46, 47 ], "y": 14 } ], - "place_loot": [ { "item": "oil_lamp_on", "x": 47, "y": 16 } ] + "place_zones": [ + { "type": "NPC_RETREAT", "faction": "gods_community", "x": [ 48, 69 ], "y": [ 4, 18 ] }, + { "type": "NPC_RETREAT", "faction": "gods_community", "x": [ 44, 47 ], "y": [ 4, 18 ] }, + { "type": "NPC_RETREAT", "faction": "gods_community", "x": [ 51, 55 ], "y": [ 20, 23 ] }, + { "type": "NPC_INVESTIGATE_ONLY", "faction": "gods_community", "x": [ 0, 23 ], "y": [ 0, 23 ] }, + { "type": "NPC_INVESTIGATE_ONLY", "faction": "gods_community", "x": [ 0, 23 ], "y": [ 24, 47 ] }, + { "type": "NPC_INVESTIGATE_ONLY", "faction": "gods_community", "x": [ 0, 23 ], "y": [ 48, 71 ] }, + { "type": "NPC_INVESTIGATE_ONLY", "faction": "gods_community", "x": [ 24, 47 ], "y": [ 0, 23 ] }, + { "type": "NPC_INVESTIGATE_ONLY", "faction": "gods_community", "x": [ 24, 47 ], "y": [ 24, 47 ] }, + { "type": "NPC_INVESTIGATE_ONLY", "faction": "gods_community", "x": [ 24, 47 ], "y": [ 48, 71 ] }, + { "type": "NPC_INVESTIGATE_ONLY", "faction": "gods_community", "x": [ 48, 71 ], "y": [ 0, 23 ] }, + { "type": "NPC_INVESTIGATE_ONLY", "faction": "gods_community", "x": [ 48, 71 ], "y": [ 24, 47 ] }, + { "type": "NPC_INVESTIGATE_ONLY", "faction": "gods_community", "x": [ 48, 71 ], "y": [ 48, 71 ] } + ], + "place_vehicles": [ + { "vehicle": "bus", "x": 33, "y": [ 18, 18 ], "chance": 100, "status": 4, "rotation": 90 }, + { "vehicle": "wheelchair", "x": 8, "y": 35, "chance": 100, "status": 0, "rotation": 90 }, + { "vehicle": "wheelbarrow", "x": [ 39, 40 ], "y": [ 48, 49 ], "chance": 100, "status": 0, "rotation": 90 } + ], + "place_npcs": [ + { "class": "godco_cook", "x": [ 46, 47 ], "y": 14 }, + { "class": "godco_helena", "x": [ 56, 57 ], "y": 10 }, + { "class": "godco_karen", "x": 56, "y": 12 }, + { "class": "godco_kostas", "x": 58, "y": 12 }, + { "class": "godco_sonia", "x": [ 34, 35 ], "y": 42 }, + { "class": "godco_russell", "x": 36, "y": 44 }, + { "class": "godco_chloe", "x": 34, "y": 44 }, + { "class": "godco_mark", "x": 38, "y": 49 }, + { "class": "godco_tom", "x": 9, "y": 37 }, + { "class": "godco_aunt", "x": 7, "y": 35 }, + { "class": "godco_olwen", "x": 7, "y": 30 }, + { "class": "godco_julian", "x": 6, "y": 31 }, + { "class": "godco_felicity", "x": 6, "y": 37 }, + { "class": "godco_jeremiah", "x": 9, "y": 50 }, + { "class": "godco_katherine", "x": 7, "y": 49 }, + { "class": "godco_gemma", "x": 6, "y": 51 }, + { "class": "godco_zachary", "x": 6, "y": 56 }, + { "class": "godco_corry", "x": 9, "y": 55 }, + { "class": "godco_arturo", "x": [ 18, 19 ], "y": 16 }, + { "class": "godco_damien", "x": [ 18, 19 ], "y": 14 }, + { "class": "godco_jane", "x": 15, "y": 14 } + ], + "place_loot": [ + { "item": "log", "x": [ 31, 34 ], "y": [ 65, 70 ], "repeat": [ 50, 60 ] }, + { "item": "stick_long", "x": [ 31, 34 ], "y": [ 65, 70 ], "repeat": [ 30, 40 ] }, + { "item": "cowboy_hat", "x": 35, "y": 43 }, + { "item": "months_old_newspaper", "x": 8, "y": 38, "repeat": [ 3, 5 ] }, + { "item": "one_year_old_newspaper", "x": 8, "y": 38, "repeat": [ 3, 5 ] }, + { "item": "character_sheet", "x": 8, "y": 50 }, + { "item": "character_sheet", "x": 7, "y": 50 }, + { "item": "character_sheet", "x": 7, "y": 51 }, + { "item": "RPG_die", "x": 8, "y": 51 }, + { "item": "deck_of_cards", "x": 7, "y": 56 }, + { "item": "fertilizer_commercial", "repeat": [ 1, 3 ], "x": [ 39, 40 ], "y": [ 48, 49 ] } + ] } }, { @@ -132,16 +184,16 @@ "########(zzzzzzzzzzzzz)####################vxxxxxxx....hhq%%%%%%%%%%%%v#", "########(zzzzzzzzzzzzz)####################vxxx.xxx...h..q%%%%%%%%%%%%v#", "########(zzzzzzzzzzzzz)####################|xx.......xqqq|%%%%%%%%%%%%|#", - "########(zzzzzzzzzzzzz)=)#################||x.??.xx...q%%%%%%%%%%%%%%%||", - "########(zzzzzzzzzzzzzzz)#################|...nnhx....q%%%%%%%%%%%%%%%%|", - "########(zzzjzzzzzzzzzzz)#################v..xxxx...?.q%%%%%%%%%%%%%%%%v", + "########(zzzzzzzzzzzzz)=)#################||x.??Cxx...q%%%%%%%%%%%%%%%||", + "########(zzzzzzzzzzzzzzz)#################|...nnxx....q%%%%%%%%%%%%%%%%|", + "########(zzzjzzzzzzZZZzz)#################v..xxxx...?.q%%%%%%%%%%%%%%%%v", "########(zzzzzzzzzzzzzzz)#################v...xx....?.q%%%%%%%%%%%%%%%%v", "########(zzzzzzzzzzzzz)-)#################v.|.......?.q%%%%%%%%%%%%%%%%v", "########(zzzzzzzzzzzzz)###################|>|.........q%%%%%%%%%%%%%%%%|", "########(zzzzzzzzzzzzz)###################|||...h.....q%%%%%%%%%%%%%%%||", - "########(zzzzzzzzzzzzz)####################|..hnn.....qqq|%%%%%%%%%%%%|#", - "########(zzzzzzzzzzzzz)####################v...nnh...^...q%%%%%%%%%%%%v#", - "########(zzzzzzzzzzzzz)####################v..h......??.bq%%%%%%%%%%%%v#", + "########(zZZzzzzzzZZzz)####################|..hnn.....qqq|%%%%%%%%%%%%|#", + "########(zZZzzzzzzZZzz)####################v...nnh...^...q%%%%%%%%%%%%v#", + "########(zZZzzzzzzZZzz)####################v..h......??.bq%%%%%%%%%%%%v#", "########(zzzzzzzzzzzzz)####################|............bq%%%%%%%%%%%%|#", "########(-------------)####################||||||||+|+|||vv||vv||vv||||#", "#################################################|>...<|################", @@ -157,9 +209,9 @@ "(zzzzzzzzzzzzzzzzzzz)###################################################", "(zzzzzzzzzzzzzzzzzzz)###################################################", "(zzzzzzzzzzzzzzzzzzz)###################################################", - "(zzzzwzzzzzzzzzzzzzz)###################################################", - "(zzzzzzzzzzzzzzzzzzz)###################################################", - "(zzzzzzzzzzzzzzzzzzz)###################################################", + "(zzzzwZZZZzzzzzzzzzz)###################################################", + "(zzzzzZZZZzzzzzzzzzz)###################################################", + "(zzzzzZZZZzzzzzzzzzz)###################################################", "(zzzzzzzzzzzzzzzzzzz)###################################################", "(zzzzzzzzzzzzzz)----)###################################################", "(zzzzzzzzzzzzzz)########################################################", @@ -171,21 +223,21 @@ "#(zzzzzzzz)#############################################################", "#(zWzzzzzz)#############################################################", "((zzzzzzzz)====)########################################################", - "(zzzzzzzzzzzzzz)#########################################(==========)###", - "(zzzzzzzzzzzjzz)#########################################(zzzzzzzzzz)###", - "(zzzzzzzzzzzzzz)#########################################(zzzzzzzzzz)###", - "(zzzzzzzzzzzzzz)====)####################################(zzzzzzzzzz)###", - "(zzzzzzzzzzzzzzzzzzz)####################################(zzzzzzzzzz)###", - "(zzzzzzzzzzzzzzzzzzz)####################################((zzzzzzzzz)###", - "(zzzzzzzzzzzzzzzzzzz)#####################################(zzzzzzzzz)###", - "(zzzzwzzzzzzzzzzzzzz)#####################################(zzzzzzzzz)###", - "(zzzzzzzzzzzzzzzzzzz)#####################################(zzzzzzzzz)###", - "(zzzzzzzzzzzzzzzzzzz)#####################################(zzzzzzzzz)###", - "(zzzzzzzzzzzzzzzzzzz)#####################################(zzzzzzzz))###", - "(zzzzzzzzzzzzzzzzzzz)#####################################(zzwzzzzz)####", - "(---------:---------)#####################################(zzzzz)--)####", - "########################(================)################(zzzzz:#######", - "########################(zzzzzzzzzzzzzzzz)################(-----)#######", + "(zzzzzzzzzzzzzz)########################################################", + "(zzzzzzzzzzzjzz)########################################################", + "(zzzzzzzzzzzzzz)########################################################", + "(zzzzzzzzzzzzzz)====)###################################################", + "(zzzzzzzzzzzzzzzzzzz)###################################################", + "(zzzzzZZZZzzzzzzzzzz)###################################################", + "(zzzzzZZZZzzzzzzzzzz)###################################################", + "(zzzzwZZZZzzzzzzzzzz)###################################################", + "(zzzzzzzzzzzzzzzzzzz)###################################################", + "(zzzzzzzzzzzzzzzzzzz)###################################################", + "(zzzzzzzzzzzzzzzzzzz)###################################################", + "(zzzzzzzzzzzzzzzzzzz)###################################################", + "(---------:---------)###################################################", + "########################(================)##############################", + "########################(zzzzzzzzzzzzzzzz)##############################", "########################(zzzzzzzzzzzzzzzz)##############################", "########################(zzzzzzzzzzzzzzzz:##############################", "########################(zzzzzzzzzzzzzzzz)##############################", @@ -200,10 +252,7 @@ "palettes": [ "cground" ], "place_nested": [ { "chunks": [ [ "roof_4x4_utility", 10 ], [ "roof_4x4_utility_1", 10 ] ], "x": 31, "y": 65 } ], "place_npcs": [ { "class": "godco_food_guard", "x": 47, "y": 8 } ], - "place_loot": [ - { "group": "novels", "x": [ 46, 47 ], "y": 9, "repeat": [ 6, 10 ], "chance": 100 }, - { "item": "oil_lamp_on", "x": [ 46, 47 ], "y": 9 } - ] + "place_loot": [ { "group": "novels", "x": [ 46, 47 ], "y": 9, "repeat": [ 6, 10 ], "chance": 100 } ] } }, { From f118c1935945248528e8a8ab0a4fc0b734c57d3c Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Wed, 15 Jan 2020 18:53:23 +0100 Subject: [PATCH 2/4] Update palette --- data/json/mapgen_palettes/cground.json | 38 ++++++++++++++------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/data/json/mapgen_palettes/cground.json b/data/json/mapgen_palettes/cground.json index 23fa9dd2e10e3..4b3869237a711 100644 --- a/data/json/mapgen_palettes/cground.json +++ b/data/json/mapgen_palettes/cground.json @@ -3,14 +3,14 @@ "type": "palette", "id": "cground", "terrain": { - " ": "t_region_groundcover_forest", + " ": "t_region_groundcover", ",": "t_region_groundcover_forest", - "_": [ [ "t_dirt", 12 ], [ "t_railroad_rubble", 8 ], [ "t_region_groundcover", 2 ] ], - ";": [ [ "t_dirt", 10 ], [ "t_grass", 2 ], [ "t_grass_long", 1 ] ], + "_": [ [ "t_dirt", 12 ], [ "t_railroad_rubble", 8 ], "t_grass_long", "t_grass_dead" ], + ";": [ [ "t_dirt", 20 ], "t_grass", [ "t_grass_dead", 2 ], [ "t_grass_long", 3 ] ], "B": [ [ "t_dirt", 12 ], [ "t_railroad_rubble", 8 ], [ "t_region_groundcover", 2 ] ], "N": [ [ "t_dirt", 12 ], [ "t_railroad_rubble", 8 ], [ "t_region_groundcover", 2 ] ], - "D": [ [ "t_dirt", 12 ], [ "t_railroad_rubble", 8 ], "t_region_groundcover" ], - "R": [ [ "t_dirt", 12 ], [ "t_railroad_rubble", 8 ], "t_region_groundcover" ], + "D": [ [ "t_dirt", 12 ], [ "t_railroad_rubble", 3 ] ], + "R": [ [ "t_dirt", 12 ], [ "t_railroad_rubble", 3 ] ], "|": "t_wall_log", ".": "t_floor", "i": "t_pit_shallow", @@ -19,8 +19,8 @@ "X": "t_console_broken", "H": "t_privacy_fence", "m": "t_privacy_fencegate_c", - "F": "t_region_tree_evergreen", - "7": [ "t_region_groundcover_forest", [ "t_region_tree", 3 ] ], + "F": "t_tree_juniper", + "7": [ "t_region_groundcover_forest", [ "t_region_tree", 15 ] ], "*": "t_region_shrub", "o": "t_dirtmound", "G": "t_grave", @@ -43,6 +43,7 @@ "'": "t_concrete" }, "furniture": { + "C": "f_oil_lamp_post", "g": "f_bulletin", "i": "f_firering", "b": "f_bench", @@ -78,8 +79,8 @@ "L": "f_locker", " ": [ [ "f_null", 200 ], "f_region_flower" ], ",": [ - [ "f_null", 1500 ], - [ "f_region_flower", 10 ], + [ "f_null", 1250 ], + [ "f_region_flower", 25 ], [ "f_boulder_small", 4 ], [ "f_rubble_rock", 5 ], [ "f_boulder_medium", 2 ], @@ -89,7 +90,8 @@ "toilets": { "T": { } }, "items": { "@": { "item": "bed", "chance": 80, "repeat": [ 1, 2 ] }, - "L": { "item": "cleaning", "chance": 75, "repeat": [ 1, 3 ] }, + "L": { "item": "SUS_janitors_closet", "chance": 90 }, + "f": { "item": "SUS_office_filing_cabinet", "chance": 90 }, "?": { "item": "bed", "chance": 10, "repeat": [ 1, 2 ] }, "D": { "item": "trash", "chance": 75, "repeat": [ 1, 10 ] }, "R": { "item": "trash", "chance": 75, "repeat": [ 1, 10 ] }, @@ -97,9 +99,9 @@ "O": { "item": "oven", "chance": 100, "repeat": [ 1, 2 ] }, ",": { "item": "forest", "chance": 1 }, " ": { "item": "field", "chance": 1 }, - "l": [ { "item": "allclothes", "chance": 90, "repeat": [ 1, 3 ] }, { "item": "shelter", "chance": 45, "repeat": [ 1, 2 ] } ], + "l": [ { "item": "allclothes", "chance": 90, "repeat": [ 3, 5 ] }, { "item": "shelter", "chance": 45, "repeat": [ 1, 2 ] } ], "e": [ { "item": "fridge", "chance": 70, "repeat": [ 1, 8 ] }, { "item": "fridgesnacks", "chance": 20, "repeat": [ 1, 2 ] } ], - "c": [ { "item": "kitchen_appliances", "chance": 15 }, { "item": "dishes_utility", "chance": 15 } ], + "c": [ { "item": "kitchen_appliances", "chance": 15 }, { "item": "dishes_utility", "chance": 25 } ], "s": [ { "item": "dishes_utility", "chance": 80, "repeat": [ 1, 3 ] }, { "item": "dishes_dining", "chance": 80, "repeat": [ 5, 25 ] } @@ -109,19 +111,19 @@ { "item": "dishes_dining", "chance": 80, "repeat": [ 5, 10 ] } ], "u": [ - { "item": "cannedfood", "chance": 55, "repeat": [ 2, 3 ] }, + { "item": "cannedfood", "chance": 55, "repeat": [ 3, 5 ] }, { "item": "pasta", "chance": 50, "repeat": [ 1, 3 ] }, { "item": "snacks", "chance": 33, "repeat": [ 1, 2 ] } ], "x": [ - { "item": "cannedfood", "chance": 85, "repeat": [ 5, 7 ] }, - { "item": "pasta", "chance": 75, "repeat": [ 4, 6 ] }, + { "item": "cannedfood", "chance": 85, "repeat": [ 10, 15 ] }, + { "item": "pasta", "chance": 75, "repeat": [ 3, 5 ] }, { "item": "snacks", "chance": 60, "repeat": [ 3, 5 ] } ], - "M": { "item": "drugs_heal_simple", "chance": 70, "repeat": [ 1, 4 ] }, + "M": { "item": "drugs_pharmacy", "chance": 100, "repeat": [ 8, 12 ] }, "d": [ - { "item": "office", "chance": 25, "repeat": [ 1, 2 ] }, - { "item": "cubical_office", "chance": 25, "repeat": [ 1, 2 ] } + { "item": "office", "chance": 33, "repeat": [ 1, 2 ] }, + { "item": "cubical_office", "chance": 33, "repeat": [ 1, 2 ] } ] } } From c42b0a1b60b559d3859fd98cdbc6d3954e0a3805 Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Wed, 15 Jan 2020 20:25:11 +0100 Subject: [PATCH 3/4] Adds f_oil_lamp_post --- .../furniture-terrains.json | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index 65d1168c40013..c2077279f2f1c 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -746,5 +746,37 @@ { "item": "scrap", "count": [ 3, 5 ] } ] } + }, + { + "type": "furniture", + "id": "f_oil_lamp_post", + "name": "oil lamp post", + "looks_like": "f_street_light", + "description": "A wooden post that holds a lit oil lamp.", + "symbol": "i", + "color": "brown", + "move_cost_mod": 2, + "coverage": 35, + "required_str": 20, + "deconstruct": { + "items": [ + { "item": "2x4", "count": 10 }, + { "item": "oil_lamp", "charges-min": 50, "charges-max": 750 }, + { "item": "nail", "charges": [ 10, 15 ] } + ] + }, + "light_emitted": 40, + "flags": [ "BASHABLE", "TRANSPARENT", "DECONSTRUCT", "FLAMMABLE_ASH" ], + "bash": { + "sound": "smash!", + "sound_fail": "whump.", + "str_min": 12, + "str_max": 40, + "items": [ + { "item": "splinter", "count": [ 4, 8 ] }, + { "item": "nail", "charges": [ 4, 8 ] }, + { "item": "scrap", "count": [ 0, 1 ] } + ] + } } ] From 66692c4be07c9f52fb0c376b7e3eca3a7b7b7eec Mon Sep 17 00:00:00 2001 From: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Thu, 16 Jan 2020 18:38:41 +0100 Subject: [PATCH 4/4] replace sofas with chairs in office --- data/json/mapgen/cground3x3.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/mapgen/cground3x3.json b/data/json/mapgen/cground3x3.json index 0c214a2edb30e..737986cf22e83 100644 --- a/data/json/mapgen/cground3x3.json +++ b/data/json/mapgen/cground3x3.json @@ -25,9 +25,9 @@ ",7,,,,,,7,*,,7,,,7,,*,7,,,,,7,* _________ 7 ,,,,,*,,,,,,,,,,*,,,,*,,", ",,,,*7,,||||v||||||v|||,*,,,,,, _________ *,,,7,,,,,,,*,,,,7,,7,*,,,*", "7,,*,G,7|^.fff.^|ddddd|,,7,*, __________7* ,,7,,,,,*,,77,,,,*,,,,7,,,,7", - ",,G,,,,t|.d.?..X|d..hdv7,, __________ ||||||||||||||vv||vv||vv||||,", + ",,G,,,,t|.d.h..X|d..hdv7,, __________ ||||||||||||||vv||vv||vv||||,", "G* G,G*|.dddd.Y|dh..dv,,*, ___________F |???|T+.a|^...............^|7", - " ;7 ; ,v..?.?..|.....v,,,,* ___________ v?.?|||.S|.bnb.bnb.bnb.bnb.v,", + " ;7 ; ,v..h.h..|.....v,,,,* ___________ v?.?|||.S|.bnb.bnb.bnb.bnb.v,", ",G;G G;7v.......+.ff.g|,,7, ____________ v...|T+.S|.bnb.bnb.bnb.bnb.v*", ",*;;; G|hh..bbb|.||+||,,7 ____________F |..n|||.S|.bnb|bnb.bnb.bnb.|7", "G,G G;G,||||+||||+|..Y||| _____________ ||..n|T+..|.bnbCbnb.bnb.bnb.||",