diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll index 444d06d8..0ce5d3d5 100644 Binary files a/1.6/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/1.6/Assemblies/WulaFallenEmpire.dll differ diff --git a/1.6/1.6/Defs/QuestScriptDefs/Wula_ScheduledEvents.xml b/1.6/1.6/Defs/QuestScriptDefs/Wula_ScheduledEvents.xml index 6dbb39d4..31b58973 100644 --- a/1.6/1.6/Defs/QuestScriptDefs/Wula_ScheduledEvents.xml +++ b/1.6/1.6/Defs/QuestScriptDefs/Wula_ScheduledEvents.xml @@ -1,5 +1,64 @@ + + Wula_Quest_ExampleEvent + + 一个强大的心灵实体将它的意志强加于你的意识之中。 + + +
  • + + +
  • questName->乌拉的呼唤
    • + + + +
  • + + +
  • questDescription->一个强大的心灵实体将它的意志强加于你的意识之中。
    • + + + +
  • + 乌拉需要你的注意 + 乌拉需要你的注意 + 一个强大的心灵实体将它的意志强加于你的意识之中。它自称为“乌拉”，并要求你阅览它的消息。这股力量是压倒性的，不容拒绝。 + +
  • + + +
  • + +
  • + Wula_UI_Anisia_1 +
    • + + + + +
  • + + +
  • + +
  • + Wula_UI_Anisia_1 +
    • +
  • + 你试图抵抗心灵入侵，但这股力量过于强大。无论如何，消息还是涌入了你的脑海。 + NegativeEvent +
    • + + + + + + +     +     +     + Wula_Quest_RecoverItem @@ -50,15 +109,15 @@ Wula_QuestItem_AncientDataDevice itemStashContents + +
  • +
  • +
  • $itemStashContents itemStashContents
    • - -
  • -
  • -
  • @@ -83,11 +142,19 @@
  • - WulaFallenEmpire.Quest.RecoverItem.ItemRecoveredToHome - - $itemStashContents.Map - $itemStashContents - + site.AllEnemiesDefeated + + +
  • + + 任务地点的敌人已被清除。乌拉族的回收穿梭机正在赶来，请等待其抵达并装载物品。 +
    • +
  • + $site.Map + $itemStashContents +
    • + +
  • @@ -96,7 +163,7 @@
  • - $(800 * questPointFactor) + $(800 * questPointFactor)
  • @@ -106,13 +173,29 @@
    • - +
  • + site.MapRemoved + site.MapGenerated + + +
  • + + 你离开了任务地点，但未能将[itemStashContents_label]装载到回收穿梭机中。乌拉族对此表示失望，任务失败。 +
    • +
  • + Fail +
    • + + + + +
  • - $site - true - $(randInt(12,28)*60000) - site.MapGenerated - QuestTimeout + $site + true + $(randInt(12,28)*60000) + site.MapGenerated + QuestTimeout
  • QuestTimeout diff --git a/1.6/1.6/Languages/ChineseSimplified/Keyed/Wula_Quest_Keys.xml b/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Wula_Quest_Keys.xml similarity index 61% rename from 1.6/1.6/Languages/ChineseSimplified/Keyed/Wula_Quest_Keys.xml rename to 1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Wula_Quest_Keys.xml index ec9bfba9..a45f7801 100644 --- a/1.6/1.6/Languages/ChineseSimplified/Keyed/Wula_Quest_Keys.xml +++ b/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Wula_Quest_Keys.xml @@ -8,7 +8,9 @@ 你收到了一个来自乌拉族的任务请求。 已取回物品 你的人已经拿到了{0}。现在需要将它安全带回殖民地，乌拉族会派穿梭机来取走它。 - 回收穿梭机已抵达 - 乌拉族的回收穿梭机已经抵达。请将{0}装载到穿梭机中以完成任务。 + 回收穿梭机即将抵达 + 任务地点的敌人已被清除。乌拉族的回收穿梭机正在赶来，请等待其抵达并装载物品。 + 任务失败：未回收物品 + 你离开了任务地点，但未能将{0}装载到回收穿梭机中。乌拉族对此表示失望，任务失败。 \ No newline at end of file diff --git a/1.6/1.6/Languages/English/Keyed/Wula_Quest_Keys.xml b/1.6/1.6/Languages/English/Keyed/Wula_Quest_Keys.xml new file mode 100644 index 00000000..c44c0b5a --- /dev/null +++ b/1.6/1.6/Languages/English/Keyed/Wula_Quest_Keys.xml @@ -0,0 +1,16 @@ + + + + + Recover: {0} + An agent of the Wula has contacted you. They have located an ancient relic containing {0}, guarded by {1} of the {2}.\n\nThey wish for you to retrieve this item. In return, they will provide a reward.\n\nThe location is at [site_tile_label], [site_tile_distance] days travel from [site_tile_label]. + Quest: Recover Item + You have received a quest request from the Wula. + Item Retrieved + Your people have retrieved the {0}. You now need to bring it safely back to your colony, and the Wula will send a shuttle to collect it. + Recovery Shuttle Arrived + The enemies at the quest site have been cleared. The Wula recovery shuttle is en route, please wait for its arrival and load the item. + Quest Failed: Item Not Recovered + You left the quest site without loading the {0} onto the recovery shuttle. The Wula are disappointed, and the quest has failed. + + \ No newline at end of file diff --git a/Source/WulaFallenEmpire/Quests/QuestUtility.cs b/Source/WulaFallenEmpire/Quests/QuestUtility.cs index ae05d008..f4d14c26 100644 --- a/Source/WulaFallenEmpire/Quests/QuestUtility.cs +++ b/Source/WulaFallenEmpire/Quests/QuestUtility.cs @@ -50,13 +50,13 @@ namespace WulaFallenEmpire.Quests if (item.Map != null && item.Map.IsPlayerHome) { - Find.SignalManager.SendSignal(new Signal("WulaFallenEmpire.Quest.RecoverItem.ItemRecoveredToHome")); + Find.SignalManager.SendSignal(new Signal("WulaFallenEmpire.Quest.RecoverItem.ItemRecoveredToHome", new NamedArgument(item, "SUBJECT"))); } if (item.ParentHolder is CompTransporter transporter && transporter.groupID == shuttleGroupID) { - Find.SignalManager.SendSignal(new Signal("WulaFallenEmpire.Quest.RecoverItem.ItemLoadedOnShuttle")); - UnregisterRecoveryQuest(item); + Find.SignalManager.SendSignal(new Signal("WulaFallenEmpire.Quest.RecoverItem.ItemLoadedOnShuttle", new NamedArgument(item, "SUBJECT"))); + UnregisterRecoveryQuest(item); } } }