Skip to content

Commit a275d3d

Browse files
Merge pull request #2054 from EaW-Team/general-dev
4.4.1.1
2 parents 26b2edf + 990d4ea commit a275d3d

File tree

669 files changed

+13835
-4231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

669 files changed

+13835
-4231
lines changed

changelog.txt

Lines changed: 129 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,133 @@
1-
🐱 “Cats and Dogs” 2.4.1 🐶
1+
🐱 “Cats and Dogs” 2.4.1.1 🐶
2+
✢ Additions:
3+
- Added news events for the outcome of the Arabian Civil War.
4+
- Abyssinia:
5+
- New concern icons.
6+
- Baltimare:
7+
- New portrait and icon for Mayor Ash Moustache.
8+
- Bronzehill:
9+
- Added an event each about Ignatius and Barnaby for Softfur's, Steelpaw's and Loudbark's paths.
10+
- Flowena:
11+
- New portrait for Nicolas de Charbon.
12+
- Jaki-Clan:
13+
- New GFX icons.
14+
15+
✢ Changes:
16+
- Merged two hyena cultures into one.
17+
- Merged Zebridean and South Zebrican cultures into East Zebrican culture.
18+
- Replaced a number of black sun focus icons with viking-themed icons.
19+
- Changed start years of racial technologies.
20+
- Reduced global special forces attack factor by 30% from doctrines.
21+
- Strengthened racial doctrine tree with various small tweaks.
22+
- Starting carriers now actually use primitive armor.
23+
- Updated AI generic ship templates.
24+
- Griffon countries can now form Aquileia and Evi after forming the Griffonian Empire.
25+
- Boltria and Central Zebrican Empire now start with the Legacy of the Storm national spirit.
26+
- Tactical nuclear strike is now quicker to prepare.
27+
- Strengthened lategame SHTs on bad terrain.
28+
- Changed research year of the pegasus void suit.
29+
- Updated what models cities use across the world.
30+
- Adjusted VP values and state categories.
31+
- Added more urban terrain across the map.
32+
- Increased population of Melahaka, Tanaigha and Zongo.
33+
- Adjusted garrison requirements for occupation laws.
34+
- Changed access rules for Zebrican straits.
35+
- Abyssinia:
36+
- Industrial meat production racial technology now improves the food situation.
37+
- Chiropterra:
38+
- Increased size of starting fleet, but made it more outdated.
39+
- Moved a province to another strategic region.
40+
- Added a naval base and a victory point.
41+
- Separated submarines from the line navy.
42+
- Made AI pursue integration of Tobuck faster.
43+
- AI should rush Zarantia.
44+
- Chiropterra gets less naval bombers but a few medium planes.
45+
- Chiropterra gets back CV naval bombers.
46+
- Strengthened naval templates.
47+
- Increased numbers of 2nd tier submarines.
48+
- Added night fighting from the start.
49+
- Made Chiropterran AI delay the North Zebrican War if Colthage is not yet ready to fight.
50+
- Colthage:
51+
- Coltvan revolt now only triggers if Colthage controls three Coltvan states instead of just one.
52+
- Free Camel Tribes:
53+
- Now starts with slave economy.
54+
- Reduced level of Legacy of the Storm national spirit.
55+
- Hippogriffia:
56+
- Gave them a panzerschiff.
57+
- Fixed inconsistencies between no-MtG and MtG navies.
58+
- AI should defend the isles if an enemy landed there.
59+
- Increased number of airwings on the carrier.
60+
- Decision to devastate coastal cities now damages the Cothon landmark in Colthage.
61+
- Kiria:
62+
- Removed the "Dominion of the Tricolor Plumage".
63+
- Olenia:
64+
- Cleaned up terrain textures so they match the terrain of the provinces more.
65+
- Zongo:
66+
- Increased society development level and changed starting laws.
67+
- Added more factories.
68+
- Added two victory points.
69+
70+
✢ Fixes:
71+
- Fixed ASROC module icon.
72+
- Fixed issues with 3D models for new buildings.
73+
- Fixed wrong equipment being marked as obsolete for Changelings and Stalliongrad.
74+
- Improved AI war preparation logic for the North Zebrican war.
75+
- Disabled core removal for Colthage and Abyssinia civil war factions as it was causing issues.
76+
- Yak countries can no longer release each other.
77+
- Added various checks prevent subjects forming factions.
78+
- Fixed non-NSB SHT2 date.
79+
- Fixed bypasses in generic Griffonian and Zebrican focus trees.
80+
- Added checks so that subjects cannot start the North Zebrican War.
81+
- Abyssinia:
82+
- Fixed some missing tooltips.
83+
- Castanor:
84+
- Fixed a focus not declaring war on Ibhayiz.
85+
- Added a failsafe accounting for Kirian breakaways.
86+
- Celestial Resistance:
87+
- Fixed Epilogue Solarist leaders not promoting.
88+
- Chital:
89+
- Fixed a decision and an event not declaring war on Ibhayiz.
90+
- Colthage:
91+
- Fixed Zumidian referendum not warning Hippogriffia that it might result in a war.
92+
- Crystal Empire:
93+
- Fixed Changeling Crystal Protectorate losing their cosmetic tag randomly.
94+
- Griffonian Republic:
95+
- Can no longer declare war on the Griffonian Empire while being a subject.
96+
- Hippogriffia:
97+
- Decisions to devastate coastal cities now checks if the target countries are at war with Hippogriffia.
98+
- Peacedeal with Wingbardy no longer checks for nations not involved in the North Zebrican War.
99+
- Ibhayiz:
100+
- Fixed the country having wrong culture.
101+
- Fixed some generic decisions not being available.
102+
- Kiria:
103+
- Fixed some events not accounting for Ibhayiz's existence.
104+
- New Mareland:
105+
- Fixed a general having the wrong advisor icon.
106+
- Fixed a focus bypassing when it shouldn't.
107+
- Olenia:
108+
- Fixed a focus not declaring war on all Equus nations.
109+
- Polar Bear Communities:
110+
- Fixed not getting wargoals on both Nova Griffonia civil war countries.
111+
- Quaggatai:
112+
- Fixed missing advisor icon for Khan Zaghu.
113+
- Accounted for Colthage to lose their cores when forming the Kingdom of Quaggatai.
114+
- Stalliongrad:
115+
- Fixed Palace of the Soviets raid check.
116+
- Fixed loss of puppet status for puppets when joining the UPA.
117+
- Twizanyika:
118+
- Fixed unit names.
119+
- Fixed wrong operative portraits.
120+
- Warzena:
121+
- "Hippogriff Warzena" gets renamed back to Warzena if it is no longer a Hippogriffian puppet.
122+
- Yale:
123+
- Fixed an advisor icon being the wrong size.
124+
- Dehumanized some GFX.
125+
- Miscellaneous bugfixes and improvements.
126+
- Miscellaneous localisation fixes.
127+
128+
🐱 “Cats and Dogs” 2.4.1 🐶
2129
✢ Reworked starting setup for south-east Zebrica:
3-
- Replaced the Zuid-Zebrikanische Vrystaat with Imba-Zebu.
130+
- Replaced the Zuid-Zebrikanische Vrystaat with Imba-Zaru.
4131
- Replaced the Talonsvaal Republic with Tzhimane Confederacy.
5132
- Added a new country, Ibhayiz.
6133
- Twizanyika is now a hyena (diamond dog) country instead of giraffe.

