diff --git a/data/config/settings.json b/data/config/settings.json index 8dfa6f6..816bd2c 100644 --- a/data/config/settings.json +++ b/data/config/settings.json @@ -13,9 +13,15 @@ 255 ], "Tekkadan": [ - 183, - 83, - 95, + 141, + 31, + 34, + 255 + ], + "Iron-Blooded Orphans": [ + 141, + 31, + 34, 255 ], }, diff --git a/data/hullmods/AlayaVijnanaSystem.java b/data/hullmods/AlayaVijnanaSystem.java index 1ca9846..e66e1a8 100644 --- a/data/hullmods/AlayaVijnanaSystem.java +++ b/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; } } diff --git a/data/hullmods/hull_mods.csv b/data/hullmods/hull_mods.csv index 8ee72d8..155bf78 100644 --- a/data/hullmods/hull_mods.csv +++ b/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 diff --git a/data/hulls/graze_custom.ship b/data/hulls/graze_custom.ship index 32c8562..8cbb021 100644 --- a/data/hulls/graze_custom.ship +++ b/data/hulls/graze_custom.ship @@ -28,7 +28,6 @@ "builtInMods": [ "ah_reactor", "nano_armor", - "av_system" ], "center": [ 18, diff --git a/data/hulls/ship_data.csv b/data/hulls/ship_data.csv index b57a9cf..d64d06a 100644 --- a/data/hulls/ship_data.csv +++ b/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 diff --git a/data/hulls/wing_data.csv b/data/hulls/wing_data.csv index 8a38db9..55ee988 100644 --- a/data/hulls/wing_data.csv +++ b/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 diff --git a/data/strings/descriptions.csv b/data/strings/descriptions.csv index da239a3..0387311 100644 --- a/data/strings/descriptions.csv +++ b/data/strings/descriptions.csv @@ -22,9 +22,45 @@ The suit's control system has been changed as well, it is now connected to the A mobile_worker,SHIP,It is a space-use version of the ground-use TK-53 CGS Mobile Worker. Space activity was made possible due to the installation of a propellant tank and replacement of the ground-use wheels with vernier nozzles.,,, shiden,SHIP,"A mass production, general purpose model developed by Teiwaz based on the technology accumulated from the development of the Hyakuri and Hyakuren. The Shiden's Io Frame was designed from scratch, but as it shares the same design philosophy as the Hyakuri and Hyakuren's Teiwaz Frame, the two appear to be sister machines even to great technicians. Although the Io frame uses Ahab Reactor from the Calamity War era that was recovered from the Debris Zone, it is still extremely valuable as it uses the latest technology in the crafting of its frame material to its design and development.",,, shiden_custom,SHIP,A customized Shiden Mobile Suit with a shield shoulder mount and a modified single horn faceplate.,,, -graze_dainsleif,SHIP,"A Graze unit equipped with a Dáinsleif railgun mounted in place of it's left arm. A railgun modified to fire special projectiles made from the rare alloy used on mobile suit frames due to the use of superior mechanism, and during the Calamity War, they were heavily used as weapons that could even pierce nanolaminate armor.",,, +graze_dainsleif,SHIP,A Graze unit equipped with a Dáinsleif railgun mounted in place of it's left arm.,,, shiden_ryusei,SHIP,"A customized Shiden Mobile Suit with a shield shoulder mount. This is a Shiden customized for Norba Shino's use, and at his request, shoulder thrusters were added and a gauntlet is equipped as part of its standard equipment.",,, shiden_riden,SHIP,"A customized Shiden Mobile Suit with a shield shoulder mount. After Shino switched to the Gundam Flauros, his Shiden Custom was given to Ride Mass. It was then painted in a yellow-gold color scheme with a blue lightning motif on the left shoulder based on Ride's preferences.",,, ,,,,, -anti-aircraft_gun,WEAPON,"This is an Anti-Aircraft gun. It was primarily made to counter mobile suits. This makes sure that mobile suits stay far away from you.","Point Defense",, -autocannon_rear,WEAPON,"This cannon is commonly present and attached to Isaribi models. Because of it's small stature those cannons are not good to attack any ships.","Point Defense",, +man_rodi_head,WEAPON,A set of dual vulcan guns put inside the head of the Rodi. It allows it to deastroy in coming Mobile Suits.,,, +landman_rodi_head,WEAPON,A set of dual vulcan guns put inside the head of the Rodi. It allows it to deastroy in coming Mobile Suits.,,, +,,,,, +graze_custom_left,WEAPON,"A rocket firing weapon developed for Graze's use, it is mounted on a special shoulder rack. If the grips are used, the bazooka can be fired without being mounted on the rack.",,, +graze_bazooka_right,WEAPON,"A rocket firing weapon developed for Graze's use, it is mounted on a special shoulder rack. If the grips are used, the bazooka can be fired without being mounted on the rack.",,, +graze_space_bazooka_right,WEAPON,"A rocket firing weapon developed for Graze's use, it is mounted on a special shoulder rack. If the grips are used, the bazooka can be fired without being mounted on the rack.",,, +shiden_bazooka_right,WEAPON,"A rocket firing weapon developed for Graze's use, it is mounted on a special shoulder rack. If the grips are used, the bazooka can be fired without being mounted on the rack.",,, +graze_bazooka_right_h,WEAPON,"A rocket firing weapon developed for Graze's use, it is mounted on a special shoulder rack. If the grips are used, the bazooka can be fired without being mounted on the rack.",,, +shiden_bazooka_right_p,WEAPON,"A rocket firing weapon developed for Graze's use, it is mounted on a special shoulder rack. If the grips are used, the bazooka can be fired without being mounted on the rack.",,, +,,,,, +shiden_right,WEAPON,"The standard range weapon of the Shiden, it is stored on the rear skirt armor when not in use. Typically, the suit would attack using the assault rifle while protecting itself with the riot shield.",,, +shiden_custom_right,WEAPON,"The standard range weapon of the Shiden, it is stored on the rear skirt armor when not in use. Typically, the suit would attack using the assault rifle while protecting itself with the riot shield.",,, +shiden_right_p,WEAPON,"The standard range weapon of the Shiden, it is stored on the rear skirt armor when not in use. Typically, the suit would attack using the assault rifle while protecting itself with the riot shield.",,, +shiden_custom_right_p,WEAPON,"The standard range weapon of the Shiden, it is stored on the rear skirt armor when not in use. Typically, the suit would attack using the assault rifle while protecting itself with the riot shield.",,, +shiden_right_ryusei,WEAPON,"The standard range weapon of the Shiden, it is stored on the rear skirt armor when not in use. Typically, the suit would attack using the assault rifle while protecting itself with the riot shield.",,, +shiden_right_riden,WEAPON,"The standard range weapon of the Shiden, it is stored on the rear skirt armor when not in use. Typically, the suit would attack using the assault rifle while protecting itself with the riot shield.",,, +,,,,, +graze_custom_right,WEAPON,"Graze's standard shooting armament. High accuracy, high utility value as the main or support weapon. The rifle has two magazines, one on each side.",,, +graze_right,WEAPON,"Graze's standard shooting armament. High accuracy, high utility value as the main or support weapon. The rifle has two magazines, one on each side.",,, +ryusei_go_right,WEAPON,"Graze's standard shooting armament. High accuracy, high utility value as the main or support weapon. The rifle has two magazines, one on each side.",,, +ryusei_go_left,WEAPON,"Graze's standard shooting armament. High accuracy, high utility value as the main or support weapon. The rifle has two magazines, one on each side.",,, +graze_space_right,WEAPON,"Graze's standard shooting armament. High accuracy, high utility value as the main or support weapon. The rifle has two magazines, one on each side.",,, +graze_right_h,WEAPON,"Graze's standard shooting armament. High accuracy, high utility value as the main or support weapon. The rifle has two magazines, one on each side.",,, +,,,,, +man_rodi_right,WEAPON,"A simple mobile suit-use submachine gun that is widely circulated, pirates favor the weapon due to its relatively low price. It can be fired single handedly or held with both hands, and during precision firing, the stock is extended.",,, +landman_rodi_right,WEAPON,"A simple mobile suit-use submachine gun that is widely circulated, pirates favor the weapon due to its relatively low price. It can be fired single handedly or held with both hands, and during precision firing, the stock is extended.",,, +,,,,, +man_rodi_left,WEAPON,"One hand grenade can be stored behind each side skirt armor. Besides the normal explosive grenade, there is also other variations like smoke grenade and their blast timing can be altered by shooting at it.",,, +landman_rodi_left,WEAPON,"One hand grenade can be stored behind each side skirt armor. Besides the normal explosive grenade, there is also other variations like smoke grenade and their blast timing can be altered by shooting at it.",,, +,,,,, +dainsleif,WEAPON,"A railgun modified to fire special projectiles made from the rare alloy used on mobile suit frames due to the use of superior mechanism, and during the Calamity War, they were heavily used as weapons that could even pierce nanolaminate armor.",,, +,,,,, +rifle_right,WEAPON,"The Mobile Worker possess two 30mm machine guns mounted on the hardpoints on either sides. While they are able to do damage to other mobile workers, they can barely do any damage to Mobile Suits due to their Nanolaminate Armor.",,, +rifle_left,WEAPON,"The Mobile Worker possess two 30mm machine guns mounted on the hardpoints on either sides. While they are able to do damage to other mobile workers, they can barely do any damage to Mobile Suits due to their Nanolaminate Armor.",,, +,,,,, +anti-aircraft_gun,WEAPON,This is an Anti-Aircraft gun. It was primarily made to counter Mobile Suits. This makes sure that Mobile Suits stay far away from you.,,, +autocannon_fixed,WEAPON,This cannon is commonly present and attached to Isaribi models. Because of it's small stature those cannons are not good to attack any ships.,,, +autocannon_rear,WEAPON,This cannon is commonly present and attached to Isaribi models. Because of it's small stature those cannons are not good to attack any ships.,,, diff --git a/data/variants/halfbeack/halfbeack_cannon.variant b/data/variants/halfbeack/halfbeack_cannon.variant index ee83857..dbdb1a7 100644 --- a/data/variants/halfbeack/halfbeack_cannon.variant +++ b/data/variants/halfbeack/halfbeack_cannon.variant @@ -1,17 +1,31 @@ { "displayName": "Cannon", - "fluxCapacitors": 5, - "fluxVents": 14, + "fluxCapacitors": 6, + "fluxVents": 10, "hullId": "halfbeack", - "hullMods": [ - "ballistic_rangefinder" - ], + "hullMods": ["ballistic_rangefinder"], "permaMods": [], "sMods": [], "variantId": "halfbeack_cannon", "weaponGroups": [ { "autofire": false, + "mode": "ALTERNATING", + "weapons": { + "MM01": "swarmer", + "MM02": "swarmer" + } + }, + { + "autofire": false, + "mode": "ALTERNATING", + "weapons": { + "SMH01": "swarmer", + "SMH02": "swarmer" + } + }, + { + "autofire": true, "mode": "LINKED", "weapons": { "BW01": "mjolnir", @@ -20,46 +34,69 @@ } }, { - "autofire": false, + "autofire": true, "mode": "LINKED", "weapons": { - "MM01": "swarmer", - "MM02": "swarmer" + "ST05": "lightmortar", + "ST06": "lightmortar" } }, { - "autofire": false, + "autofire": true, "mode": "LINKED", "weapons": { "ST01": "vulcan", "ST02": "vulcan", - "ST03": "lightneedler", - "ST04": "lightneedler", - "ST05": "lightmortar", - "ST06": "lightmortar" + "STH01": "vulcan", + "STH02": "vulcan", + "STH03": "vulcan", + "STH04": "vulcan" } }, { "autofire": false, "mode": "LINKED", "weapons": { - "STH03": "vulcan" + "BW01": "mjolnir", + "BW02": "mjolnir", + "BW03": "mjolnir" } }, { "autofire": false, "mode": "LINKED", "weapons": { - "SMH01": "swarmer" + "MM01": "swarmer", + "MM02": "swarmer" } }, { "autofire": false, "mode": "LINKED", "weapons": { - "STH04": "vulcan" + "ST01": "vulcan", + "ST02": "vulcan", + "ST03": "lightmortar", + "ST04": "lightmortar", + "ST05": "lightmortar", + "ST06": "lightmortar" } }, + { + "autofire": false, + "mode": "LINKED", + "weapons": {"STH03": "vulcan"} + }, + { + "autofire": false, + "mode": "LINKED", + "weapons": {"SMH01": "swarmer"} + }, + { + "autofire": false, + "mode": "LINKED", + "weapons": {"STH04": "vulcan"} + }, { "autofire": false, "mode": "LINKED", @@ -71,6 +108,8 @@ } ], "wings": [ + "graze_bazooka_wing", + "graze_bazooka_wing", "graze_bazooka_wing", "graze_bazooka_wing" ] diff --git a/data/variants/halfbeack/halfbeack_dainsleif.variant b/data/variants/halfbeack/halfbeack_dainsleif.variant index 004fae7..2680f0f 100644 --- a/data/variants/halfbeack/halfbeack_dainsleif.variant +++ b/data/variants/halfbeack/halfbeack_dainsleif.variant @@ -1,7 +1,7 @@ { "displayName": "Dainsleif", - "fluxCapacitors": 3, - "fluxVents": 20, + "fluxCapacitors": 6, + "fluxVents": 10, "hullId": "halfbeack", "hullMods": [ "fluxdistributor", @@ -13,61 +13,53 @@ "weaponGroups": [ { "autofire": false, - "mode": "LINKED", + "mode": "ALTERNATING", "weapons": { - "STH03": "vulcan" + "MM01": "pilum", + "MM02": "pilum" } }, { "autofire": false, - "mode": "LINKED", + "mode": "ALTERNATING", "weapons": { - "SMH01": "swarmer" + "SMH01": "swarmer", + "SMH02": "swarmer" } }, { - "autofire": false, + "autofire": true, "mode": "LINKED", "weapons": { - "STH04": "vulcan" - } - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": { - "SMH02": "swarmer", - "STH01": "vulcan", - "STH02": "vulcan" + "BW02": "heavyneedler", + "BW03": "heavyneedler" } }, { - "autofire": false, + "autofire": true, "mode": "LINKED", "weapons": { - "MM01": "pilum" + "ST01": "lightmortar", + "ST02": "lightmortar", + "ST03": "lightmortar", + "ST04": "lightmortar", + "ST05": "lightmortar", + "ST06": "lightmortar" } }, { - "autofire": false, + "autofire": true, "mode": "LINKED", - "weapons": { - "MM02": "pilum" - } + "weapons": {"BW01": "dualflak"} }, { - "autofire": false, + "autofire": true, "mode": "LINKED", "weapons": { - "BW01": "dualflak", - "BW02": "heavyneedler", - "BW03": "heavyneedler", - "ST01": "lightmortar", - "ST02": "lightmortar", - "ST03": "lightmortar", - "ST04": "lightmortar", - "ST05": "lightmortar", - "ST06": "lightmortar" + "STH01": "vulcan", + "STH02": "vulcan", + "STH03": "vulcan", + "STH04": "vulcan" } } ], diff --git a/data/variants/halfbeack/halfbeack_distance.variant b/data/variants/halfbeack/halfbeack_distance.variant index 92e4da9..52f7c62 100644 --- a/data/variants/halfbeack/halfbeack_distance.variant +++ b/data/variants/halfbeack/halfbeack_distance.variant @@ -1,7 +1,7 @@ { "displayName": "Distance", - "fluxCapacitors": 5, - "fluxVents": 20, + "fluxCapacitors": 6, + "fluxVents": 4, "goalVariant": true, "hullId": "halfbeack", "hullMods": [ @@ -32,16 +32,12 @@ { "autofire": true, "mode": "LINKED", - "weapons": { - "BW03": "gauss" - } + "weapons": {"BW03": "gauss"} }, { "autofire": true, "mode": "LINKED", - "weapons": { - "BW02": "heavyneedler" - } + "weapons": {"BW02": "heavyneedler"} }, { "autofire": true, diff --git a/data/variants/halfbeack/halfbeack_original.variant b/data/variants/halfbeack/halfbeack_original.variant index 93a3ed3..edf7f4c 100644 --- a/data/variants/halfbeack/halfbeack_original.variant +++ b/data/variants/halfbeack/halfbeack_original.variant @@ -1,28 +1,17 @@ { "displayName": "Original", - "fluxCapacitors": 6, - "fluxVents": 12, + "fluxCapacitors": 5, + "fluxVents": 8, "goalVariant": true, "hullId": "halfbeack", - "hullMods": [ - "heavyarmor" - ], + "hullMods": ["heavyarmor"], "permaMods": [], "sMods": [], "variantId": "halfbeack_original", "weaponGroups": [ { "autofire": false, - "mode": "LINKED", - "weapons": { - "BW01": "devastator", - "BW02": "devastator", - "BW03": "devastator" - } - }, - { - "autofire": false, - "mode": "LINKED", + "mode": "ALTERNATING", "weapons": { "MM01": "annihilatorpod", "MM02": "annihilatorpod" @@ -30,44 +19,41 @@ }, { "autofire": false, - "mode": "LINKED", - "weapons": { - "ST01": "lightmg", - "ST02": "lightmg", - "ST03": "vulcan", - "ST04": "vulcan", - "ST05": "vulcan", - "ST06": "vulcan" - } - }, - { - "autofire": false, - "mode": "LINKED", + "mode": "ALTERNATING", "weapons": { - "STH03": "vulcan" + "SMH01": "swarmer", + "SMH02": "swarmer" } }, { - "autofire": false, + "autofire": true, "mode": "LINKED", "weapons": { - "SMH01": "swarmer" + "BW01": "devastator", + "BW02": "devastator", + "BW03": "devastator" } }, { - "autofire": false, + "autofire": true, "mode": "LINKED", "weapons": { + "ST03": "vulcan", + "ST04": "vulcan", + "ST05": "vulcan", + "ST06": "vulcan", + "STH01": "vulcan", + "STH02": "vulcan", + "STH03": "vulcan", "STH04": "vulcan" } }, { - "autofire": false, + "autofire": true, "mode": "LINKED", "weapons": { - "SMH02": "swarmer", - "STH01": "vulcan", - "STH02": "vulcan" + "ST01": "lightmg", + "ST02": "lightmg" } } ], diff --git a/data/variants/halfbeack_cannon.variant b/data/variants/halfbeack_cannon.variant deleted file mode 100644 index 11c26a4..0000000 --- a/data/variants/halfbeack_cannon.variant +++ /dev/null @@ -1,69 +0,0 @@ -{ - "displayName": "Cannon", - "fluxCapacitors": 5, - "fluxVents": 9, - "hullId": "halfbeack", - "hullMods": ["ballistic_rangefinder"], - "permaMods": [], - "sMods": [], - "variantId": "halfbeack_cannon", - "weaponGroups": [ - { - "autofire": false, - "mode": "LINKED", - "weapons": { - "BW01": "mjolnir", - "BW02": "mjolnir", - "BW03": "mjolnir" - } - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": { - "MM01": "swarmer", - "MM02": "swarmer" - } - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": { - "ST01": "vulcan", - "ST02": "vulcan", - "ST03": "lightneedler", - "ST04": "lightneedler", - "ST05": "lightmortar", - "ST06": "lightmortar" - } - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": {"STH03": "vulcan"} - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": {"SMH01": "swarmer"} - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": {"STH04": "vulcan"} - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": { - "SMH02": "swarmer", - "STH01": "vulcan", - "STH02": "vulcan" - } - } - ], - "wings": [ - "graze_bazooka_wing", - "graze_bazooka_wing" - ] -} \ No newline at end of file diff --git a/data/variants/halfbeack_dainsleif.variant b/data/variants/halfbeack_dainsleif.variant deleted file mode 100644 index de4452a..0000000 --- a/data/variants/halfbeack_dainsleif.variant +++ /dev/null @@ -1,68 +0,0 @@ -{ - "displayName": "Dainsleif", - "fluxCapacitors": 6, - "fluxVents": 10, - "hullId": "halfbeack", - "hullMods": [ - "fluxdistributor", - "armoredweapons" - ], - "permaMods": [], - "sMods": [], - "variantId": "halfbeack_dainsleif", - "weaponGroups": [ - { - "autofire": false, - "mode": "LINKED", - "weapons": {"STH03": "vulcan"} - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": {"SMH01": "swarmer"} - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": {"STH04": "vulcan"} - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": { - "SMH02": "swarmer", - "STH01": "vulcan", - "STH02": "vulcan" - } - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": {"MM01": "pilum"} - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": {"MM02": "pilum"} - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": { - "BW01": "dualflak", - "BW02": "heavyneedler", - "BW03": "heavyneedler", - "ST01": "lightmortar", - "ST02": "lightmortar", - "ST03": "lightmortar", - "ST04": "lightmortar", - "ST05": "lightmortar", - "ST06": "lightmortar" - } - } - ], - "wings": [ - "graze_dainsleif_wing", - "graze_dainsleif_wing" - ] -} \ No newline at end of file diff --git a/data/variants/halfbeack_distance.variant b/data/variants/halfbeack_distance.variant deleted file mode 100644 index 52f7c62..0000000 --- a/data/variants/halfbeack_distance.variant +++ /dev/null @@ -1,70 +0,0 @@ -{ - "displayName": "Distance", - "fluxCapacitors": 6, - "fluxVents": 4, - "goalVariant": true, - "hullId": "halfbeack", - "hullMods": [ - "armoredweapons", - "ballistic_rangefinder", - "targetingunit" - ], - "permaMods": [], - "sMods": [], - "variantId": "halfbeack_distance", - "weaponGroups": [ - { - "autofire": false, - "mode": "ALTERNATING", - "weapons": { - "MM01": "annihilatorpod", - "MM02": "annihilatorpod" - } - }, - { - "autofire": false, - "mode": "ALTERNATING", - "weapons": { - "SMH01": "swarmer", - "SMH02": "swarmer" - } - }, - { - "autofire": true, - "mode": "LINKED", - "weapons": {"BW03": "gauss"} - }, - { - "autofire": true, - "mode": "LINKED", - "weapons": {"BW02": "heavyneedler"} - }, - { - "autofire": true, - "mode": "LINKED", - "weapons": { - "BW01": "flak", - "STH01": "vulcan", - "STH02": "vulcan", - "STH03": "vulcan", - "STH04": "vulcan" - } - }, - { - "autofire": true, - "mode": "LINKED", - "weapons": { - "ST01": "lightmg", - "ST02": "lightmg", - "ST03": "lightmg", - "ST04": "lightmg", - "ST05": "lightmg", - "ST06": "lightmg" - } - } - ], - "wings": [ - "graze_wing", - "graze_bazooka_wing" - ] -} \ No newline at end of file diff --git a/data/variants/halfbeack_original.variant b/data/variants/halfbeack_original.variant deleted file mode 100644 index efa9bbf..0000000 --- a/data/variants/halfbeack_original.variant +++ /dev/null @@ -1,70 +0,0 @@ -{ - "displayName": "Original", - "fluxCapacitors": 5, - "fluxVents": 8, - "goalVariant": true, - "hullId": "halfbeack", - "hullMods": ["heavyarmor"], - "permaMods": [], - "sMods": [], - "variantId": "halfbeack_original", - "weaponGroups": [ - { - "autofire": false, - "mode": "LINKED", - "weapons": { - "BW01": "devastator", - "BW02": "devastator", - "BW03": "devastator" - } - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": { - "MM01": "annihilatorpod", - "MM02": "annihilatorpod" - } - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": { - "ST01": "lightmg", - "ST02": "lightmg", - "ST03": "vulcan", - "ST04": "vulcan", - "ST05": "vulcan", - "ST06": "vulcan" - } - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": {"STH03": "vulcan"} - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": {"SMH01": "swarmer"} - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": {"STH04": "vulcan"} - }, - { - "autofire": false, - "mode": "LINKED", - "weapons": { - "SMH02": "swarmer", - "STH01": "vulcan", - "STH02": "vulcan" - } - } - ], - "wings": [ - "graze_wing", - "graze_wing" - ] -} \ No newline at end of file diff --git a/data/weapons/dainsleif.wpn b/data/weapons/dainsleif.wpn index 1d544cc..16ed17a 100644 --- a/data/weapons/dainsleif.wpn +++ b/data/weapons/dainsleif.wpn @@ -2,10 +2,10 @@ "specClass": "projectile", "id": "dainsleif", "type": "BALLISTIC", - "size": "SMALL", + "size": "MEDIUM", "displayArcRadius": 40, - "turretSprite": "graphics/weapons/dainsleif_base00.png", - "hardpointSprite": "graphics/weapons/dainsleif_base00.png", + "turretSprite": "graphics/weapons/dainsleif/dainsleif00.png", + "hardpointSprite": "graphics/weapons/dainsleif/dainsleif00.png", "numFrames": 4, "frameRate": 30, "renderHints": [], @@ -31,8 +31,8 @@ "particleSizeRange": 14.0, "cloudParticleCount": 3, "cloudDuration": 1.5, - "cloudRadius": 12.0; - "blowbackParticleCount": 3, + "cloudRadius": 12.0, + "blowbackParticleCount": 3, "blowbackDuration": 0.45, "blowbackLength": 20.0, "blowbackSpread": 6.0, diff --git a/data/weapons/proj/dainsleif_shot.proj b/data/weapons/proj/dainsleif_shot.proj index eb5399c..041ca28 100644 --- a/data/weapons/proj/dainsleif_shot.proj +++ b/data/weapons/proj/dainsleif_shot.proj @@ -1,17 +1,26 @@ { - "id":"dainsleif_shot", - "specClass":"projectile", - "spawnType":"BALLISTIC", - "collisionClass":"PROJECTILE_FF", - "collisionClassByFighter":"PROJECTILE_FIGHTER", - "length":30.0, - "width":8.5, - "fadeTime":0.20, - #"fringeColor":[255,255,100,255], - #"coreColor":[255,255,200,150], - "fringeColor":[235,255,215,235], - "coreColor":[225,255,205,200], - "textureScrollSpeed":64.0, - "pixelsPerTexel":5.0, - "bulletSprite":"graphics/missiles/dainsleif_bolt.png" + "id": "dainsleif_shot", + "specClass": "projectile", + "spawnType": "BALLISTIC_AS_BEAM", + "collisionClass": "RAY", + "collisionClassByFighter": "RAY_FIGHTER", + "length": 252.0, + "width": 8.5, + "fadeTime": 1000, + "fringeColor": [ + 235, + 255, + 215, + 235 + ], + "coreColor": [ + 225, + 255, + 205, + 200 + ], + "hitGlowRadius": 100, + "textureScrollSpeed": 64.0, + "pixelsPerTexel": 5.0, + "bulletSprite": "graphics/missiles/dainsleif_spear.png" } \ No newline at end of file diff --git a/data/weapons/weapon_data.csv b/data/weapons/weapon_data.csv index a31ce4d..8dbff77 100644 --- a/data/weapons/weapon_data.csv +++ b/data/weapons/weapon_data.csv @@ -1,6 +1,6 @@ name,id,tier,rarity,base value,range,damage/second,damage/shot,emp,impact,turn rate,OPs,ammo,ammo/sec,reload size,type,energy/shot,energy/second,chargeup,chargedown,burst size,burst delay,min spread,max spread,spread/shot,spread decay/sec,beam speed,proj speed,launch speed,flight time,proj hitpoints,autofireAccBonus,extraArcForAI,hints,tags,groupTag,tech/manufacturer,for weapon tooltip>>,primaryRoleStr,speedStr,trackingStr,turnRateStr,accuracyStr,customPrimary,customPrimaryHL,customAncillary,customAncillaryHL,noDPSInTooltip,number -Head Vulcan,man_rodi_head,,,,1000,,29,,,90,4,,,,KINETIC,1,,0,0.12,1,,0,12,1,20,,1000,,,10,,,"PD, SYSTEM",,,,,,,,,,,,,,,80 -Head Vulcan,landman_rodi_head,,,,1000,,29,,,90,4,,,,KINETIC,1,,0,0.12,1,,0,12,1,20,,1000,,,10,,,"PD, SYSTEM",,,,,,,,,,,,,,,81 +Head Vulcan,man_rodi_head,,,,300,,15,,,90,,,,,KINETIC,1,,0,0.12,1,,4,12,1,20,,1000,,,10,,,"ANTI_FTR, SYSTEM",,,Pirate,,Point Defense ,,,,,,,,,,80 +Head Vulcan,landman_rodi_head,,,,300,,15,,,90,,,,,KINETIC,1,,0,0.12,1,,4,12,1,20,,1000,,,10,,,"ANTI_FTR, SYSTEM",,,Pirate,,Point Defense ,,,,,,,,,,81 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Head,graze_head,,,,1000,,,,,90,,,,,,,,,,,,,,,,,,,,,,,SYSTEM,,,,,,,,,,,,,,,100 Head,graze_head_h,,,,1000,,,,,90,,,,,,,,,,,,,,,,,,,,,,,SYSTEM,,,,,,,,,,,,,,,101 @@ -15,38 +15,38 @@ Head,graze_dainsleif_head,,,,8000,,,,,90,,,,,,,,,,,,,,,,,,,,,,,SYSTEM,,,,,,,,,,, Head,shiden_head_ryusei,,,,1000,,,,,90,,,,,,,,,,,,,,,,,,,,,,,SYSTEM,,,,,,,,,,,,,,,106 Head,shiden_head_riden,,,,1000,,,,,90,,,,,,,,,,,,,,,,,,,,,,,SYSTEM,,,,,,,,,,,,,,,110 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -GR-W02 320mm Bazooka,graze_custom_left,,,,600,,450,,50,30,4,7,,,HIGH_EXPLOSIVE,0,,0,0.5,1,,0,30,1,10,,400,50,3.75,50,,,SYSTEM,,,,,,,,,,,,,,,200 -GR-W02 320mm Bazooka,graze_bazooka_right,,,,600,,450,,50,30,4,7,,,HIGH_EXPLOSIVE,0,,0,0.5,1,,0,30,1,10,,400,50,3.75,50,,,SYSTEM,,,,,,,,,,,,,,,201 -GR-W02 320mm Bazooka,graze_space_bazooka_right,,,,600,,450,,50,30,4,7,,,HIGH_EXPLOSIVE,0,,0,0.5,1,,0,30,1,10,,400,50,3.75,50,,,SYSTEM,,,,,,,,,,,,,,,202 -GR-W02 320mm Bazooka,shiden_bazooka_right,,,,600,,450,,50,30,4,7,,,HIGH_EXPLOSIVE,0,,0,0.5,1,,0,30,1,10,,400,50,3.75,50,,,SYSTEM,,,,,,,,,,,,,,,203 -GR-W02 320mm Bazooka,graze_bazooka_right_h,,,,600,,450,,50,30,4,7,,,HIGH_EXPLOSIVE,0,,0,0.5,1,,0,30,1,10,,400,50,3.75,50,,,SYSTEM,,,,,,,,,,,,,,,204 -GR-W02 320mm Bazooka,shiden_bazooka_right_p,,,,600,,450,,50,30,4,7,,,HIGH_EXPLOSIVE,0,,0,0.5,1,,0,30,1,10,,400,50,3.75,50,,,SYSTEM,,,,,,,,,,,,,,,205 -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -JEE-205 130mm Assault Rifle,shiden_right,,,,470,,40,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,690,,,10,,,SYSTEM,,,,,,,,,,,,,,,300 -JEE-205 130mm Assault Rifle,shiden_custom_right,,,,470,,60,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,690,,,10,,,SYSTEM,,,,,,,,,,,,,,,301 -JEE-205 130mm Assault Rifle,shiden_right_p,,,,470,,50,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,690,,,10,,,SYSTEM,,,,,,,,,,,,,,,302 -JEE-205 130mm Assault Rifle,shiden_custom_right_p,,,,470,,60,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,690,,,10,,,SYSTEM,,,,,,,,,,,,,,,303 -JEE-205 130mm Assault Rifle,shiden_right_ryusei,,,,470,,60,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,690,,,10,,,SYSTEM,,,,,,,,,,,,,,,304 -JEE-205 130mm Assault Rifle,shiden_right_riden,,,,470,,60,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,690,,,10,,,SYSTEM,,,,,,,,,,,,,,,305 -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -GR-W01 120mm Rifle,graze_custom_right,,,,450,,60,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,700,,,10,,,SYSTEM,,,,,,,,,,,,,,,400 -GR-W01 120mm Rifle,graze_right,,,,450,,40,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,700,,,10,,,SYSTEM,,,,,,,,,,,,,,,401 -GR-W01 120mm Rifle,ryusei_go_right,,,,450,,60,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,700,,,10,,,SYSTEM,,,,,,,,,,,,,,,402 -GR-W01 120mm Rifle,ryusei_go_left,,,,450,,60,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,700,,,10,,,SYSTEM,,,,,,,,,,,,,,,403 -GR-W01 120mm Rifle,graze_space_right,,,,450,,40,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,700,,,10,,,SYSTEM,,,,,,,,,,,,,,,404 -GR-W01 120mm Rifle,graze_right_h,,,,450,,40,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,700,,,10,,,SYSTEM,,,,,,,,,,,,,,,405 -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -90mm Sub Machine Gun,man_rodi_right,,,,350,,30,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,1200,,,10,,,SYSTEM,,,,,,,,,,,,,,,500 -90mm Sub Machine Gun,landman_rodi_right,,,,350,,30,,,30,,90,,,KINETIC,2,,0,0.25,1,,3,7,5,8,,1200,,,10,,,SYSTEM,,,,,,,,,,,,,,,501 -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -Hand Grenade,man_rodi_left,,,,2000,,250,,50,15,4,10,,,HIGH_EXPLOSIVE,0,,0,1,1,,0,0,0,0,,170,20,25,150,,,"STRIKE, BOMB, SYSTEM",,,,,,,,,,,,,,,600 -Hand Grenade,landman_rodi_left,,,,2000,,250,,50,15,4,10,,,HIGH_EXPLOSIVE,0,,0,1,1,,0,0,0,0,,170,20,25,150,,,"STRIKE, BOMB, SYSTEM",,,,,,,,,,,,,,,601 -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -Dáinsleif,dainsleif,,,,7500,,1150,,200,30,,15,,,HIGH_EXPLOSIVE,140,,4,4,1,,3,7,1,8,,1250,,,100,,,SYSTEM,,,,,,,,,,,,,,,700 -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -Light Machine Gun,rifle_right,,,,250,,20,,,30,,90,,,KINETIC,1,,0,0.25,1,,3,7,5,8,,700,,,10,,,SYSTEM,,,,,,,,,,,,,,,800 -Light Machine Gun,rifle_left,,,,250,,20,,,30,,90,,,KINETIC,1,,0,0.25,1,,3,7,5,8,,700,,,10,,,SYSTEM,,,,,,,,,,,,,,,801 -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -Anti-Aircraft Gun,anti-aircraft_gun,1,,250,250,,25,,,75,4,,,,FRAGMENTATION,1,,0,0.05,1,,0,15,1,15,,800,,,10,,,PD,,,,,,,,,,,,,,,900 -Auto-Cannon,autocannon_fixed,,,125,600,,50,,3,10,4,,,,KINETIC,55,,0,0.5,1,,0,20,3,9,,800,,,20,,,SYSTEM,,,,,,,,,,,,,,,901 -Auto-Cannon,autocannon_rear,1,,300,600,,50,,3,10,5,,,,KINETIC,50,,0,0.6,2,0.1,0,20,3,9,,800,,,20,,,,,,,,,,,,,,,,,,902 +GR-W02 320mm Bazooka,graze_custom_left,,,,600,,450,,50,30,,5,0.35,5,HIGH_EXPLOSIVE,0,,0,0.5,1,,0,15,1,10,,400,50,3.75,50,,,SYSTEM,,,Midline,,Anti Armor,,,,,,,,,,200 +GR-W02 320mm Bazooka,graze_bazooka_right,,,,600,,450,,50,30,,5,0.35,5,HIGH_EXPLOSIVE,0,,0,0.5,1,,0,15,1,10,,400,50,3.75,50,,,SYSTEM,,,Midline,,Anti Armor,,,,,,,,,,201 +GR-W02 320mm Bazooka,graze_space_bazooka_right,,,,600,,450,,50,30,,5,0.35,5,HIGH_EXPLOSIVE,0,,0,0.5,1,,0,15,1,10,,400,50,3.75,50,,,SYSTEM,,,Midline,,Anti Armor,,,,,,,,,,202 +GR-W02 320mm Bazooka,shiden_bazooka_right,,,,600,,450,,50,30,,5,0.35,5,HIGH_EXPLOSIVE,0,,0,0.5,1,,0,15,1,10,,400,50,3.75,50,,,SYSTEM,,,Midline,,Anti Armor,,,,,,,,,,203 +GR-W02 320mm Bazooka,graze_bazooka_right_h,,,,600,,450,,50,30,,5,0.35,5,HIGH_EXPLOSIVE,0,,0,0.5,1,,0,15,1,10,,400,50,3.75,50,,,SYSTEM,,,Midline,,Anti Armor,,,,,,,,,,204 +GR-W02 320mm Bazooka,shiden_bazooka_right_p,,,,600,,450,,50,30,,5,0.35,5,HIGH_EXPLOSIVE,0,,0,0.5,1,,0,15,1,10,,400,50,3.75,50,,,SYSTEM,,,Midline,,Anti Armor,,,,,,,,,,205 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +JEE-205 130mm Assault Rifle,shiden_right,,,,480,,62,,,30,,90,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,690,,,10,,,SYSTEM,,,Midline,,Anti Shield,,,,,,,,,,300 +JEE-205 130mm Assault Rifle,shiden_custom_right,,,,480,,62,,,30,,90,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,690,,,10,,,SYSTEM,,,Midline,,Anti Shield,,,,,,,,,,301 +JEE-205 130mm Assault Rifle,shiden_right_p,,,,480,,62,,,30,,90,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,690,,,10,,,SYSTEM,,,Midline,,Anti Shield,,,,,,,,,,302 +JEE-205 130mm Assault Rifle,shiden_custom_right_p,,,,480,,62,,,30,,90,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,690,,,10,,,SYSTEM,,,Midline,,Anti Shield,,,,,,,,,,303 +JEE-205 130mm Assault Rifle,shiden_right_ryusei,,,,480,,62,,,30,,90,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,690,,,10,,,SYSTEM,,,Midline,,Anti Shield,,,,,,,,,,304 +JEE-205 130mm Assault Rifle,shiden_right_riden,,,,480,,62,,,30,,90,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,690,,,10,,,SYSTEM,,,Midline,,Anti Shield,,,,,,,,,,305 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +GR-W01 120mm Rifle,graze_custom_right,,,,450,,55,,,30,,100,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,700,,,10,,,SYSTEM,,,Midline,,Anti Shield,,,,,,,,,,400 +GR-W01 120mm Rifle,graze_right,,,,450,,55,,,30,,100,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,700,,,10,,,SYSTEM,,,Midline,,Anti Shield,,,,,,,,,,401 +GR-W01 120mm Rifle,ryusei_go_right,,,,450,,55,,,30,,100,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,700,,,10,,,SYSTEM,,,Midline,,Anti Shield,,,,,,,,,,402 +GR-W01 120mm Rifle,ryusei_go_left,,,,450,,55,,,30,,100,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,700,,,10,,,SYSTEM,,,Midline,,Anti Shield,,,,,,,,,,403 +GR-W01 120mm Rifle,graze_space_right,,,,450,,55,,,30,,100,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,700,,,10,,,SYSTEM,,,Midline,,Anti Shield,,,,,,,,,,404 +GR-W01 120mm Rifle,graze_right_h,,,,450,,55,,,30,,100,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,700,,,10,,,SYSTEM,,,Midline,,Anti Shield,,,,,,,,,,405 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +90mm Sub Machine Gun,man_rodi_right,,,,350,,40,,,30,,80,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,1200,,,10,,,SYSTEM,,,Low Tech,,Anti Shield,,,,,,,,,,500 +90mm Sub Machine Gun,landman_rodi_right,,,,350,,40,,,30,,80,,,KINETIC,2,,0,0.25,1,,1,4,5,8,,1200,,,10,,,SYSTEM,,,Low Tech,,Anti Shield,,,,,,,,,,501 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +Hand Grenade,man_rodi_left,,,,800,,300,,50,15,,8,,,HIGH_EXPLOSIVE,0,,0,1,1,,0,0,0,0,,170,20,25,150,,,"STRIKE, BOMB, SYSTEM",,,Low Tech,,Strike,,,,,,,,,,600 +Hand Grenade,landman_rodi_left,,,,800,,300,,50,15,,8,,,HIGH_EXPLOSIVE,0,,0,1,1,,0,0,0,0,,170,20,25,150,,,"STRIKE, BOMB, SYSTEM",,,Low Tech,,Strike,,,,,,,,,,601 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +Dáinsleif,dainsleif,,,,7500,,1000,,200,0,,12,,,ENERGY,400,,3.5,1.5,1,,3,10,1,8,,2400,,,100,,,"SYSTEM , SHOW_IN_CODEX, STRIKE",,,Gjallarhorn,,Anti Capital Ship,,,The ship it is mounted needs to turn,,,,,,,700 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +30mm Machine Gun,rifle_right,,,,250,,20,,,30,,,,,KINETIC,1,,0,0.25,1,,3,7,5,8,,700,,,10,,,SYSTEM,,,Low Tech,,Anti Armor,,,,,,,,,,800 +30mm Machine Gun,rifle_left,,,,250,,20,,,30,,,,,KINETIC,1,,0,0.25,1,,3,7,5,8,,700,,,10,,,SYSTEM,,,Low Tech,,Anti Armor,,,,,,,,,,801 +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +Anti-Aircraft Gun,anti-aircraft_gun,1,,250,250,,25,,,75,4,,,,FRAGMENTATION,1,,0,0.05,1,,0,15,1,15,,800,,,10,,,"ANTI_FTR, PD_ONLY",,,Low Tech,,Point Defense ,,,,,,,,,,900 +Auto-Cannon,autocannon_fixed,,,125,600,,50,,3,10,4,,,,KINETIC,55,,0,0.5,1,,0,20,3,9,,800,,,20,,,SYSTEM,,,Low Tech,,Point Defense ,,,,,,,,,,901 +Auto-Cannon,autocannon_rear,1,,300,600,,50,,3,10,5,,,,KINETIC,50,,0,0.6,2,0.1,0,20,3,9,,800,,,20,,,SYSTEM,,,Low Tech,,Point Defense ,,,,,,,,,,902 diff --git a/graphics/missiles/dainsleif_spear.png b/graphics/missiles/dainsleif_spear.png new file mode 100644 index 0000000..d84b04b Binary files /dev/null and b/graphics/missiles/dainsleif_spear.png differ diff --git a/graphics/weapons/dainsleif/dainsleif00.png b/graphics/weapons/dainsleif/dainsleif00.png new file mode 100644 index 0000000..d93a98e Binary files /dev/null and b/graphics/weapons/dainsleif/dainsleif00.png differ diff --git a/graphics/weapons/dainsleif/dainsleif01.png b/graphics/weapons/dainsleif/dainsleif01.png new file mode 100644 index 0000000..be60663 Binary files /dev/null and b/graphics/weapons/dainsleif/dainsleif01.png differ diff --git a/graphics/weapons/dainsleif/dainsleif02.png b/graphics/weapons/dainsleif/dainsleif02.png new file mode 100644 index 0000000..9b41800 Binary files /dev/null and b/graphics/weapons/dainsleif/dainsleif02.png differ diff --git a/graphics/weapons/dainsleif/dainsleif03.png b/graphics/weapons/dainsleif/dainsleif03.png new file mode 100644 index 0000000..96cd4df Binary files /dev/null and b/graphics/weapons/dainsleif/dainsleif03.png differ diff --git a/graphics/weapons/dainsleif_base00.png b/graphics/weapons/dainsleif_base00.png deleted file mode 100644 index 130c9ba..0000000 Binary files a/graphics/weapons/dainsleif_base00.png and /dev/null differ diff --git a/graphics/weapons/dainsleif_base01.png b/graphics/weapons/dainsleif_base01.png deleted file mode 100644 index 48c1d2d..0000000 Binary files a/graphics/weapons/dainsleif_base01.png and /dev/null differ diff --git a/graphics/weapons/dainsleif_base02.png b/graphics/weapons/dainsleif_base02.png deleted file mode 100644 index 57bb96a..0000000 Binary files a/graphics/weapons/dainsleif_base02.png and /dev/null differ diff --git a/graphics/weapons/dainsleif_base03.png b/graphics/weapons/dainsleif_base03.png deleted file mode 100644 index d8cb7db..0000000 Binary files a/graphics/weapons/dainsleif_base03.png and /dev/null differ diff --git a/jars/ibo-faction.jar b/jars/ibo-faction.jar index 1f92212..6c50aa7 100644 Binary files a/jars/ibo-faction.jar and b/jars/ibo-faction.jar differ