diff --git a/DATA/SHIPS/BRETONIA/BR_BATTLESHIP/br_battleship.cmp b/DATA/SHIPS/BRETONIA/BR_BATTLESHIP/br_battleship.cmp index 07ef8923..347558b9 100644 Binary files a/DATA/SHIPS/BRETONIA/BR_BATTLESHIP/br_battleship.cmp and b/DATA/SHIPS/BRETONIA/BR_BATTLESHIP/br_battleship.cmp differ diff --git a/DATA/SHIPS/BRETONIA/BR_DESTROYER/br_destroyer.cmp b/DATA/SHIPS/BRETONIA/BR_DESTROYER/br_destroyer.cmp index 8521a976..8eb2e7d5 100644 Binary files a/DATA/SHIPS/BRETONIA/BR_DESTROYER/br_destroyer.cmp and b/DATA/SHIPS/BRETONIA/BR_DESTROYER/br_destroyer.cmp differ diff --git a/DATA/SHIPS/BRETONIA/BR_GUNSHIP/br_gunship.cmp b/DATA/SHIPS/BRETONIA/BR_GUNSHIP/br_gunship.cmp index 56cb1384..4bb11368 100644 Binary files a/DATA/SHIPS/BRETONIA/BR_GUNSHIP/br_gunship.cmp and b/DATA/SHIPS/BRETONIA/BR_GUNSHIP/br_gunship.cmp differ diff --git a/DATA/SHIPS/EVENT/HALLOWEEN/Jack_O'Lantern.3db b/DATA/SHIPS/EVENT/HALLOWEEN/Jack_O'Lantern.3db index 3980674c..17be4e0e 100644 Binary files a/DATA/SHIPS/EVENT/HALLOWEEN/Jack_O'Lantern.3db and b/DATA/SHIPS/EVENT/HALLOWEEN/Jack_O'Lantern.3db differ diff --git a/DATA/SHIPS/KUSARI/KU_BATTLESHIP/ku_battleship.cmp b/DATA/SHIPS/KUSARI/KU_BATTLESHIP/ku_battleship.cmp index fe7e07ce..3b77c0ed 100644 Binary files a/DATA/SHIPS/KUSARI/KU_BATTLESHIP/ku_battleship.cmp and b/DATA/SHIPS/KUSARI/KU_BATTLESHIP/ku_battleship.cmp differ diff --git a/DATA/SHIPS/KUSARI/KU_DESTROYER/ku_destroyer.cmp b/DATA/SHIPS/KUSARI/KU_DESTROYER/ku_destroyer.cmp index 725e2b50..5f6c9c95 100644 Binary files a/DATA/SHIPS/KUSARI/KU_DESTROYER/ku_destroyer.cmp and b/DATA/SHIPS/KUSARI/KU_DESTROYER/ku_destroyer.cmp differ diff --git a/DATA/SHIPS/KUSARI/KU_GUNSHIP/ku_gunship.cmp b/DATA/SHIPS/KUSARI/KU_GUNSHIP/ku_gunship.cmp index bdb75024..7f41cc24 100644 Binary files a/DATA/SHIPS/KUSARI/KU_GUNSHIP/ku_gunship.cmp and b/DATA/SHIPS/KUSARI/KU_GUNSHIP/ku_gunship.cmp differ diff --git a/DATA/SHIPS/LIBERTY/LI_CRUISER/li_cruiser.cmp b/DATA/SHIPS/LIBERTY/LI_CRUISER/li_cruiser.cmp index a1774d28..e7497fbf 100644 Binary files a/DATA/SHIPS/LIBERTY/LI_CRUISER/li_cruiser.cmp and b/DATA/SHIPS/LIBERTY/LI_CRUISER/li_cruiser.cmp differ diff --git a/DATA/SHIPS/NOMAD/NO_BATTLESHIP/no_battleship.3db b/DATA/SHIPS/NOMAD/NO_BATTLESHIP/no_battleship.3db index 58b088ad..2bc8228d 100644 Binary files a/DATA/SHIPS/NOMAD/NO_BATTLESHIP/no_battleship.3db and b/DATA/SHIPS/NOMAD/NO_BATTLESHIP/no_battleship.3db differ diff --git a/DATA/SHIPS/NOMAD/NO_FIGHTER/no_fighter.3db b/DATA/SHIPS/NOMAD/NO_FIGHTER/no_fighter.3db index 05203339..dd11c178 100644 Binary files a/DATA/SHIPS/NOMAD/NO_FIGHTER/no_fighter.3db and b/DATA/SHIPS/NOMAD/NO_FIGHTER/no_fighter.3db differ diff --git a/DATA/SHIPS/NOMAD/NO_GUNSHIP/no_gunship.3db b/DATA/SHIPS/NOMAD/NO_GUNSHIP/no_gunship.3db index bf66bcb9..0095f9d4 100644 Binary files a/DATA/SHIPS/NOMAD/NO_GUNSHIP/no_gunship.3db and b/DATA/SHIPS/NOMAD/NO_GUNSHIP/no_gunship.3db differ diff --git a/DATA/SHIPS/NOMAD2/NO2_ARTILLERY/no2_artillery.3db b/DATA/SHIPS/NOMAD2/NO2_ARTILLERY/no2_artillery.3db index 492ccb99..64493c1e 100644 Binary files a/DATA/SHIPS/NOMAD2/NO2_ARTILLERY/no2_artillery.3db and b/DATA/SHIPS/NOMAD2/NO2_ARTILLERY/no2_artillery.3db differ diff --git a/DATA/SHIPS/NOMAD2/NO2_ARTILLERY/no2_artillery_alt.3db b/DATA/SHIPS/NOMAD2/NO2_ARTILLERY/no2_artillery_alt.3db index 298dc57b..7e0d1730 100644 Binary files a/DATA/SHIPS/NOMAD2/NO2_ARTILLERY/no2_artillery_alt.3db and b/DATA/SHIPS/NOMAD2/NO2_ARTILLERY/no2_artillery_alt.3db differ diff --git a/DATA/SHIPS/NOMAD2/NO2_BATTLESHIP/no2_battleship.3db b/DATA/SHIPS/NOMAD2/NO2_BATTLESHIP/no2_battleship.3db index 9b83fba5..47e54f1d 100644 Binary files a/DATA/SHIPS/NOMAD2/NO2_BATTLESHIP/no2_battleship.3db and b/DATA/SHIPS/NOMAD2/NO2_BATTLESHIP/no2_battleship.3db differ diff --git a/DATA/SHIPS/NOMAD2/NO2_BOMBER/no2_bomber.3db b/DATA/SHIPS/NOMAD2/NO2_BOMBER/no2_bomber.3db index 6bd23f4c..8d13f32f 100644 Binary files a/DATA/SHIPS/NOMAD2/NO2_BOMBER/no2_bomber.3db and b/DATA/SHIPS/NOMAD2/NO2_BOMBER/no2_bomber.3db differ diff --git a/DATA/SHIPS/NOMAD2/NO2_BOSS/no2_boss.cmp b/DATA/SHIPS/NOMAD2/NO2_BOSS/no2_boss.cmp index cd09f8be..b65e928e 100644 Binary files a/DATA/SHIPS/NOMAD2/NO2_BOSS/no2_boss.cmp and b/DATA/SHIPS/NOMAD2/NO2_BOSS/no2_boss.cmp differ diff --git a/DATA/SHIPS/NOMAD2/NO2_CRUISER/no2_cruiser.3db b/DATA/SHIPS/NOMAD2/NO2_CRUISER/no2_cruiser.3db index 4a7f755c..b45c91da 100644 Binary files a/DATA/SHIPS/NOMAD2/NO2_CRUISER/no2_cruiser.3db and b/DATA/SHIPS/NOMAD2/NO2_CRUISER/no2_cruiser.3db differ diff --git a/DATA/SHIPS/NOMAD2/NO2_ELITE/no2_elite.3db b/DATA/SHIPS/NOMAD2/NO2_ELITE/no2_elite.3db index 6f620fae..f6a929b2 100644 Binary files a/DATA/SHIPS/NOMAD2/NO2_ELITE/no2_elite.3db and b/DATA/SHIPS/NOMAD2/NO2_ELITE/no2_elite.3db differ diff --git a/DATA/SHIPS/NOMAD2/NO2_FIGHTER/no2_fighter.3db b/DATA/SHIPS/NOMAD2/NO2_FIGHTER/no2_fighter.3db index 52b9a091..b88cacf7 100644 Binary files a/DATA/SHIPS/NOMAD2/NO2_FIGHTER/no2_fighter.3db and b/DATA/SHIPS/NOMAD2/NO2_FIGHTER/no2_fighter.3db differ diff --git a/DATA/SHIPS/NOMAD2/NO2_FIGHTER/no2_fighter_alt.3db b/DATA/SHIPS/NOMAD2/NO2_FIGHTER/no2_fighter_alt.3db index 5884cec2..d995acd4 100644 Binary files a/DATA/SHIPS/NOMAD2/NO2_FIGHTER/no2_fighter_alt.3db and b/DATA/SHIPS/NOMAD2/NO2_FIGHTER/no2_fighter_alt.3db differ diff --git a/DATA/SHIPS/NOMAD2/NO2_GUNBOAT/no2_gunboat.3db b/DATA/SHIPS/NOMAD2/NO2_GUNBOAT/no2_gunboat.3db index 000770d5..52066b6c 100644 Binary files a/DATA/SHIPS/NOMAD2/NO2_GUNBOAT/no2_gunboat.3db and b/DATA/SHIPS/NOMAD2/NO2_GUNBOAT/no2_gunboat.3db differ diff --git a/DATA/SHIPS/NOMAD2/NO2_GUNSHIP/no2_gunship.3db b/DATA/SHIPS/NOMAD2/NO2_GUNSHIP/no2_gunship.3db index 7b203f72..38045f37 100644 Binary files a/DATA/SHIPS/NOMAD2/NO2_GUNSHIP/no2_gunship.3db and b/DATA/SHIPS/NOMAD2/NO2_GUNSHIP/no2_gunship.3db differ diff --git a/DATA/SHIPS/ORDER/OR_OSIRIS/or_osiris.cmp b/DATA/SHIPS/ORDER/OR_OSIRIS/or_osiris.cmp index 5148c4ef..8b5918e5 100644 Binary files a/DATA/SHIPS/ORDER/OR_OSIRIS/or_osiris.cmp and b/DATA/SHIPS/ORDER/OR_OSIRIS/or_osiris.cmp differ diff --git a/DATA/SHIPS/RHEINLAND/RH_BATTLESHIP/rh_battleship.cmp b/DATA/SHIPS/RHEINLAND/RH_BATTLESHIP/rh_battleship.cmp index a931cd00..00c20f09 100644 Binary files a/DATA/SHIPS/RHEINLAND/RH_BATTLESHIP/rh_battleship.cmp and b/DATA/SHIPS/RHEINLAND/RH_BATTLESHIP/rh_battleship.cmp differ diff --git a/DATA/SHIPS/RHEINLAND/RH_CRUISER/rh_cruiser.cmp b/DATA/SHIPS/RHEINLAND/RH_CRUISER/rh_cruiser.cmp index 63f17a7c..a2356085 100644 Binary files a/DATA/SHIPS/RHEINLAND/RH_CRUISER/rh_cruiser.cmp and b/DATA/SHIPS/RHEINLAND/RH_CRUISER/rh_cruiser.cmp differ diff --git a/DATA/SHIPS/UTILITY/FREIGHT_TRAIN/freight_trainx2.cmp b/DATA/SHIPS/UTILITY/FREIGHT_TRAIN/freight_trainx2.cmp index 3c8b32c5..ec630103 100644 Binary files a/DATA/SHIPS/UTILITY/FREIGHT_TRAIN/freight_trainx2.cmp and b/DATA/SHIPS/UTILITY/FREIGHT_TRAIN/freight_trainx2.cmp differ diff --git a/DATA/SHIPS/loadouts.ini b/DATA/SHIPS/loadouts.ini index 097f5bda..43048cbf 100644 --- a/DATA/SHIPS/loadouts.ini +++ b/DATA/SHIPS/loadouts.ini @@ -10729,7 +10729,7 @@ cargo = commodity_nomad_power_cell, 1 cargo = commodity_nomad_blaster_schematic, 1 cargo = commodity_nomad_cannon_schematic, 1 -; Jack O'Lantern Loadout +; Jack O´Lantern Loadout [Loadout] nickname = event_jack_o_lantern_load diff --git a/DATA/SHIPS/loadouts_special.ini b/DATA/SHIPS/loadouts_special.ini index cb80adfd..bb988b58 100644 --- a/DATA/SHIPS/loadouts_special.ini +++ b/DATA/SHIPS/loadouts_special.ini @@ -746,7 +746,7 @@ archetype = li_dreadnought equip = infinite_power, HpPower01 equip = ge_s_scanner_02 equip = sfx_rumble_battleship -equip = ge_lbd_engine_01 +equip = ge_lbd_engine_01, HpDrive01 equip = li_battleship_turret01, HpTurret_L1_01 equip = li_battleship_turret02, HpTurret_L2_01 equip = li_battleship_turret03, HpTurret_L3_01