Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Two houses at the end of a lonely road #54022

Merged
merged 42 commits into from
Jan 14, 2022
Merged

Two houses at the end of a lonely road #54022

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
dafb0db
clothes, zones, npcs
bombasticSlacks Jan 3, 2022
93e0a30
turrets added, some basic item lists built
bombasticSlacks Jan 4, 2022
cf6f183
Apply suggestions from code review
bombasticSlacks Jan 4, 2022
e70f0a1
Cody initial trade list
bombasticSlacks Jan 4, 2022
0ffb79a
modified jays house and added spawns
bombasticSlacks Jan 4, 2022
752a84d
lights, decorations, bank set up
bombasticSlacks Jan 4, 2022
3594c09
moved to separate palette, added id reader
bombasticSlacks Jan 4, 2022
2aa6fb0
started on basement
bombasticSlacks Jan 5, 2022
0cd43bc
some progress on moving to 1 floor again
bombasticSlacks Jan 7, 2022
7d4fd6a
Cody first dialogue pass
bombasticSlacks Jan 8, 2022
09356bc
Cody Done
bombasticSlacks Jan 8, 2022
256634c
typo fix
bombasticSlacks Jan 8, 2022
668ada2
gun show complete
bombasticSlacks Jan 8, 2022
eccf3d5
Linting
bombasticSlacks Jan 8, 2022
541ff87
mission definitions complete
bombasticSlacks Jan 9, 2022
bc679fc
Cody has a bigger forge
bombasticSlacks Jan 9, 2022
9026c57
moved the forge
bombasticSlacks Jan 9, 2022
bf2189b
renamed something
bombasticSlacks Jan 9, 2022
c4f0f66
Copy changeup
bombasticSlacks Jan 9, 2022
13167b1
Fixes and linting
bombasticSlacks Jan 9, 2022
6acc041
more lintin
bombasticSlacks Jan 9, 2022
1c642d1
why won't it tell me everything that needs linted
bombasticSlacks Jan 9, 2022
a3e3f53
Update specials.json
bombasticSlacks Jan 9, 2022
5dea5b0
generic guns stuff
bombasticSlacks Jan 9, 2022
62190b1
swapped rifle to KORD fixed some single spaces
bombasticSlacks Jan 9, 2022
9f2ed20
fix secubots sometimes spawning outside, added teamster mission
bombasticSlacks Jan 9, 2022
3069c95
turret deconstruct rules
bombasticSlacks Jan 9, 2022
cfdb9be
replaced references to AK12 in Cody's dialogue
bombasticSlacks Jan 9, 2022
0197118
Apply most suggestions from code review
bombasticSlacks Jan 10, 2022
41641fd
Update data/json/items/gun/545x39.json
bombasticSlacks Jan 10, 2022
da361cb
Apply suggestions from code review
bombasticSlacks Jan 10, 2022
bcfead3
Final suggestions
bombasticSlacks Jan 10, 2022
8d6805a
Update factions.json
bombasticSlacks Jan 10, 2022
4314934
missed an issue with suggestions
bombasticSlacks Jan 10, 2022
d6f240c
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
bombasticSlacks Jan 10, 2022
0f99678
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
bombasticSlacks Jan 11, 2022
4dc3fce
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
bombasticSlacks Jan 11, 2022
f9f6b94
thought name was description
bombasticSlacks Jan 13, 2022
03da419
buggin out
bombasticSlacks Jan 13, 2022
21372de
Single caps since I think gun brands / designations are capitalized
bombasticSlacks Jan 13, 2022
5b760d7
linting
bombasticSlacks Jan 13, 2022
885077b
clean up pointless plural
bombasticSlacks Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions data/json/itemgroups/military.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@
"subtype": "collection",
"entries": [ { "item": "esapi_plate", "prob": 50 }, { "item": "esapi_plate", "prob": 50 } ]
},
{
"id": "military_ballistic_vest_light_pristine",
"type": "item_group",
"//": "light ballistic vest plus plates",
"container-item": "ballistic_vest_light",
"subtype": "collection",
"entries": [ { "item": "esapi_plate" }, { "item": "esapi_plate" } ]
},
{
"id": "military_ballistic_vest_heavy",
"type": "item_group",
Expand Down
270 changes: 270 additions & 0 deletions data/json/mapgen/isolated_road/isolated_road_home_chunks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,270 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "isolated_house_farm_gunsmith" ],
"object": {
"fill_ter": "t_floor",
"rows": [
"GGGGGGGGGGGGGGGGGGGGGGGG",
"%%%%%%%%%%%%%%%%%%%%%%%G",
"%..................b..%G",
"%...........|vvv|.....%G",
"%%||vv|||||||kkk|||...%G",
".||g + + h 1|...%G",
".vk | |@@ nv...%G",
".vkh @@|dd|@@ 888|...%G",
".vk @@|||||||+||||...%G",
".|||+|||y nv...%G",
"%%|a ||+||||||...%G",
"H,+ n|D S|rrr|...%G",
"%,|Y n|B |r r|...%G",
"%,|Y n|B t|r r|...%G",
"%,|Y n||+|||+||...%G",
"%,v D c u|...%G",
"%,v hnnh c uv...%G",
"%,v hnnh c Sv...%G",
"%,| o|...%G",
"%,|y 8888 cfuu|...%G",
"%,||v|+||||vvv|||||...%G",
"%,,,,,,...............%G",
"%H%%%%%%%%%%%%%%%%%%%%%G",
"......................%G"
],
"palettes": [ "farm_house" ],
"terrain": {
"G": "t_pit_spiked"
},
"place_loot": [ { "item": "television", "x": 10, "y": 10, "chance": 100 } ],
"place_npcs": [ { "class": "jay_ruckers", "x": 4, "y": 16 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "isolated_house_farm_blacksmith" ],
"object": {
"fill_ter": "t_floor",
"rows": [
"G%%%%%%%%%%%%%%%%%%%%%..",
"G%..............b....%..",
"G%...................H..",
"G%...||||||vv|| |####|..",
"G%...|rrr|fouu| #..",
"G%...vr + S| #..",
"G%...|rrr|cc u|+||| #..",
"G%...||||||| 1n|7 #..",
"G%...|k d@@|d v7 #..",
"G%...|kh @@|d v7 #..",
"G%...vk |d | #..",
"G%...|y g|d v |,,",
"G%...||||+||n v ,,",
"G%...+ | ,,",
"G%...||||+||D y ||+||.",
"G%...|@@ 8||+|| 7v.",
"G%...v@@ 8|t D|8 7v.",
"G%...|d 8| |8 7v.",
"G%...|D 1 |BBS|8YYYa||.",
"G%...|||kkk|||||||v|||..",
"G%.....|vvv|.........%..",
"G%...................%..",
"G%%%%%%%%%%%%%%%%%%%%%%%",
"GGGGGGGGGGGGGGGGGGGGGGGG"
],
"palettes": [ "farm_house" ],
"furniture": {
"d": "f_displaycase"
},
"terrain": {
"G": "t_pit_spiked"
},
"place_monster": [
{ "monster": "mon_turret_artisans", "x": 16, "y": 12, "chance": 100 },
],
"place_loot": [ { "item": "television", "x": 12, "y": [ 9, 12 ], "chance": 100 } ],
"place_npcs": [ { "class": "cody_miller", "x": 16, "y": 13 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "isolated_road_field_0" ],
"object": {
"fill_ter": "t_grass",
"rows": [
"GGGGGGGGGjjjjjjjGGGGGGGG",
"G........ddddddd........",
"G........ddddddd........",
"G........ddddddd........",
"G........ddddddd........",
"G........ddddddd........",
"G........ddddddd........",
"G........ddddddd........",
"Gddddddddddddddd........",
"Gddddddddddddddd........",
"Gddddddddddddddd........",
"Gddddddddddddddd........",
"G........ddddddd........",
"G........ddddddd........",
"G........ddddddd........",
"Gddddddddddddddd........",
"Gdddddddddddddd.........",
"Gddddddddddddd..........",
"Gdddddddddddd...........",
"G.......................",
"G.......................",
"G.......................",
"G.......................",
"G......................."
],
"terrain": {
"G": "t_pit_spiked",
"j": "t_pit_covered",
"d": "t_dirt"
},
"place_vehicles": [
{ "vehicle": "pickup", "chance": 100, "fuel": 50, "rotation": 180, "status": 0, "x": 4, "y": 10 }
],
"place_monster": [
{ "monster": "mon_turret_artisans", "x": 8, "y": 1, "chance": 100 },
{ "monster": "mon_turret_artisans", "x": 16, "y": 1, "chance": 100 },
{ "monster": "mon_turret_artisans", "x": 23, "y": 23, "chance": 100 },
{ "monster": "mon_turret_artisans", "x": 2, "y": 23, "chance": 100 },
{ "monster": "mon_turret_artisans", "x": 23, "y": 2, "chance": 100 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "isolated_road_field_1" ],
"object": {
"fill_ter": "t_dirt",
"rows": [
"______________________%G",
"______________________%G",
"__....................%G",
"__..-----O............%G",
"__..-ttt-O.......###..%G",
"__..-ddd-........###..%G",
"__...............##...%G",
"__....................%G",
"__..D.D.D.D..D.D.D.D..%G",
"__..D.D.D.D..D.D.D.D..%G",
"__..D.D.D.D..D.D.D.D..%G",
"__....................%G",
"__....................%G",
"__..D.D.D.D..D.D.D.D..%G",
"__..D.D.D.D..D.D.D.D..%G",
"__..D.D.D.D..D.D.D.D..%G",
"__....................%G",
"__..D.D.D.D..D.D.D.D..%G",
"__..D.D.D.D..D.D.D.D..%G",
"__..D.D.D.D..D.D.D.D..%G",
"__....................%G",
"__....................%G",
"%%%%%%%%%%%%%%%%%%%%%%%G",
"GGGGGGGGGGGGGGGGGGGGGGGG"
],
"terrain": {
"#": "t_dirtmound",
"+": "t_fencegate_c",
"%": "t_splitrail_fence",
"-": "t_wall_wood",
"D": "t_dirtmound",
".": [ "t_grass", "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_dirt" ],
"P": "t_fence",
"_": "t_region_groundcover_urban",
"d": "t_dirtfloor",
"t": "t_dirtfloor",
"|": "t_fence",
"G": "t_pit_spiked"
},
"furniture": { "O": "f_standing_tank", "H": "f_standing_tank", "P": "f_sign", "t": "f_table" },
"liquids": { "O": { "liquid": "water", "amount": [ 0, 100 ] }, "H": { "liquid": "fertilizer_liquid", "amount": [ 0, 100 ] } },
"sealed_item": { "D": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_seedling", "chance": 70 } },
"place_items": [
{ "chance": 35, "repeat": 2, "item": "supplies_farming", "x": 6, "y": 4 },
{ "chance": 35, "repeat": 2, "item": "garden_shed", "x": 7, "y": 4 },
{ "chance": 40, "repeat": 2, "item": "garden_shed", "x": 5, "y": 4 }
],
"place_monster": [
{ "monster": "mon_turret_artisans", "x": 1, "y": 21, "chance": 100 },
{ "monster": "mon_turret_artisans", "x": 21, "y": 1, "chance": 100 },
{ "monster": "mon_turret_artisans", "x": 21, "y": 21, "chance": 100 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "isolated_house_farm_roof_blacksmith",
"object": {
"fill_ter": "t_floor",
"rows": [
" ",
" ",
" ",
" |2222222222222223 ",
" |_______________3 ",
" |_______________3 ",
" |_______________3 ",
" |_______________3 ",
" |_______________3 ",
" |_______________3 ",
" |_______________3 ",
" |_______________3 ",
" |_______________3 ",
" |_______________3 ",
" |_______________33 ",
" |________________3 ",
" |________________3 ",
" |________________3 ",
" |_______________33 ",
" |--___----------- ",
" ----- ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { "_": "t_shingle_flat_roof" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "isolated_house_farm_roof_gunsmith",
"object": {
"fill_ter": "t_floor",
"rows": [
" ",
" ",
" ",
" ----- ",
" -----------___--| ",
" 33_______________| ",
" 3________________| ",
" 3________________| ",
" 3________________| ",
" 33_______________| ",
" 3_______________| ",
" 3_______________| ",
" 3_______________| ",
" 3_______________| ",
" 3_______________| ",
" 3_______________| ",
" 3_______________| ",
" 3_______________| ",
" 3_______________| ",
" 3_______________| ",
" 3222222222222222| ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { "_": "t_shingle_flat_roof" }
}
}
]
18 changes: 13 additions & 5 deletions data/json/monster_factions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"type": "MONSTER_FACTION",
"name": "human",
"neutral": [ "mech_bot" ],
"by_mood": "exodii"
"by_mood": ["exodii", "isolated_artisans"]
},
{
"type": "MONSTER_FACTION",
Expand Down Expand Up @@ -60,14 +60,14 @@
"type": "MONSTER_FACTION",
"name": "small_animal",
"base_faction": "animal",
"neutral": [ "zombie", "fish", "exodii", "nether", "animal" ],
"neutral": [ "zombie", "fish", "exodii", "isolated_artisans", "nether", "animal" ],
"by_mood": [ "cat", "bear", "fox", "big_cat", "dog", "wolf" ]
},
{
"type": "MONSTER_FACTION",
"name": "herbivore",
"base_faction": "animal",
"neutral": [ "small_animal", "fish", "exodii" ]
"neutral": [ "small_animal", "fish", "exodii", "isolated_artisans" ]
},
{
"type": "MONSTER_FACTION",
Expand Down Expand Up @@ -129,7 +129,7 @@
"base_faction": "animal",
"hate": [ "aquatic_predator", "zombie_aquatic", "mutant_piscivores", "crayfish", "strider" ],
"by_mood": [ "bear", "big_cat" ],
"neutral": [ "zombie", "bot", "animal", "small_animal", "exodii", "plant", "nether", "jabberwock", "insect", "mutant", "fungus" ]
"neutral": [ "zombie", "bot", "animal", "small_animal", "exodii", "isolated_artisans", "plant", "nether", "jabberwock", "insect", "mutant", "fungus" ]
},
{
"type": "MONSTER_FACTION",
Expand Down Expand Up @@ -476,13 +476,21 @@
"by_mood": [ "animal", "nether", "human" ],
"hate": [ "zombie", "fungus", "triffid", "mi-go" ]
},
{
"type": "MONSTER_FACTION",
"name": "isolated_artisans",
"base_faction": "human",
"neutral": [ "fish", "small_animal", "herbivore" ],
"by_mood": [ "animal", "nether", "human" ],
"hate": [ "zombie", "fungus", "triffid", "mi-go" ]
},
{
"type": "MONSTER_FACTION",
"name": "mi-go",
"base_faction": "nether",
"neutral": [ "fish", "small_animal", "slime" ],
"by_mood": [ "nether" ],
"hate": [ "zombie", "triffid", "fungus", "exodii" ]
"hate": [ "zombie", "triffid", "fungus", "exodii", "isolated_artisans" ]
},
{
"type": "MONSTER_FACTION",
Expand Down
14 changes: 14 additions & 0 deletions data/json/monsters/turrets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,5 +405,19 @@
"INTERIOR_AMMO",
"STUN_IMMUNE"
]
},
{
"id": "mon_turret_artisans",
"type": "MONSTER",
"name": { "str": "custom plated turret" },
"looks_like": "mon_turret",
"description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. This one is fitted with a M249 and reinforced with heavy plating.",
"default_faction": "isolated_artisans",
"copy-from": "mon_turret_rifle",
"aggression": -10,
"armor_bash": 25,
"armor_cut": 25,
"armor_bullet": 25,
"anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ]
}
]
29 changes: 29 additions & 0 deletions data/json/npcs/factions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,35 @@
],
"description": "An outpost started by the Free Merchants to provide a source of food and raw materials."
},
{
"type": "faction",
"id": "isolated_artisans",
"name": "Isolated Artisans",
"likes_u": 10,
"respects_u": 0,
"known_by_u": false,
"size": 2,
"power": 5,
"food_supply": 4000,
"wealth": 100000,
"currency": "FMCNote",
"relations": {
"free_merchants": {
bombasticSlacks marked this conversation as resolved.
Show resolved Hide resolved
"kill on sight": false,
"watch your back": true,
"share my stuff": true,
"guard your stuff": true,
"lets you in": true,
"defends your space": true,
"knows your voice": true
}
},
"epilogues": [
{ "power_min": 0, "id": "epilogue_faction_tacoma_commune_0" },
bombasticSlacks marked this conversation as resolved.
Show resolved Hide resolved
{ "power_max": 150, "id": "epilogue_faction_tacoma_commune_150" }
bombasticSlacks marked this conversation as resolved.
Show resolved Hide resolved
],
"description": "A couple of talented artisans in the country."
},
{
"type": "faction",
"id": "marloss",
Expand Down
Loading