From f9099c3ea42e44a54735e8b49eb6fbf385849d63 Mon Sep 17 00:00:00 2001 From: Pithlit Date: Sun, 3 Mar 2024 23:01:22 +0100 Subject: [PATCH] shiptemplate: add GR-75 --- resources/radar/gr75.png | Bin 0 -> 6055 bytes .../shiptemplates/player_star_wars.lua | 68 ++++++++++++------ shattered_horizon_laucher.py | 13 ++-- 3 files changed, 52 insertions(+), 29 deletions(-) create mode 100755 resources/radar/gr75.png diff --git a/resources/radar/gr75.png b/resources/radar/gr75.png new file mode 100755 index 0000000000000000000000000000000000000000..9766d6aeae358656ff382a3277e82033d118767d GIT binary patch literal 6055 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 AS^xk5 literal 0 HcmV?d00001 diff --git a/scripts-piglit/shiptemplates/player_star_wars.lua b/scripts-piglit/shiptemplates/player_star_wars.lua index b47316e7ea..e249a10691 100644 --- a/scripts-piglit/shiptemplates/player_star_wars.lua +++ b/scripts-piglit/shiptemplates/player_star_wars.lua @@ -6,32 +6,32 @@ function playerFighter(shields) -- a single pilot fighter local template = ShipTemplate() template:setType("playership") - template:setModel("WespeScout"..color_player) - template:setImpulseSoundFile("sfx/engine_fighter.wav") + template:setModel("WespeScout"..color_player) + template:setImpulseSoundFile("sfx/engine_fighter.wav") if shields then - template:setHull(37) -- asteroid makes 35 dmg + template:setHull(37) -- asteroid makes 35 dmg template:setShields(34, 34) else - template:setHull(2*36) -- asteroid makes 35 dmg + template:setHull(2*36) -- asteroid makes 35 dmg end - -- speed, turn, accel, rev-speed, rev-accel - template:setSpeed(100, 28, 40, 25, 20) - --template:setCombatManeuver(600, 200) - template:setEnergyStorage(500) - template:setRepairCrewCount(1) + -- speed, turn, accel, rev-speed, rev-accel + template:setSpeed(100, 28, 40, 25, 20) + --template:setCombatManeuver(600, 200) + template:setEnergyStorage(500) + template:setRepairCrewCount(1) template:setLongRangeRadarRange(10000) - template:setShortRangeRadarRange(5000) - template:setCanScan(false) - template:setCanHack(false) - template:setCanDock(true) - template:setCanCombatManeuver(false) - template:setCanLaunchProbe(false) - template:setCanSelfDestruct(false) - template:setAutoCoolant(true) - template:setAutoMissileReload(true) - template:setAutoRepair(true) - template:setDefaultAI('fighter') - addSystemsWespe(template) + template:setShortRangeRadarRange(5000) + template:setCanScan(false) + template:setCanHack(false) + template:setCanDock(true) + template:setCanCombatManeuver(false) + template:setCanLaunchProbe(false) + template:setCanSelfDestruct(false) + template:setAutoCoolant(true) + template:setAutoMissileReload(true) + template:setAutoRepair(true) + template:setDefaultAI('fighter') + addSystemsWespe(template) return template end @@ -68,7 +68,7 @@ template:setSpeed(100, 20, 40, 25, 20) --[[Player Transport--]] -template = ShipTemplate():setName("YT-2400"):setClass(_("class", "Frigther"), _("subclass", "Light transport")):setType("playership") +template = ShipTemplate():setName("YT-2400"):setClass(_("class", "Freighter"), _("subclass", "Light transport")):setType("playership") template:setModel("LightCorvette"..color_player) template:setRadarTrace("yt2400b.png") template:setDescription([[The YT-2400 light freighter, also known as the YT-2400 transport, was a class of YT-series light freighter. During the Imperial Era, this model of freighter was used by both the Galactic Empire and the Alliance to Restore the Republic. The YT-2400 also saw use under cargo haulers and pirates.]]) @@ -119,8 +119,30 @@ template:setHull(200) -- speed, turn, accel, rev-speed, rev-accel template:setSpeed(80, 10, 20) template:setCombatManeuver(400, 250) -template:setRepairCrewCount(0) --XXX ? +template:setRepairCrewCount(4) template:setDockClasses(_("class", "Starfighter")) +template:setRepairDocked(true) +template:setSharesEnergyWithDocked(false) +template:setRestocksMissilesDocked("all") addSystemsMulitGun(template) +--[[Heavy Freighter]] +template = ShipTemplate():setName("GR-75"):setClass(_("class", "Freighter"), _("subclass", "Medium Transport")):setModel("transport_4_2") +template:setType("playership") +template:setDescription([[The GR-75 medium transport, sometimes referred to as the Gallofree transport, was a transport designed and constructed by Gallofree Yards, Inc.. They were lightly armed with a clamshell-like hull to protect the cargo pods it carried. They could not reach anymore than 650 kilometers per hour.]]) +template:setRadarTrace("gr75.png") +template:setShields(70, 70, 70, 70) +template:setHull(200) +-- speed, turn, accel, rev-speed, rev-accel +template:setSpeed(40, 5, 7) +-- Arc, Dir, Range, CycleTime, Dmg +template:setBeam(0, 10, 0, 1500.0, 6.0, 6) +template:setBeam(1, 10, 180, 1500.0, 6.0, 6) +-- Arc, Dir, Rotate speed +template:setBeamWeaponTurret( 0, 120, 0, 6) +template:setBeamWeaponTurret( 1, 120, 180, 6) +template:setCanCombatManeuver(false) +template:setRepairCrewCount(5) +addSystemsTransport(template) + diff --git a/shattered_horizon_laucher.py b/shattered_horizon_laucher.py index 7554930e7d..c8a400b035 100755 --- a/shattered_horizon_laucher.py +++ b/shattered_horizon_laucher.py @@ -9,12 +9,13 @@ playerships = { - "Artful Dodger": ("YT-2K", "Leanti Meva's YT-2K"), - "Bluewing": ("U-Wing", "Ric Halcard's U-Wing"), - "Lunaris": ("YT-2400", "Caex Vanta's YT-2400"), - "Orga-Schiff": ("Gozanti", "Kell Murtry's Gozanti"), - "None": ("", "does not spawn a ship") - } + "Artful Dodger": ("YT-2K", "Leanti Meva's YT-2K"), + "Bluewing": ("U-Wing", "Ric Halcard's U-Wing"), + "Cropdust Nomad": ("Gozanti", "Kell Murtry's Gozanti"), + "Greedy Wampa": ("GR-75", "~Caro~'s GR-75"), #TODO find out character name + "Lunaris": ("YT-2400", "Caex Vanta's YT-2400"), + "None": ("", "does not spawn a ship") +} factions = [ ("Imperial", ""),