Skip to content

Commit

Permalink
Isherwood farm mutable (#72424)
Browse files Browse the repository at this point in the history 
* Mutable

* Missions

* Special obsoletion

* Update achievements.json

* Correct migration (what the hell did I expect this to do)

* Update to new linear rural_road ids

* Randomise building placement

* Rename the mutable overmaps too

* Add mutable NPC faction camp support

Could probably do with deduplicating at some point

* Lint

* Prevent map extras on isherwood specific maps

* Hopefully extract the mutable faction camp names

* Flake8 is pain

* Update overmap_special.py

* Prevent extras on smokehouse

* Minor map tweaks

* Migrate old fields

* Fix typo in migration

* Remove a few omt entries I forgot about

* Removes special_field_isherwood that I didn't end up using

* Find in files not bothering to reload open files is rood

* I feel like I'm farming CI fails at this point...
  • Loading branch information
@Procyonae
Procyonae authored Jun 12, 2024
1 parent 1fb61c1 commit 85948df
Show file tree
Hide file tree
Showing 24 changed files with 1,681 additions and 1,463 deletions.
2 changes: 1 addition & 1 deletion data/json/achievements.json
View file
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
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
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

0 comments on commit 85948df

Please sign in to comment.