Skip to content
This repository has been archived by the owner on Aug 11, 2020. It is now read-only.

Commit

Permalink
Merge pull request #97 from Parexy/development
Browse files Browse the repository at this point in the history
Update to 0.4.8.3
  • Loading branch information
Parexy authored Jul 15, 2019
2 parents bee3b33 + 8475fbb commit 0df9abe
Show file tree
Hide file tree
Showing 17 changed files with 338 additions and 104 deletions.
2 changes: 1 addition & 1 deletion About/About.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<url>https://github.com/Parexy/Multiplayer/</url>
<description>&lt;color=red&gt;&lt;b&gt;Important: &lt;/b&gt; This mod should be loaded right after Core and before HugsLib to work properly!&lt;/color&gt;\n
Multiplayer mod for rimworld.
This is version 0.4.8
This is version 0.4.8.3
</description>
</ModMetaData>
2 changes: 1 addition & 1 deletion About/Manifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Manifest>

<identifier>Multiplayer</identifier>
<version>0.4.8</version>
<version>0.4.8.3</version>
<manifestUri>https://raw.githubusercontent.com/Parexy/Multiplayer/master/About/Manifest.xml</manifestUri>
<downloadUri>https://github.com/Parexy/Multiplayer/releases/latest</downloadUri>

Expand Down
72 changes: 37 additions & 35 deletions Languages/Dutch/Keyed/Multiplayer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,39 +15,40 @@

<MpWrongDefs>Modeldefinitie komt niet overeen</MpWrongDefs>
<MpWrongDefsInfo>Zorg ervoor dat uw geïnstalleerde mods, hun versie en hun volgorde overeen komen met die van de host.</MpWrongDefsInfo>
<MpModList>Wijzigingslijst</MpModList>
<MpSeeModList>Zie wijzigingslijst</MpSeeModList>
<MpModList>Modlijst</MpModList>
<MpSeeModList>Zie modlijst</MpSeeModList>

<MpServerClosed>Server gesloten</MpServerClosed>
<MpServerFull>De server is vol</MpServerFull>
<MpKicked>Je bent gekickt van de server</MpKicked>

<MpInvalidUsernameAlreadyPlaying>Gebruiker is al aanwezig in de game</MpInvalidUsernameAlreadyPlaying>
<MpInvalidUsernameAlreadyPlaying>Gebruikersnaam is al aanwezig in de game</MpInvalidUsernameAlreadyPlaying>
<MpInvalidUsernameChars>Gebruikersnaam bevat ongeldige tekens</MpInvalidUsernameChars>
<MpInvalidUsernameLength>Gebruikersnaam heeft een ongeldige lengte</MpInvalidUsernameLength>
<MpChangeUsernameInfo>U kunt uw gebruikersnaam wijzigen in de wijzigingsinstellingen.</MpChangeUsernameInfo>
<MpChangeUsernameInfo>U kunt uw gebruikersnaam wijzigen onder Mod instellingen.</MpChangeUsernameInfo>

<MpPlayerConnected>{0} heeft zich aangesloten</MpPlayerConnected>
<MpPlayerDisconnected>{0} is vertrokken</MpPlayerDisconnected>

<MpReplayOutdated>"Niet up-to-date"</MpReplayOutdated>
<MpReplayOutdatedDesc1>Deze herhaling is gemaakt voor de protocolversie {0}, maar u gebruikt versie {1}.</MpReplayOutdatedDesc1>
<MpReplayOutdatedDesc2>De herhalingen worden mogelijks niet correct afgespeeld.</MpReplayOutdatedDesc2>
<MpReplayOutdated>(verouderd)</MpReplayOutdated>
<MpReplayOutdatedDesc1>Deze replay is gemaakt voor de protocolversie {0}, maar de versie die je nu gebruikt is {1}.</MpReplayOutdatedDesc1>
<MpReplayOutdatedDesc2>De replay kan mogelijk niet correct worden afgespeeld.</MpReplayOutdatedDesc2>

