Remove Battery/Emitter subsystem
authorTheSaminator <TheSaminator@users.noreply.github.com>
Mon, 14 Feb 2022 14:26:12 +0000 (09:26 -0500)
committerTheSaminator <TheSaminator@users.noreply.github.com>
Mon, 14 Feb 2022 14:26:12 +0000 (09:26 -0500)
plan/icons/subsystems.svg
src/commonMain/kotlin/starshipfights/game/ship.kt
src/commonMain/kotlin/starshipfights/game/ship_instances.kt
src/jsMain/resources/images/subsystem-battery.svg [deleted file]
src/jsMain/resources/images/subsystem-shields.svg
src/jvmMain/kotlin/starshipfights/info/views_ships.kt

index c5b1668139dd60b2ed5e7b47f0c78e24e8ac7a66..23b820da622bd7a98164ec73b6c94544b2ce21c5 100644 (file)
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="248.01404"
-     inkscape:cy="272.97214"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="489.74695"
+     inkscape:cy="214.06125"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -55,7 +55,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -66,7 +66,7 @@
      transform="translate(0,-153.00018)">
     <path
        style="fill:#6699ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17499971;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-       d="M 111.9996,152.99978 A 31.999996,31.999999 0 0 0 80,184.99989 31.999996,31.999999 0 0 0 111.9996,217 31.999996,31.999999 0 0 0 143.99971,184.99989 31.999996,31.999999 0 0 0 111.9996,152.99978 Z m 0,1.99988 a 30,30 0 0 1 30.00024,30.00023 30,30 0 0 1 -30.00024,30.00023 30,30 0 0 1 -29.999721,-30.00023 30,30 0 0 1 29.999721,-30.00023 z m 1.834,2.06654 -0.15038,1.99419 0.99632,0.0765 h 0.002 0.004 l 1.27537,0.16227 0.5979,0.10697 0.98443,0.17621 0.35347,-1.96887 -0.9865,-0.1757 -0.6227,-0.11162 -0.0238,-0.004 -0.0253,-0.004 -1.35134,-0.17208 -0.0253,-0.002 -0.0258,-0.002 h -0.004 z m -6.23218,0.28009 -0.98444,0.17518 -0.23461,0.0429 -0.0253,0.004 -0.0233,0.006 -1.3069,0.30075 -0.0233,0.006 -0.0253,0.008 -0.40411,0.11523 -0.96325,0.2713 0.54674,1.92392 0.96325,-0.2713 0.39636,-0.11369 0.008,-0.002 1.24023,-0.28526 0.0176,-0.004 0.18552,-0.0331 0.98444,-0.1757 z m 16.25379,2.26911 -0.91209,1.77922 0.88884,0.45682 0.56224,0.28732 0.0196,0.01 1.0666,0.61546 0.0155,0.01 0.84181,0.54105 1.08003,-1.68568 -0.84181,-0.53899 -0.0351,-0.0232 -0.0217,-0.0119 -0.0217,-0.0134 -1.12861,-0.64854 -0.0217,-0.014 -0.0212,-0.01 -0.58239,-0.29869 z m -25.994285,1.19321 -0.841809,0.54105 -0.654222,0.42013 -0.02119,0.0114 -0.01964,0.0155 -0.994254,0.70745 -0.816488,0.57981 1.160134,1.62884 0.814422,-0.57981 0.980818,-0.69556 0.0155,-0.0114 0.61495,-0.39274 0.841809,-0.54105 z m 14.138675,0.1912 -7.4998,7.4998 v 7.50032 h 3.75016 v 16.49976 h -2.25 v 1.87534 h -5.99963 l -5.16e-4,2.99982 6.000146,5.99964 v 1.87534 h 5.24982 v 3.75015 h 1.50016 v -3.75015 h 5.24929 v -1.87534 l 6.00067,-5.99964 -5.1e-4,-2.99982 h -6.00016 v -1.87534 h -2.24947 v -16.49976 h 3.74913 v -7.50032 z m 20.25613,4.63124 -1.51205,1.30845 0.65474,0.75603 0.67748,0.78289 0.002,0.002 0.56431,0.71882 0.61753,0.78703 1.57407,-1.2361 -0.61909,-0.78548 -0.59376,-0.75758 -0.0155,-0.0176 -0.016,-0.0196 -0.67955,-0.7829 z m -42.210864,1.93735 -0.580326,0.81442 -0.668177,0.94154 -0.01344,0.0196 -0.01344,0.0191 -0.457335,0.71314 -0.538986,0.84181 1.683618,1.07797 0.538986,-0.84181 0.429948,-0.66973 0.0098,-0.0139 0.659908,-0.92759 0.580327,-0.81649 z m 47.813624,6.6859 -1.8588,0.73225 0.36535,0.93121 0.0486,0.11937 0.006,0.0196 0.40411,1.18753 0.002,0.006 0.13488,0.47284 0.2713,0.96273 1.92391,-0.54673 -0.2713,-0.96274 -0.13694,-0.47852 -0.006,-0.0238 -0.0103,-0.0233 -0.42375,-1.25367 -0.008,-0.0238 -0.0103,-0.0232 -0.0646,-0.16588 z m -52.600929,2.42104 -0.27337,0.96118 -0.0956,0.3421 -0.0078,0.0253 -0.0062,0.0232 -0.300757,1.3069 -0.0057,0.0233 -0.0041,0.0253 -0.05478,0.2992 -0.175699,0.98392 1.968873,0.35192 0.177766,-0.98444 0.04289,-0.25011 0.0057,-0.0217 0.283188,-1.23609 0.0021,-0.01 0.09405,-0.33228 0.273368,-0.96273 z m 52.767839,7.29929 -0.0258,0.99994 -0.0331,1.33792 -0.002,0.0139 -0.0429,0.59531 -0.076,0.99838 1.99368,0.15039 0.0765,-0.99631 0.047,-0.60929 0.002,-0.0253 v -0.0253 l 0.0351,-1.38906 0.0253,-0.99993 z m -52.011813,2.72851 -1.984375,0.25218 0.125055,0.99219 0.163817,1.2909 0.0041,0.0253 0.0036,0.0232 0.122991,0.68937 0.1757,0.98444 1.968873,-0.3514 -0.175702,-0.98443 -0.119372,-0.66199 -0.159682,-1.26762 z m 50.591753,6.7717 -0.36742,0.92964 -0.28526,0.72451 -0.006,0.0134 -0.47853,1.05471 -0.41031,0.91209 1.82211,0.82423 0.41238,-0.91207 0.4961,-1.09969 0.01,-0.0232 0.0103,-0.0212 0.29094,-0.73845 0.3669,-0.92964 z m -48.180015,2.52695 -1.781286,0.9121 0.457338,0.88884 0.267684,0.52348 0.0098,0.0217 0.01344,0.0191 0.648539,1.1312 0.01344,0.0212 0.01188,0.0196 0.05839,0.092 0.541054,0.84183 1.683618,-1.0785 -0.541052,-0.8418 -0.03307,-0.0506 -0.0078,-0.0119 -0.619085,-1.0759 -0.0098,-0.0196 -0.01395,-0.0233 -0.243912,-0.48058 z m 43.465055,5.80277 -0.68937,0.72501 -0.79891,0.83767 -0.0176,0.0176 -0.0176,0.0176 -0.53899,0.51366 -0.7245,0.68935 1.38079,1.44745 0.72244,-0.68934 0.57412,-0.54726 0.0176,-0.0176 0.0176,-0.0176 0.83199,-0.87281 0.68988,-0.72244 z m -37.900537,1.98231 -1.310513,1.51204 0.756026,0.65423 0.734322,0.63664 0.01964,0.0155 0.01757,0.016 0.808736,0.63458 0.787032,0.61701 1.234033,-1.572 -0.784966,-0.61754 -0.771528,-0.60512 -0.0021,-0.002 -0.732252,-0.63457 z m 12.760467,2.21279 v 2.24999 h 3.75016 v -2.24999 z m 6.74894,0 v 2.24999 h 3.74965 v -2.24999 z m 10.91406,1.85155 -0.88986,0.45527 -0.23048,0.11938 -0.0103,0.004 -1.14049,0.51728 -0.014,0.006 -0.33951,0.13488 -0.92966,0.36483 0.73432,1.86137 0.92966,-0.36689 0.35347,-0.13902 0.0217,-0.01 0.0233,-0.01 1.19527,-0.54104 0.0233,-0.0104 0.0217,-0.0113 0.27337,-0.13901 0.89038,-0.45683 z m -22.36453,1.17306 -0.73484,1.86034 0.93173,0.36536 0.10387,0.0408 0.0233,0.0104 0.0233,0.008 1.25419,0.42373 0.0233,0.008 0.0238,0.008 0.5426,0.15451 0.96118,0.27337 0.54674,-1.92392 -0.96067,-0.27337 -0.49609,-0.14057 -0.006,-0.002 -1.23455,-0.41807 -0.0134,-0.004 -0.0584,-0.0238 z m 13.28292,1.79006 -0.99787,0.0765 -1.00614,0.0744 -0.0134,0.002 -0.92604,0.0238 -0.99994,0.0253 0.0512,1.99781 0.99787,-0.0253 0.97669,-0.0233 0.0253,-0.002 0.0253,-0.002 1.02164,-0.076 0.99581,-0.0765 z"
