fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added TagSkillBonus option to the skills ini file

Browse Source 
Fixed a crash in the previous commit.
This commit is contained in:
NovaRain
2021-01-06 11:30:29 +08:00
parent dfeafc3058
commit 97c48909c0
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/config_files/Perks.ini
+2 -2
View File
@@ -31,7 +31,7 @@ VaultCityInoculationsPoisonBonus=10
VaultCityInoculationsRadBonus=10 VaultCityInoculationsRadBonus=10
;Changes the damage bonus per level for 'Demolition Expert' perk (ID 82) ;Changes the damage bonus per level for 'Demolition Expert' perk (ID 82)
;10 - default bonus ;999 - maximum bonus, 10 - default bonus
DemolitionExpertBonus=10 DemolitionExpertBonus=10
;Changes the damage bonus for 'Living Anatomy' perk (ID 97) ;Changes the damage bonus for 'Living Anatomy' perk (ID 97)
@@ -43,7 +43,7 @@ LivingAnatomyBonus=5
PyromaniacBonus=5 PyromaniacBonus=5
;Changes the skill bonus per level for 'Salesman' perk (ID 103) ;Changes the skill bonus per level for 'Salesman' perk (ID 103)
;125 - maximum bonus, 20 - default bonus ;999 - maximum bonus, 20 - default bonus
SalesmanBonus=20 SalesmanBonus=20
;Changes the percent chance for 'Stonewall' perk (ID 104) ;Changes the percent chance for 'Stonewall' perk (ID 104)
artifacts/config_files/Skills.ini
+6 -1
View File
@@ -1,7 +1,12 @@
;This file lets you set the formula for calculating skills ;This file lets you set the formula for calculating skills
[skills] [skills]
BasedOnPoints=0 ;Set to 1 to base skill costs on spent points instead of current level ;Changes the initial bonus to skill level for tagged skills
;valid range: 0..100, 20 - default bonus
TagSkillBonus=20
;Set to 1 to base skill costs on spent points instead of current level
BasedOnPoints=0
Skill0=s1|i2|l1.5 ;Skill 0 (small guns) is str*1 + int*2 + luck*1.5 Skill0=s1|i2|l1.5 ;Skill 0 (small guns) is str*1 + int*2 + luck*1.5
SkillBase1=50 ;Big guns has a base of 50 SkillBase1=50 ;Big guns has a base of 50
sfall/Modules/Skills.cpp
+3
View File
@@ -407,6 +407,9 @@ void Skills::init() {
basedOnPoints = iniGetInt("Skills", "BasedOnPoints", 0, file); basedOnPoints = iniGetInt("Skills", "BasedOnPoints", 0, file);
if (basedOnPoints) HookCall(0x4AA9EC, (void*)fo::funcoffs::skill_points_); // skill_dec_point_ if (basedOnPoints) HookCall(0x4AA9EC, (void*)fo::funcoffs::skill_points_); // skill_dec_point_
int tagBonus = iniGetInt("Skills", "TagSkillBonus", 20, file);
if (tagBonus != 20 && tagBonus >=0 && tagBonus <= 100) SafeWrite8(0x4AA61E, static_cast<BYTE>(tagBonus));
} }
} }
sfall/Modules/SubModules/EnginePerks.cpp
+8 -8
View File
@@ -91,8 +91,7 @@ public:
void setSalesmanBonus(long value) { void setSalesmanBonus(long value) {
if (value < 0) return; if (value < 0) return;
SalesmanBonus = value; SalesmanBonus = value;
if (SalesmanBonus > 125) SalesmanBonus = 125; if (SalesmanBonus > 999) SalesmanBonus = 999;
SafeWrite8(0x496F60, static_cast<BYTE>(SalesmanBonus));
} }
void setLivingAnatomyBonus(long value) { void setLivingAnatomyBonus(long value) {
@@ -119,6 +118,7 @@ public:
void setDemolitionExpertBonus(long value) { void setDemolitionExpertBonus(long value) {
if (value < 0) return; if (value < 0) return;
DemolitionExpertBonus = value; DemolitionExpertBonus = value;
if (DemolitionExpertBonus > 999) DemolitionExpertBonus = 999;
} }
void setVaultCityInoculationsPoisonBonus(long value) { void setVaultCityInoculationsPoisonBonus(long value) {
@@ -167,14 +167,14 @@ void ReadPerksBonuses(const char* perksFile) {
wScopeRangeMod = iniGetInt("PerksTweak", "WeaponScopeRangeBonus", 5, perksFile); wScopeRangeMod = iniGetInt("PerksTweak", "WeaponScopeRangeBonus", 5, perksFile);
if (wScopeRangeMod != 5) perks.setWeaponScopeRangeBonus(wScopeRangeMod); if (wScopeRangeMod != 5) perks.setWeaponScopeRangeBonus(wScopeRangeMod);
int enginePerkMod = iniGetInt("PerksTweak", "WeaponLongRangeBonus", 4, perksFile); int wLongRangeBonus = iniGetInt("PerksTweak", "WeaponLongRangeBonus", 4, perksFile);
if (enginePerkMod != 4) perks.setWeaponLongRangeBonus(enginePerkMod); if (wLongRangeBonus != 4) perks.setWeaponLongRangeBonus(wLongRangeBonus);
enginePerkMod = iniGetInt("PerksTweak", "WeaponAccurateBonus", 20, perksFile); int wAccurateBonus = iniGetInt("PerksTweak", "WeaponAccurateBonus", 20, perksFile);
if (enginePerkMod != 20) perks.setWeaponAccurateBonus(enginePerkMod); if (wAccurateBonus != 20) perks.setWeaponAccurateBonus(wAccurateBonus);
enginePerkMod = iniGetInt("PerksTweak", "WeaponHandlingBonus", 3, perksFile); int wHandlingBonus = iniGetInt("PerksTweak", "WeaponHandlingBonus", 3, perksFile);
if (enginePerkMod != 3) perks.setWeaponHandlingBonus(enginePerkMod); if (wHandlingBonus != 3) perks.setWeaponHandlingBonus(wHandlingBonus);
int masterTraderBonus = iniGetInt("PerksTweak", "MasterTraderBonus", 25, perksFile); int masterTraderBonus = iniGetInt("PerksTweak", "MasterTraderBonus", 25, perksFile);
if (masterTraderBonus != 25) perks.setMasterTraderBonus(masterTraderBonus); if (masterTraderBonus != 25) perks.setMasterTraderBonus(masterTraderBonus);