1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Extended "Merc Random Stats Feature" (by Jenilee)

Browse Source 
- Added 4th option for MERCS_RANDOM_STATS (MERCS_RANDOM_STATS = 4)
  o full randomization of mercs, including traits, gear kits and all statistics
see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/328769.html#Post328769

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6676 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-12-03 10:14:15 +00:00
parent 8c4201e335
commit 5c062ff752
25 changed files with 1125 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Console/Console_VS2013.vcxproj
+1 -1
View File
@@ -47,7 +47,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Editor/Editor_VS2013.vcxproj
+1 -1
View File
@@ -90,7 +90,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
GameSettings.cpp
+1 -1
View File
@@ -872,7 +872,7 @@ void LoadGameExternalOptions()
// Buggler: setting to show/hide skills/traits in AIM & MERC hiring page
gGameExternalOptions.fShowSkillsInHirePage = iniReader.ReadBoolean("Recruitment Settings", "SHOW_SKILLS_IN_HIRING_PAGE", FALSE);
gGameExternalOptions.ubMercRandomStats = iniReader.ReadInteger("Recruitment Settings", "MERCS_RANDOM_STATS", 0, 0, 3);
gGameExternalOptions.ubMercRandomStats = iniReader.ReadInteger("Recruitment Settings", "MERCS_RANDOM_STATS", 0, 0, 4);
gGameExternalOptions.fMercRandomBellDistribution = iniReader.ReadBoolean("Recruitment Settings", "MERCS_RANDOM_BELL_DISTRIBUTION", TRUE);
gGameExternalOptions.ubMercRandomStatsRange = iniReader.ReadInteger("Recruitment Settings", "MERCS_RANDOM_STAT_RANGE", 10, 0, 50);
gGameExternalOptions.ubMercRandomExpRange = iniReader.ReadInteger("Recruitment Settings", "MERCS_RANDOM_EXP_RANGE", 1, 0, 4);
Laptop/Laptop_VS2013.vcxproj
+1 -1
View File
@@ -195,7 +195,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
ModularizedTacticalAI/ModularizedTacticalAI_VS2013.vcxproj
+1 -1
View File
@@ -49,7 +49,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Standard Gaming Platform/SGP_VS2013.vcxproj
+1 -1
View File
@@ -150,7 +150,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Strategic/Strategic_VS2013.vcxproj
+1 -1
View File
@@ -148,7 +148,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Tactical/RandomMerc.cpp
+1072
View File
File diff suppressed because it is too large Load Diff
Tactical/Soldier Profile.cpp
+19
View File
@@ -106,6 +106,12 @@ extern UINT8 gubItemDroppableFlag[NUM_INV_SLOTS];
RANDOM_STATS_VALUES gRandomStatsValue[NUM_PROFILES];
void RandomStats();
void RandomStartSalary();
//Jenilee
extern void RandomizeMerc(UINT8 profile_id, MERCPROFILESTRUCT* merc);
extern void InitRandomMercs();
extern void ExitRandomMercs();
INT32 RandomAbsoluteRange( INT32 iValue, INT32 iMin, INT32 iMax, INT32 iRange, BOOLEAN fBellCurve );
INT8 RandomPercentRange( UINT8 iPRange, BOOLEAN fBellCurve );
@@ -584,6 +590,19 @@ void RandomStats()
}
}
}
// Jenilee: 4th method (see also RandomMerc.cpp)
else if (gGameExternalOptions.ubMercRandomStats == 4)
{
InitRandomMercs();
for ( cnt = 0; cnt < NUM_PROFILES; cnt++ )
{
pProfile = &(gMercProfiles[cnt]);
RandomizeMerc(cnt, pProfile);
}
ExitRandomMercs();
}
}
void RandomStartSalary()
Tactical/Tactical_VS2005.vcproj
+4
View File
@@ -892,6 +892,10 @@
RelativePath=".\Rain.cpp"
>
</File>
<File
RelativePath=".\RandomMerc.cpp"
>
</File>
<File
RelativePath=".\Real Time Input.cpp"
>
Tactical/Tactical_VS2008.vcproj
+4
View File
@@ -894,6 +894,10 @@
RelativePath="Rain.cpp"
>
</File>
<File
RelativePath=".\RandomMerc.cpp"
>
</File>
<File
RelativePath="Real Time Input.cpp"
>
Tactical/Tactical_VS2010.vcxproj
+1
View File
@@ -162,6 +162,7 @@
<ClCompile Include="Points.cpp" />
<ClCompile Include="QARRAY.cpp" />
<ClCompile Include="Rain.cpp" />
<ClCompile Include="RandomMerc.cpp" />
<ClCompile Include="Real Time Input.cpp" />
<ClCompile Include="Rotting Corpses.cpp" />
<ClCompile Include="ShopKeeper Interface.cpp" />
Tactical/Tactical_VS2010.vcxproj.filters
+3
View File
@@ -656,5 +656,8 @@
<ClCompile Include="XML_Taunts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="RandomMerc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
Tactical/Tactical_VS2013.vcxproj
+2 -1
View File
@@ -162,6 +162,7 @@
<ClCompile Include="Points.cpp" />
<ClCompile Include="QARRAY.cpp" />
<ClCompile Include="Rain.cpp" />
<ClCompile Include="RandomMerc.cpp" />
<ClCompile Include="Real Time Input.cpp" />
<ClCompile Include="Rotting Corpses.cpp" />
<ClCompile Include="ShopKeeper Interface.cpp" />
@@ -252,7 +253,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Tactical/Tactical_VS2013.vcxproj.filters
+3
View File
@@ -656,5 +656,8 @@
<ClCompile Include="XML_Taunts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="RandomMerc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
TacticalAI/TacticalAI_VS2013.vcxproj
+1 -1
View File
@@ -57,7 +57,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
TileEngine/TileEngine_VS2013.vcxproj
+1 -1
View File
@@ -116,7 +116,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
Utils/Utils_VS2013.vcxproj
+1 -1
View File
@@ -146,7 +146,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
ext/VFS/build/7z_VS2013.vcxproj
+1 -1
View File
@@ -103,7 +103,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
ext/VFS/build/VFS_VS2013.vcxproj
+1 -1
View File
@@ -108,7 +108,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
ext/export/ja2export_VS2013.vcxproj
+1 -1
View File
@@ -25,7 +25,7 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
ext/libpng/projects/visualc71/libpng_VS2013.vcxproj
+1 -1
View File
@@ -58,7 +58,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
ext/libpng/projects/visualc71/zlib_VS2013.vcxproj
+1 -1
View File
@@ -69,7 +69,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
ja2_VS2013.vcxproj
+1 -1
View File
@@ -33,7 +33,7 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
lua/lua_VS2013.vcxproj
+1 -1
View File
@@ -57,7 +57,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>