Skip to content

Commit

Permalink
fix: replace the UniqueComponentTag string with the ComponentGroupTag…
Browse files Browse the repository at this point in the history
… object that specifies its own limit on installable components

resolve #455
  • Loading branch information
PavelZinchenko committed Sep 3, 2024
1 parent 1546092 commit e5606bc
Show file tree
Hide file tree
Showing 116 changed files with 922 additions and 141 deletions.
2 changes: 1 addition & 1 deletion Assets/Modules/Database/.Editor
Submodule .Editor updated 34 files
+4 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/DataModel/BulletTrigger.cs
+53 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/DataModel/ComponentGroupTag.cs
+3 −3 DatabaseModel/DatabaseModel/GeneratedEditorCode/DataModel/ComponentRestrictions.cs
+3 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/DataModel/Ship.cs
+3 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/DataModel/ShipSettings.cs
+4 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/DataModel/Technology.cs
+6 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/DataModel/VisualEffectElement.cs
+21 −1 DatabaseModel/DatabaseModel/GeneratedEditorCode/Database.cs
+2 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/Enums/ImpactEffectType.cs
+1 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/Enums/ItemType.cs
+17 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/Enums/ToggleState.cs
+1 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/Enums/VisualEffectType.cs
+1 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/Serializable/BulletTrigger.cs
+21 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/Serializable/ComponentGroupTag.cs
+2 −1 DatabaseModel/DatabaseModel/GeneratedEditorCode/Serializable/ComponentRestrictions.cs
+1 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/Serializable/Ship.cs
+1 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/Serializable/ShipSettings.cs
+1 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/Serializable/Technology.cs
+2 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/Serializable/VisualEffectElement.cs
+12 −0 DatabaseModel/DatabaseModel/GeneratedEditorCode/Storage/DatabaseContent.cs
+8 −2 DatabaseModel/DatabaseModel/GeneratedMigrationCode/DatabaseUpgrader.cs
+2 −0 DatabaseModel/DatabaseModel/GeneratedMigrationCode/v1/Enums/ImpactEffectType.cs
+1 −0 DatabaseModel/DatabaseModel/GeneratedMigrationCode/v1/Enums/ItemType.cs
+17 −0 DatabaseModel/DatabaseModel/GeneratedMigrationCode/v1/Enums/ToggleState.cs
+1 −0 DatabaseModel/DatabaseModel/GeneratedMigrationCode/v1/Enums/VisualEffectType.cs
+1 −0 DatabaseModel/DatabaseModel/GeneratedMigrationCode/v1/Serializable/BulletTrigger.cs
+27 −0 DatabaseModel/DatabaseModel/GeneratedMigrationCode/v1/Serializable/ComponentGroupTag.cs
+2 −1 DatabaseModel/DatabaseModel/GeneratedMigrationCode/v1/Serializable/ComponentRestrictions.cs
+1 −0 DatabaseModel/DatabaseModel/GeneratedMigrationCode/v1/Serializable/Ship.cs
+1 −0 DatabaseModel/DatabaseModel/GeneratedMigrationCode/v1/Serializable/ShipSettings.cs
+1 −0 DatabaseModel/DatabaseModel/GeneratedMigrationCode/v1/Serializable/Technology.cs
+2 −0 DatabaseModel/DatabaseModel/GeneratedMigrationCode/v1/Serializable/VisualEffectElement.cs
+9 −0 DatabaseModel/DatabaseModel/GeneratedMigrationCode/v1/Storage/DatabaseContent.cs
+108 −0 DatabaseModel/DatabaseModel/Migration/v1/DatabaseUpgrader_6_7.cs
1 change: 1 addition & 0 deletions Assets/Modules/Database/.Schema/v1/Enums/ItemType.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<item name="StatUpgradeTemplate" value="32" />
<item name="FrontierLevel" value="33" />
<item name="FrontierCommonLevel" value="34" />
<item name="ComponentGroupTag" value="35" />

<item name="ShipSettings" value="100" />
<item name="GalaxySettings" value="101" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<data name="ComponentGroupTag" type="object" typeid="ComponentGroupTag" >
<member name="MaxInstallableComponents" type="int" minvalue="1" />
</data>
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<member name="ShipSizes" type="enum_flags" typeid="SizeClass" />
<member name="NotForOrganicShips" type="bool" />
<member name="NotForMechanicShips" type="bool" />
<member name="UniqueComponentTag" type="string" />
<member name="MaxComponentAmount" type="int" minvalue="0" />
<member name="ComponentGroupTag" type="object" typeid="ComponentGroupTag" />

