Skip to content

Commit

Permalink
Full package structure refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
niatahl committed May 21, 2023
1 parent 1c57a0c commit d63bc38
Show file tree
Hide file tree
Showing 140 changed files with 528 additions and 598 deletions.
5 changes: 5 additions & 0 deletions Changelog.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion data/campaign/industries.csv
Original file line number Diff line number Diff line change
@@ -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
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
2 changes: 1 addition & 1 deletion data/campaign/market_conditions.csv
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion data/campaign/submarkets.csv
Original file line number Diff line number Diff line change
@@ -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
19 changes: 17 additions & 2 deletions data/config/engine_styles.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
},
}

144 changes: 72 additions & 72 deletions data/config/indEvo/reverse_engineering_whitelist.csv
Original file line number Diff line number Diff line change
@@ -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,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
4 changes: 2 additions & 2 deletions data/config/vayraBounties/unique_bounty_data.csv
Original file line number Diff line number Diff line change
@@ -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,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Expand Down
18 changes: 9 additions & 9 deletions data/hullmods/hull_mods.csv
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
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.

Due to interfering with the necessary subsystems, %s will %s these effects and %s will disable them entirely.

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
6 changes: 3 additions & 3 deletions data/hulls/tahlan_angora.ship
Original file line number Diff line number Diff line change
Expand Up @@ -145,23 +145,23 @@
"width": 16.720409,
"angle": 157,
"contrailSize": 16.720409,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
},
{
"location": [20, -69.5],
"length": 44.287212,
"width": 16.720409,
"angle": -157,
"contrailSize": 16.720409,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
},
{
"location": [-78.5, -0],
"length": 52,
"width": 23,
"angle": 180,
"contrailSize": 23,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
},
{
"location": [21, 69],
Expand Down
22 changes: 11 additions & 11 deletions data/hulls/tahlan_belt.ship
Original file line number Diff line number Diff line change
Expand Up @@ -77,55 +77,55 @@
"width": 26,
"angle": 180,
"contrailSize": 26,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
},
{
"location": [-60.5, 33.5],
"length": 26.5,
"width": 7,
"angle": 180,
"contrailSize": 7,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
},
{
"location": [-60.5, -33.5],
"length": 26.5,
"width": 7,
"angle": -180,
"contrailSize": 7,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
},
{
"location": [-60.5, 40],
"length": 30,
"width": 10,
"angle": 180,
"contrailSize": 30,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
},
{
"location": [-60.5, -40],
"length": 30,
"width": 10,
"angle": -180,
"contrailSize": 30,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
},
{
"location": [-36, 12.5],
"length": 26,
"width": 7,
"angle": 180,
"contrailSize": 7,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
},
{
"location": [-36, -12.5],
"length": 26,
"width": 7,
"angle": -180,
"contrailSize": 7,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
},
{
"location": [-32.5, -0],
Expand All @@ -141,31 +141,31 @@
"width": 14.473699,
"angle": 94.5,
"contrailSize": 128,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
},
{
"location": [54, -62],
"length": 15.479922,
"width": 14.473699,
"angle": -94.5,
"contrailSize": 128,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
},
{
"location": [6, 63.5],
"length": 15.479922,
"width": 14.473699,
"angle": 114.5,
"contrailSize": 128,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
},
{
"location": [6, -63.5],
"length": 15.479922,
"width": 14.473699,
"angle": -114.5,
"contrailSize": 128,
"style": "HIGH_TECH"
"style": "TAHLAN_SCALAR_ENGINE"
}
],
"bounds": [
Expand Down
Loading

0 comments on commit d63bc38

Please sign in to comment.