mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
New feature: We can now create non-profile-based merchants via lua.scripts.
Requires GameDir >= r2320. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23061&goto=345526&#msg_345526 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -2959,6 +2959,9 @@ extern STR16 szIdividualMilitiaWebsiteFilterText_Rank[] ;
|
||||
extern STR16 szIdividualMilitiaWebsiteFilterText_Origin[];
|
||||
extern STR16 szIdividualMilitiaWebsiteFilterText_Sector[];
|
||||
|
||||
// Flugente: non-profile merchants
|
||||
extern STR16 szNonProfileMerchantText[];
|
||||
|
||||
#define TACTICAL_INVENTORY_DIALOG_NUM 16
|
||||
#define TACTICAL_COVER_DIALOG_NUM 16
|
||||
|
||||
|
||||
@@ -11102,6 +11102,13 @@ STR16 szIdividualMilitiaWebsiteFilterText_Sector[] =
|
||||
L"All sectors",
|
||||
};
|
||||
|
||||
STR16 szNonProfileMerchantText[] =
|
||||
{
|
||||
L"Merchant is hostile and does not want to trade.",
|
||||
L"Merchant is in no state to do business.",
|
||||
L"Merchant won't trade during combat.",
|
||||
L"Merchant refuses to interact with you.",
|
||||
};
|
||||
|
||||
// WANNE: Some Chinese specific strings that needs to be in unicode!
|
||||
STR16 ChineseSpecString1 = L"%%"; //defined in _ChineseText.cpp as this file is already unicode
|
||||
|
||||
@@ -11119,5 +11119,12 @@ STR16 szIdividualMilitiaWebsiteFilterText_Sector[] =
|
||||
L"All sectors",
|
||||
};
|
||||
|
||||
STR16 szNonProfileMerchantText[] =
|
||||
{
|
||||
L"Merchant is hostile and does not want to trade.",
|
||||
L"Merchant is in no state to do business.",
|
||||
L"Merchant won't trade during combat.",
|
||||
L"Merchant refuses to interact with you.",
|
||||
};
|
||||
|
||||
#endif //DUTCH
|
||||
|
||||
@@ -11102,4 +11102,12 @@ STR16 szIdividualMilitiaWebsiteFilterText_Sector[] =
|
||||
L"All sectors",
|
||||
};
|
||||
|
||||
STR16 szNonProfileMerchantText[] =
|
||||
{
|
||||
L"Merchant is hostile and does not want to trade.",
|
||||
L"Merchant is in no state to do business.",
|
||||
L"Merchant won't trade during combat.",
|
||||
L"Merchant refuses to interact with you.",
|
||||
};
|
||||
|
||||
#endif //ENGLISH
|
||||
|
||||
@@ -11101,5 +11101,12 @@ STR16 szIdividualMilitiaWebsiteFilterText_Sector[] =
|
||||
L"All sectors",
|
||||
};
|
||||
|
||||
STR16 szNonProfileMerchantText[] =
|
||||
{
|
||||
L"Merchant is hostile and does not want to trade.",
|
||||
L"Merchant is in no state to do business.",
|
||||
L"Merchant won't trade during combat.",
|
||||
L"Merchant refuses to interact with you.",
|
||||
};
|
||||
|
||||
#endif //FRENCH
|
||||
|
||||
@@ -10931,5 +10931,12 @@ STR16 szIdividualMilitiaWebsiteFilterText_Sector[] =
|
||||
L"All sectors",
|
||||
};
|
||||
|
||||
STR16 szNonProfileMerchantText[] =
|
||||
{
|
||||
L"Merchant is hostile and does not want to trade.",
|
||||
L"Merchant is in no state to do business.",
|
||||
L"Merchant won't trade during combat.",
|
||||
L"Merchant refuses to interact with you.",
|
||||
};
|
||||
|
||||
#endif //GERMAN
|
||||
|
||||
@@ -11110,5 +11110,12 @@ STR16 szIdividualMilitiaWebsiteFilterText_Sector[] =
|
||||
L"All sectors",
|
||||
};
|
||||
|
||||
STR16 szNonProfileMerchantText[] =
|
||||
{
|
||||
L"Merchant is hostile and does not want to trade.",
|
||||
L"Merchant is in no state to do business.",
|
||||
L"Merchant won't trade during combat.",
|
||||
L"Merchant refuses to interact with you.",
|
||||
};
|
||||
|
||||
#endif //ITALIAN
|
||||
|
||||
@@ -11123,5 +11123,12 @@ STR16 szIdividualMilitiaWebsiteFilterText_Sector[] =
|
||||
L"All sectors",
|
||||
};
|
||||
|
||||
STR16 szNonProfileMerchantText[] =
|
||||
{
|
||||
L"Merchant is hostile and does not want to trade.",
|
||||
L"Merchant is in no state to do business.",
|
||||
L"Merchant won't trade during combat.",
|
||||
L"Merchant refuses to interact with you.",
|
||||
};
|
||||
|
||||
#endif //POLISH
|
||||
|
||||
@@ -11102,5 +11102,12 @@ STR16 szIdividualMilitiaWebsiteFilterText_Sector[] =
|
||||
L"All sectors",
|
||||
};
|
||||
|
||||
STR16 szNonProfileMerchantText[] =
|
||||
{
|
||||
L"Merchant is hostile and does not want to trade.",
|
||||
L"Merchant is in no state to do business.",
|
||||
L"Merchant won't trade during combat.",
|
||||
L"Merchant refuses to interact with you.",
|
||||
};
|
||||
|
||||
#endif //RUSSIAN
|
||||
|
||||
Reference in New Issue
Block a user