+       d="m 89.372179,162.37257 a 31.999999,31.999996 45 0 0 3.57e-4,45.25463 31.999999,31.999996 45 0 0 45.254634,3.6e-4 31.999999,31.999996 45 0 0 0,-45.25499 31.999999,31.999996 45 0 0 -45.254991,0 z m 1.414129,1.41413 a 30,30 0 0 1 42.426732,-1e-5 30,30 0 0 1 0,42.42674 30,30 0 0 1 -42.426382,-3.5e-4 30,30 0 0 1 -3.5e-4,-42.42638 z m 2.758098,0.16443 1.303771,1.51644 0.758598,-0.65041 0.0014,-0.001 0.0028,-0.003 1.016565,-0.78708 0.498418,-0.34714 0.820696,-0.5715 -1.14226,-1.64214 -0.821799,0.57332 -0.519243,0.36139 -0.01966,0.014 -0.02072,0.0151 -1.07722,0.83386 -0.0193,0.0165 -0.01966,0.0168 -0.0028,0.003 z m -4.208763,4.60487 -0.572233,0.81998 -0.13556,0.19623 -0.01506,0.0207 -0.01223,0.0207 -0.711456,1.13678 -0.01223,0.0207 -0.01223,0.0236 -0.204269,0.36723 -0.489283,0.87296 1.74702,0.97381 0.489283,-0.87296 0.199878,-0.36066 0.0042,-0.007 0.675265,-1.07869 0.0096,-0.0153 0.107777,-0.15459 0.571866,-0.82034 z m 13.097667,-9.88866 0.61315,1.90304 0.95153,-0.30548 0.60073,-0.1944 0.0209,-0.007 1.1894,-0.319 0.018,-0.004 0.97783,-0.21267 -0.42826,-1.95565 -0.97638,0.21412 -0.0412,0.008 -0.0238,0.007 -0.0248,0.006 -1.25663,0.33946 -0.0252,0.005 -0.0221,0.008 -0.62302,0.20061 z m -17.537011,19.22447 -0.212669,0.97783 -0.165527,0.75968 -0.0069,0.023 -0.0029,0.0248 -0.202798,1.20328 -0.167358,0.98733 1.9721,0.33143 0.165894,-0.98587 0.201709,-1.18538 0.0029,-0.019 0.157126,-0.71254 0.212669,-0.97783 z m 10.132756,-9.86236 v 10.60632 l 5.303525,5.30352 2.65176,-2.65176 11.66709,11.66709 -1.59099,1.59099 1.32607,1.32606 -4.24238,4.24238 2.12083,2.12156 8.48513,-3.6e-4 1.32606,1.32607 3.71219,-3.71218 2.65175,2.65175 1.06078,-1.06077 -2.65176,-2.65176 3.71181,-3.71181 -1.32607,-1.32606 7.3e-4,-8.4855 -2.12156,-2.12083 -4.24275,4.24275 -1.32606,-1.32607 -1.59062,1.59062 -11.66709,-11.66709 2.65104,-2.65104 -5.30353,-5.30352 z m 17.598025,-11.04847 -0.14396,1.9944 0.99756,0.0716 1.03264,0.0745 h 0.003 l 0.90731,0.10925 0.99317,0.11986 0.23898,-1.98709 -0.99318,-0.11766 -0.95554,-0.11584 -0.0234,-0.001 -0.0252,-0.003 -1.03411,-0.0731 z m -28.477676,31.21751 0.165526,0.98624 0.193302,1.13823 0.0044,0.0233 0.004,0.023 0.180878,0.82765 0.214133,0.97637 1.952739,-0.42826 -0.214133,-0.97637 -0.169551,-0.77759 -0.0028,-0.0169 -0.189279,-1.12253 -0.166997,-0.98769 z m 38.536986,-29.0817 -0.79659,1.83215 0.9168,0.40012 0.11878,0.05 0.0181,0.01 1.12546,0.55397 0.006,0.003 0.42972,0.23896 0.87259,0.48892 0.97381,-1.74701 -0.8726,-0.48892 -0.43519,-0.24153 -0.0211,-0.0126 -0.0238,-0.009 -1.18612,-0.58685 -0.0225,-0.0112 -0.0237,-0.009 -0.16297,-0.0716 z m -35.482536,38.90641 0.486355,0.87296 0.174302,0.3095 0.01223,0.0236 0.01216,0.0207 0.711448,1.13678 0.01223,0.0207 0.01506,0.0207 0.172817,0.25032 0.571498,0.81997 1.641046,-1.14336 -0.570402,-0.8218 -0.14652,-0.20719 -0.0111,-0.0196 -0.673802,-1.07429 -0.0057,-0.008 -0.168489,-0.30142 -0.487459,-0.87405 z m 42.473876,-32.15112 0.68882,0.72531 0.92265,0.96946 0.008,0.0112 0.39061,0.45128 0.65223,0.7597 1.51608,-1.3034 -0.6504,-0.75859 -0.3976,-0.46407 -0.0165,-0.0193 -0.0179,-0.0179 -0.95739,-1.00703 -0.68917,-0.72495 z m -34.848564,38.70726 -1.224843,1.58148 0.790008,0.61316 1.028642,0.79697 0.02072,0.0151 0.01923,0.0136 0.574425,0.40049 0.820343,0.57186 1.143724,-1.64068 -0.820343,-0.57186 -0.552505,-0.38369 -1.009246,-0.78343 z m 40.562094,-30.98546 0.39754,0.91717 0.3106,0.714 0.005,0.0137 0.40741,1.08417 0.35481,0.93508 1.87125,-0.70561 -0.35333,-0.93653 -0.4268,-1.12839 -0.009,-0.0235 -0.008,-0.0223 -0.31644,-0.72789 -0.39792,-0.91679 z m -32.2816,35.85524 -0.61461,1.90452 0.9519,0.30511 0.55944,0.18087 0.0224,0.008 0.023,0.004 1.25846,0.3413 0.0245,0.006 0.0223,0.005 0.10635,0.0238 0.97785,0.21267 0.42789,-1.95311 -0.97783,-0.21266 -0.0592,-0.0124 -0.0141,-0.003 -1.19854,-0.32301 -0.0209,-0.007 -0.0263,-0.007 -0.51229,-0.16736 z m 34.83762,-26.63126 0.0252,1.00012 0.0274,1.15724 v 0.0249 l 0,0.0249 -0.0179,0.74433 -0.0249,0.99974 1.99987,0.0471 0.0234,-0.99828 0.019,-0.79292 v -0.0249 -0.0249 l -0.0289,-1.20548 -0.023,-0.99866 z m -25.39802,28.20143 0.14249,1.99586 0.99721,-0.072 0.96941,-0.0691 0.0248,-0.003 0.0238,-0.001 1.02058,-0.12315 0.99281,-0.12022 -0.23898,-1.98416 -0.99172,0.11838 -0.97344,0.11767 h -0.003 l -0.96649,0.0691 z m 10.58769,-7.45833 1.59098,1.59098 2.65177,-2.65176 -1.59099,-1.59098 z m 4.77222,-4.77222 1.59098,1.59098 2.65141,-2.6514 -1.59099,-1.59099 z m 9.02665,-6.40816 -0.3073,0.95115 -0.0786,0.24738 -0.004,0.0101 -0.44067,1.17222 -0.006,0.0141 -0.14469,0.33544 -0.3994,0.91535 1.83543,0.79694 0.39793,-0.91679 0.15165,-0.34825 0.008,-0.0224 0.009,-0.0235 0.46261,-1.22776 0.009,-0.0238 0.007,-0.0233 0.095,-0.2916 0.30656,-0.95262 z m -14.98463,16.64358 0.79584,1.83508 0.91719,-0.40049 0.10229,-0.0446 0.0238,-0.009 0.0221,-0.0108 1.18647,-0.58722 0.0221,-0.0108 0.0225,-0.0112 0.49293,-0.27442 0.87296,-0.48635 -0.97382,-1.74702 -0.87259,0.48599 -0.45018,0.25139 -0.006,0.003 -1.16857,0.57734 -0.0123,0.007 -0.0581,0.0245 z m 10.6582,-8.12667 -0.6515,0.75969 -0.65884,0.76406 -0.008,0.0109 -0.63798,0.67163 -0.68918,0.72496 1.44887,1.37646 0.68772,-0.7235 0.67415,-0.7071 0.0165,-0.0193 0.0165,-0.0193 0.66866,-0.77614 0.65006,-0.75824 z"
        id="path945"
        inkscape:connector-curvature="0" />
     <path
        id="path888"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#ffcc33;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12.00000095;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-       d="m 60.472656,880.62891 -37.794922,37.79492 v 37.79492 h 18.898438 v 83.15035 H 30.236328 v 9.4493 H 0.00195313 L 0,1063.9355 l 30.236328,30.2364 v 9.4492 h 26.457031 v 18.8984 h 7.558594 v -18.8984 h 26.455078 v -9.4492 l 30.238279,-30.2364 -0.002,-15.1171 H 90.707031 v -9.4493 H 79.369141 V 956.21875 H 98.263672 V 918.42383 Z M 188.97461,884.4082 136.0625,929.76367 V 960 L 188.97461,914.64453 241.88867,960 v -30.23633 z m 0,52.91407 -52.91211,45.35546 v 30.23637 l 52.91211,-45.35551 52.91406,45.35551 v -30.23637 z m 0,52.91211 -52.91211,45.35542 v 30.2364 l 52.91211,-45.3555 52.91406,45.3555 v -30.2364 z m 0,52.91402 -52.91211,45.3555 v 30.2363 l 52.91211,-45.3554 52.91406,45.3554 v -30.2363 z m -154.955079,64.252 v 11.3379 h 18.896485 v -11.3379 z m 34.009766,0 v 11.3379 h 18.896484 v -11.3379 z"
