王国风云2
ParaWikis
Notice
: Undefined index: HTTP_ACCEPT_LANGUAGE in
/data/wwwroot/www.parawikis.com/skins/Liberty/LibertyTemplate.php
on line
185
最新百科
都市天际线2百科
英雄无敌3百科
维多利亚3百科
奇妙探险队2百科
罪恶帝国百科
英白拉多:罗马百科
热门百科
群星百科
欧陆风云4百科
十字军之王2百科
十字军之王3百科
钢铁雄心4百科
维多利亚2百科
ParaWikis
申请建站
ParaWikis
ParaCommons
最近更改
随机页面
加入QQ群
工具
链入页面
相关更改
特殊页面
页面信息
页面值
帮助
译名手册
字词转换
编辑指南
编辑规范
练手沙盒
资助我们
ParaTranz
资助我们
×
欢迎访问王国风云2百科!
注册一个账号
,一起参与编写吧!这里是
当前的工程
。
全站已采用新UI,任何使用上的问题请点击
这里
。欢迎所有对百科感兴趣的同学加入QQ群:
497888338
。
阅读
查看源代码
查看历史
讨论
查看“合并指南”的源代码
←
合并指南
因为以下原因,您没有权限编辑本页:
您请求的操作仅限属于该用户组的用户执行:
用户
您可以查看和复制此页面的源代码。
{{version|Timeless}} This guide describes the steps to retrofit the changes from a vanilla [[patch]], for a mod that modifies some vanilla files. It is best to avoid copying and modifying vanilla files inside a mod (by [[Modding#Game structure|loading from folders]]), but sometimes this is unavoidable. If you do, there is some extra work needed for every vanilla patch, to merge changes with your own, and make the mod compatible with the new patch: <pre> 'Base' file (vanilla version N) ----------------> 'Destination' file (vanilla version N+1) | New patch | | Copied and modified | Propagating vanilla changes | | v v 'Source' file (mod version N) ----------------> 'Result' file (mod version N+1) Keeping mod changes </pre> ==Merge tool== Ideally you should use a [[wp:Merge_%28version_control%29#Three-way_merge|3-way merge]] tool, with 3-way folder merging capability: * 3-way text merging will resolve most conflicts automatically, allowing to complete much faster and with less risks of mistakes. * 3-way folder merging allows to trigger the 3-way text merge of files that need merging more conveniently. Some 3-way merge tools: * [http://kdiff3.sourceforge.net/ KDiff3] * [http://www.scootersoftware.com/ Beyond Compare 4 Pro] (30 days free trial) Note that [http://winmerge.org/ WinMerge] doesn't support 3-way merge, only 2-way diff. ==Launching the merge== 3-way merge is composed of 4 windows: * '''Source''': The mod * '''Base''': The last vanilla version for which the mod was updated for * '''Destination''': The vanilla version to updated to * '''Result''': The mod For simplicity, it's common to have source and result work on same files, but make sure the old version of the mod is backed-up in case you need to re-start the merge for any reason. {{stub}} ==Tips== * Tell the mergetool about CK2 syntax, for an even more efficient merge and some syntax coloration: ** Comment = Text from # to end of line ** Identifier = Text matching [_a-z]\w* ** String = Text from " to " ** ... * If possible, add new mod entities in separate files, as things added at the end of a vanilla files will always conflict when new elements are added to vanilla. * If removing elements from a large vanilla file, leave breadcrumbs to help the merge tool. This will prevent the tool from attempting to merge with the next element in the file. For instance if removing <code>religious</code> CB in 00_cb_types, keeping the following in the mod will help future merges: <pre> # Regular Holy War CB #religious = { # # can_use_gui = { # # } # # can_use = { # # } # # can_use_title = { # # } # # is_valid = { # # } # # is_valid_title = { # # } # # on_add = { # # } # # on_success_title = { # # } # # on_fail = { # # } # # on_reverse_demand = { # # } # # attacker_ai_victory_worth = { # # } # # attacker_ai_defeat_worth = { # # } # # defender_ai_victory_worth = { # # } # # defender_ai_defeat_worth = { # # } #} </pre> ==参考资料== <references /> {{ModdingGuidesNavbox}} [[Category:模组制作指南]] [[en:Merging guide]]
本页使用的模板:
Template:Ambox
(
查看源代码
)
Template:Ambox/core
(
查看源代码
)
Template:Clear
(
查看源代码
)
Template:ModdingGuidesNavbox
(
查看源代码
)
Template:Navbox
(
查看源代码
)
Template:Navboxgroup
(
查看源代码
)
Template:Stub
(
查看源代码
)
Template:Version
(
查看源代码
)
返回
合并指南
。
×
登录
密码
记住登录
加入王国风云2百科
忘记密码?
其他方式登录