gemrb: Infinity Engine emulator
The branch master has been updated
via 870cdba9ae19d9db1750ace958039ee5756eefeb (commit)
via 83b41c65592f480983fbbbcd1a8f6a74c2f7f89e (commit)
via 449a34f34f86d98723b46a51c51095271679ada6 (commit)
via abef6ff20deebf556c44418d165c2b3bccf7d70d (commit)
Summary of changes:
gemrb/GUIScripts/GUICommon.py | 1 +
gemrb/GUIScripts/GUIREC.py | 2 +-
gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp | 12 ++++++++++--
3 files changed, 12 insertions(+), 3 deletions(-)
from 10499e967edde5870c1333671789dbd3be509908 (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=870cdba9ae19d9db1750ace958039ee5756eefeb
commit 870cdba9ae19d9db1750ace958039ee5756eefeb
Author: Jaka Kranjc <lynxlupodian@...>
Date: Mon Feb 4 00:08:23 2013 +0100
fx_smite_evil: give the actual boni
diff --git a/gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp b/gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp
index b56a8ed..7f39579 100644
--- a/gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp
+++ b/gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp
@@ -3399,6 +3399,11 @@ int fx_smite_evil (Scriptable* /*Owner*/, Actor* target, Effect* fx)
{
if(0) print("fx_smite_evil(%2d)", fx->Opcode);
target->SetSpellState(SS_SMITEEVIL);
+ int chrmod = target->GetAbilityBonus(IE_CHR);
+ if (chrmod > 0) {
+ target->ToHit.HandleFxBonus(chrmod, fx->TimingMode==FX_DURATION_INSTANT_PERMANENT);
+ }
+ STAT_ADD(IE_DAMAGEBONUS, target->GetPaladinLevel());
return FX_NOT_APPLIED;
}
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=83b41c65592f480983fbbbcd1a8f6a74c2f7f89e
commit 83b41c65592f480983fbbbcd1a8f6a74c2f7f89e
Author: Jaka Kranjc <lynxlupodian@...>
Date: Mon Feb 4 00:02:42 2013 +0100
SetupDamageInfo: partially disable the iwd2 hpbar, so the full-hp max isn't visible
... unless you are fully healed, of course
diff --git a/gemrb/GUIScripts/GUICommon.py b/gemrb/GUIScripts/GUICommon.py
index e183c7c..84f1763 100644
--- a/gemrb/GUIScripts/GUICommon.py
+++ b/gemrb/GUIScripts/GUICommon.py
@@ -771,6 +771,7 @@ def SetupDamageInfo (pc, Button, Window):
hpBar = Window.GetControl (pc-1 + 50)
hpBar.SetBAM ("GUIHITPT", band, 0)
hpBar.SetPictureClipping (ratio)
+ hpBar.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_OR)
ratio_str = "\n%d/%d" %(hp, hp_max)
Button.SetTooltip (GemRB.GetPlayerName (pc, 1) + ratio_str)
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=449a34f34f86d98723b46a51c51095271679ada6
commit 449a34f34f86d98723b46a51c51095271679ada6
Author: Jaka Kranjc <lynxlupodian@...>
Date: Sun Feb 3 23:52:47 2013 +0100
fx_tenser_transformation: also give a tohit bonus; cleanup
diff --git a/gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp b/gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp
index 26f20cb..b56a8ed 100644
--- a/gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp
+++ b/gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp
@@ -3365,11 +3365,14 @@ int fx_tenser_transformation (Scriptable* /*Owner*/, Actor* target, Effect* fx)
fx->Parameter3=core->Roll(fx->CasterLevel, 6, 0);
fx->Parameter4=core->Roll(2,4,0);
fx->Parameter5=core->Roll(2,4,0);
- BASE_ADD( IE_HITPOINTS, fx->Parameter3);
+ BASE_ADD(IE_HITPOINTS, fx->Parameter3); // FIXME: permanent
}
target->AC.HandleFxBonus(4, fx->TimingMode==FX_DURATION_INSTANT_PERMANENT);
- STAT_ADD(IE_SAVEFORTITUDE, 5); //FIXME: this is a bonus
+ // FIXME: should actually increase the base, so extra attacks can be gained
+ // but then the effect would be permanent and Actor::GetNumberOfAttacks doesn't handle effects yet
+ target->ToHit.HandleFxBonus(fx->CasterLevel/2, fx->TimingMode==FX_DURATION_INSTANT_PERMANENT);
+ STAT_ADD(IE_SAVEFORTITUDE, 5);
STAT_ADD(IE_MAXHITPOINTS, fx->Parameter3);
STAT_ADD(IE_STR, fx->Parameter4);
STAT_ADD(IE_CON, fx->Parameter5);
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=abef6ff20deebf556c44418d165c2b3bccf7d70d
commit abef6ff20deebf556c44418d165c2b3bccf7d70d
Author: Jaka Kranjc <lynxlupodian@...>
Date: Sun Feb 3 15:51:19 2013 +0100
guirec: use a proper strref for electricity resistance in iwd
diff --git a/gemrb/GUIScripts/GUIREC.py b/gemrb/GUIScripts/GUIREC.py
index 905dfc2..c6efeb4 100644
--- a/gemrb/GUIScripts/GUIREC.py
+++ b/gemrb/GUIScripts/GUIREC.py
@@ -626,7 +626,7 @@ def GetStatOverview (pc, LevelDiff=[0,0,0]):
stats.append ((15546, GS (IE_RESISTCOLD), '%'))
stats.append ((15580, GS (IE_RESISTMAGICCOLD), '%'))
# 32220 Electricity
- if GUICommon.GameIsBG1():
+ if GUICommon.GameIsBG1() or GUICommon.GameIsIWD1():
stats.append ((14013, GS (IE_RESISTELECTRICITY), '%'))
else:
stats.append ((32220, GS (IE_RESISTELECTRICITY), '%'))
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|