-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop' into develop
- Loading branch information
Showing
4 changed files
with
52 additions
and
50 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -58,8 +58,6 @@ state = { | |
| 9340 = { | ||
| naval_base = 3 | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,29 @@ | ||
| state={ | ||
| id=32 | ||
| name="STATE_32" | ||
| state = { | ||
| id = 32 | ||
| name = "STATE_32" | ||
| manpower = 1307500 | ||
| state_category=town | ||
| provinces={ 762 780 3589 3768 6784 11713 } | ||
| resources={ | ||
| wood=0 | ||
| aluminium=45 | ||
| steel=85 | ||
| } | ||
| history={ | ||
| victory_points={ 3768 1 } | ||
| owner=FRA | ||
| add_core_of=FRA | ||
| 1936.1.1={ | ||
| owner=FRA | ||
| add_core_of=FRA | ||
| victory_points={ 3768 1 } | ||
| buildings={ | ||
| infrastructure=4 | ||
| } | ||
| } | ||
| buildings={ | ||
| infrastructure=4 | ||
| industrial_complex=1 | ||
| state_category = town | ||
| provinces = { 762 780 3589 3768 6784 11713 } | ||
| resources = { | ||
| wood = 0 | ||
| aluminium = 45 | ||
| steel = 85 | ||
| } | ||
| history = { | ||
| victory_points = { 3768 1 } | ||
| owner = FRA | ||
| add_core_of = FRA | ||
| 1936.1.1 = { | ||
| owner = FRA | ||
| add_core_of = FRA | ||
| victory_points = { 3768 1 } | ||
| buildings = { | ||
| infrastructure = 4 | ||
| } | ||
| } | ||
| buildings = { | ||
| infrastructure = 4 | ||
| industrial_complex = 1 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,33 @@ | ||
| state={ | ||
| id=40 | ||
| name="STATE_40" # Barnaul | ||
| state = { | ||
| id = 40 | ||
| name = "STATE_40" # Barnaul | ||
| manpower = 2107451 | ||
| state_category=large_town | ||
| provinces={ 1297 1779 1794 1797 4803 7680 10537 10546 11410 12515 12528 12613 } | ||
| resources={ | ||
| wood=0 | ||
| } | ||
| history={ | ||
| owner=RUS | ||
| add_core_of=RUS | ||
| 1936.1.1={ | ||
| owner=SOV | ||
| add_core_of=SOV | ||
| buildings={ | ||
| infrastructure=2 | ||
| industrial_complex=1 | ||
| } | ||
| state_category = large_town | ||
| provinces = { 1297 1779 1794 1797 4803 7680 10537 10546 11410 12515 12528 12613 } | ||
| resources = { | ||
| wood = 0 | ||
| } | ||
| history = { | ||
| owner = RUS | ||
| add_core_of = RUS | ||
| 1936.1.1 = { | ||
| owner = SOV | ||
| add_core_of = SOV | ||
| buildings = { | ||
| infrastructure = 2 | ||
| industrial_complex = 1 | ||
| } | ||
| 1939.1.1={ buildings={ industrial_complex=2 } } | ||
| buildings={ | ||
| infrastructure=2 | ||
| } | ||
| 1939.1.1 = { | ||
| buildings = { | ||
| industrial_complex = 2 | ||
| } | ||
| } | ||
| buildings = { | ||
| infrastructure = 2 | ||
| } | ||
| 1919.1.1 = { | ||
| add_core_of = SOV | ||
| } | ||
| } | ||
| } | ||
| } |