Skip to content

Commit c4c508a

Browse files
authored
Fix Marauder Behemoth conflicts with Lost in Midnight
1 parent 63da037 commit c4c508a

File tree

3 files changed

+70
-69
lines changed

3 files changed

+70
-69
lines changed

data/fleets.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fleet "Pirate Variants"
1818
"Bulwark"
1919
"Cutlass"
2020
"Cutthroat"
21-
"Marauder Behemoth"
21+
"Rumskib Marauder Behemoth"
2222
"Nighthawk"
2323
"Scrapper"
2424
"Valkyrie"
@@ -35,7 +35,7 @@ fleet "Rumskib Large Pirate Raiding Party"
3535
heroic
3636
plunders
3737
variant
38-
"Marauder Behemoth" 5
38+
"Rumskib Marauder Behemoth" 5
3939
"Marauder Combat Drone" 5
4040
variant
4141
"Sparrow" 14
@@ -189,13 +189,13 @@ fleet "Small Core Pirates"
189189

190190
fleet "Large Southern Pirates"
191191
add variant
192-
"Marauder Behemoth"
192+
"Rumskib Marauder Behemoth"
193193
"Marauder Combat Drone"
194194

195195

196196
fleet "Marauder fleet VI"
197197
add variant
198-
"Marauder Behemoth"
198+
"Rumskib Marauder Behemoth"
199199
"Marauder Combat Drone"
200200
"Marauder Firebird (Weapons)"
201201
"Marauder Manta (Engines)"

data/omnis.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ shipyard "human plugin"
1313
"Cleaver"
1414
"Cutlass"
1515
"Dragonfly"
16-
"Marauder Behemoth"
16+
"Rumskib Marauder Behemoth"
1717
"Marauder Boxwing"
1818
"Marauder Combat Drone"
1919
"Rumskib Destroyer"

data/ships.txt

+65-64
Original file line numberDiff line numberDiff line change
@@ -273,70 +273,6 @@ ship "Dragonfly"
273273

274274

275275

276-
ship "Marauder Behemoth"
277-
sprite "ship/mbehemoth"
278-
thumbnail "thumbnail/mbehemoth"
279-
attributes
280-
category "Heavy Warship"
281-
"cost" 10800000
282-
"shields" 7600
283-
"hull" 7300
284-
"required crew" 12
285-
"bunks" 30
286-
"mass" 1120
287-
"drag" 14.9
288-
"heat dissipation" .26
289-
"fuel capacity" 600
290-
"cargo space" 490
291-
"outfit space" 510
292-
"weapon capacity" 280
293-
"engine capacity" 90
294-
weapon
295-
"blast radius" 140
296-
"shield damage" 1400
297-
"hull damage" 700
298-
"hit force" 2100
299-
outfits
300-
"Sidewinder Missile Launcher"
301-
"Sidewinder Missile" 45
302-
"Heavy Laser Turret" 6
303-
"Breeder Reactor"
304-
"LP144a Battery Pack"
305-
"D94-YV Shield Generator"
306-
"Large Radar Jammer"
307-
"Liquid Nitrogen Cooler"
308-
"Outfits Expansion" 6
309-
"A250 Atomic Thruster"
310-
"A125 Atomic Steering"
311-
"A375 Atomic Steering"
312-
"Scram Drive"
313-
314-
engine -34 143 0.8
315-
engine 34 143 0.8
316-
engine -56 148.5 0.6
317-
engine 56 148.5 0.6
318-
gun -47.5 -57.5 "Sidewinder Missile Launcher"
319-
gun 47.5 -57.5
320-
turret -31 -50 "Heavy Laser Turret"
321-
turret 31 -50 "Heavy Laser Turret"
322-
turret -47.5 33.5 "Heavy Laser Turret"
323-
turret 47.5 33.5 "Heavy Laser Turret"
324-
turret -22 66.5 "Heavy Laser Turret"
325-
turret 22 66.5 "Heavy Laser Turret"
326-
bay Drone 0 26.5
327-
leak "leak" 30 50
328-
leak "flame" 30 80
329-
leak "big leak" 50 30
330-
explode "small explosion" 15
331-
explode "medium explosion" 25
332-
explode "large explosion" 35
333-
explode "huge explosion" 20
334-
"final explode" "final explosion large"
335-
description "The Behemoth is a recent ship design from Betelgeuse Shipyards, designed as an alternative to the Syndicate Bulk Freighter. Although its cargo capacity is somewhat lower, it is also more maneuverable, and packs a heavier armament by default."
336-
description " This Marauder version has been heavily modified and is slower with a greater hull strength."
337-
338-
339-
340276
ship "Marauder Boxwing"
341277
sprite "ship/marauder boxwing"
342278
thumbnail "thumbnail/marauder boxwing"
@@ -544,6 +480,71 @@ ship "Rumskib Destroyer"
544480

545481

546482

483+
ship "Rumskib Marauder Behemoth"
484+
sprite "ship/mbehemoth"
485+
thumbnail "thumbnail/mbehemoth"
486+
"display name" "Marauder Behemoth"
487+
attributes
488+
category "Heavy Warship"
489+
"cost" 10800000
490+
"shields" 7600
491+
"hull" 7300
492+
"required crew" 12
493+
"bunks" 30
494+
"mass" 1120
495+
"drag" 14.9
496+
"heat dissipation" .26
497+
"fuel capacity" 600
498+
"cargo space" 490
499+
"outfit space" 510
500+
"weapon capacity" 280
501+
"engine capacity" 90
502+
weapon
503+
"blast radius" 140
504+
"shield damage" 1400
505+
"hull damage" 700
506+
"hit force" 2100
507+
outfits
508+
"Sidewinder Missile Launcher"
509+
"Sidewinder Missile" 45
510+
"Heavy Laser Turret" 6
511+
"Breeder Reactor"
512+
"LP144a Battery Pack"
513+
"D94-YV Shield Generator"
514+
"Large Radar Jammer"
515+
"Liquid Nitrogen Cooler"
516+
"Outfits Expansion" 6
517+
"A250 Atomic Thruster"
518+
"A125 Atomic Steering"
519+
"A375 Atomic Steering"
520+
"Scram Drive"
521+
522+
engine -34 143 0.8
523+
engine 34 143 0.8
524+
engine -56 148.5 0.6
525+
engine 56 148.5 0.6
526+
gun -47.5 -57.5 "Sidewinder Missile Launcher"
527+
gun 47.5 -57.5
528+
turret -31 -50 "Heavy Laser Turret"
529+
turret 31 -50 "Heavy Laser Turret"
530+
turret -47.5 33.5 "Heavy Laser Turret"
531+
turret 47.5 33.5 "Heavy Laser Turret"
532+
turret -22 66.5 "Heavy Laser Turret"
533+
turret 22 66.5 "Heavy Laser Turret"
534+
bay Drone 0 26.5
535+
leak "leak" 30 50
536+
leak "flame" 30 80
537+
leak "big leak" 50 30
538+
explode "small explosion" 15
539+
explode "medium explosion" 25
540+
explode "large explosion" 35
541+
explode "huge explosion" 20
542+
"final explode" "final explosion large"
543+
description "The Behemoth is a recent ship design from Betelgeuse Shipyards, designed as an alternative to the Syndicate Bulk Freighter. Although its cargo capacity is somewhat lower, it is also more maneuverable, and packs a heavier armament by default."
544+
description " This Marauder version has been heavily modified and is slower with a greater hull strength."
545+
546+
547+
547548
ship "Tanager"
548549
sprite "ship/tanager"
549550
thumbnail "thumbnail/tanager"

0 commit comments

Comments
 (0)