0.6.40

SS2-Project/Assets/Languages/en/SS2Lang_Difficulties_en.json

@@ -22,7 +22,7 @@
         "SS2_DIFFICULTY_CYCLONE3_NAME": "Cyclone +3",
 
         "SS2_DIFFICULTY_TYPHOON_NAME": "Typhoon",
-        "SS2_DIFFICULTY_TYPHOON_DESC": "Maximum challenge. The world is a nightmare, and survival is merely an illusion. Nobody has what it takes.<style=cStack>\n\n>Player Health Regeneration: <style=cIsHealth>-40%</style>\n>Difficulty Scaling: <style=cIsHealth>+75%</style>\n>Monster Spawn Limit: <style=cIsHealth>+100%</style>\n>Monster Spawn Rate: <style=cIsHealth>+25%</style>\n>Gold and Experience Rewards: <style=cisHealth>-20%</style>",
+        "SS2_DIFFICULTY_TYPHOON_DESC": "Maximum challenge. The world is a nightmare, and survival is merely an illusion. Nobody has what it takes.<style=cStack>\n\n>Player Health Regeneration: <style=cIsHealth>-40%</style>\n>Difficulty Scaling: <style=cIsHealth>+75%</style>\n>Monster Spawn Limit: <style=cIsHealth>+{0}%</style>\n>Monster Spawn Rate: <style=cIsHealth>+{1}%</style>\n>Experience Rewards: <style=cIsHealth>-{2}%</style>\n>Gold Rewards: <style=cIsHealth>-{3}%</style>",
 
         "SS2_DIFFICULTY_SUPERTYPHOON_NAME": "Super Typhoon",
         "SS2_DIFFICULTY_SUPERTYPHOON_DESC": "",

SS2-Project/Assets/Starstorm2/AssetStorm/InDev/Characters/Cyborg2/Cyborg2Body.prefab

@@ -37,6 +37,7 @@ GameObject:
   - component: {fileID: 8467841194318990007}
   - component: {fileID: 4269496153077987429}
   - component: {fileID: 1004718732815417702}
+  - component: {fileID: 3736198632451785268}
   m_Layer: 0
   m_Name: Cyborg2Body
   m_TagString: Player
@@ -749,6 +750,41 @@ MonoBehaviour:
   canBeFrozen: 1
   isFrozen: 1
   canBeTaunted: 1
+--- !u!114 &3736198632451785268
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2260960647979714696}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1143142494, guid: 951ce57ad999ac1f040a4dceb5f8b763, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  body: {fileID: 0}
+  itemDisplayRuleSet: {fileID: 0}
+  autoPopulateLightInfos: 1
+  gameObjectActivationTransforms: []
+  customGameObjectActivationTransforms: []
+  baseRendererInfos: []
+  fullBodyPing: 0
+  baseLightInfos: []
+  constraintItemDisplaysScale: 0
+  ignoreJitterBones: 0
+  corpseFade: 1
+  speedFade: 1
+  CharacterOnScreen: 0
+  visibilityChecker: {fileID: 0}
+  useHullForFadeCalc: 0
+  activeOverlays: 0
+  oldOverlays: 0
+  hitFlashValue: 0
+  healFlashValue: 0
+  oldHit: 0
+  oldHeal: 0
+  oldFade: 0
+  forceUpdate: 0
 --- !u!1 &4426841502502991441
 GameObject:
   m_ObjectHideFlags: 0
@@ -1793,6 +1829,32 @@ MonoBehaviour:
   oldHeal: 0
   oldFade: 0
   forceUpdate: 0
+--- !u!114 &6079387867497595865
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5008875975933509408}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1533710874, guid: 951ce57ad999ac1f040a4dceb5f8b763, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DelayLoadingAnimatorUntilMaterialsHaveCompleted: 0
+  _animatorControllerAddress:
+    m_AssetGUID: 
+    m_SubObjectName: 
+    m_SubObjectType: 
+  _animatorController: {fileID: 0}
+  _avatarAddress:
+    m_AssetGUID: 
+    m_SubObjectName: 
+    m_SubObjectType: 
+  _avatar: {fileID: 0}
+  skins:
+  - {fileID: 11400000, guid: a38e0ea4218dc9e4bb177461ead40ffc, type: 2}
+  prefabInstantiationDatas: []
 --- !u!4 &5677010006892963226 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 577b3c79db118904c8eda5144dd41024,

