From: Laszlo T. <ave...@us...> - 2012-01-29 19:18:25
|
gemrb: Infinity Engine emulator The branch master has been updated via daf042f6ccddddb454d9a9025760cae7ebca8c74 (commit) Summary of changes: gemrb/includes/strrefs.h | 3 +- gemrb/override/bg1/strings.2da | 1 + gemrb/override/bg2/strings.2da | 1 + gemrb/override/how/strings.2da | 1 + gemrb/override/iwd/strings.2da | 1 + gemrb/override/iwd2/strings.2da | 297 +++++++++++++++++---------------- gemrb/plugins/FXOpcodes/FXOpcodes.cpp | 3 + 7 files changed, 158 insertions(+), 149 deletions(-) from 5d9fbd4c4fba7d9d0df40a834f687610af1e79c6 (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=daf042f6ccddddb454d9a9025760cae7ebca8c74 commit daf042f6ccddddb454d9a9025760cae7ebca8c74 Author: Avenger <ave...@so...> Date: Sun Jan 29 20:17:51 2012 +0100 snakebite comes with a 'Held' string printed diff --git a/gemrb/includes/strrefs.h b/gemrb/includes/strrefs.h index c256e38..a6dde0f 100644 --- a/gemrb/includes/strrefs.h +++ b/gemrb/includes/strrefs.h @@ -209,7 +209,8 @@ #define STR_EXPERTISE 176 #define STR_POWERATTACK 177 #define STR_CLEAVE 178 +#define STR_HELD 179 -#define STRREF_COUNT 179 +#define STRREF_COUNT 180 #endif //! IE_STRINGS_H diff --git a/gemrb/override/bg1/strings.2da b/gemrb/override/bg1/strings.2da index f5063e5..7990f7e 100644 --- a/gemrb/override/bg1/strings.2da +++ b/gemrb/override/bg1/strings.2da @@ -180,3 +180,4 @@ ARTERIAL -1 EXPERTISE -1 POWERATTACK -1 CLEAVE -1 +HELD 14102 diff --git a/gemrb/override/bg2/strings.2da b/gemrb/override/bg2/strings.2da index 444d37d..39d7554 100644 --- a/gemrb/override/bg2/strings.2da +++ b/gemrb/override/bg2/strings.2da @@ -180,3 +180,4 @@ ARTERIAL -1 EXPERTISE -1 POWERATTACK -1 CLEAVE -1 +HELD 14102 diff --git a/gemrb/override/how/strings.2da b/gemrb/override/how/strings.2da index c8b2d87..202a9ab 100644 --- a/gemrb/override/how/strings.2da +++ b/gemrb/override/how/strings.2da @@ -180,3 +180,4 @@ ARTERIAL -1 EXPERTISE -1 POWERATTACK -1 CLEAVE -1 +HELD 14102 diff --git a/gemrb/override/iwd/strings.2da b/gemrb/override/iwd/strings.2da index 5b93de4..ec6c347 100644 --- a/gemrb/override/iwd/strings.2da +++ b/gemrb/override/iwd/strings.2da @@ -180,3 +180,4 @@ ARTERIAL -1 EXPERTISE -1 POWERATTACK -1 CLEAVE -1 +HELD 14102 diff --git a/gemrb/override/iwd2/strings.2da b/gemrb/override/iwd2/strings.2da index 61c1c19..a37bea5 100644 --- a/gemrb/override/iwd2/strings.2da +++ b/gemrb/override/iwd2/strings.2da @@ -1,182 +1,183 @@ 2DA V1.0 -1 STRREF -SCATTERED 16457 -WHOLEPARTY 16484 -DOORLOCKED 16485 -MAGICTRAP 16486 -NORMALTRAP 16487 -TRAP 16488 -CANNOTGO 16489 -TRAPREMOVED 16490 -OVERSTOCKED 16491 -SLEEP 16492 -AMBUSH 16493 -CONTLOCKED 16494 -NOMONEY 16495 -CURSED 16496 -SPELLDISRUPT 16497 -DIED 16498 -MAYNOTREST 16499 -CANTRESTMONS 16500 -CANTSAVEMONS 16501 -CANTSAVE 16502 -NODIALOG 10945 -CANTSAVEDIALOG 19253 -CANTSAVEDIALOG2 19254 -CANTSAVEMOVIE 19255 +SCATTERED 55021 +WHOLEPARTY -1 +DOORLOCKED 19309 +MAGICTRAP 19289 +NORMALTRAP 19289 +TRAP -1 +CANNOTGO -1 +TRAPREMOVED 19287 +OVERSTOCKED 19283 +SLEEP -1 +AMBUSH -1 +CONTLOCKED 22031 +NOMONEY -1 +CURSED 50538 +SPELLDISRUPT -1 +DIED -1 +MAYNOTREST 34599 +CANTRESTMONS 34600 +CANTSAVEMONS 34598 +CANTSAVE 34592 +NODIALOG -1 +CANTSAVEDIALOG 34593 +CANTSAVEDIALOG2 -1 +CANTSAVEMOVIE 34594 TARGETBUSY -1 CANTTALKTRANS -1 -GOTGOLD 17572 -LOSTGOLD 17573 -GOTXP 17574 -LOSTXP 17575 -GOTITEM 17576 -LOSTITEM 17577 -GOTREP 19686 -LOSTREP 19687 -GOTABILITY 10514 -GOTSPELL 10514 -GOTSONG 26320 +GOTGOLD 19252 +LOSTGOLD 19253 +GOTXP 19254 +LOSTXP 19255 +GOTITEM 19256 +LOSTITEM 19258 +GOTREP 19259 +LOSTREP 19260 +GOTABILITY 19307 +GOTSPELL -1 +GOTSONG -1 NOTHINGTOSAY -1 -JOURNALCHANGE 11359 -WORLDMAPCHANGE 11360 -PAUSED 16321 -UNPAUSED 16322 -SCRIPTPAUSED 7666 -AP_UNUSABLE 17113 -AP_ATTACKED 17114 -AP_HIT 17115 -AP_WOUNDED 17116 -AP_DEAD 17117 -AP_NOTARGET 17118 -AP_ENDROUND 10014 -AP_ENEMY 23511 -AP_TRAP -1 -AP_SPELLCAST -1 -AP_GENERIC 17166 -AP_RESERVED1 -1 -AP_RESERVED2 -1 -AP_RESERVED3 -1 -CHARMED 14672 -DIRECHARMED 14780 +JOURNALCHANGE 37096 +WORLDMAPCHANGE 19264 +PAUSED 39436 +UNPAUSED -1 +SCRIPTPAUSED 39436 +AP_UNUSABLE 39436 +AP_ATTACKED 39436 +AP_HIT 39436 +AP_WOUNDED 39436 +AP_DEAD 39436 +AP_NOTARGET 39436 +AP_ENDROUND 39436 +AP_ENEMY 39436 +AP_TRAP 39436 +AP_SPELLCAST 39436 +AP_GENERIC 39436 +AP_RESERVED1 39436 +AP_RESERVED2 39436 +AP_RESERVED3 39436 +CHARMED -1 +DIRECHARMED -1 CONTROLLED -1 -EVIL 16505 -GNE_NEUTRAL 16504 -GOOD 16503 +EVIL -1 +GNE_NEUTRAL -1 +GOOD -1 STR_LAWFUL -1 LNC_NEUTRAL -1 CHAOTIC -1 -ACTION_CAST 16464 -ACTION_ATTACK 16465 -ACTION_TURN 16466 -ACTION_SONG 16467 -ACTION_FINDTRAP 16468 -MAGICWEAPON 10141 -OFFHAND_USED 9380 -TWOHANDED_USED 9381 -CANNOT_USE_ITEM 9382 -CANT_DROP_ITEM 25697 -NOT_IN_OFFHAND 26342 -ITEM_IS_CURSED 16304 -NO_CRITICAL 20696 +ACTION_CAST -1 +ACTION_ATTACK -1 +ACTION_TURN -1 +ACTION_SONG -1 +ACTION_FINDTRAP -1 +MAGICWEAPON -1 +OFFHAND_USED -1 +TWOHANDED_USED -1 +CANNOT_USE_ITEM 50532 +CANT_DROP_ITEM 50569 +NOT_IN_OFFHAND -1 +ITEM_IS_CURSED 50538 +NO_CRITICAL 19273 TRACKING -1 -TRACKINGFAILED 19534 +TRACKINGFAILED -1 DOOR_NOPICK 23169 CONT_NOPICK 23169 CANTSAVECOMBAT -1 CANTSAVENOCTRL -1 -LOCKPICK_DONE 16517 -LOCKPICK_FAILED 16518 -STATIC_DISSIPATE 26518 -LIGHTNING_DISSIPATE 41008 -HAS_NO_ABILITY 17317 -NEEDS_IDENTIFY 17316 -WRONG_ITEMTYPE 9375 -HAS_ITEMEXCL 20685 -PICKPOCKET_DONE 10072 -PICKPOCKET_NONE 18297 -PICKPOCKET_FAIL 10069 -PICKPOCKET_EVIL 10068 -PICKPOCKET_ARMOR 10067 -USING_FEAT 39823 -STOPPED_FEAT 39853 +LOCKPICK_DONE 19281 +LOCKPICK_FAILED 19282 +STATIC_DISSIPATE -1 +LIGHTNING_DISSIPATE -1 +HAS_NO_ABILITY 50545 +NEEDS_IDENTIFY 50544 +WRONG_ITEMTYPE 50537 +HAS_ITEMEXCL -1 +PICKPOCKET_DONE -1 +PICKPOCKET_NONE 19304 +PICKPOCKET_FAIL 19303 +PICKPOCKET_EVIL 19302 +PICKPOCKET_ARMOR 19301 +USING_FEAT -1 +STOPPED_FEAT -1 DISARM_DONE 16520 DISARM_FAIL 1608 -DOORBASH_DONE 9915 -DOORBASH_FAIL 9913 -CONTBASH_DONE 9916 -CONTBASH_FAIL 9914 +DOORBASH_DONE -1 +DOORBASH_FAIL -1 +CONTBASH_DONE -1 +CONTBASH_FAIL -1 MAYNOTSETTRAP -1 SNAREFAILED -1 SNARESUCCEED -1 NOMORETRAP -1 DISABLEDMAGE -1 -SAVESUCCEED 1682 -QSAVESUCCEED 10237 -UNINJURED 2943 -INJURED1 2944 -INJURED2 2945 -INJURED3 2946 -INJURED4 2947 -HOURS 10700 -HOUR 10701 -DAYS 10697 -DAY 10698 -REST 10690 -JOURNEY 10689 -PST_REST -1 -PST_HOUR -1 -PST_HOURS -1 -DAMAGE_IMMUNITY 25038 -DAMAGE_STR1 25028 -DAMAGE_STR2 25017 -DAMAGE_STR3 26223 -DMG_POISON 25018 -DMG_MAGIC 25019 -DMG_MISSILE 25020 -DMG_SLASHING 25021 -DMG_PIERCING 25022 -DMG_CRUSHING 25023 -DMG_FIRE 25024 -DMG_ELECTRIC 25025 -DMG_COLD 25026 -DMG_ACID 25027 -DMG_OTHER 0 +SAVESUCCEED 28646 +QSAVESUCCEED 50461 +UNINJURED -1 +INJURED1 -1 +INJURED2 -1 +INJURED3 -1 +INJURED4 -1 +HOURS -1 +HOUR -1 +DAYS -1 +DAY -1 +REST -1 +JOURNEY -1 +PST_REST 19262 +PST_HOUR 19312 +PST_HOURS 19313 +DAMAGE_IMMUNITY -1 +DAMAGE_STR1 -1 +DAMAGE_STR2 -1 +DAMAGE_STR3 -1 +DMG_POISON -1 +DMG_MAGIC -1 +DMG_MISSILE -1 +DMG_SLASHING -1 +DMG_PIERCING -1 +DMG_CRUSHING -1 +DMG_FIRE -1 +DMG_ELECTRIC -1 +DMG_COLD -1 +DMG_ACID -1 +DMG_OTHER -1 GOTQUESTXP -1 -LEVELUP 17119 -INVFULL_ITEMDROP 32879 -CONT_DUP 32876 +LEVELUP 4246 +INVFULL_ITEMDROP 37079 +CONT_DUP -1 CONT_TRIG -1 CONT_FAIL -1 SEQ_DUP -1 -CRITICAL_HIT 16462 -CRITICAL_MISS 16463 -DEATH 14026 +CRITICAL_HIT 19272 +CRITICAL_MISS 19274 +DEATH -1 BACKSTAB 12128 -BACKSTAB_BAD 10013 -BACKSTAB_FAIL 121 +BACKSTAB_BAD 19271 +BACKSTAB_FAIL -1 CASTER_LVL_INC -1 CASTER_LVL_DEC -1 -CHARS_EXPORTED 26827 -PALADIN_FALL 19620 -RANGER_FALL 19621 -RES_RESISTED 26818 +CHARS_EXPORTED -1 +PALADIN_FALL -1 +RANGER_FALL -1 +RES_RESISTED -1 DEADMAGIC_FAIL -1 MISCASTMAGIC -1 WILDSURGE -1 -FAMBLOCK 8537 -FAMPROTAGONIST 8538 -MAGIC_RESISTED 19224 -CANTSAVESTORE 10841 +FAMBLOCK -1 +FAMPROTAGONIST -1 +MAGIC_RESISTED -1 +CANTSAVESTORE -1 NOSEE_NOCAST -1 -AURACLEANSED 23797 -INDOOR_FAIL 9744 -SPELL_DISRUPTED 14796 +AURACLEANSED -1 +INDOOR_FAIL 19300 +SPELL_DISRUPTED -1 CHAOSSHIELD -1 -RAPIDSHOT 35796 -HAMSTRING 35787 -ARTERIAL 35774 -EXPERTISE 35785 -POWERATTACK 35794 -CLEAVE 39846 +RAPIDSHOT -1 +HAMSTRING -1 +ARTERIAL -1 +EXPERTISE -1 +POWERATTACK -1 +CLEAVE -1 +HELD -1 diff --git a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp index 5c31e48..e88c312 100644 --- a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp +++ b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp @@ -1689,6 +1689,9 @@ int fx_set_poisoned_state (Scriptable* /*Owner*/, Actor* target, Effect* fx) target->AddPortraitIcon(PI_HELD); target->SetSpellState(SS_HELD); STATE_SET(STATE_HELPLESS); + if (fx->FirstApply) { + displaymsg->DisplayConstantStringName(STR_HELD, DMC_WHITE, target); + } break; case RPD_7: break; ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |