Commit 59b428f
committed
Centralize ordnance launch rules in shared helpers
Phase 4 of the maintenance plan. Extracts duplicated ordnance
launch eligibility logic into two shared helpers in engine/util.ts:
- validateShipOrdnanceLaunch: per-ship per-type error messages
- canLaunchOrdnance: quick boolean for ship filtering
Both client ordnance.ts and engine game-engine.ts now use these
instead of encoding the same rules independently. Removes the
duplicate canShipLaunchAnyOrdnance from client code.
Fixes two client-side bugs:
- Orbital bases at D1 damage were incorrectly blocked from launching
- Torpedo error message now correctly mentions orbital bases1 parent 5bc55f3 commit 59b428f
File tree
6 files changed
+258
-175
lines changed- docs
- src
- client/game
6 files changed
+258
-175
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | | - | |
| 73 | + | |
74 | 74 | | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
80 | 82 | | |
81 | 83 | | |
82 | 84 | | |
| |||
92 | 94 | | |
93 | 95 | | |
94 | 96 | | |
95 | | - | |
| 97 | + | |
96 | 98 | | |
97 | 99 | | |
98 | 100 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
| |||
45 | 44 | | |
46 | 45 | | |
47 | 46 | | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | 47 | | |
59 | 48 | | |
60 | 49 | | |
| |||
141 | 130 | | |
142 | 131 | | |
143 | 132 | | |
144 | | - | |
| 133 | + | |
145 | 134 | | |
146 | 135 | | |
147 | 136 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
2 | 6 | | |
3 | 7 | | |
4 | 8 | | |
| |||
50 | 54 | | |
51 | 55 | | |
52 | 56 | | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | 57 | | |
66 | 58 | | |
67 | 59 | | |
68 | 60 | | |
69 | 61 | | |
70 | 62 | | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
| 63 | + | |
77 | 64 | | |
78 | 65 | | |
79 | 66 | | |
| |||
83 | 70 | | |
84 | 71 | | |
85 | 72 | | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
| 73 | + | |
92 | 74 | | |
93 | 75 | | |
94 | 76 | | |
| |||
99 | 81 | | |
100 | 82 | | |
101 | 83 | | |
102 | | - | |
103 | | - | |
104 | 84 | | |
105 | 85 | | |
106 | 86 | | |
| |||
109 | 89 | | |
110 | 90 | | |
111 | 91 | | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
| 92 | + | |
117 | 93 | | |
118 | | - | |
| 94 | + | |
119 | 95 | | |
120 | 96 | | |
121 | 97 | | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | | - | |
152 | | - | |
153 | | - | |
154 | | - | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
160 | | - | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | | - | |
168 | | - | |
| 98 | + | |
169 | 99 | | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | | - | |
| 100 | + | |
| 101 | + | |
176 | 102 | | |
177 | 103 | | |
178 | 104 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
| |||
689 | 690 | | |
690 | 691 | | |
691 | 692 | | |
692 | | - | |
| 693 | + | |
693 | 694 | | |
694 | 695 | | |
695 | 696 | | |
696 | 697 | | |
697 | | - | |
698 | | - | |
699 | | - | |
700 | | - | |
701 | | - | |
702 | | - | |
703 | | - | |
704 | | - | |
705 | | - | |
706 | | - | |
707 | | - | |
708 | | - | |
709 | | - | |
710 | | - | |
711 | 698 | | |
712 | 699 | | |
713 | 700 | | |
714 | 701 | | |
715 | 702 | | |
716 | 703 | | |
717 | | - | |
718 | | - | |
719 | 704 | | |
720 | 705 | | |
721 | 706 | | |
722 | 707 | | |
723 | 708 | | |
724 | | - | |
725 | | - | |
726 | | - | |
727 | | - | |
728 | | - | |
729 | | - | |
730 | | - | |
731 | | - | |
732 | | - | |
733 | | - | |
734 | | - | |
735 | | - | |
736 | | - | |
737 | | - | |
738 | | - | |
739 | | - | |
740 | | - | |
741 | | - | |
742 | | - | |
743 | | - | |
744 | | - | |
745 | | - | |
746 | | - | |
747 | | - | |
748 | | - | |
749 | | - | |
750 | | - | |
751 | | - | |
| 709 | + | |
| 710 | + | |
| 711 | + | |
752 | 712 | | |
753 | 713 | | |
754 | 714 | | |
| |||
0 commit comments