From 7663322ceae51228f56dc328ce7e00eb5eaf4a59 Mon Sep 17 00:00:00 2001
From: TheSaminator <TheSaminator@users.noreply.github.com>
Date: Fri, 3 Jun 2022 16:53:03 -0400
Subject: [PATCH] Fix ship using fighters on itself

---
 plan/icons/weapons.svg                        | 110 ++++++++++++++++++
 .../starshipfights/game/ship_weapons.kt       |  15 ++-
 2 files changed, 122 insertions(+), 3 deletions(-)
 create mode 100644 plan/icons/weapons.svg

diff --git a/plan/icons/weapons.svg b/plan/icons/weapons.svg
new file mode 100644
index 0000000..a2ef6b6
--- /dev/null
+++ b/plan/icons/weapons.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="224mm"
+   height="224mm"
+   viewBox="0 0 224 224"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="weapons.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#888888"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.55217145"
+     inkscape:cx="379.29399"
+     inkscape:cy="176.67818"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true"
+     showguides="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-center="true"
+     inkscape:snap-intersection-paths="true" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-73.00018)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.984375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="m 136.45752,152.99996 -0.7307,6.57634 -7.63674,0.84853 -0.84852,7.63674 -7.63675,0.84853 -0.84852,7.63674 -7.63675,0.84853 -0.84852,7.63674 1.69707,1.69705 7.63672,-0.84852 0.84854,-7.63675 7.63673,-0.84852 0.84854,-7.63675 7.63675,-0.84852 0.84852,-7.63675 6.57635,-0.7307 v -7.54269 h -5.3e-4 l -0.63614,5.72781 -5.7278,0.63666 0.63664,-5.72782 5.7273,-0.63665 z m -0.94308,8.48527 -0.63613,5.72781 -5.72781,0.63666 0.63664,-5.72782 z m -8.48526,8.48527 -0.63614,5.72781 -5.72783,0.63666 0.63666,-5.72782 z m -8.48527,8.48578 -0.63614,5.7273 -5.72783,0.63666 0.63667,-5.72782 z M 88.48579,183.05859 80,191.54437 v 11.31404 l 19.79931,-19.79982 z m 16.97003,0 L 80,208.51491 v 8.48527 h 8.48527 l 25.45632,-25.45581 z m 8.48527,14.14228 -19.79932,19.79931 h 11.31405 l 8.48577,-8.48578 z"
+       id="rect1420"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.984375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="m 142.07476,72.99995 -4.59817,4.59869 h -5.13509 l 5.3e-4,5.13405 -5.13457,5.13457 -5.13405,-5.3e-4 v 5.13508 l -5.13457,5.13406 -5.13406,-5.3e-4 v 5.13509 l -5.13457,5.13405 h -5.13405 v 5.13457 l 1.92495,1.92495 5.13457,-5.13406 5.13405,-5.3e-4 v -5.13405 l 5.13457,-5.13405 5.13406,-5.3e-4 v -5.13406 l 5.13457,-5.13405 h 5.13405 l 5.3e-4,-5.13457 5.13405,-5.13457 h 4.59817 V 72.9999 Z m 0.53537,3.31504 v 1.28365 H 141.327 Z m -8.34317,3.20859 h 1.28417 l -1.28417,1.28416 z m -1.92546,7.06004 v 1.28364 h -1.28312 z m -8.34316,3.20858 h 1.28416 l -1.28416,1.28417 z m -1.92494,7.06004 v 1.28313 h -1.28365 z m -8.34368,3.20859 h 1.28416 l -1.28416,1.28416 z m -1.92495,7.06003 v 1.28365 h -1.28364 z M 94.24254,107.20096 80,121.4435 v 8.48579 l 18.48517,-18.48518 z m 9.21855,3.12849 h 1.28416 l -1.28416,1.28416 z m -2.50113,3.58945 -7.07089,7.07088 -1.76785,-1.76785 -8.48527,8.48579 5.6565,5.6565 8.48579,-8.48475 -1.76785,-1.76785 7.0714,-7.0714 -1.06143,-1.06092 z m 4.5961,4.5961 -18.48518,18.48518 11.31404,-5.3e-4 12.82816,-12.82764 z"
+       id="rect1156"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.98437512;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="m 54.051476,73.00047 -5.2e-4,5.1e-4 a 2.2108731,2.2109005 0 0 0 -2.21071,2.21072 2.2108731,2.2109005 0 0 0 0.003,0.0801 c -5.97455,0.63875 -13.66063,4.76962 -20.39927,11.50834 l 10.94041,-1.56321 -20.38428,29.76304 29.76252,-20.38532 -1.56321,10.94145 c 6.7394,-6.73946 10.86846,-14.42425 11.50679,-20.39927 a 2.2108731,2.2109005 0 0 0 0.0827,0.004 2.2108731,2.2109005 0 0 0 2.21123,-2.21124 2.2108731,2.2109005 0 0 0 -2.21123,-2.21071 2.2108731,2.2109005 0 0 0 -0.33849,0.0274 c -0.14681,-0.54904 -0.34232,-1.06636 -0.58549,-1.54977 a 2.2108731,2.2109005 0 0 0 0.92398,-1.79421 2.2108731,2.2109005 0 0 0 -2.21072,-2.21072 2.2108731,2.2109005 0 0 0 -1.79524,0.92294 c -0.48347,-0.24308 -1.0007,-0.43874 -1.54978,-0.58549 a 2.2108731,2.2109005 0 0 0 0.0289,-0.33745 2.2108731,2.2109005 0 0 0 -2.21072,-2.21071 z m -5.2e-4,1.10587 a 1.1054365,1.1054502 0 0 1 1.10537,1.10536 1.1054365,1.1054502 0 0 1 -1.10537,1.10536 1.1054365,1.1054502 0 0 1 -1.10535,-1.10536 1.1054365,1.1054502 0 0 1 1.10535,-1.10536 z m 5.52732,2.21072 a 1.1054365,1.1054502 0 0 1 1.10535,1.10536 1.1054365,1.1054502 0 0 1 -1.10535,1.10536 1.1054365,1.1054502 0 0 1 -1.10536,-1.10536 1.1054365,1.1054502 0 0 1 1.10536,-1.10536 z m -9.57358,2.21382 v 5.2e-4 a 3.8853033,2.8332184 45.001162 0 1 0.65681,0.0372 l 6.71845,1.05265 1.05213,6.71845 a 3.8853033,2.8332184 45.001162 0 1 -2.83393,2.83291 3.8853033,2.8332184 45.001162 0 1 -3.88504,-3.88504 3.8853033,2.8332184 45.001162 0 1 -3.88503,-3.88606 3.8853033,2.8332184 45.001162 0 1 2.17661,-2.87063 z m 11.7843,3.31349 a 1.1054365,1.1054502 0 0 1 1.10588,1.10536 1.1054365,1.1054502 0 0 1 -1.10588,1.10536 1.1054365,1.1054502 0 0 1 -1.10537,-1.10536 1.1054365,1.1054502 0 0 1 1.10537,-1.10536 z M 0,105.00006 8.574666,137.00018 h 16.56437 l -7.12617,-26.59631 z m 11.362096,7.34271 c 2.52646,0.0382 5.06621,2.45143 5.99343,5.91126 1.05959,3.95432 -0.38833,7.77807 -3.23391,8.54005 -2.84513,0.76208 -6.01046,-1.82569 -7.06985,-5.77949 -1.05918,-3.95364 0.38855,-7.77641 3.23339,-8.53901 0.35565,-0.0954 0.71602,-0.13826 1.07694,-0.13281 z M 0,120.45338 v 16.5468 h 4.433836 z"
+       id="rect1048"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.98437488;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="m 56.64202,233.00202 c -5.583446,-0.10305 -13.364231,3.75293 -20.099033,10.48773 l 9.897071,-1.41386 -18.440218,26.92393 26.923939,-18.44073 -1.414385,9.89759 c 9.370165,-9.37017 13.16936,-20.76498 8.484237,-25.45013 -1.317696,-1.3177 -3.166782,-1.9642 -5.351611,-2.00453 z m -39.421883,31.99805 c -1.577657,-0.01 -2.955118,0.45282 -3.939294,1.43712 -2.862869,2.86327 -1.314701,9.05261 3.457153,13.82448 4.771912,4.77182 10.961185,6.31948 13.82448,3.45664 2.863458,-2.86304 1.316029,-9.05285 -3.45612,-13.825 -3.131759,-3.1317 -6.874325,-4.87434 -9.886219,-4.89324 z M 10.776086,268.94298 0,279.71907 v 17.28111 h 17.280599 l 10.780736,-10.78022 c -3.697039,0.61713 -8.460898,-1.37436 -12.187369,-5.09426 -3.719173,-3.72426 -5.711589,-8.48541 -5.09788,-12.18272 z m 9.33018,2.10478 c 1.193335,0.0314 2.659243,0.72614 3.889685,1.95647 1.909227,1.90906 2.528139,4.38477 1.382345,5.5299 -1.145382,1.14518 -3.621119,0.52605 -5.529895,-1.38287 -1.908609,-1.90874 -2.527444,-4.38411 -1.382345,-5.52937 0.357824,-0.35805 0.845223,-0.54366 1.405082,-0.57155 0.07699,-0.004 0.155573,-0.005 0.235128,-0.002 z"
+       id="path1620"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.98437476;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="m 138.64448,232.99995 -37.89226,39.71127 1.76785,1.76785 5.05034,-7.87911 7.8791,-5.05034 5.05086,-7.8791 7.87859,-5.05086 5.05085,-7.8791 7.87962,-5.05086 1.72393,-2.68975 z m 5.35575,2.1115 -1.27693,1.99212 -7.8791,5.05086 -5.05086,7.87962 -7.87859,5.05085 -5.05085,7.87911 -7.87911,5.05034 -5.05085,7.8791 0.35295,0.35399 39.71334,-37.89433 z M 93.511836,267.8433 c -3.210684,-0.0384 -8.529938,2.96178 -13.411584,7.84345 -0.03397,0.034 -0.06646,0.0683 -0.100252,0.10231 v 14.14023 l 7.171139,-7.17166 11.314037,-11.31352 -2.828251,-2.82825 c -0.51254,-0.51261 -1.246097,-0.7618 -2.145089,-0.77256 z m 7.448124,6.07559 -7.070885,7.07089 -1.767851,-1.76785 -8.485787,8.48579 5.657019,5.6565 8.485787,-8.48527 -1.767851,-1.76785 7.070888,-7.07089 -1.06092,-1.06091 z m 4.5961,4.59611 -18.485174,18.48517 h 16.970544 l 9.9999,-9.9999 z"
+       id="path1631"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.49999905;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="m 191.9996,232.99995 -1.13534,18.15961 a 11.992506,19.18801 45 0 0 -7.34425,5.3604 11.992506,19.18801 45 0 0 -5.35884,7.34529 L 160,265.00006 l 17.19688,1.07487 a 11.992506,19.18801 45 0 0 0.51677,11.64942 l -11.71402,13.27568 13.28291,-11.72022 a 11.992506,19.18801 45 0 0 11.6427,0.52658 l 1.07436,17.19379 1.13533,-18.15962 a 11.992506,19.18801 45 0 0 7.34477,-5.3604 11.992506,19.18801 45 0 0 5.35833,-7.34528 l 18.16168,-1.13482 -17.1974,-1.07487 a 11.992506,19.18801 45 0 0 -0.51625,-11.64993 l 11.7135,-13.27516 -13.28239,11.7197 a 11.992506,19.18801 45 0 0 -11.64322,-0.52658 z m 5.98103,18.00097 a 10.493442,16.78951 45 0 1 5.89111,2.127 10.493442,16.78951 45 0 1 -4.45192,19.29185 10.493442,16.78951 45 0 1 -19.29185,4.45192 10.493442,16.78951 45 0 1 4.45192,-19.29185 10.493442,16.78951 45 0 1 13.40074,-6.57892 z m -1.70894,3.99975 a 7.4953158,11.992508 45 0 0 -9.57203,4.69946 7.4953158,11.992508 45 0 0 -3.17965,13.78003 7.4953158,11.992508 45 0 0 13.77952,-3.18016 7.4953158,11.992508 45 0 0 3.18017,-13.78004 7.4953158,11.992508 45 0 0 -4.20801,-1.51929 z"
+       id="path1811"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.984375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="M 59.37351,153.00019 43.95168,168.42202 42.40989,166.87966 26.98806,182.30093 25.44627,180.75914 10.02444,196.18097 8.48152,194.63861 0,203.12014 v 13.87948 5.6e-4 h 5.6e-4 13.87948 l 8.48152,-8.48152 -1.54235,-1.54292 15.42183,-15.42183 -1.54179,-1.54179 15.42127,-15.42183 -1.54235,-1.54179 15.42182,-15.42183 z"
+       id="rect1163"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.984375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="m 194.26819,152.99996 -8.26823,10.6872 5.49217,-0.29094 -1.5353,7.60419 8.04344,-10.77144 -5.42602,0.88677 z m -19.94762,4.22403 1.71049,13.40332 3.6773,-4.08968 4.29172,6.46266 -1.92908,-13.30358 -3.20962,4.46329 z m 38.41315,2.34352 -12.50413,5.12114 4.90202,2.49339 -5.13146,5.81825 12.35117,-5.30666 -5.14231,-1.9451 z M 160,169.00001 l 3.93051,26.94409 7.22178,-8.0641 8.84804,13.12013 -4.36511,-26.75186 -6.2699,8.83202 z m 64.00024,0 -9.36533,14.08028 -6.26991,-8.83202 -4.36459,26.75186 8.84753,-13.12013 7.22228,8.0641 z m -40.00016,8.00003 v 4.5713 h 3.42873 v 6.85746 h -3.42873 v 3.42822 h 3.42873 v 2.85719 h -3.42873 v 3.42873 h 3.42873 v 2.85719 h -3.42873 v 3.42821 h 3.42873 v 2.85771 h -3.42873 v 3.42873 h 3.42873 v 2.85667 h -3.42873 v 3.42873 h 16.00007 v -3.42873 h -3.42874 v -2.85667 h 3.42874 v -3.42873 h -3.42874 v -2.85771 h 3.42874 v -3.42821 h -3.42874 v -2.85719 h 3.42874 v -3.42873 h -3.42874 v -2.85719 h 3.42874 v -3.42822 h -3.42874 v -6.85746 h 3.42874 v -4.5713 h -6.85694 v 2.28565 h -2.28619 v -2.28565 z"
+       id="rect1424"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/commonMain/kotlin/starshipfights/game/ship_weapons.kt b/src/commonMain/kotlin/starshipfights/game/ship_weapons.kt
index a54233e..97407c2 100644
--- a/src/commonMain/kotlin/starshipfights/game/ship_weapons.kt
+++ b/src/commonMain/kotlin/starshipfights/game/ship_weapons.kt
@@ -700,18 +700,27 @@ fun GameState.useWeaponPickResponse(attacker: ShipInstance, weaponId: Id<ShipWea
 			val targetedShip = ships[targetedShipId] ?: return GameEvent.InvalidAction("That ship does not exist")
 			
 			val impact = targetedShip.afterTargeted(attacker, weaponId)
-			val newAttacker = attacker.afterUsing(weaponId)
+			
+			val newAttacker = if (targetedShipId == attacker.id) {
+				if (impact is ImpactResult.Damaged)
+					impact.ship.afterUsing(weaponId)
+				else
+					null
+			} else
+				attacker.afterUsing(weaponId)
 			
 			val newShips = (if (impact is ImpactResult.Damaged)
 				ships + mapOf(targetedShipId to impact.ship)
-			else ships - targetedShipId) + mapOf(attacker.id to newAttacker)
+			else ships - targetedShipId) + (if (newAttacker != null)
+				mapOf(attacker.id to newAttacker)
+			else emptyMap())
 			
 			val newWrecks = destroyedShips + if (impact is ImpactResult.Destroyed)
 				mapOf(targetedShipId to impact.ship)
 			else emptyMap()
 			
 			val newChatMessages = chatBox + listOfNotNull(
-				impact.toChatEntry(ShipAttacker.EnemyShip(newAttacker.id), weapon)
+				impact.toChatEntry(ShipAttacker.EnemyShip(attacker.id), weapon)
 			)
 			
 			GameEvent.StateChange(
-- 
2.25.1