-       transform="scale(0.26458333)"
+       style="fill:#ffcc33;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17500019;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="m 56.000057,232.99996 -9.999907,9.99991 v 9.9999 h 5.000212 v 22.0002 h -3.000334 v 2.50013 H 40.000517 L 40,281.49983 l 8.000028,8.00005 v 2.5001 h 7.00009 v 5.0002 h 1.999878 v -5.0002 h 6.999572 v -2.5001 l 8.000545,-8.00005 -5.29e-4,-3.99973 h -8.000016 v -2.50013 h -2.999816 v -22.0002 h 4.999178 v -9.9999 z m 33.999475,0.99994 -13.999663,12.0003 v 8.00003 l 13.999663,-12.0003 14.000178,12.0003 v -8.00003 z m 0,14.00018 -13.999663,12.0003 v 8.00004 l 13.999663,-12.00032 14.000178,12.00032 v -8.00004 z m 0,13.99966 -13.999663,12.00029 v 8.00005 l 13.999663,-12.00031 14.000178,12.00031 v -8.00005 z m 0,14.00017 -13.999663,12.00031 v 8.00002 l 13.999663,-12.00028 14.000178,12.00028 v -8.00002 z m -40.998531,17.00001 v 2.99982 h 4.999695 v -2.99982 z m 8.998417,0 v 2.99982 h 4.999695 v -2.99982 z"
        id="path888-4"
        inkscape:connector-curvature="0" />
