Skip to content

Commit

Permalink
Cyborg Emotes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Moffein committed Dec 28, 2022
1 parent 7cd839f commit 8b75185
Show file tree
Hide file tree
Showing 57 changed files with 1,495 additions and 1,163 deletions.
Binary file modified Starstorm 2/Assets/assetstorm
Binary file not shown.
3 changes: 3 additions & 0 deletions Starstorm 2/Cores/BuffCore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ private void CharacterBody_RecalculateStats(On.RoR2.CharacterBody.orig_Recalcula
if (self.skillLocator.secondary) self.skillLocator.secondary.cooldownScale *= 0.66f;
if (self.skillLocator.utility) self.skillLocator.utility.cooldownScale *= 0.66f;
if (self.skillLocator.special) self.skillLocator.special.cooldownScale *= 0.66f;

if (!self.bodyFlags.HasFlag(CharacterBody.BodyFlags.ImmuneToVoidDeath)) self.bodyFlags |= CharacterBody.BodyFlags.ImmuneToVoidDeath;
if (!self.bodyFlags.HasFlag(CharacterBody.BodyFlags.ImmuneToExecutes)) self.bodyFlags |= CharacterBody.BodyFlags.ImmuneToExecutes;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Starstorm 2/Cores/DamageTypeCore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static class ModdedDamageTypes
//public static DamageType
//OnHit;

public static float gougeDamageCoefficient = 1.5f; //gouge DPS
public static float gougeDamageCoefficient = 2f; //gouge DPS

public DamageTypeCore()
{
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ManifestFileVersion: 0
CRC: 3360858128
CRC: 2262860340
AssetBundleManifest:
AssetBundleInfos:
Info_0:
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1803927563
CRC: 3500648319
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 33f3d6e4871c568f23da6b292ed35587
Hash: a937a24f4fbb85919309c8684aed4e1a
TypeTreeHash:
serializedVersion: 2
Hash: 7aec747c424dad58343d1828cf4a71ef
Expand Down Expand Up @@ -310,7 +310,6 @@ Assets:
- Assets/AssetBundle/Cyborg/Animations/CharSelect.anim
- Assets/AssetBundle/Nemmando/VFX/Materials/matSlash01.mat
- Assets/AssetBundle/Nemmando/Animations/SprintRHT.anim
- Assets/THE FUCKING TRASH CAN/skill2icon.png
- Assets/AssetBundle/Items/NkotasHeritage/matNkotas.mat
- Assets/AssetBundle/Nemmando/Textures/texNemmandoClassicEmission.png
- Assets/AssetBundle/Cyborg/mdlCyborg.prefab
Expand All @@ -327,12 +326,12 @@ Assets:
- Assets/AssetBundle/Nemmando/VFX/NemmandoSwingEffectOld.prefab
- Assets/AssetBundle/Cyborg/Meshes/meshCyborgSteam.mesh
- Assets/AssetBundle/Cyborg/Animations/ascend.anim
- Assets/AssetBundle/Cyborg/animCyborg1Emote.prefab
- Assets/AssetBundle/Enemies/Wayfarer/LampBoss.png
- Assets/AssetBundle/Items/JetBoots/jet_boots.png
- Assets/AssetBundle/Cyborg/Animations/animCyTP_Death.anim
- Assets/AssetBundle/Nucleator/Animations/Clips/RunR.anim
- Assets/AssetBundle/Executioner/Animations/animExecutioner.controller
- Assets/THE FUCKING TRASH CAN/skill3icon.png
- Assets/AssetBundle/Cyborg/VFX/matCyborgSprintEffect.mat
- Assets/AssetBundle/Nemmando/Animations/Utility.BackLeft.anim
- Assets/AssetBundle/Nemmando/Materials/matVergil.mat
Expand Down Expand Up @@ -498,7 +497,6 @@ Assets:
- Assets/AssetBundle/Chirr/Animations/animChirr.controller
- Assets/AssetBundle/Nemmando/Mesh/meshVergil.mesh
- Assets/AssetBundle/Executioner/Animations/maskExeAimYaw.mask
- Assets/THE FUCKING TRASH CAN/skill4icon.png
- Assets/AssetBundle/Nemmando/Textures/texNemmandoClassic.png
- Assets/AssetBundle/Executioner/VFX/Exe trail.png
- Assets/AssetBundle/Executioner/Icons/texExecutionerSecondary.png
Expand Down Expand Up @@ -556,7 +554,6 @@ Assets:
- Assets/AssetBundle/Cyborg/cyborgpassive.png
- Assets/AssetBundle/Nemmando/Animations/SprintRToRest.anim
- Assets/AssetBundle/Executioner/Icons/texExecutionerIconUnlock.png
- Assets/THE FUCKING TRASH CAN/skill1icon.png
- Assets/AssetBundle/Nemmando/Icons/texVergilSkin.png
- Assets/AssetBundle/Nucleator/Icons/texNucleatorIconUnlock.png
- Assets/AssetBundle/Nemmando/mdlNemmando.prefab
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,6 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1101638606711370464
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102232228442458718}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.4844575
m_TransitionOffset: 0
m_ExitTime: 0.88909084
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102232228442458718
AnimatorState:
serializedVersion: 5
Expand Down Expand Up @@ -80,8 +58,7 @@ AnimatorState:
m_Name: IdleIn
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101638606711370464}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand All @@ -108,7 +85,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102278912666954418}
m_Position: {x: 276, y: 120, z: 0}
m_Position: {x: 280, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102232228442458718}
m_Position: {x: 516, y: 120, z: 0}
Expand Down

Large diffs are not rendered by default.

Loading

0 comments on commit 8b75185

Please sign in to comment.