Merge pull request #46 from Laroustine/45-rework-dainsleif

Rework Weapons and Fighters

data/config/settings.json

@@ -13,9 +13,15 @@
 			255
 		],
 		"Tekkadan": [
-			183,
-			83,
-			95,
+			141,
+			31,
+			34,
+			255
+		],
+		"Iron-Blooded Orphans": [
+			141,
+			31,
+			34,
 			255
 		],
 	},

data/hullmods/AlayaVijnanaSystem.java

@@ -15,20 +15,23 @@
 public class AlayaVijnanaSystem extends BaseHullMod {
 
   public static final float MANEUVER_BONUS = 50.0f;
+  public static final float ACCURACY_BONUS = 80.0f;
 
   public void applyEffectsBeforeShipCreation(
     HullSize hullSize,
     MutableShipStatsAPI stats,
     String id
   ) {
-    stats.getAcceleration().modifyPercent(id, MANEUVER_BONUS * 2f);
-    stats.getDeceleration().modifyPercent(id, MANEUVER_BONUS);
-    stats.getTurnAcceleration().modifyPercent(id, MANEUVER_BONUS * 2f);
-    stats.getMaxTurnRate().modifyPercent(id, MANEUVER_BONUS);
+    stats.getAutofireAimAccuracy().modifyPercent(id, 100 + ACCURACY_BONUS);
+    stats.getAcceleration().modifyPercent(id, 100 + MANEUVER_BONUS);
+    stats.getDeceleration().modifyPercent(id, 100 + MANEUVER_BONUS);
+    stats.getTurnAcceleration().modifyPercent(id, 100 + MANEUVER_BONUS);
+    stats.getMaxTurnRate().modifyPercent(id, 100 + MANEUVER_BONUS);
   }
 
   public String getDescriptionParam(int index, HullSize hullSize) {
     if (index == 0) return "" + (int) MANEUVER_BONUS + "%";
+    if (index == 1) return "" + (int) ACCURACY_BONUS + "%";
     return null;
   }
 }

data/hullmods/hull_mods.csv

@@ -1,5 +1,5 @@
 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
 Nanolaminate Armor,nano_armor,1,,High Tech,defensive,Defenses,2800,,,,8,16,20,40,data.hullmods.NanolaminateArmor,A special metal paint that reacts to Ahab Particles is vapor-deposited onto the surface of the armor of Mobile Suits and ships. Reduce Beam dammage by %s and Energy dammage by %s. Increases Flux cost by %s.,Reduce Beam dammage by %s and Energy dammage by %s. Increases Flux cost by %s.,graphics/hullmods/nano_armor.png
-Alaya-Vijnana System,av_system,0,,Gjallarhorn,special,,100,,TRUE,,0,0,0,0,data.hullmods.AlayaVijnanaSystem,"The Alaya-Vijnana System creates a pseudo-brain lobe in the pilot's body using nano-machines, and this allows the pilot's brain to directly process mobile suit data fed through the physical connection. As the pseudo-brain lobe also governs spatial awareness so the pilot's spatial awareness is enhanced. Increasing maneuverability by %s.",Increases fighter manevuerability by %s.,graphics/hullmods/av_system.png
+Alaya-Vijnana System,av_system,0,,Gjallarhorn,special,,100,,TRUE,,0,0,0,0,data.hullmods.AlayaVijnanaSystem,"The Alaya-Vijnana System creates a pseudo-brain lobe in the pilot's body using nano-machines, and this allows the pilot's brain to directly process mobile suit data fed through the physical connection. As the pseudo-brain lobe also governs spatial awareness so the pilot's spatial awareness is enhanced. Increasing maneuverability by %s and accuracy by %s.",Increases manevuerability by %s and accuracy by %s.,graphics/hullmods/av_system.png
 Catapult MS,catapult_ms,1,,High Tech,special,,4000,,,,4,8,12,16,data.hullmods.CatapultMS,The Catapult MS is a tool to send fighters longer into battle. It mutliplies by %s the fighter longevity.,It mutliplies by %s the fighter longevity,graphics/hullmods/catapult_ms.png
 Ahab Reactor,ah_reactor,2,,High Tech,special,,8000,,,,8,12,16,20,data.hullmods.AhabReactor,"High output reactors invented by a scientist named Ahab Balaena and named after him, they are commonly used as power-plants in mobile suits and ships. Increases flux capacity by %s/%s/%s/%s and flux dissipation by %s/%s/%s/%s but increases sensor profile %s.",Increases flux capacity by %s/%s/%s/%s and flux dissipation by %s/%s/%s/%s but increases sensor profile %s.,graphics/hullmods/ah_reactor.png

data/hulls/graze_custom.ship

