added: more jammers

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index db2cc5fd3dd57c1b97428c1ea29d2d7dd89d3fc0..782072a7c3e1b84120224a92a10eab148cb871c9 100644 (file)
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -177,9 +177,12 @@
   },
   "active": "04094233c3d02ad2",
   "lastOpenFiles": [
+    "Nebulous Command/data.py~",
+    "Nebulous Command/missiles-ranges.py~",
+    "Nebulous Command/__pycache__/data.cpython-314.pyc",
+    "Nebulous Command/missiles-ranges.py",
     "Nebulous Command/missile-simulator.py~",
     "Nebulous Command/calc.py~",
-    "Nebulous Command/data.py~",
     "Nebulous Command/4913",
     "Nebulous Command/data.py",
     "List of things to do.md",
@@ -191,10 +194,7 @@
     "Nebulous Command/ANS/My Fleets/ANS Dedicated/Stat Sheet.md",
     "Nebulous Command/ANS/My Fleets/ANS Dedicated",
     "Nebulous Command/ANS/My Fleets/Fleets/Untitled.md",
-    "Nebulous Command/ANS/My Fleets/Fleets",
     "Nebulous Command/Notes on Nebulous Command.md",
-    "Nebulous Command/ANS/My Fleets",
-    "Nebulous Command/ANS",
     "Some cool music perhaps?.md",
     "System Overview and Links.md",
     "Thoughts on Politics and Researching, and finding out things that you think are right.md",

diff --git a/Nebulous Command/Notes on Mechanics.md b/Nebulous Command/Notes on Mechanics.md
index 8d3b836bb04659fe597d1b96b8f90119e2904e54..131b2bbe451bb33ca0f762474c59fe3d41370a4d 100644 (file)
--- a/Nebulous Command/Notes on Mechanics.md
+++ b/Nebulous Command/Notes on Mechanics.md
@@ -22,20 +22,20 @@ If the person is able to find the launch platform, providing intel for your carr
 ## Cross-sections
 The cross sections of different ships
 
-| Ship                 | Cross Section (m^2) | -10%     | -25%     | -35%     |
-| -------------------- | ------------------- | -------- | -------- | -------- |
-| Sprinter (Corvette)  | 2890                | 2601     | 2167.5   | 1878.5   |
-| Raines (FF)          | 3783                | 3404.7   | 2837.25  | 2458.95  |
-| Keystone (DD)        | 6281                | 5652.9   | 4710.75  | 4082.65  |
-| Vauxhall (CL)        | 11727               | 10554.30 | 8795.25  | 7622.55  |
-| Axford (HC)          | 14332               | 12898.80 | 10749.00 | 9315.80  |
-| Solomon (BB)         | 27876               | 25088.40 | 20907.00 | 18119.40 |
-| Ferryman (Corvette)  | 2890                | 2601     | 2167.5   | 1878.5   |
-| Draugr (FF)          | 4685                | 4216.50  | 3513.75  | 3045.25  |
-| Flathead (DD)        | 9869                | 8882.10  | 7401.75  | 6414.85  | 
-| Ocello (HC)          | 15745               | 14170.50 | 11808.75 | 10234.25 |
-| Marauder (BB)        | 15745               | 14170.50 | 11808.75 | 10234.25 |
-| Moorline (BB)        | 15745               | 14170.50 | 11808.75 | 10234.25 |
+| Ship                | Cross Section (m^2) | -10%     | -25%     | -35%     |     |     |
+| ------------------- | ------------------- | -------- | -------- | -------- | --- | --- |
+| Sprinter (Corvette) | 2890                | 2601     | 2167.5   | 1878.5   |     |     |
+| Raines (FF)         | 3783                | 3404.7   | 2837.25  | 2458.95  |     |     |
+| Keystone (DD)       | 6281                | 5652.9   | 4710.75  | 4082.65  |     |     |
+| Vauxhall (CL)       | 11727               | 10554.30 | 8795.25  | 7622.55  |     |     |
+| Axford (HC)         | 14332               | 12898.80 | 10749.00 | 9315.80  |     |     |
+| Solomon (BB)        | 27876               | 25088.40 | 20907.00 | 18119.40 |     |     |
+| Ferryman (Corvette) | 2890                | 2601     | 2167.5   | 1878.5   |     |     |
+| Draugr (FF)         | 4685                | 4216.50  | 3513.75  | 3045.25  |     |     |
+| Flathead (DD)       | 9869                | 8882.10  | 7401.75  | 6414.85  |     |     |
+| Ocello (HC)         | 15745               | 14170.50 | 11808.75 | 10234.25 |     |     |
+| Marauder (BB)       | 15745               | 14170.50 | 11808.75 | 10234.25 |     |     |
+| Moorline (BB)       | 15745               | 14170.50 | 11808.75 | 10234.25 |     |     |
 
 
 Turning off the radar: -25% signature

diff --git a/Nebulous Command/__pycache__/data.cpython-314.pyc b/Nebulous Command/__pycache__/data.cpython-314.pyc
new file mode 100644 (file)
index 0000000..a322fe4
Binary files /dev/null and b/Nebulous Command/__pycache__/data.cpython-314.pyc differ

diff --git a/Nebulous Command/data.py b/Nebulous Command/data.py
index 4885bb68e996e5cb4d10510975ac8d89e854cc1d..a4158189800803f6e931efcbf619876653c7597e 100644 (file)
--- a/Nebulous Command/data.py
+++ b/Nebulous Command/data.py
@@ -5,14 +5,22 @@ from dataclasses import dataclass
 class Jammer:
     name: str
     range_km: float
-    radiated_power_kw: int
+    radiated_power_kw: float
     gain_db: int
+    radar: bool
+    comms: bool
 
 
 jammers = [
-    Jammer("No Jammer", 0, 0, 0),
-    Jammer("Self Screening Jammer", 2.5, 5, 2),
-    Jammer("Boosted Self Screening Jammer", 5, 5, 4)
+    Jammer("No Jammer", 0, 0, 0, False, False),
+    Jammer("Self Screening Jammer", 2.5, 5, 2, True, True),
+    Jammer("Boosted Self Screening Jammer", 5, 5, 4, True, True),
+    Jammer("E70 Interruption", 4, 750, 1, False, True),
+    Jammer("E71 Hangup", 20, 300, 25, False, True),
+    Jammer("E90 Blanket", 10, 1, 20, True, False),
+    Jammer("J15 Bellbird", 10, 1.25, 20, True, False),
+    Jammer("J360 Lyrebird", 4, 10, 2, True, False),
+    Jammer("J75 Warbler", 2.5, 1250, 1, False, True),
 ]
 
 
@@ -27,7 +35,6 @@ class Missile(Ship):
     side_rcs_m2: float
 
 
-
 ships = [
     Ship("Sprinter", 2601),
     Ship("Raines", 3783),

diff --git a/Nebulous Command/missiles-ranges.py b/Nebulous Command/missiles-ranges.py
new file mode 100644 (file)
index 0000000..173e7c3
--- /dev/null
+++ b/Nebulous Command/missiles-ranges.py
@@ -0,0 +1,11 @@
+from data import Jammer, Radar, Ship, Missile
+import tkinter as tk
+
+
+def main():
+    root = tk.Tk()
+    root.mainloop()
+
+
+if __name__ == "__main__":
+    main()