[Gemrb-commits] gemrb: branch master updated. v0.7.0-393-g3baae87

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  3baae8799bcf75dba9e8c4bb68455adb001ac70d (commit)
       via  332f5c296285c5271529da264652e14a9fa876f8 (commit)

Summary of changes:
 gemrb/GUIScripts/iwd2/CharGen9.py |    7 +++++++
 gemrb/core/Scriptable/Actor.cpp   |   14 --------------
 2 files changed, 7 insertions(+), 14 deletions(-)
      from  2f97bd6f871ccf711d5fbc940967564124b56d69 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=3baae8799bcf75dba9e8c4bb68455adb001ac70d

commit 3baae8799bcf75dba9e8c4bb68455adb001ac70d
Author: Jaka Kranjc <lyn...@us...>
Date:   Sun Feb 26 12:25:50 2012 +0100

    iwd2: set proficiency stats in chargen

diff --git a/gemrb/GUIScripts/iwd2/CharGen9.py b/gemrb/GUIScripts/iwd2/CharGen9.py
index 3e1809f..b6656d5 100644
--- a/gemrb/GUIScripts/iwd2/CharGen9.py
+++ b/gemrb/GUIScripts/iwd2/CharGen9.py
@@ -192,8 +192,15 @@ def NextPress():
 	#setting feats
 	TmpTable = GemRB.LoadTable ("featreq")
 	FeatCount = TmpTable.GetRowCount ()
+	ProfOffset = IE_PROFICIENCYBASTARDSWORD
 	for i in range (FeatCount):
 		GemRB.SetFeat (MyChar, i, GemRB.GetVar ("Feat "+str(i) ) )
+		# set proficiencies
+		# feats for exotic: bastard swords; martial weapons; simple weapons
+		if i == 18 or (i > 37 and i < 45) or (i > 52 and i < 58):
+			stars = GemRB.GetVar ("Feat "+str(i))
+			if stars:
+				GemRB.SetPlayerStat (MyChar, ProfOffset+i, stars)
 
 	#does all the rest
 	LargePortrait = GemRB.GetToken ("LargePortrait")

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=332f5c296285c5271529da264652e14a9fa876f8

commit 332f5c296285c5271529da264652e14a9fa876f8
Author: Jaka Kranjc <lyn...@us...>
Date:   Sun Feb 26 12:19:27 2012 +0100

    iwd2 actually has wspecial.2da and it is complete

diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index 19969c3..91ea98a 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -5214,20 +5214,6 @@ bool Actor::GetCombatDetails(int &tohit, bool leftorright, WeaponInfo& wi, ITMEx
 	//second parameter is left or right hand flag
 	tohit = GetToHit(THAC0Bonus, wi.wflags, target);
 	if (third) {
-		// "star" system: 1 - no penalty, 2 - +1 tohit, 3 - +2dmg
-		switch (stars) {
-			case 0:
-				tohit -= 4;
-				break;
-			case 1:
-				break;
-			case 2:
-				tohit += 1;
-				break;
-			case 3:
-				DamageBonus += 2;
-		}
-
 		// iwd2 gives a dualwielding bonus when using a simple weapon in the offhand
 		// it is limited to shortswords and daggers, which also have this flag set
 		if (IsDualWielding() && (wi.wflags&WEAPON_FINESSE)) {

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator