<commit_before>#include "j1App.h"
#include "j1Input.h"
#include "j1Render.h"
#include "Pokemon.h"
#include "j1Scene.h"
#include "j1Collision.h"
#include "p2Log.h"

j1Collision::j1Collision()
{
	name = "collision";

	for (uint i = 0; i < MAX_COLLIDERS; ++i)
		colliders[i] = nullptr;

	matrix[COLLIDER_PLAYER][COLLIDER_ENEMY] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_ITEM] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_BOMB] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_SWITCH_MAP] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_DYNOBJECT] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_POKEMON] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_TRAINER] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_VILAGER] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_GANON_ATTACK] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_GMINION] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_RMINION] = true;

	matrix[COLLIDER_BCTROOPER_MAZE][COLLIDER_PLAYER] = true;
	matrix[COLLIDER_BCTROOPER][COLLIDER_SWORD] = true;
	matrix[COLLIDER_BCTROOPER][COLLIDER_ARROW] = true;
	matrix[COLLIDER_BCTROOPER][COLLIDER_DYNOBJECT] = true;

	matrix[COLLIDER_SWORD][COLLIDER_POKEMON] = true;
	matrix[COLLIDER_SWORD][COLLIDER_DYNOBJECT] = true;

	matrix[COLLIDER_ENEMY][COLLIDER_PLAYER] = false;
	matrix[COLLIDER_ENEMY][COLLIDER_SWORD] = true;
	matrix[COLLIDER_ENEMY][COLLIDER_BOMB] = true;
	matrix[COLLIDER_ENEMY][COLLIDER_ENEMY] = false;<commit_msg>new collision set<commit_after>#include "j1App.h"
#include "j1Input.h"
#include "j1Render.h"
#include "Pokemon.h"
#include "j1Scene.h"
#include "j1Collision.h"
#include "p2Log.h"

j1Collision::j1Collision()
{
	name = "collision";

	for (uint i = 0; i < MAX_COLLIDERS; ++i)
		colliders[i] = nullptr;

	matrix[COLLIDER_PLAYER][COLLIDER_ENEMY] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_ITEM] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_BOMB] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_SWITCH_MAP] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_DYNOBJECT] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_POKEMON] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_TRAINER] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_VILAGER] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_GANON_ATTACK] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_GMINION] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_RMINION] = true;
	matrix[COLLIDER_PLAYER][COLLIDER_FIREBAT] = true;

	matrix[COLLIDER_BCTROOPER_MAZE][COLLIDER_PLAYER] = true;
	matrix[COLLIDER_BCTROOPER][COLLIDER_SWORD] = true;
	matrix[COLLIDER_BCTROOPER][COLLIDER_ARROW] = true;
	matrix[COLLIDER_BCTROOPER][COLLIDER_DYNOBJECT] = true;

	matrix[COLLIDER_SWORD][COLLIDER_POKEMON] = true;
	matrix[COLLIDER_SWORD][COLLIDER_DYNOBJECT] = true;

	matrix[COLLIDER_ENEMY][COLLIDER_PLAYER] = false;
	matrix[COLLIDER_ENEMY][COLLIDER_SWORD] = true;
	matrix[COLLIDER_ENEMY][COLLIDER_BOMB] = true;
	matrix[COLLIDER_ENEMY][COLLIDER_ENEMY] = false;
{'fraction_non_alphanumeric': 0.12905525846702318, 'fraction_numerical': 0.006417112299465241, 'mean_word_length': 9.431226765799256, 'pattern_counts': {'":': 0, '<': 5, '<?xml version=': 0, '>': 3, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '2813544', 'n_tokens_mistral': 1352, 'n_tokens_neox': 1328, 'n_words': 139}