From d23febcf863a6d38030d426049355c8d80b77e0f Mon Sep 17 00:00:00 2001
From: En Passant <enpassant4264@gmail.com>
Date: Wed, 28 Aug 2024 20:48:10 -0600
Subject: [PATCH] Straighten the straightening

---
 data/mods/earthsky/abilities.ts  |  3 ++-
 data/mods/earthsky/conditions.ts | 17 ++++++++++++++---
 data/mods/earthsky/moves.ts      |  6 ++++++
 data/mods/earthsky/typechart.ts  | 27 +++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/data/mods/earthsky/abilities.ts b/data/mods/earthsky/abilities.ts
index f26c6129c6..bb08f71d47 100644
--- a/data/mods/earthsky/abilities.ts
+++ b/data/mods/earthsky/abilities.ts
@@ -2958,7 +2958,8 @@ export const Abilities: {[abilityid: string]: ModdedAbilityData} = {
 	},
 	tangling: {
 		onHit(target, source, move) {
-			if (this.checkMoveMakesContact(move, source, target)) {
+			if (this.checkMoveMakesContact(move, source, target)) 
+				this.add('-activate', target, 'ability: Tangling');{
 				source.addVolatile('singletrap', target, Dex.abilities.get('tangling'), 'trapper');
 			}
 		},
diff --git a/data/mods/earthsky/conditions.ts b/data/mods/earthsky/conditions.ts
index 3afde97b19..f79228accf 100644
--- a/data/mods/earthsky/conditions.ts
+++ b/data/mods/earthsky/conditions.ts
@@ -183,6 +183,7 @@ export const Conditions: {[k: string]: ModdedConditionData} = {
 			return 4;
 		},
 		onStart(target, source, move) {
+			this.add('-start', target, 'Block', '[silent]');
 			this.add('-activate', target, 'trapped');
 		},
 		onTrapPokemon(pokemon) {
@@ -212,6 +213,10 @@ export const Conditions: {[k: string]: ModdedConditionData} = {
 				return false;
 			}
 		},
+		onEnd(target) {
+			this.add('-end', target, 'trapped');
+			this.add('-end', target, 'Block', '[silent]');
+		},
 	},
 	meanlooked: {
 		name: 'meanlooked',
@@ -222,12 +227,17 @@ export const Conditions: {[k: string]: ModdedConditionData} = {
 			return 4;
 		},
 		onStart(target, source, move) {
+			this.add('-start', target, 'Mean Look', '[silent]');
 			this.add('-activate', target, 'trapped');
 		},
 		onTrapPokemonPriority: 100,
 		onTrapPokemon(pokemon) {
 			pokemon.trapped = true;
 		},
+		onEnd(target) {
+			this.add('-end', target, 'trapped');
+			this.add('-end', target, 'Mean Look', '[silent]');
+		},
 	},
 	arenatrapped: {
 		name: 'arenatrapped',
@@ -248,12 +258,13 @@ export const Conditions: {[k: string]: ModdedConditionData} = {
 			pokemon.tryTrap();
 		},
 		onStart(target) {
+			this.add('-start', target, 'singletrap', '[silent]');
 			this.add('-activate', target, 'trapped');
 		},
-		onEnd(pokemon) {
-			this.add('-end', pokemon, 'singletrap');
+		onEnd(target) {
+			this.add('-end', target, 'trapped');
+			this.add('-end', target, 'singletrap', '[silent]');
 		},
-		end: "  [POKEMON] was freed from trapping.",
 	},
 	strongpartialtrap: {
 		name: 'strongpartialtrap',
diff --git a/data/mods/earthsky/moves.ts b/data/mods/earthsky/moves.ts
index 526fa7fc51..faf4e80c54 100644
--- a/data/mods/earthsky/moves.ts
+++ b/data/mods/earthsky/moves.ts
@@ -6854,6 +6854,12 @@ export const Moves: {[moveid: string]: ModdedMoveData} = {
 				this.runEvent('AfterSubDamage', target, source, move, damage);
 				return this.HIT_SUBSTITUTE;
 			},
+			onTrapPokemonPriority: -10,
+			onTrapPokemon(pokemon) {
+				if(!pokemon.volatiles['meanlooked']){
+					pokemon.trapped = false;
+				}
+			},
 			onEnd(target) {
 				this.add('-end', target, 'Substitute');
 			},
diff --git a/data/mods/earthsky/typechart.ts b/data/mods/earthsky/typechart.ts
index b907dc6b6d..7168641fe3 100644
--- a/data/mods/earthsky/typechart.ts
+++ b/data/mods/earthsky/typechart.ts
@@ -24,4 +24,31 @@ export const TypeChart: {[k: string]: ModdedTypeData} = {
 		},
 		HPivs: {atk: 30, def: 30},
 	},
+	ghost: {
+		damageTaken: {
+			trapped: 3,
+			singletrap: 3,
+			blocked: 3,
+			arenatrapped: 3,
+			Bug: 2,
+			Dark: 1,
+			Dragon: 0,
+			Electric: 0,
+			Fairy: 0,
+			Fighting: 3,
+			Fire: 0,
+			Flying: 0,
+			Ghost: 1,
+			Grass: 0,
+			Ground: 0,
+			Ice: 0,
+			Normal: 3,
+			Poison: 2,
+			Psychic: 0,
+			Rock: 0,
+			Steel: 0,
+			Water: 0,
+		},
+		HPivs: {def: 30, spd: 30},
+	},
 };