Changed: Merge changes from next patch

code/ryzom/common/src/game_share/action_nature.cpp

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

code/ryzom/common/src/game_share/action_nature.h

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

code/ryzom/common/src/game_share/magic_fx.h

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