From 093e6c9906e230c0f19826d95a0fc8a868bb8de3 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Sun, 19 Feb 2012 21:48:22 +0400 Subject: [PATCH] Check and update various structures in world.raws. --- df.creature-raws.xml | 18 ++-- df.descriptors.xml | 8 ++ df.entity-raws.xml | 19 ++++- df.history.xml | 6 +- df.item-raws.xml | 1 + df.reaction-raws.xml | 4 +- df.syndrome.xml | 4 +- v0.34.02.lst | 199 ++++++++++++++++++++++--------------------- 8 files changed, 143 insertions(+), 116 deletions(-) diff --git a/df.creature-raws.xml b/df.creature-raws.xml index 59158803a..13a14dba9 100644 --- a/df.creature-raws.xml +++ b/df.creature-raws.xml @@ -664,15 +664,6 @@ - - - - - - - - - @@ -704,6 +695,10 @@ + + + + @@ -714,6 +709,7 @@ + muscle: @@ -731,6 +727,8 @@ + + @@ -940,7 +938,7 @@ - + diff --git a/df.descriptors.xml b/df.descriptors.xml index 5dbecd8e3..aa880dd70 100644 --- a/df.descriptors.xml +++ b/df.descriptors.xml @@ -5,6 +5,7 @@ + @@ -33,6 +34,13 @@ + + + + + + + diff --git a/df.entity-raws.xml b/df.entity-raws.xml index 15a6f7e7d..e10c3bf87 100644 --- a/df.entity-raws.xml +++ b/df.entity-raws.xml @@ -268,13 +268,14 @@ - + - - + + @@ -303,7 +304,7 @@ - + @@ -354,6 +355,16 @@ + + + + + + + + + + diff --git a/df.history.xml b/df.history.xml index 58ad279aa..2bb6285d7 100644 --- a/df.history.xml +++ b/df.history.xml @@ -107,8 +107,10 @@ - - + + + + diff --git a/df.item-raws.xml b/df.item-raws.xml index c05580003..d95118084 100644 --- a/df.item-raws.xml +++ b/df.item-raws.xml @@ -300,6 +300,7 @@ + - + + + diff --git a/df.syndrome.xml b/df.syndrome.xml index 8a2e9f648..e8515761e 100644 --- a/df.syndrome.xml +++ b/df.syndrome.xml @@ -129,7 +129,9 @@ + inherits-from='creature_interaction_effect'> + + diff --git a/v0.34.02.lst b/v0.34.02.lst index a2e996032..95d04aa4a 100644 --- a/v0.34.02.lst +++ b/v0.34.02.lst @@ -13,7 +13,7 @@ "announcements" :STATUS :UNCHECKED "armor_flags" :STATUS :UNCHECKED "armor_general_flags" :STATUS :UNCHECKED -"armor_properties" :STATUS :UNCHECKED +"armor_properties" :STATUS :VERIFIED "art_facet_type" :STATUS :UNCHECKED "art_image" :STATUS :UNCHECKED "art_image_collection" :STATUS :VERIFIED @@ -43,13 +43,13 @@ "block_square_event_type" :STATUS :UNCHECKED "block_square_event_world_constructionst" :STATUS :UNCHECKED "body_component_info" :STATUS :UNCHECKED -"body_detail_plan" :STATUS :UNCHECKED -"body_part_layer_raw" :STATUS :UNCHECKED -"body_part_raw" :STATUS :UNCHECKED -"body_part_template" :STATUS :UNCHECKED -"body_part_template_contype" :STATUS :UNCHECKED +"body_detail_plan" :STATUS :VERIFIED +"body_part_layer_raw" :STATUS :VERIFIED +"body_part_raw" :STATUS :VERIFIED +"body_part_template" :STATUS :VERIFIED +"body_part_template_contype" :STATUS :VERIFIED "body_part_template_flags" :STATUS :UNCHECKED -"body_template" :STATUS :UNCHECKED +"body_template" :STATUS :VERIFIED "build_req_choice_genst" :STATUS :UNCHECKED "build_req_choice_specst" :STATUS :UNCHECKED "build_req_choice_type" :STATUS :UNCHECKED @@ -80,9 +80,9 @@ "building_coffinst" :STATUS :UNCHECKED "building_coffinst.burial_mode" :STATUS :UNCHECKED "building_constructionst" :STATUS :UNCHECKED -"building_def" :STATUS :UNCHECKED +"building_def" :STATUS :VERIFIED "building_def_furnacest" :STATUS :UNCHECKED -"building_def_workshopst" :STATUS :UNCHECKED +"building_def_workshopst" :STATUS :VERIFIED "building_design" :STATUS :UNCHECKED "building_design.flags" :STATUS :UNCHECKED "building_doorst" :STATUS :UNCHECKED @@ -136,17 +136,17 @@ "building_workshopst" :STATUS :UNCHECKED "builtin_mats" :STATUS :UNCHECKED "burrow" :STATUS :UNCHECKED -"caste_body_info" :STATUS :UNCHECKED -"caste_raw" :STATUS :UNCHECKED -"caste_raw.attributes" :STATUS :UNCHECKED -"caste_raw.caste_profession_name" :STATUS :UNCHECKED -"caste_raw.extracts" :STATUS :UNCHECKED -"caste_raw.misc" :STATUS :UNCHECKED -"caste_raw.personality" :STATUS :UNCHECKED -"caste_raw.unknown2" :STATUS :UNCHECKED +"caste_body_info" :STATUS :VERIFIED +"caste_raw" :STATUS :ALIGNED +"caste_raw.attributes" :STATUS :VERIFIED +"caste_raw.caste_profession_name" :STATUS :VERIFIED +"caste_raw.extracts" :STATUS :VERIFIED +"caste_raw.misc" :STATUS :ALIGNED +"caste_raw.personality" :STATUS :VERIFIED +"caste_raw.unknown2" :STATUS :VERIFIED "caste_raw_flags" :STATUS :UNCHECKED "cave_column_link" :STATUS :UNCHECKED -"color_modifier_raw" :STATUS :UNCHECKED +"color_modifier_raw" :STATUS :VERIFIED "construction" :STATUS :ALIGNED "construction_flags" :STATUS :ALIGNED "construction_type" :STATUS :UNCHECKED @@ -157,32 +157,32 @@ "coord_path" :STATUS :UNCHECKED "corpse_material_type" :STATUS :UNCHECKED "craft_material_class" :STATUS :UNCHECKED -"creature_interaction_effect" :STATUS :UNCHECKED -"creature_interaction_effect_bleedingst" :STATUS :UNCHECKED -"creature_interaction_effect_blistersst" :STATUS :UNCHECKED -"creature_interaction_effect_bruisingst" :STATUS :UNCHECKED -"creature_interaction_effect_cough_bloodst" :STATUS :UNCHECKED -"creature_interaction_effect_dizzinessst" :STATUS :UNCHECKED -"creature_interaction_effect_drowsinessst" :STATUS :UNCHECKED -"creature_interaction_effect_feverst" :STATUS :UNCHECKED -"creature_interaction_effect_flags" :STATUS :UNCHECKED +"creature_interaction_effect" :STATUS :VERIFIED +"creature_interaction_effect_bleedingst" :STATUS :VERIFIED +"creature_interaction_effect_blistersst" :STATUS :VERIFIED +"creature_interaction_effect_bruisingst" :STATUS :VERIFIED +"creature_interaction_effect_cough_bloodst" :STATUS :VERIFIED +"creature_interaction_effect_dizzinessst" :STATUS :VERIFIED +"creature_interaction_effect_drowsinessst" :STATUS :VERIFIED +"creature_interaction_effect_feverst" :STATUS :VERIFIED +"creature_interaction_effect_flags" :STATUS :VERIFIED "creature_interaction_effect_impair_functionst" :STATUS :UNCHECKED -"creature_interaction_effect_nauseast" :STATUS :UNCHECKED -"creature_interaction_effect_necrosisst" :STATUS :UNCHECKED -"creature_interaction_effect_numbnessst" :STATUS :UNCHECKED -"creature_interaction_effect_oozingst" :STATUS :UNCHECKED -"creature_interaction_effect_painst" :STATUS :UNCHECKED -"creature_interaction_effect_paralysisst" :STATUS :UNCHECKED -"creature_interaction_effect_swellingst" :STATUS :UNCHECKED -"creature_interaction_effect_target" :STATUS :UNCHECKED +"creature_interaction_effect_nauseast" :STATUS :VERIFIED +"creature_interaction_effect_necrosisst" :STATUS :VERIFIED +"creature_interaction_effect_numbnessst" :STATUS :VERIFIED +"creature_interaction_effect_oozingst" :STATUS :VERIFIED +"creature_interaction_effect_painst" :STATUS :VERIFIED +"creature_interaction_effect_paralysisst" :STATUS :VERIFIED +"creature_interaction_effect_swellingst" :STATUS :VERIFIED +"creature_interaction_effect_target" :STATUS :VERIFIED "creature_interaction_effect_type" :STATUS :UNCHECKED "creature_interaction_effect_unconsciousnessst" :STATUS :UNCHECKED "creature_interaction_effect_vomit_bloodst" :STATUS :UNCHECKED -"creature_raw" :STATUS :UNCHECKED -"creature_raw.profession_name" :STATUS :UNCHECKED +"creature_raw" :STATUS :ALIGNED +"creature_raw.profession_name" :STATUS :VERIFIED "creature_raw_flags" :STATUS :UNCHECKED -"creature_variation" :STATUS :UNCHECKED -"creature_variation_convert_tag" :STATUS :UNCHECKED +"creature_variation" :STATUS :VERIFIED +"creature_variation_convert_tag" :STATUS :VERIFIED "cursor" :STATUS :VERIFIED "d_init" :STATUS :VERIFIED "d_init.store_dist" :STATUS :VERIFIED @@ -195,9 +195,9 @@ "d_init_nickname" :STATUS :VERIFIED "d_init_tunnel" :STATUS :VERIFIED "d_init_z_view" :STATUS :VERIFIED -"descriptor_color" :STATUS :UNCHECKED -"descriptor_pattern" :STATUS :UNCHECKED -"descriptor_shape" :STATUS :UNCHECKED +"descriptor_color" :STATUS :VERIFIED +"descriptor_pattern" :STATUS :VERIFIED +"descriptor_shape" :STATUS :VERIFIED "dfhack_material_category" :STATUS :UNCHECKED "dipscript_info" :STATUS :UNCHECKED "door_flags" :STATUS :UNCHECKED @@ -212,21 +212,21 @@ "entity_position" :STATUS :UNCHECKED "entity_position_assignment" :STATUS :UNCHECKED "entity_position_flags" :STATUS :UNCHECKED -"entity_position_raw" :STATUS :UNCHECKED +"entity_position_raw" :STATUS :ALIGNED "entity_position_raw_flags" :STATUS :UNCHECKED "entity_position_responsibility" :STATUS :UNCHECKED -"entity_raw" :STATUS :UNCHECKED -"entity_raw.equipment" :STATUS :UNCHECKED -"entity_raw.habitat" :STATUS :UNCHECKED -"entity_raw.jobs" :STATUS :UNCHECKED -"entity_raw.land_holder_trigger" :STATUS :UNCHECKED -"entity_raw.progress_trigger" :STATUS :UNCHECKED -"entity_raw.symbols" :STATUS :UNCHECKED -"entity_raw.workshops" :STATUS :UNCHECKED +"entity_raw" :STATUS :VERIFIED +"entity_raw.equipment" :STATUS :VERIFIED +"entity_raw.habitat" :STATUS :VERIFIED +"entity_raw.jobs" :STATUS :VERIFIED +"entity_raw.land_holder_trigger" :STATUS :VERIFIED +"entity_raw.progress_trigger" :STATUS :VERIFIED +"entity_raw.symbols" :STATUS :ALIGNED +"entity_raw.workshops" :STATUS :VERIFIED "entity_raw_flags" :STATUS :UNCHECKED "entity_uniform" :STATUS :UNCHECKED "environment_type" :STATUS :ALIGNED -"ethic_response" :STATUS :UNCHECKED +"ethic_response" :STATUS :VERIFIED "ethic_type" :STATUS :UNCHECKED "feature" :STATUS :UNCHECKED "feature_alteration" :STATUS :UNCHECKED @@ -464,7 +464,7 @@ "history_event_war_site_tribute_forcedst" :STATUS :UNCHECKED "hospital_supplies" :STATUS :UNCHECKED "hospital_supplies.supplies_needed" :STATUS :UNCHECKED -"improvement_type" :STATUS :UNCHECKED +"improvement_type" :STATUS :VERIFIED "inclusion_type" :STATUS :ALIGNED "init" :STATUS :VERIFIED "init_display" :STATUS :VERIFIED @@ -485,6 +485,7 @@ "inorganic_raw.metal_ore" :STATUS :VERIFIED "inorganic_raw.thread_metal" :STATUS :VERIFIED "instrument_flags" :STATUS :UNCHECKED +"interaction" :STATUS :VERIFIED "interface" :STATUS :VERIFIED "interface_breakdown_types" :STATUS :VERIFIED "interface_button" :STATUS :UNCHECKED @@ -616,21 +617,22 @@ "item_weaponst" :STATUS :UNCHECKED "item_windowst" :STATUS :UNCHECKED "item_woodst" :STATUS :UNCHECKED -"itemdef" :STATUS :UNCHECKED -"itemdef_ammost" :STATUS :UNCHECKED -"itemdef_armorst" :STATUS :UNCHECKED -"itemdef_foodst" :STATUS :UNCHECKED -"itemdef_glovesst" :STATUS :UNCHECKED -"itemdef_helmst" :STATUS :UNCHECKED -"itemdef_instrumentst" :STATUS :UNCHECKED -"itemdef_pantsst" :STATUS :UNCHECKED -"itemdef_shieldst" :STATUS :UNCHECKED -"itemdef_shoesst" :STATUS :UNCHECKED -"itemdef_siegeammost" :STATUS :UNCHECKED -"itemdef_toolst" :STATUS :UNCHECKED -"itemdef_toyst" :STATUS :UNCHECKED -"itemdef_trapcompst" :STATUS :UNCHECKED -"itemdef_weaponst" :STATUS :UNCHECKED +"itemdef" :STATUS :VERIFIED +"itemdef_ammost" :STATUS :VERIFIED +"itemdef_armorst" :STATUS :VERIFIED +"itemdef_foodst" :STATUS :VERIFIED +"itemdef_glovesst" :STATUS :VERIFIED +"itemdef_helmst" :STATUS :VERIFIED +"itemdef_instrumentst" :STATUS :VERIFIED +"itemdef_pantsst" :STATUS :VERIFIED +"itemdef_shieldst" :STATUS :VERIFIED +"itemdef_shoesst" :STATUS :VERIFIED +"itemdef_siegeammost" :STATUS :VERIFIED +"itemdef_toolst" :STATUS :VERIFIED +"itemdef_toolst.tool_use" :STATUS :VERIFIED +"itemdef_toyst" :STATUS :VERIFIED +"itemdef_trapcompst" :STATUS :VERIFIED +"itemdef_weaponst" :STATUS :VERIFIED "itemimprovement" :STATUS :UNCHECKED "itemimprovement_art_imagest" :STATUS :UNCHECKED "itemimprovement_bandsst" :STATUS :UNCHECKED @@ -658,14 +660,14 @@ "job_item_vector_id" :STATUS :UNCHECKED "job_list_link" :STATUS :VERIFIED "job_material_category" :STATUS :ALIGNED -"job_skill" :STATUS :UNCHECKED +"job_skill" :STATUS :VERIFIED "job_skill_class" :STATUS :UNCHECKED "job_type" :STATUS :VERIFIED "job_type_class" :STATUS :UNCHECKED "language_name" :STATUS :VERIFIED -"language_symbol" :STATUS :UNCHECKED -"language_translation" :STATUS :UNCHECKED -"language_word" :STATUS :UNCHECKED +"language_symbol" :STATUS :VERIFIED +"language_translation" :STATUS :VERIFIED +"language_word" :STATUS :VERIFIED "language_word_flags" :STATUS :UNCHECKED "machine" :STATUS :UNCHECKED "machine_info" :STATUS :UNCHECKED @@ -696,15 +698,15 @@ "pants_flags" :STATUS :UNCHECKED "part_of_speech" :STATUS :VERIFIED "party_info" :STATUS :UNCHECKED -"pattern_type" :STATUS :UNCHECKED +"pattern_type" :STATUS :VERIFIED "personality_facet_type" :STATUS :UNCHECKED "physical_attribute_type" :STATUS :UNCHECKED "plant" :STATUS :UNCHECKED "plant_flags" :STATUS :UNCHECKED -"plant_raw" :STATUS :UNCHECKED -"plant_raw.colors" :STATUS :UNCHECKED -"plant_raw.material_defs" :STATUS :UNCHECKED -"plant_raw.tiles" :STATUS :UNCHECKED +"plant_raw" :STATUS :VERIFIED +"plant_raw.colors" :STATUS :VERIFIED +"plant_raw.material_defs" :STATUS :VERIFIED +"plant_raw.tiles" :STATUS :VERIFIED "plant_raw_flags" :STATUS :UNCHECKED "popup_message" :STATUS :UNCHECKED "power_info" :STATUS :UNCHECKED @@ -715,20 +717,20 @@ "proj_unitst" :STATUS :UNCHECKED "projectile" :STATUS :UNCHECKED "projectile_type" :STATUS :UNCHECKED -"reaction" :STATUS :UNCHECKED -"reaction.building" :STATUS :UNCHECKED +"reaction" :STATUS :VERIFIED +"reaction.building" :STATUS :VERIFIED "reaction_flags" :STATUS :UNCHECKED -"reaction_product" :STATUS :UNCHECKED +"reaction_product" :STATUS :VERIFIED "reaction_product_improvement_flags" :STATUS :UNCHECKED "reaction_product_item_flags" :STATUS :UNCHECKED -"reaction_product_item_improvementst" :STATUS :UNCHECKED -"reaction_product_item_improvementst.get_material" :STATUS :UNCHECKED -"reaction_product_itemst" :STATUS :UNCHECKED -"reaction_product_itemst.get_material" :STATUS :UNCHECKED +"reaction_product_item_improvementst" :STATUS :VERIFIED +"reaction_product_item_improvementst.get_material" :STATUS :VERIFIED +"reaction_product_itemst" :STATUS :VERIFIED +"reaction_product_itemst.get_material" :STATUS :VERIFIED "reaction_product_type" :STATUS :UNCHECKED -"reaction_reagent" :STATUS :UNCHECKED -"reaction_reagent_flags" :STATUS :UNCHECKED -"reaction_reagent_itemst" :STATUS :UNCHECKED +"reaction_reagent" :STATUS :VERIFIED +"reaction_reagent_flags" :STATUS :VERIFIED +"reaction_reagent_itemst" :STATUS :VERIFIED "reaction_reagent_type" :STATUS :UNCHECKED "report" :STATUS :UNCHECKED "report.flags" :STATUS :UNCHECKED @@ -783,8 +785,8 @@ "siegeengine_type" :STATUS :UNCHECKED "site_type" :STATUS :UNCHECKED "slab_engraving_type" :STATUS :UNCHECKED -"special_mat_table" :STATUS :UNCHECKED -"sphere_type" :STATUS :UNCHECKED +"special_mat_table" :STATUS :VERIFIED +"sphere_type" :STATUS :VERIFIED "squad" :STATUS :UNCHECKED "squad_ammo_spec" :STATUS :VERIFIED "squad_ammo_spec.flags" :STATUS :VERIFIED @@ -807,8 +809,8 @@ "stockpile_settings.weapons" :STATUS :UNCHECKED "stockpile_settings_food" :STATUS :UNCHECKED "stockpile_settings_refuse" :STATUS :UNCHECKED -"syndrome" :STATUS :UNCHECKED -"syndrome_flags" :STATUS :UNCHECKED +"syndrome" :STATUS :VERIFIED +"syndrome_flags" :STATUS :VERIFIED "texture_handler" :STATUS :UNCHECKED "tile_designation" :STATUS :UNCHECKED "tile_dig_designation" :STATUS :UNCHECKED @@ -822,10 +824,10 @@ "tiletype_shape_basic" :STATUS :UNCHECKED "tiletype_special" :STATUS :UNCHECKED "tiletype_variant" :STATUS :UNCHECKED -"tissue_template" :STATUS :UNCHECKED +"tissue_template" :STATUS :VERIFIED "tissue_template_flags" :STATUS :UNCHECKED "tool_flags" :STATUS :UNCHECKED -"tool_uses" :STATUS :UNCHECKED +"tool_uses" :STATUS :VERIFIED "toy_flags" :STATUS :UNCHECKED "trap_type" :STATUS :UNCHECKED "trapcomp_flags" :STATUS :UNCHECKED @@ -960,11 +962,12 @@ "world_population_ref" :STATUS :VERIFIED "world_population_type" :STATUS :VERIFIED "world_raws" :STATUS :UNCHECKED -"world_raws.buildings" :STATUS :UNCHECKED -"world_raws.creatures" :STATUS :UNCHECKED -"world_raws.itemdefs" :STATUS :UNCHECKED -"world_raws.language" :STATUS :UNCHECKED -"world_raws.plants" :STATUS :UNCHECKED +"world_raws.bodyglosses.*.*" :STATUS :VERIFIED +"world_raws.buildings" :STATUS :VERIFIED +"world_raws.creatures" :STATUS :VERIFIED +"world_raws.itemdefs" :STATUS :VERIFIED +"world_raws.language" :STATUS :VERIFIED +"world_raws.plants" :STATUS :VERIFIED "world_region" :STATUS :UNCHECKED "world_region_details" :STATUS :UNCHECKED "world_region_details.rivers_horizontal" :STATUS :UNCHECKED