Compare commits

5 Commits
main ... main

Author SHA1 Message Date
Garrett Kaiser
ef830fd4ac Boss Hurts PLayer 2026-01-15 14:54:58 -08:00
Garrett Kaiser
3d0dbd029a WEEEE 2026-01-13 15:34:35 -08:00
Garrett Kaiser
6a89355a5e Boss Jump and Lunge 2026-01-09 14:45:35 -08:00
Garrett Kaiser
6929a4cdb2 Boss Jump Above you 2026-01-07 15:24:56 -08:00
Garrett Kaiser
e53a53e48f we 2026-01-05 14:05:58 -08:00
23 changed files with 554 additions and 11 deletions

View File

@@ -20,8 +20,7 @@ Material:
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: {} stringTagMap: {}
disabledShaderPasses: disabledShaderPasses: []
- MOTIONVECTORS
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3

View File

@@ -20,8 +20,7 @@ Material:
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: {} stringTagMap: {}
disabledShaderPasses: disabledShaderPasses: []
- MOTIONVECTORS
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3

BIN
Assets/New Terrain 1.asset Normal file

Binary file not shown.

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: bb90d637fa5a642da99b630af5e39341
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 15600000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/New Terrain 2.asset Normal file

Binary file not shown.

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6007277cfe490427ea53da88a2d31543
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 15600000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -33,7 +33,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.4, y: 0.5, z: 0.4} m_LocalScale: {x: 0.4, y: 0.5, z: 0.4}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 9031458065949887395}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
--- !u!33 &5688607449888095492 --- !u!33 &5688607449888095492
@@ -51,7 +52,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6611039685471789196} m_GameObject: {fileID: 6611039685471789196}
m_Enabled: 1 m_Enabled: 0
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
m_DynamicOccludee: 1 m_DynamicOccludee: 1
@@ -112,7 +113,7 @@ CapsuleCollider:
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Radius: 0.5 m_Radius: 0.5
m_Height: 2 m_Height: 4
m_Direction: 1 m_Direction: 1
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &7066644236778025839 --- !u!114 &7066644236778025839
@@ -130,6 +131,7 @@ MonoBehaviour:
rb: {fileID: 6393509116105302420} rb: {fileID: 6393509116105302420}
player: {fileID: 0} player: {fileID: 0}
TargetPosition: {x: 0, y: 0, z: 0} TargetPosition: {x: 0, y: 0, z: 0}
playerDistance: 0
currentRotation: {x: 0, y: 0, z: 0} currentRotation: {x: 0, y: 0, z: 0}
targetRotation: {x: 0, y: 0, z: 0, w: 0} targetRotation: {x: 0, y: 0, z: 0, w: 0}
isStuck: 0 isStuck: 0
@@ -161,3 +163,81 @@ Rigidbody:
m_Interpolate: 0 m_Interpolate: 0
m_Constraints: 0 m_Constraints: 0
m_CollisionDetection: 1 m_CollisionDetection: 1
--- !u!1001 &9195834916317290860
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2838261725573212642}
m_Modifications:
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_LocalScale.y
value: 0.88888884
objectReference: {fileID: 0}
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_LocalScale.z
value: 0.88888884
objectReference: {fileID: 0}
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_LocalRotation.z
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 90
objectReference: {fileID: 0}
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 685625544054550645, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
propertyPath: m_Name
value: gun(2)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
--- !u!4 &9031458065949887395 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 200414994334902991, guid: aab294e47e7d04c89bbe94d901f8e108, type: 3}
m_PrefabInstance: {fileID: 9195834916317290860}
m_PrefabAsset: {fileID: 0}

View File

@@ -0,0 +1,59 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &379073252485696804
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 9cfcfcb1b0db4456bb0c5dbea19e3a70, type: 3}
propertyPath: m_LocalPosition.x
value: 527.1048
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9cfcfcb1b0db4456bb0c5dbea19e3a70, type: 3}
propertyPath: m_LocalPosition.y
value: 25.502022
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9cfcfcb1b0db4456bb0c5dbea19e3a70, type: 3}
propertyPath: m_LocalPosition.z
value: 216.44846
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9cfcfcb1b0db4456bb0c5dbea19e3a70, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9cfcfcb1b0db4456bb0c5dbea19e3a70, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9cfcfcb1b0db4456bb0c5dbea19e3a70, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9cfcfcb1b0db4456bb0c5dbea19e3a70, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9cfcfcb1b0db4456bb0c5dbea19e3a70, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9cfcfcb1b0db4456bb0c5dbea19e3a70, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9cfcfcb1b0db4456bb0c5dbea19e3a70, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 9cfcfcb1b0db4456bb0c5dbea19e3a70, type: 3}
propertyPath: m_Name
value: gun(2)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9cfcfcb1b0db4456bb0c5dbea19e3a70, type: 3}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: aab294e47e7d04c89bbe94d901f8e108
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

BIN
Assets/Scenes/Scene1-Boss.unity LFS Normal file

