Permalink
Browse files

Attempting to fix stupid merge issue.

  • Loading branch information...
thebracket committed May 27, 2017
2 parents 8be8061 + 4e1654b commit 4c4c990204c60a311a4b1d3574de830efadbb5f1
Showing with 5,917 additions and 2,311 deletions.
  1. +1 −1 README.md
  2. BIN assets/background_image.jpg
  3. BIN assets/gamelogo.png
  4. BIN branding/nf_icon.png
  5. +1 −0 branding/nf_icon.svg
  6. BIN branding/nfdark.png
  7. +1 −0 branding/nfdark.svg
  8. BIN branding/nfwhite.png
  9. +1 −0 branding/nfwhite.svg
  10. +13 −2 src/CMakeLists.txt
  11. +1 −0 src/components/CMakeLists.txt
  12. +9 −3 src/components/building.hpp
  13. +1 −1 src/components/designations.hpp
  14. +31 −0 src/components/explosion_t.hpp
  15. +57 −0 src/components/item.cpp
  16. +6 −51 src/components/item.hpp
  17. +1 −0 src/components/natural_attacks_t.hpp
  18. +22 −0 src/components/riding_t.hpp
  19. +5 −3 src/main.cpp
  20. +0 −1 src/main/CMakeLists.txt
  21. +6 −0 src/main/game_config.cpp
  22. +1 −0 src/main/game_config.hpp
  23. +0 −3 src/main/game_region.cpp
  24. +0 −7 src/main/game_region.hpp
  25. +2 −2 src/main/play_game.cpp
  26. +1 −1 src/planet/CMakeLists.txt
  27. +1 −8 src/planet/builder/CMakeLists.txt
  28. +20 −19 src/planet/builder/biome_builder.cpp
  29. +29 −28 src/planet/builder/history_builder.cpp
  30. +23 −46 src/planet/builder/region_builder.cpp
  31. +1 −1 src/planet/builder/regions/CMakeLists.txt
  32. +30 −23 src/planet/builder/regions/blight_builder.cpp
  33. +2 −3 src/planet/builder/regions/blight_builder.hpp
  34. +59 −104 src/planet/builder/regions/buildings.cpp
  35. +5 −6 src/planet/builder/regions/buildings.hpp
  36. +30 −27 src/planet/builder/regions/decorators.cpp
  37. +3 −5 src/planet/builder/regions/decorators.hpp
  38. +4 −2 src/planet/builder/regions/heightmap.cpp
  39. +1 −2 src/planet/builder/regions/heightmap.hpp
  40. +24 −22 src/planet/builder/regions/strata.cpp
  41. +3 −3 src/planet/builder/regions/strata.hpp
  42. +25 −23 src/planet/builder/regions/trees.cpp
  43. +2 −2 src/planet/builder/regions/trees.hpp
  44. +5 −3 src/planet/builder/regions/water_features.cpp
  45. +1 −2 src/planet/builder/regions/water_features.hpp
  46. +62 −16 src/planet/builder/sentient_builder.cpp
  47. +1 −2 src/planet/builder/sentient_builder.hpp
  48. +61 −56 src/planet/builder/settler_builder.cpp
  49. +2 −1 src/planet/planet_builder.cpp
  50. +1 −1 src/planet/planet_builder.hpp
  51. +0 −347 src/planet/region.cpp
  52. +0 −84 src/planet/region.hpp
  53. +5 −0 src/planet/region/CMakeLists.txt
  54. +809 −0 src/planet/region/region.cpp
  55. +267 −0 src/planet/region/region.hpp
  56. +2 −4 src/raws/CMakeLists.txt
  57. +8 −5 src/raws/biomes.cpp
  58. +9 −33 src/raws/biomes.hpp
  59. +28 −5 src/raws/buildings.cpp
  60. +8 −31 src/raws/buildings.hpp
  61. +5 −2 src/raws/clothing.cpp
  62. +2 −13 src/raws/clothing.hpp
  63. +2 −1 src/raws/creatures.cpp
  64. +2 −46 src/raws/creatures.hpp
  65. +29 −0 src/raws/defs/biome_type_t.hpp
  66. +29 −0 src/raws/defs/building_def_t.hpp
  67. +93 −0 src/raws/defs/civilization_t.hpp
  68. +16 −0 src/raws/defs/clothing_t.hpp
  69. +44 −0 src/raws/defs/item_def_t.hpp
  70. +25 −0 src/raws/defs/life_event_template.hpp
  71. +24 −0 src/raws/defs/material_def_t.hpp
  72. +22 −0 src/raws/defs/plant_t.hpp
  73. +22 −0 src/raws/defs/profession_t.hpp
  74. +47 −0 src/raws/defs/raw_creature_t.hpp
  75. +24 −0 src/raws/defs/reaction_t.hpp
  76. +66 −0 src/raws/graphviz.hpp
  77. +2 −0 src/raws/health_factory.cpp
  78. +31 −3 src/raws/items.cpp
  79. +9 −43 src/raws/items.hpp
  80. +16 −2 src/raws/life_events.cpp
  81. +6 −27 src/raws/life_events.hpp
  82. +35 −6 src/raws/materials.cpp
  83. +7 −23 src/raws/materials.hpp
  84. +0 −155 src/raws/native_population.cpp
  85. +0 −41 src/raws/native_population.hpp
  86. +5 −8 src/raws/plants.cpp
  87. +3 −26 src/raws/plants.hpp
  88. +8 −1 src/raws/profession.cpp
  89. +5 −24 src/raws/profession.hpp
  90. +61 −38 src/raws/raws.cpp
  91. +43 −15 src/raws/reactions.cpp
  92. +8 −22 src/raws/reactions.hpp
  93. +43 −4 src/raws/species.cpp
  94. +15 −93 src/raws/species.hpp
  95. +2 −1 src/systems/ai/distance_map_system.cpp
  96. +57 −48 src/systems/ai/inventory_system.cpp
  97. +10 −9 src/systems/ai/mining_system.cpp
  98. +2 −2 src/systems/ai/mode_rogue_system.cpp
  99. +32 −18 src/systems/ai/movement_system.cpp
  100. +12 −10 src/systems/ai/path_finding.cpp
  101. +22 −2 src/systems/ai/settler/ai_idle.cpp
  102. +8 −0 src/systems/ai/settler/ai_visibility_scan.cpp
  103. +20 −18 src/systems/ai/settler/ai_work_architect.cpp
  104. +9 −7 src/systems/ai/settler/ai_work_building.cpp
  105. +4 −1 src/systems/ai/settler/ai_work_butcher.cpp
  106. +19 −11 src/systems/ai/settler/ai_work_harvest.cpp
  107. +1 −1 src/systems/ai/settler/ai_work_hunt.cpp
  108. +13 −12 src/systems/ai/settler/ai_work_lumberjack.cpp
  109. +10 −6 src/systems/ai/settler/ai_work_mining.cpp
  110. +9 −7 src/systems/ai/settler/ai_work_order.cpp
  111. +2 −2 src/systems/ai/settler/ai_work_template.hpp
  112. +4 −2 src/systems/ai/settler_spawner_system.cpp
  113. +8 −7 src/systems/ai/visibility_system.cpp
  114. +8 −6 src/systems/ai/wildlife_population_system.cpp
  115. +20 −19 src/systems/ai/workflow_system.cpp
  116. +2 −1 src/systems/damage/creature_attacks.cpp
  117. +26 −2 src/systems/damage/damage_system.cpp
  118. +2 −0 src/systems/damage/damage_system.hpp
  119. +17 −13 src/systems/damage/sentient_attacks.cpp
  120. +10 −6 src/systems/damage/settler_melee_attacks.cpp
  121. +12 −8 src/systems/damage/settler_ranged_attack.cpp
  122. +11 −6 src/systems/damage/weapons_helpers.cpp
  123. +3 −3 src/systems/gui/hud_system.cpp
  124. +36 −38 src/systems/gui/mode_design_system.cpp
  125. +50 −42 src/systems/gui/mode_play_system.cpp
  126. +2 −0 src/systems/gui/mode_sentient_info_system.cpp
  127. +5 −3 src/systems/gui/mode_settler_info_system.cpp
  128. +2 −2 src/systems/gui/mode_units_system.cpp
  129. +4 −3 src/systems/gui/panel_render_system.cpp
  130. +12 −6 src/systems/gui/particle_system.cpp
  131. +2 −0 src/systems/gui/particle_system.hpp
  132. +72 −21 src/systems/gui/wish_system.cpp
  133. +2 −2 src/systems/input/keyboard_system.cpp
  134. +1 −0 src/systems/physics/CMakeLists.txt
  135. +7 −5 src/systems/physics/door_system.cpp
  136. +210 −0 src/systems/physics/explosive_system.cpp
  137. +12 −0 src/systems/physics/explosive_system.hpp
  138. +40 −38 src/systems/physics/fluid_system.cpp
  139. +19 −16 src/systems/physics/gravity_system.cpp
  140. +43 −50 src/systems/physics/topology_system.cpp
  141. +8 −6 src/systems/physics/trigger_system.cpp
  142. +17 −15 src/systems/physics/vegetation_system.cpp
  143. +1 −1 src/systems/render/camera_system.cpp
  144. +2 −2 src/systems/render/lighting_system.cpp
  145. +3 −2 src/systems/render/renderables_system.cpp
  146. +12 −3 src/systems/scheduler/initiative_system.cpp
  147. +12 −9 src/systems/stockpile_system.cpp
  148. +2 −0 src/systems/systems.cpp
  149. +9 −9 src/systems/tasks/pathfinding.hpp
  150. +1 −4 src/systems/tasks/settler_work_time.cpp
  151. +17 −17 src/systems/tasks/work_types/demolition_work.cpp
  152. +2 −0 src/systems/tasks/work_types/equip_armor_work.cpp
  153. +1 −0 src/systems/tasks/work_types/equip_melee_work.cpp
  154. +1 −0 src/systems/tasks/work_types/equip_ranged_work.cpp
  155. +2 −2 src/systems/world_system.cpp
  156. +22 −20 src/utils/dijkstra_map.cpp
  157. +2 −2 src/utils/filesystem.cpp
  158. +1 −1 src/utils/gl/CMakeLists.txt
  159. +68 −70 src/utils/gl/map_render.cpp
  160. +11 −10 src/utils/gl/world_scene.cpp
  161. +1 −1 src/utils/octree.hpp
  162. +45 −45 world_defs/biomes.lua
  163. +40 −0 world_defs/buildings_carpenter.lua
  164. +113 −0 world_defs/buildings_chemist.lua
  165. +267 −0 world_defs/buildings_clothier.lua
  166. +300 −5 world_defs/buildings_forge.lua
  167. +20 −0 world_defs/buildings_leather.lua
  168. +10 −0 world_defs/buildings_mason.lua
  169. +26 −1 world_defs/buildings_mechanic.lua
  170. +114 −0 world_defs/buildings_raw_material.lua
  171. +386 −18 world_defs/buildings_workshop.lua
  172. +219 −4 world_defs/clothing.lua
  173. +1 −0 world_defs/config.txt
  174. +23 −0 world_defs/creatures.lua
  175. +1 −1 world_defs/emmet_tl4.lua
  176. +1 −0 world_defs/glyphs.lua
  177. +2 −0 world_defs/index.txt
  178. +189 −0 world_defs/items_intermediary.lua
  179. +377 −1 world_defs/items_weapons_melee.lua
  180. +254 −17 world_defs/items_weapons_ranged.lua
  181. +3 −2 world_defs/neolithic_elf.lua
  182. +5 −3 world_defs/neolithic_human.lua
  183. +5 −3 world_defs/neolithic_orc.lua
  184. +2 −1 world_defs/stockpiles.lua
  185. +5 −0 world_defs/vegetation.lua
