[Gemrb-commits] gemrb: branch master updated. v0.7.0-378-g9326d53

[Laszlo T. <ave...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  9326d53430dde85dcdd11a1a9150374421ebb25e (commit)
       via  6eed6b3e15ed975e1144cc6c4f090987b56c9b43 (commit)
       via  ba6a0283e545346b009e9ea9443e85affde46ac8 (commit)

Summary of changes:
 gemrb/core/EffectQueue.cpp               |    2 +
 gemrb/core/Scriptable/Actor.cpp          |    4 +++
 gemrb/override/iwd2/feat18.spl           |  Bin 0 -> 458 bytes
 gemrb/override/{bg2 => pst}/proftype.2da |   36 +++++++++++++++++++----------
 4 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 gemrb/override/iwd2/feat18.spl
 copy gemrb/override/{bg2 => pst}/proftype.2da (56%)
      from  fb729ee47dc0259174d318f37888a7364db001ff (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=9326d53430dde85dcdd11a1a9150374421ebb25e

commit 9326d53430dde85dcdd11a1a9150374421ebb25e
Author: Avenger <ave...@so...>
Date:   Thu Feb 23 23:21:01 2012 +0100

    pst itemtype vs. proficiency map (+comment about lucky hardcoding of bonusagainstcreature)

diff --git a/gemrb/core/EffectQueue.cpp b/gemrb/core/EffectQueue.cpp
index c9d7ebd..061a7ce 100644
--- a/gemrb/core/EffectQueue.cpp
+++ b/gemrb/core/EffectQueue.cpp
@@ -1636,6 +1636,8 @@ int EffectQueue::BonusAgainstCreature(ieDword opcode, Actor *actor) const
 			MATCH_PARAM1();
 		}
 		int val = (int) (*f)->Parameter3;
+		//we are really lucky with this, most of these boni are using +2 (including fiendslayer feat)
+		//it would be much more inconvenient if we had to use v2 effect files
 		if( !val) val = 2;
 		sum += val;
 	}
diff --git a/gemrb/override/pst/proftype.2da b/gemrb/override/pst/proftype.2da
new file mode 100644
index 0000000..ba02e94
--- /dev/null
+++ b/gemrb/override/pst/proftype.2da
@@ -0,0 +1,45 @@
+2DA V1.0
+-1
+           OLD_PROFICIENCY
+0          -1
+1          -1
+2          -1
+3          -1
+4          -1
+5          -1
+6          -1
+7          -1
+8          -1
+9          -1
+10         -1
+11         -1
+12         -1
+13         -1
+14         -1
+15_BOW     5
+16_DAGGER  1
+17_MACE    4
+18_SLING   -1
+19_SWORD   1
+20_BIG     1
+21_HAMMER  2
+22_MS      -1
+23_FLAIL   -1
+24_DART    -1
+25_AXE     3
+26_STAFF   4
+27_XBOW    5
+28_HAND    0
+29_SPEAR   -1
+30_HALBERD -1
+31 -1
+32 -1
+33 -1
+34 -1
+35 -1
+36 -1
+37 -1
+38 -1
+39 -1
+40 -1
+41_TEETH 0

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

commit 6eed6b3e15ed975e1144cc6c4f090987b56c9b43
Author: Avenger <ave...@so...>
Date:   Thu Feb 23 23:18:37 2012 +0100

    fiendslayer feat

diff --git a/gemrb/override/iwd2/feat18.spl b/gemrb/override/iwd2/feat18.spl
new file mode 100644
index 0000000..7728902
Binary files /dev/null and b/gemrb/override/iwd2/feat18.spl differ

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

commit ba6a0283e545346b009e9ea9443e85affde46ac8
Author: Avenger <ave...@so...>
Date:   Thu Feb 23 23:16:37 2012 +0100

    implement to hit bonus against creature

diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index ef8ad92..8b46dd4 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -3322,6 +3322,7 @@ void Actor::CheckCleave()
 	}
 }
 
+static EffectRef fx_tohit_vs_creature_ref = { "ToHitVsCreature", -1 };
 static EffectRef fx_damage_vs_creature_ref = { "DamageVsCreature", -1 };
 
 //returns actual damage
@@ -5302,8 +5303,11 @@ int Actor::GetToHit(int bonus, ieDword Flags, Actor *target) const
 				tohit += 4;
 			}
 		}
+		tohit += fxqueue.BonusAgainstCreature(fx_tohit_vs_creature_ref, target);
+
 	}
 
+
 	if (ReverseToHit) {
 		tohit = (signed)GetStat(IE_TOHIT)-tohit;
 	} else {

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


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