SS2-Project/Assets/Starstorm2/AssetStorm/InDev/Characters/Cyborg2/Cyborg2Display.prefab

@@ -40,6 +40,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2942509041794450991}
+  - component: {fileID: 6460089162439241661}
   m_Layer: 0
   m_Name: Cyborg2Display
   m_TagString: Untagged
@@ -63,6 +64,41 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6460089162439241661
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8308556267028715609}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1143142494, guid: 951ce57ad999ac1f040a4dceb5f8b763, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  body: {fileID: 0}
+  itemDisplayRuleSet: {fileID: 0}
+  autoPopulateLightInfos: 1
+  gameObjectActivationTransforms: []
+  customGameObjectActivationTransforms: []
+  baseRendererInfos: []
+  fullBodyPing: 0
+  baseLightInfos: []
+  constraintItemDisplaysScale: 0
+  ignoreJitterBones: 0
+  corpseFade: 1
+  speedFade: 1
+  CharacterOnScreen: 0
+  visibilityChecker: {fileID: 0}
+  useHullForFadeCalc: 0
+  activeOverlays: 0
+  oldOverlays: 0
+  hitFlashValue: 0
+  healFlashValue: 0
+  oldHit: 0
+  oldHeal: 0
+  oldFade: 0
+  forceUpdate: 0
 --- !u!1001 &8329871487314338267
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -933,3 +969,29 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   soundCenter: {fileID: 0}
+--- !u!114 &402126579458382863
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9176308721897938058}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1533710874, guid: 951ce57ad999ac1f040a4dceb5f8b763, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DelayLoadingAnimatorUntilMaterialsHaveCompleted: 0
+  _animatorControllerAddress:
+    m_AssetGUID: 
+    m_SubObjectName: 
+    m_SubObjectType: 
+  _animatorController: {fileID: 0}
+  _avatarAddress:
+    m_AssetGUID: 
+    m_SubObjectName: 
+    m_SubObjectType: 
+  _avatar: {fileID: 0}
+  skins:
+  - {fileID: 11400000, guid: a38e0ea4218dc9e4bb177461ead40ffc, type: 2}
+  prefabInstantiationDatas: []

SS2-Project/Assets/Starstorm2/AssetStorm/InDev/Characters/Cyborg2/Projectiles/meshTeleporter.mesh

@@ -232,6 +232,7 @@ Mesh:
   m_MeshMetrics[1]: 1
   m_MeshOptimizationFlags: -1
   m_StreamData:
+    serializedVersion: 2
     offset: 0
     size: 0
     path: 

SS2-Project/Assets/Starstorm2/AssetStorm/InDev/Characters/Cyborg2/SkinCyborgDefault.asset

@@ -0,0 +1,36 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -1255927399, guid: 951ce57ad999ac1f040a4dceb5f8b763, type: 3}
+  m_Name: SkinCyborgDefault
+  m_EditorClassIdentifier: 
+  baseSkins: []
+  icon: {fileID: 21300000, guid: 569d613e909cca4429fa126c8fc9f44e, type: 3}
+  nameToken: SS2_SKIN_CYBORG_DEFAULT
+  unlockableName: 
+  unlockableDef: {fileID: 0}
+  rootObject: {fileID: 5008875975933509408, guid: 8a7e1fdc0e7e91d4ba7d7e0cf4707cec,
+    type: 3}
+  skinDefParamsAddress:
+    m_AssetGUID: 
+    m_SubObjectName: 
+    m_SubObjectType: 
+  skinDefParams: {fileID: 0}
+  optimizedSkinDefParamsAddress:
+    m_AssetGUID: 
+    m_SubObjectName: 
+    m_SubObjectType: 
+  optimizedSkinDefParams: {fileID: 0}
+  rendererInfos: []
+  gameObjectActivations: []
+  meshReplacements: []
+  projectileGhostReplacements: []
+  minionSkinReplacements: []

