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.

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

feat: add oldwest-style buildings #89

Merged
merged 41 commits into from
Oct 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
9e0cef9
feat: add oldwest-style residential houses
jdrueckert Aug 3, 2020
dba9315
Merge branch 'develop' into feat/oldwest-buildings
jdrueckert Aug 3, 2020
42c1adc
feat: Add Jail structure template
skaldarnar Aug 6, 2020
056252d
feat: Set no construction animation for residential houses
skaldarnar Aug 6, 2020
2d93c18
feat: Add Saloon building
skaldarnar Aug 11, 2020
930a59c
Merge branch 'develop' into feat/oldwest-buildings
skaldarnar Jun 10, 2021
d55f501
Merge branch 'develop' into feat/oldwest-buildings
skaldarnar Aug 15, 2021
c802a06
feat: add another residential house
jdrueckert Aug 16, 2021
9a35e06
Update residentialHouse.prefab
jdrueckert Aug 16, 2021
62d2d33
Merge branch 'develop' into feat/oldwest-buildings
skaldarnar Aug 26, 2021
3f49e2d
fix: split residential houses, correct sizes
jdrueckert Aug 31, 2021
9249a65
fix: ST extents
jdrueckert Sep 1, 2021
b91b41a
fix: ST extents
jdrueckert Sep 1, 2021
a386629
fix: update extents
jdrueckert Sep 1, 2021
3a4ed0e
fix: update extents
jdrueckert Sep 1, 2021
3f43fb5
fix: ST extents, add outer decor
jdrueckert Sep 1, 2021
8bdbbc8
fix: ST height extent
jdrueckert Sep 1, 2021
33501b5
chore: use non-square extents
jdrueckert Sep 1, 2021
519b04e
chore: use non-square extents
jdrueckert Sep 1, 2021
632fdd4
chore: use non-square extents
jdrueckert Sep 1, 2021
15ac84d
feat: improve architecture, fix ST extents
jdrueckert Sep 1, 2021
e9a1001
feat: add outer decor
jdrueckert Sep 1, 2021
fec7703
feat: add residential house 4
jdrueckert Sep 1, 2021
896ae0b
feat: add building prefab for residential house 4
jdrueckert Sep 1, 2021
ada8295
feat: add house 4 to culture
jdrueckert Sep 1, 2021
18efff3
feat: add torches
jdrueckert Sep 1, 2021
155d8ea
feat: add old west church
jdrueckert Sep 1, 2021
34781c6
chore: rename to oldWestChurch
jdrueckert Sep 1, 2021
154b3d0
feat: add non-generated church building prefab
jdrueckert Sep 1, 2021
328879d
feat: add church building to culture
jdrueckert Sep 1, 2021
807d952
fix: ST extents of church
jdrueckert Sep 1, 2021
6ced910
feat: add water tower templates (2 variants)
skaldarnar Sep 1, 2021
f3245ab
feat: add water towers as utility buildings
skaldarnar Sep 1, 2021
aeb6ebd
tweak: add "utility" zone to more districts
skaldarnar Sep 1, 2021
18f9660
fix: ST extents for res house 1
jdrueckert Sep 1, 2021
23c2792
fix: ST extents for res house 2
jdrueckert Sep 1, 2021
e8ec086
feat: add inner decor, fix ST extents for res house 3
jdrueckert Sep 1, 2021
2fd3438
fix: ST extents for res house 4
jdrueckert Sep 1, 2021
f0b9ae9
fix: correct building size
jdrueckert Sep 1, 2021
1168be1
fix: allow only a single citizen in res house 3
jdrueckert Sep 1, 2021
4496f5e
Merge branch 'develop' into feat/oldwest-buildings
jdrueckert Oct 1, 2021
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
13 changes: 13 additions & 0 deletions assets/prefabs/buildings/Saloon.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"GenericBuilding": {
"name": "Saloon",
"templateNames": ["MetalRenegades:oldWestSaloonTemplate"],
"zone": "COMMERCIAL",
"minSize": [21, 17],
"maxSize": [21, 17],
"isEntity": true
},
"SimpleSource": {
"needType": "FOOD"
}
}
12 changes: 12 additions & 0 deletions assets/prefabs/buildings/church.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"GenericBuilding" : {
"name" : "Church",
"templateNames": [
"MetalRenegades:oldWestChurch"
],
"zone" : "CLERICAL",
"minSize" : [15, 21],
"maxSize" : [15, 21],
"isEntity" : true
}
}
11 changes: 11 additions & 0 deletions assets/prefabs/buildings/jail.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"GenericBuilding" : {
"name" : "Jail",
"templateNames" : ["MetalRenegades:oldWestJailTemplate"],
"zone" : "GOVERNMENTAL",
"minSize" : [16, 19],
"maxSize" : [16, 19],
"isEntity" : true
}
}

16 changes: 0 additions & 16 deletions assets/prefabs/buildings/residentialHouse.prefab

This file was deleted.