<member name="UniqueComponentTag" type="string" options="obsolete" />
</data>
2 changes: 1 addition & 1 deletion Assets/Modules/Database/.Schema/versions.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<schema>
<version name="v1" major="1" minor="6" />
<version name="v1" major="1" minor="7" />
</schema>
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"Layout": "100100100",
"CellType": "5",
"DeviceId": 1,
"Restrictions": {
"ComponentGroupTag": 1
},
"PossibleModifications": [
2,
1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"Layout": "100100100",
"CellType": "5",
"DeviceId": 1,
"Restrictions": {
"ComponentGroupTag": 1
},
"PossibleModifications": [
2,
1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"Layout": "1100",
"CellType": "5",
"DeviceId": 2,
"Restrictions": {
"ComponentGroupTag": 2
},
"PossibleModifications": [
2,
1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
2,
3
],
"UniqueComponentTag": "camouflage"
"ComponentGroupTag": 3
},
"PossibleModifications": [
2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
2,
3
],
"UniqueComponentTag": "camouflage"
"ComponentGroupTag": 3
},
"PossibleModifications": [
2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"Layout": "1111",
"CellType": "2",
"DeviceId": 3,
"Restrictions": {
"ComponentGroupTag": 4
},
"PossibleModifications": [
2,
1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"Layout": "1111",
"CellType": "2",
"DeviceId": 5,
"Restrictions": {
"ComponentGroupTag": 5
},
"PossibleModifications": [
2,
7,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"Layout": "1100",
"CellType": "2",
"DeviceId": 4,
"Restrictions": {
"ComponentGroupTag": 6
},
"PossibleModifications": [
6,
2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"Layout": "101111101",
"CellType": "2",
"DeviceId": 6,
"Restrictions": {
"ComponentGroupTag": 7
},
"PossibleModifications": [
15,
1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"Layout": "010111000",
"CellType": "2",
"DeviceId": 7,
"Restrictions": {
"ComponentGroupTag": 8
},
"PossibleModifications": [
2,
1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"Layout": "111010000",
"CellType": "2",
"DeviceId": 8,
"Restrictions": {
"ComponentGroupTag": 7
},
"PossibleModifications": [
2,
1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"Layout": "111111111",
"CellType": "2",
"DeviceId": 9,
"Restrictions": {
"ComponentGroupTag": 9
},
"PossibleModifications": [
2,
1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
2,
3
],
"UniqueComponentTag": "safeguard"
"ComponentGroupTag": 10
},
"PossibleModifications": [
1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"Layout": "000010111",
"CellType": "2",
"DeviceId": 10,
"Restrictions": {
"ComponentGroupTag": 11
},
"PossibleModifications": [
2,
7,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"Layout": "1111",
"CellType": "2",
"DeviceId": 11,
"Restrictions": {
"ComponentGroupTag": 12
},
"PossibleModifications": [
2,
7,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"Layout": "1",
"CellType": "2",
"DeviceId": 12,
"Restrictions": {
"ComponentGroupTag": 12
},
"PossibleModifications": [
2,
7,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"Layout": "101111101",
"CellType": "2",
"DeviceId": 13,
"Restrictions": {
"ComponentGroupTag": 13
},
"PossibleModifications": [
2,
1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"Layout": "1100",
"CellType": "2",
"DeviceId": 14,
"Restrictions": {
"ComponentGroupTag": 13
},
"PossibleModifications": [
2,
1,
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ItemType": 35,
"Id": 1,
"MaxInstallableComponents": 1
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ItemType": 35,
"Id": 2,
"MaxInstallableComponents": 1
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ItemType": 35,
"Id": 3,
"MaxInstallableComponents": 1
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ItemType": 35,
"Id": 4,
"MaxInstallableComponents": 1
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ItemType": 35,
"Id": 5,
"MaxInstallableComponents": 1
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ItemType": 35,
"Id": 6,
"MaxInstallableComponents": 1
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ItemType": 35,
"Id": 7,
"MaxInstallableComponents": 1
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ItemType": 35,
"Id": 8,
"MaxInstallableComponents": 1
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ItemType": 35,
"Id": 9,
"MaxInstallableComponents": 1
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ItemType": 35,
"Id": 11,
"MaxInstallableComponents": 1
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ItemType": 35,
"Id": 12,
"MaxInstallableComponents": 1
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ItemType": 35,
"Id": 10,
"MaxInstallableComponents": 1
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e5606bc

Please sign in to comment.