-    <path
-       style="fill:#33ff66;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12.00000095;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-       d="M 423.5332 302.36328 A 120.94488 120.94488 0 0 0 345.56445 330.6582 L 355.2832 342.23828 A 105.82677 105.82677 0 0 1 459.50195 323.86328 L 464.67188 309.65625 A 120.94488 120.94488 0 0 0 423.5332 302.36328 z M 423.47656 332.59766 A 90.708658 90.708658 0 0 0 365 353.82031 L 374.71875 365.40039 A 75.590549 75.590549 0 0 1 449.16016 352.27539 L 454.33008 338.06836 A 90.708658 90.708658 0 0 0 423.47656 332.59766 z M 423.41992 362.83398 A 60.472439 60.472439 0 0 0 384.43555 376.98242 L 394.1543 388.56445 A 45.354329 45.354329 0 0 1 438.81836 380.6875 L 443.99023 366.48242 A 60.472439 60.472439 0 0 0 423.41992 362.83398 z M 485.66797 362.83398 L 470.55078 362.83594 L 470.55078 393.07227 L 461.10156 393.07227 L 461.10156 404.41016 L 377.95117 404.41016 L 377.95117 385.51562 L 340.15625 385.51562 L 302.36133 423.30664 L 340.15625 461.10156 L 377.95117 461.10156 L 377.95117 442.20312 L 461.10156 442.20312 L 461.10156 453.54297 L 470.55078 453.54297 L 470.55078 483.77734 L 485.66797 483.7793 L 515.9043 453.54297 L 525.35352 453.54297 L 525.35352 427.08594 L 544.25195 427.08594 L 544.25195 419.52734 L 525.35352 419.52734 L 525.35352 393.07227 L 515.9043 393.07227 L 485.66797 362.83398 z M 529.13281 396.85352 L 529.13281 415.75 L 540.4707 415.75 L 540.4707 396.85352 L 529.13281 396.85352 z M 529.13281 430.86328 L 529.13281 449.75977 L 540.4707 449.75977 L 540.4707 430.86328 L 529.13281 430.86328 z M 394.15234 458.05078 L 384.43555 469.63086 A 60.47272 60.47272 0 0 0 443.99023 480.13281 L 438.81836 465.92578 A 45.354542 45.354542 0 0 1 394.15234 458.05078 z M 374.7168 481.21289 L 365 492.79492 A 90.709083 90.709083 0 0 0 454.33008 508.54492 L 449.16016 494.33984 A 75.590901 75.590901 0 0 1 374.7168 481.21289 z M 355.28125 504.375 L 345.56445 515.95703 A 120.94546 120.94546 0 0 0 464.67188 536.95898 L 459.50195 522.75195 A 105.82726 105.82726 0 0 1 355.28125 504.375 z "
-       transform="matrix(0.26458333,0,0,0.26458333,0,153.00018)"
-       id="path1169" />
   </g>
 </svg>
