Merge pull request #11 from nullifiedcat/master

update fork

CODE_OF_CONDUCT.md

@@ -1,46 +1,6 @@
-# Contributor Covenant Code of Conduct
+# Contributor Code of Conduct
 
-## Our Pledge
+This project adheres to No Code of Conduct.  We are all adults.  We accept anyone's contributions.  Nothing else matters.
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+For more information please visit the [No Code of Conduct](https://github.com/domgetter/NCoC) homepage.
 
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at nullifiedcat+contact@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

src/hacks/Aimbot.cpp

@@ -52,6 +52,7 @@ static CatVar priority_mode(priority_mode_enum, "aimbot_prioritymode", "0", "Pri
 		"SMART: Basically Auto-Threat. Will be tweakable eventually. "
 		"FOV, DISTANCE, HEALTH are self-explainable. HEALTH picks the weakest enemy");
 static CatVar wait_for_charge(CV_SWITCH, "aimbot_charge", "0", "Wait for sniper rifle charge", "Aimbot waits until it has enough charge to kill");
+static CatVar wait_for_charge_bypass(CV_SWITCH, "aimbot_charge_if_full", "1", "Sniper rifle will shoot at 100% charge even if the shot will not kill", "Aimbot waits until 100% charge");
 static CatVar ignore_vaccinator(CV_SWITCH, "aimbot_ignore_vaccinator", "1", "Ignore Vaccinator", "Hitscan weapons won't fire if enemy is vaccinated against bullets");
 static CatVar ignore_hoovy(CV_SWITCH, "aimbot_ignore_hoovy", "0", "Ignore Hoovies", "Aimbot won't attack hoovies");
 static CatVar ignore_cloak(CV_SWITCH, "aimbot_ignore_cloak", "1", "Ignore cloaked", "Don't aim at invisible enemies");
@@ -120,6 +121,7 @@ bool silent_huntsman { false };
 // for current frame, to avoid performing them again
 AimbotCalculatedData_s calculated_data_array[2048] {};
 
+// The main "loop" of the aimbot. 
 // The main "loop" of the aimbot.
 void CreateMove() {
 	
@@ -369,12 +371,12 @@ bool IsTargetStateGood(CachedEntity* entity) {
 			}
 		}
 		IF_GAME (IsTF()) {
-			// If settings allow waiting for charge, and current charge cant kill target, dont aim
+			// If settings allow waiting for charge, and current charge cant kill target, dont aim unless at 100% and the player wants to fire at 100% anyways
 			if (wait_for_charge && g_pLocalPlayer->holding_sniper_rifle) {
-				
 				// Grab netvar for current charge damage and multiply by 3 for headshot
 				float cdmg = CE_FLOAT(LOCAL_W, netvar.flChargedDamage) * 3;
 
+				if (!(cdmg == 450.0f && wait_for_charge_bypass)) {
 					 // Darwins damage correction, Darwins protects against 15% of damage
 					if (HasDarwins(entity))
 					  cdmg = (cdmg * .85) - 1;
@@ -394,6 +396,7 @@ bool IsTargetStateGood(CachedEntity* entity) {
 					  return false;
 					}
 				}
+			}
 			// If settings allow, ignore taunting players
 			if (ignore_taunting && HasCondition<TFCond_Taunting>(entity)) return false;
 			// Dont target invulnerable players, ex: uber, bonk
@@ -1032,7 +1035,3 @@ void DrawText() {
 
 
 }}}
- 
-
-
-

src/hacks/LagExploit.cpp

@@ -58,7 +58,7 @@ bool ExploitActive() {
 
 static CatVar mini_lag_exploit(CV_INT, "lagexploit_mini", "0", "Mini Lag Exploit");
 static CatVar instant_weapon_switch(CV_SWITCH, "instant_weapon_switch", "0", "Instant weapon switch");
-static CatVar infinite_packs(CV_SWITCH, "infinite_healthpacks", "0", "Infinite Healthpacks", "Activate removecond when standing on healthpack while having not full HP");
+static CatVar infinite_packs(CV_SWITCH, "infinite_packs", "0", "Infinite Pickups", "Activate removecond when standing on pickups while having not full HP/Ammo");
 
 void CreateMove() {
 	if (CE_BAD(LOCAL_E)) return;
@@ -147,6 +147,7 @@ void CreateMove() {
 		amount = int(mini_lag_exploit);
 	}
 
+
 	// Infinite healthpacks (I'll probably have to move this somewhere else)
 	if (infinite_packs && CE_GOOD(LOCAL_E) && LOCAL_E->m_iHealth < LOCAL_E->m_iMaxHealth) {
 		ICollideable* p = RAW_ENT(LOCAL_E)->GetCollideable();

tf-settings/menu.json

@@ -12,6 +12,7 @@
 			"aimbot_fov_draw",
 			"aimbot_prioritymode",
 			"aimbot_charge",
+			"aimbot_charge_if_full",
 			{
 				"type": "list",
 				"name": "Ignore",
@@ -438,6 +439,7 @@
 					"removecond_stun",
 					"instant_decloak",
 					"instant_rezoom",
+					"infinite_packs",
 					"lagexploit_mini"
 				]
 			},