1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

New feature: localized weather adds more weather types, different weather can happen in different sectors at the same time.

Browse Source 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23094&#msg_345949

Requires GameDir >= r2325

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8253 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-06-18 20:57:03 +00:00
parent facadda6e8
commit 503523a9fa
40 changed files with 1059 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Sound Control.cpp
+2 -1
View File
@@ -386,7 +386,8 @@ char szAmbientEffects[NUM_AMBIENTS][255] =
"SOUNDS\\owl2.wav",
"SOUNDS\\owl3.wav",
"SOUNDS\\night_bird1.wav",
"SOUNDS\\night_bird3.wav"
"SOUNDS\\night_bird3.wav",
"SOUNDS\\wind.wav",
};
UINT8 AmbientVols[NUM_AMBIENTS]={
Utils/Sound Control.h
+2 -1
View File
@@ -398,7 +398,8 @@ enum AmbientDefines
OWL_3,
NIGHT_BIRD_1,
NIGHT_BIRD_2,
WIND,
NUM_AMBIENTS
};
Utils/Text.h
+3
View File
@@ -2966,6 +2966,9 @@ extern STR16 szIdividualMilitiaWebsiteFilterText_Sector[];
// Flugente: non-profile merchants
extern STR16 szNonProfileMerchantText[];
// Flugente: externalised weather
extern STR16 szWeatherTypeText[];
#define TACTICAL_INVENTORY_DIALOG_NUM 16
#define TACTICAL_COVER_DIALOG_NUM 16
Utils/_ChineseText.cpp
+14
View File
@@ -4300,6 +4300,7 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"显示民兵和敌人 (|Z)",
L"显示民兵移动 (|R)", // HEADROCK HAM 4: Mobile Restrictions Button
L"显示疾病消息", //L"Show Disease Data",
L"Show Weather", // TODO.Translate
};
STR16 pMapScreenInvenButtonHelpText[] =
@@ -6172,6 +6173,9 @@ STR16 zMarksMapScreenText[] =
// Flugente: disease texts describing what a map view does //文本描述疾病查看地图并做翻译。
L"这个视图会展示出哪个地区爆发了瘟疫，这个数字表明，平均每个人的感染程度，颜色表示它的范围。 灰色=无病。 绿色到红色=不断升级的感染程度。", //L"This view shows in which sectors disease has broken out. The number indicates the mean magnitude of infection per person, the colour indicates how widespread it is. GREY= No disease known of. GREEN to RED = escalating levels of infection.",
// Flugente: weather texts describing what a map view does
L"This view shows current weather. No colour=Sunny. CYAN=Rain. BLUE=Thunderstorm. ORANGE=Sandstorm. WHITE=Snow.", // TODO.Translate
};
@@ -11121,6 +11125,16 @@ STR16 szNonProfileMerchantText[] =
L"Merchant refuses to interact with you.",
};
STR16 szWeatherTypeText[] = // TODO.Translate
{
L"normal",
L"rain",
L"thunderstorm",
L"sandstorm",
L"snow",
};
// WANNE: Some Chinese specific strings that needs to be in unicode!
STR16 ChineseSpecString1 = L"%％"; //defined in _ChineseText.cpp as this file is already unicode
STR16 ChineseSpecString2 = L"*%3d%％%%"; //defined in _ChineseText.cpp as this file is already unicode
Utils/_DutchText.cpp
+14
View File
@@ -4299,6 +4299,7 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Toon Milities & Vijanden (|Z)",
L"Show Mobile Militia |Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button // TODO.Translate
L"Show Disease Data", // TODO.Translate
L"Show Weather", // TODO.Translate
};
STR16 pMapScreenInvenButtonHelpText[] =
@@ -6176,6 +6177,9 @@ STR16 zMarksMapScreenText[] =
// Flugente: disease texts describing what a map view does TODO.Translate
L"This view shows in which sectors disease has broken out. The number indicates the mean magnitude of infection per person, the colour indicates how widespread it is. GREY= No disease known of. GREEN to RED = escalating levels of infection.",
// Flugente: weather texts describing what a map view does
L"This view shows current weather. No colour=Sunny. CYAN=Rain. BLUE=Thunderstorm. ORANGE=Sandstorm. WHITE=Snow.", // TODO.Translate
};
@@ -11138,4 +11142,14 @@ STR16 szNonProfileMerchantText[] =
L"Merchant refuses to interact with you.",
};
STR16 szWeatherTypeText[] = // TODO.Translate
{
L"normal",
L"rain",
L"thunderstorm",
L"sandstorm",
L"snow",
};
#endif //DUTCH
Utils/_EnglishText.cpp
+14
View File
@@ -4297,6 +4297,7 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Show Militia & Enemies (|Z)",
L"Show Mobile Militia |Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button
L"Show Disease Data",
L"Show Weather",
};
STR16 pMapScreenInvenButtonHelpText[] =
@@ -6169,6 +6170,9 @@ STR16 zMarksMapScreenText[] =
// Flugente: disease texts describing what a map view does
L"This view shows in which sectors disease has broken out. The number indicates the mean magnitude of infection per person, the colour indicates how widespread it is. GREY= No disease known of. GREEN to RED = escalating levels of infection.",
// Flugente: weather texts describing what a map view does
L"This view shows current weather. No colour=Sunny. CYAN=Rain. BLUE=Thunderstorm. ORANGE=Sandstorm. WHITE=Snow.",
};
@@ -11121,4 +11125,14 @@ STR16 szNonProfileMerchantText[] =
L"Merchant refuses to interact with you.",
};
STR16 szWeatherTypeText[] =
{
L"normal",
L"rain",
L"thunderstorm",
L"sandstorm",
L"snow",
};
#endif //ENGLISH
Utils/_FrenchText.cpp
+14
View File
@@ -4303,6 +4303,7 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Milice & Ennemis (|Z)",
L"Montrer la milice mobile |Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button
L"Show Disease Data", // TODO.Translate
L"Show Weather", // TODO.Translate
};
STR16 pMapScreenInvenButtonHelpText[] =
@@ -6181,6 +6182,9 @@ STR16 zMarksMapScreenText[] =
// Flugente: disease texts describing what a map view does TODO.Translate
L"This view shows in which sectors disease has broken out. The number indicates the mean magnitude of infection per person, the colour indicates how widespread it is. GREY= No disease known of. GREEN to RED = escalating levels of infection.",
// Flugente: weather texts describing what a map view does
L"This view shows current weather. No colour=Sunny. CYAN=Rain. BLUE=Thunderstorm. ORANGE=Sandstorm. WHITE=Snow.", // TODO.Translate
};
@@ -11120,4 +11124,14 @@ STR16 szNonProfileMerchantText[] =
L"Merchant refuses to interact with you.",
};
STR16 szWeatherTypeText[] = // TODO.Translate
{
L"normal",
L"rain",
L"thunderstorm",
L"sandstorm",
L"snow",
};
#endif //FRENCH
Utils/_GermanText.cpp
+14
View File
@@ -4289,6 +4289,7 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Mili|z & Feinde zeigen",
L"Zeige Mobile Miliz Begrenzungen (|R)", // HEADROCK HAM 4: Mobile Restrictions Button
L"Show Disease Data", // TODO.Translate
L"Show Weather", // TODO.Translate
};
STR16 pMapScreenInvenButtonHelpText[] =
@@ -6021,6 +6022,9 @@ STR16 zMarksMapScreenText[] =
// Flugente: disease texts describing what a map view does TODO.Translate
L"This view shows in which sectors disease has broken out. The number indicates the mean magnitude of infection per person, the colour indicates how widespread it is. GREY= No disease known of. GREEN to RED = escalating levels of infection.",
// Flugente: weather texts describing what a map view does
L"This view shows current weather. No colour=Sunny. CYAN=Rain. BLUE=Thunderstorm. ORANGE=Sandstorm. WHITE=Snow.", // TODO.Translate
};
STR16 pLandMarkInSectorString[] =
@@ -10950,4 +10954,14 @@ STR16 szNonProfileMerchantText[] =
L"Merchant refuses to interact with you.",
};
STR16 szWeatherTypeText[] = // TODO.Translate
{
L"normal",
L"rain",
L"thunderstorm",
L"sandstorm",
L"snow",
};
#endif //GERMAN
Utils/_ItalianText.cpp
+14
View File
@@ -4293,6 +4293,7 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Mostra esercito & nemici (|Z)",
L"Show Mobile Militia |Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button // TODO.Translate
L"Show Disease Data", // TODO.Translate
L"Show Weather", // TODO.Translate
};
STR16 pMapScreenInvenButtonHelpText[] =
@@ -6159,6 +6160,9 @@ STR16 zMarksMapScreenText[] =
// Flugente: disease texts describing what a map view does TODO.Translate
L"This view shows in which sectors disease has broken out. The number indicates the mean magnitude of infection per person, the colour indicates how widespread it is. GREY= No disease known of. GREEN to RED = escalating levels of infection.",
// Flugente: weather texts describing what a map view does
L"This view shows current weather. No colour=Sunny. CYAN=Rain. BLUE=Thunderstorm. ORANGE=Sandstorm. WHITE=Snow.", // TODO.Translate
};
@@ -11129,4 +11133,14 @@ STR16 szNonProfileMerchantText[] =
L"Merchant refuses to interact with you.",
};
STR16 szWeatherTypeText[] = // TODO.Translate
{
L"normal",
L"rain",
L"thunderstorm",
L"sandstorm",
L"snow",
};
#endif //ITALIAN
Utils/_PolishText.cpp
+14
View File
@@ -4304,6 +4304,7 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Pokaż samoobronę i wrogów (|Z)",
L"Show Mobile Militia |Restrictions", // HEADROCK HAM 4: Mobile Restrictions Button // TODO.Translate
L"Show Disease Data", // TODO.Translate
L"Show Weather", // TODO.Translate
};
STR16 pMapScreenInvenButtonHelpText[] =
@@ -6177,6 +6178,9 @@ STR16 zMarksMapScreenText[] =
// Flugente: disease texts describing what a map view does TODO.Translate
L"This view shows in which sectors disease has broken out. The number indicates the mean magnitude of infection per person, the colour indicates how widespread it is. GREY= No disease known of. GREEN to RED = escalating levels of infection.",
// Flugente: weather texts describing what a map view does
L"This view shows current weather. No colour=Sunny. CYAN=Rain. BLUE=Thunderstorm. ORANGE=Sandstorm. WHITE=Snow.", // TODO.Translate
};
@@ -11142,4 +11146,14 @@ STR16 szNonProfileMerchantText[] =
L"Merchant refuses to interact with you.",
};
STR16 szWeatherTypeText[] = // TODO.Translate
{
L"normal",
L"rain",
L"thunderstorm",
L"sandstorm",
L"snow",
};
#endif //POLISH
Utils/_RussianText.cpp
+14
View File
@@ -4297,6 +4297,7 @@ STR16 pMapScreenBorderButtonHelpText[] =
L"Ополчение и враги (|Z)",
L"Патруль ополчения (|R)", // HEADROCK HAM 4: Mobile Restrictions Button
L"Очаги заболеваний",
L"Show Weather", // TODO.Translate
};
STR16 pMapScreenInvenButtonHelpText[] =
@@ -6169,6 +6170,9 @@ STR16 zMarksMapScreenText[] =
// Flugente: disease texts describing what a map view does
L"Здесь показаны вспышки заболеваний по секторам. Число указывает средний показатель инфекции на человека, цвет - насколько широко распространена инфекция. СЕРЫЙ= нет информации о заболеваемости. ЗЕЛЁНЫЙ - КРАСНЫЙ = уровень роста заболеваемости.",
// Flugente: weather texts describing what a map view does
L"This view shows current weather. No colour=Sunny. CYAN=Rain. BLUE=Thunderstorm. ORANGE=Sandstorm. WHITE=Snow.", // TODO.Translate
};
@@ -11121,4 +11125,14 @@ STR16 szNonProfileMerchantText[] =
L"Merchant refuses to interact with you.",
};
STR16 szWeatherTypeText[] = // TODO.Translate
{
L"normal",
L"rain",
L"thunderstorm",
L"sandstorm",
L"snow",
};
#endif //RUSSIAN