Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Merge changes from next patch

Browse source
This commit is contained in:
kervala 2011-05-26 14:16:13 +02:00
parent d7556cfe3c
commit e59f5dbf31
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/ryzom/common/src/game_share/action_nature.cpp
View file

@ -38,6 +38,7 @@ namespace ACTNATURE
NL_STRING_CONVERSION_TABLE_ENTRY(DODGE) NL_STRING_CONVERSION_TABLE_ENTRY(DODGE)
NL_STRING_CONVERSION_TABLE_ENTRY(PARRY) NL_STRING_CONVERSION_TABLE_ENTRY(PARRY)
NL_STRING_CONVERSION_TABLE_ENTRY(SHIELD_USE) NL_STRING_CONVERSION_TABLE_ENTRY(SHIELD_USE)
NL_STRING_CONVERSION_TABLE_ENTRY(RECHARGE)
NL_END_STRING_CONVERSION_TABLE(TActionNature, ActionNatureConversion, UNKNOWN) NL_END_STRING_CONVERSION_TABLE(TActionNature, ActionNatureConversion, UNKNOWN)

1
code/ryzom/common/src/game_share/action_nature.h
View file

@ -35,6 +35,7 @@ namespace ACTNATURE
DODGE, DODGE,
PARRY, PARRY,
SHIELD_USE, SHIELD_USE,
RECHARGE,
NEUTRAL, //only for multi effect on spell,progression consider it as OFFENSIVE_MAGIC NEUTRAL, //only for multi effect on spell,progression consider it as OFFENSIVE_MAGIC

3
code/ryzom/common/src/game_share/magic_fx.h
View file

@ -133,6 +133,9 @@ namespace MAGICFX
WaterWall = 11, WaterWall = 11,
ThornWall = 12, ThornWall = 12,
LightningWall = 13, LightningWall = 13,
OtherFireWall = 14,
TeleportKami = 15, // No effect aura
TeleportKara = 16, // No effect aura
}; };
} }