Binary file not shown.

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4e0c2c5470ba3477ca0849aae9f0b6e7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -41,8 +41,11 @@ public class GunThrown : MonoBehaviour
void Update() void Update()
{ {
//transform.position = Vector3.MoveTowards(transform.position, TargetPosition, 10 * Time.deltaTime); //transform.position = Vector3.MoveTowards(transform.position, TargetPosition, 10 * Time.deltaTime);
if (Time.timeScale == 1)
{
targetRotation = Quaternion.Euler(-20f, currentRotation.y, currentRotation.z); targetRotation = Quaternion.Euler(-20f, currentRotation.y, currentRotation.z);
transform.rotation = Quaternion.RotateTowards(transform.rotation, targetRotation , -1); transform.rotation = Quaternion.RotateTowards(transform.rotation, targetRotation, -0.8f);
}
if (transform.position == TargetPosition) if (transform.position == TargetPosition)
{ {

View File

@@ -0,0 +1,29 @@
using UnityEngine;
public class JumpHitbox : MonoBehaviour
{
public PlayerMovement playerMovement;
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
}
// Update is called once per frame
void Update()
{
}
public void OnTriggerEnter(Collider other)
{
if (other.CompareTag("Player"))
{
Debug.Log("Hit Player");
playerMovement.HP -= 1;
}
else{
Debug.Log("Failed");
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: ba495adcc9de84e148094bc4f9073dfa

View File

@@ -0,0 +1,29 @@
using UnityEngine;
public class LungeHitbox : MonoBehaviour
{
public PlayerMovement playerMovement;
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
}
// Update is called once per frame
void Update()
{
}
public void OnTriggerEnter(Collider other)
{
if (other.CompareTag("Player"))
{
Debug.Log("Hit Player");
playerMovement.HP -= 1.5f;
}
else{
Debug.Log("Failed");
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 982fdb439fe8344d68124ca1628747ae

View File

@@ -0,0 +1,16 @@
using UnityEngine;
public class MechBoss : MonoBehaviour
{
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 7f1d4c5acc0624759954b8d3abdb2f6d

View File

@@ -0,0 +1,175 @@
using UnityEngine;
public class SteampunkBoss : MonoBehaviour
{
public PlayerMovement playerMovement;
public GameObject Player;
public int randomNumber = 0;
public float stallTimer = 0;
public bool setTimer = false;
public Vector3 TargetPosition;
public bool setposition = false;
public GameObject JumpHitbox;
public GameObject LungeHitbox;
public float lungeBackup;
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
}
// Update is called once per frame
void Update()
{
if (stallTimer <= 0)
{
transform.LookAt(Player.transform);
randomNumber = Random.Range(1, 6);
setTimer = false;
}
if (randomNumber == 1)
{
JumpAttack();
}
else if (randomNumber == 2)
{
RocketAttack();
}
else if (randomNumber == 3)
{
LungeAttack();
}
else if (randomNumber == 4)
{
SlashAttack();
}
else if (randomNumber == 5)
{
Block();
}
}
void JumpAttack()
{
if (!setTimer)
{
stallTimer = 1;
setTimer = true;
}
if (!setposition)
{
TargetPosition = Player.transform.position;
setposition = true;
}
transform.position = Vector3.MoveTowards(transform.position, new Vector3(TargetPosition.x, 20, TargetPosition.z), 20 * Time.deltaTime);
if ((transform.position.x == TargetPosition.x) && (transform.position.z == TargetPosition.z))
{
transform.position = Vector3.MoveTowards(transform.position, TargetPosition, 80 * Time.deltaTime);
JumpHitbox.SetActive(true);
}
if (transform.position == TargetPosition)
{
JumpHitbox.SetActive(false);
stallTimer -= Time.deltaTime;
}
if (stallTimer <= 0)
{
setposition = false;
}
}
void RocketAttack()
{
if (!setTimer)
{
stallTimer = 3;
setTimer = true;
}
if (!setposition)
{
TargetPosition = Player.transform.position;
setposition = true;
}
if (stallTimer >= 2.6 && randomNumber == 2)
{
transform.position = Vector3.MoveTowards(transform.position, TargetPosition, -30 * Time.deltaTime);
}
stallTimer -= Time.deltaTime;
if (stallTimer <= 0)
{
setposition = false;
}
}
void LungeAttack()
{
if (!setTimer)
{
stallTimer = 0.5f;
setTimer = true;
}
if (!setposition)
{
TargetPosition = Player.transform.position;
setposition = true;
}
if (lungeBackup > 0)
{
transform.position = Vector3.MoveTowards(transform.position, TargetPosition, -10 * Time.deltaTime);
lungeBackup -= Time.deltaTime;
}
if (lungeBackup <= 0)
{
LungeHitbox.SetActive(true);
transform.position = Vector3.MoveTowards(transform.position, TargetPosition, 30 * Time.deltaTime);
}
if (transform.position == TargetPosition)
{
LungeHitbox.SetActive(false);
stallTimer -= Time.deltaTime;
}
if (stallTimer <= 0)
{
lungeBackup = 1;
setposition = false;
}
}
void SlashAttack()
{
if (!setTimer)
{
stallTimer = 1;
setTimer = true;
}
stallTimer -= Time.deltaTime;
}
void Block()
{
if (!setTimer)
{
stallTimer = 1;
setTimer = true;
}
stallTimer -= Time.deltaTime;
}
public void OnTriggerEnter(Collider other)
{
if (other.CompareTag("Player"))
{
Debug.Log("Hit Player");
playerMovement.HP -= 1;
}
else{
Debug.Log("Failed");
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 3d8198e3ebde5469e8ad7d54300da09f

BIN
Assets/models/gun(2).fbx LFS Normal file

Binary file not shown.

View File

@@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 9cfcfcb1b0db4456bb0c5dbea19e3a70
ModelImporter:
serializedVersion: 24200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
generateMeshLods: 0
meshLodGenerationFlags: 0
maximumMeshLod: -1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant: