Menu
▾
▴
[Gemrb-commits] SF.net SVN: gemrb:[7156] gemrb/trunk/gemrb
|
From: <lyn...@us...> - 2009-09-14 12:10:11
|
Revision: 7156
http://gemrb.svn.sourceforge.net/gemrb/?rev=7156&view=rev
Author: lynxlupodian
Date: 2009-09-14 12:10:04 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
fixed damage resistance for damage types without it
aka rats lost their superpowers
Modified Paths:
--------------
gemrb/trunk/gemrb/override/bg1/dmgtypes.2da
gemrb/trunk/gemrb/override/bg2/dmgtypes.2da
gemrb/trunk/gemrb/override/how/dmgtypes.2da
gemrb/trunk/gemrb/override/iwd/dmgtypes.2da
gemrb/trunk/gemrb/override/iwd2/dmgtypes.2da
gemrb/trunk/gemrb/override/pst/dmgtypes.2da
gemrb/trunk/gemrb/plugins/Core/Actor.cpp
Modified: gemrb/trunk/gemrb/override/bg1/dmgtypes.2da
===================================================================
--- gemrb/trunk/gemrb/override/bg1/dmgtypes.2da 2009-09-14 12:04:58 UTC (rev 7155)
+++ gemrb/trunk/gemrb/override/bg1/dmgtypes.2da 2009-09-14 12:10:04 UTC (rev 7156)
@@ -15,7 +15,7 @@
DAMAGE_PIERCINGMISSILE 133 24 0x400
DAMAGE_MAGICCOLD 139 20 0x400
DAMAGE_CRUSHINGMISSILE 133 24 0x400
-DAMAGE_STUNNING 141 -1 0x800
-DAMAGE_SOULEATER 141 -1 0x1000
-DAMAGE_DISEASE 141 -1 0x4000
-DAMAGE_CHUNKING 141 -1 0x8000
+DAMAGE_STUNNING 141 0 0x800
+DAMAGE_SOULEATER 141 0 0x1000
+DAMAGE_DISEASE 141 0 0x4000
+DAMAGE_CHUNKING 141 0 0x8000
Modified: gemrb/trunk/gemrb/override/bg2/dmgtypes.2da
===================================================================
--- gemrb/trunk/gemrb/override/bg2/dmgtypes.2da 2009-09-14 12:04:58 UTC (rev 7155)
+++ gemrb/trunk/gemrb/override/bg2/dmgtypes.2da 2009-09-14 12:10:04 UTC (rev 7156)
@@ -15,7 +15,7 @@
DAMAGE_PIERCINGMISSILE 133 24 0x400
DAMAGE_MAGICCOLD 139 20 0x400
DAMAGE_CRUSHINGMISSILE 133 24 0x400
-DAMAGE_STUNNING 141 -1 0x800
-DAMAGE_SOULEATER 141 -1 0x1000
-DAMAGE_DISEASE 141 -1 0x4000
-DAMAGE_CHUNKING 141 -1 0x8000
+DAMAGE_STUNNING 141 0 0x800
+DAMAGE_SOULEATER 141 0 0x1000
+DAMAGE_DISEASE 141 0 0x4000
+DAMAGE_CHUNKING 141 0 0x8000
Modified: gemrb/trunk/gemrb/override/how/dmgtypes.2da
===================================================================
--- gemrb/trunk/gemrb/override/how/dmgtypes.2da 2009-09-14 12:04:58 UTC (rev 7155)
+++ gemrb/trunk/gemrb/override/how/dmgtypes.2da 2009-09-14 12:10:04 UTC (rev 7156)
@@ -15,7 +15,7 @@
DAMAGE_PIERCINGMISSILE 133 24 0x400
DAMAGE_MAGICCOLD 139 20 0x400
DAMAGE_CRUSHINGMISSILE 133 24 0x400
-DAMAGE_STUNNING 141 -1 0x800
-DAMAGE_SOULEATER 141 -1 0x1000
-DAMAGE_DISEASE 141 -1 0x4000
-DAMAGE_CHUNKING 141 -1 0x8000
+DAMAGE_STUNNING 141 0 0x800
+DAMAGE_SOULEATER 141 0 0x1000
+DAMAGE_DISEASE 141 0 0x4000
+DAMAGE_CHUNKING 141 0 0x8000
Modified: gemrb/trunk/gemrb/override/iwd/dmgtypes.2da
===================================================================
--- gemrb/trunk/gemrb/override/iwd/dmgtypes.2da 2009-09-14 12:04:58 UTC (rev 7155)
+++ gemrb/trunk/gemrb/override/iwd/dmgtypes.2da 2009-09-14 12:10:04 UTC (rev 7156)
@@ -15,7 +15,7 @@
DAMAGE_PIERCINGMISSILE 133 24 0x400
DAMAGE_MAGICCOLD 139 20 0x400
DAMAGE_CRUSHINGMISSILE 133 24 0x400
-DAMAGE_STUNNING 141 -1 0x800
-DAMAGE_SOULEATER 141 -1 0x1000
-DAMAGE_DISEASE 141 -1 0x4000
-DAMAGE_CHUNKING 141 -1 0x8000
+DAMAGE_STUNNING 141 0 0x800
+DAMAGE_SOULEATER 141 0 0x1000
+DAMAGE_DISEASE 141 0 0x4000
+DAMAGE_CHUNKING 141 0 0x8000
Modified: gemrb/trunk/gemrb/override/iwd2/dmgtypes.2da
===================================================================
--- gemrb/trunk/gemrb/override/iwd2/dmgtypes.2da 2009-09-14 12:04:58 UTC (rev 7155)
+++ gemrb/trunk/gemrb/override/iwd2/dmgtypes.2da 2009-09-14 12:10:04 UTC (rev 7156)
@@ -15,7 +15,7 @@
DAMAGE_PIERCINGMISSILE 133 24 0x400
DAMAGE_MAGICCOLD 139 20 0x400
DAMAGE_CRUSHINGMISSILE 133 24 0x400
-DAMAGE_STUNNING 141 -1 0x800
-DAMAGE_SOULEATER 141 -1 0x1000
-DAMAGE_DISEASE 141 -1 0x4000
-DAMAGE_CHUNKING 141 -1 0x8000
+DAMAGE_STUNNING 141 0 0x800
+DAMAGE_SOULEATER 141 0 0x1000
+DAMAGE_DISEASE 141 0 0x4000
+DAMAGE_CHUNKING 141 0 0x8000
Modified: gemrb/trunk/gemrb/override/pst/dmgtypes.2da
===================================================================
--- gemrb/trunk/gemrb/override/pst/dmgtypes.2da 2009-09-14 12:04:58 UTC (rev 7155)
+++ gemrb/trunk/gemrb/override/pst/dmgtypes.2da 2009-09-14 12:10:04 UTC (rev 7156)
@@ -15,7 +15,7 @@
DAMAGE_PIERCINGMISSILE 133 24 0x400
DAMAGE_MAGICCOLD 139 20 0x400
DAMAGE_CRUSHINGMISSILE 133 24 0x400
-DAMAGE_STUNNING 141 -1 0x800
-DAMAGE_SOULEATER 141 -1 0x1000
-DAMAGE_DISEASE 141 -1 0x4000
-DAMAGE_CHUNKING 141 -1 0x8000
+DAMAGE_STUNNING 141 0 0x800
+DAMAGE_SOULEATER 141 0 0x1000
+DAMAGE_DISEASE 141 0 0x4000
+DAMAGE_CHUNKING 141 0 0x8000
Modified: gemrb/trunk/gemrb/plugins/Core/Actor.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2009-09-14 12:04:58 UTC (rev 7155)
+++ gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2009-09-14 12:10:04 UTC (rev 7156)
@@ -2485,7 +2485,6 @@
}
} else {
if (resisted == DR_IMMUNE) {
- // this will also display for hits on stoneskins and mirrorimages
printMessage("Actor", " ", GREEN);
printf("is immune to damage type: %s.\n", type_name);
@@ -3952,6 +3951,8 @@
it = core->DamageInfoMap.find(damagetype);
if (it == core->DamageInfoMap.end()) {
printf("Unhandled damagetype:%d\n", damagetype);
+ } else if (it->second.resist_stat == 0) {
+ // damage type without a resistance stat
} else {
resisted = (int) (damage * (signed)target->GetStat(it->second.resist_stat)/100.0);
damage -= resisted;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|