diff --git a/scripts-piglit/model_data.lua b/scripts-piglit/model_data.lua index caa1c3bf03..6fa45dc0b7 100644 --- a/scripts-piglit/model_data.lua +++ b/scripts-piglit/model_data.lua @@ -436,9 +436,9 @@ for sizeName, sizeValues in pairs(sizes) do model:addBeamPosition(1.8, 0, 0.03) model:addBeamPosition(1.8,-0.13, 0.03) model:addBeamPosition(1.8, 0.13, 0.03) + model:addTubePosition(1.8, 0, 0.03) model:addTubePosition(1.8,-0.13, 0.03) model:addTubePosition(1.8, 0.13, 0.03) - model:addTubePosition(1.8, 0, 0.03) model:addEngineEmitter(-1.5, 0.42, -0.13, 0.5, 0.5, 1.0, 0.5) model:addEngineEmitter(-1.5,-0.42, -0.13, 0.5, 0.5, 1.0, 0.5) model:addEngineEmitter(-1.5, 0.42, 0.33, 0.5, 0.5, 1.0, 0.5) @@ -542,11 +542,11 @@ for sizeName, sizeValues in pairs(sizes) do model:setScale(sizeValues[1]) model:setRadius(sizeValues[2]) + --model:addTubePosition(1.4, 0, 0.06) + --model:addTubePosition(1.4, 0, 0.06) + model:addTubePosition(0.3,-0.5, 0.06) + model:addTubePosition(0.3, 0.5, 0.06) model:addTubePosition(1.4, 0, 0.06) - model:addTubePosition(1.4, 0, 0.06) - model:addTubePosition(1.4, 0, 0.06) - --model:addTubePosition(0.3,-0.5, 0.06) - --model:addTubePosition(0.3, 0.5, 0.06) model:addEngineEmitter(-1, 0.54, 0.0, 0.5, 0.5, 1.0, 0.4) model:addEngineEmitter(-1,-0.54, 0.0, 0.5, 0.5, 1.0, 0.4) diff --git a/scripts-piglit/shiptemplates/player.lua b/scripts-piglit/shiptemplates/player.lua index e389fe4584..f6616aa3f3 100644 --- a/scripts-piglit/shiptemplates/player.lua +++ b/scripts-piglit/shiptemplates/player.lua @@ -16,7 +16,7 @@ template:setDescription([[The MP52 Hornet interceptor is a fast but fragile star template:setImpulseSoundFile("sfx/engine_fighter.wav") template:setHull(70) -template:setShields(60) +--template:setShields(60) -- spped, turn, accel, rev-speed, rev-accel template:setSpeed(125, 32, 40, 125, 20) template:setCombatManeuver(600, 0) @@ -40,22 +40,22 @@ template:setAutoRepair(true) addSystemsWespe(template) -var = template:copy("MP58 Mole") -- Drill, slower maneuver, but faster beams --- what is fun: difficult to outmaneuver enemies if they have high turn rate -var:setClass(_("class", "Starfighter"), _("subclass", "Laser Drill")) -var:setDescription([[The Mole mobile drill was long used to mine small asteroids. Outfitted with a state of the art starfighter impulse engine the MP58 Mole is capable of digging holes into enemy ships.]]) -var:setModel("WespeFighterBlue") -var:setBeam(0, 30,-5, 900.0, 3.0, 2.5) -var:setBeam(1, 30, 5, 900.0, 3.0, 2.5) -var:setSpeed(80, 16, 20, 70, 10) - --- what is fun: same as starfighter but wider beam range makes it a bit more easy -var = template:copy("MP56 Bumblebee") -- Wider beam range -var:setDescription([[The MP58 Bumblebee interceptor is the upgraded version of the MP52 Hornet interceptor. Fast but fragile starfighter, conveived for high-speed surgical strikes, distraction maneuvers and escor fighter duty.]]) -var:setClass(_("class", "Starfighter"), _("subclass", "Advanced Interceptor")) -var:setModel("WespeFighterRed") -var:setBeam(0, 45,-5, 700.0, 4.0, 2.5) -var:setBeam(1, 45, 5, 700.0, 4.0, 2.5) +--var = template:copy("MP58 Mole") -- Drill, slower maneuver, but faster beams +---- what is fun: difficult to outmaneuver enemies if they have high turn rate +--var:setClass(_("class", "Starfighter"), _("subclass", "Laser Drill")) +--var:setDescription([[The Mole mobile drill was long used to mine small asteroids. Outfitted with a state of the art starfighter impulse engine the MP58 Mole is capable of digging holes into enemy ships.]]) +--var:setModel("WespeFighterBlue") +--var:setBeam(0, 30,-5, 900.0, 3.0, 2.5) +--var:setBeam(1, 30, 5, 900.0, 3.0, 2.5) +--var:setSpeed(80, 16, 20, 70, 10) +-- +---- what is fun: same as starfighter but wider beam range makes it a bit more easy +--var = template:copy("MP56 Bumblebee") -- Wider beam range +--var:setDescription([[The MP58 Bumblebee interceptor is the upgraded version of the MP52 Hornet interceptor. Fast but fragile starfighter, conveived for high-speed surgical strikes, distraction maneuvers and escor fighter duty.]]) +--var:setClass(_("class", "Starfighter"), _("subclass", "Advanced Interceptor")) +--var:setModel("WespeFighterRed") +--var:setBeam(0, 45,-5, 700.0, 4.0, 2.5) +--var:setBeam(1, 45, 5, 700.0, 4.0, 2.5) --[[Bomber--]] @@ -75,20 +75,20 @@ template:setDescription([[The WX-Lindworm, or "Worm" as it's often called, is a template:setImpulseSoundFile("sfx/engine_fighter.wav") template:setHull(75) -template:setShields(40) +--template:setShields(40) template:setSpeed(70, 15, 25, 40, 15) -template:setTubes(3, 10.0) +template:setTubes(2, 9.0) template:setTubeSize(0, "small") template:setTubeSize(1, "small") -template:setTubeSize(2, "small") -template:setWeaponStorage("HVLI", 12) -template:setWeaponStorage("Homing", 3) -template:setTubeDirection(1,-1):setWeaponTubeExclusiveFor(1, "HVLI") -template:setTubeDirection(2, 1):setWeaponTubeExclusiveFor(2, "HVLI") +--template:setTubeSize(2, "small") +template:setWeaponStorage("HVLI", 8) +--template:setWeaponStorage("Homing", 3) +template:setTubeDirection(0,-1):setWeaponTubeExclusiveFor(0, "HVLI") +template:setTubeDirection(1, 1):setWeaponTubeExclusiveFor(1, "HVLI") -- Arc, Dir, Range, CycleTime, Dmg -template:setBeam(0, 10, 180, 700, 6.0, 2) +--template:setBeam(0, 10, 180, 700, 6.0, 2) -- Arc, Dir, Rotate speed -template:setBeamWeaponTurret( 0, 270, 180, 4) +--template:setBeamWeaponTurret( 0, 270, 180, 4) template:setCombatManeuver(250, 150) template:setEnergyStorage(400) template:setRepairCrewCount(1) @@ -110,54 +110,54 @@ addSystemsLindwurm(template) --what is fun: destroying bigger enemies. Player should always consider weather keeping up the attack or escaping is adequate. Reverse drive should be slower than enemies forward drive. But forward faster. --Challenge: you have to sustain firing, but are too slow to escape using reverse -var = template:copy("Peluda") -- HVLI -var:setClass(_("class", "Starfighter"), _("subclass", "Bomber")) -var:setModel("LindwurmFighterGreen") -var:setDescription([[The Peluda assault Bomber is a basic starfighter of the Human Navy; being ideally suited for attacking slow or stationary targets.]]) -var:setTubes(1,7) -var:setWeaponStorage("Homing", 0) -var:setWeaponStorage("HVLI", 6) -var:setBeam(0,0,0,0,0,0) -var:setBeamWeaponTurret(0,0,0,0) - -var = template:copy("Drac") -- Mine Rear ---what is fun: short range but huge AOE ---more challenging than front mines, since reverse is slow -var:setClass(_("class", "Starfighter"), _("subclass", "Delivery")) -var:setModel("LindwurmFighterYellow") -var:setDescription([[The Dray tactical mine delivery fighter is an advanced starfighter of the Human Navy, designed for surgical strikes.]]) -var:setTubes(1,20) -var:setWeaponStorage("HVLI", 0) -var:setWeaponStorage("Homing", 0) -var:setWeaponStorage("Mine", 1) -var:setTubeDirection(0,180) -var:setBeam(0,0,0,0,0,0) -var:setBeamWeaponTurret(0,0,0,0) - -var = template:copy("Cuelebre") -- Mine Front ---what is fun: frontal mines are awesome. short range but huge AOE -> fun to place -var:setClass(_("class", "Starfighter"), _("subclass", "Delivery")) -var:setModel("LindwurmFighterBlue") -var:setDescription([[The Cuelebre tactical mine delivery fighter is an advanced starfighter of the Human Navy, designed for surgical strikes.]]) -var:setTubes(1,20) -var:setWeaponStorage("HVLI", 0) -var:setWeaponStorage("Homing", 0) -var:setWeaponStorage("Mine", 1) -var:setBeam(0,0,0,0,0,0) -var:setBeamWeaponTurret(0,0,0,0) - -var = template:copy("Bashe") -- Nuke ---what is fun: the firepower of nukes from a fighter. ---not really a challenge, it is just delivery and some dodging -var:setClass(_("class", "Starfighter"), _("subclass", "Delivery")) -var:setModel("LindwurmFighterRed") -var:setDescription([[The Bashe tactical nuke delivery fighter is an advanced starfighter of the Human Navy, designed for surgical strikes.]]) -var:setTubes(1,20) -- take quite long, so combat may evolve -var:setWeaponStorage("HVLI", 0) -var:setWeaponStorage("Homing", 0) -var:setWeaponStorage("Nuke", 1) -var:setBeam(0,0,0,0,0,0) -var:setBeamWeaponTurret(0,0,0,0) +--var = template:copy("Peluda") -- HVLI +--var:setClass(_("class", "Starfighter"), _("subclass", "Bomber")) +--var:setModel("LindwurmFighterGreen") +--var:setDescription([[The Peluda assault Bomber is a basic starfighter of the Human Navy; being ideally suited for attacking slow or stationary targets.]]) +--var:setTubes(1,7) +--var:setWeaponStorage("Homing", 0) +--var:setWeaponStorage("HVLI", 6) +--var:setBeam(0,0,0,0,0,0) +--var:setBeamWeaponTurret(0,0,0,0) +-- +--var = template:copy("Drac") -- Mine Rear +----what is fun: short range but huge AOE +----more challenging than front mines, since reverse is slow +--var:setClass(_("class", "Starfighter"), _("subclass", "Delivery")) +--var:setModel("LindwurmFighterYellow") +--var:setDescription([[The Dray tactical mine delivery fighter is an advanced starfighter of the Human Navy, designed for surgical strikes.]]) +--var:setTubes(1,20) +--var:setWeaponStorage("HVLI", 0) +--var:setWeaponStorage("Homing", 0) +--var:setWeaponStorage("Mine", 1) +--var:setTubeDirection(0,180) +--var:setBeam(0,0,0,0,0,0) +--var:setBeamWeaponTurret(0,0,0,0) +-- +--var = template:copy("Cuelebre") -- Mine Front +----what is fun: frontal mines are awesome. short range but huge AOE -> fun to place +--var:setClass(_("class", "Starfighter"), _("subclass", "Delivery")) +--var:setModel("LindwurmFighterBlue") +--var:setDescription([[The Cuelebre tactical mine delivery fighter is an advanced starfighter of the Human Navy, designed for surgical strikes.]]) +--var:setTubes(1,20) +--var:setWeaponStorage("HVLI", 0) +--var:setWeaponStorage("Homing", 0) +--var:setWeaponStorage("Mine", 1) +--var:setBeam(0,0,0,0,0,0) +--var:setBeamWeaponTurret(0,0,0,0) +-- +--var = template:copy("Bashe") -- Nuke +----what is fun: the firepower of nukes from a fighter. +----not really a challenge, it is just delivery and some dodging +--var:setClass(_("class", "Starfighter"), _("subclass", "Delivery")) +--var:setModel("LindwurmFighterRed") +--var:setDescription([[The Bashe tactical nuke delivery fighter is an advanced starfighter of the Human Navy, designed for surgical strikes.]]) +--var:setTubes(1,20) -- take quite long, so combat may evolve +--var:setWeaponStorage("HVLI", 0) +--var:setWeaponStorage("Homing", 0) +--var:setWeaponStorage("Nuke", 1) +--var:setBeam(0,0,0,0,0,0) +--var:setBeamWeaponTurret(0,0,0,0) --[[Still Bombers, but with Scout hull--]] template = ShipTemplate():setName("Ryu"):setClass(_("class", "Starfighter"), _("subclass", "Rocket Fighter")):setType("playership") @@ -165,13 +165,14 @@ template = ShipTemplate():setName("Ryu"):setClass(_("class", "Starfighter"), _(" template:setModel("AdlerLongRangeFighterRed") template:setRadarTrace("fighter.png") template:setImpulseSoundFile("sfx/engine_fighter.wav") -template:setDescription([[The Ryu Rocket Fighter is a basic starfighter of the Human Navy; Designed for escort and anti-fighter missions.]]) -template:setTubes(2,7) +template:setDescription([[TODO The Ryu Rocket Fighter is a basic starfighter of the Human Navy; Designed for escort and anti-fighter missions.]]) +template:setBeam(0, 30, 0, 900.0, 4.0, 2.5) +template:setTubes(1,7) template:setTubeSize(0, "small") -template:setTubeSize(1, "small") -template:setWeaponStorage("Homing", 4) +--template:setTubeSize(1, "small") +template:setWeaponStorage("HVLI", 4) template:setHull(75) -template:setShields(40) +--template:setShields(40) template:setSpeed(70, 15, 25, 40, 15) template:setCombatManeuver(250, 150) @@ -194,19 +195,18 @@ template:setAutoRepair(true) addSystemsAdler(template) --- switch to model with two primary tubes -- switch to model with two primary tubes --what is fun: --Can not destroy enemies, since it has only emps -var = template:copy("Zomok") -- EMP -var:setModel("AdlerLongRangeFighterBlue") -var:setClass(_("class", "Starfighter"), _("subclass", "Delivery")) -var:setDescription([[The Zomok tactical EMP delivery fighter is an advanced starfighter of the Human Navy, designed for surgical strikes.]]) -var:setTubes(2,10) -- may hide two rockets in tubes while docking. So we can change loadout! -var:setWeaponStorage("HVLI", 1) -var:setWeaponStorage("Homing", 0) -var:setWeaponStorage("EMP", 1) -var:setAutoMissileReload(false) +--var = template:copy("Zomok") -- EMP +--var:setModel("AdlerLongRangeFighterBlue") +--var:setClass(_("class", "Starfighter"), _("subclass", "Delivery")) +--var:setDescription([[The Zomok tactical EMP delivery fighter is an advanced starfighter of the Human Navy, designed for surgical strikes.]]) +--var:setTubes(2,10) -- may hide two rockets in tubes while docking. So we can change loadout! +--var:setWeaponStorage("HVLI", 1) +--var:setWeaponStorage("Homing", 0) +--var:setWeaponStorage("EMP", 1) +--var:setAutoMissileReload(false) --[[Scout--]]