<MpReplayOutdatedDesc3>Mogelijke incompatibiliteiten worden vermeld in het releaseverleden.</MpReplayOutdatedDesc3>
<MpReplayOutdatedDesc4>Dit bestand bevat aanvullende informatie en de hosting ervan zou goed moeten werken.</MpReplayOutdatedDesc4>

<MpServerCloseConfirmation>Weet u zeker dat u de server wilt sluiten? Onbewaarde vooruitgang zal verloren gaan.</MpServerCloseConfirmation>
<MpServerCloseConfirmation>Weet u zeker dat u de server wilt sluiten? Niet opgeslagen vooruitgang zal verloren gaan.</MpServerCloseConfirmation>

<MpHostServer>Host een server</MpHostServer>
<MpSaveReplay>Opslaan van herhaling</MpSaveReplay>
<MpSaveReplay>Opslaan van replay</MpSaveReplay>

<MpConvert>Omzetten naar singleplayer</MpConvert>
<MpConverting>Aan het omzetten</MpConverting>

<MpUsername>Gebruikersnaam</MpUsername>
<MpShowPlayerCursors>Toon cursors van spelers</MpShowPlayerCursors>
<MpAutoAcceptSteam>Auto-accepteren Steam</MpAutoAcceptSteam>
<MpAutoAcceptSteamDesc>Accepteer automatisch alle inkomende aanvragen voor een Steamverbinding.</MpAutoAcceptSteamDesc>
<MpAutoAcceptSteamDesc>Accepteer automatisch alle inkomende Steamverbinding aanvragen.</MpAutoAcceptSteamDesc>
<MpTransparentChat>Transparante chat</MpTransparentChat>

<MpAutosaveSlots>Autosave Slots</MpAutosaveSlots>
Expand All @@ -64,67 +65,68 @@
<MpSteamAcceptDesc>Klik om te accepteren</MpSteamAcceptDesc>
<MpSteamAccepted>Speler is geaccepteerd</MpSteamAccepted>

<MpConnectingTo>Verbonden maken met {0}:{1}</MpConnectingTo>
<MpConnectingTo>Verbinding maken met {0}:{1}</MpConnectingTo>
<MpConnected>Aangesloten.</MpConnected>
<MpDownloading>Downloaden ({0}%)</MpDownloading>

<MpSteamConnectingTo>Een verbinding met {0} aan het maken</MpSteamConnectingTo>
<MpSteamConnectingWaiting>We wachten op een bevestiging van de host</MpSteamConnectingWaiting>
<MpSteamConnectingTo>Aan het verbinden met spel gehost door {0}</MpSteamConnectingTo>
<MpSteamConnectingWaiting>Wachten op bevestiging van de host</MpSteamConnectingWaiting>

<MpTicksBehind>U bent {0} ticks vroeger.</MpTicksBehind>
<MpTicksBehind>U ligt {0} ticks achter.</MpTicksBehind>
<MpLowerGameSpeed>Overweeg de spelsnelheid te verlagen.</MpLowerGameSpeed>
<MpForceCatchUp>Klik om achterstand inhalen te forceren.</MpForceCatchUp>
<MpForceCatchUp>Klik om achterstand-inhalen te forceren.</MpForceCatchUp>

<MpDesynced>De staat van het spel is niet (meer) gesynchroniseerd.</MpDesynced>
<MpTryResync>Probeer hersynchronisatie</MpTryResync>

<MpSaveReplayAs>Sla replay op als</MpSaveReplayAs>
<MpWillOverwrite>Dit zal overschreven worden:</MpWillOverwrite>
<MpWillOverwrite>Zal overschrijven als nodig:</MpWillOverwrite>
<MpReplaySaved>Replay opgeslagen</MpReplaySaved>