@@ -28,7 +28,6 @@
   "builtInMods": [
     "ah_reactor",
     "nano_armor",
-    "av_system"
   ],
   "center": [
     18,

data/hulls/ship_data.csv

@@ -1,6 +1,5 @@
 name,id,designation,tech/manufacturer,system id,fleet pts,hitpoints,armor rating,max flux,8/6/5/4%,flux dissipation,ordnance points,fighter bays,max speed,acceleration,deceleration,max turn rate,turn acceleration,mass,shield type,defense id,shield arc,shield upkeep,shield efficiency,phase cost,phase upkeep,min crew,max crew,cargo,fuel,fuel/ly,range,max burn,base value,cr %/day,CR to deploy,peak CR sec,CR loss/sec,supplies/rec,supplies/mo,c/s,c/f,f/s,f/f,crew/s,crew/f,hints,tags,rarity,breakProb,minPieces,maxPieces,travel drive,number
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 Mobile Worker,mobile_worker,,Tekkadan,,,150,65,500,,100,0,,185,135,100,90,180,1,NONE,,0,0,0,,,1,1,,,,,,,,,,,,,,,,,,,,,,0,0,0,,1
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 Man Rodi,rodi_man,,Pirate,,,1250,265,900,,150,0,,165,125,100,90,180,30,NONE,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,0.25,0,2,,2
@@ -10,7 +9,7 @@ Shiden Custom,shiden_custom,,Teiwaz,maneuveringjets,,1450,210,2000,,250,0,,265,1
 Ryusei-Go III,shiden_ryusei,,Tekkadan,maneuveringjets,,1650,250,2100,,250,0,,265,165,125,90,180,28,NONE,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,0.25,0,2,,15
 Graze,graze,,Gjallarhorn,,,1300,200,750,,140,0,,175,125,100,90,180,28,NONE,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,0.25,0,2,,11
 Graze Custom,graze_custom,,Tekkadan,fastmissileracks,,1650,215,2000,,250,0,,265,165,100,90,180,26,NONE,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,0.25,0,2,,13
-Graze Dainsleif,graze_dainsleif,,Gjallarhorn,,,1200,170,800,,150,0,,110,100,100,50,180,38,NONE,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,0.25,0,2,,14
+Graze Dainsleif,graze_dainsleif,,Gjallarhorn,,,1200,170,800,,150,0,,100,100,100,50,180,38,NONE,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,0.25,0,2,,14
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 Isaribi,isaribi,Destroyer,Low Tech,flarelauncher,10,4500,850,2250,,300,70,2,80,60,40,25,30,400,NONE,,0,0,0,,,25,80,60,30,2,15,9,80000,5,10,120,0.25,4,4,,,,,,,CARRIER,"lowtech_bp, tek_bp",,0.6,2,3,,19
 Halfbeack,halfbeack,Battleship,Gjallarhorn,,22,8000,1800,8000,5000,180,145,2,100,25,15,20,25,2800,NONE,,0,0,0,,,30,400,420,280,3,100,7,200000,5,15,380,0.22,22,18,,,,,,,COMBAT,gja_bp,,0.6,2,3,,20

data/hulls/wing_data.csv

@@ -1,25 +1,25 @@
-id,variant,tags,tier,rarity,fleet pts,op cost,formation,range,attackRunRange,num,role,role desc,refit,base value,Column,Column [1],Column [2],Column [3],Column [4],Column [5],Column [6],Column [7],Column [8],Column [9],Column [10],Column [11],number,
-mobile_worker_wing,mobile_worker,"fighter1, fighter, low, base_bp",0,,0,0,BOX,4000,500,6,FIGHTER,Fighter,35,850,,,,,,,,,,,,,1195,
+id,variant,tags,tier,rarity,fleet pts,op cost,formation,range,attackRunRange,attackPositionOffset,num,role,role desc,refit,base value,Column,Column [1],Column [2],Column [3],Column [4],Column [5],Column [6],Column [7],Column [8],Column [9],Column [10],Column [11],number
+mobile_worker_wing,mobile_worker,"support1, fighter, base_bp, merc",0,,0,0,BOX,4000,500,,6,SUPPORT,Support,35,850,,,,,,,,,,,,,1195
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-rodi_man_wing,rodi_man,"fighter2, fighter, low, rodi_bp, pirate_bp",0,,9,7,V,4000,500,2,FIGHTER,Mobile Suit,15,3000,,,,,,,,,,,,,1193,
-rodi_landman_wing,rodi_landman,"fighter2, fighter, low, rodi_bp, tek_bp",0,,9,7,V,4000,500,2,FIGHTER,Mobile Suit,15,3000,,,,,,,,,,,,,1194,
-,,,,,,,,,,,,,,,,,,,,,,,,,,,
-graze_wing,graze,"fighter2, fighter, high, graze_bp, gja_bp",0,,8,5,V,4000,500,3,FIGHTER,Mobile Suit,25,4000,,,,,,,,,,,,,1195,
-graze_h_wing,graze_h,"fighter2, fighter, high, graze_bp, hegemony",2,,8,5,V,4000,500,3,FIGHTER,Mobile Suit,25,4500,,,,,,,,,,,,,1207,
-graze_space_wing,graze_space,"fighter2, fighter, high, graze_bp, gja_bp",2,,8,5,V,4000,500,3,FIGHTER,Mobile Suit,25,4000,,,,,,,,,,,,,1199,
-graze_bazooka_wing,graze_bazooka,"fighter2, fighter, high, graze_bp, gja_bp",2,,8,5,V,4000,1000,2,BOMBER,Mobile Suit Bazooka,25,5000,,,,,,,,,,,,,1202,
-graze_bazooka_h_wing,graze_bazooka_h,"fighter2, fighter, high, graze_bp, hegemony",2,,8,5,V,4000,1000,2,BOMBER,Mobile Suit Bazooka,25,5500,,,,,,,,,,,,,1208,
-graze_space_bazooka_wing,graze_space_bazooka,"fighter2, fighter, high, graze_bp, gja_bp",2,,8,5,V,4000,1000,2,BOMBER,Mobile Suit Bazooka,25,5000,,,,,,,,,,,,,1201,
-graze_dainsleif_wing,graze_dainsleif,"fighter2, fighter, high, graze_bp, gja_bp, no_bp_drop",4,0.025,15,20,BOX,1000,4000,2,BOMBER,Mobile Suit Anti-Ship,25,16000,,,,,,,,,,,,,1200,
-,,,,,,,,,,,,,,,,,,,,,,,,,,,
-graze_custom_wing,graze_custom,"fighter4, fighter, high, no_bp_drop, tek_bp",3,0.25,12,10,V,5000,500,1,FIGHTER,Mobile Suit Stolen,10,8000,,,,,,,,,,,,,1192
-ryusei_go_wing,ryusei_go,"fighter4, fighter, high, rare_bp, tek_bp",3,0.05,12,10,V,5000,500,1,FIGHTER,Mobile Suit Custom,10,8000,,,,,,,,,,,,,1196
-shiden_ryusei_wing,shiden_ryusei,"fighter4, fighter, mid, shiden_bp, rare_bp, tek_bp",3,0.05,12,10,V,5000,500,1,FIGHTER,Mobile Suit,10,8000,,,,,,,,,,,,,1198
-shiden_riden_wing,shiden_riden,"fighter4, fighter, mid, shiden_bp, rare_bp, tek_bp",3,0.05,12,10,V,5000,500,1,FIGHTER,Mobile Suit,10,8000,,,,,,,,,,,,,1198
-,,,,,,,,,,,,,,,,,,,,,,,,,,,
-shiden_wing,shiden,"fighter2, fighter, mid, shiden_bp, teiwaz_bp",0,,7,6,V,4000,500,3,FIGHTER,Mobile Suit,25,4000,,,,,,,,,,,,,1197,
-shiden_p_wing,shiden_p,"fighter2, fighter, mid, shiden_bp, persean",0,,7,6,V,4000,500,3,FIGHTER,Mobile Suit,25,4500,,,,,,,,,,,,,1204,
-shiden_custom_wing,shiden_custom,"fighter4, fighter, mid, shiden_bp, teiwaz_bp",3,0.05,12,10,V,5000,500,1,FIGHTER,Mobile Suit,10,8000,,,,,,,,,,,,,1198,
-shiden_bazooka_wing,shiden_bazooka,"fighter2, fighter, mid, shiden_bp, teiwaz_bp",2,,8,5,V,4000,500,2,BOMBER,Mobile Suit Bazooka,25,4000,,,,,,,,,,,,,1203,
-shiden_bazooka_p_wing,shiden_bazooka_p,"fighter2, fighter, mid, shiden_bp, persean",2,,8,5,V,4000,500,2,BOMBER,Mobile Suit Bazooka,25,4500,,,,,,,,,,,,,1206,
-shiden_custom_p_wing,shiden_custom_p,"fighter4, fighter, mid, shiden_bp, persean",3,0.05,12,10,V,5000,500,1,FIGHTER,Mobile Suit,10,8000,,,,,,,,,,,,,1205,
+rodi_man_wing,rodi_man,"fighter2, fighter, rodi_bp, pirate_bp, merc",0,,8,7,V,5000,500,-500,2,FIGHTER,Mobile Suit,15,3000,,,,,,,,,,,,,1193
+rodi_landman_wing,rodi_landman,"fighter2, fighter, rodi_bp, tek_bp, merc",0,,8,7,V,5000,500,-500,2,FIGHTER,Mobile Suit,15,3000,,,,,,,,,,,,,1194
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+graze_wing,graze,"interceptor2, interceptor, graze_bp, gja_bp",2,,6,5,V,4000,500,100,3,INTERCEPTOR,Mobile Suit,25,4000,,,,,,,,,,,,,1195
+graze_h_wing,graze_h,"interceptor2, interceptor, graze_bp, hegemony",2,,6,5,V,4000,500,100,3,INTERCEPTOR,Mobile Suit,25,4500,,,,,,,,,,,,,1207
+graze_space_wing,graze_space,"interceptor2, interceptor, graze_bp, gja_bp",2,,6,5,V,4000,500,100,3,INTERCEPTOR,Mobile Suit,25,4000,,,,,,,,,,,,,1199
+graze_bazooka_wing,graze_bazooka,"bomber2, bomber, graze_bp, gja_bp",2,,6,5,V,4000,1000,500,3,BOMBER,Mobile Suit Bazooka,25,5000,,,,,,,,,,,,,1202
+graze_bazooka_h_wing,graze_bazooka_h,"bomber2, bomber, graze_bp, hegemony",2,,6,5,V,4000,1000,500,3,BOMBER,Mobile Suit Bazooka,25,5500,,,,,,,,,,,,,1208
+graze_space_bazooka_wing,graze_space_bazooka,"bomber2, bomber, graze_bp, gja_bp",2,,6,5,V,4000,1000,500,3,BOMBER,Mobile Suit Bazooka,25,5000,,,,,,,,,,,,,1201
+graze_dainsleif_wing,graze_dainsleif,"bomber4, bomber, graze_bp, gja_bp, no_bp_drop",4,0.025,14,20,BOX,500,10000,2000,2,BOMBER,Mobile Suit Anti-Ship,40,18000,,,,,,,,,,,,,1200
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+graze_custom_wing,graze_custom,"fighter4, fighter, no_bp_drop, tek_bp, independent_of_carrier",3,0.25,9,8,V,5000,500,-100,1,FIGHTER,Mobile Suit Stolen,10,8000,,,,,,,,,,,,,1192
+ryusei_go_wing,ryusei_go,"interceptor4, interceptor, rare_bp, hist1t, tek_bp, independent_of_carrier",3,0.05,9,8,V,5000,500,-100,1,INTERCEPTOR,Mobile Suit Custom,10,8000,,,,,,,,,,,,,1196
+shiden_ryusei_wing,shiden_ryusei,"fighter4, fighter, shiden_bp, rare_bp, tek_bp, independent_of_carrier",3,0.05,9,8,V,5000,500,-100,1,FIGHTER,Mobile Suit,10,8000,,,,,,,,,,,,,1198
+shiden_riden_wing,shiden_riden,"fighter4, fighter, shiden_bp, rare_bp, tek_bp, independent_of_carrier",3,0.05,9,8,V,5000,500,-100,1,FIGHTER,Mobile Suit,10,8000,,,,,,,,,,,,,1198
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+shiden_wing,shiden,"interceptor2, interceptor, shiden_bp, teiwaz_bp, merc",2,,6,6,V,4000,500,100,3,INTERCEPTOR,Mobile Suit,25,4000,,,,,,,,,,,,,1197
+shiden_p_wing,shiden_p,"interceptor2, interceptor, shiden_bp, persean",2,,6,6,V,4000,500,100,3,INTERCEPTOR,Mobile Suit,25,4500,,,,,,,,,,,,,1204
+shiden_custom_wing,shiden_custom,"fighter4, fighter, shiden_bp, teiwaz_bp",3,0.05,9,8,V,5000,500,-100,1,FIGHTER,Mobile Suit,10,8000,,,,,,,,,,,,,1198
+shiden_bazooka_wing,shiden_bazooka,"bomber2, bomber, shiden_bp, teiwaz_bp, merc",2,,6,6,V,4000,500,500,3,BOMBER,Mobile Suit Bazooka,25,4000,,,,,,,,,,,,,1203
+shiden_bazooka_p_wing,shiden_bazooka_p,"bomber2, bomber, shiden_bp, persean",2,,6,6,V,4000,500,500,3,BOMBER,Mobile Suit Bazooka,25,4500,,,,,,,,,,,,,1206
+shiden_custom_p_wing,shiden_custom_p,"fighter4, fighter, shiden_bp, persean",3,0.05,9,8,V,5000,500,-100,1,FIGHTER,Mobile Suit,10,8000,,,,,,,,,,,,,1205