diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 0000000..d1175be --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,29 @@ +## Contributing + +Feel free to get in touch with any issues or suggestions for new features you'd like to see. I also welcome pull requests to fix bugs or implement new features. The best way to make contact is via [GitHub Issues](https://github.com/jpanther/Dectorio/issues). + +### Did you find a bug? + +* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/jpanther/Dectorio/issues). + > **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one. + +* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/jpanther/Dectorio/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or a **test case** demonstrating the expected behaviour that is not occurring. + +### Can you write a patch that fixes a bug or do you want to implement a new feature? + +* Fork the `develop` branch. + > **Note:** The `master` branch is reserved for releases and is always in a 'production-ready' state. The `develop` branch is where the latest changes are developed and tested ahead of the next release. + +* Create a new branch in your fork that describes the issue or new feature (i.e. `bugfix-nastybug` or `feature-mynewfeature`) + +* Make the changes required to fix the bug or implement the new feature. + +* Pull the upstream `develop` branch and merge it into your fork regularly to stay up to date with changes. + +* When you're ready to submit your changes, and there are no conflicts with the upstream branch, push your fork and open a new GitHub pull request to the `develop` branch with your patch. + +* Ensure the PR description clearly describes what the patch does. If it fixes a reported bug or feature request, include the relevant issue number. + +### Credit + +Contributors are automatically credited in the [CHANGELOG](changelog.txt) for any contributions made. If you would not like to be credited, please mention this in your pull request. diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..7366209 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,30 @@ +--- +name: Bug report +about: Report something that isn't working +title: '' +labels: bug +assignees: '' + +--- + +**Describe the bug** +Please provide a clear and concise description of what the bug is. If the game gives you an error message, include it here. Then complete any relevant sections below (and delete those that don't apply). + +**How to reproduce** +Steps to reproduce the behaviour: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Mod list** +If you are playing with other mods, include a list of these mods. The best way to do this is to provide a copy of `mod-list.json` from your Factorio data folder. + +**Multiplayer** +If playing in multiplayer and you experience a desync, please upload a copy of your desync report. + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..263d3d5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for the mod +title: '' +labels: enhancement +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Eg. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you'd like to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md new file mode 100644 index 0000000..89b13f1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.md @@ -0,0 +1,11 @@ +--- +name: Question +about: Ask a question about something else +title: '' +labels: question +assignees: '' + +--- + +**What is your question?** +Be as detailed as possible. diff --git a/.github/ISSUE_TEMPLATE/translation-issue.md b/.github/ISSUE_TEMPLATE/translation-issue.md new file mode 100644 index 0000000..fa88b8e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/translation-issue.md @@ -0,0 +1,14 @@ +--- +name: Translation issue +about: Report a problem with the mod's translation into other languages +title: '' +labels: translation +assignees: '' + +--- + +**If you'd like to add a new language for translation, please request it here** +Requests for new languages are welcome! + +**All other translation issues should be reported on CrowdIn** +Dectorio uses CrowdIn to allow the community to translate the mod from English into various languages. If you are able to translate the mod into another language, please visit the [Dectorio project on CrowdIn](https://crowdin.com/project/dectorio) to help with the translation effort. You can suggest your own alternate translations if you find an issue, or vote for other user's suggestions. diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..97e1bcd --- /dev/null +++ b/.gitignore @@ -0,0 +1,29 @@ +/build + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk diff --git a/README.md b/README.md index 406a48d..5f1759f 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,18 @@ -# Dectorio [![GitHub issues](https://img.shields.io/github/issues/jpanther/Dectorio.svg)](https://github.com/jpanther/Dectorio/issues) [![CrowdIn](https://d322cqt584bo4o.cloudfront.net/dectorio/localized.svg)](https://crowdin.com/project/dectorio) [![GitHub license](https://img.shields.io/github/license/jpanther/Dectorio.svg)](https://github.com/jpanther/Dectorio/blob/develop/LICENSE) -A simple mod that adds decorative elements to beautify your factory. New technology research is required to unlock the various items before they can be crafted and some default recipes are adjusted to better reflect how these items should be made. - -Inspiration for the mod came from a lot of other mods on the Factorio mod portal, although all the assets in Dectorio have been custom made for this mod and are either modified versions of base game assets or created from scratch. If you'd like to use any of these in your own mod, please observe the GNU GPLv3 license. - -Requires Factorio version 0.15 or later. - -## How to install +⚠️ **Found a bug or want a new feature?** Report it on [GitHub](https://git.io/DectorioIssues). +🌏 **Can you help translate Dectorio?** Visit [CrowdIn](https://crowdin.com/project/dectorio) to get started. +⁉️ **Have a different question?** Visit the [FAQ](https://mods.factorio.com/mod/Dectorio/faq) for detailed information about common queries. -Download the latest stable release from the [Factorio mod portal](https://mods.factorio.com/mod/Dectorio) or at and copy the entire zip file to your Factorio mods directory: +# Dectorio -* Windows: `%appdata%\Factorio\mods` -* Mac: `~/Library/Application Support/factorio/mods/` -* Linux: `~/.factorio/mods` +Dectorio is a large mod that adds decorative elements to beautify your factory. New technology research is required to unlock the various items before they can be crafted and some default recipes are adjusted to better reflect how these items should be made. -> **Note:** If playing with Factorio 0.15, please download v0.7.6, or for Factorio 0.16, please download v0.8.11 as these are the last stable versions supported on these base game releases. v0.9.0 and later are only supported on Factorio 0.17. +Inspiration for the mod came from a lot of other mods on the portal, although all the assets in Dectorio have been custom made for this mod and are either modified versions of base game assets or created from scratch. If you'd like to use any of these in your own mod, please observe the GNU GPLv3 license. -When you launch the game, the new mod will be enabled by default. +Requires Factorio version 0.15 or later. -## Current Features +## Features ### Decorative items @@ -98,41 +91,17 @@ Check out the [Mod Spotlight video by Xterminator](https://www.youtube.com/watch 🇩🇪 German players may be interested in this [Mod Monday video by SeeNo](https://www.youtube.com/watch?v=0SzAF997sOk). -## Frequently Asked Questions - -Have a question that isn't covered here? Visit the [Dectorio FAQ](FAQ.md) to see if it's already been answered. If you still have a query, read below for details on how to raise an issue on GitHub. - ## Development -### Contributing - -Feel free to get in touch with any issues or suggestions for new features you'd like to see. I also welcome pull requests to fix bugs or implement new features. The best way to make contact is via [GitHub Issues](https://github.com/jpanther/Dectorio/issues). - -#### **Did you find a bug?** - -* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/jpanther/Dectorio/issues). - > **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one. +### Bugs & Suggestions -* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/jpanther/Dectorio/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or a **test case** demonstrating the expected behaviour that is not occurring. +Feel free to get in touch with any issues or suggestions for new features you'd like to see. You can get in contact via the GitHub issues page at . I'm also occasionally online on the Factorio Discord or Forums. -#### **Can you write a patch that fixes a bug or do you want to implement a new feature?** +### Community Translations -* Fork the `develop` branch. - > **Note:** The `master` branch is reserved for releases and is always in a 'production-ready' state. The `develop` branch is where the latest changes are developed and tested ahead of the next release. +Dectorio uses CrowdIn to allow the community to translate the mod from English into various languages. If you are able to translate the mod into another language, please visit the [Dectorio project on CrowdIn](https://crowdin.com/project/dectorio) to help with the translation effort. Requests for new languages are welcome! -* Create a new branch in your fork that describes the issue or new feature (i.e. `bugfix-nastybug` or `feature-mynewfeature`) - -* Make the changes required to fix the bug or implement the new feature. - -* Pull the upstream `develop` branch and merge it into your fork regularly to stay up to date with changes. - -* When you're ready to submit your changes, and there are no conflicts with the upstream branch, push your fork and open a new GitHub pull request to the `develop` branch with your patch. - -* Ensure the PR description clearly describes what the patch does. If it fixes a reported bug or feature request, include the relevant issue number. - -### Language Support - -Dectorio uses CrowdIn to translate the mod into various languages. Special thanks to all the translators listed below (in no particular order). +Special thanks to the translators below (in no particular order). Fully supported languages: * English @@ -142,14 +111,12 @@ Community translations: * Chinese Traditional (29%) * Czech (64%) - [dereksp](https://crowdin.com/profile/dereksp) and [Meritic](https://crowdin.com/profile/Meritic). * French (87%) - [Taniotoshi](https://crowdin.com/profile/Taniotoshi). -* German (94%) - [seeba8](https://github.com/seeba8), [ST-DDT](https://crowdin.com/profile/ST-DDT) and [LastDawn](https://crowdin.com/profile/LastDawn). +* German (100%) - [seeba8](https://github.com/seeba8), [ST-DDT](https://crowdin.com/profile/ST-DDT), [LastDawn](https://crowdin.com/profile/LastDawn) and [lpzockerx](https://crowdin.com/profile/lpzockerx). * Korean (87%) - [Xagros](https://crowdin.com/profile/GimoXagros). * Polish (54%) - [Tomirad](https://github.com/Tomirad). * Portuguese, Brazilian (100%) - [celaquila](https://crowdin.com/profile/celaquila). * Russian (94%) - [nastyslave](https://crowdin.com/profile/nastyslave), [diraria](https://crowdin.com/profile/diraria), [scheugen86](https://crowdin.com/profile/scheugen86), [antonus777](https://crowdin.com/profile/antonus777) and [schmarotzerltd](https://crowdin.com/profile/schmarotzerltd). -* Spanish (96%) - [notallme](https://crowdin.com/profile/notallme). - -If you are able to translate the mod into any of the above languages, or you know an additional language that you'd like to add a new translation for, please visit the [Dectorio project on CrowdIn](https://crowdin.com/project/dectorio) to help with the translation effort. +* Spanish (100%) - [notallme](https://crowdin.com/profile/notallme). ### Mod Compatibility @@ -157,7 +124,7 @@ If you are able to translate the mod into any of the above languages, or you kno Limited testing has been completed with other mods. Warnings will be shown in-game to highlight any known issues. If you come across a specific compatibility issue, please let me know and I'll see what I can do to fix it. -It is not recommended to use other coloured signal mods at the same time as Dectorio. This can cause coloured signals to be overwritten multiple times and lead to game-breaking compatibility issues with other mods. If you would like more colours, you can add these in the Dectorio config.lua file (instructions are in the file). +It is not recommended to use other coloured signal mods at the same time as Dectorio. This can cause coloured signals to be overwritten multiple times and lead to game-breaking compatibility issues with other mods. If you would like more colours, you can add these in the Dectorio config.lua file (instructions are in the file). For full details, visit the [FAQ](https://mods.factorio.com/mod/Dectorio/faq). Dectorio includes specific support for [Alien Biomes](https://mods.factorio.com/mod/alien-biomes). @@ -166,12 +133,3 @@ Other mods with additional Dectorio support (thanks!): [Concreep](https://mods.f Other decorative mods worth checking out (all compatible with Dectorio): [Asphalt Roads](https://mods.factorio.com/mod/AsphaltRoads), [Beautiful Bridge Railway](https://mods.factorio.com/mod/beautiful_bridge_railway), [Color Coding](https://mods.factorio.com/mod/color-coding), [Naked Rails](https://mods.factorio.com/mod/naked-rails), [Reinforced Walls](https://mods.factorio.com/mod/Reinforced-Walls). Mods with known compatibility issues with Dectorio (either don't install these, or edit your mod settings and disable the conflicting components in Dectorio): [Expanded Color Lamps](https://mods.factorio.com/mod/Expanded_Color_Lamps). - -### Changelog - -Refer to the [CHANGELOG](changelog.txt) for a detailed list of changes in each version. The changelog is also available in-game from the _Mods_ screen. - -### Credits - -Developed with ❤ by [James Panther](https://github.com/jpanther) in Melbourne, Australia. -Special thanks to [marcfj](https://github.com/marcfj) for support and play testing. diff --git a/changelog.txt b/changelog.txt index aaa7b78..3ee6409 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,12 @@ --------------------------------------------------------------------------------------------------- +Version: 0.9.9 +Date: 25. 03. 2019 + Changed: + - Added support for new pollution model introduced in 0.17.12 + Locales: + - Updated German translation (thanks to lpzockerx and LastDawn) + - Updated Spanish translation (thanks to notallme) +--------------------------------------------------------------------------------------------------- Version: 0.9.8 Date: 19. 03. 2019 Added: diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 0000000..1626add --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,5 @@ +files: + - source: /locale/en/ + translation: /locale/%two_letters_code%/dectorio.cfg + type: ini + dest: /dectorio.ini diff --git a/info.json b/info.json index a5fcb21..e6b0fce 100644 --- a/info.json +++ b/info.json @@ -1,11 +1,11 @@ { "name": "Dectorio", - "version": "0.9.8", + "version": "0.9.9", "title": "Dectorio", "author": "PantherX", "contact": "", "homepage": "https://github.com/jpanther/Dectorio", "factorio_version": "0.17", - "dependencies": ["base >= 0.17.10", "? alien-biomes >= 0.4.1", "(?) Expanded_Color_Lamps < 0.1"], + "dependencies": ["base >= 0.17.12", "? alien-biomes >= 0.4.1", "(?) Expanded_Color_Lamps < 0.1"], "license": "GNU GPLv3" } diff --git a/locale/cs/dectorio.cfg b/locale/cs/dectorio.cfg index ec99e20..ba3622f 100644 --- a/locale/cs/dectorio.cfg +++ b/locale/cs/dectorio.cfg @@ -125,9 +125,6 @@ dect-paint-defect-right=Poruchový beton dect-paint-operations-left=Operační beton dect-paint-operations-right=Operační beton dect-wood-floor=Dřevěné parkety -dect-stone-gravel=Kamený šterk -dect-iron-ore-gravel=Kovový šterk -dect-copper-ore-gravel=Měděný štěrk dect-coal-gravel=Uhelný štěrk [technology-name] @@ -137,7 +134,6 @@ stone-walls=Základní zdi dect-advanced-walls=Pokročilé zdi dect-wood-floor=Dřevěné parkety landfill=Zemní práce -dect-lawnmower=Sekačka dect-signs=Cedule [technology-description] diff --git a/locale/de/dectorio.cfg b/locale/de/dectorio.cfg index 2067795..54d2c35 100644 --- a/locale/de/dectorio.cfg +++ b/locale/de/dectorio.cfg @@ -17,6 +17,7 @@ dectorio-decoratives=Aktiviere Dekorationen dectorio-item-group=Separater Crafting Tab dectorio-vanilla-hazard-concrete-style=Verwende den Standard-Betonstil von Factorio dectorio-landscaping-blueprintable=Landschaftsobjekte sind mit Blaupausen kopierbar +dectorio-painted-concrete-speed-modifier=Farbiger Beton Geschwindigkeitsbonus dectorio-decorative-removal-probability=Wahrscheinlichkeit, Dekoration zu entfernen dectorio-flooring-stack-size=Stapelgröße von Bodentypen dectorio-landscaping-stack-size=Stapelgröße von Landschaftsobjekten @@ -35,6 +36,7 @@ dectorio-decoratives=Aktiviert die Möglichkeit dekorative Gegenstände für dei dectorio-item-group=Verschiebt alle dekorativen Gegenstände in einen eigenen Crafting-Tab im Inventar dectorio-vanilla-hazard-concrete-style=Wenn diese Option aktiviert ist, sieht bemalter Beton mit Gefahrenmarkierung aus wie der normale Factorio-Beton mit Gefahrenmarkierung (erfordert, dass bemalter Beton aktiviert ist) dectorio-landscaping-blueprintable=Wenn diese Option aktiviert ist, enthalten Blaupausen Landschaftsobjekte als Kacheln +dectorio-painted-concrete-speed-modifier=Ändert die Standardgeschwindigkeit und die Fahrzeuggeschwindigkeit für Gefärbten Beton um diesen Betrag (1 = keine Änderung der Geschwindigkeit (Standardwert), 0,75 = 75% der Standardgeschwindigkeit, 0,5 = 50% der Standardgeschwindigkeit) dectorio-decorative-removal-probability=Wahrscheinlichkeit, dass Dekorationen wie Büsche und Gräser entfernt werden, wenn Böden platziert werden (1 = 100% werden enfernt (Standard), 0.5 = 50%, 0 = Dekorationen werden nicht enfernt) dectorio-flooring-stack-size=Anzahl an Bodenkacheln, die in einem Inventarslot gestapelt werden können (Standard = 500) dectorio-landscaping-stack-size=Anzahl an Landschaftsobjekten, die in einem Inventarslot gestapelt werden können (Standard = 500) @@ -50,7 +52,7 @@ sign-cancel=Abbrechen [dect-notify] dectorio=Dectorio version=[__1__] Version __2__ installiert. -new-version=[__1__] Aktualisiert von Version __2__ auf Version __3__. Wirf einen Blick auf die Changelogs für mehr Details (Mods > Dectorio > Changelog). +new-version=[__1__] Aktualisiert von Version __2__ auf Version __3__. Wirf einen Blick auf die Liste der Änderungen für mehr Informationen (Mods > Dectorio > Changelog). incompatible=[__1__] Warnung: Eine inkompatible Mod wurde gefunden! reason-signals=[__1__] Grund: '__2__' überschreibt Signaldaten. reason-tech=[__1__] Grund: '__2__' dupliziert Technologien, die bereits in Dectorio vorhanden sind. @@ -141,6 +143,7 @@ dect-paint-refined-danger=Drücke __CONTROL__rotate__ um bemalte Kacheln zu dreh dect-paint-refined-defect=Drücke __CONTROL__rotate__ um bemalte Kacheln zu drehen. dect-paint-refined-operations=Drücke __CONTROL__rotate__ um bemalte Kacheln zu drehen. dect-small-lamp-glow=Wenn diese Lampe ein Signal empfängt, leuchtet sie hell über einen großen Radius. +dect-lawnmower=__CONTROL__select-for-blueprint__ halten und ziehen um Dekorationen auf dieser Fläche zu entfernen. __CONTROL__select-for-cancel-deconstruct__ halten und ziehen um Leichen zu entfernen. [recipe-name] dect-concrete-wall-from-stone-wall=Betonmauer aus Steinmauer @@ -165,7 +168,7 @@ dect-paint-radiation-right=Beton mit Strahlungswarnung dect-paint-safety-left=Beton mit Sicherheitsmarkierung dect-paint-safety-right=Beton mit Sicherheitsmarkierung dect-paint-caution-left=Beton mit Warnmarkierung -dect-paint-caution-right=Beton mit Warnungsmarkierung +dect-paint-caution-right=Beton mit Warnmarkierung dect-paint-danger-left=Beton mit Gefahrenmarkierung dect-paint-danger-right=Beton mit Gefahrenmarkierung dect-paint-defect-left=Beton mit Beschädigungswarnung diff --git a/locale/es-ES/dectorio.cfg b/locale/es-ES/dectorio.cfg index 0357668..72b5ae7 100644 --- a/locale/es-ES/dectorio.cfg +++ b/locale/es-ES/dectorio.cfg @@ -17,6 +17,7 @@ dectorio-decoratives=Habilitar decoraciones dectorio-item-group=Separar pestaña de elaboración dectorio-vanilla-hazard-concrete-style=Usar el estilo por defecto de Factorio para el concreto de peligro dectorio-landscaping-blueprintable=Incluir items de paisajismo al crear planos +dectorio-painted-concrete-speed-modifier=Modificador de velocidad de concreto pintado dectorio-decorative-removal-probability=Probabilidad de eliminar decoración dectorio-flooring-stack-size=Los items de pavimentación son apilables dectorio-landscaping-stack-size=Los items de paisajismo son apilables @@ -35,6 +36,7 @@ dectorio-decoratives=Habilita la capacidad de diseñar items decorativos para la dectorio-item-group=Mueve todos los elementos decorativos a una pestaña dedicada en el menú de elaboración dectorio-vanilla-hazard-concrete-style=Cuando se habilita, el Concreto de riesgo pintado se verá como el Concreto de riesgo por defecto de Factorio cuando se coloca (requiere que se habilite el Concreto Pintado) dectorio-landscaping-blueprintable=Cuando está activada, los planos incluirán características de paisaje como mosaicos +dectorio-painted-concrete-speed-modifier=Modifica la velocidad de movimiento a pie y en vehículos por defecto sobre concreto por esta cantidad (1 = no hay cambio de velocidad (por defecto), 0,75 = 75% de la velocidad por defecto, 0,5 = 50% de la velocidad por defecto) dectorio-decorative-removal-probability=La probabilidad de que se eliminen las decoraciones, como los arbustos y el pasto, cuando se colocan los mosaicos de pavimentación (1 = 100% (valor predeterminado), 0,5 = 50%, 0 = no se elimina ninguno) dectorio-flooring-stack-size=El número de elementos de pavimentación que se pueden apilar en una ranura de inventario (valor predeterminado = 500) dectorio-landscaping-stack-size=El número de elementos de paisajismo que se pueden apilar en una ranura de inventario (valor predeterminado = 500) @@ -157,7 +159,7 @@ dect-traffic-bollard=Bolardo de tráfico [tile-name] dect-concrete-grid=Cuadricula de concreto -hazard-concrete-left=Concreto de riesgo +hazard-concrete-left=Concreto de peligro hazard-concrete-right=Concreto de peligro dect-paint-emergency-left=Concreto de emergencia dect-paint-emergency-right=Concreto de emergencia diff --git a/locale/fr/dectorio.cfg b/locale/fr/dectorio.cfg index 94fb537..5158ce6 100644 --- a/locale/fr/dectorio.cfg +++ b/locale/fr/dectorio.cfg @@ -144,38 +144,38 @@ dect-traffic-bollard=Plot de signalisation [tile-name] dect-concrete-grid=Grille en béton -hazard-concrete-left=Zone de danger en béton striée à gauche -hazard-concrete-right=Zone de danger en béton striée à droite -dect-paint-emergency-left=Zone d'urgence en béton striée à gauche -dect-paint-emergency-right=Zone d'urgence en béton striée à droite -dect-paint-radiation-left=Zone de danger de radiation en béton striée à gauche -dect-paint-radiation-right=Zone de danger de radiation en béton striée à droite -dect-paint-safety-left=Zone de sécurité en béton striée à gauche -dect-paint-safety-right=Zone de sécurité en béton striée à droite -dect-paint-caution-left=Zone d'avertissement en béton striée à gauche -dect-paint-caution-right=Zone d'avertissement en béton striée à droite -dect-paint-danger-left=Zone de danger en béton striée à gauche -dect-paint-danger-right=Zone de danger en béton striée à droite -dect-paint-defect-left=Zone d'anomalie en béton striée à gauche -dect-paint-defect-right=Zone d'anomalie en béton striée à droite -dect-paint-operations-left=Zone d'opérations en béton striée à gauche -dect-paint-operations-right=Zone d'opérations en béton striée à droite -refined-hazard-concrete-left=Zone de danger en béton haute-performance striée à gauche -refined-hazard-concrete-right=Zone de danger en béton haute-performance striée à droite -dect-paint-refined-emergency-left=Zone d'urgence en béton haute-performance striée à gauche -dect-paint-refined-emergency-right=Zone d'urgence en béton haute-performance striée à droite -dect-paint-refined-radiation-left=Zone de danger de radiation en béton haute-performance striée à gauche -dect-paint-refined-radiation-right=Zone de danger de radiation en béton haute-performance striée à droite -dect-paint-refined-safety-left=Zone de sécurité en béton haute-performance striée à gauche -dect-paint-refined-safety-right=Zone de sécurité en béton haute-performance striée à droite -dect-paint-refined-caution-left=Zone d'avertissement en béton haute-performance striée à gauche -dect-paint-refined-caution-right=Zone d'avertissement en béton haute-performance striée à droite -dect-paint-refined-danger-left=Zone de danger en béton haute-performance striée à gauche -dect-paint-refined-danger-right=Zone de danger en béton haute-performance striée à droite -dect-paint-refined-defect-left=Zone d'anomalie en béton haute-performance striée à gauche -dect-paint-refined-defect-right=Zone d'anomalie en béton haute-performance striée à droite -dect-paint-refined-operations-left=Zone d'opérations en béton haute-performance striée à gauche -dect-paint-refined-operations-right=Zone d'opérations en béton haute-performance striée à droite +hazard-concrete-left=Zone de danger en béton striée +hazard-concrete-right=Zone de danger en béton striée +dect-paint-emergency-left=Zone d'urgence en béton striée +dect-paint-emergency-right=Zone d'urgence en béton striée +dect-paint-radiation-left=Zone de danger de radiation en béton striée +dect-paint-radiation-right=Zone de danger de radiation en béton striée +dect-paint-safety-left=Zone de sécurité en béton striée +dect-paint-safety-right=Zone de sécurité en béton striée +dect-paint-caution-left=Zone d'avertissement en béton striée +dect-paint-caution-right=Zone d'avertissement en béton striée +dect-paint-danger-left=Zone de danger en béton striée +dect-paint-danger-right=Zone de danger en béton striée +dect-paint-defect-left=Zone d'anomalie en béton striée +dect-paint-defect-right=Zone d'anomalie en béton striée +dect-paint-operations-left=Zone d'opérations en béton striée +dect-paint-operations-right=Zone d'opérations en béton striée +refined-hazard-concrete-left=Zone de danger en béton haute-performance striée +refined-hazard-concrete-right=Zone de danger en béton haute-performance striée +dect-paint-refined-emergency-left=Zone d'urgence en béton haute-performance striée +dect-paint-refined-emergency-right=Zone d'urgence en béton haute-performance striée +dect-paint-refined-radiation-left=Zone de danger de radiation en béton haute-performance striée +dect-paint-refined-radiation-right=Zone de danger de radiation en béton haute-performance striée +dect-paint-refined-safety-left=Zone de sécurité en béton haute-performance striée +dect-paint-refined-safety-right=Zone de sécurité en béton haute-performance striée +dect-paint-refined-caution-left=Zone d'avertissement en béton haute-performance striée +dect-paint-refined-caution-right=Zone d'avertissement en béton haute-performance striée +dect-paint-refined-danger-left=Zone de danger en béton haute-performance striée +dect-paint-refined-danger-right=Zone de danger en béton haute-performance striée +dect-paint-refined-defect-left=Zone d'anomalie en béton haute-performance striée +dect-paint-refined-defect-right=Zone d'anomalie en béton haute-performance striée +dect-paint-refined-operations-left=Zone d'opérations en béton haute-performance striée +dect-paint-refined-operations-right=Zone d'opérations en béton haute-performance striée dect-wood-floor=Planchers en bois dect-stone-gravel=Gravier de pierre dect-iron-ore-gravel=Gravier de fer diff --git a/locale/ko/dectorio.cfg b/locale/ko/dectorio.cfg index c08a19a..e6e1bdc 100644 --- a/locale/ko/dectorio.cfg +++ b/locale/ko/dectorio.cfg @@ -2,7 +2,7 @@ Dectorio=덱토리오(Dectorio) [mod-description] -Dectorio=공장을 아름답게 장식하는 장식 요소를 추가합니다. 현재는 투광 조명, 나무 울타리, 철조망, 돌 및 콘크리트 벽, 위험 출입구, 간판, 나무 바닥재, 자갈 및 바닥 표시 콘크리트 스타일이 포함됩니다.\n\n번역: Team Xagros[https://mods.factorio.com/mods/Xagros/XMKTP] +Dectorio=공장을 아름답게 장식하는 장식 요소를 추가합니다. 현재는 투광 조명, 나무 울타리, 철조망, 돌 및 콘크리트 벽, 위험 출입구, 간판, 나무 바닥재, 자갈 및 바닥 표시 콘크리트 스타일이 포함됩니다.\n\n번역: Team Xagros [mod-setting-name] dectorio-signals=신호 활성화 @@ -47,7 +47,7 @@ sign-title=아이콘 선택 sign-cancel=취소 [dect-notify] -dectorio=덱토리오 +dectorio=덱토리오(Dectorio) version=[__1__] 버전: __2__ 설치됨. new-version=[__1__] 버전 __2__에서 버전 __3__으로 업데이트된 자세한 사항은 같이 동봉 된 changelog 파일을 참조바랍니다. (Mods > Dectorio > Changelog) incompatible=[__1__] 경고: 호환되지 않는 모드가 감지되었습니다! @@ -82,7 +82,7 @@ misc-gears=기어 misc-star=별 [item-group-name] -dectorio=덱토리오 +dectorio=덱토리오(Dectorio) [item-name] dect-concrete-grid=격자 콘크리트 diff --git a/locale/pl/dectorio.cfg b/locale/pl/dectorio.cfg index b8aa420..b11e879 100644 --- a/locale/pl/dectorio.cfg +++ b/locale/pl/dectorio.cfg @@ -102,7 +102,7 @@ dect-chain-wall=Ogrodzenie z metalowych drutów dect-concrete-wall=Betonowy mur dect-sign-wood=Drewniany znak dect-sign-steel=Stalowy znak -dect-small-lamp-glow=Świecąca lampa +dect-small-lamp-glow=Lapy oświetlające [tile-name] hazard-concrete-left=Beton z pasami ostrzegawczymi diff --git a/locale/pt-BR/dectorio.cfg b/locale/pt-BR/dectorio.cfg index cbf9cab..b7b1241 100644 --- a/locale/pt-BR/dectorio.cfg +++ b/locale/pt-BR/dectorio.cfg @@ -154,7 +154,7 @@ dect-chain-wall=Alambrado dect-concrete-wall=Muro de Concreto dect-sign-wood=Placa de Madeira dect-sign-steel=Placa de Aço -dect-small-lamp-glow=Lâmpada Incandescente +dect-small-lamp-glow=Lampada Incandescente dect-traffic-bollard=Balisador de trânsito [tile-name] @@ -204,7 +204,7 @@ stone-walls=Muros dect-advanced-walls=Muros Avançados dect-wood-floor=Piso de Madeira landfill=Manipulador de Terreno -dect-lawnmower=Cortador de Grama +dect-lawnmower=Cortador de grama dect-signs=Placas [technology-description] diff --git a/locale/ru/dectorio.cfg b/locale/ru/dectorio.cfg index c37e8ff..43b517e 100644 --- a/locale/ru/dectorio.cfg +++ b/locale/ru/dectorio.cfg @@ -155,7 +155,7 @@ dect-small-lamp-glow=Яркая лампа dect-traffic-bollard=Дорожный столбик [tile-name] -dect-concrete-grid=Бетонные плиты +dect-concrete-grid=Плиты бетона hazard-concrete-left=Бетон "Опасность" hazard-concrete-right=Бетон "Опасность" dect-paint-emergency-left=Бетон "Авария" @@ -174,8 +174,8 @@ dect-paint-operations-left=Бетон "Ведутся работы" dect-paint-operations-right=Бетон "Ведутся работы" refined-hazard-concrete-left=Железобетон "Опасность" refined-hazard-concrete-right=Железобетон "Опасность" -dect-paint-refined-emergency-left=Железобетон "Критическая опасность" -dect-paint-refined-emergency-right=Железобетон "Критическая опасность" +dect-paint-refined-emergency-left=Железобетон "Авария" +dect-paint-refined-emergency-right=Железобетон "Авария" dect-paint-refined-radiation-left=Железобетон "Радиационная опасность" dect-paint-refined-radiation-right=Железобетон "Радиационная опасность" dect-paint-refined-safety-left=Железобетон "Безопасная зона" @@ -199,7 +199,7 @@ dect-landscaping=Ландшафтный дизайн dect-concrete-paint=Окрашенный бетон stone-walls=Простые стены dect-advanced-walls=Улучшенные стены -dect-wood-floor=Паркетный настил +dect-wood-floor=Деревянный паркет landfill=Ландшафтные работы dect-lawnmower=Газонокосилка dect-signs=Знаки и указатели diff --git a/locale/zh-CN/dectorio.cfg b/locale/zh-CN/dectorio.cfg index da5f849..ca0e916 100644 --- a/locale/zh-CN/dectorio.cfg +++ b/locale/zh-CN/dectorio.cfg @@ -150,14 +150,14 @@ dect-paint-radiation-left=辐射涂层混凝土 dect-paint-radiation-right=辐射涂层混凝土 dect-paint-safety-left=安全混凝土 dect-paint-safety-right=安全混凝土 -dect-paint-caution-left=警告混凝土 -dect-paint-caution-right=警告混凝土 -dect-paint-danger-left=危险混凝土 -dect-paint-danger-right=危险混凝土 -dect-paint-defect-left=缺陷混凝土 -dect-paint-defect-right=缺陷混凝土 -dect-paint-operations-left=操作混凝土 -dect-paint-operations-right=操作混凝土 +dect-paint-caution-left=警告地板 +dect-paint-caution-right=警告地板 +dect-paint-danger-left=危险地板 +dect-paint-danger-right=危险地板 +dect-paint-defect-left=缺陷地板 +dect-paint-defect-right=缺陷地板 +dect-paint-operations-left=操作地板 +dect-paint-operations-right=操作地板 refined-hazard-concrete-left=精制危害混凝土 refined-hazard-concrete-right=精制危害混凝土 dect-paint-refined-emergency-left=精制应急混凝土 diff --git a/makefile b/makefile new file mode 100644 index 0000000..9586b3b --- /dev/null +++ b/makefile @@ -0,0 +1,61 @@ + +# Factorio makefile adapted from original by Nexela +# https://github.com/Nexela/PickerExtended/blob/master/makefile + +# Get the current name and version from info.json +PACKAGE_NAME := $(shell jq -r .name info.json) +PACKAGE_VERSION := $(shell jq -r .version info.json) +PACKAGE_FULL_NAME := $(PACKAGE_NAME)_$(PACKAGE_VERSION) +PACKAGE_FILE := $(PACKAGE_FULL_NAME).zip +CONFIG_FILE = ./$(OUTPUT_DIR)/config.lua + +# Set up build directoy and files +BUILD_DIR := build +OUTPUT_DIR := $(BUILD_DIR)/$(PACKAGE_FULL_NAME) + +PKG_FILES := $(wildcard *.md) $(wildcard *.txt) $(wildcard locale) $(wildcard sound) $(wildcard LICENSE) +FILE_PATTERN := .*.(lua|json|png)$ +SRC_FILES += $(shell find -E . -regex '$(FILE_PATTERN)' -type f -not -path './$(BUILD_DIR)/*') +SRC_FILES := $(SRC_FILES:%=$(OUTPUT_DIR)/%) + +all: clean package zip + +clean: + @echo 'Removing build directory' + @rm -rf $(BUILD_DIR) + +package: $(SRC_FILES) nodebug + @echo 'Copying files' + @mkdir -p $(OUTPUT_DIR) + @cp -r $(PKG_FILES) $(OUTPUT_DIR) + +$(OUTPUT_DIR)/%.png: %.png + @mkdir -p $(@D) + @cp -r $< $(OUTPUT_DIR)/$< +# @pngquant --skip-if-larger --quiet --strip --ext .png --force $(OUTPUT_DIR)/$< || true + +$(OUTPUT_DIR)/%.lua: %.lua + @mkdir -p $(@D) + @cp -r $< $(OUTPUT_DIR)/$< + +$(OUTPUT_DIR)/%.json: %.json + @mkdir -p $(@D) + @cp -r $< $(OUTPUT_DIR)/$< + +nodebug: + @[ -e $(CONFIG_FILE) ] && \ + echo Removing debug switches from config.lua && \ + sed -i '' -e 's/^\(.*DECT.DEBUG.*=\).*/\1 false/' $(CONFIG_FILE) || \ + echo No config files + +zip: + @cd $(BUILD_DIR) && zip -rq $(PACKAGE_FILE) $(PACKAGE_FULL_NAME) && mkdir artifacts && cp -r $(PACKAGE_FILE) artifacts/$(PACKAGE_FILE) + @echo $(PACKAGE_FULL_NAME) ready + +release: + git commit --all --allow-empty -m "Preparing Release v$(PACKAGE_VERSION)" + git checkout master + git merge --no-ff develop + git tag -f v$(PACKAGE_VERSION) + git push --tags + git checkout develop diff --git a/makerelease.sh b/makerelease.sh deleted file mode 100755 index 5a2523f..0000000 --- a/makerelease.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -# Run this script after committing an updated info.json to automatically tag the update and prepare a zip of it. - -# Get mod name and version from info.json -# https://stedolan.github.io/jq/ -modname=`cat info.json|jq -r .name` -modver=`cat info.json|jq -r .version` -gitbranch=`git rev-parse --abbrev-ref HEAD` - -# Switch to master branch -git checkout master - -# Merge in develop branch -git merge --no-ff develop - -# Create git tag for this version -git tag "v$modver" - -# Prepare zip for Factorio native use and mod portal -git archive --prefix "${modname}_$modver/" -o "/Users/james/Desktop/tmp/${modname}_$modver.zip" HEAD - -# Push tag to git -git push origin "v$modver" - -# Switch back to original branch -git checkout $gitbranch diff --git a/prototypes/tile/tiles.lua b/prototypes/tile/tiles.lua index 47c8ce1..f570649 100644 --- a/prototypes/tile/tiles.lua +++ b/prototypes/tile/tiles.lua @@ -133,8 +133,8 @@ if DECT.ENABLED["wood-floor"] then { filename = "__Dectorio__/sound/walking/wood-03.ogg", volume = 0.95 }, { filename = "__Dectorio__/sound/walking/wood-04.ogg", volume = 0.95 } }, - map_color={r=139, g=69, b=19}, - ageing=0, + map_color = {r=139, g=69, b=19}, + pollution_absorption_per_second = 0, vehicle_friction_modifier = base_stone_path.vehicle_friction_modifier } }) @@ -157,8 +157,8 @@ if DECT.ENABLED["concrete"] then decorative_removal_probability = decorative_removal_probability, variants = tile_variants_material("concrete", "grid"), walking_sound = base_concrete.walking_sound, - map_color={r=130, g=130, b=130}, - ageing = 0, + map_color = {r=130, g=130, b=130}, + pollution_absorption_per_second = 0, vehicle_friction_modifier = base_concrete.vehicle_friction_modifier } }) @@ -186,7 +186,7 @@ if DECT.ENABLED["gravel"] then variants = tile_variants(variant.name, "gravel"), walking_sound = base_dirt.walking_sound, map_color = variant.color, - ageing = 0, + pollution_absorption_per_second = 0, vehicle_friction_modifier = dirt_vehicle_speed_modifier } }) @@ -223,7 +223,7 @@ if DECT.ENABLED["painted-concrete"] then variants = tile_variants_material("concrete", variant.name.."-"..direction.this), walking_sound = base_concrete.walking_sound, map_color = variant.color, - ageing = 0, + pollution_absorption_per_second = 0, vehicle_friction_modifier = base_concrete.vehicle_friction_modifier * set_modifier } }) @@ -245,7 +245,7 @@ if DECT.ENABLED["painted-concrete"] then variants = tile_variants_material("refined-concrete", variant.name.."-"..direction.this), walking_sound = base_refined_concrete.walking_sound, map_color = variant.color, - ageing = 0, + pollution_absorption_per_second = 0, vehicle_friction_modifier = base_refined_concrete.vehicle_friction_modifier * set_modifier } }) diff --git a/updatelocales.sh b/updatelocales.sh deleted file mode 100755 index c691756..0000000 --- a/updatelocales.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# Run this script to export translations from CrowdIn. -# Requires CROWDIN_API_KEY environment variable to be set. - -# Get mod name from info.json and use as the CrowdIn project name -# https://stedolan.github.io/jq/ -projname=`cat info.json|jq -r .name` - -# Call CrowdIn API to build and export latest translations -curl -k "https://api.crowdin.com/api/project/$projname/export?key=$CROWDIN_API_KEY" - -# Download and unzip all translations -curl -k -o locales.zip "https://api.crowdin.com/api/project/$projname/download/all.zip?key=$CROWDIN_API_KEY" -unzip locales.zip -d temp - -# Move translations into place -mv temp/locale/cs-CZ/dectorio.ini locale/cs/dectorio.cfg -mv temp/locale/de-DE/dectorio.ini locale/de/dectorio.cfg -mv temp/locale/es-ES/dectorio.ini locale/es-ES/dectorio.cfg -mv temp/locale/fr-FR/dectorio.ini locale/fr/dectorio.cfg -mv temp/locale/ko-KR/dectorio.ini locale/ko/dectorio.cfg -mv temp/locale/pl-PL/dectorio.ini locale/pl/dectorio.cfg -mv temp/locale/pt-BR/dectorio.ini locale/pt-BR/dectorio.cfg -mv temp/locale/ru-RU/dectorio.ini locale/ru/dectorio.cfg -mv temp/locale/zh-CN/dectorio.ini locale/zh-CN/dectorio.cfg -mv temp/locale/zh-TW/dectorio.ini locale/zh-TW/dectorio.cfg - -# Clean up -rm locales.zip -rm -rf temp - -# Commit to repo -#git add locale/* -#git commit -m "Update localisations"