Mercurial > sumwars

changeset 11:3dcd6f906783

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
XML-System erweitert
author kemic
date Wed, 01 Oct 2008 10:18:46 +0000
parents 30e67179d6cd
children 5d7cea3f23f3
files data/items.xml src/core/itemloader.cpp src/gui/application.cpp
diffstat 3 files changed, 64 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/data/items.xml	Tue Sep 30 14:44:34 2008 +0000
+++ b/data/items.xml	Wed Oct 01 10:18:46 2008 +0000
@@ -9,11 +9,49 @@
 		level_requirement="char"
 		character_requirement="char"
 		price="int"
-		min_enchant="30"
-		max_enchant="120"
+		min_enchant="float"
+		max_enchant="float"
+	/>
+	<UseupEffect
+		dhealth="float"
+		dstatus_mod_immune_time0="float"
+		dstatus_mod_immune_time1="float"
+		dstatus_mod_immune_time2="float"
+		dstatus_mod_immune_time3="float"
+		dstatus_mod_immune_time4="float"
+		dstatus_mod_immune_time5="float"
+		dstatus_mod_immune_time6="float"
+		dstatus_mod_immune_time7="float"
 	/>
-	<UseupEffect />
-	<EquipEffect />
+	<EquipEffect
+		darmor="short"
+		dblock="short"
+		dmax_health="float"
+		dattack="short"
+		dstrength="short"
+		ddexterity="short"
+		dmagic_power="short"
+		dwillpower="short"
+		dresistances_physical="short"
+		dresistances_air="short"
+		dresistances_ice="short"
+		dresistances_fire="short"
+		dresistances_cap_physical="short"
+		dresistances_cap_air="short"
+		dresistances_cap_ice="short"
+		dresistances_cap_fire="short"
+		dwalk_speed="short"
+		dattack_speed="short"
+		xspecial_flags="int"
+		time="float"
+		xabilities0="int"
+		xabilities1="int"
+		xabilities2="int"
+		xabilities3="int"
+		xabilities4="int"
+		xabilities5="int"
+		ximmunity="char"
+	/>
 	<WeaponAttribute
 		damage_min_physical="5"
 		damage_max_physical="10"
@@ -25,9 +63,9 @@
 		damage_max_fire="0"
 		damage_attack="20"
 		damage_power="30"
-		attack_range="1.0"
+		attack_range="float"
 		two_handed="no"
-		dattack_speed="500"
+		dattack_speed="short"
 	/>
 	<DropChance
 		level="int"
--- a/src/core/itemloader.cpp	Tue Sep 30 14:44:34 2008 +0000
+++ b/src/core/itemloader.cpp	Wed Oct 01 10:18:46 2008 +0000
@@ -73,6 +73,25 @@
 		
 		while (element == "UseupEffect" && pAttrib)
 		{
+			if (!strcmp(pAttrib->Name(), "dhealth") && pAttrib->QueryDoubleValue(&dval) == TIXML_SUCCESS)
+				m_item_data->m_useup_effect->m_dhealth = static_cast<float>(dval);
+			else if (!strcmp(pAttrib->Name(), "dstatus_mod_immune_time0") && pAttrib->QueryDoubleValue(&dval) == TIXML_SUCCESS)
+				m_item_data->m_useup_effect->m_dstatus_mod_immune_time[0] = static_cast<float>(dval);
+			else if (!strcmp(pAttrib->Name(), "dstatus_mod_immune_time1") && pAttrib->QueryDoubleValue(&dval) == TIXML_SUCCESS)
+				m_item_data->m_useup_effect->m_dstatus_mod_immune_time[1] = static_cast<float>(dval);
+			else if (!strcmp(pAttrib->Name(), "dstatus_mod_immune_time2") && pAttrib->QueryDoubleValue(&dval) == TIXML_SUCCESS)
+				m_item_data->m_useup_effect->m_dstatus_mod_immune_time[2] = static_cast<float>(dval);
+			else if (!strcmp(pAttrib->Name(), "dstatus_mod_immune_time3") && pAttrib->QueryDoubleValue(&dval) == TIXML_SUCCESS)
+				m_item_data->m_useup_effect->m_dstatus_mod_immune_time[3] = static_cast<float>(dval);
+			else if (!strcmp(pAttrib->Name(), "dstatus_mod_immune_time4") && pAttrib->QueryDoubleValue(&dval) == TIXML_SUCCESS)
+				m_item_data->m_useup_effect->m_dstatus_mod_immune_time[4] = static_cast<float>(dval);
+			else if (!strcmp(pAttrib->Name(), "dstatus_mod_immune_time5") && pAttrib->QueryDoubleValue(&dval) == TIXML_SUCCESS)
+				m_item_data->m_useup_effect->m_dstatus_mod_immune_time[5] = static_cast<float>(dval);
+			else if (!strcmp(pAttrib->Name(), "dstatus_mod_immune_time6") && pAttrib->QueryDoubleValue(&dval) == TIXML_SUCCESS)
+				m_item_data->m_useup_effect->m_dstatus_mod_immune_time[6] = static_cast<float>(dval);
+			else if (!strcmp(pAttrib->Name(), "dstatus_mod_immune_time7") && pAttrib->QueryDoubleValue(&dval) == TIXML_SUCCESS)
+				m_item_data->m_useup_effect->m_dstatus_mod_immune_time[7] = static_cast<float>(dval);
+			
 			i++;
 			pAttrib=pAttrib->Next();
 		}
--- a/src/gui/application.cpp	Tue Sep 30 14:44:34 2008 +0000
+++ b/src/gui/application.cpp	Wed Oct 01 10:18:46 2008 +0000
@@ -318,7 +318,7 @@
 			result = setlocale (LC_MESSAGES, "en_NZ");
 	}
 
-	bindtextdomain ("sumwars","../shared/translation/");
+	bindtextdomain ("sumwars","../../translation/");
 	textdomain ("sumwars");
 	return result;
 	#endif