Skip to content

Commit

Permalink
Merge branch 'Update' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Wolferos committed Jun 15, 2017
2 parents ab698b5 + 5554589 commit 20ce665
Show file tree
Hide file tree
Showing 93 changed files with 640 additions and 12 deletions.
19 changes: 14 additions & 5 deletions mod/thegreatwar/common/national_focus/uk.txt
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,14 @@ focus_tree = {
prerequisite = { focus=ENG_ww1_liberate_policy }
icon = GFX_goal_generic_forceful_treaty
available = {
NOT={ country_exists=EGY }
# Open Beta 0.3.1
EGY = {
exists = yes
is_puppet_of = ENG
}
}
completion_reward = {
release = EGY
end_puppet = EGY
}
ai_will_do = { factor = 0 }
cost = 10
Expand Down Expand Up @@ -687,14 +691,19 @@ focus_tree = {
TUR={
has_war_with=ENG
}
ENG={
controls_state=453
}
not={
HJZ={
has_war_with=ENG
}
}

# Open Beta 0.3.1
EGY = {
exists = yes
is_puppet_of = ENG
}


date>1917.1.1
date<1925.12.30
}
Expand Down
Binary file modified mod/thegreatwar/gfx/interface/pdx_int_logo.dds
Binary file not shown.
3 changes: 2 additions & 1 deletion mod/thegreatwar/history/states/273-Italian Africa.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ state={
name="STATE_273" # Libyan Desert
manpower = 42633
state_category=wasteland
impassable = yes
# Open Beta 0.3.1 - Removed temporary due to bugs - Waiting an answer/fix from Paradox
# impassable = yes
provinces={ 1060 1140 4962 5004 7985 10754 10785 10884 11951 12022 12082 12866 }
resources={
wood=0
Expand Down
3 changes: 2 additions & 1 deletion mod/thegreatwar/history/states/514-North Africa.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ state={
name="STATE_514" # Algerian Desert
manpower = 207733
state_category=wasteland
impassable = yes
# Open Beta 0.3.1 - Removed temporary due to bugs - Waiting an answer/fix from Paradox
# impassable = yes
provinces={ 1043 1095 1901 1958 2049 4903 5035 5095 7041 8061 8077 8088 10731 10749 12711 12842 12849 }
resources={
wood=0
Expand Down
3 changes: 2 additions & 1 deletion mod/thegreatwar/history/states/515-Central Africa.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ state={
name="STATE_515"
manpower=1482744
state_category=wasteland
impassable = yes
# Open Beta 0.3.1 - Removed temporary due to bugs - Waiting an answer/fix from Paradox
# impassable = yes
buildings_max_level_factor=1.000
#provinces={ 1473 1956 2068 3123 4897 4902 4913 4978 5136 7939 8028 8128 10758 10780 10805 10893 10917 13138 }
provinces={ 1956 2068 4902 4913 5136 7939 8028 8128 10758 10780 10805 10893 10917 13138 }
Expand Down
3 changes: 2 additions & 1 deletion mod/thegreatwar/history/states/552-Western Egypt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ state={
name="STATE_552"
manpower = 26539
state_category=wasteland
impassable = yes
# Open Beta 0.3.1 - Removed temporary due to bugs - Waiting an answer/fix from Paradox
# impassable = yes
provinces={ 992 1143 2064 4138 4961 5078 7117 7148 7216 7987 8103 10127 10869 10900 10907 12033 12091 12099 12733 12764 12816 12836 }
resources={
wood=0
Expand Down
3 changes: 2 additions & 1 deletion mod/thegreatwar/history/states/557-Dakar.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ state={
name="STATE_557" # Mauritania
manpower = 429200
state_category=wasteland
impassable = yes
# Open Beta 0.3.1 - Removed temporary due to bugs - Waiting an answer/fix from Paradox
# impassable = yes
provinces={ 1115 1897 1962 5034 5077 7943 7992 8035 8058 10725 10779 10814 10838 10868 }
resources={
wood=0
Expand Down
7 changes: 5 additions & 2 deletions mod/thegreatwar/history/states/754-BritishLibya.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@ state={
name="STATE_754"
manpower=10000
state_category=wasteland
impassable = yes
# Open Beta 0.3.1 - Removed temporary due to bugs - Waiting an answer/fix from Paradox
# impassable = yes
provinces={ 4191 1994 1057 10104 }
resources={
wood=0
}
history={
owner=TUR
1936.1.1={ owner=ITA }
1914.1.1 = {
owner = ITA
}
buildings={
infrastructure=0
}
Expand Down
Binary file added mod/thegreatwar/sound/auh/de_Idle_001.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_002.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_003.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_004.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_005.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_006.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_010.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_011.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_012.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_016.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_017.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_018.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_019.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_020.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_021.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_022.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_023.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_024.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_025.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_026.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Idle_027.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_001.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_002.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_003.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_004.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_005.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_006.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_007.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_008.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_009.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_010.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_011.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_012.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_013.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_014.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_015.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_016.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_017.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_018.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_019.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_020.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Neutral_021.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_001.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_002.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_003.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_007.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_008.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_009.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_010.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_011.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_012.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_013.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_014.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_015.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_016.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_017.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_018.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_019.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_020.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_021.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_022.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_023.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Positive_024.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_001.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_002.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_003.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_004.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_005.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_006.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_007.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_008.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_009.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_010.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_011.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_012.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_013.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_014.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_015.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_016.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_016_alt.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_017.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_017_alt.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_018.wav
Binary file not shown.
Binary file added mod/thegreatwar/sound/auh/de_Retreat_018_alt.wav
Binary file not shown.
Loading

0 comments on commit 20ce665

Please sign in to comment.