SS2-Project/Assets/Starstorm2/AssetStorm/InDev/Characters/Cyborg2/acCyborg2.asset

@@ -58,6 +58,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 851f4b4fde9c1354c917bec6c902c55a, type: 2}
   - {fileID: 11400000, guid: 4525a9086c2bce84fb7ff50069a181cf, type: 2}
   - {fileID: 11400000, guid: 65ff2e6eb0a0cf04f95ff02e0dc67ed8, type: 2}
+  - {fileID: 11400000, guid: a38e0ea4218dc9e4bb177461ead40ffc, type: 2}
   bodyPrefab: {fileID: 2260960647979714696, guid: 8a7e1fdc0e7e91d4ba7d7e0cf4707cec,
     type: 3}
   masterPrefab: {fileID: 0}

SS2-Project/Assets/Starstorm2/AssetStorm/InDev/Characters/Cyborg2/meshBorgTele.mesh

@@ -322,6 +322,7 @@ Mesh:
   m_MeshMetrics[1]: 1
   m_MeshOptimizationFlags: -1
   m_StreamData:
+    serializedVersion: 2
     offset: 0
     size: 0
     path: 

SS2-Project/Assets/Starstorm2/AssetStorm/InDev/Characters/Knight/Skills/escKnightShield.asset

@@ -27,7 +27,7 @@ MonoBehaviour:
         objectValue: {fileID: 11400000, guid: 5849d64b8d77076478f1da59bc884d6d, type: 2}
     - fieldName: parryBuffDuration
       fieldValue:
-        stringValue: 0.4
+        stringValue: 1.2
         objectValue: {fileID: 0}
     - fieldName: shieldBashSkillDef
       fieldValue:

SS2-Project/Assets/Starstorm2/AssetStorm/InDev/Characters/Variants/Artificer/acArti.asset

@@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c726deca6f3a3bd4982e0fea154271eb, type: 3}
+  m_Name: acArti
+  m_EditorClassIdentifier: 
+  assets:
+  - {fileID: 11400000, guid: cf2d0b5323996c14bafc44368063c390, type: 2}
+  - {fileID: 11400000, guid: 781a696bd8695234da7767f32f845c0a, type: 2}
+  survivorDefAddress: RoR2/Base/Merc/Mage.asset

SS2-Project/Assets/Starstorm2/AssetStorm/InDev/Characters/Variants/Artificer/escLampBarrage.asset

@@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 89795172, guid: 951ce57ad999ac1f040a4dceb5f8b763, type: 3}
+  m_Name: escLampBarrage
+  m_EditorClassIdentifier: 
+  targetType:
+    assemblyQualifiedName: 
+  serializedFieldsCollection:
+    serializedFields: []

SS2-Project/Assets/Starstorm2/AssetStorm/InDev/Characters/Variants/Artificer/sdLampBarrage.asset

@@ -0,0 +1,45 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1391837873, guid: 951ce57ad999ac1f040a4dceb5f8b763, type: 3}
+  m_Name: sdLampBarrage
+  m_EditorClassIdentifier: 
+  skillName: 
+  skillNameToken: 
+  skillDescriptionToken: 
+  keywordTokens: []
+  icon: {fileID: 0}
+  activationStateMachineName: 
+  activationState:
+    _typeName: 
+  interruptPriority: 1
+  baseRechargeInterval: 1
+  baseMaxStock: 1
+  rechargeStock: 1
+  requiredStock: 1
+  stockToConsume: 1
+  attackSpeedBuffsRestockSpeed: 0
+  attackSpeedBuffsRestockSpeed_Multiplier: 1
+  resetCooldownTimerOnUse: 0
+  fullRestockOnAssign: 1
+  dontAllowPastMaxStocks: 0
+  beginSkillCooldownOnSkillEnd: 0
+  isCooldownBlockedUntilManuallyReset: 0
+  cancelSprintingOnActivation: 1
+  forceSprintDuringState: 0
+  canceledFromSprinting: 0
+  isCombatSkill: 1
+  mustKeyPress: 0
+  triggeredByPressRelease: 0
+  autoHandleLuminousShot: 1
+  suppressSkillActivation: 0
+  hideStockCount: 0
+  hideCooldown: 0