<MpGameName>Naam van dit spel</MpGameName>
<MpMaxPlayers>Limiet van spelers</MpMaxPlayers>
<MpAutosaveEvery>Automatisch opslaan elke</MpAutosaveEvery>
<MpGameName>Spelnaam</MpGameName>
<MpMaxPlayers>Spelerslimiet</MpMaxPlayers>
<MpAutosaveEvery>Autosave om de</MpAutosaveEvery>
<MpAutosaveMinutes>Minuten</MpAutosaveMinutes>
<MpLanDesc1>Host dit spel uit op uw lokaal netwerk</MpLanDesc1>
<MpLanDesc2>Lokaal netwerkadres gevonden: {0}</MpLanDesc2>
<MpArbiterDesc>Een proces dat draait op de achtergrond en helpt met de detectie van desyncs</MpArbiterDesc>
<MpLanDesc1>Host dit spel binnen uw lokaal netwerk</MpLanDesc1>
<MpLanDesc2>Gevonden lokaal netwerkadres: {0}</MpLanDesc2>
<MpArbiterDesc>Een proces dat op de achtergrond draait en helpt met het verhelpen van desyncs</MpArbiterDesc>
<MpAsyncTimeDesc>Afzonderlijke tijdcontroles voor elke kaart en de planeet.</MpAsyncTimeDesc>
<MpExperimentalFeature>Experimentele eigenschappen</MpExperimentalFeature>
<MpExperimentalFeature>Experimentele functies</MpExperimentalFeature>

<MpHostButton>Hosten</MpHostButton>
<MpWatchReplay>Kijken</MpWatchReplay>
<MpNothingSelected>Niets geselecteerd</MpNothingSelected>
<MpNoSaves>Multiplayermodus kan alleen gebruikt worden bij spellen die al bestaan</MpNoSaves>
<MpNoSaves>Er kan alleen Multiplayer gespeeld worden uit bestaande opgeslagen spellen</MpNoSaves>

<MpHostIngame>Uit dit spel hosten</MpHostIngame>
<MpHostReplay>Uit een herhaling hosten</MpHostReplay>
<MpHostSavefile>Host vanuit bestaande savefile</MpHostSavefile>
<MpHostIngame>Hosten vanuit dit spel</MpHostIngame>
<MpHostReplay>Hosten vanuit een replay</MpHostReplay>
<MpHostSavefile>Host vanuit opgeslagen spel</MpHostSavefile>

<MpJoinButton>Join</MpJoinButton>
<MpJoinButton>Verbind</MpJoinButton>
<MpConnectButton>Verbinden</MpConnectButton>
<MpLanSearching>Aan het zoeken</MpLanSearching>

<MpNotConnectedToSteam>Niet verbonden met Steam</MpNotConnectedToSteam>
<MpNoFriendsPlaying>Geen vrienden die nu aan het spelen zijn</MpNoFriendsPlaying>
<MpNoFriendsPlaying>Geen vrienden die nu Rimworld spelen</MpNoFriendsPlaying>
<MpPlayingRimWorld>RimWorld aan het spelen</MpPlayingRimWorld>
<MpNotInMultiplayer>Niet in multiplayer</MpNotInMultiplayer>

<MpPauseOnAutosave>Pauze op Autosave</MpPauseOnAutosave>
<MpPauseOnAutosave>Pauzeer tijdens Autosave</MpPauseOnAutosave>
<MpLan>LAN</MpLan>
<MpDirect>Direct</MpDirect>
<MpSteam>Steam</MpSteam>
<MpHostTab>Hosten</MpHostTab>

<MpMultiplayer>Multiplayermodus</MpMultiplayer>
<MpSingleplayer>Singleplayermodus</MpSingleplayer>
<MpMultiplayer>Multiplayer</MpMultiplayer>
<MpSingleplayer>Singleplayer</MpSingleplayer>

<MpNotAvailable>Niet beschikbaar in de meerspelerstand.</MpNotAvailable>
<MpNotAvailable>Niet beschikbaar in multiplayer.</MpNotAvailable>
<MpCallingFactionNotAvailable>Andere facties contacteren is momenteel niet mogelijk in Multiplayer.</MpCallingFactionNotAvailable>

<MpAggressiveTicking>Agressief tikken</MpAggressiveTicking>
<MpAggressiveTickingDesc>Probeer altijd automatisch de server in te halen op kosten op kosten van FPS.</MpAggressiveTickingDesc>
<MpAggressiveTickingDesc>Probeer altijd automatisch gelijk te blijven met de server op kosten op kosten van FPS.</MpAggressiveTickingDesc>

