diff --git a/Changelog.txt b/Changelog.txt index 9b413a0..76d09d4 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,8 @@ +0.9 +- Updated to 0.96a +- Updated to MagicLib 1.0.0 +- Refactored package structure + 0.8.7 - Frock - System changed to magmine strike diff --git a/data/campaign/industries.csv b/data/campaign/industries.csv index ddf569e..72d02d2 100644 --- a/data/campaign/industries.csv +++ b/data/campaign/industries.csv @@ -1,2 +1,2 @@ id,name,cost mult,build time,income,upkeep,downgrade,upgrade,tags,data,image,plugin,desc,order -tahlan_scalartechhq,STDF Headquarters,90,60,,6,,,"military, unraidable, tactical_bombardment, structure",,graphics/tahlan/icons/industry/tahlan_scalartechhq.png,data.scripts.campaign.econ.industries.tahlan_ScalarTechHQ,"Headquarters of the ScalarTech Defense Forces, the now highly experienced defenders of the Spindle system. Equipped with the best equipment ScalarTech Solutions can provide, they have ensured the safety of Spindle for decades.",2650 \ No newline at end of file +tahlan_scalartechhq,STDF Headquarters,90,60,,6,,,"military, unraidable, tactical_bombardment, structure",,graphics/tahlan/icons/industry/tahlan_scalartechhq.png,org.niatahl.scalartech.campaign.econ.industries.ScalarTechHQ,"Headquarters of the ScalarTech Defense Forces, the now highly experienced defenders of the Spindle system. Equipped with the best equipment ScalarTech Solutions can provide, they have ensured the safety of Spindle for decades.",2650 \ No newline at end of file diff --git a/data/campaign/market_conditions.csv b/data/campaign/market_conditions.csv index 5259880..99fb207 100644 --- a/data/campaign/market_conditions.csv +++ b/data/campaign/market_conditions.csv @@ -1,2 +1,2 @@ name,id,planetary,decivRemove,script,desc,icon,order -The Gateway Scar,tahlan_gatescar,TRUE,,data.scripts.campaign.econ.tahlan_GateScar,"The failed gateway experiment has left the planet scarred, most notably wrapping it in a dense magnetic field that makes orbital navigation difficult. While problematic for general traffic and trade, it also makes any planetary assault attempts considerably harder.",graphics/tahlan/icons/markets/tahlan_gatescar.png,9203 +The Gateway Scar,tahlan_gatescar,TRUE,,org.niatahl.scalartech.campaign.econ.GateScar,"The failed gateway experiment has left the planet scarred, most notably wrapping it in a dense magnetic field that makes orbital navigation difficult. While problematic for general traffic and trade, it also makes any planetary assault attempts considerably harder.",graphics/tahlan/icons/markets/tahlan_gatescar.png,9203 diff --git a/data/campaign/submarkets.csv b/data/campaign/submarkets.csv index f9db3a0..a0086fb 100644 --- a/data/campaign/submarkets.csv +++ b/data/campaign/submarkets.csv @@ -1,3 +1,3 @@ id,name,faction,desc,script,icon,order tahlan_stdfmarket,"STDF -Requisitions",scalartech_requisitions,"To facilitate strong alliances, the STDF offers access to some of its stock to its closest allies.",data.scripts.campaign.submarkets.tahlan_STDFMarketPlugin,,800.05 +Requisitions",scalartech_requisitions,"To facilitate strong alliances, the STDF offers access to some of its stock to its closest allies.",org.niatahl.scalartech.campaign.submarkets.STDFMarketPlugin,,800.05 diff --git a/data/config/engine_styles.json b/data/config/engine_styles.json index 969a4cb..2113812 100644 --- a/data/config/engine_styles.json +++ b/data/config/engine_styles.json @@ -8,7 +8,9 @@ "contrailAngularVelocityMult":0f, "contrailColor":[255,100,100,0], "glowAlternateColor":[255,0,0,225], - "type":"GLOW" # GLOW or SMOKE + "type":"GLOW", + "glowSprite":"graphics/tahlan/fx/tahlan_scalar_engine_scroll.png", + "glowOutline":"graphics/tahlan/fx/tahlan_scalar_engine_out.png", }, "TAHLAN_RED_FIGHTER_ENGINE":{ "mode":"QUAD_STRIP", @@ -52,8 +54,21 @@ "contrailCampaignColor":[100,165,255,75], "glowSprite":"graphics/tahlan/fx/tahlan_gh_engineglow.png", "glowOutline":"graphics/tahlan/fx/tahlan_gh_engineflame.png", - "omegaMode":true, + #"omegaMode":true, "type":"GLOW" # GLOW or SMOKE }, + "TAHLAN_SCALAR_ENGINE":{ + "engineColor":[100,165,255,255], + "contrailParticleSizeMult":4, + "contrailParticleDuration":1, + "contrailParticleFinalSizeMult":2.5, + "contrailMaxSpeedMult":0.5f, + "contrailAngularVelocityMult":0f, + "contrailColor":[100,165,255,25], + "contrailCampaignColor":[100,165,255,75], + "type":"GLOW", # GLOW or SMOKE + "glowSprite":"graphics/tahlan/fx/tahlan_scalar_engine_scroll.png", + "glowOutline":"graphics/tahlan/fx/tahlan_scalar_engine_out.png", + }, } diff --git a/data/config/indEvo/reverse_engineering_whitelist.csv b/data/config/indEvo/reverse_engineering_whitelist.csv index eaf0f8e..aaed6ad 100644 --- a/data/config/indEvo/reverse_engineering_whitelist.csv +++ b/data/config/indEvo/reverse_engineering_whitelist.csv @@ -1,73 +1,73 @@ -id -# NOTES -# Ship IDs entered here will be allowed by the Engineering hub (Reverse Engineering ship hulls) -# Ships that would break the game (Balance/Technical/Lore) if the player could produce them via blueprint should not be on this list. +id, +# NOTES, +# Ship IDs entered here will be allowed by the Engineering hub (Reverse Engineering ship hulls), +# Ships that would break the game (Balance/Technical/Lore) if the player could produce them via blueprint should not be on this list., "# Remember that we are all in this to have fun. Reverse Engineering is neither easy nor cheap, and forbidding too much takes away from player experience." -tahlan_filament -tahlan_strand -tahlan_tress -tahlan_brim -tahlan_hem -tahlan_margin -tahlan_curl -tahlan_frill -tahlan_verge -tahlan_skye -tahlan_skirt -tahlan_midi -tahlan_camise -tahlan_culotte -tahlan_corset -tahlan_sateen - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +tahlan_filament, +tahlan_strand, +tahlan_tress, +tahlan_brim, +tahlan_hem, +tahlan_margin, +tahlan_curl, +tahlan_frill, +tahlan_verge, +tahlan_skye, +tahlan_skirt, +tahlan_midi, +tahlan_camise, +tahlan_culotte, +tahlan_corset, +tahlan_sateen, +tahlan_frock, +tahlan_angora, +tahlan_belt, +tahlan_percale, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, +, diff --git a/data/config/vayraBounties/unique_bounty_data.csv b/data/config/vayraBounties/unique_bounty_data.csv index 627d95b..9d94bca 100644 --- a/data/config/vayraBounties/unique_bounty_data.csv +++ b/data/config/vayraBounties/unique_bounty_data.csv @@ -1,6 +1,6 @@ bounty_id,level,rank,firstName,lastName,captainPersonality,fleetName,flagshipName,gender,faction,portrait,greetingText,suppressIntel,postedByFaction,creditReward,repReward,intelText,flagshipVariantId,fleetVariantIds,minimumFleetFP,playerFPScalingFactor,chanceToAutoRecover,specialItemRewards,neverSpawnUnlessBountiesCompleted,neverSpawnWhenFactionHostile,neverSpawnWhenFactionNonHostile,neverSpawnBeforeCycle,neverSpawnBeforeLevel,neverSpawnBeforeFleetPoints -tahlan_bounty_hanakaze,30,spaceAdmiral,M.K.,Skye,aggressive,STDF BlackOps Fleet,Hana,MALE,scalartech,graphics/portraits/portrait_corporate03.png,Another dirty merc who is after that pirate bloodmoney? Give it your shot then.,FALSE,pirates,500000,10,"A collective of various pirate groups has put out a bounty on an STDF Admiral by the name of Skye. That man is commanding a unique Skye-class cruiser, I kid you not. From what we know, the name is pure coincidence, but who cares anyhow. There's a lot of money on his head, if you want to get your hands dirty.",tahlan_skye_hana_lancer,"tahlan_gown_standard, tahlan_filament_bridgehead, tahlan_filament_bridgehead",300,1.2,1,,,FALSE,FALSE,206,30,200 -tahlan_bounty_kimono,30,spaceAdmiral,Auri,Calus,aggressive,STDF Assault Fleet,Kimono,FEMALE,scalartech,graphics/tahlan/portraits/aurica.png,"Yes, you will do for a test subject. Please try to resist.",FALSE,pirates,800000,10,"There's a new bounty here on a Spindle Protectorate admiral. Seems to be undergoing ""tests"" of a new ship currently, by which they seem to mean carving through a good few pirate fleets over the past couple days. Some people are out for revenge and that means money for us.",tahlan_sateen_kim_hailstorm,"tahlan_corset_standard, tahlan_corset_standard, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike",400,1.3,1,,,FALSE,FALSE,207,30,200 +tahlan_bounty_hanakaze,7,spaceAdmiral,M.K.,Skye,aggressive,STDF BlackOps Fleet,Hana,MALE,scalartech,graphics/portraits/portrait_corporate03.png,Another dirty merc who is after that pirate bloodmoney? Give it your shot then.,FALSE,pirates,500000,10,"A collective of various pirate groups has put out a bounty on an STDF Admiral by the name of Skye. That man is commanding a unique Skye-class cruiser, I kid you not. From what we know, the name is pure coincidence, but who cares anyhow. There's a lot of money on his head, if you want to get your hands dirty.",tahlan_skye_hana_lancer,"tahlan_gown_standard, tahlan_filament_bridgehead, tahlan_filament_bridgehead",300,1.2,1,,,FALSE,FALSE,206,30,200 +tahlan_bounty_kimono,7,spaceAdmiral,Auri,Calus,aggressive,STDF Assault Fleet,Kimono,FEMALE,scalartech,graphics/tahlan/portraits/aurica.png,"Yes, you will do for a test subject. Please try to resist.",FALSE,pirates,800000,10,"There's a new bounty here on a Spindle Protectorate admiral. Seems to be undergoing ""tests"" of a new ship currently, by which they seem to mean carving through a good few pirate fleets over the past couple days. Some people are out for revenge and that means money for us.",tahlan_sateen_kim_hailstorm,"tahlan_corset_standard, tahlan_corset_standard, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike, tahlan_tress_strike",400,1.3,1,,,FALSE,FALSE,207,30,200 ,,,,,,,,,,,,,,,,,,,,,,,,,,,, # NOTES,,,,,,,,,,,,,,,,,,,,,,,,,,,, # bounty_id : line ID. Must be unique across all mods. I recommend a prefix,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/data/hullmods/hull_mods.csv b/data/hullmods/hull_mods.csv index a5937e5..df0c76f 100644 --- a/data/hullmods/hull_mods.csv +++ b/data/hullmods/hull_mods.csv @@ -1,6 +1,6 @@ name,id,tier,rarity,tech/manufacturer,tags,uiTags,base value,unlocked,hidden,hiddenEverywhere,cost_frigate,cost_dest,cost_cruiser,cost_capital,script,desc,short,sprite -Bridgehead Design,tahlan_filamentspecs,,,,,,,,TRUE,,0,0,0,0,data.scripts.hullmods.tahlan_FilamentSpecs,"Instead of actual fighter bays, this ship instead projects a stable wormhole connected to an automated planetary aerospace facility which handles actual fighter operations. Due to the planetary facility's capacities, fighter replacement times and their decay from sustained losses are reduced by %s.",Improved fighter operations,graphics/tahlan/hullmods/tahlan_filamentspecs.png -ScalarTech Drives,tahlan_scalarspecs,,,,,,,,TRUE,,0,0,0,0,data.scripts.hullmods.tahlan_ScalarSpecs,"ScalarTech's sophisticated drive technology is renowned for its enhanced performance at low flux, increasing the 0-flux speed boost by %s. +Bridgehead Design,tahlan_filamentspecs,,,,,,,,TRUE,,0,0,0,0,org.niatahl.scalartech.hullmods.FilamentSpecs,"Instead of actual fighter bays, this ship instead projects a stable wormhole connected to an automated planetary aerospace facility which handles actual fighter operations. Due to the planetary facility's capacities, fighter replacement times and their decay from sustained losses are reduced by %s.",Improved fighter operations,graphics/tahlan/hullmods/tahlan_filamentspecs.png +ScalarTech Drives,tahlan_scalarspecs,,,,,,,,TRUE,,0,0,0,0,org.niatahl.scalartech.hullmods.ScalarSpecs,"ScalarTech's sophisticated drive technology is renowned for its enhanced performance at low flux, increasing the 0-flux speed boost by %s. To ensure the ship's survival, these advanced drives are equipped with an emergency delimiter, allowing %s increase in top speed after peak performance time has passed, allowing a swift retreat from combat. @@ -8,19 +8,19 @@ Due to interfering with the necessary subsystems, %s will %s these effects and % Enhanced engine shielding also reduces engine damage taken by %s.",Enhanced Drives,graphics/tahlan/hullmods/tahlan_scalarspecs.png ,,,,,,,,,,,,,,,,,, -Semi-modular Design,tahlan_gownmodule,,,,,,,,TRUE,,0,0,0,0,data.scripts.hullmods.tahlan_GownModule,"While the Gown's structure is modular in design, the individual flux grids and systems are closely linked, leading to the following effects:",,graphics/hullmods/vast_bulk.png -Centralized Targeting Core,tahlan_centraltargeting,,,,,,,,TRUE,,0,0,0,0,data.scripts.hullmods.tahlan_CentralTargetingCore,"A centralized targeting core extends the range of standard ballistic and energy weapons by %s and point defense weapons by %s. +Semi-modular Design,tahlan_gownmodule,,,,,,,,TRUE,,0,0,0,0,org.niatahl.scalartech.hullmods.GownModule,"While the Gown's structure is modular in design, the individual flux grids and systems are closely linked, leading to the following effects:",,graphics/hullmods/vast_bulk.png +Centralized Targeting Core,tahlan_centraltargeting,,,,,,,,TRUE,,0,0,0,0,org.niatahl.scalartech.hullmods.CentralTargetingCore,"A centralized targeting core extends the range of standard ballistic and energy weapons by %s and point defense weapons by %s. Precludes the installation of a Dedicated Targeting Core or an Integrated Targeting Unit.",Greatly extends non-missile weapon range.,graphics/hullmods/advanced_targeting_core.png -Dual Capacitor Banks,tahlan_cycleboost,,,,,,,,TRUE,,0,0,0,0,data.scripts.hullmods.tahlan_CycleBoost,Doubled energy weapon capacitor banks allow all mounted energy weapons to fire and recharge %s faster. Does not affect sustained beam weapons.,Energy RoF boost.,graphics/tahlan/hullmods/tahlan_cycleboost.png -Upscaled Capacitor Banks,tahlan_heavycycleboost,,,,,,,,TRUE,,0,0,0,0,data.scripts.hullmods.tahlan_HeavyCycleBoost,"This ship's weapon mounts are linked to experimental upsized capacitor banks, allowing both energy and ballistic weapons to operate at faster cycle rates. Increases rate of fire and charge regeneration by %s and increases beam damage and flux cost by %s.",Weapon RoF boost.,graphics/tahlan/hullmods/tahlan_cycleboost.png -Integrated Autoforge,tahlan_scalarautoforge,,,,,,,,TRUE,,0,0,0,0,data.scripts.hullmods.tahlan_ScalarAutoforge,"This ship contains a large autoforge passively producing missile ammunition during combat. Restores %s of base ammo capacity %s. +Dual Capacitor Banks,tahlan_cycleboost,,,,,,,,TRUE,,0,0,0,0,org.niatahl.scalartech.hullmods.CycleBoost,Doubled energy weapon capacitor banks allow all mounted energy weapons to fire and recharge %s faster. Does not affect sustained beam weapons.,Energy RoF boost.,graphics/tahlan/hullmods/tahlan_cycleboost.png +Upscaled Capacitor Banks,tahlan_heavycycleboost,,,,,,,,TRUE,,0,0,0,0,org.niatahl.scalartech.hullmods.HeavyCycleBoost,"This ship's weapon mounts are linked to experimental upsized capacitor banks, allowing both energy and ballistic weapons to operate at faster cycle rates. Increases rate of fire and charge regeneration by %s and increases beam damage and flux cost by %s.",Weapon RoF boost.,graphics/tahlan/hullmods/tahlan_cycleboost.png +Integrated Autoforge,tahlan_scalarautoforge,,,,,,,,TRUE,,0,0,0,0,org.niatahl.scalartech.hullmods.ScalarAutoforge,"This ship contains a large autoforge passively producing missile ammunition during combat. Restores %s of base ammo capacity %s. Effect increased by %s if commanding officer has the %s skill. Unaffected by hullmods that increase maximum missile ammo. Precludes the installation of %s.",Regenerates Missiles,graphics/hullmods/missile_autofactory.png -Targeting Coprocessor,tahlan_bansheemounts,,,,,,,,TRUE,TRUE,0,0,0,0,data.scripts.hullmods.tahlan_BansheeMounts,Increases range of non-PD weapons by %s.,Slightly increases weapon range.,graphics/hullmods/targeting_core.png +Targeting Coprocessor,tahlan_bansheemounts,,,,,,,,TRUE,TRUE,0,0,0,0,org.niatahl.scalartech.hullmods.BansheeMounts,Increases range of non-PD weapons by %s.,Slightly increases weapon range.,graphics/hullmods/targeting_core.png ,,,,,,,,,,,,,,,,,, -ScalarTech Logistics,tahlan_chmscalartech,,,,,,,,TRUE,,0,0,0,0,data.scripts.hullmods.tahlan_CHMScalartech,"ScalarTech Crews have not forgotten their corporation's roots in the logistics sector and know how to run a fleet efficiently. Capable of optimizing storage capacity, they can increase the fuel and cargo capacity of ships by %s and streamlined ship operations reduce monthly maintenance and fuel use by %s. +ScalarTech Logistics,tahlan_chmscalartech,,,,,,,,TRUE,,0,0,0,0,org.niatahl.scalartech.hullmods.CHMScalartech,"ScalarTech Crews have not forgotten their corporation's roots in the logistics sector and know how to run a fleet efficiently. Capable of optimizing storage capacity, they can increase the fuel and cargo capacity of ships by %s and streamlined ship operations reduce monthly maintenance and fuel use by %s. Additionally, the corporation's vast experience with drive systems allows their engineers to tickle a bit of extra performance out of ship engines while under low system stress, increasing top speed by %s of base speed while the ship's flux level remains below %s.",Efficiency,graphics/tahlan/hullmods/tahlan_chmscalar.png diff --git a/data/hulls/tahlan_angora.ship b/data/hulls/tahlan_angora.ship index e74e769..df13705 100644 --- a/data/hulls/tahlan_angora.ship +++ b/data/hulls/tahlan_angora.ship @@ -145,7 +145,7 @@ "width": 16.720409, "angle": 157, "contrailSize": 16.720409, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [20, -69.5], @@ -153,7 +153,7 @@ "width": 16.720409, "angle": -157, "contrailSize": 16.720409, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-78.5, -0], @@ -161,7 +161,7 @@ "width": 23, "angle": 180, "contrailSize": 23, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [21, 69], diff --git a/data/hulls/tahlan_belt.ship b/data/hulls/tahlan_belt.ship index 2abdffb..7528d25 100644 --- a/data/hulls/tahlan_belt.ship +++ b/data/hulls/tahlan_belt.ship @@ -77,7 +77,7 @@ "width": 26, "angle": 180, "contrailSize": 26, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-60.5, 33.5], @@ -85,7 +85,7 @@ "width": 7, "angle": 180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-60.5, -33.5], @@ -93,7 +93,7 @@ "width": 7, "angle": -180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-60.5, 40], @@ -101,7 +101,7 @@ "width": 10, "angle": 180, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-60.5, -40], @@ -109,7 +109,7 @@ "width": 10, "angle": -180, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-36, 12.5], @@ -117,7 +117,7 @@ "width": 7, "angle": 180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-36, -12.5], @@ -125,7 +125,7 @@ "width": 7, "angle": -180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-32.5, -0], @@ -141,7 +141,7 @@ "width": 14.473699, "angle": 94.5, "contrailSize": 128, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [54, -62], @@ -149,7 +149,7 @@ "width": 14.473699, "angle": -94.5, "contrailSize": 128, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [6, 63.5], @@ -157,7 +157,7 @@ "width": 14.473699, "angle": 114.5, "contrailSize": 128, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [6, -63.5], @@ -165,7 +165,7 @@ "width": 14.473699, "angle": -114.5, "contrailSize": 128, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" } ], "bounds": [ diff --git a/data/hulls/tahlan_brim.ship b/data/hulls/tahlan_brim.ship index df30f12..0967917 100644 --- a/data/hulls/tahlan_brim.ship +++ b/data/hulls/tahlan_brim.ship @@ -86,7 +86,7 @@ "width": 14, "angle": 180, "contrailSize": 14, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-82.5, -21.5], @@ -94,7 +94,7 @@ "width": 14, "angle": -180, "contrailSize": 14, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-82.5, 28], @@ -102,7 +102,7 @@ "width": 10, "angle": 180, "contrailSize": 10, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-82.5, -28], @@ -110,7 +110,7 @@ "width": 10, "angle": -180, "contrailSize": 10, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-70.5, 47], @@ -118,7 +118,7 @@ "width": 14, "angle": 180, "contrailSize": 14, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-70.5, -47], @@ -126,7 +126,7 @@ "width": 14, "angle": -180, "contrailSize": 14, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-23.5, -0], @@ -134,7 +134,7 @@ "width": 16, "angle": 180, "contrailSize": 16, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-24.5, -0], diff --git a/data/hulls/tahlan_camise.ship b/data/hulls/tahlan_camise.ship index 9dc6432..291203a 100644 --- a/data/hulls/tahlan_camise.ship +++ b/data/hulls/tahlan_camise.ship @@ -96,7 +96,7 @@ "width": 35, "angle": 180, "contrailSize": 35, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-203.5, 15], @@ -104,7 +104,7 @@ "width": 9, "angle": 180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-203.5, -15], @@ -112,7 +112,7 @@ "width": 9, "angle": -180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-218.5, 35], @@ -120,7 +120,7 @@ "width": 8, "angle": 180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-218.5, -35], @@ -128,7 +128,7 @@ "width": 8, "angle": -180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-218.5, 42], @@ -136,7 +136,7 @@ "width": 8, "angle": 180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-218.5, -42], @@ -144,7 +144,7 @@ "width": 8, "angle": -180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-199, -0], diff --git a/data/hulls/tahlan_camisette.ship b/data/hulls/tahlan_camisette.ship index 2c4dfe4..f3b925c 100644 --- a/data/hulls/tahlan_camisette.ship +++ b/data/hulls/tahlan_camisette.ship @@ -78,7 +78,7 @@ "width": 35, "angle": 180, "contrailSize": 35, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-122, 15], @@ -86,7 +86,7 @@ "width": 9, "angle": 180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-122, -15], @@ -94,7 +94,7 @@ "width": 9, "angle": -180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-137, 35], @@ -102,7 +102,7 @@ "width": 8, "angle": 180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-137, -35], @@ -110,7 +110,7 @@ "width": 8, "angle": -180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-137, 42], @@ -118,7 +118,7 @@ "width": 8, "angle": 180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-137, -42], @@ -126,7 +126,7 @@ "width": 8, "angle": -180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-117.5, -0], diff --git a/data/hulls/tahlan_corset.ship b/data/hulls/tahlan_corset.ship index 731676f..b945730 100644 --- a/data/hulls/tahlan_corset.ship +++ b/data/hulls/tahlan_corset.ship @@ -162,7 +162,7 @@ "width": 11, "angle": 180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [1.5, -89.5], @@ -170,7 +170,7 @@ "width": 11, "angle": -180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [1.5, 96], @@ -178,7 +178,7 @@ "width": 9, "angle": 180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [1.5, -96], @@ -186,7 +186,7 @@ "width": 9, "angle": -180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-7, 71.5], @@ -194,7 +194,7 @@ "width": 11, "angle": 180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-7, -71.5], @@ -202,7 +202,7 @@ "width": 11, "angle": -180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-6.5, 77.5], @@ -210,7 +210,7 @@ "width": 9, "angle": 180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-6.5, -77.5], @@ -218,7 +218,7 @@ "width": 9, "angle": -180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [13, 115], @@ -226,7 +226,7 @@ "width": 11, "angle": 180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [13, -115], @@ -234,7 +234,7 @@ "width": 11, "angle": -180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-104.5, 11.5], @@ -242,7 +242,7 @@ "width": 11, "angle": 180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-104.5, -11.5], @@ -250,7 +250,7 @@ "width": 11, "angle": -180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-103, -0], @@ -258,7 +258,7 @@ "width": 30, "angle": 180, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-102, -0], diff --git a/data/hulls/tahlan_culotte.ship b/data/hulls/tahlan_culotte.ship index 00fe23f..e4e4b38 100644 --- a/data/hulls/tahlan_culotte.ship +++ b/data/hulls/tahlan_culotte.ship @@ -78,7 +78,7 @@ "width": 35, "angle": 180, "contrailSize": 35, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-129.5, 15], @@ -86,7 +86,7 @@ "width": 9, "angle": 180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-129.5, -15], @@ -94,7 +94,7 @@ "width": 9, "angle": -180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-144.5, 35], @@ -102,7 +102,7 @@ "width": 8, "angle": 180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-144.5, -35], @@ -110,7 +110,7 @@ "width": 8, "angle": -180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-144.5, 42], @@ -118,7 +118,7 @@ "width": 8, "angle": 180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-144.5, -42], @@ -126,7 +126,7 @@ "width": 8, "angle": -180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-125, 0], diff --git a/data/hulls/tahlan_curl.ship b/data/hulls/tahlan_curl.ship index 3b2ccf4..83c3d07 100644 --- a/data/hulls/tahlan_curl.ship +++ b/data/hulls/tahlan_curl.ship @@ -68,7 +68,7 @@ "width": 7, "angle": 180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-9.5, -36], @@ -76,7 +76,7 @@ "width": 7, "angle": -180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-10.5, 28.5], @@ -84,7 +84,7 @@ "width": 7, "angle": 180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-10.5, -28.5], @@ -92,7 +92,7 @@ "width": 7, "angle": -180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-43, -0], @@ -100,7 +100,7 @@ "width": 17, "angle": 180, "contrailSize": 17, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-42, -0], diff --git a/data/hulls/tahlan_filament.ship b/data/hulls/tahlan_filament.ship index c00320d..abf401c 100644 --- a/data/hulls/tahlan_filament.ship +++ b/data/hulls/tahlan_filament.ship @@ -284,7 +284,7 @@ "width": 19, "angle": 180, "contrailSize": 19, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-161, 60.5], @@ -292,7 +292,7 @@ "width": 15, "angle": -180, "contrailSize": 15, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-151.5, 31.5], @@ -300,7 +300,7 @@ "width": 19, "angle": -180, "contrailSize": 19, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-151.5, -31.5], @@ -308,7 +308,7 @@ "width": 19, "angle": 180, "contrailSize": 19, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-147.5, -0], @@ -316,7 +316,7 @@ "width": 50, "angle": -180, "contrailSize": 50, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-161, 54], @@ -324,7 +324,7 @@ "width": 11, "angle": -180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-161, -54], @@ -332,7 +332,7 @@ "width": 11, "angle": 180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-146, -0], @@ -348,7 +348,7 @@ "width": 9.667911, "angle": 157, "contrailSize": 9.667911, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-120, -123.5], @@ -356,7 +356,7 @@ "width": 9.667911, "angle": -157, "contrailSize": 9.667911, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-119, 123], diff --git a/data/hulls/tahlan_frill.ship b/data/hulls/tahlan_frill.ship index 0aa8cf0..6680839 100644 --- a/data/hulls/tahlan_frill.ship +++ b/data/hulls/tahlan_frill.ship @@ -77,7 +77,7 @@ "width": 12, "angle": 180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-51.5, -21.5], @@ -85,7 +85,7 @@ "width": 12, "angle": -180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-51.5, 15], @@ -93,7 +93,7 @@ "width": 9, "angle": 180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-51.5, -15], @@ -101,7 +101,7 @@ "width": 9, "angle": -180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-26.5, 41.5], @@ -109,7 +109,7 @@ "width": 17, "angle": 180, "contrailSize": 17, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-26.5, -41.5], @@ -117,7 +117,7 @@ "width": 17, "angle": -180, "contrailSize": 17, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-41, -0], @@ -133,7 +133,7 @@ "width": 16, "angle": -180, "contrailSize": 16, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" } ], "bounds": [ diff --git a/data/hulls/tahlan_frock.ship b/data/hulls/tahlan_frock.ship index 363a5b4..a9ab5c0 100644 --- a/data/hulls/tahlan_frock.ship +++ b/data/hulls/tahlan_frock.ship @@ -137,7 +137,7 @@ "width": 10, "angle": 180, "contrailSize": 10, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-55, -68], @@ -145,7 +145,7 @@ "width": 10, "angle": -180, "contrailSize": 10, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-53, 74.5], @@ -153,7 +153,7 @@ "width": 9, "angle": 180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-53, -74.5], @@ -161,7 +161,7 @@ "width": 9, "angle": -180, "contrailSize": 9, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-97, 39.5], @@ -169,7 +169,7 @@ "width": 10, "angle": 180, "contrailSize": 10, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-97, -39.5], @@ -177,7 +177,7 @@ "width": 10, "angle": -180, "contrailSize": 10, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-97, 32.5], @@ -185,7 +185,7 @@ "width": 8, "angle": 180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-97, -32.5], @@ -193,7 +193,7 @@ "width": 8, "angle": -180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-88.5, 11.5], @@ -201,7 +201,7 @@ "width": 11, "angle": 180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-88.5, -11.5], @@ -209,7 +209,7 @@ "width": 11, "angle": -180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-87, 6.5], @@ -217,7 +217,7 @@ "width": 7, "angle": 180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-87, -6.5], @@ -225,7 +225,7 @@ "width": 7, "angle": -180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-84, -0], @@ -241,7 +241,7 @@ "width": 17, "angle": -180, "contrailSize": 17, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" } ], "bounds": [ diff --git a/data/hulls/tahlan_gown.ship b/data/hulls/tahlan_gown.ship index 3bf9084..c651720 100644 --- a/data/hulls/tahlan_gown.ship +++ b/data/hulls/tahlan_gown.ship @@ -342,7 +342,7 @@ "width": 14, "angle": 180, "contrailSize": 14, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-159, -52.5], @@ -350,7 +350,7 @@ "width": 14, "angle": -180, "contrailSize": 14, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-160.5, 45], @@ -358,7 +358,7 @@ "width": 14, "angle": 180, "contrailSize": 14, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-160.5, -45], @@ -366,7 +366,7 @@ "width": 14, "angle": -180, "contrailSize": 14, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-133.5, 76], @@ -374,7 +374,7 @@ "width": 11, "angle": 180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-133.5, -76], @@ -382,7 +382,7 @@ "width": 11, "angle": -180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-135, 70], @@ -390,7 +390,7 @@ "width": 11, "angle": 180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-135, -70], @@ -398,7 +398,7 @@ "width": 11, "angle": -180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-158, 49], diff --git a/data/hulls/tahlan_gown_ringleft.ship b/data/hulls/tahlan_gown_ringleft.ship index 71d9884..568ff20 100644 --- a/data/hulls/tahlan_gown_ringleft.ship +++ b/data/hulls/tahlan_gown_ringleft.ship @@ -142,7 +142,7 @@ "width": 12, "angle": 140, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-174, 42.5], @@ -150,7 +150,7 @@ "width": 12, "angle": 153, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-192, 6.5], @@ -158,7 +158,7 @@ "width": 12, "angle": 166, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-148.5, 72], diff --git a/data/hulls/tahlan_gown_ringright.ship b/data/hulls/tahlan_gown_ringright.ship index 639abe2..3cd1430 100644 --- a/data/hulls/tahlan_gown_ringright.ship +++ b/data/hulls/tahlan_gown_ringright.ship @@ -142,7 +142,7 @@ "width": 12, "angle": -140, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-174, -42.5], @@ -150,7 +150,7 @@ "width": 12, "angle": -153, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-192, -6.5], @@ -158,7 +158,7 @@ "width": 12, "angle": -166, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-148.5, -72], diff --git a/data/hulls/tahlan_hem.ship b/data/hulls/tahlan_hem.ship index 1e55d6e..f9bed98 100644 --- a/data/hulls/tahlan_hem.ship +++ b/data/hulls/tahlan_hem.ship @@ -50,7 +50,7 @@ "width": 11, "angle": 180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-28, -23], @@ -58,7 +58,7 @@ "width": 11, "angle": -180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-49.5, -0], @@ -66,7 +66,7 @@ "width": 10, "angle": 180, "contrailSize": 10, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-49, -0], @@ -82,7 +82,7 @@ "width": 7, "angle": 180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-27, -28], @@ -90,7 +90,7 @@ "width": 7, "angle": -180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" } ], "bounds": [ diff --git a/data/hulls/tahlan_margin.ship b/data/hulls/tahlan_margin.ship index 69687ec..43e671d 100644 --- a/data/hulls/tahlan_margin.ship +++ b/data/hulls/tahlan_margin.ship @@ -59,7 +59,7 @@ "width": 22, "angle": 180, "contrailSize": 22, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-44.5, -0], @@ -75,7 +75,7 @@ "width": 13, "angle": 180, "contrailSize": 13, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-32, -30], @@ -83,7 +83,7 @@ "width": 13, "angle": -180, "contrailSize": 13, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" } ], "bounds": [ diff --git a/data/hulls/tahlan_midi.ship b/data/hulls/tahlan_midi.ship index 3c9c65b..10c222c 100644 --- a/data/hulls/tahlan_midi.ship +++ b/data/hulls/tahlan_midi.ship @@ -143,7 +143,7 @@ "width": 7, "angle": 180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [35, -66.5], @@ -151,7 +151,7 @@ "width": 7, "angle": -180, "contrailSize": 7, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [36, 71], @@ -159,7 +159,7 @@ "width": 6, "angle": 180, "contrailSize": 6, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [36, -71], @@ -167,7 +167,7 @@ "width": 6, "angle": -180, "contrailSize": 6, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-114, -0], @@ -175,7 +175,7 @@ "width": 30, "angle": 180, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-118, 12], @@ -183,7 +183,7 @@ "width": 8, "angle": 180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-118, -12], @@ -191,7 +191,7 @@ "width": 8, "angle": -180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-113, -0], diff --git a/data/hulls/tahlan_percale.ship b/data/hulls/tahlan_percale.ship index 255aee5..a9cdef2 100644 --- a/data/hulls/tahlan_percale.ship +++ b/data/hulls/tahlan_percale.ship @@ -165,7 +165,7 @@ "width": 16, "angle": 180, "contrailSize": 16, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-58.5, -58], @@ -173,7 +173,7 @@ "width": 16, "angle": -180, "contrailSize": 16, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [2.5, 102.5], @@ -181,7 +181,7 @@ "width": 12.762031, "angle": 144, "contrailSize": 12.762031, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [2.5, -102.5], @@ -189,7 +189,7 @@ "width": 12.762031, "angle": -144, "contrailSize": 12.762031, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-71, -0], @@ -197,7 +197,7 @@ "width": 25, "angle": 180, "contrailSize": 25, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-70, -0], diff --git a/data/hulls/tahlan_sateen.ship b/data/hulls/tahlan_sateen.ship index e403d8d..07fa906 100644 --- a/data/hulls/tahlan_sateen.ship +++ b/data/hulls/tahlan_sateen.ship @@ -164,7 +164,7 @@ "width": 23, "angle": 180, "contrailSize": 23, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-41, 118], @@ -172,7 +172,7 @@ "width": 13, "angle": 180, "contrailSize": 13, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-41, -118], @@ -180,7 +180,7 @@ "width": 13, "angle": -180, "contrailSize": 13, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-38, 143], @@ -188,7 +188,7 @@ "width": 13, "angle": 180, "contrailSize": 13, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-38, -143], @@ -196,7 +196,7 @@ "width": 13, "angle": -180, "contrailSize": 13, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-74, -0], diff --git a/data/hulls/tahlan_sateen_kim.ship b/data/hulls/tahlan_sateen_kim.ship index ebcd765..3c621a7 100644 --- a/data/hulls/tahlan_sateen_kim.ship +++ b/data/hulls/tahlan_sateen_kim.ship @@ -237,7 +237,7 @@ "width": 23, "angle": 180, "contrailSize": 23, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-41, 118], @@ -245,7 +245,7 @@ "width": 13, "angle": 180, "contrailSize": 13, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-41, -118], @@ -253,7 +253,7 @@ "width": 13, "angle": -180, "contrailSize": 13, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-38, 143], @@ -261,7 +261,7 @@ "width": 13, "angle": 180, "contrailSize": 13, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-38, -143], @@ -269,7 +269,7 @@ "width": 13, "angle": -180, "contrailSize": 13, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-74, -0], diff --git a/data/hulls/tahlan_silken_banshee.ship b/data/hulls/tahlan_silken_banshee.ship index 083eeb0..2f4a3f3 100644 --- a/data/hulls/tahlan_silken_banshee.ship +++ b/data/hulls/tahlan_silken_banshee.ship @@ -249,7 +249,7 @@ "width": 12, "angle": 180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-201.5, -61.5], @@ -257,7 +257,7 @@ "width": 12, "angle": -180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-198.5, 67], @@ -265,7 +265,7 @@ "width": 12, "angle": 180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-198.5, -67], @@ -273,7 +273,7 @@ "width": 12, "angle": -180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-242, 32], @@ -281,7 +281,7 @@ "width": 12, "angle": 180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-242, -32], @@ -289,7 +289,7 @@ "width": 12, "angle": -180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-242, 25.5], @@ -297,7 +297,7 @@ "width": 8, "angle": 180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-242, -25.5], @@ -305,7 +305,7 @@ "width": 8, "angle": -180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-205.5, -0], @@ -321,7 +321,7 @@ "width": 26, "angle": -180, "contrailSize": 26, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" } ], "bounds": [ diff --git a/data/hulls/tahlan_skirt.ship b/data/hulls/tahlan_skirt.ship index 6f20ff2..d3b6ce6 100644 --- a/data/hulls/tahlan_skirt.ship +++ b/data/hulls/tahlan_skirt.ship @@ -67,7 +67,7 @@ "width": 10, "angle": 180, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-35.5, -33.5], @@ -75,7 +75,7 @@ "width": 10, "angle": -180, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-35.5, -27], @@ -83,7 +83,7 @@ "width": 5, "angle": -180, "contrailSize": 5, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-35.5, 27], @@ -91,7 +91,7 @@ "width": 5, "angle": 180, "contrailSize": 5, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-39.5, -0], @@ -107,7 +107,7 @@ "width": 15, "angle": 180, "contrailSize": 15, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" } ], "bounds": [ diff --git a/data/hulls/tahlan_skye.ship b/data/hulls/tahlan_skye.ship index a75cc7d..be4922c 100644 --- a/data/hulls/tahlan_skye.ship +++ b/data/hulls/tahlan_skye.ship @@ -135,7 +135,7 @@ "width": 40, "angle": 180, "contrailSize": 40, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-94, 39], @@ -143,7 +143,7 @@ "width": 15, "angle": 180, "contrailSize": 15, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-94, -39], @@ -151,7 +151,7 @@ "width": 15, "angle": -180, "contrailSize": 15, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-74.5, 61.5], @@ -159,7 +159,7 @@ "width": 12, "angle": 180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-74.5, -61.5], @@ -167,7 +167,7 @@ "width": 12, "angle": -180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-95, -0], @@ -183,7 +183,7 @@ "width": 10, "angle": 180, "contrailSize": 10, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-97, -14], @@ -191,7 +191,7 @@ "width": 10, "angle": -180, "contrailSize": 10, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-55, 88.5], @@ -199,7 +199,7 @@ "width": 10.408965, "angle": 153, "contrailSize": 10.408965, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-55, -88.5], @@ -207,7 +207,7 @@ "width": 10.408965, "angle": -153, "contrailSize": 10.408965, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-54, 88], @@ -231,7 +231,7 @@ "width": 11, "angle": 180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-94, -32.5], @@ -239,7 +239,7 @@ "width": 11, "angle": -180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" } ], "bounds": [ diff --git a/data/hulls/tahlan_skye_hana.ship b/data/hulls/tahlan_skye_hana.ship index 1b512e0..ab4745b 100644 --- a/data/hulls/tahlan_skye_hana.ship +++ b/data/hulls/tahlan_skye_hana.ship @@ -158,7 +158,7 @@ "width": 40, "angle": 180, "contrailSize": 40, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-94, 39], @@ -166,7 +166,7 @@ "width": 15, "angle": 180, "contrailSize": 15, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-94, -39], @@ -174,7 +174,7 @@ "width": 15, "angle": -180, "contrailSize": 15, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-74.5, 61.5], @@ -182,7 +182,7 @@ "width": 12, "angle": 180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-74.5, -61.5], @@ -190,7 +190,7 @@ "width": 12, "angle": -180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-95, -0], @@ -206,7 +206,7 @@ "width": 10, "angle": 180, "contrailSize": 10, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-97, -14], @@ -214,7 +214,7 @@ "width": 10, "angle": -180, "contrailSize": 10, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-55, 88.5], @@ -222,7 +222,7 @@ "width": 10.408965, "angle": 153, "contrailSize": 10.408965, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-55, -88.5], @@ -230,7 +230,7 @@ "width": 10.408965, "angle": -153, "contrailSize": 10.408965, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-54, 88], @@ -254,7 +254,7 @@ "width": 11, "angle": 180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-94, -32.5], @@ -262,7 +262,7 @@ "width": 11, "angle": -180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" } ], "bounds": [ diff --git a/data/hulls/tahlan_strand.ship b/data/hulls/tahlan_strand.ship index 695de49..bd211b8 100644 --- a/data/hulls/tahlan_strand.ship +++ b/data/hulls/tahlan_strand.ship @@ -177,7 +177,7 @@ "width": 29, "angle": 180, "contrailSize": 29, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-107.5, 12.5], @@ -185,7 +185,7 @@ "width": 11, "angle": 180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-107.5, -12.5], @@ -193,7 +193,7 @@ "width": 11, "angle": -180, "contrailSize": 11, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-99.5, 88], @@ -201,7 +201,7 @@ "width": 9.816615, "angle": 156, "contrailSize": 9.816615, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-99.5, -88], @@ -209,7 +209,7 @@ "width": 9.816615, "angle": -156, "contrailSize": 9.816615, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-98.5, 87.5], @@ -241,7 +241,7 @@ "width": 14, "angle": 180, "contrailSize": 14, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-101, -30], @@ -249,7 +249,7 @@ "width": 14, "angle": -180, "contrailSize": 14, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" } ], "bounds": [ diff --git a/data/hulls/tahlan_tress.ship b/data/hulls/tahlan_tress.ship index 29344be..da59713 100644 --- a/data/hulls/tahlan_tress.ship +++ b/data/hulls/tahlan_tress.ship @@ -108,7 +108,7 @@ "width": 19, "angle": 180, "contrailSize": 19, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-66.5, 21], @@ -116,7 +116,7 @@ "width": 10, "angle": 180, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-66.5, -21], @@ -124,7 +124,7 @@ "width": 10, "angle": -180, "contrailSize": 30, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-66.5, 14.5], @@ -132,7 +132,7 @@ "width": 8, "angle": 180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-66.5, -14.5], @@ -140,7 +140,7 @@ "width": 8, "angle": -180, "contrailSize": 8, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-56, -0], @@ -156,7 +156,7 @@ "width": 8.01666, "angle": 150, "contrailSize": 8.01666, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-43.5, -82.5], @@ -164,7 +164,7 @@ "width": 8.01666, "angle": -150, "contrailSize": 8.01666, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-43, 82], diff --git a/data/hulls/tahlan_verge.ship b/data/hulls/tahlan_verge.ship index bab7215..e27dee3 100644 --- a/data/hulls/tahlan_verge.ship +++ b/data/hulls/tahlan_verge.ship @@ -122,7 +122,7 @@ "width": 33, "angle": 180, "contrailSize": 33, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-85, 63], @@ -130,7 +130,7 @@ "width": 21, "angle": 180, "contrailSize": 21, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-85, -63], @@ -138,7 +138,7 @@ "width": 21, "angle": -180, "contrailSize": 21, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-99, 21], @@ -146,7 +146,7 @@ "width": 12, "angle": 180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-99, -21], @@ -154,7 +154,7 @@ "width": 12, "angle": -180, "contrailSize": 12, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-96.5, -0], @@ -170,7 +170,7 @@ "width": 14, "angle": 180, "contrailSize": 14, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" }, { "location": [-99, -11.5], @@ -178,7 +178,7 @@ "width": 14, "angle": -180, "contrailSize": 14, - "style": "HIGH_TECH" + "style": "TAHLAN_SCALAR_ENGINE" } ], "bounds": [ diff --git a/data/lights/tahlan_scalar_texture.csv b/data/lights/tahlan_scalar_texture.csv index f2cedd4..f1f55b1 100644 --- a/data/lights/tahlan_scalar_texture.csv +++ b/data/lights/tahlan_scalar_texture.csv @@ -26,6 +26,7 @@ tahlan_gown_ringleft,ship,,1.5,normal,graphics/tahlan/maps/ships_normals/tahlan_ tahlan_gown_ringright,ship,,1.5,normal,graphics/tahlan/maps/ships_normals/tahlan_gown_ringright_Normal.png tahlan_percale,ship,,1.5,normal,graphics/tahlan/maps/ships_normals/tahlan_percale_Normal.png tahlan_silken_banshee,ship,,1.5,normal,graphics/tahlan/maps/ships_normals/tahlan_silken_banshee_Normal.png +tahlan_frock,ship,,1.5,normal,graphics/tahlan/maps/ships_normals/tahlan_frock_Normal.png ,,,,, tahlan_percale_cover_r,hardpoint,,1.5,normal,graphics/tahlan/maps/weapons_normals/tahlan_percale_cover_r_Normal.png tahlan_percale_cover_l,hardpoint,,1.5,normal,graphics/tahlan/maps/weapons_normals/tahlan_percale_cover_l_Normal.png diff --git a/data/shipsystems/tahlan_berserk.system b/data/shipsystems/tahlan_berserk.system index bf6acd3..c6f3325 100644 --- a/data/shipsystems/tahlan_berserk.system +++ b/data/shipsystems/tahlan_berserk.system @@ -1,11 +1,9 @@ { "id":"tahlan_berserk", "type":"STAT_MOD", - #"aiType":"WEAPON_BOOST", - "aiType":"CUSTOM", - "aiScript":"data.scripts.shipsystems.ai.tahlan_BerserkAI", + "aiType":"WEAPON_BOOST", - "statsScript":"data.scripts.shipsystems.tahlan_BerserkStats", + "statsScript":"org.niatahl.scalartech.shipsystems.BerserkStats", "useSound":"tahlan_berserk_start", "loopSound":"tahlan_berserk_loop", diff --git a/data/shipsystems/tahlan_capoverdrive.system b/data/shipsystems/tahlan_capoverdrive.system index 835cc16..ce9d683 100644 --- a/data/shipsystems/tahlan_capoverdrive.system +++ b/data/shipsystems/tahlan_capoverdrive.system @@ -3,7 +3,7 @@ "type":"STAT_MOD", "aiType":"WEAPON_BOOST", - "statsScript":"data.scripts.shipsystems.tahlan_CapacitorOverchargeStats", + "statsScript":"org.niatahl.scalartech.shipsystems.CapacitorOverchargeStats", "canUseWhileRightClickSystemOn":true, diff --git a/data/shipsystems/tahlan_coildischarge.system b/data/shipsystems/tahlan_coildischarge.system index a6ad34b..6c61b36 100644 --- a/data/shipsystems/tahlan_coildischarge.system +++ b/data/shipsystems/tahlan_coildischarge.system @@ -3,7 +3,7 @@ "type":"STAT_MOD", "aiType":"WEAPON_BOOST", - "statsScript":"data.scripts.shipsystems.tahlan_CoilDischargeStats", + "statsScript":"org.niatahl.scalartech.shipsystems.CoilDischargeStats", #"effectColor1":[150,150,255,200], #"effectColor2":[175,175,255,255], diff --git a/data/shipsystems/tahlan_cycleaccel.system b/data/shipsystems/tahlan_cycleaccel.system index 4999b41..80132d6 100644 --- a/data/shipsystems/tahlan_cycleaccel.system +++ b/data/shipsystems/tahlan_cycleaccel.system @@ -3,7 +3,7 @@ "type":"STAT_MOD", "aiType":"WEAPON_BOOST", - "statsScript":"data.scripts.shipsystems.tahlan_CycleAccelStats", + "statsScript":"org.niatahl.scalartech.shipsystems.CycleAccelStats", "weaponGlowColor":[0,255,255,155], "weaponTypes":[ENERGY], diff --git a/data/shipsystems/tahlan_divintervention.system b/data/shipsystems/tahlan_divintervention.system index d2f7b76..1a92b4b 100644 --- a/data/shipsystems/tahlan_divintervention.system +++ b/data/shipsystems/tahlan_divintervention.system @@ -3,7 +3,7 @@ "type":"PHASE_CLOAK", "aiType":"PHASE_CLOAK", - "statsScript":"data.scripts.shipsystems.tahlan_DivineInterventionStats", + "statsScript":"org.niatahl.scalartech.shipsystems.DivineInterventionStats", "phaseHighlight":"_glow1", "phaseDiffuse":"_glow2", diff --git a/data/shipsystems/tahlan_emprelay.system b/data/shipsystems/tahlan_emprelay.system index c0c448c..bdb0c9a 100644 --- a/data/shipsystems/tahlan_emprelay.system +++ b/data/shipsystems/tahlan_emprelay.system @@ -3,7 +3,7 @@ "type":"STAT_MOD", "aiType":"TARGETING_FEED", - "statsScript":"data.scripts.shipsystems.tahlan_EMPRelayStats", + "statsScript":"org.niatahl.scalartech.shipsystems.EMPRelayStats", "useSound":"system_targeting_feed", #"loopSound":"system_targeting_feed_loop", diff --git a/data/shipsystems/tahlan_emsuppression.system b/data/shipsystems/tahlan_emsuppression.system index 0c5cefb..15a65e0 100644 --- a/data/shipsystems/tahlan_emsuppression.system +++ b/data/shipsystems/tahlan_emsuppression.system @@ -3,7 +3,7 @@ "type":"STAT_MOD", "aiType":"TARGETING_FEED", - "statsScript":"data.scripts.shipsystems.tahlan_EMSuppression", + "statsScript":"org.niatahl.scalartech.shipsystems.EMSuppression", #"runScriptWhilePaused":true, # only for the player's ship "runScriptWhileIdle":true, # unapply() never gets called diff --git a/data/shipsystems/tahlan_flickerdrive.system b/data/shipsystems/tahlan_flickerdrive.system index 3cfdcaa..d87eebb 100644 --- a/data/shipsystems/tahlan_flickerdrive.system +++ b/data/shipsystems/tahlan_flickerdrive.system @@ -3,7 +3,7 @@ "type":"PHASE_CLOAK", "aiType":"PHASE_CLOAK", - "statsScript":"data.scripts.shipsystems.tahlan_FlickerDriveStats", + "statsScript":"org.niatahl.scalartech.shipsystems.FlickerDriveStats", "runScriptWhilePaused":false, # only for the player's ship "runScriptWhileIdle":true, # this means unapply() never gets called "blockActionsWhileChargingDown":true, diff --git a/data/shipsystems/tahlan_limitrelease.system b/data/shipsystems/tahlan_limitrelease.system index 9d94720..1729fc6 100644 --- a/data/shipsystems/tahlan_limitrelease.system +++ b/data/shipsystems/tahlan_limitrelease.system @@ -3,7 +3,7 @@ "type":"STAT_MOD", "aiType":"WEAPON_BOOST", - "statsScript":"data.scripts.shipsystems.tahlan_LimitReleaseStats", + "statsScript":"org.niatahl.scalartech.shipsystems.LimitReleaseStats", "useSound":"tahlan_limit_release_start", "loopSound":"tahlan_limit_release_loop", diff --git a/data/shipsystems/tahlan_loaderjets.system b/data/shipsystems/tahlan_loaderjets.system index 75a42c7..770d4e1 100644 --- a/data/shipsystems/tahlan_loaderjets.system +++ b/data/shipsystems/tahlan_loaderjets.system @@ -3,7 +3,7 @@ "type":"ENGINE_MOD", "aiType":"MANEUVERING_JETS", - "statsScript":"data.scripts.shipsystems.tahlan_LoaderJetsStats", + "statsScript":"org.niatahl.scalartech.shipsystems.LoaderJetsStats", "engineGlowLengthMult":1, "engineGlowWidthMult":1, diff --git a/data/shipsystems/tahlan_magminestrike.system b/data/shipsystems/tahlan_magminestrike.system index 895d1bc..c8d9961 100644 --- a/data/shipsystems/tahlan_magminestrike.system +++ b/data/shipsystems/tahlan_magminestrike.system @@ -3,7 +3,7 @@ "type":"STAT_MOD", "aiType":"MINE_STRIKE", - "statsScript":"data.scripts.shipsystems.tahlan_MagMinesStats", + "statsScript":"org.niatahl.scalartech.shipsystems.MagMinesStats", "canUseWhileRightClickSystemOn":false, diff --git a/data/shipsystems/tahlan_overboost.system b/data/shipsystems/tahlan_overboost.system index c6d217a..8ce82d8 100644 --- a/data/shipsystems/tahlan_overboost.system +++ b/data/shipsystems/tahlan_overboost.system @@ -3,7 +3,7 @@ "type":"ENGINE_MOD", "aiType":"MANEUVERING_JETS", - "statsScript":"data.scripts.shipsystems.tahlan_OverboostStats", + "statsScript":"org.niatahl.scalartech.shipsystems.OverboostStats", #"engineGlowColor":[255,175,125,255], #"engineGlowContrailColor":[100,165,255,25], diff --git a/data/shipsystems/tahlan_powersurge.system b/data/shipsystems/tahlan_powersurge.system index e7f0502..ca123a4 100644 --- a/data/shipsystems/tahlan_powersurge.system +++ b/data/shipsystems/tahlan_powersurge.system @@ -3,7 +3,7 @@ "type":"STAT_MOD", "aiType":"WEAPON_BOOST", - "statsScript":"data.scripts.shipsystems.tahlan_LimitReleaseStats", + "statsScript":"org.niatahl.scalartech.shipsystems.LimitReleaseStats", "useSound":"tahlan_limit_release_start", "loopSound":"tahlan_limit_release_loop", diff --git a/data/shipsystems/tahlan_pulsedrive.system b/data/shipsystems/tahlan_pulsedrive.system index deab8b4..f3424b0 100644 --- a/data/shipsystems/tahlan_pulsedrive.system +++ b/data/shipsystems/tahlan_pulsedrive.system @@ -3,7 +3,7 @@ "type":"ENGINE_MOD", "aiType":"BURN_DRIVE", - "statsScript":"data.scripts.shipsystems.tahlan_PulseDriveStats", + "statsScript":"org.niatahl.scalartech.shipsystems.PulseDriveStats", "engineGlowColor":[255,0,100,255], #"engineGlowContrailColor":[100,165,255,25], diff --git a/data/shipsystems/tahlan_scalarphase.system b/data/shipsystems/tahlan_scalarphase.system index 31b231d..362d139 100644 --- a/data/shipsystems/tahlan_scalarphase.system +++ b/data/shipsystems/tahlan_scalarphase.system @@ -3,7 +3,7 @@ "type":"PHASE_CLOAK", "aiType":"PHASE_CLOAK", - "statsScript":"data.scripts.shipsystems.tahlan_ScalarPhaseStats", + "statsScript":"org.niatahl.scalartech.shipsystems.ScalarPhaseStats", "runScriptWhilePaused":true, # only for the player's ship "runScriptWhileIdle":true, # this means unapply() never gets called "blockActionsWhileChargingDown":false, diff --git a/data/shipsystems/tahlan_secondwave.system b/data/shipsystems/tahlan_secondwave.system index 187164f..fb2151b 100644 --- a/data/shipsystems/tahlan_secondwave.system +++ b/data/shipsystems/tahlan_secondwave.system @@ -3,7 +3,7 @@ "type":"STAT_MOD", "aiType":"RESERVE_DEPLOYMENT", - "statsScript":"data.scripts.shipsystems.tahlan_SecondWaveStats", + "statsScript":"org.niatahl.scalartech.shipsystems.SecondWaveStats", "useSound":"system_recall_device", "outOfUsesSound":"gun_out_of_ammo", diff --git a/data/shipsystems/tahlan_supercruise.system b/data/shipsystems/tahlan_supercruise.system index bbe066f..6b1985c 100644 --- a/data/shipsystems/tahlan_supercruise.system +++ b/data/shipsystems/tahlan_supercruise.system @@ -2,9 +2,9 @@ "id":"tahlan_supercruise", "type":"ENGINE_MOD", "aiType":"CUSTOM", - "aiScript":"data.scripts.shipsystems.ai.tahlan_SupercruiseAI", + "aiScript":"org.niatahl.scalartech.shipsystems.ai.tahlan_SupercruiseAI", - "statsScript":"data.scripts.shipsystems.tahlan_SuperCruiseStats", + "statsScript":"org.niatahl.scalartech.shipsystems.SuperCruiseStats", #"engineGlowColor":[255,175,125,255], #"engineGlowContrailColor":[100,165,255,25], diff --git a/data/shipsystems/tahlan_swarmerstrike.system b/data/shipsystems/tahlan_swarmerstrike.system index 7fac741..5996045 100644 --- a/data/shipsystems/tahlan_swarmerstrike.system +++ b/data/shipsystems/tahlan_swarmerstrike.system @@ -3,7 +3,7 @@ "type":"STAT_MOD", "aiType":"ENTROPY_AMPLIFIER", - "statsScript":"data.scripts.shipsystems.tahlan_SwarmerStrikeStats", + "statsScript":"org.niatahl.scalartech.shipsystems.SwarmerStrikeStats", #"runScriptWhilePaused":true, # only for the player's ship "runScriptWhileIdle":true, # unapply() never gets called diff --git a/data/weapons/proj/tahlan_crinkle_shot.proj b/data/weapons/proj/tahlan_crinkle_shot.proj index 3467308..7bd6925 100644 --- a/data/weapons/proj/tahlan_crinkle_shot.proj +++ b/data/weapons/proj/tahlan_crinkle_shot.proj @@ -2,8 +2,8 @@ "id":"tahlan_crinkle_shot", "specClass":"projectile", "spawnType":"BALLISTIC_AS_BEAM", - "onHitEffect":"data.scripts.weapons.tahlan_CrinkleOnHitEffect", - "onFireEffect":"data.scripts.weapons.tahlan_CrinkleScript", + "onHitEffect":"org.niatahl.scalartech.weapons.CrinkleOnHitEffect", + "onFireEffect":"org.niatahl.scalartech.weapons.CrinkleScript", "collisionClass":"RAY", "collisionClassByFighter":"RAY_FIGHTER", "length":20.0, diff --git a/data/weapons/proj/tahlan_ruffle_shot.proj b/data/weapons/proj/tahlan_ruffle_shot.proj index 3917d57..86e723f 100644 --- a/data/weapons/proj/tahlan_ruffle_shot.proj +++ b/data/weapons/proj/tahlan_ruffle_shot.proj @@ -4,7 +4,7 @@ "spawnType":"BALLISTIC_AS_BEAM", "collisionClass":"RAY", "collisionClassByFighter":"RAY_FIGHTER", - "onHitEffect":"data.scripts.weapons.tahlan_RuffleOnHitEffect", + "onHitEffect":"org.niatahl.scalartech.weapons.RuffleOnHitEffect", #"spawnType":"BALLISTIC", #"collisionClass":"PROJECTILE_FF", #"collisionClassByFighter":"PROJECTILE_FIGHTER", diff --git a/data/weapons/proj/tahlan_seam_shot.proj b/data/weapons/proj/tahlan_seam_shot.proj index eb8cb1e..3e95964 100644 --- a/data/weapons/proj/tahlan_seam_shot.proj +++ b/data/weapons/proj/tahlan_seam_shot.proj @@ -2,8 +2,8 @@ "id":"tahlan_seam_shot", "specClass":"projectile", "spawnType":"BALLISTIC_AS_BEAM", - "onHitEffect":"data.scripts.weapons.tahlan_SeamOnHitEffect", - #"onFireEffect":"data.scripts.weapons.tahlan_CrinkleScript", + "onHitEffect":"org.niatahl.scalartech.weapons.SeamOnHitEffect", + #"onFireEffect":"org.niatahl.scalartech.weapons.CrinkleScript", "collisionClass":"RAY", "collisionClassByFighter":"RAY_FIGHTER", "length":8.0, diff --git a/data/weapons/proj/tahlan_tineola_msl.proj b/data/weapons/proj/tahlan_tineola_msl.proj index 32a1841..84d4952 100644 --- a/data/weapons/proj/tahlan_tineola_msl.proj +++ b/data/weapons/proj/tahlan_tineola_msl.proj @@ -3,7 +3,7 @@ "specClass":"missile", "missileType":"MISSILE", "sprite":"graphics/tahlan/missiles/tahlan_tineola_msl.png", - "onHitEffect":"data.scripts.weapons.tahlan_TineolaOnHitEffect", + "onHitEffect":"org.niatahl.scalartech.weapons.TineolaOnHitEffect", "size":[18,34], "center":[9,17], "collisionRadius":16, diff --git a/data/weapons/tahlan_crinkle.wpn b/data/weapons/tahlan_crinkle.wpn index 97bcf7c..646065e 100644 --- a/data/weapons/tahlan_crinkle.wpn +++ b/data/weapons/tahlan_crinkle.wpn @@ -4,7 +4,7 @@ "projectileSpecId": "tahlan_crinkle_shot", "type": "ENERGY", "size": "SMALL", - #"everyFrameEffect": "data.scripts.weapons.tahlan_SeamScript", + #"everyFrameEffect": "org.niatahl.scalartech.weapons.SeamScript", "turretSprite": "graphics/tahlan/weapons/tahlan_crinkle_turret_base.png", "turretGlowSprite": "graphics/tahlan/weapons/tahlan_crinkle_turret_glow.png", "hardpointSprite": "graphics/tahlan/weapons/tahlan_crinkle_hp_base.png", diff --git a/data/weapons/tahlan_crinkle_fighter.wpn b/data/weapons/tahlan_crinkle_fighter.wpn index 0f2e9ba..b71fc7c 100644 --- a/data/weapons/tahlan_crinkle_fighter.wpn +++ b/data/weapons/tahlan_crinkle_fighter.wpn @@ -4,7 +4,7 @@ "projectileSpecId": "tahlan_crinkle_shot", "type": "ENERGY", "size": "SMALL", - "everyFrameEffect": "data.scripts.weapons.tahlan_SeamScript", + "everyFrameEffect": "org.niatahl.scalartech.weapons.SeamScript", "turretSprite": "graphics/tahlan/weapons/tahlan_crinkle_turret_base.png", "turretGlowSprite": "graphics/tahlan/weapons/tahlan_crinkle_turret_glow.png", "hardpointSprite": "graphics/tahlan/weapons/tahlan_crinkle_hp_base.png", diff --git a/data/weapons/tahlan_filamentbays.wpn b/data/weapons/tahlan_filamentbays.wpn index 66bbab0..14420ff 100644 --- a/data/weapons/tahlan_filamentbays.wpn +++ b/data/weapons/tahlan_filamentbays.wpn @@ -1,7 +1,7 @@ { "animationType": "NONE", "barrelMode": "ALTERNATING", - "everyFrameEffect":"data.scripts.weapons.tahlan_FilamentPortalBays", + "everyFrameEffect":"org.niatahl.scalartech.weapons.FilamentPortalBays", "hardpointAngleOffsets": [ 0 ], diff --git a/data/weapons/tahlan_filamentengine.wpn b/data/weapons/tahlan_filamentengine.wpn index d84fced..b81c01e 100644 --- a/data/weapons/tahlan_filamentengine.wpn +++ b/data/weapons/tahlan_filamentengine.wpn @@ -9,7 +9,7 @@ ], "renderHints":["RENDER_ADDITIVE"], "showDamageWhenDecorative":false, - "everyFrameEffect": "data.scripts.weapons.tahlan_FilamentEngineScript", + "everyFrameEffect": "org.niatahl.scalartech.weapons.FilamentEngineScript", "numFrames":2, "frameRate":0, "fringeColor": [ diff --git a/data/weapons/tahlan_filamentring.wpn b/data/weapons/tahlan_filamentring.wpn index 6879560..493b1a7 100644 --- a/data/weapons/tahlan_filamentring.wpn +++ b/data/weapons/tahlan_filamentring.wpn @@ -9,7 +9,7 @@ ], "renderHints":["RENDER_ADDITIVE"], "showDamageWhenDecorative":false, - "everyFrameEffect": "data.scripts.weapons.tahlan_FilamentRingScript", + "everyFrameEffect": "org.niatahl.scalartech.weapons.FilamentRingScript", "numFrames":2, "frameRate":0, "fringeColor": [ diff --git a/data/weapons/tahlan_fold.wpn b/data/weapons/tahlan_fold.wpn index edb7388..8e5c90b 100644 --- a/data/weapons/tahlan_fold.wpn +++ b/data/weapons/tahlan_fold.wpn @@ -4,7 +4,7 @@ "projectileSpecId": "tahlan_crinkle_shot", "type": "ENERGY", "size": "SMALL", - #"everyFrameEffect": "data.scripts.weapons.tahlan_SeamScript", + #"everyFrameEffect": "org.niatahl.scalartech.weapons.SeamScript", "turretSprite": "graphics/tahlan/weapons/tahlan_crinkle_turret_base.png", "turretGlowSprite": "graphics/tahlan/weapons/tahlan_crinkle_turret_glow.png", "hardpointSprite": "", diff --git a/data/weapons/tahlan_gown_leftringglow.wpn b/data/weapons/tahlan_gown_leftringglow.wpn index 6d30954..5200c88 100644 --- a/data/weapons/tahlan_gown_leftringglow.wpn +++ b/data/weapons/tahlan_gown_leftringglow.wpn @@ -9,7 +9,7 @@ ], "renderHints":["RENDER_ADDITIVE"], "showDamageWhenDecorative":false, - "everyFrameEffect": "data.scripts.weapons.tahlan_FilamentRingScript", + "everyFrameEffect": "org.niatahl.scalartech.weapons.FilamentRingScript", "numFrames":2, "frameRate":0, "fringeColor": [ diff --git a/data/weapons/tahlan_gown_rightringglow.wpn b/data/weapons/tahlan_gown_rightringglow.wpn index b958266..d11fa3e 100644 --- a/data/weapons/tahlan_gown_rightringglow.wpn +++ b/data/weapons/tahlan_gown_rightringglow.wpn @@ -9,7 +9,7 @@ ], "renderHints":["RENDER_ADDITIVE"], "showDamageWhenDecorative":false, - "everyFrameEffect": "data.scripts.weapons.tahlan_FilamentRingScript", + "everyFrameEffect": "org.niatahl.scalartech.weapons.FilamentRingScript", "numFrames":2, "frameRate":0, "fringeColor": [ diff --git a/data/weapons/tahlan_lace.wpn b/data/weapons/tahlan_lace.wpn index 1bbb67b..3630079 100644 --- a/data/weapons/tahlan_lace.wpn +++ b/data/weapons/tahlan_lace.wpn @@ -4,7 +4,7 @@ "projectileSpecId": "tahlan_lace_shot", "type": "ENERGY", "size": "MEDIUM", - "everyFrameEffect": "data.scripts.weapons.tahlan_LaceScript", + "everyFrameEffect": "org.niatahl.scalartech.weapons.LaceScript", "turretSprite": "graphics/tahlan/weapons/tahlan_lace_turret_base.png", "hardpointSprite": "graphics/tahlan/weapons/tahlan_lace_hp_base.png", "renderAboveAllWeapons": 0, diff --git a/data/weapons/tahlan_lacette.wpn b/data/weapons/tahlan_lacette.wpn index 590bcd6..b2e786d 100644 --- a/data/weapons/tahlan_lacette.wpn +++ b/data/weapons/tahlan_lacette.wpn @@ -4,7 +4,7 @@ "projectileSpecId": "tahlan_lacette_shot", "type": "ENERGY", "size": "SMALL", - "everyFrameEffect": "data.scripts.weapons.tahlan_LacetteScript", + "everyFrameEffect": "org.niatahl.scalartech.weapons.LacetteScript", "turretSprite": "graphics/tahlan/weapons/tahlan_lacette_turret_base.png", "hardpointSprite": "graphics/tahlan/weapons/tahlan_lacette_hp_base.png", "renderAboveAllWeapons": 0, diff --git a/data/weapons/tahlan_ocbeam.wpn b/data/weapons/tahlan_ocbeam.wpn index 733e44f..8e446b8 100644 --- a/data/weapons/tahlan_ocbeam.wpn +++ b/data/weapons/tahlan_ocbeam.wpn @@ -1,6 +1,6 @@ { - "beamEffect": "data.scripts.weapons.tahlan_OverchargeBeamEffect", - "everyFrameEffect": "data.scripts.weapons.tahlan_OverchargeBeamScript", + "beamEffect": "org.niatahl.scalartech.weapons.OverchargeBeamEffect", + "everyFrameEffect": "org.niatahl.scalartech.weapons.OverchargeBeamScript", "beamFireOnlyOnFullCharge": true, "collisionClass": "RAY", "collisionClassByFighter": "RAY_FIGHTER", diff --git a/data/weapons/tahlan_ruffle.wpn b/data/weapons/tahlan_ruffle.wpn index db0fc94..319adbf 100644 --- a/data/weapons/tahlan_ruffle.wpn +++ b/data/weapons/tahlan_ruffle.wpn @@ -4,7 +4,7 @@ "projectileSpecId": "tahlan_ruffle_shot", "type": "ENERGY", "size": "LARGE", - "everyFrameEffect": "data.scripts.weapons.tahlan_RuffleScript", + "everyFrameEffect": "org.niatahl.scalartech.weapons.RuffleScript", "turretSprite": "graphics/tahlan/weapons/tahlan_ruffle_turret_base.png", "turretGlowSprite": "graphics/tahlan/weapons/tahlan_ruffle_turret_glow.png", "hardpointSprite": "graphics/tahlan/weapons/tahlan_ruffle_hp_base.png", diff --git a/data/weapons/tahlan_scalarautoforge.wpn b/data/weapons/tahlan_scalarautoforge.wpn index 4c351da..c3e9be2 100644 --- a/data/weapons/tahlan_scalarautoforge.wpn +++ b/data/weapons/tahlan_scalarautoforge.wpn @@ -1,7 +1,7 @@ { "animationType": "NONE", "barrelMode": "ALTERNATING", - "everyFrameEffect":"data.scripts.weapons.tahlan_ScalarAutoforgeEffect", + "everyFrameEffect":"org.niatahl.scalartech.weapons.ScalarAutoforgeEffect", "hardpointAngleOffsets": [ 0 ], diff --git a/data/weapons/tahlan_seam.wpn b/data/weapons/tahlan_seam.wpn index e8535c9..eb69053 100644 --- a/data/weapons/tahlan_seam.wpn +++ b/data/weapons/tahlan_seam.wpn @@ -4,7 +4,7 @@ "projectileSpecId": "tahlan_seam_shot", "type": "ENERGY", "size": "LARGE", - "everyFrameEffect": "data.scripts.weapons.tahlan_SeamScript", + "everyFrameEffect": "org.niatahl.scalartech.weapons.SeamScript", "turretSprite": "graphics/tahlan/weapons/tahlan_seam_turret_base.png", "turretGlowSprite": "graphics/tahlan/weapons/tahlan_seam_turret_glow.png", "hardpointSprite": "graphics/tahlan/weapons/tahlan_seam_hp_base.png", diff --git a/data/weapons/tahlan_stitch.wpn b/data/weapons/tahlan_stitch.wpn index 8909f5a..f755e19 100644 --- a/data/weapons/tahlan_stitch.wpn +++ b/data/weapons/tahlan_stitch.wpn @@ -3,7 +3,7 @@ "specClass": "beam", "type": "ENERGY", "size": "LARGE", - "beamEffect": "data.scripts.weapons.tahlan_StitchBeamEffect", + "beamEffect": "org.niatahl.scalartech.weapons.StitchBeamEffect", #"everyFrameEffect": "data.scripts.weapons.tahlan_StrahlhammerMuzzleFlashScript", "collisionClass": "RAY", "collisionClassByFighter": "RAY_FIGHTER", diff --git a/data/weapons/tahlan_stitchette.wpn b/data/weapons/tahlan_stitchette.wpn index 14e17f0..4128f19 100644 --- a/data/weapons/tahlan_stitchette.wpn +++ b/data/weapons/tahlan_stitchette.wpn @@ -3,7 +3,7 @@ "specClass": "beam", "type": "ENERGY", "size": "MEDIUM", - "beamEffect": "data.scripts.weapons.tahlan_StitchBeamEffect", + "beamEffect": "org.niatahl.scalartech.weapons.StitchBeamEffect", "collisionClass": "RAY", "collisionClassByFighter": "RAY_FIGHTER", "turretSprite": "graphics/tahlan/weapons/tahlan_stitchette_turret_base.png", diff --git a/data/weapons/tahlan_strandring.wpn b/data/weapons/tahlan_strandring.wpn index 1c2413a..320aef1 100644 --- a/data/weapons/tahlan_strandring.wpn +++ b/data/weapons/tahlan_strandring.wpn @@ -9,7 +9,7 @@ ], "renderHints":["RENDER_ADDITIVE"], "showDamageWhenDecorative":false, - "everyFrameEffect": "data.scripts.weapons.tahlan_FilamentRingScript", + "everyFrameEffect": "org.niatahl.scalartech.weapons.FilamentRingScript", "numFrames":2, "frameRate":0, "fringeColor": [ diff --git a/data/weapons/tahlan_tousle.wpn b/data/weapons/tahlan_tousle.wpn index 98bb743..a2091ec 100644 --- a/data/weapons/tahlan_tousle.wpn +++ b/data/weapons/tahlan_tousle.wpn @@ -6,7 +6,7 @@ "size": "MEDIUM", "turretSprite": "graphics/tahlan/weapons/tahlan_tousle_turret_base.png", "hardpointSprite": "graphics/tahlan/weapons/tahlan_tousle_hp_base.png", - "everyFrameEffect": "data.scripts.weapons.tahlan_TousleScript", + "everyFrameEffect": "org.niatahl.scalartech.weapons.TousleScript", "renderAboveAllWeapons": 0, "turretOffsets": [ 4, diff --git a/data/weapons/tahlan_wingtrail.wpn b/data/weapons/tahlan_wingtrail.wpn index 8f71e8c..56aadcb 100644 --- a/data/weapons/tahlan_wingtrail.wpn +++ b/data/weapons/tahlan_wingtrail.wpn @@ -1,7 +1,7 @@ { "animationType": "NONE", "barrelMode": "ALTERNATING", - "everyFrameEffect":"data.scripts.weapons.tahlan_WingTrailScript", + "everyFrameEffect":"org.niatahl.scalartech.weapons.WingTrailScript", "hardpointAngleOffsets": [ 0 ], diff --git a/graphics/tahlan/fx/tahlan_scalar_engine_out.png b/graphics/tahlan/fx/tahlan_scalar_engine_out.png new file mode 100644 index 0000000..0619d21 Binary files /dev/null and b/graphics/tahlan/fx/tahlan_scalar_engine_out.png differ diff --git a/graphics/tahlan/fx/tahlan_scalar_engine_scroll.png b/graphics/tahlan/fx/tahlan_scalar_engine_scroll.png new file mode 100644 index 0000000..abc0b47 Binary files /dev/null and b/graphics/tahlan/fx/tahlan_scalar_engine_scroll.png differ diff --git a/graphics/tahlan/maps/ships_normals/tahlan_frock_Normal.png b/graphics/tahlan/maps/ships_normals/tahlan_frock_Normal.png new file mode 100644 index 0000000..8f7060c Binary files /dev/null and b/graphics/tahlan/maps/ships_normals/tahlan_frock_Normal.png differ diff --git a/jars/src/data/scripts/tahlan_ScalarModPlugin.java b/jars/src/org/niatahl/scalartech/ScalarModPlugin.java similarity index 76% rename from jars/src/data/scripts/tahlan_ScalarModPlugin.java rename to jars/src/org/niatahl/scalartech/ScalarModPlugin.java index 96eff57..73f39d0 100644 --- a/jars/src/data/scripts/tahlan_ScalarModPlugin.java +++ b/jars/src/org/niatahl/scalartech/ScalarModPlugin.java @@ -1,4 +1,4 @@ -package data.scripts; +package org.niatahl.scalartech; import com.fs.starfarer.api.BaseModPlugin; import com.fs.starfarer.api.Global; @@ -21,21 +21,19 @@ import com.fs.starfarer.api.loading.HullModSpecAPI; import com.fs.starfarer.api.util.Misc; -import data.scripts.ai.tahlan_emptorpedo_ai; -import data.scripts.world.tahlan_ScalarRelationPlugin; -import data.scripts.world.tahlan_Spindle; +import org.niatahl.scalartech.ai.EMPtorpedoAI; +import org.niatahl.scalartech.world.ScalarRelationPlugin; +import org.niatahl.scalartech.world.Spindle; import exerelin.campaign.SectorManager; import org.dark.shaders.light.LightData; import org.dark.shaders.util.ShaderLib; import org.dark.shaders.util.TextureData; -import org.json.JSONException; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import org.apache.log4j.Logger; -public class tahlan_ScalarModPlugin extends BaseModPlugin { +public class ScalarModPlugin extends BaseModPlugin { static private boolean graphicsLibAvailable = false; static public boolean isGraphicsLibAvailable () { return graphicsLibAvailable; @@ -45,7 +43,7 @@ static public boolean isGraphicsLibAvailable () { public static final String EMPMISSILE_ID = "tahlan_tear_msl"; - public static Logger log = Global.getLogger(tahlan_ScalarModPlugin.class); + public static Logger log = Global.getLogger(ScalarModPlugin.class); @Override public void onApplicationLoad() { @@ -89,10 +87,10 @@ public void onNewGame() { //If we have Nexerelin and random worlds enabled, don't spawn our manual systems boolean haveNexerelin = Global.getSettings().getModManager().isModEnabled("nexerelin"); if (!haveNexerelin || SectorManager.getManager().isCorvusMode()){ - new tahlan_Spindle().generate(sector); + new Spindle().generate(sector); } - tahlan_ScalarRelationPlugin.initFactionRelationships(sector); + ScalarRelationPlugin.initFactionRelationships(sector); //Adding ScalarTech to bounty system SharedData.getData().getPersonBountyEventData().addParticipatingFaction("scalartech"); @@ -124,22 +122,8 @@ public void onNewGameAfterEconomyLoad() { admin.getMemoryWithoutUpdate().set("$nex_preferredAdmin", true); admin.getMemoryWithoutUpdate().set("$nex_preferredAdmin_factionId", "scalartech"); - admin.getStats().setSkillLevel(Skills.HELMSMANSHIP, 3); - admin.getStats().setSkillLevel(Skills.IMPACT_MITIGATION, 3); - admin.getStats().setSkillLevel(Skills.SHIELD_MODULATION, 3); - admin.getStats().setSkillLevel(Skills.MISSILE_SPECIALIZATION, 3); - admin.getStats().setSkillLevel(Skills.COORDINATED_MANEUVERS, 3); - admin.getStats().setSkillLevel(Skills.CREW_TRAINING, 3); - admin.getStats().setSkillLevel(Skills.GUNNERY_IMPLANTS, 3); - admin.getStats().setSkillLevel(Skills.ELECTRONIC_WARFARE, 3); - admin.getStats().setSkillLevel(Skills.DAMAGE_CONTROL, 3); - admin.getStats().setSkillLevel(Skills.RELIABILITY_ENGINEERING, 3); - admin.getStats().setSkillLevel(Skills.POINT_DEFENSE, 3); - admin.getStats().setSkillLevel(Skills.TARGET_ANALYSIS, 3); admin.getStats().setSkillLevel(Skills.INDUSTRIAL_PLANNING, 3); - admin.getStats().setSkillLevel(Skills.PLANETARY_OPERATIONS, 3); - admin.getStats().setSkillLevel(Skills.SPACE_OPERATIONS, 3); - admin.getStats().setLevel(15); + admin.getStats().setLevel(1); ip.addPerson(admin); market.setAdmin(admin); @@ -162,22 +146,14 @@ public void onNewGameAfterEconomyLoad() { silvys.addTag(Tags.CONTACT_MILITARY); - silvys.getStats().setSkillLevel(Skills.HELMSMANSHIP, 3); - silvys.getStats().setSkillLevel(Skills.IMPACT_MITIGATION, 3); - silvys.getStats().setSkillLevel(Skills.SHIELD_MODULATION, 3); - silvys.getStats().setSkillLevel(Skills.MISSILE_SPECIALIZATION, 3); - silvys.getStats().setSkillLevel(Skills.COORDINATED_MANEUVERS, 3); - silvys.getStats().setSkillLevel(Skills.CREW_TRAINING, 3); - silvys.getStats().setSkillLevel(Skills.GUNNERY_IMPLANTS, 3); - silvys.getStats().setSkillLevel(Skills.ELECTRONIC_WARFARE, 3); - silvys.getStats().setSkillLevel(Skills.DAMAGE_CONTROL, 3); - silvys.getStats().setSkillLevel(Skills.RELIABILITY_ENGINEERING, 3); - silvys.getStats().setSkillLevel(Skills.POINT_DEFENSE, 3); - silvys.getStats().setSkillLevel(Skills.TARGET_ANALYSIS, 3); - silvys.getStats().setSkillLevel(Skills.INDUSTRIAL_PLANNING, 3); - silvys.getStats().setSkillLevel(Skills.PLANETARY_OPERATIONS, 3); - silvys.getStats().setSkillLevel(Skills.SPACE_OPERATIONS, 3); - silvys.getStats().setLevel(15); + silvys.getStats().setSkillLevel(Skills.HELMSMANSHIP, 2); + silvys.getStats().setSkillLevel(Skills.IMPACT_MITIGATION, 2); + silvys.getStats().setSkillLevel(Skills.FIELD_MODULATION, 2); + silvys.getStats().setSkillLevel(Skills.MISSILE_SPECIALIZATION, 2); + silvys.getStats().setSkillLevel(Skills.GUNNERY_IMPLANTS, 2); + silvys.getStats().setSkillLevel(Skills.ORDNANCE_EXPERTISE, 2); + silvys.getStats().setSkillLevel(Skills.TARGET_ANALYSIS, 2); + silvys.getStats().setLevel(7); ip.addPerson(silvys); market.getCommDirectory().addPerson(silvys,1); @@ -194,7 +170,7 @@ public void onNewGameAfterEconomyLoad() { public PluginPick pickMissileAI(MissileAPI missile, ShipAPI launchingShip) { switch (missile.getProjectileSpecId()) { case EMPMISSILE_ID: - return new PluginPick(new tahlan_emptorpedo_ai(missile, launchingShip), CampaignPlugin.PickPriority.MOD_SPECIFIC); + return new PluginPick(new EMPtorpedoAI(missile, launchingShip), CampaignPlugin.PickPriority.MOD_SPECIFIC); default: } return null; diff --git a/jars/src/data/scripts/ai/tahlan_BaseMissileAI.java b/jars/src/org/niatahl/scalartech/ai/BaseMissileAI.java similarity index 97% rename from jars/src/data/scripts/ai/tahlan_BaseMissileAI.java rename to jars/src/org/niatahl/scalartech/ai/BaseMissileAI.java index 720827e..04e905e 100644 --- a/jars/src/data/scripts/ai/tahlan_BaseMissileAI.java +++ b/jars/src/org/niatahl/scalartech/ai/BaseMissileAI.java @@ -1,4 +1,4 @@ -package data.scripts.ai; +package org.niatahl.scalartech.ai; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.CollisionClass; @@ -16,7 +16,7 @@ import org.lazywizard.lazylib.combat.CombatUtils; import org.lwjgl.util.vector.Vector2f; -public class tahlan_BaseMissileAI implements MissileAIPlugin, GuidedMissileAI +public class BaseMissileAI implements MissileAIPlugin, GuidedMissileAI { private static final float RETARGET_TIME = 0f; @@ -135,7 +135,7 @@ static Vector2f interceptAdvanced(Vector2f point, float speed, float acceleratio protected float retargetTimer = RETARGET_TIME; protected CombatEntityAPI target; - public tahlan_BaseMissileAI(MissileAPI missile, ShipAPI launchingShip) + public BaseMissileAI(MissileAPI missile, ShipAPI launchingShip) { this.missile = missile; this.launchingShip = launchingShip; diff --git a/jars/src/data/scripts/ai/tahlan_emptorpedo_ai.java b/jars/src/org/niatahl/scalartech/ai/EMPtorpedoAI.java similarity index 99% rename from jars/src/data/scripts/ai/tahlan_emptorpedo_ai.java rename to jars/src/org/niatahl/scalartech/ai/EMPtorpedoAI.java index 98df284..b2985dc 100644 --- a/jars/src/data/scripts/ai/tahlan_emptorpedo_ai.java +++ b/jars/src/org/niatahl/scalartech/ai/EMPtorpedoAI.java @@ -1,4 +1,4 @@ -package data.scripts.ai; +package org.niatahl.scalartech.ai; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.campaign.AsteroidAPI; @@ -6,7 +6,6 @@ import com.fs.starfarer.api.impl.campaign.ids.Stats; import com.fs.starfarer.api.loading.DamagingExplosionSpec; import com.fs.starfarer.api.util.Misc; -import com.fs.util.C; import org.lazywizard.lazylib.CollisionUtils; import org.lazywizard.lazylib.FastTrig; import org.lazywizard.lazylib.MathUtils; @@ -26,7 +25,7 @@ * based on script by MesoTronik, with fusing logic by Nicke535 * further modified by Nia */ -public class tahlan_emptorpedo_ai extends tahlan_BaseMissileAI { +public class EMPtorpedoAI extends BaseMissileAI { /* Configurations */ private static final float ENGINE_DEAD_TIME_MAX = 0.5f; // Max time until engine burn starts private static final float ENGINE_DEAD_TIME_MIN = 0.25f; // Min time until engine burn starts @@ -71,7 +70,7 @@ public class tahlan_emptorpedo_ai extends tahlan_BaseMissileAI { private final float inaccuracy; protected final float eccmMult; - public tahlan_emptorpedo_ai(MissileAPI missile, ShipAPI launchingShip) { + public EMPtorpedoAI(MissileAPI missile, ShipAPI launchingShip) { super(missile, launchingShip); weaveSineAPhase = (float) (Math.random() * Math.PI * 2.0); diff --git a/jars/src/data/scripts/campaign/econ/tahlan_GateScar.java b/jars/src/org/niatahl/scalartech/campaign/econ/GateScar.java similarity index 89% rename from jars/src/data/scripts/campaign/econ/tahlan_GateScar.java rename to jars/src/org/niatahl/scalartech/campaign/econ/GateScar.java index 7794b4a..5187e28 100644 --- a/jars/src/data/scripts/campaign/econ/tahlan_GateScar.java +++ b/jars/src/org/niatahl/scalartech/campaign/econ/GateScar.java @@ -1,13 +1,13 @@ -package data.scripts.campaign.econ; +package org.niatahl.scalartech.campaign.econ; import com.fs.starfarer.api.impl.campaign.econ.BaseMarketConditionPlugin; import com.fs.starfarer.api.impl.campaign.ids.Stats; import com.fs.starfarer.api.ui.TooltipMakerAPI; import com.fs.starfarer.api.util.Misc; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_GateScar extends BaseMarketConditionPlugin { +public class GateScar extends BaseMarketConditionPlugin { public static final float ACCESSIBILITY_BONUS = 10f; public static final float DEFENSE_BONUS = 50f; diff --git a/jars/src/data/scripts/campaign/econ/industries/tahlan_ScalarTechHQ.java b/jars/src/org/niatahl/scalartech/campaign/econ/industries/ScalarTechHQ.java similarity index 98% rename from jars/src/data/scripts/campaign/econ/industries/tahlan_ScalarTechHQ.java rename to jars/src/org/niatahl/scalartech/campaign/econ/industries/ScalarTechHQ.java index 3bd6e43..f004f4a 100644 --- a/jars/src/data/scripts/campaign/econ/industries/tahlan_ScalarTechHQ.java +++ b/jars/src/org/niatahl/scalartech/campaign/econ/industries/ScalarTechHQ.java @@ -1,4 +1,4 @@ -package data.scripts.campaign.econ.industries; +package org.niatahl.scalartech.campaign.econ.industries; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.campaign.BattleAPI; @@ -30,7 +30,7 @@ import java.util.Random; -public class tahlan_ScalarTechHQ extends BaseIndustry implements RouteFleetSpawner, FleetEventListener { +public class ScalarTechHQ extends BaseIndustry implements RouteFleetSpawner, FleetEventListener { @Override public boolean isHidden() { diff --git a/jars/src/data/scripts/campaign/nexerelin/tahlan_ScalartechNamer.java b/jars/src/org/niatahl/scalartech/campaign/nexerelin/ScalartechNamer.java similarity index 94% rename from jars/src/data/scripts/campaign/nexerelin/tahlan_ScalartechNamer.java rename to jars/src/org/niatahl/scalartech/campaign/nexerelin/ScalartechNamer.java index 6c01e5e..ff3a246 100644 --- a/jars/src/data/scripts/campaign/nexerelin/tahlan_ScalartechNamer.java +++ b/jars/src/org/niatahl/scalartech/campaign/nexerelin/ScalartechNamer.java @@ -1,4 +1,4 @@ -package data.scripts.campaign.nexerelin; +package org.niatahl.scalartech.campaign.nexerelin; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.campaign.CampaignFleetAPI; @@ -17,7 +17,7 @@ import static exerelin.utilities.NexUtils.JSONArrayToArrayList; import static exerelin.utilities.NexUtils.getRandomListElement; -public class tahlan_ScalartechNamer implements SpecialForcesNamer { +public class ScalartechNamer implements SpecialForcesNamer { public static final String FILE_PATH = "data/config/exerelin/specialForcesNames.json"; diff --git a/jars/src/data/scripts/campaign/submarkets/tahlan_STDFMarketPlugin.java b/jars/src/org/niatahl/scalartech/campaign/submarkets/STDFMarketPlugin.java similarity index 97% rename from jars/src/data/scripts/campaign/submarkets/tahlan_STDFMarketPlugin.java rename to jars/src/org/niatahl/scalartech/campaign/submarkets/STDFMarketPlugin.java index f488a00..e14d110 100644 --- a/jars/src/data/scripts/campaign/submarkets/tahlan_STDFMarketPlugin.java +++ b/jars/src/org/niatahl/scalartech/campaign/submarkets/STDFMarketPlugin.java @@ -1,4 +1,4 @@ -package data.scripts.campaign.submarkets; +package org.niatahl.scalartech.campaign.submarkets; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.campaign.CargoStackAPI; @@ -12,7 +12,7 @@ import com.fs.starfarer.api.impl.campaign.submarkets.BaseSubmarketPlugin; import com.fs.starfarer.api.util.Misc; -public class tahlan_STDFMarketPlugin extends BaseSubmarketPlugin { +public class STDFMarketPlugin extends BaseSubmarketPlugin { private final RepLevel MIN_STANDING = RepLevel.COOPERATIVE; diff --git a/jars/src/data/scripts/hullmods/tahlan_BansheeMounts.java b/jars/src/org/niatahl/scalartech/hullmods/BansheeMounts.java similarity index 84% rename from jars/src/data/scripts/hullmods/tahlan_BansheeMounts.java rename to jars/src/org/niatahl/scalartech/hullmods/BansheeMounts.java index dba32e4..e9d14fb 100644 --- a/jars/src/data/scripts/hullmods/tahlan_BansheeMounts.java +++ b/jars/src/org/niatahl/scalartech/hullmods/BansheeMounts.java @@ -1,12 +1,12 @@ -package data.scripts.hullmods; +package org.niatahl.scalartech.hullmods; import com.fs.starfarer.api.combat.BaseHullMod; import com.fs.starfarer.api.combat.MutableShipStatsAPI; import com.fs.starfarer.api.combat.ShipAPI; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_BansheeMounts extends BaseHullMod { +public class BansheeMounts extends BaseHullMod { static final float RANGE_BOOST = 150f; diff --git a/jars/src/data/scripts/hullmods/tahlan_CHMScalartech.java b/jars/src/org/niatahl/scalartech/hullmods/CHMScalartech.java similarity index 92% rename from jars/src/data/scripts/hullmods/tahlan_CHMScalartech.java rename to jars/src/org/niatahl/scalartech/hullmods/CHMScalartech.java index 0bffe04..22a86d9 100644 --- a/jars/src/data/scripts/hullmods/tahlan_CHMScalartech.java +++ b/jars/src/org/niatahl/scalartech/hullmods/CHMScalartech.java @@ -1,12 +1,12 @@ -package data.scripts.hullmods; +package org.niatahl.scalartech.hullmods; import com.fs.starfarer.api.combat.BaseHullMod; import com.fs.starfarer.api.combat.MutableShipStatsAPI; import com.fs.starfarer.api.combat.ShipAPI; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_CHMScalartech extends BaseHullMod { +public class CHMScalartech extends BaseHullMod { private static final float EFFICIENCY_MULT = 0.05f; private static final float CAPACITY_MULT = 0.05f; diff --git a/jars/src/data/scripts/hullmods/tahlan_CentralTargetingCore.java b/jars/src/org/niatahl/scalartech/hullmods/CentralTargetingCore.java similarity index 89% rename from jars/src/data/scripts/hullmods/tahlan_CentralTargetingCore.java rename to jars/src/org/niatahl/scalartech/hullmods/CentralTargetingCore.java index 40fa816..4ecc22f 100644 --- a/jars/src/data/scripts/hullmods/tahlan_CentralTargetingCore.java +++ b/jars/src/org/niatahl/scalartech/hullmods/CentralTargetingCore.java @@ -1,16 +1,15 @@ -package data.scripts.hullmods; +package org.niatahl.scalartech.hullmods; import com.fs.starfarer.api.combat.BaseHullMod; import com.fs.starfarer.api.combat.MutableShipStatsAPI; import com.fs.starfarer.api.combat.ShipAPI; import com.fs.starfarer.api.combat.ShipAPI.HullSize; -import com.fs.starfarer.api.ui.TooltipMakerAPI; -import data.scripts.util.MagicIncompatibleHullmods; +import org.magiclib.util.MagicIncompatibleHullmods; import java.util.HashSet; import java.util.Set; -public class tahlan_CentralTargetingCore extends BaseHullMod { +public class CentralTargetingCore extends BaseHullMod { private static final Set BLOCKED_HULLMODS = new HashSet<>(2); diff --git a/jars/src/data/scripts/hullmods/tahlan_CycleBoost.java b/jars/src/org/niatahl/scalartech/hullmods/CycleBoost.java similarity index 83% rename from jars/src/data/scripts/hullmods/tahlan_CycleBoost.java rename to jars/src/org/niatahl/scalartech/hullmods/CycleBoost.java index 0d6e759..88629cd 100644 --- a/jars/src/data/scripts/hullmods/tahlan_CycleBoost.java +++ b/jars/src/org/niatahl/scalartech/hullmods/CycleBoost.java @@ -1,13 +1,11 @@ -package data.scripts.hullmods; +package org.niatahl.scalartech.hullmods; -import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.combat.ShipAPI.HullSize; -import com.fs.starfarer.api.impl.campaign.ids.Stats; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_CycleBoost extends BaseHullMod { +public class CycleBoost extends BaseHullMod { private static final float ROF_BOOST = 2f; diff --git a/jars/src/data/scripts/hullmods/tahlan_FilamentSpecs.java b/jars/src/org/niatahl/scalartech/hullmods/FilamentSpecs.java similarity index 85% rename from jars/src/data/scripts/hullmods/tahlan_FilamentSpecs.java rename to jars/src/org/niatahl/scalartech/hullmods/FilamentSpecs.java index 937e63e..031268e 100644 --- a/jars/src/data/scripts/hullmods/tahlan_FilamentSpecs.java +++ b/jars/src/org/niatahl/scalartech/hullmods/FilamentSpecs.java @@ -1,4 +1,4 @@ -package data.scripts.hullmods; +package org.niatahl.scalartech.hullmods; import com.fs.starfarer.api.combat.BaseHullMod; import com.fs.starfarer.api.combat.MutableShipStatsAPI; @@ -6,9 +6,9 @@ import com.fs.starfarer.api.combat.ShipAPI.HullSize; import com.fs.starfarer.api.impl.campaign.ids.Stats; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_FilamentSpecs extends BaseHullMod { +public class FilamentSpecs extends BaseHullMod { private static final float REFIT_BONUS = 15f; private static final float RATE_DECREASE_MODIFIER = 15f; diff --git a/jars/src/data/scripts/hullmods/tahlan_GownModule.java b/jars/src/org/niatahl/scalartech/hullmods/GownModule.java similarity index 98% rename from jars/src/data/scripts/hullmods/tahlan_GownModule.java rename to jars/src/org/niatahl/scalartech/hullmods/GownModule.java index 3bc36f3..79b72c3 100644 --- a/jars/src/data/scripts/hullmods/tahlan_GownModule.java +++ b/jars/src/org/niatahl/scalartech/hullmods/GownModule.java @@ -1,4 +1,4 @@ -package data.scripts.hullmods; +package org.niatahl.scalartech.hullmods; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; @@ -6,19 +6,19 @@ import com.fs.starfarer.api.combat.ShipwideAIFlags.AIFlags; import com.fs.starfarer.api.ui.TooltipMakerAPI; import com.fs.starfarer.api.util.Misc; -import data.scripts.util.MagicIncompatibleHullmods; +import org.magiclib.util.MagicIncompatibleHullmods; import java.awt.*; import java.util.HashSet; import java.util.List; import java.util.Set; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; //Nabbed this from Alfonzo, madman extraordinaire //Original code by DR, mad god of the modiverse //Further modified by Nia, also a bit mad -public class tahlan_GownModule extends BaseHullMod { +public class GownModule extends BaseHullMod { private static void advanceChild(ShipAPI child, ShipAPI parent) { diff --git a/jars/src/data/scripts/hullmods/tahlan_HeavyCycleBoost.java b/jars/src/org/niatahl/scalartech/hullmods/HeavyCycleBoost.java similarity index 89% rename from jars/src/data/scripts/hullmods/tahlan_HeavyCycleBoost.java rename to jars/src/org/niatahl/scalartech/hullmods/HeavyCycleBoost.java index efff11f..9d77ccb 100644 --- a/jars/src/data/scripts/hullmods/tahlan_HeavyCycleBoost.java +++ b/jars/src/org/niatahl/scalartech/hullmods/HeavyCycleBoost.java @@ -1,12 +1,11 @@ -package data.scripts.hullmods; +package org.niatahl.scalartech.hullmods; -import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.combat.ShipAPI.HullSize; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_HeavyCycleBoost extends BaseHullMod { +public class HeavyCycleBoost extends BaseHullMod { private static final float ROF_BOOST = 1.5f; private static final float BEAM_BOOST = 1.25f; diff --git a/jars/src/data/scripts/hullmods/tahlan_ScalarAutoforge.java b/jars/src/org/niatahl/scalartech/hullmods/ScalarAutoforge.java similarity index 81% rename from jars/src/data/scripts/hullmods/tahlan_ScalarAutoforge.java rename to jars/src/org/niatahl/scalartech/hullmods/ScalarAutoforge.java index 38e396b..ae320e9 100644 --- a/jars/src/data/scripts/hullmods/tahlan_ScalarAutoforge.java +++ b/jars/src/org/niatahl/scalartech/hullmods/ScalarAutoforge.java @@ -1,12 +1,12 @@ -package data.scripts.hullmods; +package org.niatahl.scalartech.hullmods; import com.fs.starfarer.api.combat.BaseHullMod; import com.fs.starfarer.api.combat.ShipAPI; -import data.scripts.util.MagicIncompatibleHullmods; +import org.magiclib.util.MagicIncompatibleHullmods; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_ScalarAutoforge extends BaseHullMod { +public class ScalarAutoforge extends BaseHullMod { @Override public void applyEffectsAfterShipCreation(ShipAPI ship, String id) { diff --git a/jars/src/data/scripts/hullmods/tahlan_ScalarSpecs.java b/jars/src/org/niatahl/scalartech/hullmods/ScalarSpecs.java similarity index 94% rename from jars/src/data/scripts/hullmods/tahlan_ScalarSpecs.java rename to jars/src/org/niatahl/scalartech/hullmods/ScalarSpecs.java index 745d5f7..681143a 100644 --- a/jars/src/data/scripts/hullmods/tahlan_ScalarSpecs.java +++ b/jars/src/org/niatahl/scalartech/hullmods/ScalarSpecs.java @@ -1,13 +1,13 @@ -package data.scripts.hullmods; +package org.niatahl.scalartech.hullmods; import com.fs.starfarer.api.combat.BaseHullMod; import com.fs.starfarer.api.combat.MutableShipStatsAPI; import com.fs.starfarer.api.combat.ShipAPI; import com.fs.starfarer.api.combat.ShipAPI.HullSize; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_ScalarSpecs extends BaseHullMod { +public class ScalarSpecs extends BaseHullMod { private static final float ZERO_FLUX_BOOST = 10f; private static final float ZERO_FLUX_BOOST_UI = 5f; diff --git a/jars/src/data/scripts/shipsystems/tahlan_BerserkStats.java b/jars/src/org/niatahl/scalartech/shipsystems/BerserkStats.java similarity index 96% rename from jars/src/data/scripts/shipsystems/tahlan_BerserkStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/BerserkStats.java index 9268461..f84587b 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_BerserkStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/BerserkStats.java @@ -1,19 +1,17 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.Global; -import com.fs.starfarer.api.characters.PersonAPI; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.impl.combat.BaseShipSystemScript; import com.fs.starfarer.api.util.IntervalUtil; import org.lazywizard.lazylib.MathUtils; -import org.lazywizard.lazylib.combat.entities.SimpleEntity; import java.awt.*; import java.util.EnumSet; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_BerserkStats extends BaseShipSystemScript { +public class BerserkStats extends BaseShipSystemScript { public static final float SPEED_BOOST = 50f; public static final float DAMAGE_MULT = 0.33f; diff --git a/jars/src/data/scripts/shipsystems/tahlan_CapacitorOverchargeStats.java b/jars/src/org/niatahl/scalartech/shipsystems/CapacitorOverchargeStats.java similarity index 82% rename from jars/src/data/scripts/shipsystems/tahlan_CapacitorOverchargeStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/CapacitorOverchargeStats.java index 09b2b69..d0ef6e1 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_CapacitorOverchargeStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/CapacitorOverchargeStats.java @@ -1,11 +1,11 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.combat.MutableShipStatsAPI; import com.fs.starfarer.api.impl.combat.BaseShipSystemScript; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_CapacitorOverchargeStats extends BaseShipSystemScript { +public class CapacitorOverchargeStats extends BaseShipSystemScript { private static final float DAMAGE_MULT = 2f; diff --git a/jars/src/data/scripts/shipsystems/tahlan_CoilDischargeStats.java b/jars/src/org/niatahl/scalartech/shipsystems/CoilDischargeStats.java similarity index 96% rename from jars/src/data/scripts/shipsystems/tahlan_CoilDischargeStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/CoilDischargeStats.java index 8c9bf12..8cfbd16 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_CoilDischargeStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/CoilDischargeStats.java @@ -1,4 +1,4 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; @@ -7,14 +7,12 @@ import org.lazywizard.lazylib.MathUtils; import org.lazywizard.lazylib.combat.CombatUtils; import org.lazywizard.lazylib.combat.entities.SimpleEntity; -import org.lwjgl.util.vector.Vector2f; -import javax.rmi.CORBA.Util; import java.awt.*; import java.util.ArrayList; import java.util.List; -public class tahlan_CoilDischargeStats extends BaseShipSystemScript { +public class CoilDischargeStats extends BaseShipSystemScript { static final float DAMAGE = 200f; static final float COOLDOWN_MOD = 2f; diff --git a/jars/src/data/scripts/shipsystems/tahlan_CycleAccelStats.java b/jars/src/org/niatahl/scalartech/shipsystems/CycleAccelStats.java similarity index 91% rename from jars/src/data/scripts/shipsystems/tahlan_CycleAccelStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/CycleAccelStats.java index a9d5f84..0ea0126 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_CycleAccelStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/CycleAccelStats.java @@ -1,14 +1,12 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; -import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.MutableShipStatsAPI; import com.fs.starfarer.api.combat.ShipAPI; -import com.fs.starfarer.api.combat.WeaponAPI; import com.fs.starfarer.api.impl.combat.BaseShipSystemScript; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_CycleAccelStats extends BaseShipSystemScript { +public class CycleAccelStats extends BaseShipSystemScript { private static final float ROF_MULT = 3f; diff --git a/jars/src/data/scripts/shipsystems/tahlan_DivineInterventionStats.java b/jars/src/org/niatahl/scalartech/shipsystems/DivineInterventionStats.java similarity index 98% rename from jars/src/data/scripts/shipsystems/tahlan_DivineInterventionStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/DivineInterventionStats.java index 483d266..57b26fd 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_DivineInterventionStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/DivineInterventionStats.java @@ -1,4 +1,4 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.Global; @@ -6,7 +6,7 @@ import com.fs.starfarer.api.graphics.SpriteAPI; import com.fs.starfarer.api.impl.combat.BaseShipSystemScript; import com.fs.starfarer.api.util.IntervalUtil; -import data.scripts.util.MagicRender; +import org.magiclib.util.MagicRender; import org.lazywizard.lazylib.FastTrig; import org.lazywizard.lazylib.MathUtils; import org.lazywizard.lazylib.VectorUtils; @@ -18,7 +18,7 @@ import java.util.List; -public class tahlan_DivineInterventionStats extends BaseShipSystemScript { +public class DivineInterventionStats extends BaseShipSystemScript { private static final Color FLICKER_COLOR = new Color(86, 125, 129, 131); private static final Color AFTERIMAGE_COLOR = new Color(101, 129, 128, 61); diff --git a/jars/src/data/scripts/shipsystems/tahlan_EMPRelayStats.java b/jars/src/org/niatahl/scalartech/shipsystems/EMPRelayStats.java similarity index 98% rename from jars/src/data/scripts/shipsystems/tahlan_EMPRelayStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/EMPRelayStats.java index 74481b7..3666ea9 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_EMPRelayStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/EMPRelayStats.java @@ -1,4 +1,4 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.List; -public class tahlan_EMPRelayStats extends BaseShipSystemScript { +public class EMPRelayStats extends BaseShipSystemScript { private static final Object KEY_JITTER = new Object(); private static final Color JITTER_UNDER_COLOR = new Color(47, 218, 255, 125); diff --git a/jars/src/data/scripts/shipsystems/tahlan_EMSuppression.java b/jars/src/org/niatahl/scalartech/shipsystems/EMSuppression.java similarity index 97% rename from jars/src/data/scripts/shipsystems/tahlan_EMSuppression.java rename to jars/src/org/niatahl/scalartech/shipsystems/EMSuppression.java index 415d52a..8a43608 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_EMSuppression.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/EMSuppression.java @@ -1,4 +1,4 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; @@ -9,12 +9,12 @@ import com.fs.starfarer.api.input.InputEventAPI; import com.fs.starfarer.api.util.Misc; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; import java.awt.*; import java.util.List; -public class tahlan_EMSuppression extends BaseShipSystemScript { +public class EMSuppression extends BaseShipSystemScript { public static final Object KEY_SHIP = new Object(); public static final Object KEY_TARGET = new Object(); diff --git a/jars/src/data/scripts/shipsystems/tahlan_FlickerDriveStats.java b/jars/src/org/niatahl/scalartech/shipsystems/FlickerDriveStats.java similarity index 95% rename from jars/src/data/scripts/shipsystems/tahlan_FlickerDriveStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/FlickerDriveStats.java index de86d2f..0003d12 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_FlickerDriveStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/FlickerDriveStats.java @@ -1,13 +1,13 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.impl.combat.BaseShipSystemScript; import com.fs.starfarer.api.util.IntervalUtil; -import data.scripts.tahlan_ScalarModPlugin; -import data.scripts.util.MagicLensFlare; -import data.scripts.util.MagicRender; +import org.niatahl.scalartech.ScalarModPlugin; +import org.magiclib.util.MagicLensFlare; +import org.magiclib.util.MagicRender; import org.lazywizard.lazylib.MathUtils; import org.lazywizard.lazylib.combat.CombatUtils; import org.lazywizard.lazylib.combat.entities.SimpleEntity; @@ -18,10 +18,10 @@ import java.util.List; import static com.fs.starfarer.api.util.Misc.ZERO; -import static data.scripts.utils.tahlan_graphicLibEffects.CustomRippleDistortion; +import static org.niatahl.scalartech.utils.GraphicLibEffects.CustomRippleDistortion; -public class tahlan_FlickerDriveStats extends BaseShipSystemScript { +public class FlickerDriveStats extends BaseShipSystemScript { private static final Color FLICKER_COLOR = new Color(108, 127, 129, 131); public static final float MAX_TIME_MULT = 3f; @@ -156,7 +156,7 @@ public void apply(MutableShipStatsAPI stats, String id, State state, float effec MagicLensFlare.createSharpFlare(engine,ship,target.getLocation(),5f,100f,0f,LIGHTNING_CORE_COLOR,Color.white); - if (tahlan_ScalarModPlugin.isGraphicsLibAvailable()) { + if (ScalarModPlugin.isGraphicsLibAvailable()) { CustomRippleDistortion(target.getLocation(),ZERO,60,2f,false,0f,360f,0.5f,0f,0.2f,0.2f,0.4f,0f); } diff --git a/jars/src/data/scripts/shipsystems/tahlan_LimitReleaseStats.java b/jars/src/org/niatahl/scalartech/shipsystems/LimitReleaseStats.java similarity index 95% rename from jars/src/data/scripts/shipsystems/tahlan_LimitReleaseStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/LimitReleaseStats.java index 4079720..2f572d3 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_LimitReleaseStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/LimitReleaseStats.java @@ -1,16 +1,14 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; -import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.MutableShipStatsAPI; import com.fs.starfarer.api.combat.ShipAPI; -import com.fs.starfarer.api.combat.WeaponAPI; import com.fs.starfarer.api.impl.combat.BaseShipSystemScript; import java.awt.*; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_LimitReleaseStats extends BaseShipSystemScript { +public class LimitReleaseStats extends BaseShipSystemScript { private static final float ROF_MULT = 2f; private static final float SPEED_BOOST = 50f; diff --git a/jars/src/data/scripts/shipsystems/tahlan_LoaderJetsStats.java b/jars/src/org/niatahl/scalartech/shipsystems/LoaderJetsStats.java similarity index 84% rename from jars/src/data/scripts/shipsystems/tahlan_LoaderJetsStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/LoaderJetsStats.java index 68e5776..a9d125a 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_LoaderJetsStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/LoaderJetsStats.java @@ -1,13 +1,10 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; -import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.MutableShipStatsAPI; -import com.fs.starfarer.api.combat.ShipAPI; -import com.fs.starfarer.api.combat.ShipEngineControllerAPI.ShipEngineAPI; import com.fs.starfarer.api.impl.combat.BaseShipSystemScript; import com.fs.starfarer.api.plugins.ShipSystemStatsScript; -public class tahlan_LoaderJetsStats extends BaseShipSystemScript { +public class LoaderJetsStats extends BaseShipSystemScript { public void apply(MutableShipStatsAPI stats, String id, State state, float effectLevel) { if (state == ShipSystemStatsScript.State.OUT) { diff --git a/jars/src/data/scripts/shipsystems/tahlan_MagMinesStats.java b/jars/src/org/niatahl/scalartech/shipsystems/MagMinesStats.java similarity index 97% rename from jars/src/data/scripts/shipsystems/tahlan_MagMinesStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/MagMinesStats.java index da3dc07..bd1cb6a 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_MagMinesStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/MagMinesStats.java @@ -1,4 +1,4 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; @@ -9,7 +9,7 @@ import com.fs.starfarer.api.input.InputEventAPI; import com.fs.starfarer.api.util.Misc; import com.fs.starfarer.api.util.WeightedRandomPicker; -import data.scripts.util.MagicLensFlare; +import org.magiclib.util.MagicLensFlare; import org.lwjgl.util.vector.Vector2f; import java.awt.*; @@ -17,7 +17,7 @@ import static com.fs.starfarer.api.util.Misc.ZERO; -public class tahlan_MagMinesStats extends BaseShipSystemScript implements MineStrikeStatsAIInfoProvider { +public class MagMinesStats extends BaseShipSystemScript implements MineStrikeStatsAIInfoProvider { public static float MINE_RANGE = 1500f; diff --git a/jars/src/data/scripts/shipsystems/tahlan_OverboostStats.java b/jars/src/org/niatahl/scalartech/shipsystems/OverboostStats.java similarity index 95% rename from jars/src/data/scripts/shipsystems/tahlan_OverboostStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/OverboostStats.java index d8a7cbe..7240b82 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_OverboostStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/OverboostStats.java @@ -1,25 +1,22 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.graphics.SpriteAPI; import com.fs.starfarer.api.impl.combat.BaseShipSystemScript; -import com.fs.starfarer.api.loading.WeaponSlotAPI; import com.fs.starfarer.api.util.IntervalUtil; -import data.scripts.util.MagicRender; +import org.magiclib.util.MagicRender; import org.lazywizard.lazylib.FastTrig; import org.lazywizard.lazylib.MathUtils; import org.lazywizard.lazylib.combat.CombatUtils; -import org.lazywizard.lazylib.combat.entities.SimpleEntity; import org.lwjgl.util.vector.Vector2f; import java.awt.*; -import java.util.ArrayList; import java.util.List; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_OverboostStats extends BaseShipSystemScript { +public class OverboostStats extends BaseShipSystemScript { private static final float SPEED_BOOST = 300f; diff --git a/jars/src/data/scripts/shipsystems/tahlan_PulseDriveStats.java b/jars/src/org/niatahl/scalartech/shipsystems/PulseDriveStats.java similarity index 89% rename from jars/src/data/scripts/shipsystems/tahlan_PulseDriveStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/PulseDriveStats.java index db3265f..4148eb8 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_PulseDriveStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/PulseDriveStats.java @@ -1,12 +1,11 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.combat.MutableShipStatsAPI; import com.fs.starfarer.api.combat.ShipAPI; -import com.fs.starfarer.api.combat.ShipAPI.HullSize; import com.fs.starfarer.api.impl.combat.BaseShipSystemScript; import com.fs.starfarer.api.plugins.ShipSystemStatsScript; -public class tahlan_PulseDriveStats extends BaseShipSystemScript { +public class PulseDriveStats extends BaseShipSystemScript { public void apply(MutableShipStatsAPI stats, String id, State state, float effectLevel) { if (state == ShipSystemStatsScript.State.OUT) { diff --git a/jars/src/data/scripts/shipsystems/tahlan_ScalarPhaseStats.java b/jars/src/org/niatahl/scalartech/shipsystems/ScalarPhaseStats.java similarity index 98% rename from jars/src/data/scripts/shipsystems/tahlan_ScalarPhaseStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/ScalarPhaseStats.java index a9f1bb6..498d6d3 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_ScalarPhaseStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/ScalarPhaseStats.java @@ -1,4 +1,4 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.MutableShipStatsAPI; @@ -11,7 +11,7 @@ import java.awt.*; -public class tahlan_ScalarPhaseStats extends BaseShipSystemScript { +public class ScalarPhaseStats extends BaseShipSystemScript { public static final float SHIP_ALPHA_MULT = 0.25f; diff --git a/jars/src/data/scripts/shipsystems/tahlan_SecondWaveStats.java b/jars/src/org/niatahl/scalartech/shipsystems/SecondWaveStats.java similarity index 97% rename from jars/src/data/scripts/shipsystems/tahlan_SecondWaveStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/SecondWaveStats.java index dfb75ac..a8e17ee 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_SecondWaveStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/SecondWaveStats.java @@ -1,4 +1,4 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.FighterLaunchBayAPI; @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; -public class tahlan_SecondWaveStats extends BaseShipSystemScript { +public class SecondWaveStats extends BaseShipSystemScript { public static float EXTRA_FIGHTER_DURATION = 10; public static float SPEED_BOOST = 100; diff --git a/jars/src/data/scripts/shipsystems/tahlan_SuperCruiseStats.java b/jars/src/org/niatahl/scalartech/shipsystems/SuperCruiseStats.java similarity index 92% rename from jars/src/data/scripts/shipsystems/tahlan_SuperCruiseStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/SuperCruiseStats.java index 3ec763c..888f045 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_SuperCruiseStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/SuperCruiseStats.java @@ -1,4 +1,4 @@ -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.combat.MutableShipStatsAPI; import com.fs.starfarer.api.combat.ShipAPI; @@ -6,9 +6,9 @@ import java.awt.*; -import static data.scripts.utils.tahlan_scalar_txt.txt; +import static org.niatahl.scalartech.utils.Scalar_txt.txt; -public class tahlan_SuperCruiseStats extends BaseShipSystemScript { +public class SuperCruiseStats extends BaseShipSystemScript { public void apply(MutableShipStatsAPI stats, String id, State state, float effectLevel) { diff --git a/jars/src/data/scripts/shipsystems/tahlan_SwarmerStrikeStats.java b/jars/src/org/niatahl/scalartech/shipsystems/SwarmerStrikeStats.java similarity index 95% rename from jars/src/data/scripts/shipsystems/tahlan_SwarmerStrikeStats.java rename to jars/src/org/niatahl/scalartech/shipsystems/SwarmerStrikeStats.java index 9cb5af8..8be4efe 100644 --- a/jars/src/data/scripts/shipsystems/tahlan_SwarmerStrikeStats.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/SwarmerStrikeStats.java @@ -1,13 +1,13 @@ //By Nicke535, spawns several wings of fighters to attack a target -package data.scripts.shipsystems; +package org.niatahl.scalartech.shipsystems; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.fleet.FleetMemberType; import com.fs.starfarer.api.impl.combat.BaseShipSystemScript; import com.fs.starfarer.api.mission.FleetSide; -import data.scripts.tahlan_ScalarModPlugin; -import data.scripts.util.MagicLensFlare; +import org.niatahl.scalartech.ScalarModPlugin; +import org.magiclib.util.MagicLensFlare; import org.lazywizard.lazylib.MathUtils; import org.lazywizard.lazylib.VectorUtils; import org.lazywizard.lazylib.combat.CombatUtils; @@ -18,9 +18,9 @@ import java.util.List; import static com.fs.starfarer.api.util.Misc.ZERO; -import static data.scripts.utils.tahlan_graphicLibEffects.CustomRippleDistortion; +import static org.niatahl.scalartech.utils.GraphicLibEffects.CustomRippleDistortion; -public class tahlan_SwarmerStrikeStats extends BaseShipSystemScript { +public class SwarmerStrikeStats extends BaseShipSystemScript { private final static int WINGS_TO_DEPLOY = 2; private final static float WING_SPAWN_DISTANCE_MIN = 600f; private final static float WING_SPAWN_DISTANCE_MAX = 700f; @@ -184,7 +184,7 @@ private void spawnTeleportFlash(ShipAPI fighter, boolean isLanding) { engine.addSmoothParticle(fighter.getLocation(), ZERO, 150f, 0.7f, 1f, BASIC_GLOW_COLOR); engine.addHitParticle(fighter.getLocation(), ZERO, 200f, 1f, 0.05f, Color.white); - if (tahlan_ScalarModPlugin.isGraphicsLibAvailable()) { + if (ScalarModPlugin.isGraphicsLibAvailable()) { CustomRippleDistortion(fighter.getLocation(),ZERO,60,2f,false,0f,360f,0.5f,0f,0.2f,0.2f,0.4f,0f); } } diff --git a/jars/src/data/scripts/shipsystems/ai/tahlan_BerserkAI.java b/jars/src/org/niatahl/scalartech/shipsystems/ai/tahlan_BerserkAI.java similarity index 99% rename from jars/src/data/scripts/shipsystems/ai/tahlan_BerserkAI.java rename to jars/src/org/niatahl/scalartech/shipsystems/ai/tahlan_BerserkAI.java index 43316c5..18198c5 100644 --- a/jars/src/data/scripts/shipsystems/ai/tahlan_BerserkAI.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/ai/tahlan_BerserkAI.java @@ -4,7 +4,7 @@ //It's 3:30 in the morning and I just want to sleep //Dreadnought go BRRRRRRR -package data.scripts.shipsystems.ai; +package org.niatahl.scalartech.shipsystems.ai; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.combat.ShipwideAIFlags.AIFlags; diff --git a/jars/src/data/scripts/shipsystems/ai/tahlan_SupercruiseAI.java b/jars/src/org/niatahl/scalartech/shipsystems/ai/tahlan_SupercruiseAI.java similarity index 99% rename from jars/src/data/scripts/shipsystems/ai/tahlan_SupercruiseAI.java rename to jars/src/org/niatahl/scalartech/shipsystems/ai/tahlan_SupercruiseAI.java index 3fcecf5..b06da0f 100644 --- a/jars/src/data/scripts/shipsystems/ai/tahlan_SupercruiseAI.java +++ b/jars/src/org/niatahl/scalartech/shipsystems/ai/tahlan_SupercruiseAI.java @@ -4,7 +4,7 @@ //It's 3:30 in the morning and I just want to sleep //Dreadnought go BRRRRRRR -package data.scripts.shipsystems.ai; +package org.niatahl.scalartech.shipsystems.ai; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.combat.ShipwideAIFlags.AIFlags; diff --git a/jars/src/data/scripts/utils/tahlan_graphicLibEffects.java b/jars/src/org/niatahl/scalartech/utils/GraphicLibEffects.java similarity index 98% rename from jars/src/data/scripts/utils/tahlan_graphicLibEffects.java rename to jars/src/org/niatahl/scalartech/utils/GraphicLibEffects.java index fb5de6b..33a27bb 100644 --- a/jars/src/data/scripts/utils/tahlan_graphicLibEffects.java +++ b/jars/src/org/niatahl/scalartech/utils/GraphicLibEffects.java @@ -1,7 +1,7 @@ /* By Tartiflette */ -package data.scripts.utils; +package org.niatahl.scalartech.utils; import com.fs.starfarer.api.combat.CombatEntityAPI; import org.dark.shaders.distortion.DistortionShader; @@ -13,7 +13,7 @@ import java.awt.*; -public class tahlan_graphicLibEffects { +public class GraphicLibEffects { public static void customLight(Vector2f loc, CombatEntityAPI anchor, float size, float intensity, Color color, float fadeIn, float last, float fadeOut){ StandardLight light = new StandardLight(); diff --git a/jars/src/data/scripts/utils/tahlan_scalar_txt.java b/jars/src/org/niatahl/scalartech/utils/Scalar_txt.java similarity index 76% rename from jars/src/data/scripts/utils/tahlan_scalar_txt.java rename to jars/src/org/niatahl/scalartech/utils/Scalar_txt.java index 2befb87..f5a1876 100644 --- a/jars/src/data/scripts/utils/tahlan_scalar_txt.java +++ b/jars/src/org/niatahl/scalartech/utils/Scalar_txt.java @@ -1,8 +1,8 @@ -package data.scripts.utils; +package org.niatahl.scalartech.utils; import com.fs.starfarer.api.Global; -public class tahlan_scalar_txt { +public class Scalar_txt { private static final String scalartech="scalartech"; public static String txt(String id){ return Global.getSettings().getString(scalartech, id); diff --git a/jars/src/data/scripts/weapons/tahlan_CrinkleOnHitEffect.java b/jars/src/org/niatahl/scalartech/weapons/CrinkleOnHitEffect.java similarity index 97% rename from jars/src/data/scripts/weapons/tahlan_CrinkleOnHitEffect.java rename to jars/src/org/niatahl/scalartech/weapons/CrinkleOnHitEffect.java index 4c8866e..a91c157 100644 --- a/jars/src/data/scripts/weapons/tahlan_CrinkleOnHitEffect.java +++ b/jars/src/org/niatahl/scalartech/weapons/CrinkleOnHitEffect.java @@ -1,10 +1,9 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.campaign.AsteroidAPI; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.combat.listeners.ApplyDamageResultAPI; -import data.scripts.util.MagicRender; import org.lazywizard.lazylib.MathUtils; import org.lazywizard.lazylib.combat.CombatUtils; import org.lazywizard.lazylib.combat.entities.SimpleEntity; @@ -14,7 +13,7 @@ import java.util.ArrayList; import java.util.List; -public class tahlan_CrinkleOnHitEffect implements OnHitEffectPlugin { +public class CrinkleOnHitEffect implements OnHitEffectPlugin { private static final Color CORE_EXPLOSION_COLOR = new Color(181, 224, 255, 255); private static final Color CORE_GLOW_COLOR = new Color(210, 226, 241, 150); private static final Color EXPLOSION_COLOR = new Color(190, 199, 255, 10); diff --git a/jars/src/data/scripts/weapons/tahlan_CrinkleScript.java b/jars/src/org/niatahl/scalartech/weapons/CrinkleScript.java similarity index 90% rename from jars/src/data/scripts/weapons/tahlan_CrinkleScript.java rename to jars/src/org/niatahl/scalartech/weapons/CrinkleScript.java index 3869534..2fe5f78 100644 --- a/jars/src/data/scripts/weapons/tahlan_CrinkleScript.java +++ b/jars/src/org/niatahl/scalartech/weapons/CrinkleScript.java @@ -1,4 +1,4 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.CombatEngineAPI; @@ -11,7 +11,7 @@ import static com.fs.starfarer.api.util.Misc.ZERO; -public class tahlan_CrinkleScript implements OnFireEffectPlugin { +public class CrinkleScript implements OnFireEffectPlugin { private static final Color PARTICLE_COLOR = new Color(63, 158, 215); private static final Color GLOW_COLOR = new Color(205, 234, 255, 50); diff --git a/jars/src/data/scripts/weapons/tahlan_FilamentEngineScript.java b/jars/src/org/niatahl/scalartech/weapons/FilamentEngineScript.java similarity index 97% rename from jars/src/data/scripts/weapons/tahlan_FilamentEngineScript.java rename to jars/src/org/niatahl/scalartech/weapons/FilamentEngineScript.java index e260439..d56ac06 100644 --- a/jars/src/data/scripts/weapons/tahlan_FilamentEngineScript.java +++ b/jars/src/org/niatahl/scalartech/weapons/FilamentEngineScript.java @@ -1,4 +1,4 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; @@ -7,7 +7,7 @@ import java.awt.*; -public class tahlan_FilamentEngineScript implements EveryFrameWeaponEffectPlugin { +public class FilamentEngineScript implements EveryFrameWeaponEffectPlugin { private static final float[] COLOR_NORMAL = {255f / 255f, 200f / 255f, 200f / 255f}; private static final float MAX_OPACITY = 0.9f; diff --git a/jars/src/data/scripts/weapons/tahlan_FilamentPortalBays.java b/jars/src/org/niatahl/scalartech/weapons/FilamentPortalBays.java similarity index 93% rename from jars/src/data/scripts/weapons/tahlan_FilamentPortalBays.java rename to jars/src/org/niatahl/scalartech/weapons/FilamentPortalBays.java index 261c286..2e2bae0 100644 --- a/jars/src/data/scripts/weapons/tahlan_FilamentPortalBays.java +++ b/jars/src/org/niatahl/scalartech/weapons/FilamentPortalBays.java @@ -1,12 +1,12 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.CombatEngineAPI; import com.fs.starfarer.api.combat.EveryFrameWeaponEffectPlugin; import com.fs.starfarer.api.combat.ShipAPI; import com.fs.starfarer.api.combat.WeaponAPI; -import data.scripts.tahlan_ScalarModPlugin; -import data.scripts.util.MagicLensFlare; +import org.niatahl.scalartech.ScalarModPlugin; +import org.magiclib.util.MagicLensFlare; import org.lazywizard.lazylib.combat.CombatUtils; import org.lwjgl.util.vector.Vector2f; @@ -15,13 +15,13 @@ import java.util.List; import static com.fs.starfarer.api.util.Misc.ZERO; -import static data.scripts.utils.tahlan_graphicLibEffects.CustomRippleDistortion; +import static org.niatahl.scalartech.utils.GraphicLibEffects.CustomRippleDistortion; /** * Causes fighters to seemingly "teleport" in and out of fighter bays * @author Nicke535 */ -public class tahlan_FilamentPortalBays implements EveryFrameWeaponEffectPlugin { +public class FilamentPortalBays implements EveryFrameWeaponEffectPlugin { //Store which fighters have already spawned their teleport flash, and which ones are about to private Set fightersAlreadyTeleportedIn = new HashSet<>(); private Set fightersTeleportingOut = new HashSet<>(); @@ -113,7 +113,7 @@ private void spawnTeleportFlash(ShipAPI fighter, boolean isLanding) { engine.addSmoothParticle(fighter.getLocation(), ZERO, 150f, 0.7f, 1f, BASIC_GLOW_COLOR); engine.addHitParticle(fighter.getLocation(), ZERO, 200f, 1f, 0.05f, Color.white); - if (tahlan_ScalarModPlugin.isGraphicsLibAvailable()) { + if (ScalarModPlugin.isGraphicsLibAvailable()) { CustomRippleDistortion(fighter.getLocation(),ZERO,60,2f,false,0f,360f,0.5f,0f,0.2f,0.2f,0.4f,0f); } diff --git a/jars/src/data/scripts/weapons/tahlan_FilamentRingScript.java b/jars/src/org/niatahl/scalartech/weapons/FilamentRingScript.java similarity index 96% rename from jars/src/data/scripts/weapons/tahlan_FilamentRingScript.java rename to jars/src/org/niatahl/scalartech/weapons/FilamentRingScript.java index 7e43451..856dcc0 100644 --- a/jars/src/data/scripts/weapons/tahlan_FilamentRingScript.java +++ b/jars/src/org/niatahl/scalartech/weapons/FilamentRingScript.java @@ -1,4 +1,4 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; @@ -6,7 +6,7 @@ import java.awt.*; -public class tahlan_FilamentRingScript implements EveryFrameWeaponEffectPlugin { +public class FilamentRingScript implements EveryFrameWeaponEffectPlugin { private static final float[] COLOR_NORMAL = {78f / 255f, 238f / 255f, 255f / 255f}; private static final float TIMER_MULT = 0.5f; diff --git a/jars/src/data/scripts/weapons/tahlan_LaceScript.java b/jars/src/org/niatahl/scalartech/weapons/LaceScript.java similarity index 91% rename from jars/src/data/scripts/weapons/tahlan_LaceScript.java rename to jars/src/org/niatahl/scalartech/weapons/LaceScript.java index 8066969..db67d16 100644 --- a/jars/src/data/scripts/weapons/tahlan_LaceScript.java +++ b/jars/src/org/niatahl/scalartech/weapons/LaceScript.java @@ -1,22 +1,15 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; -import com.fs.starfarer.api.util.IntervalUtil; -import org.lazywizard.lazylib.MathUtils; import org.lazywizard.lazylib.VectorUtils; -import org.lazywizard.lazylib.combat.entities.SimpleEntity; import org.lwjgl.util.vector.Vector2f; import java.awt.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; import static com.fs.starfarer.api.util.Misc.ZERO; -public class tahlan_LaceScript implements EveryFrameWeaponEffectPlugin { +public class LaceScript implements EveryFrameWeaponEffectPlugin { private static final Color PARTICLE_COLOR = new Color(100,200,255); private static final Color GLOW_COLOR = new Color(69, 206, 255, 50); diff --git a/jars/src/data/scripts/weapons/tahlan_LacetteScript.java b/jars/src/org/niatahl/scalartech/weapons/LacetteScript.java similarity index 97% rename from jars/src/data/scripts/weapons/tahlan_LacetteScript.java rename to jars/src/org/niatahl/scalartech/weapons/LacetteScript.java index 6da27d5..a825264 100644 --- a/jars/src/data/scripts/weapons/tahlan_LacetteScript.java +++ b/jars/src/org/niatahl/scalartech/weapons/LacetteScript.java @@ -1,4 +1,4 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.CombatEngineAPI; @@ -11,7 +11,7 @@ import static com.fs.starfarer.api.util.Misc.ZERO; -public class tahlan_LacetteScript implements EveryFrameWeaponEffectPlugin { +public class LacetteScript implements EveryFrameWeaponEffectPlugin { private static final Color PARTICLE_COLOR = new Color(100,200,255); private static final Color GLOW_COLOR = new Color(69, 206, 255, 50); diff --git a/jars/src/data/scripts/weapons/tahlan_OverchargeBeamEffect.java b/jars/src/org/niatahl/scalartech/weapons/OverchargeBeamEffect.java similarity index 97% rename from jars/src/data/scripts/weapons/tahlan_OverchargeBeamEffect.java rename to jars/src/org/niatahl/scalartech/weapons/OverchargeBeamEffect.java index 9632e81..ada309e 100644 --- a/jars/src/data/scripts/weapons/tahlan_OverchargeBeamEffect.java +++ b/jars/src/org/niatahl/scalartech/weapons/OverchargeBeamEffect.java @@ -1,4 +1,4 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.impl.campaign.ids.Stats; @@ -7,7 +7,7 @@ import org.lazywizard.lazylib.combat.entities.SimpleEntity; import org.lwjgl.util.vector.Vector2f; -public class tahlan_OverchargeBeamEffect implements BeamEffectPlugin { +public class OverchargeBeamEffect implements BeamEffectPlugin { private IntervalUtil effectInterval = new IntervalUtil(0.08f, 0.12f); private boolean wasZero = true; diff --git a/jars/src/data/scripts/weapons/tahlan_OverchargeBeamScript.java b/jars/src/org/niatahl/scalartech/weapons/OverchargeBeamScript.java similarity index 96% rename from jars/src/data/scripts/weapons/tahlan_OverchargeBeamScript.java rename to jars/src/org/niatahl/scalartech/weapons/OverchargeBeamScript.java index 6076887..5686dd0 100644 --- a/jars/src/data/scripts/weapons/tahlan_OverchargeBeamScript.java +++ b/jars/src/org/niatahl/scalartech/weapons/OverchargeBeamScript.java @@ -1,4 +1,4 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; @@ -9,7 +9,7 @@ import java.awt.*; -public class tahlan_OverchargeBeamScript implements EveryFrameWeaponEffectPlugin { +public class OverchargeBeamScript implements EveryFrameWeaponEffectPlugin { private final IntervalUtil effectInterval = new IntervalUtil(0.05f, 0.1f); diff --git a/jars/src/data/scripts/weapons/tahlan_RuffleOnHitEffect.java b/jars/src/org/niatahl/scalartech/weapons/RuffleOnHitEffect.java similarity index 84% rename from jars/src/data/scripts/weapons/tahlan_RuffleOnHitEffect.java rename to jars/src/org/niatahl/scalartech/weapons/RuffleOnHitEffect.java index 7f813f1..0cac631 100644 --- a/jars/src/data/scripts/weapons/tahlan_RuffleOnHitEffect.java +++ b/jars/src/org/niatahl/scalartech/weapons/RuffleOnHitEffect.java @@ -1,24 +1,14 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; -import com.fs.starfarer.api.campaign.AsteroidAPI; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.combat.listeners.ApplyDamageResultAPI; -import data.scripts.tahlan_ScalarModPlugin; -import data.scripts.util.MagicRender; -import org.lazywizard.lazylib.MathUtils; -import org.lazywizard.lazylib.combat.CombatUtils; -import org.lazywizard.lazylib.combat.entities.SimpleEntity; +import org.magiclib.util.MagicRender; import org.lwjgl.util.vector.Vector2f; import java.awt.*; -import java.util.ArrayList; -import java.util.List; -import static com.fs.starfarer.api.util.Misc.ZERO; -import static data.scripts.utils.tahlan_graphicLibEffects.CustomRippleDistortion; - -public class tahlan_RuffleOnHitEffect implements OnHitEffectPlugin { +public class RuffleOnHitEffect implements OnHitEffectPlugin { private static final Color CORE_EXPLOSION_COLOR = new Color(216, 156, 255, 255); private static final Color CORE_GLOW_COLOR = new Color(228, 213, 241, 150); private static final Color EXPLOSION_COLOR = new Color(232, 176, 255, 10); diff --git a/jars/src/data/scripts/weapons/tahlan_RuffleScript.java b/jars/src/org/niatahl/scalartech/weapons/RuffleScript.java similarity index 79% rename from jars/src/data/scripts/weapons/tahlan_RuffleScript.java rename to jars/src/org/niatahl/scalartech/weapons/RuffleScript.java index 5776442..c8405bd 100644 --- a/jars/src/data/scripts/weapons/tahlan_RuffleScript.java +++ b/jars/src/org/niatahl/scalartech/weapons/RuffleScript.java @@ -1,27 +1,15 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; -import com.fs.starfarer.api.graphics.SpriteAPI; -import com.fs.starfarer.api.util.IntervalUtil; -import data.scripts.plugins.MagicTrailPlugin; -import org.lazywizard.lazylib.MathUtils; import org.lazywizard.lazylib.VectorUtils; -import org.lazywizard.lazylib.combat.CombatUtils; -import org.lazywizard.lazylib.combat.entities.SimpleEntity; import org.lwjgl.util.vector.Vector2f; import java.awt.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; import static com.fs.starfarer.api.util.Misc.ZERO; -import static org.lwjgl.opengl.GL11.GL_ONE; -import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; -public class tahlan_RuffleScript implements EveryFrameWeaponEffectPlugin { +public class RuffleScript implements EveryFrameWeaponEffectPlugin { private static final Color PARTICLE_COLOR = new Color(215, 42, 94); private static final Color GLOW_COLOR = new Color(255, 166, 187, 50); diff --git a/jars/src/data/scripts/weapons/tahlan_ScalarAutoforgeEffect.java b/jars/src/org/niatahl/scalartech/weapons/ScalarAutoforgeEffect.java similarity index 95% rename from jars/src/data/scripts/weapons/tahlan_ScalarAutoforgeEffect.java rename to jars/src/org/niatahl/scalartech/weapons/ScalarAutoforgeEffect.java index a449f03..03f0f76 100644 --- a/jars/src/data/scripts/weapons/tahlan_ScalarAutoforgeEffect.java +++ b/jars/src/org/niatahl/scalartech/weapons/ScalarAutoforgeEffect.java @@ -1,5 +1,5 @@ //Based on Tartiflette's missileFab script. Thanks, buddy -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.characters.PersonAPI; import com.fs.starfarer.api.combat.CombatEngineAPI; @@ -12,7 +12,7 @@ import java.util.Iterator; import java.util.Map; -public class tahlan_ScalarAutoforgeEffect implements EveryFrameWeaponEffectPlugin { +public class ScalarAutoforgeEffect implements EveryFrameWeaponEffectPlugin { private boolean runOnce = false; private ShipSystemAPI theSystem; diff --git a/jars/src/data/scripts/weapons/tahlan_SeamOnHitEffect.java b/jars/src/org/niatahl/scalartech/weapons/SeamOnHitEffect.java similarity index 92% rename from jars/src/data/scripts/weapons/tahlan_SeamOnHitEffect.java rename to jars/src/org/niatahl/scalartech/weapons/SeamOnHitEffect.java index 7d82f80..7e44bfa 100644 --- a/jars/src/data/scripts/weapons/tahlan_SeamOnHitEffect.java +++ b/jars/src/org/niatahl/scalartech/weapons/SeamOnHitEffect.java @@ -1,18 +1,18 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.combat.listeners.ApplyDamageResultAPI; import com.fs.starfarer.api.loading.DamagingExplosionSpec; -import data.scripts.tahlan_ScalarModPlugin; -import data.scripts.util.MagicRender; +import org.niatahl.scalartech.ScalarModPlugin; +import org.magiclib.util.MagicRender; import org.lwjgl.util.vector.Vector2f; import java.awt.*; -import static data.scripts.utils.tahlan_graphicLibEffects.CustomRippleDistortion; +import static org.niatahl.scalartech.utils.GraphicLibEffects.CustomRippleDistortion; -public class tahlan_SeamOnHitEffect implements OnHitEffectPlugin { +public class SeamOnHitEffect implements OnHitEffectPlugin { private static final Color CORE_EXPLOSION_COLOR = new Color(124, 242, 255, 255); private static final Color CORE_GLOW_COLOR = new Color(153, 200, 241, 150); private static final Color EXPLOSION_COLOR = new Color(183, 218, 255, 10); @@ -102,7 +102,7 @@ public void onHit(DamagingProjectileAPI projectile, CombatEntityAPI target, Vect ); - if (tahlan_ScalarModPlugin.isGraphicsLibAvailable()) { + if (ScalarModPlugin.isGraphicsLibAvailable()) { CustomRippleDistortion(point,ZERO,200,3f,false,0f,360f,0.5f,0f,0.15f,0.15f,0.3f,0f); } diff --git a/jars/src/data/scripts/weapons/tahlan_SeamScript.java b/jars/src/org/niatahl/scalartech/weapons/SeamScript.java similarity index 95% rename from jars/src/data/scripts/weapons/tahlan_SeamScript.java rename to jars/src/org/niatahl/scalartech/weapons/SeamScript.java index 55a7455..3abb7ed 100644 --- a/jars/src/data/scripts/weapons/tahlan_SeamScript.java +++ b/jars/src/org/niatahl/scalartech/weapons/SeamScript.java @@ -1,4 +1,4 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.CombatEngineAPI; @@ -11,7 +11,7 @@ import static com.fs.starfarer.api.util.Misc.ZERO; -public class tahlan_SeamScript implements EveryFrameWeaponEffectPlugin { +public class SeamScript implements EveryFrameWeaponEffectPlugin { private static final Color PARTICLE_COLOR = new Color(63, 158, 215); private static final Color GLOW_COLOR = new Color(205, 234, 255, 50); diff --git a/jars/src/data/scripts/weapons/tahlan_StitchBeamEffect.java b/jars/src/org/niatahl/scalartech/weapons/StitchBeamEffect.java similarity index 92% rename from jars/src/data/scripts/weapons/tahlan_StitchBeamEffect.java rename to jars/src/org/niatahl/scalartech/weapons/StitchBeamEffect.java index 3ff3b62..6b3232c 100644 --- a/jars/src/data/scripts/weapons/tahlan_StitchBeamEffect.java +++ b/jars/src/org/niatahl/scalartech/weapons/StitchBeamEffect.java @@ -1,11 +1,10 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.impl.campaign.ids.Stats; import com.fs.starfarer.api.util.IntervalUtil; -import org.lwjgl.util.vector.Vector2f; -public class tahlan_StitchBeamEffect implements BeamEffectPlugin { +public class StitchBeamEffect implements BeamEffectPlugin { private IntervalUtil fireInterval = new IntervalUtil(0.1f, 0.2f); private boolean wasZero = true; diff --git a/jars/src/data/scripts/weapons/tahlan_TineolaOnHitEffect.java b/jars/src/org/niatahl/scalartech/weapons/TineolaOnHitEffect.java similarity index 91% rename from jars/src/data/scripts/weapons/tahlan_TineolaOnHitEffect.java rename to jars/src/org/niatahl/scalartech/weapons/TineolaOnHitEffect.java index d223417..5c2c0aa 100644 --- a/jars/src/data/scripts/weapons/tahlan_TineolaOnHitEffect.java +++ b/jars/src/org/niatahl/scalartech/weapons/TineolaOnHitEffect.java @@ -1,17 +1,17 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; import com.fs.starfarer.api.combat.listeners.ApplyDamageResultAPI; -import data.scripts.tahlan_ScalarModPlugin; -import data.scripts.util.MagicRender; +import org.niatahl.scalartech.ScalarModPlugin; +import org.magiclib.util.MagicRender; import org.lwjgl.util.vector.Vector2f; import java.awt.*; -import static data.scripts.utils.tahlan_graphicLibEffects.CustomRippleDistortion; +import static org.niatahl.scalartech.utils.GraphicLibEffects.CustomRippleDistortion; -public class tahlan_TineolaOnHitEffect implements OnHitEffectPlugin { +public class TineolaOnHitEffect implements OnHitEffectPlugin { private static final Color CORE_EXPLOSION_COLOR = new Color(255, 156, 197, 255); private static final Color CORE_GLOW_COLOR = new Color(241, 213, 220, 150); @@ -91,7 +91,7 @@ public void onHit(DamagingProjectileAPI projectile, CombatEntityAPI target, Vect 0.4f, 1.2f ); - if (tahlan_ScalarModPlugin.isGraphicsLibAvailable()) { + if (ScalarModPlugin.isGraphicsLibAvailable()) { CustomRippleDistortion(point,ZERO,400,3f,false,0f,360f,0.5f,0f,0.15f,0.15f,0.4f,0f); } diff --git a/jars/src/data/scripts/weapons/tahlan_TousleScript.java b/jars/src/org/niatahl/scalartech/weapons/TousleScript.java similarity index 93% rename from jars/src/data/scripts/weapons/tahlan_TousleScript.java rename to jars/src/org/niatahl/scalartech/weapons/TousleScript.java index b9dc449..d206c81 100644 --- a/jars/src/data/scripts/weapons/tahlan_TousleScript.java +++ b/jars/src/org/niatahl/scalartech/weapons/TousleScript.java @@ -1,28 +1,19 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.*; -import com.fs.starfarer.api.graphics.SpriteAPI; -import com.fs.starfarer.api.util.IntervalUtil; -import com.fs.starfarer.api.util.Misc; -import data.scripts.plugins.MagicTrailPlugin; import org.lazywizard.lazylib.MathUtils; import org.lazywizard.lazylib.VectorUtils; import org.lazywizard.lazylib.combat.CombatUtils; -import org.lazywizard.lazylib.combat.entities.SimpleEntity; import org.lwjgl.util.vector.Vector2f; import java.awt.*; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; import static com.fs.starfarer.api.util.Misc.ZERO; -import static org.lwjgl.opengl.GL11.GL_ONE; -import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; -public class tahlan_TousleScript implements EveryFrameWeaponEffectPlugin { +public class TousleScript implements EveryFrameWeaponEffectPlugin { private static final Color PARTICLE_COLOR = new Color(124, 242, 255); private static final Color GLOW_COLOR = new Color(104, 216, 255, 50); diff --git a/jars/src/data/scripts/weapons/tahlan_WingTrailScript.java b/jars/src/org/niatahl/scalartech/weapons/WingTrailScript.java similarity index 88% rename from jars/src/data/scripts/weapons/tahlan_WingTrailScript.java rename to jars/src/org/niatahl/scalartech/weapons/WingTrailScript.java index 83c4dab..45e24fd 100644 --- a/jars/src/data/scripts/weapons/tahlan_WingTrailScript.java +++ b/jars/src/org/niatahl/scalartech/weapons/WingTrailScript.java @@ -1,4 +1,4 @@ -package data.scripts.weapons; +package org.niatahl.scalartech.weapons; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.combat.CombatEngineAPI; @@ -8,14 +8,12 @@ import com.fs.starfarer.api.graphics.SpriteAPI; import com.fs.starfarer.api.util.IntervalUtil; import com.fs.starfarer.api.util.Misc; -import data.scripts.plugins.MagicTrailPlugin; +import org.magiclib.plugins.MagicTrailPlugin; import org.lwjgl.util.vector.Vector2f; import java.awt.*; -import static com.fs.starfarer.api.util.Misc.ZERO; - -public class tahlan_WingTrailScript implements EveryFrameWeaponEffectPlugin { +public class WingTrailScript implements EveryFrameWeaponEffectPlugin { private IntervalUtil effectInterval = new IntervalUtil(0.05f, 0.05f); private Float trailID = null; @@ -43,7 +41,9 @@ public void advance(float amount, CombatEngineAPI engine, WeaponAPI weapon) { if (trailID == null) { trailID = MagicTrailPlugin.getUniqueID(); } - MagicTrailPlugin.AddTrailMemberSimple(ship, trailID, trailSprite, + MagicTrailPlugin.addTrailMemberSimple(ship, + trailID, + trailSprite, weapon.getLocation(), 0f, angle, diff --git a/jars/src/data/scripts/world/tahlan_ScalarRelationPlugin.java b/jars/src/org/niatahl/scalartech/world/ScalarRelationPlugin.java similarity index 93% rename from jars/src/data/scripts/world/tahlan_ScalarRelationPlugin.java rename to jars/src/org/niatahl/scalartech/world/ScalarRelationPlugin.java index 776e95f..8d67293 100644 --- a/jars/src/data/scripts/world/tahlan_ScalarRelationPlugin.java +++ b/jars/src/org/niatahl/scalartech/world/ScalarRelationPlugin.java @@ -1,11 +1,11 @@ -package data.scripts.world; +package org.niatahl.scalartech.world; import com.fs.starfarer.api.campaign.FactionAPI; import com.fs.starfarer.api.campaign.SectorAPI; import com.fs.starfarer.api.campaign.SectorGeneratorPlugin; -public class tahlan_ScalarRelationPlugin implements SectorGeneratorPlugin { +public class ScalarRelationPlugin implements SectorGeneratorPlugin { //Just call initFactionRelationships: this is only intended as a means to set faction relations at start @Override diff --git a/jars/src/data/scripts/world/tahlan_Spindle.java b/jars/src/org/niatahl/scalartech/world/Spindle.java similarity index 98% rename from jars/src/data/scripts/world/tahlan_Spindle.java rename to jars/src/org/niatahl/scalartech/world/Spindle.java index 9dcccd0..bcd44a6 100644 --- a/jars/src/data/scripts/world/tahlan_Spindle.java +++ b/jars/src/org/niatahl/scalartech/world/Spindle.java @@ -1,11 +1,9 @@ -package data.scripts.world; +package org.niatahl.scalartech.world; import com.fs.starfarer.api.Global; import com.fs.starfarer.api.campaign.*; import com.fs.starfarer.api.campaign.econ.EconomyAPI; import com.fs.starfarer.api.campaign.econ.MarketAPI; -import com.fs.starfarer.api.characters.FullName; -import com.fs.starfarer.api.characters.PersonAPI; import com.fs.starfarer.api.impl.campaign.DerelictShipEntityPlugin; import com.fs.starfarer.api.impl.campaign.ids.*; import com.fs.starfarer.api.impl.campaign.procgen.*; @@ -13,7 +11,6 @@ import com.fs.starfarer.api.impl.campaign.procgen.themes.SalvageSpecialAssigner; import com.fs.starfarer.api.impl.campaign.rulecmd.salvage.special.ShipRecoverySpecial; import com.fs.starfarer.api.impl.campaign.terrain.BaseTiledTerrain; -import com.fs.starfarer.api.impl.campaign.terrain.DebrisFieldTerrainPlugin; import com.fs.starfarer.api.impl.campaign.terrain.HyperspaceTerrainPlugin; import com.fs.starfarer.api.impl.campaign.terrain.MagneticFieldTerrainPlugin; import com.fs.starfarer.api.util.Misc; @@ -25,7 +22,7 @@ import java.util.Arrays; import java.util.Random; -public class tahlan_Spindle { +public class Spindle { public void generate(SectorAPI sector) { StarSystemAPI system = sector.createStarSystem("Spindle"); diff --git a/jars/tahlan-scalartech.jar b/jars/tahlan-scalartech.jar index 114eec7..ee992a5 100644 Binary files a/jars/tahlan-scalartech.jar and b/jars/tahlan-scalartech.jar differ diff --git a/mod_info.json b/mod_info.json index 44c0fa9..1c71532 100644 --- a/mod_info.json +++ b/mod_info.json @@ -1,22 +1,20 @@ { - "id":"tahlan_scalartech", # internal id + "id":"scalartech", # internal id "name":"ScalarTech Solutions", # displayed to the player "author":"Nia Tahl", "version":"0.8.7", "description":"A small faction at the edge of the core worlds with an iron will to defend their people.", - "gameVersion":"0.95.1a-RC6", + "gameVersion":"0.96a-RC10", "jars":["jars/tahlan-scalartech.jar"], - "modPlugin":"data.scripts.tahlan_ScalarModPlugin", + "modPlugin":"org.niatahl.scalartech.ScalarModPlugin", "dependencies": [ { "id": "lw_lazylib", "name": "LazyLib", - #"version": "2.6" # If a specific version or higher is required, include this line }, { "id": "MagicLib", "name": "MagicLib", - #"version": "0.32rc2" # If a specific version is NOT required, comment out this line } ] } diff --git a/scalartech.version b/scalartech.version index 511f35c..d485597 100644 --- a/scalartech.version +++ b/scalartech.version @@ -5,7 +5,7 @@ "modVersion": { "major":0, - "minor":8, - "patch":"7" + "minor":9, + "patch":"0" }, } \ No newline at end of file