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

Move overmap visualization to overmap area editor #414

Merged
merged 70 commits into from
Oct 17, 2024
Merged

Move overmap visualization to overmap area editor #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
cfe8fca
Add cracked concrete
snipercup Oct 1, 2024
eb1dcf8
Don't duplicate references
snipercup Oct 1, 2024
d56b8ce
Replace some concrete with cracked version
snipercup Oct 1, 2024
6b7eeec
Add road connections
snipercup Oct 1, 2024
6de456d
Add controls for neighbors
snipercup Oct 1, 2024
4605092
Add initial code for the controls
snipercup Oct 1, 2024
15dc813
Re-use code, add comments
snipercup Oct 1, 2024
8a19bf0
Add code for the other directions
snipercup Oct 1, 2024
ac145cb
Update connections format
snipercup Oct 2, 2024
8036b83
Add controls for neighbor keys
snipercup Oct 2, 2024
b47b428
neihbor key functions
snipercup Oct 4, 2024
d404511
Map neighbors and controls
snipercup Oct 4, 2024
a9be551
Rename populate_category_options
snipercup Oct 4, 2024
315c43a
Rename neighbor_key_option_button
snipercup Oct 4, 2024
f15074d
Update tooltip
snipercup Oct 4, 2024
28b4651
Add house neighbors
snipercup Oct 4, 2024
15706c8
Other maps have neighbors
snipercup Oct 4, 2024
5ab251c
Add gaea addon, remove kenney
snipercup Oct 4, 2024
5d64d63
Update neighbors format
snipercup Oct 4, 2024
7aaf1c9
Read the new neighbors format
snipercup Oct 4, 2024
812cb69
Step 1 of neighbor selection
snipercup Oct 4, 2024
e3e011c
Exclude invalid rotations
snipercup Oct 4, 2024
4e5a701
Set the neighbors for each tile entry
snipercup Oct 4, 2024
101f54f
Weight calculations
snipercup Oct 5, 2024
073380a
Be sure to duplicate the entry before applying weight
snipercup Oct 5, 2024
65a88d5
Add tooltip
snipercup Oct 5, 2024
34189e5
Create the grid
snipercup Oct 5, 2024
9375bef
Add generator scene for wave function collapse
snipercup Oct 6, 2024
1aa818b
pivot to overmap area genertor
snipercup Oct 6, 2024
2156150
Fix tile rotation
snipercup Oct 6, 2024
d3795c0
Rotation and connection check
snipercup Oct 6, 2024
e798303
Add more generation related functions
snipercup Oct 6, 2024
d2d08ed
Add tile_dictionary
snipercup Oct 8, 2024
2885055
Use the tile_dictionary
snipercup Oct 8, 2024
e4a259d
Start city generation algorithm
snipercup Oct 8, 2024
4c1492e
Basic generation
snipercup Oct 8, 2024
326c343
Fix position
snipercup Oct 9, 2024
5058e2b
Fix rotations
snipercup Oct 9, 2024
12b4547
Add iterations to fill the grid
snipercup Oct 9, 2024
3b0a44d
Add types to variables
snipercup Oct 9, 2024
e7c229a
Do not place tiles twice
snipercup Oct 9, 2024
012e4b6
Make some variables global
snipercup Oct 9, 2024
51d7487
Move direction_offsets
snipercup Oct 9, 2024
0cedf20
Retry mechanism
snipercup Oct 9, 2024
2adc05b
Remove gaea addon
snipercup Oct 9, 2024
e4d7f5e
Update project.godot - remove gaea
snipercup Oct 9, 2024
1a55b5c
Remove wave function collapse
snipercup Oct 9, 2024
284088b
Remove remains of wave function collapse
snipercup Oct 9, 2024
4464d96
Add basic overmaparea data
snipercup Oct 9, 2024
843c7ac
Add data read and write
snipercup Oct 9, 2024
8c3a70b
Update data
snipercup Oct 9, 2024
96842af
Read write spinbox values
snipercup Oct 9, 2024
61a4b71
More overmap area editor work
snipercup Oct 10, 2024
5f5f2aa
Overmap area work
snipercup Oct 10, 2024
28d7480
Region editor layout
snipercup Oct 10, 2024
a661657
Add generichouse_end
snipercup Oct 10, 2024
eb1ffcf
Add references
snipercup Oct 10, 2024
6b3f20a
Add areas option button
snipercup Oct 10, 2024
7660dbe
Add required functions for new calculations
snipercup Oct 10, 2024
3382c16
Selection of neighbor key
snipercup Oct 11, 2024
16a8dcc
Get percentage from different grid
snipercup Oct 11, 2024
0266a02
Apply noise to city
snipercup Oct 11, 2024
65abf82
Cleanup
snipercup Oct 11, 2024
fdf8714
Implement overmap area into overmap
snipercup Oct 11, 2024
9d44f16
Remove noise based cities off the map
snipercup Oct 11, 2024
c80cc7f
Remove neighbors and neighbor key from maps
snipercup Oct 11, 2024
230a274
Remove neighbor key controls
snipercup Oct 11, 2024
d8d11d4
Dynamic city size
snipercup Oct 11, 2024
3a246bd
Move overmap visualization to editor
snipercup Oct 12, 2024
6188c87
Set overmaparea
snipercup Oct 12, 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
66 changes: 48 additions & 18 deletions Mods/Core/Furniture/Furniture.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"Generichouse",
"Generichouse_00",
"RockyHill_SW",
"abandoned_building"
"abandoned_building",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -52,7 +53,9 @@
"Generichouse",
"Generichouse_00",
"RockyHill_SW",
"abandoned_building"
"abandoned_building",
"RockyHill_NE",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -89,7 +92,8 @@
"generichouse_cross",
"generichouse_t",
"Generichouse",
"Generichouse_00"
"Generichouse_00",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -129,7 +133,12 @@
"Generichouse_00",
"field_grass_basic_00",
"RockyHill_SE",
"RockyHill_SW"
"RockyHill_SW",
"RockyHill_NE",
"generichouse_end",
"RockyHill_NW",
"urbanroad",
"urbanroad_cross"
]
}
},
Expand Down Expand Up @@ -166,7 +175,11 @@
"forest_basic_00",
"field_grass_basic_00",
"RockyHill_SE",
"RockyHill_SW"
"RockyHill_SW",
"generichouse_end",
"RockyHill_NW",
"urbanroad",
"urbanroad_cross"
]
}
},
Expand Down Expand Up @@ -205,7 +218,12 @@
"Generichouse_00",
"field_grass_basic_00",
"RockyHill_SE",
"RockyHill_SW"
"RockyHill_SW",
"RockyHill_NE",
"generichouse_end",
"RockyHill_NW",
"urbanroad",
"urbanroad_cross"
]
}
},
Expand Down Expand Up @@ -239,7 +257,8 @@
"generichouse_corner",
"generichouse_cross",
"generichouse_t",
"store_groceries"
"store_groceries",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -277,7 +296,8 @@
"store_electronic_clothing",
"Generichouse",
"Generichouse_00",
"store_groceries"
"store_groceries",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -307,7 +327,8 @@
"generichouse_t",
"Generichouse",
"Generichouse_00",
"RockyHill_SW"
"RockyHill_SW",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -348,7 +369,8 @@
"generichouse_t",
"Generichouse",
"Generichouse_00",
"RockyHill_SW"
"RockyHill_SW",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -384,7 +406,8 @@
"generichouse_cross",
"generichouse_t",
"Generichouse",
"Generichouse_00"
"Generichouse_00",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -425,7 +448,8 @@
"generichouse_cross",
"generichouse_t",
"Generichouse",
"Generichouse_00"
"Generichouse_00",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -463,7 +487,8 @@
"store_electronic_clothing",
"Generichouse",
"Generichouse_00",
"store_groceries"
"store_groceries",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -503,7 +528,8 @@
"store_electronic_clothing",
"Generichouse",
"Generichouse_00",
"store_groceries"
"store_groceries",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -668,7 +694,8 @@
"Generichouse_00",
"store_electronic_clothing",
"RockyHill_SW",
"store_groceries"
"store_groceries",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -1133,7 +1160,8 @@
"Generichouse_00",
"generichouse_corner",
"store_electronic_clothing",
"store_groceries"
"store_groceries",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -1161,7 +1189,8 @@
"core": {
"maps": [
"store_electronic_clothing",
"store_groceries"
"store_groceries",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -1198,7 +1227,8 @@
"generichouse_corner",
"generichouse_t",
"store_electronic_clothing",
"store_groceries"
"store_groceries",
"generichouse_end"
]
}
},
Expand Down
13 changes: 11 additions & 2 deletions Mods/Core/Itemgroups/Itemgroups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@
"wall_shelf"
],
"maps": [
"store_groceries"
"store_groceries",
"generichouse_end"
]
}
},
Expand Down Expand Up @@ -886,7 +887,15 @@
"field_grass_basic_00",
"field_grass_flowers_00",
"RockyHill_SE",
"RockyHill_SW"
"RockyHill_SW",
"field_grass_hill_00",
"field_grass_hole_00",
"RockyHill_NE",
"RockyHill_NW",
"urbanroad",
"urbanroad_corner",
"urbanroad_cross",
"urbanroad_t"
]
}
},
Expand Down
9 changes: 9 additions & 0 deletions Mods/Core/Maps/Generichouse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,12 @@
"Urban",
"City"
],
"connections": {
"east": "road",
"north": "ground",
"south": "ground",
"west": "road"
},
"description": "A standard house layout suitable for various scenarios.",
"id": "Generichouse",
"levels": [
Expand Down Expand Up @@ -38350,6 +38356,9 @@
"name": "Generic House",
"references": {
"core": {
"overmapareas": [
"city"
],
"tacticalmaps": [
"DefaultTacticalMap.json"
]
Expand Down
Loading