</LanguageData>

<!-- With help from Janssent11041, Darkness and Ghost. -->
<!-- v0.1 14-04-2019 With help from Janssent11041, Darkness and Ghost. -->
<!-- v0.2 06-05-2019 Updated by Epeirios -->
128 changes: 128 additions & 0 deletions Languages/TraditionalChinese/Keyed/Multiplayer.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
<?xml version="1.0" encoding="utf-8" ?>
<LanguageData>

<MpSimulating>遊戲模擬中</MpSimulating>
<MpSimulatingServer>伺服器正在模擬中</MpSimulatingServer>
<MpLoading>讀取中</MpLoading>
<MpSaving>儲存中</MpSaving>

<MpInvalidPort>無效的連接埠</MpInvalidPort>
<MpInvalidAddress>無效的IP位址</MpInvalidAddress>
<MpInvalidGameName>無效的遊戲名稱</MpInvalidGameName>

<MpWrongProtocol>協定版本錯誤</MpWrongProtocol>
<MpWrongMultiplayerVersionInfo>這個伺服器運行在 {0} ({1}協定)</MpWrongMultiplayerVersionInfo>

<MpWrongDefs>模組設置有問題</MpWrongDefs>
<MpWrongDefsInfo>請確認你安裝的模組版本與伺服器的模組版本一致</MpWrongDefsInfo>
<MpModList>模組列表</MpModList>
<MpSeeModList>查看模組列表</MpSeeModList>

<MpServerClosed>伺服器已關閉</MpServerClosed>
<MpServerFull>伺服器人數已達上限</MpServerFull>
<MpKicked>已從伺服器被踢除</MpKicked>

<MpInvalidUsernameAlreadyPlaying>玩家名稱重複</MpInvalidUsernameAlreadyPlaying>
<MpInvalidUsernameChars>玩家名稱中含有非法字元</MpInvalidUsernameChars>
<MpInvalidUsernameLength>無效的玩家名稱長度</MpInvalidUsernameLength>
<MpChangeUsernameInfo>在模組設定介面中可以修改玩家名稱</MpChangeUsernameInfo>

<MpPlayerConnected>{0} 加入伺服器</MpPlayerConnected>
<MpPlayerDisconnected>{0} 離開伺服器</MpPlayerDisconnected>

<MpReplayOutdated>(版本已過期)</MpReplayOutdated>
<MpReplayOutdatedDesc1>重播用協定 {0} 版本,但是你用協定 {1} 版本</MpReplayOutdatedDesc1>
<MpReplayOutdatedDesc2>無法進行重播</MpReplayOutdatedDesc2>
<MpReplayOutdatedDesc3>不支援的模組能在發佈歷史中查看</MpReplayOutdatedDesc3>
<MpReplayOutdatedDesc4>本文檔中含有多餘訊息,伺服器可能無法正常啟動</MpReplayOutdatedDesc4>

<MpServerCloseConfirmation>確定要關閉伺服器嗎? 未儲存的資訊將消失</MpServerCloseConfirmation>

<MpHostServer>主持伺服器</MpHostServer>
<MpSaveReplay>儲存重播</MpSaveReplay>

<MpConvert>切換至單人遊戲</MpConvert>
<MpConverting>切換中</MpConverting>

<MpUsername>玩家名稱</MpUsername>
<MpShowPlayerCursors>顯示玩家指標</MpShowPlayerCursors>
<MpAutoAcceptSteam>自動接受 Steam 加入請求</MpAutoAcceptSteam>
<MpAutoAcceptSteamDesc>自動接受任何 Steam 加入請求</MpAutoAcceptSteamDesc>
<MpTransparentChat>聊天視窗透明化</MpTransparentChat>

<MpAutosaveSlots>自動儲存的列表</MpAutosaveSlots>
<MpAutosaveSlotsDesc>留存的自動儲存數量</MpAutosaveSlotsDesc>

