diff --git a/.vscode/settings.json b/.vscode/settings.json index e9afbcd3e1897a3fad77cbedd9b65d952864b190..f924920e99d6d99905fd73413a0b7b4661baea81 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -19,6 +19,7 @@ "Hannaz", "Hauke", "Hebras", + "Klepper", "Kloos", "Kuno", "Laugo", diff --git a/Ideas/characters.rst b/Ideas/characters.rst index d32b65658ac3e251580dd6d7da42335d366c790b..b83206c04454e982cdcfbf65a5a753eec07ed95a 100644 --- a/Ideas/characters.rst +++ b/Ideas/characters.rst @@ -19,7 +19,7 @@ Characters * Wyn - Owner of general store * Savlik - Radio operator and head of communications in 3rd Subjugation Fleet -* Egon - Head of Barbarian Diplomatic Relations for the Foreign Affairs Department +* Egon Klepper - Head of Barbarian Diplomatic Relations for the Foreign Affairs Department * Oskar Glas - Diplomatic Lt. for GVE Foreign Affairs Department (FAD) * Eike Baumstein - Head of FAD for GVE * Hauke Schiefer - Military Intelligence officer diff --git a/Ideas/militaries.rst b/Ideas/militaries.rst index d864f3a9af88c8575424fc99f79f4e9dd9ed3f23..08d10d026166e090f4489fb10b11479d06dc3c06 100644 --- a/Ideas/militaries.rst +++ b/Ideas/militaries.rst @@ -21,7 +21,7 @@ The 36mm variant can punch holes in almost everything using the assisted sabot r Adding some 'stats' below. -.. image:: ../_images/examples/IFV_Example_CV_90_Mk_IV.jpg +.. image:: ../_images/examples/IFV_Example_CV_90_Mk_IV.png :width: 300px .. include:: ./includes/cv-8.rst @@ -78,7 +78,7 @@ The base probably has ~50 Apollo-like craft. The single airframe lowers maintena .. image:: ../_images/examples/ships/Apollo_Triage_Concept.png :width: 49% -.. image:: ../_images/examples/ships/Apollo_-_interior_layout.jpg +.. image:: ../_images/examples/ships/Apollo_-_interior_layout.png :width: 49% diff --git a/Ideas/sources.rst b/Ideas/sources.rst index de31ab0ff2c4cc642ef996386944e581f4a49643..cacbf6e59adf89f8bda16f91ef5ec95571c86d13 100644 --- a/Ideas/sources.rst +++ b/Ideas/sources.rst @@ -1,7 +1,7 @@ Sources for Images ================== -.. image:: ../_images/examples/IFV_Example_CV_90_Mk_IV.jpg +.. image:: ../_images/examples/IFV_Example_CV_90_Mk_IV.png :width: 50% https://en.wikipedia.org/wiki/Combat_Vehicle_90#/media/File:CV_90_Mk_IV_SIAF-2022.jpg @@ -36,7 +36,7 @@ https://titanfall.fandom.com/wiki/Simulacrum?file=Hands_of_the_Machine_Hi.jpg .. Apollo medevac .. image:: ../_images/examples/ships/Apollo_Triage_Concept.png :width: 49% -.. image:: ../_images/examples/ships/Apollo_-_interior_layout.jpg +.. image:: ../_images/examples/ships/Apollo_-_interior_layout.png :width: 49% https://starcitizen.tools/Apollo_Medivac @@ -46,12 +46,12 @@ https://starcitizen.tools/Apollo_Medivac https://apexlegends.fandom.com/wiki/Rampage_LMG -.. image:: ../_images/examples/personnel/DustUp_Tactical_armor_set.jpg +.. image:: ../_images/examples/personnel/DustUp_Tactical_armor_set.png :width: 49% https://starcitizen.tools/File:DustUp_Tactical_armor_set.jpg -.. image:: ../_images/examples/personnel/Defiance_Tactical_armor_set.jpg +.. image:: ../_images/examples/personnel/Defiance_Tactical_armor_set.png :width: 49% https://starcitizen.tools/File:Defiance_Tactical_armor_set.jpg diff --git a/_images/examples/IFV_Example_CV_90_Mk_IV.jpg b/_images/examples/IFV_Example_CV_90_Mk_IV.jpg deleted file mode 100644 index bba018ba6066886504162b2cce15bd047f7802c7..0000000000000000000000000000000000000000 Binary files a/_images/examples/IFV_Example_CV_90_Mk_IV.jpg and /dev/null differ diff --git a/_images/examples/IFV_Example_CV_90_Mk_IV.png b/_images/examples/IFV_Example_CV_90_Mk_IV.png new file mode 100644 index 0000000000000000000000000000000000000000..78b5d5f065633838b2cb01d8f39551fb18c35a24 Binary files /dev/null and b/_images/examples/IFV_Example_CV_90_Mk_IV.png differ diff --git a/_images/examples/Rampage_rifle_cosmetic.png b/_images/examples/Rampage_rifle_cosmetic.png index eb2c55cb77b00a61ac4dc8a4c6aaee8e9545cd6e..b96fc888e2e58e47402d6def7b8ebb11d61c651e 100644 Binary files a/_images/examples/Rampage_rifle_cosmetic.png and b/_images/examples/Rampage_rifle_cosmetic.png differ diff --git a/_images/examples/Simulacra_Example.png b/_images/examples/Simulacra_Example.png index 6f9709b2d91b12b564fa48fb5301957681f8368b..cb6372fb098d6c3f15df2bed747b3d630d04e59f 100644 Binary files a/_images/examples/Simulacra_Example.png and b/_images/examples/Simulacra_Example.png differ diff --git a/_images/examples/Simulacra_Example_2.png b/_images/examples/Simulacra_Example_2.png index ab43226a2e1a7c94a2f388def1dbc07514911ec2..0bdd8dd55ed4519f6bb6e6d751b97c25d2d0da1c 100644 Binary files a/_images/examples/Simulacra_Example_2.png and b/_images/examples/Simulacra_Example_2.png differ diff --git a/_images/examples/Simulacra_Example_front.png b/_images/examples/Simulacra_Example_front.png index 508b5241e226e0dc45ada8830a20dd86f5a36618..266943e2f6b7a46b72bef4f2ed469d4a0bdd66cc 100644 Binary files a/_images/examples/Simulacra_Example_front.png and b/_images/examples/Simulacra_Example_front.png differ diff --git a/_images/examples/Simulacra_Example_rear.png b/_images/examples/Simulacra_Example_rear.png index 0086e63bc48b055c44e88490b31f5eb8a0dc28b0..3ff9d5c8986c54a1234ce8537b360ed21860f1e5 100644 Binary files a/_images/examples/Simulacra_Example_rear.png and b/_images/examples/Simulacra_Example_rear.png differ diff --git a/_images/examples/Simulacra_Maskless.png b/_images/examples/Simulacra_Maskless.png index b9430290702b713c4e197585fc1ea76857e8a331..116f5c9a013e9748bea4539c8793704b330898b7 100644 Binary files a/_images/examples/Simulacra_Maskless.png and b/_images/examples/Simulacra_Maskless.png differ diff --git a/_images/examples/Simulacra_Test_Face.png b/_images/examples/Simulacra_Test_Face.png index 2ceabbef91bc20abed6869275de4bfb1585ed0f2..904697e45b271450248bcb49a221a74c4697d47d 100644 Binary files a/_images/examples/Simulacra_Test_Face.png and b/_images/examples/Simulacra_Test_Face.png differ diff --git a/_images/examples/personnel/CSP-68M_Backpack.png b/_images/examples/personnel/CSP-68M_Backpack.png index 6808c287e2742720541407fcc3420b673b65364e..23d5a50fc28131d96ce41c098ff2e6024d3fd2e1 100644 Binary files a/_images/examples/personnel/CSP-68M_Backpack.png and b/_images/examples/personnel/CSP-68M_Backpack.png differ diff --git a/_images/examples/personnel/Defiance_Tactical_armor_set.jpg b/_images/examples/personnel/Defiance_Tactical_armor_set.jpg deleted file mode 100644 index 4dc75f1f3b8140fe07b2323335fa220e9719a49f..0000000000000000000000000000000000000000 Binary files a/_images/examples/personnel/Defiance_Tactical_armor_set.jpg and /dev/null differ diff --git a/_images/examples/personnel/Defiance_Tactical_armor_set.png b/_images/examples/personnel/Defiance_Tactical_armor_set.png new file mode 100644 index 0000000000000000000000000000000000000000..483ed2d51b427e89f8a12eb320c1c5bfeeb9e026 Binary files /dev/null and b/_images/examples/personnel/Defiance_Tactical_armor_set.png differ diff --git a/_images/examples/personnel/DustUp_Tactical_armor_set.jpg b/_images/examples/personnel/DustUp_Tactical_armor_set.jpg deleted file mode 100644 index 3f7a3cf8ab446d7964f67d7ca657773669ea1661..0000000000000000000000000000000000000000 Binary files a/_images/examples/personnel/DustUp_Tactical_armor_set.jpg and /dev/null differ diff --git a/_images/examples/personnel/DustUp_Tactical_armor_set.png b/_images/examples/personnel/DustUp_Tactical_armor_set.png new file mode 100644 index 0000000000000000000000000000000000000000..04c1929159b2386a08a221bfc07188f22593a729 Binary files /dev/null and b/_images/examples/personnel/DustUp_Tactical_armor_set.png differ diff --git a/_images/examples/personnel/MMC_Concept_1.png b/_images/examples/personnel/MMC_Concept_1.png index 675ee27dd01ef917f9ca2fe15b6cc087fb191058..99304fa208564a2044f850c1b44caf5d28055fa7 100644 Binary files a/_images/examples/personnel/MMC_Concept_1.png and b/_images/examples/personnel/MMC_Concept_1.png differ diff --git a/_images/examples/personnel/MMC_Concept_2.png b/_images/examples/personnel/MMC_Concept_2.png index 8cc076be0db555c25bf4978d63f6adad28a89477..1a62b8e7ca2c30c112162d8a6255f68bc24c2927 100644 Binary files a/_images/examples/personnel/MMC_Concept_2.png and b/_images/examples/personnel/MMC_Concept_2.png differ diff --git a/_images/examples/personnel/MMC_helmet_backpack.png b/_images/examples/personnel/MMC_helmet_backpack.png index 1c4beb26f128ec7331984455e185bfa7cbe7676b..c3f6033518578613b4ca86e33df96be3383557c3 100644 Binary files a/_images/examples/personnel/MMC_helmet_backpack.png and b/_images/examples/personnel/MMC_helmet_backpack.png differ diff --git a/_images/examples/ships/Apollo hover underside.png b/_images/examples/ships/Apollo hover underside.png index e6c39f5a3781a60d34048af617e66a8701e2d79d..63a72c85bf7f4fad95a8f135dfeb236baa5690d2 100644 Binary files a/_images/examples/ships/Apollo hover underside.png and b/_images/examples/ships/Apollo hover underside.png differ diff --git a/_images/examples/ships/Apollo_-_interior_layout.jpg b/_images/examples/ships/Apollo_-_interior_layout.jpg deleted file mode 100644 index eb9c67b55c657eb73060e9008be319d3e12c90ac..0000000000000000000000000000000000000000 Binary files a/_images/examples/ships/Apollo_-_interior_layout.jpg and /dev/null differ diff --git a/_images/examples/ships/Apollo_-_interior_layout.png b/_images/examples/ships/Apollo_-_interior_layout.png new file mode 100644 index 0000000000000000000000000000000000000000..1efd9f933a198fb200811b4fd6b57d1eef57655d Binary files /dev/null and b/_images/examples/ships/Apollo_-_interior_layout.png differ diff --git a/_static/cc-by-sa.png b/_static/cc-by-sa.png new file mode 100644 index 0000000000000000000000000000000000000000..cbf95abb3633d0bc54792916e3f6a7164bb30e38 Binary files /dev/null and b/_static/cc-by-sa.png differ diff --git a/conf.py b/conf.py index b07701a304e0cd6a3f28b9a57aeeca69729e6d2a..9ded37e15053958c0169fdeeae7e4d768a606182 100644 --- a/conf.py +++ b/conf.py @@ -21,7 +21,8 @@ language = 'en' extensions = [ 'sphinx.ext.duration', 'sphinx.ext.extlinks', - 'sphinx.ext.todo' + 'sphinx.ext.todo', + 'sphinx.ext.imgconverter' ] templates_path = ['_templates'] diff --git a/index.rst b/index.rst index 59700ec9aa3e0b03ebae16838c7247e91e6f6cd0..66a043568ec38e20c0eebc1e71c76de5be69767e 100644 --- a/index.rst +++ b/index.rst @@ -7,18 +7,9 @@ Summoning Frontier ==================== -.. image:: _static/cc-by-sa.svg +.. image:: _static/cc-by-sa.* :target: https://creativecommons.org/licenses/by-sa/4.0/ -.. toctree:: - :maxdepth: 2 - :caption: Contents: - :glob: - - Book/* - - Ideas/index - Source: https://gitlab.com/kaictl/writing/summoning .. image:: _images/maps/Map_of_the_civilized_area_1200.png @@ -36,5 +27,14 @@ Inspired by `Japan Summons/Nihonkoku Shoukan by みのろう`_ .. _`Japan Summons/Nihonkoku Shoukan by みのろう`: http://mokotyama.sblo.jp/ -.. image:: _static/cc-by-sa.svg - :target: https://creativecommons.org/licenses/by-sa/4.0/ \ No newline at end of file +.. image:: _static/cc-by-sa.* + :target: https://creativecommons.org/licenses/by-sa/4.0/ + +.. toctree:: + :maxdepth: 2 + :caption: Contents: + :glob: + + Book/* + + Ideas/index