Merge pull request #19 from Laroustine/variant

MS Update and Sound
Laroustine · Mar 23, 2022 · 85b0f22 · 85b0f22
2 parents d2fa9ec + 793f0db
commit 85b0f22
Show file tree

Hide file tree

Showing 72 changed files with 1,234 additions and 648 deletions.
diff --git a/data/campaign/sim_opponents.csv b/data/campaign/sim_opponents.csv
@@ -1,5 +1,6 @@
 variant id
 halfbeack_original
 halfbeack_cannon
+halfbeack_dainsleif
 isaribi_standard
 isaribi_strike
diff --git a/data/campaign/sim_opponents_dev.csv b/data/campaign/sim_opponents_dev.csv
@@ -1,5 +1,6 @@
 variant id
 halfbeack_original
 halfbeack_cannon
+halfbeack_dainsleif
 isaribi_standard
 isaribi_strike
diff --git a/data/config/sounds.json b/data/config/sounds.json
@@ -109,6 +109,56 @@
 				]
 			}
 		],
-	}
-}
+	},
+	"ibo_dainsleif_fire": [
+		{
+			"file": "sounds/sfx_wpn_guns/dainsleif_shot_01.wav",
+			"pitch": 1,
+			"volume": 0.30
+		},
+		{
+			"file": "sounds/sfx_wpn_guns/dainsleif_shot_01.wav",
+			"pitch": 0.8,
+			"volume": 0.30
+		},
+		{
+			"file": "sounds/sfx_wpn_guns/dainsleif_shot_01.wav",
+			"pitch": 0.6,
+			"volume": 0.30
+		},
+	],
+	"ibo_dainsleif_spinup": [
+		{
+			"file": "sounds/sfx_wpn_guns/dainsleif_spin_01.wav",
+			"pitch": 0.6,
+			"volume": 0.08
+		},
+		{
+			"file": "sounds/sfx_wpn_guns/dainsleif_spin_02.wav",
+			"pitch": 1,
+			"volume": 0.08
+		},
+		{
+			"file": "sounds/sfx_wpn_guns/dainsleif_spin_03.wav",
+			"pitch": 1,
+			"volume": 0.2
+		},
+	],
+	"ibo_120mm_rifle": [
+		{
+			"file": "sounds/sfx_wpn_guns/rifle_01.wav",
+			"pitch": 0.6,
+			"volume": 0.08
+		},
+		{
+			"file": "sounds/sfx_wpn_guns/rifle_01.wav",
+			"pitch": 0.65,
+			"volume": 0.08
+		},
+		{
+			"file": "sounds/sfx_wpn_guns/rifle_01.wav",
+			"pitch": 0.7,
+			"volume": 0.08
+		},
+	],
 }
diff --git a/data/hulls/graze.ship b/data/hulls/graze.ship
@@ -65,13 +65,10 @@
   "builtInMods": [
     "nano_armor"
   ],