View
@@ -1,4 +1,4 @@
# Black Future
# Nox Futura (formerly Black Future)
An open-source game combining elements of Dwarf Fortress, Civilization, Warhammer, Douglass Adams, and more.
View
BIN +198 KB (140%) assets/background_image.jpg
Binary file not shown.
View
BIN -72.5 KB (36%) assets/gamelogo.png
Binary file not shown.
View
BIN +6.01 KB branding/nf_icon.png
Binary file not shown.
View
@@ -0,0 +1 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><defs><style>.cls-1{stroke:#000;stroke-miterlimit:10;}</style></defs><title>Artboard 3</title><path class="cls-1" d="M41.13,76.08l2.47.32H47Q58.2,77.58,58.2,79.08a1.43,1.43,0,0,1,1.25.91q3,0,5.4,6a1.62,1.62,0,0,0,.36.53,71.67,71.67,0,0,1,6.25,8.72l.38.41q.7.39,2,4.79a2,2,0,0,0,.47.78,3.74,3.74,0,0,1,.45,2.07,1.66,1.66,0,0,0,.4,1.06q1.34,1.44,3.84,10a1.81,1.81,0,0,0,.15.37q5,9,6.36,14.74a1.6,1.6,0,0,0,.13.36,77.49,77.49,0,0,1,4.9,12.46h.27l1-3.5c0-.09-.22-1.64-.22-1.64l.22-1.17-.49-14.71s0-.08,0-.12l.27-9.57-.27-2.41-.27-5q0-.08,0-.17l.27-8.38q0-12.56-3-15.3a5.41,5.41,0,0,1-2-2.15v-.26h.22a14.71,14.71,0,0,0,4.43,1.15,1,1,0,0,0,.75-.23,5.85,5.85,0,0,1,2.58-.66q0-.52,1.79-.59l10.15-2.49-2.89,2.82q0,.36-2.36,1.33a1.45,1.45,0,0,0-.56.47,17.66,17.66,0,0,1-3.13,2.52,1.52,1.52,0,0,0-.4.41L96,83.89l.22,1.24a15.75,15.75,0,0,0-1.46,7.49l-.27.91V98s0,.07,0,.11l.47,8.35a2,2,0,0,1-.07.62,35.46,35.46,0,0,0-.66,5.77c0,.16.26,1.74.26,1.74l-.49.91a14.82,14.82,0,0,1,.76,3.91V120l-.53,4.71a2,2,0,0,0,0,.22v4.75c0,.14.27,1.45.27,1.45l-.27,2.26c0,.27.53,1.8.52,2.11l-.51,9.7s0,.07,0,.1v3.27q0,2.51,3.71,10.63a1.73,1.73,0,0,1,.12.36,24.77,24.77,0,0,0,4.19,9.7q0,.65,2.55,3.64a32.22,32.22,0,0,1,4,3.59,1.7,1.7,0,0,0,.46.51,18.82,18.82,0,0,0,10.5,3.39h1q4.3,0,9.34-4.07a1.68,1.68,0,0,0,.35-.39c.86-1.34-1.21,4.36-8.05,6.83l-.24.06-3.62.57h-1l-.49.65q-3,0-10.24-2.73V181l-1.25-1.17-.76-.33v-.59l-4-2.81a1.22,1.22,0,0,1-1-.35l-4.36-4.21a1.65,1.65,0,0,1-.31-.43q-.93-1.83-1.39-1.83l.27-1.5v-.33l-6.14-8.78a1.65,1.65,0,0,1-.22-.44q-1.21-3.7-5.89-11.08l-.09-.16a67.89,67.89,0,0,1-5.15-14.35,1.87,1.87,0,0,0-.23-.62L75,129.91l.49-2.08a33.49,33.49,0,0,0-4.25-9.57l-.06-.12L65,105.24l-3.52-7.81q-2.56-5.8-4.5-6.53a1.34,1.34,0,0,1-.72-.64v0c-.74-1.36-2.52-.71-2.52.92V123.6c0,6.1-.74,17.53-.7,17.71a99,99,0,0,1,1.17,10.56c0,.2,2.71,5.71,3.91,6,.22.05,4.26,3,4.89,3v.59S59.35,161,58,160.19a21.77,21.77,0,0,0-4.68.12s-2.63.16-3.39-.26c-.31-.17-4.4.65-8.28,1.18v-.59q9.27-2.54,9.27-11.13V136s0-.08,0-.12l.48-8a2,2,0,0,0,0-.22l-.48-9.46s0-.08,0-.12a37.45,37.45,0,0,1,.76-5.91V109a2,2,0,0,0,0-.32l-.49-3a2,2,0,0,1,0-.32v-4a2,2,0,0,0,0-.2,33.07,33.07,0,0,0,.55-3.8l-.53-4.71a2,2,0,0,1,0-.22V86.16a7.69,7.69,0,0,0-6.72-5.71,4.78,4.78,0,0,0-.57-.14h-2a19.71,19.71,0,0,0-10.13,2.6c-.07,0-1.9,1.56-1.9,1.56s-3.67,3.15-4.71,6.31c-1.34,3.86-3.2,14.41-2.59,19.94.45,4.13,5.17,8.31,8.33,8.63,4.71.48,10.22-10.66,10.22-10.66a2,2,0,0,0,0-.28v-3.76q0-6.64-5-6.64l-.27-.26q-6.63,1.41-6.72,7.89a2.6,2.6,0,0,0,0,.36q.57,4.38,3,4.38,1.4,0,2.72-1.92a1.82,1.82,0,0,0,.3-1.1c-.11-2.2.72-2,.72-.62v.65q-.87,5.4-4,5.4h-.49q-2.42,0-4.38-5.4a2,2,0,0,1-.12-.68V104.3a2.1,2.1,0,0,1,0-.45Q28.87,95,32.4,95q7.42,0,9.27,3a19.07,19.07,0,0,1,2.22,8.72q0,7.51-6.06,15.46a10.63,10.63,0,0,1-4,1.4H29.64c-2.53,0-9.58-6.38-9.65-6.53a18.2,18.2,0,0,1-1.89-8.51s1.12-15,3.37-17.29c.1-.1-.77-1.59,3.77-9C28.4,79.7,33.79,76.08,41.13,76.08Zm55.11,0"/><path class="cls-1" d="M171.47,22.07c-2.14.78-3.2,1.78-3.2,3a2.68,2.68,0,0,0,1.79,2.47h.27v-.26l-.92-1.63A2.46,2.46,0,0,1,171.9,24h.7c2.07,0,3.21.83,3.42,2.47v1.11l-.71,1.37q-6,3.91-8.89,3.9-1,1-7.32,1.63v-.85l-4.11.59a75.6,75.6,0,0,0-12.85-1.11H133l-1.08.09h-.09c-1.6.27-3.21.57-4.82.75a17.38,17.38,0,0,1-6.28-.31h-2.8l-.71-.52h-1.84q0,1-6.4,1.89v.32l.23.27v.26L103,37.43q-8,4-13.28,14.07c-.9,5.11-1.49,7.68-1.79,7.68l.22,2.73v2.22c1.45,2,2.83,3,4.12,3h.65l1.42-.26q4.33-2.28,4.33-5.21a3.5,3.5,0,0,0-2.54-3.58l-1.57.26v.59a2.08,2.08,0,0,1,2.27,1.36v.27c0,1.56-1,2.58-3,3l-.65-.32c-.95,0-1.41-1.28-1.41-3.84q0-6.18,6.39-11.26a17,17,0,0,0,4.12-2.74v-.26l-.22-.32V44.6h1.13l1.42-.53h.22l.22.26,1.36-.26h5.3c1.67,0,4.87.94,9.57,2.8a9.48,9.48,0,0,1,6.16,4.26,26.38,26.38,0,0,1,6.23,7.53l.54,1.42.16.2v.23l.43,1.14H135q3.9,12.7,3.9,20.64l-1.14,12.89v2.21q0,7.16-.71,9.64-2.65,6.7-5.68,9.89-3.1,7.94-18.32,7.95l-6.88-3.32q-6.66-3.46-9.8-13.15l-.71-6.9c.6-9.49,4.34-14,4.34-14q4.89-6.91,11-6.9h1.14c1.08,0,2.76,1.47,5,4.42.69,0,1.45,2.39,2.27,7.16l-.22,1.89c0,3-1.6,5.1-4.82,6.32l-2.5-.52a13.43,13.43,0,0,1-2.54-5.47c.29-2.22,1.2-3.32,2.76-3.32.25,0,.55.54.91,1.63a2.12,2.12,0,0,1-1.84,2.21v.52h1.62A2.83,2.83,0,0,0,114.24,93V91.07a5.14,5.14,0,0,0-1.84-2h-1.57q-2.82,0-4.12,6.63v2.74q0,6.78,4.12,9a18,18,0,0,0,6.39-.78q7.32-4.55,7.32-15.43l-.39-4.43A6.42,6.42,0,0,1,123,84.16c-.11-.72-.3-1.37-.47-2.06l-.22-.54-.62-1.67q-3.65-5.35-9.33-5.36c-9,0-12.32,1-16.26,11.59,0,0-3.29,5.52-4.34,14.84l.22,5.8q3.36,12.24,7.8,15.87,5,5.48,14.63,5.47h3.69a17.75,17.75,0,0,0,8-1.89c2.71-.64,4.15-1.38,4.34-2.21a5.32,5.32,0,0,0,2.27-1.63c2.61-1.3,3.9-2.41,3.9-3.32q1.46-.26,6.39-6.57a24.61,24.61,0,0,0,3.69-9q3.41-10.42,3.41-11.85l-.7-6,.27-1.37,1.57-2.74v-.26l4.12-1.1.48.52,3.41-2.74a14.66,14.66,0,0,0,6.8-5.52c3.08-2.63,3-8.49-.7-5.44a4,4,0,0,1-.5.32Q159.49,74,152,74h-1.85a5.12,5.12,0,0,0-1.36-2.21,37.57,37.57,0,0,0-2.32-9v-.21a11.24,11.24,0,0,1-1.39-2.84l-2-3q-5-6.89-9.85-9c-3.47-2.6-5.82-3.9-7-3.9v-.26q.65-1.37,2.93-1.37h.48l1.14.26,1.36-.26h1.41l13,.59q.54-.59,6.66-1.43l3.9,1.1h3.2q4.39,0,9.81-3.25,9.37-6.85,9.37-11c0-3.51-1.76-5.53-5.26-6"/></svg>
View
BIN +35.5 KB branding/nfdark.png
Binary file not shown.
View
@@ -0,0 +1 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841 158.08"><defs><style>.cls-1{fill:#231f20;stroke:#000;stroke-miterlimit:10;}</style></defs><title>Artboard 1 copy</title><path class="cls-1" d="M36.9,15.48l3.91.42h5.35q17.72,1.54,17.72,3.5a2.28,2.28,0,0,1,2,1.2q4.67,0,8.53,7.89a2.15,2.15,0,0,0,.56.7q2.48,2.05,9.87,11.47l.6.55q1.11.51,3.1,6.3a2.54,2.54,0,0,0,.75,1q.6.55.71,2.72a2,2,0,0,0,.63,1.39q2.12,1.89,6.07,13.17a2.18,2.18,0,0,0,.24.49q8,11.81,10.06,19.4a1.88,1.88,0,0,0,.2.47,92.62,92.62,0,0,1,7.74,16.39h.43L116.9,98c0-.12-.34-2.16-.34-2.16l.34-1.54-.77-19.36q0-.08,0-.16l.43-12.6L116.13,59l-.42-6.57a2.17,2.17,0,0,1,0-.22l.42-11q0-16.53-4.71-20.13a7.82,7.82,0,0,1-3.17-2.83v-.34h.34a27.09,27.09,0,0,0,7,1.51,1.81,1.81,0,0,0,1.18-.3q.74-.54,4.07-.87,0-.69,2.83-.77h11.48v.43q0,.48-3.73,1.76a2.24,2.24,0,0,0-.89.62,27.48,27.48,0,0,1-4.95,3.32,2.23,2.23,0,0,0-.62.54l-1.29,1.64.34,1.63q-2.31,3.51-2.31,9.85l-.43,1.2v5.84s0,.1,0,.15l.74,11a2.24,2.24,0,0,1-.1.81,39.25,39.25,0,0,0-1,7.59c0,.21.41,2.29.41,2.29l-.77,1.2a16.72,16.72,0,0,1,1.2,5.14v.86l-.84,6.19a2.17,2.17,0,0,0,0,.29V86c0,.19.43,1.91.43,1.91l-.43,3c0,.35.84,2.37.82,2.77l-.81,12.77s0,.09,0,.14v4.3q0,3.31,5.87,14a2,2,0,0,1,.19.48,30.13,30.13,0,0,0,6.62,12.77q0,.85,4,4.8s5.45,3.5,6.39,4.72a2.45,2.45,0,0,0,.73.67,34,34,0,0,0,16.6,4.46h1.54q6.8,0,14.76-5.35a2.41,2.41,0,0,0,.55-.52c1.35-1.76-1.91,5.74-12.73,9a2.4,2.4,0,0,1-.38.08l-5.72.75h-1.63l-.77.86q-4.8,0-16.19-3.6v-.43l-2-1.54-1.2-.43v-.77l-6.3-3.69a2.17,2.17,0,0,1-1.59-.47l-6.89-5.54a2.23,2.23,0,0,1-.49-.57q-1.48-2.41-2.2-2.41l.43-2v-.43l-9.71-11.55a2.05,2.05,0,0,1-.34-.58q-1.91-4.86-9.31-14.58l-.14-.21c-4.18-7-7.39-15.47-8.14-18.88a2.23,2.23,0,0,0-.37-.82l-2-2.8.77-2.74Q90,78.72,84.5,71l-.1-.16-9.8-17L69,43.58q-4-7.64-7.11-8.6a2,2,0,0,1-1.14-.84l0,0a2.17,2.17,0,0,0-4,1.2V78c0,8-1.17,23.07-1.11,23.3a109.48,109.48,0,0,1,1.85,13.9c0,.26,4.28,7.51,6.19,7.89.34.07,6.74,4,7.73,4v.77s-5.71-.57-7.82-1.7a41.28,41.28,0,0,0-7.4.15s-4.16.21-5.36-.35c-.48-.23-6.95.85-13.08,1.55v-.77q14.65-3.34,14.65-14.65V94.36q0-.08,0-.16l.75-10.49a2.17,2.17,0,0,0,0-.29L52.41,71c0-.05,0-.11,0-.16A41.55,41.55,0,0,1,53.6,63V58.86a2.17,2.17,0,0,0,0-.42l-.78-4a2.17,2.17,0,0,1,0-.42V48.85a2.17,2.17,0,0,0,0-.27,36.77,36.77,0,0,0,.87-5l-.84-6.19a2.17,2.17,0,0,1,0-.29V28.75c0-.64-2.27-6.63-10.61-7.51a8.82,8.82,0,0,0-.9-.19H38.1a36.16,36.16,0,0,0-16,3.43c-.12.06-3,2.06-3,2.06s-5.8,4.14-7.45,8.31c-2.11,5.08-5.06,19-4.09,26.25C8.25,66.52,15.72,72,20.71,72.44c7.45.63,16.16-14,16.16-14a2.17,2.17,0,0,0,0-.37v-5q0-8.74-7.88-8.74L28.59,44Q18.12,45.87,18,54.39a2.86,2.86,0,0,0,0,.47q.9,5.76,4.68,5.76,2.22,0,4.3-2.53a2.11,2.11,0,0,0,.47-1.44c-.18-2.89,1.14-2.62,1.14-.82v.86q-1.37,7.11-6.34,7.11h-.77q-3.83,0-6.92-7.11a2.25,2.25,0,0,1-.18-.89V52.61a2.32,2.32,0,0,1,.08-.59q3.08-11.61,8.66-11.61,11.73,0,14.65,3.94a21.84,21.84,0,0,1,3.51,11.48q0,9.88-9.58,20.35A19,19,0,0,1,25.43,78H18.74c-4,0-15.14-8.4-15.25-8.59a20.7,20.7,0,0,1-3-11.2S2.27,38.46,5.83,35.47c.16-.13-1.22-2.09,6-11.89A44.69,44.69,0,0,1,36.9,15.48Zm87.11,0,23,81.54.34.43h.43q0,2.06-2.4,3.17h-.77l-.77-.86Q143.88,98.91,147.05,97Z"/><path class="cls-1" d="M176.69,58.4l1.2-1.2q8.31,2.57,8.74,4.8,11.56,9,11.56,24.67V88.2a38.64,38.64,0,0,1-3.6,16.7h-.77l-1.2,3.17-5.57,6.77a22.33,22.33,0,0,1-6.34,5.14q-6.77,5.57-18.33,5.57-14.13,0-22.27-14.3l-.34-1.54a4.5,4.5,0,0,1-1.2-2.83A40.77,40.77,0,0,1,136.17,95V92.14q0-10.45,5.14-17.47s2.8-2.63,7.19-6.34q2.74-3.08,2.74-5.57a34.14,34.14,0,0,1,20.3-6.34ZM165.21,64c-1.6-.17-9.16,1.51-9.16,3.17q-1,0-2.74,4.37l-.43.43a53.93,53.93,0,0,0-2.83,15.5l.86,9.51,1.2,6s.91,2.46,1.54,3.94a12.13,12.13,0,0,1,1.63,4.37q4.63,6.08,8.74,6.34h4.37q4.71,0,14.73-11.91l.34-2.4-.34-1.54-.43-2v-4l.43-7.11-.43-3.6h-.77v-3.6a34.14,34.14,0,0,1-2.4-7.54l-1.2-1.54V70q-2,0-4.8-3.6A31.79,31.79,0,0,0,166,63.54Z"/><path class="cls-1" d="M278.19,55.91m-11.13,10q-2.14,2.48-9.68,15.76v1.71q0,2.66,2.91,9.34,4.37,11.82,5.74,11.82,1.71,0,4.63,7.54.68,0,6.77,5.4a11.12,11.12,0,0,0,5.4,1.71q5.48,0,13.62-6.77l.34-1.8v-1.46q-1.89-2.48-3.25-2.48-2.83.26-2.83,1.8l.69,1.46H291q-1,0-1.46-2.91,0-2.14,4.37-3.17h2.14q3,0,3.94,5,0,7.28-10.79,16.45-4.37,2.23-6.08,2.23h-7.54a22.43,22.43,0,0,1-15.33-5.74L252.06,110q-.77-3.08-7.88-12.59-12.25,19.44-12.25,23.3,1.45,6.08,3.94,6.08v.77H223.71l-1.37-.43-.43.43h-1.37l-.77.6c-.46,0-2.14-.26-2.14-.26l-3.94-.34,2.57-3.25h.34q3.08,0,4.28-3.25l5.74-4.63a152,152,0,0,0,14.65-25.1,170.47,170.47,0,0,1-6.42-21.41q-3.77-8.39-9.34-10.79l-6.42-.69-.69.34-3.25-.34q-8.14,0-10,4.63,0,2.06,3.94,2.48h1.46l3.17-2.14H214v.43q0,1.71-5.65,3.51-5.4,0-7.88-3.51v-.43q0-3.85,17.13-17.13a21.62,21.62,0,0,1,7.19-1.11q8.14,1.71,8.91,2.48a25.24,25.24,0,0,1,9,5.4,31.75,31.75,0,0,1,5.74,10q3.42,3.85,6.77,12.93h.34Q267.4,57.88,267.4,54.11V52.66l-2.14-5.05v-.34s-2.9-2.48,4.71-2.48l20,1.11v.69Q276,52,276,56.94S268.88,61.88,267.05,65.93Zm8.57-8.31"/><path class="cls-1" d="M474.55,56.31c.36-.41.71-.78,1-1.14a.67.67,0,0,0,0-.18A16.26,16.26,0,0,1,474.55,56.31Zm-53.06-5.8L421,50h-.34v.42l1.12,1.46v-.81Z"/><path class="cls-1" d="M480.33.5c-3.38,1-5.05,2.34-5.05,3.95,0,1.41.94,2.5,2.83,3.25h.42V7.35l-1.46-2.14A3.93,3.93,0,0,1,481,3h1.1c3.26,0,5.07,1.09,5.41,3.25V7.69l-1.12,1.8q-9.5,5.14-14,5.13-1.53,1.36-11.56,2.14V15.65l-6.5.78A143,143,0,0,0,434,15H419.52v0c-.57,0-1.14.08-1.71.11h-.15c-2.53.36-5.07.75-7.62,1a32.87,32.87,0,0,1-9.92-.41h-4.42L394.59,15h-2.91q0,1.29-10.12,2.49v.42l.36.36v.34l-9.78,2.13q-12.67,5.31-21,18.52c-1.43,6.72-2.36,10.1-2.83,10.1l.34,3.59v2.92q3.44,3.92,6.51,3.93h1l2.24-.34q6.85-3,6.84-6.85c0-2.34-1.33-3.91-4-4.71l-2.49.34V49c1.93,0,3.13.6,3.59,1.79v.36c0,2-1.58,3.39-4.71,4l-1-.42c-1.49,0-2.23-1.69-2.23-5.05q0-8.14,10.1-14.81,5.31-2.41,6.51-3.61V30.9l-.34-.42v-.34h1.79l2.24-.7h.34l.34.34,2.14-.34h8.38c2.65,0,7.7,1.23,15.12,3.69a15.3,15.3,0,0,1,9.73,5.6,37,37,0,0,1,9.84,9.91l.86,1.87.26.26v.31l.68,1.49h.34q6.16,16.71,6.17,27.16l-1.8,17v2.91q0,9.43-1.12,12.69-4.19,8.82-9,13-4.9,10.45-29,10.46l-10.88-4.37q-10.53-4.56-15.5-17.3L360.58,105c.94-12.49,6.85-18.42,6.85-18.42q7.72-9.09,17.4-9.08h1.8c1.71,0,4.37,1.93,8,5.81,1.09,0,2.29,3.15,3.59,9.42l-.34,2.49c0,3.95-2.53,6.71-7.62,8.32l-3.95-.68a16.47,16.47,0,0,1-4-7.2c.45-2.92,1.9-4.37,4.37-4.37.39,0,.88.71,1.45,2.14,0,1.54-1,2.5-2.91,2.91V97h2.57a3.62,3.62,0,0,0,2.14-3.25V91.29A7.44,7.44,0,0,0,387,88.72h-2.49q-4.46,0-6.51,8.72v3.61c0,5.94,2.16,9.91,6.51,11.91,4.84,0,8.22-.34,10.1-1q11.57-6,11.56-20.3l-.62-5.83a7.74,7.74,0,0,1-1.75-3.61,25.77,25.77,0,0,0-.75-2.71l-.34-.71-1-2.19a18.25,18.25,0,0,0-14.75-7q-18.86,0-25.7,15.25s-5.2,7.26-6.85,19.52l.34,7.63q5.31,16.1,12.33,20.89Q375,140,390.22,140h5.83a32.75,32.75,0,0,0,12.67-2.49c4.29-.84,6.56-1.82,6.85-2.91a8.47,8.47,0,0,0,3.59-2.14c4.13-1.71,6.17-3.17,6.17-4.37q2.31-.34,10.1-8.64c3.26-4.4,5.2-8.36,5.83-11.91q5.38-13.72,5.39-15.59l-1.1-8,.42-1.8h.34L447,83v2.14h.78l.68-6.51v-.34L455,76.82l.76.68,5.39-3.61q7.14-2.56,10.75-7.26s5.52-7.89,7.59-7.89q5,1.8,5,4.29l.42,9.76-.42,13.61v1.12l.76,3.93V95.4l1,10-.7,3.59q0,9,3.61,14.39l5.73,2.92c0,1.36,2.52,2,7.54,2h1.46c3.13,0,5.28-.83,6.42-2.49q13.72-10.87,18-16.1l.76.68v3.61l.68.68-.34,1.1q0,5,2.83,7.54c2.24,1.84,5.49,3.15,9.78,3.95h.34l.34-.34q7.87-1.36,7.88-3.26,13.35-8.14,13.37-16.52v-2.49c-1.54-1.66-3-2.49-4.37-2.49h-1a4,4,0,0,0-2.13,3.93l.68.7h.34a3.28,3.28,0,0,1,1.1-2.49c1.72,0,2.66.71,2.83,2.13,0,3.49-2.62,5.9-7.88,7.2h-.68q-5,0-8-14.37V97.89l1.1-1.46V87.08h.68V85.72h-.68L545.6,76V67h.34l.68-17c0-1.59-.6-2.53-1.79-2.83-4.13,0-7.94,1.8-11.48,5.39q-3.26,3.87-3.25,29.82v1Q529,97.28,527.62,100c-3.15,4.22-4.71,6.63-4.71,7.2q-7.46,7.19-14.39,7.2-3,0-5.31-3.61-1-9.26-2.92-11.47v-7.2l.7-1v-8.3l1.1-9L501,66.28l.76-8.66v-1Q500,47.27,496,47.26H491.3l-1.8-.34v.34c-2.57,0-4.37.6-5.39,1.8-1.95.13-4.79,2.19-8.51,6.11-.32.36-.68.73-1,1.14l0,0,0,0a15.37,15.37,0,0,1-3.7,3.1c-.26.16-.54.29-.8.42a27.3,27.3,0,0,1-20.4,8.95h-2.92c0-.5-.71-1.48-2.14-2.91A43,43,0,0,0,440.85,54v-.28A13.94,13.94,0,0,1,438.66,50l-3.22-4q-8-9.06-15.58-11.91c-5.49-3.43-9.19-5.13-11.14-5.13v-.34q1-1.8,4.63-1.8h.76l1.8.34,2.14-.34h2.23l20.56.78q.85-.78,10.53-1.88l6.17,1.45h5.05q6.94,0,15.51-4.27,14.81-9,14.81-14.49c0-4.61-2.78-7.28-8.32-8"/><polygon class="cls-1" points="446.66 81.87 446.32 81.87 445.98 80.07 446.66 80.07 447 80.41 446.66 81.87"/><path class="cls-1" d="M607.1,102.68h-2.74v-.34c0-.23-.69.34-.69.34q-3.43,1.46-3.77,3.08c.86,1.6,2.06,1,2.06,1v-.69q0-.86,2.06-1h.69l.69.69v2.06q0,4.45-7.19,6.85-6.85-1.28-6.85-4.45L592,98.57,591,78.7l.69-5.14L591,69.79v-.34l1-1-.34-8.57L592,57.8l10.62-2.4.51.49a5.6,5.6,0,0,1,.59-.08c.22,0,.62-1.1.62-1.1l.69-1.37,2.06-3.43q0-2.06-3.43-4.11L602,45.46q0,1.71,1.37,1.71v.69l-.34.34-6.85,3.08-2.4-.69h-.34l-.34.34-1.37-.69.34-2.74-1-3.43v-2.4l.69-2.74a93.2,93.2,0,0,1-.69-13v-1h-.69a47.16,47.16,0,0,1-7.38,14.3,67.81,67.81,0,0,1-4.24,6.87,3.26,3.26,0,0,1-.91,1.47c-.25.43-.51.86-.74,1.31,0,0-.13.43-.31.48a4.21,4.21,0,0,1-2,1.65c-.07.11-.15.19-.22.31l-.49-.1a4.39,4.39,0,0,1-1.48,0l-.09.09Q565,53.43,565,57.8v.34q1.45,3.43,4.45,3.43h1.37q-2.4-2.06-2.4-2.74l2.4-2.06a12.61,12.61,0,0,0,5.14,1.71v1l-.69.69,1,13.36v4.8l-.34,1.71q1,2,1,11.31v6.51l-.69,2.06v.34l.34.34-1.37,5.48.34,6.85q0,11,4.11,12.33l-.09.26.38.16h0l.37.11c0-.16.76.05,1.28.33a5,5,0,0,1,.95.44,20.66,20.66,0,0,0,2.24.77q4.2,0,12-3.77l7.54-6.85,5.14-6.51q.94-4.11,1.71-4.11Q611.21,103,607.1,102.68Z"/><path class="cls-1" d="M574.55,51.29c7.92-6.82,14.35-26.68,15.76-26.38s-.27,23,1.37,25.35c1.77,2.58,12.07-2,12-4.45,0-.91,3.81,3.25,3.43,4.11-1.33,2.94-3.77,5.56-3.36,5.9,3.38,2.75-9.66-1.47-11.71,2-3.57,6,2.5,42.67-.69,52.42a3.58,3.58,0,0,0,1.06,2.19c1.58,1.88,4.63,2.44,7,1.84,4.78-1.24,7-7.5,6-8.48-.65-.65-3.43.34-3.43.34-.07.92-.14-1.94.31-2.75.94-1.68,6.53-1.87,7.92.35,2,3.2-4.88,11.11-9.49,15.19-3.81,3.37-11.11,8.26-17.61,7.87-5.08-.31-8.64-6.06-7.58-15.37,2.6-22.78,3.53-43.25.35-43.25-3,0,1.42-7.25.07-9.67-2-3.61-6.8-3.74-6.93,0-.06.85,1.92,2.72,1.79,3.08s-3,.43-4.47-1.29-.9-4.38.21-6C568.36,51.62,572.57,53,574.55,51.29Z"/><path class="cls-1" d="M697.63,102.25c-1.43.74-.74,2.83,0,2.14q2.57,0,2.83,2.14,0,5.22-7.88,7.19h-.69q-5,0-8-14.39V97.88L685,96.43V87.09h.12a10.15,10.15,0,0,1-.11-1.37h0L684.7,76V67H685l.69-17q0-2.4-1.8-2.83-6.17,0-11.48,5.4-3.26,3.85-3.25,29.81v1q-1.11,13.79-2.48,16.53-4.71,6.34-4.71,7.19-7.45,7.19-14.39,7.19-3,0-5.31-3.6-1-9.25-2.91-11.48V92.14l.69-1V82.81l1.11-9-1.11-7.54.77-8.65v-1q-1.71-9.34-5.74-9.34h-4.71l-1.8-.34v.34q-3.85,0-5.4,1.8-3.85.26-12.25,10.36l-1,1.46v.34l1,5.4,2.57.77h.69q2.23,0,3.94-2.57v-1l-1.37,1.46a2.38,2.38,0,0,1-2.57-1.8q1.28-4.71,4.37-4.71,5,1.8,5,4.28l.43,9.76-.43,13.62v1.11l.77,3.94V95.4l1,10-.69,3.6q0,9,3.6,14.39l5.74,2.91q0,2.06,7.54,2.06H643q4.71,0,6.42-2.48,13.7-10.88,18-16.1l.77.69v3.6l.69.69-.34,1.11q0,5,2.83,7.54,3.34,2.74,9.76,3.94h.34l.34-.34q7.88-1.37,7.88-3.25Q703,115.61,703,107.22v-2.48q-2.31-2.48-4.37-2.48Z"/><path class="cls-1" d="M752.28,46.32,749.11,46q-6.68,0-15.85,11.31-1.2-6.34-5.31-6.34h-.69l-8.82,4.2a70.78,70.78,0,0,0-9.16,11.65q-5.65,4.11-5.65,9.94s.48,1.51.61,1.91a4.24,4.24,0,0,0,2.56,1.26h.34a4.5,4.5,0,0,0,1.94-.7,1.9,1.9,0,0,0,.2-1.79h-.77a1.81,1.81,0,0,1-2.06-1.8c1-2.34,5-4.07,5-4.07,4-.94,8.73,4.38,6.89,7.16-1.14,1.72-.06,4.12-.14,6.17A2.87,2.87,0,0,1,719.59,87c.36,5-.95,9.82-1,14.87-.06,4.8.68,9.58.87,14.38.25,6.38-.12,17.57,1.14,16.13,1.6-.12,11.22-7,11.22-7h.43l.32-.32a2.57,2.57,0,0,1-.34-.8c-1.47-6.44.61-12.37.43-18.76-.06-2.1-.36-4.38-.31-6.58a22.67,22.67,0,0,1,1-11.74L733.6,76v-.34l.69-5.65V64.74q3.94-3.94,6-3.94h2.14q3.34,0,4.63,7.11v1.71q-2.14,9.59-6,9.59h-.43c-1.14-.63-1.06,2.6,2.48,3.17l.77-.77q3.85,0,7.37-4.54,4.63-5.57,4.63-7.79,3.85-6.42,3.85-9.16v-5Q759.73,50.69,752.28,46.32Z"/><polygon class="cls-1" points="769.92 77.07 770.35 77.41 770.35 77.75 769.92 78.1 769.58 78.1 769.24 77.75 769.24 77.41 769.58 77.07 769.92 77.07"/><polygon class="cls-1" points="780.2 121.18 780.54 121.52 780.54 121.87 780.2 122.21 779.86 122.21 779.51 121.87 779.51 121.52 779.86 121.18 780.2 121.18"/><path class="cls-1" d="M840.5,110.56q0-2.74-3.43-2.74c-2.28,0-3.08,2-1.71,1.71l1.37,1.37v.69q-2.23,5.82-5.82,5.82-4.37,0-5.14-8.91v-6.17l-1.71-12.68V86.23a50.39,50.39,0,0,0,1.71-12.68v-12q0-5.65,5.48-7.19,2.06.77,2.4,2.06s3.08-.11,3.08-2.06q0-3.85-8.91-4.8l-7.19.34c-1.2.91-4.11,0-4.11,0l-3.43.34h-1.37l-1-.69h-2.4s-3.43.57-3.43,0l-8.22,1.37-1.37-.34-1.37.69c-2.8.57-8.22,3.43-8.22,3.43q-13.45,8.48-17.47,17.13a8.79,8.79,0,0,1-2.4,5.82V81.1Q761,90.77,761,98.57l.69,3.43v3.43l-.69,2.06,1.37,6.51q4.28,13,12,13h.69q3.68,0,11.65-4.45c2.25-1,17.14-11.69,22.88-15.83a2.14,2.14,0,0,1,3.24.92c2,4.87,6.86,15.2,12.78,17.46,2.93-.35,6.52-1.35,8.74-3.24h0q6.17-6.68,6.17-10.28Zm-30.37-14.4a2.13,2.13,0,0,1-.32,1.62,2.2,2.2,0,0,1-2.63,1.67l-2.84,1.49a14.61,14.61,0,0,1-3.68,1.85l-.24.24h-.34l0,0-1.15.48a.47.47,0,0,1,.08.24c-.87.23-1.67.41-2.47.59a21.34,21.34,0,0,1-5,.91,24.12,24.12,0,0,1-2.82.21h-1.71q-6.94-2.66-9.59-8.57v-1l-.34-3.77.08-.16c-.78-6.92.83-16.41,4.31-22.32a10.24,10.24,0,0,1,1.66-2.1c1.09-3.27,3.88-5.29,7.16-6.33.74-.72,1.48-1.4,2.21-2q8.39-4.11,15.42-4.11h.34a5.58,5.58,0,0,1,.4,1.28,2.4,2.4,0,0,1,.84,1.86C809.77,71,812.44,83.46,810.13,96.16Z"/><line class="cls-1" x1="835.36" y1="134.2" x2="835.7" y2="134.54"/><line class="cls-1" x1="839.13" y1="134.2" x2="839.13" y2="134.54"/></svg>
View
BIN +39.8 KB branding/nfwhite.png
Binary file not shown.
Oops, something went wrong.

0 comments on commit 4c4c990

Please sign in to comment.