index 1d68ff51afb81c8a7446f123457b48ea4c9c24f7..274c33b50945335f6bc27f94dcc800070033f886 100644 (file)
@@ -32,29 +32,29 @@ data class Ship(
 
 @Serializable
 data class ShipReactor(
-       val powerOutput: Int,
+       val subsystemAmount: Int,
        val gridEfficiency: Int
 ) {
-       val subsystemAmount: Int
-               get() = powerOutput / 4
+       val powerOutput: Int
+               get() = subsystemAmount * 3
 }
 
 val ShipWeightClass.reactor: ShipReactor
        get() = when (this) {
-               ShipWeightClass.ESCORT -> ShipReactor(8, 1)
-               ShipWeightClass.DESTROYER -> ShipReactor(12, 2)
-               ShipWeightClass.CRUISER -> ShipReactor(16, 3)
-               ShipWeightClass.BATTLECRUISER -> ShipReactor(16, 4)
-               ShipWeightClass.BATTLESHIP -> ShipReactor(20, 4)
+               ShipWeightClass.ESCORT -> ShipReactor(2, 1)
+               ShipWeightClass.DESTROYER -> ShipReactor(3, 1)
+               ShipWeightClass.CRUISER -> ShipReactor(4, 2)
+               ShipWeightClass.BATTLECRUISER -> ShipReactor(5, 3)
+               ShipWeightClass.BATTLESHIP -> ShipReactor(7, 4)
                
-               ShipWeightClass.GRAND_CRUISER -> ShipReactor(20, 3)
-               ShipWeightClass.COLOSSUS -> ShipReactor(36, 7)
+               ShipWeightClass.GRAND_CRUISER -> ShipReactor(6, 4)
+               ShipWeightClass.COLOSSUS -> ShipReactor(9, 6)
                
-               ShipWeightClass.HEAVY_CRUISER -> ShipReactor(24, 3)
+               ShipWeightClass.HEAVY_CRUISER -> ShipReactor(6, 3)
                
-               ShipWeightClass.FRIGATE -> ShipReactor(12, 1)
-               ShipWeightClass.LINE_SHIP -> ShipReactor(20, 3)
-               ShipWeightClass.DREADNOUGHT -> ShipReactor(28, 5)
+               ShipWeightClass.FRIGATE -> ShipReactor(4, 1)
+               ShipWeightClass.LINE_SHIP -> ShipReactor(6, 3)
+               ShipWeightClass.DREADNOUGHT -> ShipReactor(8, 5)
        }
 
 @Serializable
index bd3ee1f00ba28333ff09366751540af97a751569..d81fd4cdd9e0e142cde2db23577068fbde9287fc 100644 (file)
@@ -59,7 +59,7 @@ data class ShipPosition(
 }
 
 enum class ShipSubsystem {
-       WEAPONS, SHIELDS, ENGINES, BATTERY;
+       WEAPONS, SHIELDS, ENGINES;
        
        val displayName: String
                get() = name.lowercase().replaceFirstChar { it.uppercase() }
@@ -69,7 +69,6 @@ enum class ShipSubsystem {
                        WEAPONS -> "#FF6633"
                        SHIELDS -> "#6699FF"
                        ENGINES -> "#FFCC33"
-                       BATTERY -> "#33FF66"
                }
        
        val imageUrl: String
@@ -86,13 +85,11 @@ data class ShipPowerMode(
        val weapons: Int,
        val shields: Int,
        val engines: Int,
-       val battery: Int,
 ) {
        operator fun plus(delta: Map<ShipSubsystem, Int>) = copy(
                weapons = weapons + (delta[ShipSubsystem.WEAPONS] ?: 0),
                shields = shields + (delta[ShipSubsystem.SHIELDS] ?: 0),
                engines = engines + (delta[ShipSubsystem.ENGINES] ?: 0),
-               battery = battery + (delta[ShipSubsystem.BATTERY] ?: 0),
        )
        
        operator fun minus(delta: Map<ShipSubsystem, Int>) = this + delta.mapValues { (_, d) -> -d }
@@ -101,11 +98,10 @@ data class ShipPowerMode(
                ShipSubsystem.WEAPONS -> weapons
                ShipSubsystem.SHIELDS -> shields
                ShipSubsystem.ENGINES -> engines
-               ShipSubsystem.BATTERY -> battery
        }
        
        val total: Int
-               get() = weapons + shields + engines + battery
+               get() = weapons + shields + engines
        
        infix fun distanceTo(other: ShipPowerMode) = ShipSubsystem.values().sumOf { subsystem -> abs(this[subsystem] - other[subsystem]) }
 }
@@ -123,7 +119,7 @@ val ShipInstance.movement: ShipMovement
 
 fun Ship.defaultPowerMode(): ShipPowerMode {
        val amount = reactor.subsystemAmount
-       return ShipPowerMode(amount, amount, amount, amount)
+       return ShipPowerMode(amount, amount, amount)
 }
 
 enum class ShipRenderMode {
diff --git a/src/jsMain/resources/images/subsystem-battery.svg b/src/jsMain/resources/images/subsystem-battery.svg
deleted file mode 100644 (file)
index fefe69b..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-               xmlns="http://www.w3.org/2000/svg"
-               version="1.1"
-               viewBox="0 0 64 64"
-               height="32px"
-               width="32px">
-       <g
-                       transform="translate(-83.660604,-139.51202)"
-                       id="layer1">
-               <path
-                               id="path1169"
-                               d="m 115.72068,139.51211 a 31.999999,31.999999 0 0 0 -20.629226,7.48636 l 2.57142,3.0639 a 28,28 0 0 1 27.574536,-4.86172 l 1.36788,-3.75895 a 31.999999,31.999999 0 0 0 -10.88461,-1.92959 z m -0.015,7.99951 a 23.999999,23.999999 0 0 0 -15.47194,5.61516 l 2.57142,3.0639 a 19.999999,19.999999 0 0 1 19.69596,-3.47266 l 1.36787,-3.75894 a 23.999999,23.999999 0 0 0 -8.16332,-1.44746 z m -0.015,8.00003 a 15.999999,15.999999 0 0 0 -10.31461,3.74344 l 2.57142,3.06441 a 12,12 0 0 1 11.81736,-2.08411 l 1.36839,-3.75843 a 15.999999,15.999999 0 0 0 -5.44256,-0.96531 z m 16.4698,0 -3.99976,5.3e-4 v 8.00002 h -2.50011 v 2.99982 h -22.0002 v -4.99918 h -9.999906 l -9.9999,9.99887 9.9999,9.99991 h 9.999906 v -5.00021 h 22.0002 v 3.00033 h 2.50011 v 7.99951 l 3.99976,5.3e-4 8.00003,-8.00003 h 2.5001 v -7.00009 h 5.00021 v -1.99988 h -5.00021 v -6.99957 h -2.5001 z m 11.50007,9.001 v 4.99969 h 2.99982 v -4.99969 z m 0,8.99841 v 4.9997 h 2.99982 v -4.9997 z m -35.71358,7.19336 -2.5709,3.0639 a 16.000074,16.000074 0 0 0 15.75717,2.77864 l -1.36839,-3.75894 a 12.000056,12.000056 0 0 1 -11.81788,-2.0836 z m -5.14234,6.12831 -2.57091,3.06441 a 24.000112,24.000112 0 0 0 23.63525,4.16719 l -1.36787,-3.75843 a 20.000093,20.000093 0 0 1 -19.69647,-3.47317 z m -5.142316,6.12831 -2.57091,3.06441 a 32.000153,32.000153 0 0 0 31.513836,5.55677 l -1.36788,-3.75895 a 28.000129,28.000129 0 0 1 -27.575046,-4.86223 z"
-                               style="fill:#33ff66;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17500019;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"/>
-       </g>
-</svg>
index 976673bf3b9a025ed5dd858dbd617344eeb15e8b..30021506bded73aaf23e8f7740e22728de7a17c3 100644 (file)
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
                xmlns="http://www.w3.org/2000/svg"
-               version="1.1"
-               viewBox="0 0 64 64"
+               width="32px"
                height="32px"
-               width="32px">
-       <g
-                       transform="translate(-83.660604,-139.51202)"
-                       id="layer1">
-               <path
-                               id="path945"
-                               d="M 115.6602,139.5118 A 31.999997,31.999999 0 0 0 83.660604,171.51191 31.999997,31.999999 0 0 0 115.6602,203.51202 31.999997,31.999999 0 0 0 147.66031,171.51191 31.999997,31.999999 0 0 0 115.6602,139.5118 Z m 0,1.99988 a 30.000001,30.000001 0 0 1 30.00025,30.00023 30.000001,30.000001 0 0 1 -30.00025,30.00023 30.000001,30.000001 0 0 1 -29.999716,-30.00023 30.000001,30.000001 0 0 1 29.999716,-30.00023 z m 1.83401,2.06654 -0.15039,1.99419 0.99632,0.0765 h 0.002 0.004 l 1.27537,0.16227 0.5979,0.10697 0.98443,0.17621 0.35347,-1.96887 -0.9865,-0.1757 -0.6227,-0.11162 -0.0238,-0.004 -0.0253,-0.004 -1.35134,-0.17208 -0.0253,-0.002 -0.0258,-0.002 h -0.004 z m -6.23219,0.28009 -0.98444,0.17518 -0.23461,0.0429 -0.0253,0.004 -0.0233,0.006 -1.3069,0.30075 -0.0233,0.006 -0.0253,0.008 -0.40411,0.11523 -0.96325,0.2713 0.54674,1.92392 0.96325,-0.2713 0.39636,-0.11369 0.008,-0.002 1.24023,-0.28526 0.0176,-0.004 0.18552,-0.0331 0.98444,-0.1757 z m 16.2538,2.26911 -0.91209,1.77922 0.88883,0.45682 0.56224,0.28732 0.0196,0.01 1.0666,0.61546 0.0155,0.01 0.8418,0.54105 1.08004,-1.68568 -0.84182,-0.53899 -0.0351,-0.0232 -0.0217,-0.0119 -0.0217,-0.0134 -1.12861,-0.64854 -0.0217,-0.014 -0.0212,-0.01 -0.58239,-0.29869 z m -25.99429,1.19321 -0.84181,0.54105 -0.65422,0.42013 -0.0212,0.0114 -0.0196,0.0155 -0.99426,0.70745 -0.81648,0.57981 1.16013,1.62884 0.81442,-0.57981 0.98082,-0.69556 0.0155,-0.0114 0.61495,-0.39274 0.84181,-0.54105 z m 14.13867,0.1912 -7.4998,7.4998 v 7.50032 h 3.75016 v 16.49976 h -2.25 v 1.87534 h -5.99963 l -5e-4,2.99982 6.00015,5.99964 v 1.87534 h 5.24982 v 3.75015 h 1.50016 v -3.75015 h 5.24929 v -1.87534 l 6.00067,-5.99964 -5.3e-4,-2.99982 h -6.00016 v -1.87534 h -2.24947 v -16.49976 h 3.74913 v -7.50032 z m 20.25613,4.63124 -1.51205,1.30845 0.65475,0.75603 0.67747,0.78289 0.002,0.002 0.56431,0.71882 0.61753,0.78703 1.57407,-1.2361 -0.61909,-0.78548 -0.59376,-0.75758 -0.0155,-0.0176 -0.016,-0.0196 -0.67955,-0.7829 z m -42.210856,1.93735 -0.58033,0.81442 -0.66818,0.94154 -0.0134,0.0196 -0.0134,0.0191 -0.45733,0.71314 -0.53899,0.84181 1.68362,1.07797 0.53899,-0.84181 0.42995,-0.66973 0.01,-0.0139 0.6599,-0.92759 0.58033,-0.81649 z m 47.813616,6.6859 -1.8588,0.73225 0.36535,0.93121 0.0486,0.11937 0.006,0.0196 0.40411,1.18753 0.002,0.006 0.13488,0.47284 0.2713,0.96273 1.92391,-0.54673 -0.2713,-0.96274 -0.13694,-0.47852 -0.006,-0.0238 -0.0103,-0.0233 -0.42375,-1.25367 -0.008,-0.0238 -0.0103,-0.0232 -0.0646,-0.16588 z m -52.600926,2.42104 -0.27337,0.96118 -0.0956,0.3421 -0.008,0.0253 -0.006,0.0232 -0.30075,1.3069 -0.006,0.0233 -0.004,0.0253 -0.0548,0.2992 -0.1757,0.98392 1.96887,0.35192 0.17777,-0.98444 0.0429,-0.25011 0.006,-0.0217 0.28318,-1.23609 0.002,-0.01 0.0941,-0.33228 0.27337,-0.96273 z m 52.767836,7.29929 -0.0258,0.99994 -0.0331,1.33792 -0.002,0.0139 -0.0429,0.59531 -0.076,0.99838 1.99368,0.15039 0.0765,-0.99631 0.047,-0.60929 0.002,-0.0253 v -0.0253 l 0.0351,-1.38906 0.0253,-0.99993 z m -52.011806,2.72851 -1.98438,0.25218 0.12506,0.99219 0.16382,1.2909 0.004,0.0253 0.004,0.0232 0.12299,0.68937 0.1757,0.98444 1.96887,-0.3514 -0.1757,-0.98443 -0.11937,-0.66199 -0.15969,-1.26762 z m 50.591746,6.7717 -0.36742,0.92964 -0.28526,0.72451 -0.006,0.0134 -0.47853,1.05471 -0.41031,0.91209 1.82211,0.82423 0.41238,-0.91207 0.4961,-1.09969 0.01,-0.0232 0.0103,-0.0212 0.29094,-0.73845 0.3669,-0.92964 z m -48.180006,2.52695 -1.78129,0.9121 0.45734,0.88884 0.26768,0.52348 0.01,0.0217 0.0134,0.0191 0.64854,1.1312 0.0134,0.0212 0.0119,0.0196 0.0584,0.092 0.54106,0.84183 1.68361,-1.0785 -0.54105,-0.8418 -0.0331,-0.0506 -0.008,-0.0119 -0.61908,-1.0759 -0.01,-0.0196 -0.014,-0.0233 -0.24392,-0.48058 z m 43.465046,5.80277 -0.68937,0.72501 -0.7989,0.83767 -0.0176,0.0176 -0.0176,0.0176 -0.539,0.51366 -0.7245,0.68935 1.3808,1.44745 0.72244,-0.68934 0.57411,-0.54726 0.0176,-0.0176 0.0176,-0.0176 0.83199,-0.87281 0.68988,-0.72244 z m -37.900536,1.98231 -1.31051,1.51204 0.75603,0.65423 0.73432,0.63664 0.0196,0.0155 0.0176,0.016 0.80874,0.63458 0.78703,0.61701 1.234026,-1.572 -0.784966,-0.61754 -0.77152,-0.60512 -0.002,-0.002 -0.73226,-0.63457 z m 12.760466,2.21279 v 2.24999 h 3.75016 v -2.24999 z m 6.74894,0 v 2.24999 h 3.74966 v -2.24999 z m 10.91406,1.85155 -0.88986,0.45527 -0.23047,0.11938 -0.0103,0.004 -1.14049,0.51727 -0.014,0.006 -0.33952,0.13488 -0.92965,0.36483 0.73432,1.86137 0.92965,-0.36689 0.35347,-0.13902 0.0217,-0.01 0.0233,-0.01 1.19527,-0.54104 0.0233,-0.0104 0.0217,-0.0113 0.27337,-0.13901 0.89037,-0.45683 z m -22.36453,1.17306 -0.73484,1.86034 0.93173,0.36536 0.10387,0.0408 0.0233,0.0104 0.0233,0.008 1.25419,0.42373 0.0233,0.008 0.0238,0.008 0.5426,0.15451 0.96118,0.27337 0.54674,-1.92392 -0.96067,-0.27337 -0.49609,-0.14057 -0.006,-0.002 -1.23455,-0.41808 -0.0134,-0.004 -0.0584,-0.0238 z m 13.28293,1.79006 -0.99788,0.0765 -1.00614,0.0744 -0.0134,0.002 -0.92605,0.0238 -0.99994,0.0253 0.0512,1.99781 0.99786,-0.0253 0.9767,-0.0233 0.0253,-0.002 0.0253,-0.002 1.02164,-0.076 0.99581,-0.0765 z"
-                               style="fill:#6699ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17499971;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"/>
-       </g>
+               viewBox="0 0 64 64"
+               version="1.1">
+       <path
+                       id="path945-4"
+                       d="m 9.3723154,9.372759 a 32.000023,31.999996 4.4586667 0 0 3.5e-4,45.25463 32.000023,31.999996 4.4586667 0 0 45.2546646,2.6e-4 32.000023,31.999996 4.4586667 0 0 0,-45.25499 32.000023,31.999996 4.4586667 0 0 -45.2550246,0 z m 1.4141296,1.41413 a 30.000024,29.999999 0 0 1 42.426766,-10e-6 30.000024,29.999999 0 0 1 0,42.42674 30.000024,29.999999 0 0 1 -42.426416,-2.7e-4 30.000024,29.999999 0 0 1 -3.4e-4,-42.42637 z m 2.7581,0.16443 1.30377,1.51644 0.7586,-0.65041 10e-4,-10e-4 0.003,-0.003 1.01657,-0.78708 0.49841,-0.34714 0.8207,-0.5715 -1.14226,-1.64214 -0.8218,0.57332 -0.51924,0.36139 -0.0197,0.014 -0.0207,0.0151 -1.07722,0.83385 -0.0193,0.0165 -0.0197,0.0168 -0.003,0.003 z m -4.2087596,4.60487 -0.57224,0.81998 -0.13556,0.19623 -0.0151,0.0207 -0.0122,0.0207 -0.71145,1.13678 -0.0122,0.0207 -0.0122,0.0236 -0.20427,0.36723 -0.48928,0.87296 1.74702,0.97381 0.48928,-0.87296 0.19988,-0.36066 0.004,-0.007 0.6752596,-1.07869 0.01,-0.0153 0.10778,-0.15459 0.57187,-0.82034 z m 13.0976696,-9.88866 0.61315,1.90304 0.951534,-0.30548 0.60073,-0.1944 0.0209,-0.007 1.189401,-0.319 0.018,-0.004 0.977832,-0.21267 -0.428262,-1.95565 -0.97638,0.21412 -0.0412,0.008 -0.0238,0.007 -0.0248,0.006 -1.256631,0.33946 -0.0252,0.005 -0.0221,0.008 -0.623024,0.20061 z m -17.5370196,19.22447 -0.21267,0.97783 -0.16553,0.75968 -0.007,0.023 -0.003,0.0248 -0.2028,1.20328 -0.16735,0.98733 1.9721,0.33143 0.16589,-0.98587 0.20171,-1.18538 0.003,-0.019 0.15713,-0.71254 0.21267,-0.97783 z m 10.1327596,-9.86236 v 10.60632 l 5.30353,5.30352 2.65176,-2.65176 11.667103,11.66709 -1.590991,1.59099 1.326069,1.32606 -4.242383,4.24238 2.120833,2.12156 8.485136,-2.7e-4 1.326061,1.32607 3.712194,-3.71218 2.651752,2.65175 1.060781,-1.06077 -2.651765,-2.65176 3.711814,-3.71181 -1.326069,-1.32606 7.94e-4,-8.4855 -2.121561,-2.12083 -4.242753,4.24275 -1.326061,-1.32607 -1.590621,1.59062 -11.667165,-11.66718 2.651042,-2.65104 -5.303534,-5.30352 z m 17.59804,-11.04847 -0.143959,1.9944 0.997559,0.0716 1.032643,0.0745 h 0.003 l 0.907312,0.10925 0.99317,0.11986 0.23898,-1.98709 -0.993181,-0.11766 -0.95554,-0.11584 -0.02339,-10e-4 -0.02519,-0.003 -1.034111,-0.0731 z m -28.4776996,31.21751 0.16553,0.98624 0.1933,1.13823 0.004,0.0233 0.004,0.023 0.18088,0.82765 0.21413,0.97637 1.95274,-0.42826 -0.21413,-0.97637 -0.16955,-0.77759 -0.003,-0.0169 -0.18928,-1.12253 -0.167,-0.98769 z m 38.5370176,-29.0817 -0.796589,1.83215 0.9168,0.40012 0.11878,0.05 0.0181,0.01 1.125462,0.55397 0.006,0.003 0.429721,0.23896 0.872591,0.48892 0.97381,-1.74701 -0.872599,-0.48892 -0.435192,-0.24153 -0.02109,-0.0126 -0.02381,-0.009 -1.18612,-0.58685 -0.02249,-0.0112 -0.02371,-0.009 -0.162968,-0.0716 z m -35.4825676,38.90641 0.48636,0.87296 0.1743,0.3095 0.0122,0.0236 0.0122,0.0207 0.71145,1.13678 0.0122,0.0207 0.0151,0.0207 0.17282,0.25032 0.57149,0.81997 1.6410496,-1.14336 -0.5704,-0.8218 -0.14652,-0.20719 -0.0111,-0.0196 -0.6737996,-1.0743 -0.006,-0.008 -0.16849,-0.30141 -0.48746,-0.87406 z m 42.4739126,-32.15112 0.688822,0.72531 0.922651,0.96946 0.008,0.0112 0.390613,0.45128 0.65223,0.7597 1.51608,-1.3034 -0.6504,-0.75859 -0.3976,-0.46407 -0.01651,-0.0193 -0.01791,-0.0179 -0.95739,-1.00704 -0.689172,-0.72495 z m -34.848593,38.70726 -1.22484,1.58148 0.79001,0.61316 1.02864,0.79697 0.0207,0.0151 0.0192,0.0136 0.57443,0.40049 0.82034,0.57186 1.14372,-1.64068 -0.82034,-0.57186 -0.55251,-0.38369 -1.00924,-0.78343 z m 40.562129,-30.98546 0.39754,0.91717 0.3106,0.714 0.005,0.0137 0.407411,1.08417 0.35481,0.93508 1.871251,-0.70561 -0.35333,-0.93653 -0.4268,-1.12839 -0.009,-0.0235 -0.008,-0.0223 -0.316442,-0.72789 -0.397921,-0.91679 z m -32.281629,35.85524 -0.61461,1.90452 0.9519,0.3051 0.559444,0.18088 0.0224,0.008 0.023,0.004 1.258461,0.3413 0.0245,0.006 0.0223,0.005 0.106349,0.0238 0.977851,0.21267 0.427892,-1.95311 -0.977832,-0.21265 -0.0592,-0.0124 -0.0141,-0.003 -1.198541,-0.32301 -0.0209,-0.007 -0.0263,-0.007 -0.512291,-0.16736 z m 34.837649,-26.63126 0.02519,1.00012 0.0274,1.15724 v 0.0249 0.0249 l -0.01791,0.74433 -0.0249,0.99974 1.999873,0.0471 0.02339,-0.99828 0.019,-0.79292 v -0.0249 -0.0249 l -0.0289,-1.20548 -0.02299,-0.99866 z m -25.398038,28.20143 0.142489,1.99586 0.99721,-0.072 0.969413,-0.0691 0.02479,-0.003 0.02381,-0.001 1.020581,-0.12315 0.99281,-0.12022 -0.23898,-1.98416 -0.99172,0.11838 -0.97344,0.11767 h -0.003 l -0.966492,0.0691 z m 10.587697,-7.45833 1.590983,1.59098 2.65177,-2.65176 -1.590991,-1.59098 z m 4.772224,-4.77222 1.590981,1.59098 2.651413,-2.6514 -1.590991,-1.59099 z m 9.026657,-6.40816 -0.307301,0.95115 -0.0786,0.24738 -0.004,0.0101 -0.440672,1.17222 -0.006,0.0141 -0.14469,0.33544 -0.399399,0.91535 1.835432,0.79694 0.397931,-0.91679 0.151648,-0.34825 0.008,-0.0224 0.009,-0.0235 0.462611,-1.22776 0.009,-0.0238 0.007,-0.0233 0.095,-0.2916 0.30656,-0.95262 z m -14.984641,16.64358 0.79584,1.83507 0.917192,-0.40048 0.102288,-0.0446 0.02381,-0.009 0.02209,-0.0108 1.186472,-0.58721 0.02209,-0.0108 0.02249,-0.0112 0.49293,-0.27442 0.872961,-0.48635 -0.973821,-1.74702 -0.872591,0.48599 -0.450181,0.25139 -0.006,0.003 -1.16857,0.57734 -0.0123,0.007 -0.0581,0.0245 z m 10.658208,-8.12667 -0.6515,0.75969 -0.65884,0.76406 -0.008,0.0109 -0.63798,0.67163 -0.689182,0.72496 1.448873,1.37646 0.687719,-0.7235 0.674151,-0.7071 0.01651,-0.0193 0.01651,-0.0193 0.668658,-0.77614 0.65006,-0.75824 z"
+                       style="fill:#6699ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:23.99999619;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"/>
 </svg>
index 3fe6d0f54112b14160d0e910ac5acda4dbc4553f..44f278db3ae5eab5b2d42d93992841fc6eb7fc4d 100644 (file)
@@ -29,7 +29,7 @@ suspend fun ApplicationCall.shipsPage(): HTML.() -> Unit = page("Game Manual", s
                }
                h3 { +"Subsystem Powering" }
                p {
-                       +"Ships have two particular attributes that are closely related: Reactor Power and Energy Flow. Reactor Power is how much power the ship's generators generate, and starts off as being split evenly between the ship's four subsystems: Weapons, Shields, Engines, and Battery. Weapons Power is expended when firing Cannons or charging Lances; Shields Power is expended whenever the ship's shields are impacted by enemy fire; Engines Power modifies the speed and turn rate of the ship; finally, Battery Power modifies the ship's special techno-science abilities. The ship's Energy Flow statistic determines how many transfers can be made between subsystems during the Power Distribution phase of a turn."
+                       +"Ships have two particular attributes that are closely related: Reactor Power and Energy Flow. Reactor Power is how much power the ship's generators generate, and starts off as being split evenly between the ship's three subsystems: Weapons, Shields, and Engines. Weapons Power is expended when firing Cannons or charging Lances; Shields Power is expended whenever the ship's shields are impacted by enemy fire; finally, Engines Power modifies the speed and turn rate of the ship. The ship's Energy Flow statistic determines how many transfers can be made between subsystems during the Power Distribution phase of a turn."
                }
                h3 { +"Turn Structure" }
                p {