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

Isherwood farm mutable #72424

Merged
merged 24 commits into from
Jun 12, 2024
Merged

Isherwood farm mutable #72424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c99f489
Mutable
Procyonae Mar 16, 2024
92b6580
Missions
Procyonae Mar 16, 2024
2b46f7a
Special obsoletion
Procyonae Mar 16, 2024
11b1c8c
Merge branch 'master' into Isherwood
Procyonae Jun 6, 2024
87e7ca2
Update achievements.json
Procyonae Jun 6, 2024
2e689cd
Correct migration (what the hell did I expect this to do)
Procyonae Jun 6, 2024
8d991fb
Update to new linear rural_road ids
Procyonae Jun 6, 2024
a4bdc0a
Randomise building placement
Procyonae Jun 6, 2024
9357901
Rename the mutable overmaps too
Procyonae Jun 6, 2024
c6718a2
Add mutable NPC faction camp support
Procyonae Jun 7, 2024
a183f3e
Lint
Procyonae Jun 7, 2024
60f4b4e
Prevent map extras on isherwood specific maps
Procyonae Jun 7, 2024
6317563
Hopefully extract the mutable faction camp names
Procyonae Jun 7, 2024
88b80cb
Flake8 is pain
Procyonae Jun 7, 2024
82deed2
Update overmap_special.py
Procyonae Jun 7, 2024
d1e3229
Prevent extras on smokehouse
Procyonae Jun 9, 2024
7ff899e
Minor map tweaks
Procyonae Jun 9, 2024
617a92b
Merge branch 'master' into Isherwood
Procyonae Jun 9, 2024
7d7219b
Migrate old fields
Procyonae Jun 9, 2024
02838ba
Fix typo in migration
Procyonae Jun 11, 2024
4595693
Remove a few omt entries I forgot about
Procyonae Jun 11, 2024
29effc6
Removes special_field_isherwood that I didn't end up using
Procyonae Jun 11, 2024
d15437d
Find in files not bothering to reload open files is rood
Procyonae Jun 11, 2024
25ddbcf
I feel like I'm farming CI fails at this point...
Procyonae Jun 11, 2024
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
2 changes: 1 addition & 1 deletion data/json/achievements.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2011,7 +2011,7 @@
{
"event_statistic": "last_overmap_special_avatar_entered",
"is": "==",
"target": [ "overmap_special_id", "Isherwood Farms" ],
"target": [ "overmap_special_id", "Isherwood Farm Mutable" ],
"visible": "when_achievement_completed",
"description": "Reach Isherwood Farms"
}
Expand Down
7 changes: 0 additions & 7 deletions data/json/mapgen/farm_2side.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,12 +497,5 @@
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "2farm_roof_15" ],
"weight": 250,
"object": { "fill_ter": "t_open_air" }
}
]
252 changes: 0 additions & 252 deletions data/json/mapgen/farm_tiles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,256 +1,4 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "farm_lot_wire_straight_h" ],
"weight": 100,
"object": {
"fill_ter": "t_region_soil",
"rows": [
"%%%%%%%%%%%%%%%%%%%%%%%%",
" ",
"########################",
"########################",
" ",
"########################",
"########################",
" ",
"########################",
"########################",
" ",
"########################",
"########################",
" ",
"########################",
"########################",
" ",
"########################",
"########################",
" ",
"########################",
"########################",
" ",
"########################"
],
"palettes": [ "farm_lots" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "farm_lot_wire_straight_v" ],
"weight": 100,
"object": {
"fill_ter": "t_region_soil",
"rows": [
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
" ",
"%%%%%%%%%%%%%%%%%%%%%%%%"
],
"palettes": [ "farm_lots" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "farm_lot_wire_straight_v_open" ],
"weight": 100,
"object": {
"fill_ter": "t_region_soil",
"rows": [
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
"# ## ## ## ## ## ## ## #",
" //////// ",
"%%%%%%%%////////%%%%%%%%"
],
"palettes": [ "farm_lots" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "farm_lot_wire_turn_v_open" ],
"weight": 100,
"object": {
"fill_ter": "t_region_soil",
"rows": [
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% //////// ",
"%%%%%%%%////////%%%%%%%%"
],
"palettes": [ "farm_lots" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "farm_lot_M1" ],
"weight": 100,
"object": {
"fill_ter": "t_region_soil",
"rows": [
"########################",
"########################",
" ",
"########################",
"########################",
" ",
"########################",
"########################",
" ",
"########################",
"########################",
" ",
"########################",
"########################",
" ",
"########################",
"########################",
" ",
"########################",
"########################",
" ",
"########################",
"########################",
" "
],
"palettes": [ "farm_lots" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "farm_lot_wire_turn_h" ],
"weight": 100,
"object": {
"fill_ter": "t_region_soil",
"rows": [
"% ######################",
"% ",
"% ######################",
"% ######################",
"% ",
"% ######################",
"% ######################",
"% ",
"% ######################",
"% ######################",
"% ",
"% ######################",
"% ######################",
"% ",
"% ######################",
"% ######################",
"% ",
"% ######################",
"% ######################",
"% ",
"% ######################",
"% ######################",
"% ",
"%%%%%%%%%%%%%%%%%%%%%%%%"
],
"palettes": [ "farm_lots" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "farm_lot_wire_turn_v" ],
"weight": 100,
"object": {
"fill_ter": "t_region_soil",
"rows": [
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ## ## ## ## ## ## ## #",
"% ",
"%%%%%%%%%%%%%%%%%%%%%%%%"
],
"palettes": [ "farm_lots" ]
}
},
{
"type": "mapgen",
"method": "json",
Expand Down
Loading
Loading