<MpTraderLeavesIn>{0} 後離開</MpTraderLeavesIn>

<MpChatButton>聊天</MpChatButton>
<MpTradingButton>交易</MpTradingButton>

<MpChatPlayers>玩家 ({0}):</MpChatPlayers>
<MpSend>傳送</MpSend>
<MpSteamAcceptTitle>接受Steam玩家</MpSteamAcceptTitle>
<MpSteamAcceptDesc>按此接受</MpSteamAcceptDesc>
<MpSteamAccepted>玩家已被接受</MpSteamAccepted>

<MpConnectingTo>連線到 {0}:{1}</MpConnectingTo>
<MpConnected>連線成功</MpConnected>
<MpDownloading>下載中 ({0}%)</MpDownloading>

<MpSteamConnectingTo>連線到 {0} 的伺服器</MpSteamConnectingTo>
<MpSteamConnectingWaiting>等待伺服器端接受連線</MpSteamConnectingWaiting>

<MpTicksBehind>已落後 {0} Ticks</MpTicksBehind>
<MpLowerGameSpeed>請降低遊戲速度</MpLowerGameSpeed>
<MpForceCatchUp>按此與伺服器進行手動同步</MpForceCatchUp>

<MpDesynced>伺服器已不同步(Desynced)</MpDesynced>
<MpTryResync>請重新同步(Resync)</MpTryResync>

<MpSaveReplayAs>儲存重播為</MpSaveReplayAs>
<MpWillOverwrite>將進行覆蓋</MpWillOverwrite>
<MpReplaySaved>已儲存重播</MpReplaySaved>

<MpGameName>伺服器名稱</MpGameName>
<MpMaxPlayers>最大玩家數量</MpMaxPlayers>
<MpAutosaveEvery>自動儲存每</MpAutosaveEvery>
<MpAutosaveMinutes>分鐘</MpAutosaveMinutes>
<MpLanDesc1>主持重播遊戲至區域網路</MpLanDesc1>
<MpLanDesc2>區域網路IP位址: {0}</MpLanDesc2>
<MpArbiterDesc>Arbiter在伺服器後端協助玩家同步</MpArbiterDesc>
<MpAsyncTimeDesc>每個地圖和地區的時間控制皆不同</MpAsyncTimeDesc>
<MpExperimentalFeature>測試功能</MpExperimentalFeature>

<MpHostButton>啟動伺服器</MpHostButton>
<MpWatchReplay>查看重播</MpWatchReplay>
<MpNothingSelected>沒有選取</MpNothingSelected>
<MpNoSaves>多人遊戲必須從遊戲存檔中啟動</MpNoSaves>

<MpHostIngame>以當前遊戲啟動伺服器</MpHostIngame>
<MpHostReplay>以此重播啟動伺服器</MpHostReplay>
<MpHostSavefile>以此遊戲存檔啟動伺服器</MpHostSavefile>

<MpJoinButton>加入遊戲</MpJoinButton>
<MpConnectButton>伺服器連線中</MpConnectButton>
<MpLanSearching>伺服器搜尋中</MpLanSearching>

<MpNotConnectedToSteam>未連接Steam</MpNotConnectedToSteam>
<MpNoFriendsPlaying>現在沒有好友正在遊玩RimWorld</MpNoFriendsPlaying>
<MpPlayingRimWorld>正在游玩RimWorld</MpPlayingRimWorld>
<MpNotInMultiplayer>目前未進行多人遊戲</MpNotInMultiplayer>

<MpPauseOnAutosave>自動儲存時暫停遊戲</MpPauseOnAutosave>
<MpLan>區域網路</MpLan>
<MpDirect>直接連線</MpDirect>
<MpSteam>Steam</MpSteam>
<MpHostTab>主持伺服器</MpHostTab>

<MpMultiplayer>多人遊戲</MpMultiplayer>
<MpSingleplayer>單人遊戲</MpSingleplayer>