common/ai_equipment/CHN_naval.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ CHN_destroyers = {
2121
}
2222

2323
destroyer_default = {
24-
name = angry_speedboat
2524
priority = {
2625
factor = 1
2726
modifier = {
@@ -910,7 +909,7 @@ CHN_naval_capital_battleship = {
910909
}
911910

912911
capital_battleship_basic_aa_upgrade = {
913-
history = yes
912+
914913
priority = {
915914
factor = 10
916915
modifier = {
@@ -951,7 +950,7 @@ CHN_naval_capital_battleship = {
951950
}
952951
}
953952
capital_battleship_improved = { #Bismarck
954-
history = yes
953+
955954
priority = {
956955
factor = 200
957956
}
@@ -1195,6 +1194,7 @@ CHN_naval_carrier = {
11951194
modules = {
11961195
fixed_ship_deck_slot_1 = ship_deck_space
11971196
fixed_ship_deck_slot_2 = ship_deck_space
1197+
fixed_ship_armor_slot = ship_cruiser_armor
11981198
fixed_ship_anti_air_slot = ship_anti_air
11991199
fixed_ship_engine_slot = cruiser_ship_engine_1
12001200
fixed_ship_secondaries_slot = empty
@@ -1211,6 +1211,7 @@ CHN_naval_carrier = {
12111211
ship_radar
12121212
ship_deck_space
12131213
ship_carrier_armor
1214+
ship_cruiser_armor
12141215
}
12151216
}
12161217

@@ -1224,13 +1225,15 @@ CHN_naval_carrier = {
12241225
}
12251226
role_icon_index = 7
12261227

1228+
history = yes
12271229
target_variant = {
12281230
match_value = 2000.0
12291231

12301232
type = ship_hull_carrier_1
12311233
modules = {
12321234
fixed_ship_deck_slot_1 = ship_deck_space
12331235
fixed_ship_deck_slot_2 = ship_deck_space
1236+
fixed_ship_armor_slot = ship_cruiser_armor
12341237
fixed_ship_anti_air_slot = ship_anti_air
12351238
fixed_ship_engine_slot = carrier_ship_engine_1
12361239
fixed_ship_secondaries_slot = empty
@@ -1246,6 +1249,7 @@ CHN_naval_carrier = {
12461249
ship_radar
12471250
ship_deck_space
12481251
ship_carrier_armor
1252+
ship_cruiser_armor
12491253
}
12501254
}
12511255

@@ -1264,6 +1268,7 @@ CHN_naval_carrier = {
12641268
modules = {
12651269
fixed_ship_deck_slot_1 = ship_deck_space
12661270
fixed_ship_deck_slot_2 = ship_deck_space
1271+
fixed_ship_armor_slot = ship_cruiser_armor
12671272
fixed_ship_anti_air_slot = ship_anti_air
12681273
fixed_ship_engine_slot = carrier_ship_engine
12691274
fixed_ship_secondaries_slot > empty
@@ -1280,6 +1285,7 @@ CHN_naval_carrier = {
12801285
ship_radar
12811286
ship_deck_space
12821287
ship_carrier_armor
1288+
ship_cruiser_armor
12831289
}
12841290
}
12851291
carrier_advanced = {
@@ -1297,6 +1303,7 @@ CHN_naval_carrier = {
12971303
modules = {
12981304
fixed_ship_deck_slot_1 = ship_deck_space
12991305
fixed_ship_deck_slot_2 = ship_deck_space
1306+
fixed_ship_armor_slot = ship_cruiser_armor
13001307
fixed_ship_anti_air_slot = ship_anti_air
13011308
fixed_ship_engine_slot = carrier_ship_engine
13021309
fixed_ship_secondaries_slot = ship_secondaries
@@ -1313,6 +1320,7 @@ CHN_naval_carrier = {
13131320
carrier_ship_engine
13141321
ship_radar
13151322
ship_carrier_armor
1323+
ship_cruiser_armor
13161324
}
13171325
}
13181326
}
@@ -1585,7 +1593,7 @@ CHN_naval_mine_layer = {
15851593

15861594

15871595
mine_layer_light = {
1588-
history = yes
1596+
15891597
priority = {
15901598
factor = 2
15911599
modifier = {

common/ai_equipment/EQS_naval.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2032,6 +2032,7 @@ EQS_naval_carrier = {
20322032
modules = {
20332033
fixed_ship_deck_slot_1 = ship_deck_space
20342034
fixed_ship_deck_slot_2 = ship_deck_space
2035+
fixed_ship_armor_slot = ship_cruiser_armor
20352036
fixed_ship_anti_air_slot = ship_anti_air_1
20362037
fixed_ship_radar_slot = empty
20372038
fixed_ship_engine_slot = heavy_ship_engine_1
@@ -2050,6 +2051,7 @@ EQS_naval_carrier = {
20502051
carrier_ship_engine
20512052
ship_radar
20522053
ship_carrier_armor
2054+
ship_cruiser_armor
20532055
}
20542056
}
20552057

@@ -2072,6 +2074,7 @@ EQS_naval_carrier = {
20722074
modules = {
20732075
fixed_ship_deck_slot_1 = ship_deck_space
20742076
fixed_ship_deck_slot_2 = ship_deck_space
2077+
fixed_ship_armor_slot = ship_cruiser_armor
20752078
fixed_ship_anti_air_slot = ship_anti_air
20762079
fixed_ship_radar_slot = empty
20772080
fixed_ship_engine_slot = heavy_ship_engine_1
@@ -2090,6 +2093,7 @@ EQS_naval_carrier = {
20902093
carrier_ship_engine
20912094
ship_radar
20922095
ship_carrier_armor
2096+
ship_cruiser_armor
20932097
}
20942098
}
20952099

@@ -2108,6 +2112,7 @@ EQS_naval_carrier = {
21082112
modules = {
21092113
fixed_ship_deck_slot_1 = ship_deck_space
21102114
fixed_ship_deck_slot_2 = ship_deck_space
2115+
fixed_ship_armor_slot = ship_cruiser_armor
21112116
fixed_ship_anti_air_slot = ship_anti_air_1
21122117
fixed_ship_engine_slot = carrier_ship_engine_2
21132118
fixed_ship_secondaries_slot = dp_ship_secondaries_2
@@ -2123,6 +2128,7 @@ EQS_naval_carrier = {
21232128
ship_radar
21242129
ship_deck_space
21252130
ship_carrier_armor
2131+
ship_cruiser_armor
21262132
}
21272133
}
21282134

@@ -2140,6 +2146,7 @@ EQS_naval_carrier = {
21402146
modules = {
21412147
fixed_ship_deck_slot_1 = ship_deck_space
21422148
fixed_ship_deck_slot_2 = ship_deck_space
2149+
fixed_ship_armor_slot = ship_cruiser_armor
21432150
fixed_ship_anti_air_slot = ship_anti_air
21442151
fixed_ship_engine_slot = carrier_ship_engine_3
21452152
fixed_ship_secondaries_slot = ship_dp_secondaries
@@ -2156,6 +2163,7 @@ EQS_naval_carrier = {
21562163
ship_radar
21572164
ship_deck_space
21582165
ship_carrier_armor
2166+
ship_cruiser_armor
21592167
}
21602168
}
21612169
carrier_advanced = {
@@ -2172,6 +2180,7 @@ EQS_naval_carrier = {
21722180
modules = {
21732181
fixed_ship_deck_slot_1 = ship_deck_space
21742182
fixed_ship_deck_slot_2 = ship_deck_space
2183+
fixed_ship_armor_slot = ship_cruiser_armor
21752184
fixed_ship_anti_air_slot = ship_anti_air
21762185
fixed_ship_engine_slot = carrier_ship_engine_4
21772186
fixed_ship_secondaries_slot = ship_dp_secondaries
@@ -2189,6 +2198,7 @@ EQS_naval_carrier = {
21892198
ship_radar
21902199
ship_deck_space
21912200
ship_carrier_armor
2201+
ship_cruiser_armor
21922202
}
21932203
}
21942204
}

common/ai_equipment/HIP_naval.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,6 +1217,7 @@ HIP_naval_carrier = {
12171217
modules = {
12181218
fixed_ship_deck_slot_1 = ship_deck_space
12191219
fixed_ship_deck_slot_2 = ship_deck_space
1220+
fixed_ship_armor_slot = ship_cruiser_armor
12201221
fixed_ship_anti_air_slot = ship_anti_air
12211222
fixed_ship_radar_slot = empty
12221223
fixed_ship_engine_slot = carrier_ship_engine_1
@@ -1235,6 +1236,7 @@ HIP_naval_carrier = {
12351236
ship_radar
12361237
ship_deck_space
12371238
ship_carrier_armor
1239+
ship_cruiser_armor
12381240
}
12391241
}
12401242

@@ -1256,6 +1258,7 @@ HIP_naval_carrier = {
12561258
modules = {
12571259
fixed_ship_deck_slot_1 = ship_deck_space
12581260
fixed_ship_deck_slot_2 = ship_deck_space
1261+
fixed_ship_armor_slot = ship_cruiser_armor
12591262
fixed_ship_anti_air_slot = ship_anti_air
12601263
fixed_ship_engine_slot = carrier_ship_engine_2
12611264
fixed_ship_secondaries_slot = ship_secondaries
@@ -1271,6 +1274,7 @@ HIP_naval_carrier = {
12711274
ship_radar
12721275
ship_deck_space
12731276
ship_carrier_armor
1277+
ship_cruiser_armor
12741278
}
12751279
}
12761280

@@ -1293,6 +1297,7 @@ HIP_naval_carrier = {
12931297
modules = {
12941298
fixed_ship_deck_slot_1 = ship_deck_space
12951299
fixed_ship_deck_slot_2 = ship_deck_space
1300+
fixed_ship_armor_slot = ship_cruiser_armor
12961301
fixed_ship_anti_air_slot = ship_anti_air
12971302
fixed_ship_engine_slot = carrier_ship_engine
12981303
fixed_ship_secondaries_slot > empty
@@ -1309,6 +1314,7 @@ HIP_naval_carrier = {
13091314
ship_radar
13101315
ship_deck_space
13111316
ship_carrier_armor
1317+
ship_cruiser_armor
13121318
}
13131319
}
13141320
carrier_advanced = {
@@ -1326,6 +1332,7 @@ HIP_naval_carrier = {
13261332
modules = {
13271333
fixed_ship_deck_slot_1 = ship_deck_space
13281334
fixed_ship_deck_slot_2 = ship_deck_space
1335+
fixed_ship_armor_slot = ship_cruiser_armor
13291336
fixed_ship_anti_air_slot = ship_anti_air
13301337
fixed_ship_engine_slot = carrier_ship_engine
13311338
fixed_ship_secondaries_slot = dp_ship_secondaries_3
@@ -1343,6 +1350,7 @@ HIP_naval_carrier = {
13431350
ship_radar
13441351
ship_deck_space
13451352
ship_carrier_armor
1353+
ship_cruiser_armor
13461354
}
13471355
}
13481356
}

0 commit comments

Comments
 (0)