18 changes: 18 additions & 0 deletions assets/prefabs/buildings/residentialHouse1.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"GenericBuilding": {
"name": "House1",
"templateNames": [
"MetalRenegades:oldwestResidentialHouse1"
],
"zone": "RESIDENTIAL",
"minSize": [17, 17],
"maxSize": [17, 17],
"isEntity": true
},
"PotentialHome": {
"maxCitizens": 2
},
"SimpleSource": {
"needType": "REST"
}
}
18 changes: 18 additions & 0 deletions assets/prefabs/buildings/residentialHouse2.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"GenericBuilding": {
"name": "House2",
"templateNames": [
"MetalRenegades:oldwestResidentialHouse2"
],
"zone": "RESIDENTIAL",
"minSize": [14, 15],
"maxSize": [14, 15],
"isEntity": true
},
"PotentialHome": {
"maxCitizens": 2
},
"SimpleSource": {
"needType": "REST"
}
}
18 changes: 18 additions & 0 deletions assets/prefabs/buildings/residentialHouse3.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"GenericBuilding": {
"name": "House3",
"templateNames": [
"MetalRenegades:oldwestResidentialHouse3"
],
"zone": "RESIDENTIAL",
"minSize": [14, 12],
"maxSize": [14, 12],
"isEntity": true
},
"PotentialHome": {
"maxCitizens": 1
},
"SimpleSource": {
"needType": "REST"
}
}
18 changes: 18 additions & 0 deletions assets/prefabs/buildings/residentialHouse4.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"GenericBuilding": {
"name": "House4",
"templateNames": [
"MetalRenegades:oldwestResidentialHouse4"
],
"zone": "RESIDENTIAL",
"minSize": [14, 15],
"maxSize": [14, 15],
"isEntity": true
},
"PotentialHome": {
"maxCitizens": 1
},
"SimpleSource": {
"needType": "REST"
}
}
474 changes: 474 additions & 0 deletions assets/prefabs/buildings/templates/oldWestChurch.prefab

Large diffs are not rendered by default.

366 changes: 366 additions & 0 deletions assets/prefabs/buildings/templates/oldWestJailTemplate.prefab

Large diffs are not rendered by default.

822 changes: 822 additions & 0 deletions assets/prefabs/buildings/templates/oldWestSaloonTemplate.prefab

Large diffs are not rendered by default.

549 changes: 549 additions & 0 deletions assets/prefabs/buildings/templates/oldwestResidentialHouse1.prefab

Large diffs are not rendered by default.

448 changes: 448 additions & 0 deletions assets/prefabs/buildings/templates/oldwestResidentialHouse2.prefab

Large diffs are not rendered by default.

375 changes: 375 additions & 0 deletions assets/prefabs/buildings/templates/oldwestResidentialHouse3.prefab

Large diffs are not rendered by default.

296 changes: 296 additions & 0 deletions assets/prefabs/buildings/templates/oldwestResidentialHouse4.prefab

Large diffs are not rendered by default.

249 changes: 249 additions & 0 deletions assets/prefabs/buildings/templates/waterTower1Template.prefab

Large diffs are not rendered by default.

217 changes: 217 additions & 0 deletions assets/prefabs/buildings/templates/waterTower2Template.prefab

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions assets/prefabs/buildings/waterTower1.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"GenericBuilding": {
"name": "WaterTower1",
"templateNames" : ["MetalRenegades:waterTower1Template"],
"zone": "UTILITY",
"minSize": [8, 10],
"maxSize": [8, 10],
"isEntity": true
},
"SimpleSource": {
"needType": "WATER"
}
}
13 changes: 13 additions & 0 deletions assets/prefabs/buildings/waterTower2.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"GenericBuilding": {
"name": "WaterTower2",
"templateNames" : ["MetalRenegades:waterTower2Template"],
"zone": "UTILITY",
"minSize": [8, 10],
"maxSize": [8, 10],
"isEntity": true
},
"SimpleSource": {
"needType": "WATER"
}
}
37 changes: 30 additions & 7 deletions assets/prefabs/cultures/default.prefab
Original file line number Diff line number Diff line change
@@ -1,9 +1,32 @@
{
"Culture" : {
"name" : "develop clan",
"buildingNeedPerZone" : {"UTILITY" : 0.08, "GOVERNMENTAL" : 0.5, "CLERICAL" : 0.5, "RESIDENTIAL" : 1.1, "COMMERCIAL" : 0.7, "AGRICULTURE": 0.2},
"growthRate" : 8,
"availableBuildings" : ["Marketplace", "House", "SimpleChurch", "blacksmith", "Townhall", "Well", "Farm"],
"residentialZones" : ["RESIDENTIAL"]
}
"Culture": {
"name": "develop clan",
"buildingNeedPerZone": {
"AGRICULTURE": 0.2,
"CLERICAL": 0.5,
"COMMERCIAL": 0.7,
"GOVERNMENTAL": 0.5,
"RESIDENTIAL": 3,
"UTILITY": 0.08
},
"growthRate": 8,
"availableBuildings": [
"blacksmith",
"Church",
"Farm",
"House1",
"House2",
"House3",
"House3",
"Jail",
"Marketplace",
"Saloon",
"SimpleChurch",
"Townhall",
"Well",
"WaterTower1",
"WaterTower2"
],
"residentialZones": ["RESIDENTIAL"]
}
}
2 changes: 1 addition & 1 deletion assets/prefabs/districts/commercial.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"DistrictType" : {
"name" : "commercial",
"color" : 74234,
"zones" : ["COMMERCIAL", "AGRICULTURE"]
"zones" : ["COMMERCIAL", "AGRICULTURE", "UTILITY"]
}
}
2 changes: 1 addition & 1 deletion assets/prefabs/districts/residential.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"DistrictType" : {
"name" : "residential",
"color" : 435324,
"zones" : ["RESIDENTIAL"]
"zones" : ["RESIDENTIAL", "UTILITY"]
}
}
4 changes: 4 additions & 0 deletions module.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@
"id": "SimpleFarming",
"minVersion": "2.1.0"
},
{
"id": "Soils",
"minVersion": "1.0.0"
},
{
"id": "StructureTemplates",
"minVersion": "1.0.0"
Expand Down