<MpNotAvailable>不支援多人遊戲</MpNotAvailable>
<MpCallingFactionNotAvailable>多人遊戲時不支援呼叫其他勢力</MpCallingFactionNotAvailable>

<MpAggressiveTicking>加速 Tick</MpAggressiveTicking>
<MpAggressiveTickingDesc>嘗試和伺服器進行同步(將降低FPS)</MpAggressiveTickingDesc>

</LanguageData>
7 changes: 1 addition & 6 deletions Source/API/Dummy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public void WatchBegin()
throw new UninitializedAPI();
}

public void Watch(Type targetType, string fieldName, object index = null)
public void Watch(Type targetType, string fieldName, object target = null, object index = null)
{
throw new UninitializedAPI();
}
Expand All @@ -43,11 +43,6 @@ public void WatchEnd()
throw new UninitializedAPI();
}

public void RegisterAll()
{
throw new UninitializedAPI();
}

public void RegisterAll(Assembly assembly)
{
throw new UninitializedAPI();
Expand Down
3 changes: 1 addition & 2 deletions Source/API/Interfaces.cs
Original file line number Diff line number Diff line change
Expand Up @@ -457,12 +457,11 @@ public interface IAPI
string PlayerName { get; }

void WatchBegin();
void Watch(Type targetType, string fieldName, object index = null);
void Watch(Type targetType, string fieldName, object target = null, object index = null);
void Watch(object target, string fieldName, object index = null);
void Watch(string memberPath, object target = null, object index = null);
void WatchEnd();

void RegisterAll();
void RegisterAll(Assembly assembly);

ISyncField RegisterSyncField(Type targetType, string memberPath);
Expand Down
3 changes: 2 additions & 1 deletion Source/API/MP.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using System.Linq;
using System.Reflection;

Expand Down Expand Up @@ -112,7 +113,7 @@ static MP()
/// <see cref="SyncMethodAttribute"/>
/// <see cref="SyncFieldAttribute"/>
/// </summary>
public static void RegisterAll() => Sync.RegisterAll();
public static void RegisterAll() => RegisterAll(new StackTrace().GetFrame(1).GetMethod().ReflectedType.Assembly);

/// <summary>
/// Searches the given assembly for MPAPI annotations and registers them
Expand Down
2 changes: 1 addition & 1 deletion Source/API/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion(MP.API)]
[assembly: AssemblyVersion("0.1")]
[assembly: AssemblyFileVersion(MP.API)]

// The following attributes are used to specify the signing key for the assembly,
Expand Down
13 changes: 8 additions & 5 deletions Source/Client/MultiplayerMod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ public MultiplayerMod(ModContentPack pack) : base(pack)

settings = GetSettings<MpSettings>();

#if DEBUG
LongEventHandler.ExecuteWhenFinished(() => {
Log.Message("== Structure == \n" + Sync.syncWorkers.PrintStructure());
});
#endif
if (MpVersion.IsDebug) {
LongEventHandler.ExecuteWhenFinished(() => {
Log.Message("== Structure == \n" + Sync.syncWorkers.PrintStructure());
});
}
}

public static void EarlyMarkNoInline(Assembly asm)
Expand Down Expand Up @@ -194,6 +194,9 @@ static void CheckInterfaceVersions()
if (!mod.LoadedAnyAssembly)
continue;

if (mod.Name == "Multiplayer")
continue;

Assembly assembly = mod.assemblies.loadedAssemblies.FirstOrDefault(a => a.GetName().Name == MpVersion.apiAssemblyName);

if (assembly != null) {
Expand Down
5 changes: 1 addition & 4 deletions Source/Client/Persistent/PersistentDialogs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -651,13 +651,10 @@ static bool Prefix(Dialog_NodeTree __instance)

if (!Multiplayer.ShouldSync) return true;

var session = PersistentDialog.FindDialog(__instance);
if (session == null) {
if (PersistentDialog.FindDialog(__instance) == null) {
return true;
}

Find.World.renderer.wantedMode = WorldRenderMode.Planet;

return false;
}
}
Expand Down
Loading

0 comments on commit 0df9abe

Please sign in to comment.