diff --git a/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml b/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml index 6ee92e33..75861cc2 100644 --- a/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml +++ b/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml @@ -7,6 +7,37 @@ Wula/Events/Portraits/Wula_insignal 基站运转正常,通讯程序已启动。\n\n需要联络乌拉帝国的哪个派系? + +
  • + + +
  • + Wula_UI_Check_Odyssey_Is_Active +
  • +
  • + Wula_UI_Check_Anomaly_Is_Active +
  • +
  • + Wula_UI_Check_Odyssey_Is_Active + 0 +
  • +
  • + Wula_UI_Check_Anomaly_Is_Active + 0 +
  • +
  • + Wula_UI_Check_Odyssey_Is_Active + 1 + Add +
  • +
  • + Wula_UI_Check_Anomaly_Is_Active + 1 + Add +
  • + + +
  • @@ -21,10 +52,16 @@
  • -
  • - +
  • + + 异象DLC支持]]> + +
  • + Wula_FE_Spiritualist_Faction +
  • + -
  • +
  • Wula_UI_FE_Spiritualist_1 @@ -34,16 +71,6 @@
  • -
  • - - -
  • - -
  • - -
  • - -
  • diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Melee_Cleave.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Melee_Cleave.xml deleted file mode 100644 index 91d2c4de..00000000 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Melee_Cleave.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml index 2c088f07..67fde841 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml @@ -361,7 +361,7 @@ false Blunt
  • -
  • +
  • WULA_Melee_Cleave
  • diff --git a/1.6/1.6/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml b/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml similarity index 96% rename from 1.6/1.6/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml rename to 1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml index 4c717d3e..bfcecd00 100644 --- a/1.6/1.6/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml +++ b/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml @@ -1,5 +1,6 @@ + Wula_UI_FE_Spiritualist_1 diff --git a/1.6/Anomaly/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml b/1.6/Anomaly/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml index 19333462..d6152731 100644 --- a/1.6/Anomaly/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml +++ b/1.6/Anomaly/Defs/ThingDefs_Misc/Weapons/WULA_FE_Spiritualist_Weapon.xml @@ -86,7 +86,7 @@ 2 60 -
  • +
  • WULA_DamagePsychicScaling
  • WULA_ExtraPsychicSkill
  • @@ -275,7 +275,7 @@ 2 60 -
  • +
  • WULA_DamagePsychicScaling
  • WULA_ExtraPsychicSkill
  • @@ -451,7 +451,7 @@ 2 60 -
  • +
  • WULA_DamagePsychicScaling
  • WULA_ExtraPsychicSkill
  • @@ -656,7 +656,7 @@ 10 60 -
  • +
  • WULA_DamagePsychicScaling
  • WULA_ExtraPsychicSkill
  • @@ -773,7 +773,7 @@ -
  • +
  • WULA_DamagePsychicScaling
  • WULA_PsychicIgnoreBlock
  • diff --git a/1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml b/1.6/Odyssey/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml similarity index 100% rename from 1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml rename to 1.6/Odyssey/Defs/WeaponTraitDefs/WULA_WeaponCategoryDefs.xml diff --git a/1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml b/1.6/Odyssey/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml similarity index 100% rename from 1.6/1.6/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml rename to 1.6/Odyssey/Defs/WeaponTraitDefs/WULA_WeaponTraitDefs.xml