diff --git a/CMakeLists.txt b/CMakeLists.txt index 049cc922f6de..bddbe88bf006 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ MESSAGE(" \\ \\____ / __ \\_ | | / __ \\_\\ \\___ | |__ \\___ | \\__ MESSAGE(" \\______ /\(____ / |__| \(____ / \\___ >|____/ / ____|/____ >|__|_| / ") MESSAGE(" \\/ \\/ \\/ \\/ \\/ \\/ \\/ ") MESSAGE(" --= Dark Days Ahead =--") -MESSAGE("\n * http://en.cataclysmdda.com/\n") +MESSAGE("\n * https://cataclysmdda.org/\n") MESSAGE(STATUS "${PROJECT} build environment -- \n") diff --git a/COMPILING-CMAKE.md b/COMPILING-CMAKE.md index ed65b1564258..5c23c529dfa4 100644 --- a/COMPILING-CMAKE.md +++ b/COMPILING-CMAKE.md @@ -3,7 +3,6 @@ **WARNING**: CMake build is **NOT** official and should be used for *dev purposes ONLY*. For official way to build CataclysmDDA See: - * The latest instructions on how to compile can be found on [our wiki](http://tools.cataclysmdda.com/wiki). * [COMPILING.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/COMPILING.md) diff --git a/data/mods/blazemod/PAQ.txt b/data/mods/blazemod/PAQ.txt deleted file mode 100644 index ad66e967ff57..000000000000 --- a/data/mods/blazemod/PAQ.txt +++ /dev/null @@ -1,37 +0,0 @@ -Pre-emptively Answered Questions: - -- How do I use manual turrets? -Stand on the same tile that the turret is on, have your hands free, and "f"ire it. - -- How do I make automated turrets? -Craft a turret chassis (Electronics, Mechanics, and Fabrication must be at 5 to see the recipe) and install it. You can then install most non-pistol weapons as an automated turret. - -- What's the difference between " turret" and "automated "? -Turrets have a built-in cargo where you can drop appropriate ammo to load it. Automated guns do not have a cargo slot, you must install an appropriate ammunition rack (either a small metal tank or a cargo carrier for large ammo). Ammunition racks are loaded like fuel tanks, but only accept the basic ammunition type. - -- My automated turrets won't fire! -Make sure turrets are enabled by using your vehicle controls. -Make sure turrets have access to appropriate ammo. Ammunition racks can supply all turrets on the vehicle with the right ammo. Turrets that use gas or battery power need appropriate containers. -Make sure to check "Configure Individual Turrets" in the vehicle control menu. -Turrets all have different ranges at which they'll shoot, the enemy might still be out of range. -Explosive turrets won't fire if the target is too close to the vehicle. - -- I don't understand the individual turret options. -The squares next to the turret's name show its setting. -Blank means it will not fire. -"1" means it will only fire a single shot (If it has a burst option). -"B" means it will fire full bursts. -"m" means it will only fire if you control it by using "f"ire while having free hands while being on the same tile as the vehicle's controls. -"M" means the same as "m", but does burst fire instead of single shots. -If you're using a turret that doesn't have burst fire, it will be blank or "x" for off/on. -Turrets that are manually fired won't appear on the configuration menu. - -- Blob parts? Vortex parts? Diamond parts? -For blob parts you need cooking at level 6 to see the first recipe, 7 to see them all. You also need fabrication at 5. -For vortex parts, a mechanics skill of 8 to see all recipes. -For diamond parts you need fabrication at 10 and access to a CVD machine. -Everything else is up for you to find. - -- I have a question that this doesn't answer./I found a bug./I have a suggestion. -You can find the forum thread here: http://smf.cataclysmdda.com/index.php?topic=8060.0 -Also, make sure, that if you downloaded the new version from the forum, that you delete the old blazemod folder first. Bugs may arise from duplicated files. \ No newline at end of file diff --git a/data/motd/de.motd b/data/motd/de.motd index f9eeb3dff790..83472ffe448c 100644 --- a/data/motd/de.motd +++ b/data/motd/de.motd @@ -4,7 +4,7 @@ Besuch uns: * Homepage: https://cataclysmdda.org -* Wiki: http://tools.cataclysmdda.com/wiki +* Wiki: https://cddawiki.chezzo.com/cdda_wiki * Melde Bugs, Vorschläge und folge der Entwicklung auf: https://github.com/CleverRaven/Cataclysm-DDA/issues diff --git a/data/motd/en.motd b/data/motd/en.motd index e8e17ec42a5c..9c73dd951661 100644 --- a/data/motd/en.motd +++ b/data/motd/en.motd @@ -4,7 +4,7 @@ Visit us: * Homepage: https://cataclysmdda.org -* Wiki: http://tools.cataclysmdda.com/wiki +* Wiki: https://cddawiki.chezzo.com/cdda_wiki * Report bugs, suggestion and follow the development at: https://github.com/CleverRaven/Cataclysm-DDA/issues diff --git a/data/motd/es_AR.motd b/data/motd/es_AR.motd index b885e87c6868..6c74fc4e1b72 100644 --- a/data/motd/es_AR.motd +++ b/data/motd/es_AR.motd @@ -14,6 +14,6 @@ Cambios principales de la v0.C Cooper: Para ver las noticias recientes sobre Cataclysm DDA, por favor, visitá: Página web: https://cataclysmdda.org -Wiki: http://tools.cataclysmdda.com/wiki +Wiki: https://cddawiki.chezzo.com/cdda_wiki En el juego, podés acceder a las opciones con el menú de ayuda (?2). diff --git a/data/motd/it_IT.motd b/data/motd/it_IT.motd index a62064c561dc..84e5a94445a2 100644 --- a/data/motd/it_IT.motd +++ b/data/motd/it_IT.motd @@ -14,6 +14,6 @@ Contenuti principali in v0.C Cooper: Per le ultime discussioni e notizie su DDA, si prega di visitare: Pagina principale: https://cataclysmdda.org -Wiki: http://tools.cataclysmdda.com/wiki +Wiki: https://cddawiki.chezzo.com/cdda_wiki Mentre giochi puoi modificare le opzioni tramite il menù di aiuto (?2) diff --git a/data/motd/ko.motd b/data/motd/ko.motd index 58e5fd9f39ec..cca51f080c53 100644 --- a/data/motd/ko.motd +++ b/data/motd/ko.motd @@ -14,6 +14,6 @@ v0.C Cooper 주요 변경점: Cataclysm DDA에 관한 최신 정보를 원하신다면 다음 사이트를 참고해주세요: 홈페이지: https://cataclysmdda.org -위키: http://tools.cataclysmdda.com/wiki +위키: https://cddawiki.chezzo.com/cdda_wiki 도움말을 통하면 게임 안에서도 설정을 변경할 수 있습니다. (?2) diff --git a/data/motd/pt_BR.motd b/data/motd/pt_BR.motd index f4784603cc7f..556e00344787 100644 --- a/data/motd/pt_BR.motd +++ b/data/motd/pt_BR.motd @@ -14,6 +14,6 @@ Compatível com os saves das versões 0.A e 0.B. Para últimas discussões e novidades sobre Cataclysm DDA visite: Página principal: https://cataclysmdda.org -Wiki: http://tools.cataclysmdda.com/wiki +Wiki: https://cddawiki.chezzo.com/cdda_wiki Em jogo você pode acessar as opções pelo menu de ajuda (? + 2) diff --git a/data/motd/ru.motd b/data/motd/ru.motd index 9696ef89d5f0..8c0035fb8525 100644 --- a/data/motd/ru.motd +++ b/data/motd/ru.motd @@ -4,7 +4,7 @@ Полезные ссылки: * Официальный сайт: https://cataclysmdda.org -* Вики: http://tools.cataclysmdda.com/wiki +* Вики: https://cddawiki.chezzo.com/cdda_wiki Сообщайте о багах, выдвигайте предложения и следите за разработкой: * GitHub: https://github.com/CleverRaven/Cataclysm-DDA/issues diff --git a/data/motd/zh_CN.motd b/data/motd/zh_CN.motd index 02efe9f5cc17..fe18a7603b02 100644 --- a/data/motd/zh_CN.motd +++ b/data/motd/zh_CN.motd @@ -14,6 +14,6 @@ 若要了解该游戏的最新消息和讨论，请浏览以下网页： 主页：https://cataclysmdda.org -百科：http://tools.cataclysmdda.com/wiki +百科：https://cddawiki.chezzo.com/cdda_wiki 在游戏中你可以通过帮助菜单查看游戏设置。（?2） diff --git a/data/motd/zh_TW.motd b/data/motd/zh_TW.motd index 043fb38d128f..cb2e30587ce8 100644 --- a/data/motd/zh_TW.motd +++ b/data/motd/zh_TW.motd @@ -14,6 +14,6 @@ 需要烏日到站最新的新聞與討論，請拜訪: 首頁: https://cataclysmdda.org -維基: http://tools.cataclysmdda.com/wiki +維基: https://cddawiki.chezzo.com/cdda_wiki 在遊戲中你能夠透過說明選單來存取選項(?2)。 diff --git a/data/xdg/cataclysm-dda.appdata.xml b/data/xdg/cataclysm-dda.appdata.xml index 8cb17265d25e..f36340c01318 100644 --- a/data/xdg/cataclysm-dda.appdata.xml +++ b/data/xdg/cataclysm-dda.appdata.xml @@ -14,15 +14,7 @@ to giant insects to killer robots and things far stranger and deadlier, and against the others like yourself, that want what you have...

- - - http://www.cataclysmdda.com/assets/drive.png - - - http://www.cataclysmdda.com/assets/status.png - - - http://www.cataclysmdda.com/ + https://www.cataclysmdda.org/ https://github.com/CleverRaven/Cataclysm-DDA/issues https://www.transifex.com/cataclysm-dda-translators/cataclysm-dda/ cataclysm-dda.desktop diff --git a/doc/cataclysm-tiles.6 b/doc/cataclysm-tiles.6 index f6ed83afe84b..ab4e8bfa1409 100644 --- a/doc/cataclysm-tiles.6 +++ b/doc/cataclysm-tiles.6 @@ -91,6 +91,6 @@ Please submit bug reports to .Sh AUTHORS .An Kevin Granade Aq Mt kevin.granade@gmail.com .Sh SEE ALSO -.Lk http://www.cataclysmdda.com/ Homepage +.Lk https://cataclysmdda.org/ Homepage .Lk https://discourse.cataclysmdda.org/ Forums .Lk https://github.com/CleverRaven/Cataclysm-DDA GitHub diff --git a/doc/cataclysm.6 b/doc/cataclysm.6 index f1f8e8181b45..7b4dad708026 100644 --- a/doc/cataclysm.6 +++ b/doc/cataclysm.6 @@ -89,6 +89,6 @@ Please submit bug reports to .Sh AUTHORS .An Kevin Granade Aq Mt kevin.granade@gmail.com .Sh SEE ALSO -.Lk http://www.cataclysmdda.com/ Homepage +.Lk https://cataclysmdda.org/ Homepage .Lk https://discourse.cataclysmdda.org/ Forums .Lk https://github.com/CleverRaven/Cataclysm-DDA GitHub