Skip to content

Commit

Permalink
Merge branch 'development' into pr/172
Browse files Browse the repository at this point in the history
  • Loading branch information
Byte-Nova committed Oct 17, 2024
2 parents bc3054c + a1337f7 commit 3adc3b7
Show file tree
Hide file tree
Showing 44 changed files with 455 additions and 42 deletions.
8 changes: 0 additions & 8 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@
- [ ] - I confirm this PR is complying with this project's [Contribution Guidelines](https://github.com/RimworldTogether/Rimworld-Together/blob/development/.github/CONTRIBUTING.md).
- [ ] - I confirm this PR is complying with this project's [Syntax Ruleset](https://github.com/RimworldTogether/Rimworld-Together/blob/development/.github/SYNTAX.md).

### Contributing:

- [ ] - This PR implements a new usable feature or modifies an existing one considerably.

If the above is true, I have also uploaded a PR to this project's [Guide](https://github.com/RimworldTogether/Guide) so users can find information about it.

The link to said PR is: *(The link to your guide PR goes here)*.

### Longer / More informative description about what my pull request does:

- *(Your longer description goes here)*.
2 changes: 1 addition & 1 deletion Builders/Linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ SetAllNeededVariables()
echo "Build result path is set to $BUILDRESULTPATH";

cd Current;
mkdir "Assemblies";
mkdir "Assemblies" >/dev/null;
cd Assemblies;
BUILDRESULTPATH=$(pwd);
echo "Build result path is set to $BUILDRESULTPATH";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTAlly.label>盟友玩家定居点</RTAlly.label>
<RTAlly.description>一个在线派系</RTAlly.description>
<RTAlly.fixedName>盟友玩家定居点</RTAlly.fixedName>
<RTAlly.leaderTitle>领袖</RTAlly.leaderTitle>
<RTAlly.pawnSingular>殖民者</RTAlly.pawnSingular>
<RTAlly.pawnsPlural>殖民者们</RTAlly.pawnsPlural>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTEnemy.label>敌方玩家定居点</RTEnemy.label>
<RTEnemy.description>一个在线派系</RTEnemy.description>
<RTEnemy.fixedName>敌方玩家定居点</RTEnemy.fixedName>
<RTEnemy.leaderTitle>领袖</RTEnemy.leaderTitle>
<RTEnemy.pawnSingular>殖民者</RTEnemy.pawnSingular>
<RTEnemy.pawnsPlural>殖民者们</RTEnemy.pawnsPlural>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTNeutral.label>中立玩家定居点</RTNeutral.label>
<RTNeutral.description>一个在线派系</RTNeutral.description>
<RTNeutral.fixedName>中立玩家定居点</RTNeutral.fixedName>
<RTNeutral.leaderTitle>领袖</RTNeutral.leaderTitle>
<RTNeutral.pawnSingular>殖民者</RTNeutral.pawnSingular>
<RTNeutral.pawnsPlural>殖民者们</RTNeutral.pawnsPlural>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTFaction.label>派系玩家定居点</RTFaction.label>
<RTFaction.description>一个在线派系</RTFaction.description>
<RTFaction.fixedName>派系玩家定居点</RTFaction.fixedName>
<RTFaction.leaderTitle>领袖</RTFaction.leaderTitle>
<RTFaction.pawnSingular>殖民者</RTFaction.pawnSingular>
<RTFaction.pawnsPlural>殖民者们</RTFaction.pawnsPlural>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<Chat.label>聊天</Chat.label>
<Chat.description>一起聊天!</Chat.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTFarmland.label>农田</RTFarmland.label>
<RTFarmland.description>在线地点</RTFarmland.description>

<RTQuarry.label>采石场</RTQuarry.label>
<RTQuarry.description>在线地点</RTQuarry.description>

<RTSawmill.label>锯木厂</RTSawmill.label>
<RTSawmill.description>在线地点</RTSawmill.description>

<RTBank.label>银行</RTBank.label>
<RTBank.description>在线地点</RTBank.description>

<RTLaboratory.label>实验室</RTLaboratory.label>
<RTLaboratory.description>在线地点</RTLaboratory.description>

<RTRefinery.label>炼油厂</RTRefinery.label>
<RTRefinery.description>在线地点</RTRefinery.description>

<RTHerbalWorkshop.label>草药工坊</RTHerbalWorkshop.label>
<RTHerbalWorkshop.description>在线地点</RTHerbalWorkshop.description>

<RTTextileFactory.label>纺织厂</RTTextileFactory.label>
<RTTextileFactory.description>在线地点</RTTextileFactory.description>