-  "builtInWeapons": {
-    "HEAD": "graze_head",
-  },
   "weaponSlots": [
     {
       "angle": 0,
-      "arc": 106,
+      "arc": 75,
       "id": "HEAD",
       "locations": [
         0,

diff --git a/data/hulls/graze_custom.ship b/data/hulls/graze_custom.ship
@@ -29,9 +29,6 @@
     "nano_armor",
     "av_system"
   ],
-  "builtInWeapons": {
-    "WS0001": "graze_custom_head"
-  },
   "center": [
     18,
     16.5
@@ -88,19 +85,19 @@
     {
       "angle": 0,
       "arc": 75,
-      "id": "WS0001",
+      "id": "HEAD",
       "locations": [
         0,
         -0
       ],
       "mount": "TURRET",
       "size": "SMALL",
-      "type": "BUILT_IN"
+      "type": "DECORATIVE"
     },
     {
       "angle": 0,
       "arc": 26,
-      "id": "WS0002",
+      "id": "LWP",
       "locations": [
         5,
         10.5
@@ -112,7 +109,7 @@
     {
       "angle": 0,
       "arc": 46,
-      "id": "WS0003",
+      "id": "RWP",
       "locations": [
         1.5,
         -11.5

diff --git a/data/hulls/graze_dainsleif.ship b/data/hulls/graze_dainsleif.ship
@@ -72,8 +72,8 @@
   "weaponSlots": [
     {
       "angle": 0,
-      "arc": 53,
-      "id": "WS0001",
+      "arc": 75,
+      "id": "HEAD",
       "locations": [
         0,
         -0
@@ -85,7 +85,7 @@
     {
       "angle": 0,
       "arc": 0,
-      "id": "WS0002",
+      "id": "WP",
       "locations": [
         3,
         10

diff --git a/data/hulls/rodi_man.ship b/data/hulls/rodi_man.ship
@@ -62,23 +62,18 @@
     "av_system",
     "nano_armor"
   ],
-  "builtInWeapons": {
-    "HEAD": "man_rodi_head",
-    "RWP": "man_rodi_right",
-    "LWP": "man_rodi_left",
-  },
   "weaponSlots": [
     {
       "angle": 0,
-      "arc": 106,
+      "arc": 75,
       "id": "HEAD",
       "locations": [
         0,
         -0
       ],
       "mount": "TURRET",
       "size": "SMALL",
-      "type": "DECORATIVE"
+      "type": "BUILT_IN"
     },
     {
       "angle": 0,

diff --git a/data/hulls/ryusei_go.ship b/data/hulls/ryusei_go.ship
@@ -29,9 +29,6 @@
     "av_system",
     "nano_armor"
   ],
-  "builtInWeapons": {
-    "WS0001": "ryusei_go_head"
-  },
   "center": [
     18,
     16.5
@@ -74,33 +71,33 @@
   ],
   "height": 36,
   "hullId": "ryusei_go",
-  "hullName": "Ryusei-Go",
+  "hullName": "Ryusei-Go II",
   "hullSize": "FIGHTER",
   "shieldCenter": [
     0,
     -0
   ],
   "shieldRadius": 0,
-  "spriteName": "graphics/ships/ryusei_go.png",
+  "spriteName": "graphics/ships/graze/ryusei_go.png",
   "style": "LOW_TECH",
   "viewOffset": 0,
   "weaponSlots": [
     {
       "angle": 0,
       "arc": 75,
-      "id": "WS0001",
+      "id": "HEAD",
       "locations": [
         0,
         -0
       ],
       "mount": "TURRET",
       "size": "SMALL",
-      "type": "BUILT_IN"
+      "type": "DECORATIVE"
     },
     {
       "angle": 0,
       "arc": 37,
-      "id": "WS0002",
+      "id": "LWP",
       "locations": [
         1,
         12
@@ -112,7 +109,7 @@
     {
       "angle": 0,
       "arc": 37,
-      "id": "WS0003",
+      "id": "RWP",
       "locations": [
         1,
         -12

diff --git a/data/hulls/shiden.ship b/data/hulls/shiden.ship
@@ -65,13 +65,10 @@
   "builtInMods": [
     "nano_armor"
   ],
-  "builtInWeapons": {
-    "HEAD": "shiden_head",
-  },
   "weaponSlots": [
     {
       "angle": 0,
-      "arc": 106,
+      "arc": 75,
       "id": "HEAD",
       "locations": [
         0,

diff --git a/data/hulls/shiden_custom.ship b/data/hulls/shiden_custom.ship
@@ -22,7 +22,6 @@
     -0.5
   ],
   "builtInMods": [
-    "av_system",
     "nano_armor"
   ],
   "center": [
@@ -66,14 +65,10 @@
   "spriteName": "graphics/ships/shiden/shiden_custom.png",
   "style": "LOW_TECH",
   "viewOffset": 0,
-  "builtInWeapons": {
-    "HEAD": "shiden_custom_head",
-    "WP": "shiden_custom_right"
-  },
   "weaponSlots": [
     {
       "angle": 0,
-      "arc": 106,
+      "arc": 75,
       "id": "HEAD",
       "locations": [
         1.5,

diff --git a/data/hulls/ship_data.csv b/data/hulls/ship_data.csv
@@ -1,11 +1,13 @@
 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,Fighter,,,,150,65,500,,100,0,,185,135,100,90,180,30,NONE,,,,,,,1,1,,,,,10,,3,5,,,2,2,,,,,,,,base_bp,,0,0,0,,1
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 Man Rodi,rodi_man,Fighter,,,,1250,265,900,,150,0,,165,125,100,90,180,30,NONE,,,,,,,1,1,,,,,10,,3,5,,,2,2,,,,,,,,lowtech_bp,,0.25,0,2,,2
-Ryusei-Go,ryusei_go,Fighter,,maneuveringjets,,1650,215,2000,,250,0,,275,175,100,90,180,30,NONE,,,,,,,1,1,,,,,10,,3,5,,,2,2,,,,,,,,tek_bp,,0.25,0,2,,4
+Ryusei-Go II,ryusei_go,Fighter,,maneuveringjets,,1650,215,2000,,250,0,,275,175,100,90,180,30,NONE,,,,,,,1,1,,,,,10,,3,5,,,2,2,,,,,,,,tek_bp,,0.25,0,2,,4
 Shiden,shiden,Fighter,,,,1150,190,700,,140,0,,175,125,100,90,180,30,NONE,,,,,,,1,1,,,,,10,,3,5,,,2,2,,,,,,,,shiden,,0.25,0,2,,5
 Shiden Custom,shiden_custom,Fighter,,maneuveringjets,,1450,210,2000,,250,0,,265,165,100,90,180,30,NONE,,,,,,,1,1,,,,,10,,3,5,,,2,2,,,,,,,,shiden,,0.25,0,2,,6
 Graze,graze,Fighter,,,,1300,200,750,,140,0,,175,125,100,90,180,30,NONE,,,,,,,1,1,,,,,10,,3,5,,,2,2,,,,,,,,graze,,0.25,0,2,,11
 Graze Custom,graze_custom,Fighter,,fastmissileracks,,1650,215,2000,,250,0,,265,165,100,90,180,30,NONE,,,,,,,1,1,,,,,10,,3,5,,,2,2,,,,,,,,tek_bp,,0.25,0,2,,13
 Graze Dainsleif,graze_dainsleif,Fighter,,,,1200,170,800,,150,0,,110,100,100,50,180,30,NONE,,,,,,,1,1,,,,,10,,3,7,,,2,2,,,,,,,,gja_bp,,0.25,0,2,,14
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 Isaribi,isaribi,Destroyer,,flarelauncher,10,4500,650,2250,,300,70,2,80,60,40,25,30,400,NONE,,0,0,0,,,50,60,60,30,2,15,9,10000,5,10,120,0.25,4,4,,,,,,,CARRIER,lowtech_bp,,0.6,2,3,,19
 Halfbeack,halfbeack,Battleship,High Tech,,22,8000,1800,8000,5000,180,145,2,140,20,10,20,25,2500,NONE,,0,0,0,,,30,400,420,280,3,100,8,200000,5,15,380,0.22,22,18,,,,,,,COMBAT,gja_bp,,0.6,2,3,,20
diff --git a/data/hulls/skins/graze_h.skin b/data/hulls/skins/graze_h.skin
@@ -6,8 +6,4 @@
     "descriptionPrefix": "This Graze Mobile Suit model is a part of the the Hegemony expeditionary auxiliary fleet and as such its systems have been upgraded to meet Hegemony regulations.",
     "spriteName": "graphics/ships/graze/graze_h.png",
     "systemId": "maneuveringjets",
-    "removeBuiltInWeapons": [],
-    "builtInWeapons": {
-        "HEAD": "graze_head_h",
-    },
 }
diff --git a/data/hulls/skins/graze_space.skin b/data/hulls/skins/graze_space.skin
@@ -6,10 +6,6 @@
     "descriptionPrefix": "A Graze unit equipped with a boost unit on it's back for high speed movement in space.",
     "spriteName": "graphics/ships/graze/graze_space.png",
     "systemId": "maneuveringjets",
-    "removeBuiltInWeapons": [],
-    "builtInWeapons": {
-        "HEAD": "graze_space_head"
-    },
     "engineSlotChanges": {
         "0": {
             "style": "MIDLINE"

diff --git a/data/hulls/skins/rodi_landman.skin b/data/hulls/skins/rodi_landman.skin
@@ -4,10 +4,4 @@
     "hullName": "Landman Rodi",
     "descriptionId": "rodi_landman",
     "spriteName": "graphics/ships/rodi/rodi_landman.png",
-    "removeBuiltInWeapons": [],
-    "builtInWeapons": {
-        "HEAD": "landman_rodi_head",
-        "RWP": "landman_rodi_right",
-        "LWP": "landman_rodi_left",
-    },
 }
diff --git a/data/hulls/skins/shiden_custom_p.skin b/data/hulls/skins/shiden_custom_p.skin
@@ -5,9 +5,4 @@
     "descriptionId": "shiden_custom",
     "descriptionPrefix": "A Shiden Mobile Suit model originally produced by a lone planet that flew the League's colours they had intended to keep the colour scheme to themselves but were ultimately persuaded by other leaders to let the rest of the League use it. Aside from the paint job there isn't much different from the base model.",
     "spriteName": "graphics/ships/shiden/shiden_custom_p.png",
-    "removeBuiltInWeapons": [],
-    "builtInWeapons": {
-        "HEAD": "shiden_custom_head_p",
-        "WP": "shiden_custom_right_p"
-    },
 }
diff --git a/data/hulls/skins/shiden_p.skin b/data/hulls/skins/shiden_p.skin
@@ -5,8 +5,4 @@
     "descriptionId": "shiden",
     "descriptionPrefix": "A Shiden Mobile Suit model originally produced by a lone planet that flew the League's colours they had intended to keep the colour scheme to themselves but were ultimately persuaded by other leaders to let the rest of the League use it. Aside from the paint job there isn't much different from the base model.",
     "spriteName": "graphics/ships/shiden/shiden_p.png",
-    "removeBuiltInWeapons": [],
-    "builtInWeapons": {
-        "HEAD": "shiden_head_p"
-    },
 }
diff --git a/data/hulls/skins/shiden_ryusei.skin b/data/hulls/skins/shiden_ryusei.skin
@@ -0,0 +1,10 @@
+{
+    "baseHullId": "shiden_custom",
+    "skinHullId": "shiden_ryusei",
+    "hullName": "Ryusei-Go III",
+    "descriptionId": "shiden_ryusei",
+    "spriteName": "graphics/ships/shiden/shiden_ryusei.png",
+    "builtInMods": [
+        "av_system"
+    ],
+}