Skip to content
This repository has been archived by the owner on Feb 26, 2023. It is now read-only.

Commit

Permalink
misc
Browse files Browse the repository at this point in the history
brain fried, im gonna cry, creating this game make me wanna fucking die

/srs add respawn mechanic and some other stuffs i cant really remember jfc
  • Loading branch information
viethung204 committed Oct 11, 2022
1 parent 02a2b4b commit 61d6a6d
Show file tree
Hide file tree
Showing 54 changed files with 1,625 additions and 536 deletions.
100 changes: 2 additions & 98 deletions PAINDEALER files/Assets/Environment/doors/Door00.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ GameObject:
- component: {fileID: 588989215}
- component: {fileID: 588989220}
- component: {fileID: 1110519768}
- component: {fileID: 1110519767}
m_Layer: 0
m_Name: Door00
m_TagString: Untagged
Expand Down Expand Up @@ -159,100 +158,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bd6c37658d53d83498078b53dbbd4329, type: 3}
m_Name:
m_EditorClassIdentifier:
audio: {fileID: 1110519767}
--- !u!82 &1110519767
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5591926924026965816}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: e0fdf8e5720088741b89e6a2a8ac81b8, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
clip: {fileID: 8300000, guid: 141f7d1171026924db827780b9b31ecc, type: 3}
AudioVolume: 30
3 changes: 2 additions & 1 deletion PAINDEALER files/Assets/Environment/doors/Door01.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bd6c37658d53d83498078b53dbbd4329, type: 3}
m_Name:
m_EditorClassIdentifier:
clip: {fileID: 8300000, guid: e0fdf8e5720088741b89e6a2a8ac81b8, type: 3}
clip: {fileID: 8300000, guid: 141f7d1171026924db827780b9b31ecc, type: 3}
AudioVolume: 30
3 changes: 2 additions & 1 deletion PAINDEALER files/Assets/Environment/doors/DoorAudio.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
public class DoorAudio : MonoBehaviour
{
public AudioClip clip;
public float AudioVolume = 80f;

void SFX()
{
AudioSource.PlayClipAtPoint(clip, gameObject.transform.position);
AudioSource.PlayClipAtPoint(clip, gameObject.transform.position, AudioVolume);
}
}
Binary file not shown.
22 changes: 22 additions & 0 deletions PAINDEALER files/Assets/Environment/doors/doorsound2 (1).mp3.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: NUKAGE4
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ValidKeywords:
- _EMISSION
m_ValidKeywords: []
m_InvalidKeywords:
- _GLOSSYREFLECTIONS_OFF
m_LightmapFlags: 2
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ Material:
m_Name: NUKAGE5
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ValidKeywords:
- _EMISSION
- _ENVIRONMENTREFLECTIONS_OFF
- _SPECULARHIGHLIGHTS_OFF
m_InvalidKeywords:
- _GLOSSYREFLECTIONS_OFF
- _SPECULAR_COLOR
m_LightmapFlags: 2
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ Material:
m_Name: NUKAGE6
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ValidKeywords:
- _EMISSION
- _ENVIRONMENTREFLECTIONS_OFF
- _SPECULARHIGHLIGHTS_OFF
m_InvalidKeywords:
- _GLOSSYREFLECTIONS_OFF
m_LightmapFlags: 2
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

public class ToxicRiverScript : MonoBehaviour
{
playerHealth healthScript;
playerHealth healthScript;
public Collider playerCollider;
float collideTimer = 0; // timer, starts when the player first collides with the river
int timeDMG = 3; //the amount of time player can stay on river b4 take damage;
int timeDMG = 2; //the amount of time player can stay on river b4 take damage;

private void Start()
{
Expand All @@ -21,7 +21,7 @@ private void OnCollisionEnter(Collision collision)

void OnCollisionStay(Collision collision)
{
if (collision.collider == playerCollider)
if (collision.collider == playerCollider && healthScript.BioSuit == false)
{
if(collideTimer < timeDMG)
{
Expand Down
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions PAINDEALER files/Assets/Environment/pickups/health/healthPickup.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class healthPickup : MonoBehaviour
{
playerHealth healthScript;
public int HealthPU = 30;
public AudioClip healthPickupAudio;
public float AudioVolume = 10f;
private Camera PlayerCamera;

// Start is called before the first frame update
void Start()
{
healthScript = GameObject.FindGameObjectWithTag("MainCamera").GetComponent<playerHealth>();
PlayerCamera = Camera.main;
}

private void OnTriggerEnter(Collider other)
{
if (other.tag == "Player")
{
if (healthScript.Health < 100)
{
AudioSource.PlayClipAtPoint(healthPickupAudio, PlayerCamera.gameObject.transform.position, AudioVolume);
healthScript.Health += HealthPU;
Destroy(gameObject);
}
else
{
return;
}

}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions PAINDEALER files/Assets/Environment/pickups/prefabs/MEDKIT.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 7298593009034694105}
- component: {fileID: 7298593009034694103}
- component: {fileID: 7298593009034694100}
- component: {fileID: 992536886}
m_Layer: 0
m_Name: MEDKIT
m_TagString: Untagged
Expand Down Expand Up @@ -112,3 +113,18 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 0.9714286, y: 0.6571429, z: 0.15}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &992536886
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7298593009034694106}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 061a78da8338b2043aeee33232e75064, type: 3}
m_Name:
m_EditorClassIdentifier:
HealthPU: 30
healthPickupAudio: {fileID: 8300000, guid: ee99ee493bb3c294696f9c88f00799fe, type: 3}
AudioVolume: 30
8 changes: 8 additions & 0 deletions PAINDEALER files/Assets/Player/BioSuit.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added PAINDEALER files/Assets/Player/BioSuit/BIOSA0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 61d6a6d

Please sign in to comment.