<RTFoodProcessor.label>食品加工厂</RTFoodProcessor.label>
<RTFoodProcessor.description>在线地点</RTFoodProcessor.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTChillSpot.label>休闲点</RTChillSpot.label>
<RTChillSpot.description>指定一个休闲点供棋子在离线时放松。仅适用于玩家访问!</RTChillSpot.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTDefenseSpot.label>防御点</RTDefenseSpot.label>
<RTDefenseSpot.description>指定一个防御点供棋子在离线时防守。仅适用于玩家突袭!</RTDefenseSpot.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTTransferSpot.label>物资转移点</RTTransferSpot.label>
<RTTransferSpot.description>指定一个物资着陆点。仅适用于玩家交易!</RTTransferSpot.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTAlly.label>盟友玩家定居點</RTAlly.label>
<RTAlly.description>一個線上派系</RTAlly.description>
<RTAlly.fixedName>盟友玩家定居點</RTAlly.fixedName>
<RTAlly.leaderTitle>領袖</RTAlly.leaderTitle>
<RTAlly.pawnSingular>殖民者</RTAlly.pawnSingular>
<RTAlly.pawnsPlural>殖民者們</RTAlly.pawnsPlural>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTEnemy.label>敵方玩家定居點</RTEnemy.label>
<RTEnemy.description>一個線上派系</RTEnemy.description>
<RTEnemy.fixedName>敵方玩家定居點</RTEnemy.fixedName>
<RTEnemy.leaderTitle>領袖</RTEnemy.leaderTitle>
<RTEnemy.pawnSingular>殖民者</RTEnemy.pawnSingular>
<RTEnemy.pawnsPlural>殖民者們</RTEnemy.pawnsPlural>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTNeutral.label>中立玩家定居點</RTNeutral.label>
<RTNeutral.description>一個線上派系</RTNeutral.description>
<RTNeutral.fixedName>中立玩家定居點</RTNeutral.fixedName>
<RTNeutral.leaderTitle>領袖</RTNeutral.leaderTitle>
<RTNeutral.pawnSingular>殖民者</RTNeutral.pawnSingular>
<RTNeutral.pawnsPlural>殖民者們</RTNeutral.pawnsPlural>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTFaction.label>派系玩家定居點</RTFaction.label>
<RTFaction.description>一個線上派系</RTFaction.description>
<RTFaction.fixedName>派系玩家定居點</RTFaction.fixedName>
<RTFaction.leaderTitle>領袖</RTFaction.leaderTitle>
<RTFaction.pawnSingular>殖民者</RTFaction.pawnSingular>
<RTFaction.pawnsPlural>殖民者們</RTFaction.pawnsPlural>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<Chat.label>聊天</Chat.label>
<Chat.description>一起聊天!</Chat.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTFarmland.label>農田</RTFarmland.label>
<RTFarmland.description>線上地點</RTFarmland.description>

<RTQuarry.label>採石場</RTQuarry.label>
<RTQuarry.description>線上地點</RTQuarry.description>

<RTSawmill.label>鋸木廠</RTSawmill.label>
<RTSawmill.description>線上地點</RTSawmill.description>

<RTBank.label>銀行</RTBank.label>
<RTBank.description>線上地點</RTBank.description>

<RTLaboratory.label>實驗室</RTLaboratory.label>
<RTLaboratory.description>線上地點</RTLaboratory.description>

<RTRefinery.label>煉油廠</RTRefinery.label>
<RTRefinery.description>線上地點</RTRefinery.description>

<RTHerbalWorkshop.label>草藥工坊</RTHerbalWorkshop.label>
<RTHerbalWorkshop.description>線上地點</RTHerbalWorkshop.description>

<RTTextileFactory.label>紡織廠</RTTextileFactory.label>
<RTTextileFactory.description>線上地點</RTTextileFactory.description>

<RTFoodProcessor.label>食品加工廠</RTFoodProcessor.label>
<RTFoodProcessor.description>線上地點</RTFoodProcessor.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTChillSpot.label>休閒點</RTChillSpot.label>
<RTChillSpot.description>指定一個休閒點供棋子在離線時放鬆。僅適用於玩家訪問!</RTChillSpot.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTDefenseSpot.label>防禦點</RTDefenseSpot.label>
<RTDefenseSpot.description>指定一個防禦點供棋子在離線時防守。僅適用於玩家突襲!</RTDefenseSpot.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTTransferSpot.label>物資轉移點</RTTransferSpot.label>
<RTTransferSpot.description>指定一個物資著陸點。僅適用於玩家交易!</RTTransferSpot.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTAlly.label>Поселення Союзних Гравців</RTAlly.label>
<RTAlly.description>Онлайн фракція</RTAlly.description>
<RTAlly.fixedName>Поселення Союзних Гравців</RTAlly.fixedName>
<RTAlly.leaderTitle>лідер</RTAlly.leaderTitle>
<RTAlly.pawnSingular>колоніст</RTAlly.pawnSingular>
<RTAlly.pawnsPlural>колоністів</RTAlly.pawnsPlural>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTEnemy.label>Поселення Ворожих Гравців</RTEnemy.label>
<RTEnemy.description>Онлайн фракція</RTEnemy.description>
<RTEnemy.fixedName>Поселення Ворожих Гравців</RTEnemy.fixedName>
<RTEnemy.leaderTitle>лідер</RTEnemy.leaderTitle>
<RTEnemy.pawnSingular>колоніст</RTEnemy.pawnSingular>
<RTEnemy.pawnsPlural>колоністів</RTEnemy.pawnsPlural>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTNeutral.label>Поселення Нейтральних Гравців</RTNeutral.label>
<RTNeutral.description>Онлайн фракція</RTNeutral.description>
<RTNeutral.fixedName>Поселення Ворожих Гравців</RTNeutral.fixedName>
<RTNeutral.leaderTitle>лідер</RTNeutral.leaderTitle>
<RTNeutral.pawnSingular>колоніст</RTNeutral.pawnSingular>
<RTNeutral.pawnsPlural>колоністів</RTNeutral.pawnsPlural>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTFaction.label>Поселення Учасника Фракції</RTFaction.label>
<RTFaction.description>Онлайн фракція</RTFaction.description>
<RTFaction.fixedName>Поселення Учасника Фракції</RTFaction.fixedName>
<RTFaction.leaderTitle>лідер</RTFaction.leaderTitle>
<RTFaction.pawnSingular>колоніст</RTFaction.pawnSingular>
<RTFaction.pawnsPlural>колоністів</RTFaction.pawnsPlural>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<Chat.label>чат</Chat.label>
<Chat.description>Спілкуйтеся з іншими!</Chat.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTFarmland.label>Сільськогосподарські угіддя</RTFarmland.label>
<RTFarmland.description>Онлайн ділянка</RTFarmland.description>

<RTQuarry.label>Кар'єр</RTQuarry.label>
<RTQuarry.description>Онлайн ділянка</RTQuarry.description>

<RTSawmill.label>Лісопильня</RTSawmill.label>
<RTSawmill.description>Онлайн ділянка</RTSawmill.description>

<RTBank.label>Банк</RTBank.label>
<RTBank.description>Онлайн ділянка</RTBank.description>

<RTLaboratory.label>Лабораторія</RTLaboratory.label>
<RTLaboratory.description>Онлайн ділянка</RTLaboratory.description>

<RTRefinery.label>Паливний завод</RTRefinery.label>
<RTRefinery.description>Онлайн ділянка</RTRefinery.description>

<RTHerbalWorkshop.label>Плантація лікарських рослин</RTHerbalWorkshop.label>
<RTHerbalWorkshop.description>Онлайн ділянка</RTHerbalWorkshop.description>

<RTTextileFactory.label>Текстильна фабрика</RTTextileFactory.label>
<RTTextileFactory.description>Онлайн ділянка</RTTextileFactory.description>

<RTFoodProcessor.label>Харчовий комбінат</RTFoodProcessor.label>
<RTFoodProcessor.description>Онлайн ділянка</RTFoodProcessor.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTChillSpot.label>Точка Відпочинку</RTChillSpot.label>
<RTChillSpot.description>Визначає місце де колоністи будуть відпочивати в режимі офлайн. Застосовується тільки при відвідинах гравців!</RTChillSpot.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTDefenseSpot.label>Точка Оборони</RTDefenseSpot.label>
<RTDefenseSpot.description>Визначає місце де колоністи будуть знаходитись під час оборони в режимі офлайн. Застосовується тільки при нальотах гравців!</RTDefenseSpot.description>
</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>
<RTTransferSpot.label>Точка Для Товарів</RTTransferSpot.label>
<RTTransferSpot.description>Визначає місце для доставлення товарів. Застосовується тільки при торгівлі з гравцями!</RTTransferSpot.description>
</LanguageData>
16 changes: 7 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# RimWorld Together
### *A Community Driven Multiplayer Mod for Rimworld!*
[![Steam Workshop](https://img.shields.io/badge/Steam_Workshop-Subscribe-blue?logo=steam)](https://steamcommunity.com/sharedfiles/filedetails/?id=3005289691) [![Discord Link](https://img.shields.io/badge/Discord-Join-blue?logo=discord)](https://discord.gg/yUF2ec8Vt8) [![Mod Guide](https://img.shields.io/badge/Guide-Read-blue?logo=mdbook)](https://rimworldtogether.github.io/Guide/) [![Mod Incompatibility List](https://img.shields.io/badge/Incompatibility_List-View-blue?logo=markdown)](https://github.com/RimworldTogether/Rimworld-Together/blob/development/IncompatibilityList.md) [![Donate](https://img.shields.io/badge/Donate-Go-blue?logo=kofi)](https://ko-fi.com/rimworldtogether)
[![Steam Workshop](https://img.shields.io/badge/Steam_Workshop-Subscribe-blue?logo=steam)](https://steamcommunity.com/sharedfiles/filedetails/?id=3005289691) [![Discord Link](https://img.shields.io/badge/Discord-Join-blue?logo=discord)](https://discord.gg/yUF2ec8Vt8) [![Mod Wiki](https://img.shields.io/badge/Wiki-Read-blue?logo=mdbook)](https://github.com/Byte-Nova/Rimworld-Together/wiki) [![Mod Incompatibility List](https://img.shields.io/badge/Incompatibility_List-View-blue?logo=markdown)](https://github.com/RimworldTogether/Rimworld-Together/blob/development/IncompatibilityList.md) [![Donate](https://img.shields.io/badge/Donate-Go-blue?logo=kofi)](https://ko-fi.com/rimworldtogether)

> [!NOTE]
> The mod is currently a work in progress! Please report any broken stuff you find!
Expand All @@ -10,6 +10,11 @@ Welcome to the repository for `RimWorld Together`! Here you will find everything
## Server Prerequisites:
Thanks to the way the server is built, there aren't any heavy hardware related dependencies, meaning that your hosting machine will only need to have an excellent network bandwith and a bit of everything else. Really, modern e-toasters could run it.

## Server Installation:
Download the latest server files at [here](https://github.com/Byte-Nova/Rimworld-Together/releases/latest). Then extract somewhere in your system and execute the executable file.
>[!WARNING]
> When extracting the server files somewhere, be mindful on where this location might be, avoid installing it at privileged locations (where admin permissions are needed) to prevent your antivirus/system kicking off.
## Container-based Deployment:
We provide helper scripts to build and run the official RimWorld-Together Container with [buildah](https://github.com/containers/buildah) and [podman](https://github.com/containers/podman)

Expand All @@ -23,15 +28,8 @@ make build-container
make run-container
```

## Deployments:
To access our documentation and deployment examples, please run the following command:
```sh
git submodule update --init --recursive
```
This will clone (or update) our [Guide](https://github.com/RimworldTogether/Guide) and Deployments project. You can also use the `--recurse-submodules` flag on your initial clone to automatically pull the documentation at the same time.

## Contributing
Please read our [contribution guide](https://github.com/RimworldTogether/Rimworld-Together/blob/development/.github/CONTRIBUTING.md) before contributing!
Interested? Please read our [contribution guide](https://github.com/RimworldTogether/Rimworld-Together/blob/development/.github/CONTRIBUTING.md) before contributing!

## Other Questions?
Please don't hesitate to create an issue on Github if you have any questions/issues with the mod. We are here for you! You can also contact us via our Discord server (see top of this page).
6 changes: 3 additions & 3 deletions Source/Client/Core/Configs/ModStuff.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ public override void DoSettingsWindowContents(Rect inRect)

listingStandard.GapLine();
listingStandard.Label("External Sources");
if (listingStandard.ButtonTextLabeled("Check out the mod's wiki!", "Open")) StartProcess("https://rimworldtogether.github.io/Guide");
if (listingStandard.ButtonTextLabeled("Check out the mod's Github!", "Open")) StartProcess("https://github.com/RimworldTogether/Rimworld-Together");
if (listingStandard.ButtonTextLabeled("Check out the mod's incompatibility list!", "Open")) StartProcess("https://github.com/RimworldTogether/Rimworld-Together/blob/development/IncompatibilityList.md");
if (listingStandard.ButtonTextLabeled("Check out the mod's wiki!", "Open")) StartProcess("https://github.com/Byte-Nova/Rimworld-Together/wiki");
if (listingStandard.ButtonTextLabeled("Check out the mod's Github!", "Open")) StartProcess("https://github.com/Byte-Nova/Rimworld-Together");
if (listingStandard.ButtonTextLabeled("Check out the mod's incompatibility list!", "Open")) StartProcess("https://github.com/Byte-Nova/Rimworld-Together/blob/development/IncompatibilityList.md");
if (listingStandard.ButtonTextLabeled("Join the mod's Discord community!", "Open")) StartProcess("https://discord.gg/yUF2ec8Vt8");

listingStandard.End();
Expand Down
Loading

0 comments on commit 3adc3b7

Please sign in to comment.