diff --git a/.gitattributes b/.gitattributes index 24a8e87939aa53cdd833f6be7610cb4972e063ad..38cd7aab64279ac35035446adc868e96b29958fa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,4 @@ +*.ipynb text eol=lf +*.bat text eol=crlf +*.sh text eol=lf *.png filter=lfs diff=lfs merge=lfs -text diff --git a/clean_requirements.txt b/clean_requirements.txt deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/image_reprocessing/IPM.ipynb b/image_reprocessing/IPM.ipynb new file mode 100644 index 0000000000000000000000000000000000000000..2c1d9b9e71f110915c178bff6553addc0aa3edf0 --- /dev/null +++ b/image_reprocessing/IPM.ipynb @@ -0,0 +1,67 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": 9, + "id": "d6a916d2", + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "npc.png 리사이즈 완료\n" + ] + } + ], + "source": [ + "# 이미지 크기 64x64로 변경 (input_images -> resized_images)\n", + "from PIL import Image\n", + "import os\n", + "\n", + "# 입력 폴더와 출력 폴더 경로 설정\n", + "input_folder = \"input_images/set_2\" # 원본 이미지 폴더\n", + "output_folder = \"resized_images\" # 리사이즈된 이미지 저장 폴더\n", + "target_size = (64, 64)\n", + "\n", + "# 출력 폴더가 없으면 생성\n", + "os.makedirs(output_folder, exist_ok=True)\n", + "\n", + "# 이미지 리사이즈\n", + "for filename in os.listdir(input_folder):\n", + " if filename.lower().endswith((\".png\", \".jpg\", \"jpeg\", \".bmp\", \".gif\")):\n", + " input_path = os.path.join(input_folder, filename)\n", + " output_path = os.path.join(output_folder, filename)\n", + "\n", + " try:\n", + " with Image.open(input_path) as img:\n", + " resized_img = img.resize(target_size, Image.Resampling.LANCZOS)\n", + " resized_img.save(output_path)\n", + " print(f\"{filename} 리사이즈 완료\")\n", + " except Exception as e:\n", + " print(f\"{filename} 처리 중 오류 발생: {e}\")" + ] + } + ], + "metadata": { + "kernelspec": { + "display_name": "portfolio", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.11.11" + } + }, + "nbformat": 4, + "nbformat_minor": 5 +} diff --git a/image_reprocessing/input_images/set_1/animal_caw.png b/image_reprocessing/input_images/set_1/animal_caw.png new file mode 100644 index 0000000000000000000000000000000000000000..e80828afcea90db6b1ca589c452207247a9fed7c --- /dev/null +++ b/image_reprocessing/input_images/set_1/animal_caw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5cc2c9e45f4798772eb9b9c20779df27e3d8b09e64a4f2783ece4cc50723257 +size 128713 diff --git a/image_reprocessing/input_images/set_1/animal_chicken.png b/image_reprocessing/input_images/set_1/animal_chicken.png new file mode 100644 index 0000000000000000000000000000000000000000..ae3344ca24eaf0e8d3b5f981824d6e5c93cf328c --- /dev/null +++ b/image_reprocessing/input_images/set_1/animal_chicken.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f32c0c3f975026eb37df62f773f148e9758060e0386156a6fc96c4e42a0fcfce +size 131300 diff --git a/image_reprocessing/input_images/set_1/animal_dog.png b/image_reprocessing/input_images/set_1/animal_dog.png new file mode 100644 index 0000000000000000000000000000000000000000..ba532da8a2459f141262b563966f8d0d9c5283b4 --- /dev/null +++ b/image_reprocessing/input_images/set_1/animal_dog.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f76817f15076aec6db5ada101a8ac4c0b125ff7b5220f823e32c8078ec4b825 +size 129281 diff --git a/image_reprocessing/input_images/set_1/animal_horse.png b/image_reprocessing/input_images/set_1/animal_horse.png new file mode 100644 index 0000000000000000000000000000000000000000..1a46cfba1914ecf2aa2dfc55c2294ac509213629 --- /dev/null +++ b/image_reprocessing/input_images/set_1/animal_horse.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc24b61fab1475bfe89c9dcfe622d5279e0c3198c6798cfa751310565655951d +size 124758 diff --git a/image_reprocessing/input_images/set_1/animal_pig.png b/image_reprocessing/input_images/set_1/animal_pig.png new file mode 100644 index 0000000000000000000000000000000000000000..590ae7c36cbacf8d62f3c8e20c0fd097b44570c7 --- /dev/null +++ b/image_reprocessing/input_images/set_1/animal_pig.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:713f616971002faa9b781d7bd6224daf9a00b87260d464ea65406a0c7caecc18 +size 127298 diff --git a/image_reprocessing/input_images/set_1/animal_sheep.png b/image_reprocessing/input_images/set_1/animal_sheep.png new file mode 100644 index 0000000000000000000000000000000000000000..622c4871d01c5242e81d00a8ba398a7eb99f7148 --- /dev/null +++ b/image_reprocessing/input_images/set_1/animal_sheep.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48ed715bff36a950d6a68a36506f3e6f3f32e1637fc73a47d0e98bcbe4dc4a3c +size 126294 diff --git a/image_reprocessing/input_images/set_1/build_house.png b/image_reprocessing/input_images/set_1/build_house.png new file mode 100644 index 0000000000000000000000000000000000000000..ce05e269be6ddec370481c6bc7521ff67ab326bb --- /dev/null +++ b/image_reprocessing/input_images/set_1/build_house.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1c6eb1a891228fb67824283c10b2c532c9b78073cda588d5af0c00befa0f4cc +size 130409 diff --git a/image_reprocessing/input_images/set_1/build_market.png b/image_reprocessing/input_images/set_1/build_market.png new file mode 100644 index 0000000000000000000000000000000000000000..b9464efa0e5bb797922208f825cc8656ebbc8bb9 --- /dev/null +++ b/image_reprocessing/input_images/set_1/build_market.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e36bd1dfed31d8cbe44e4e59792320a2e701a11069c012f7dbfdd08372dfd26 +size 125481 diff --git a/image_reprocessing/input_images/set_1/build_temple.png b/image_reprocessing/input_images/set_1/build_temple.png new file mode 100644 index 0000000000000000000000000000000000000000..b5986a04ae435bdb7b8c868736439d382f338ebb --- /dev/null +++ b/image_reprocessing/input_images/set_1/build_temple.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d618d733dd0ca2002590a91180a4f114fd4924e25ca9d020da1887ffb31bc06a +size 113434 diff --git a/image_reprocessing/input_images/set_1/plant_raspberry.png b/image_reprocessing/input_images/set_1/plant_raspberry.png new file mode 100644 index 0000000000000000000000000000000000000000..86e769191e9a9ec7aa15fbe504b10e081332e9c8 --- /dev/null +++ b/image_reprocessing/input_images/set_1/plant_raspberry.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43733031a2d71fbff692819b93b2f258f40872a28177c548b32cd6f90aed474b +size 136805 diff --git a/image_reprocessing/input_images/set_1/plant_tree.png b/image_reprocessing/input_images/set_1/plant_tree.png new file mode 100644 index 0000000000000000000000000000000000000000..9e71c5ecb5c0498cada90d7bf948d499452fe9a1 --- /dev/null +++ b/image_reprocessing/input_images/set_1/plant_tree.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de7d3fd74dfb3ecc9b347604b638477ccdbd4a1b357da693db4d4339ccedf3b8 +size 119286 diff --git a/image_reprocessing/input_images/set_1/plant_wheat.png b/image_reprocessing/input_images/set_1/plant_wheat.png new file mode 100644 index 0000000000000000000000000000000000000000..430972b3201e70f92e8ed2528815a800f5e9a96b --- /dev/null +++ b/image_reprocessing/input_images/set_1/plant_wheat.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:158addbb4ee169edb97c5831833b7db82ea9a44b91c1ced7311a674d8293df37 +size 122627 diff --git a/image_reprocessing/input_images/set_1/tile_dirt.png b/image_reprocessing/input_images/set_1/tile_dirt.png new file mode 100644 index 0000000000000000000000000000000000000000..2601bbf6e115948e1b88b28961c32704d31dce12 --- /dev/null +++ b/image_reprocessing/input_images/set_1/tile_dirt.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8437689964eec1dbce4d9d1a6afcd6f85c1b4499670e50efcfaf6f2af1d8f9de +size 70451 diff --git a/image_reprocessing/input_images/set_1/tile_grass.png b/image_reprocessing/input_images/set_1/tile_grass.png new file mode 100644 index 0000000000000000000000000000000000000000..703739f88aaa3bc2276c9878d862e0c96234a357 --- /dev/null +++ b/image_reprocessing/input_images/set_1/tile_grass.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79a0acb1e5d6479d7bdf3ae9654627e2c1273cdcd1a00c3f4bda39d3e6346bab +size 113847 diff --git a/image_reprocessing/input_images/set_1/tile_pool.png b/image_reprocessing/input_images/set_1/tile_pool.png new file mode 100644 index 0000000000000000000000000000000000000000..c2b5a343658f27d817407b94dd4fc87bcfcfba80 --- /dev/null +++ b/image_reprocessing/input_images/set_1/tile_pool.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e962a7e33b5243df954959032553d22e5f2805e77ee38ae3e63fb47608a80a8d +size 126085 diff --git a/image_reprocessing/input_images/set_1/tile_stone.png b/image_reprocessing/input_images/set_1/tile_stone.png new file mode 100644 index 0000000000000000000000000000000000000000..1fe373106e380c0ba7e4cda42ec8e3b463cfbea0 --- /dev/null +++ b/image_reprocessing/input_images/set_1/tile_stone.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8462cb029e25adee62049fa2985956979176da8f34fae32d5c69ae9c31334c7 +size 127161 diff --git a/image_reprocessing/input_images/set_1/tile_water.png b/image_reprocessing/input_images/set_1/tile_water.png new file mode 100644 index 0000000000000000000000000000000000000000..cf49144acaec4da6bd93725b83f4ebe1d9f428a4 --- /dev/null +++ b/image_reprocessing/input_images/set_1/tile_water.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b526e5fc147e664523dae53b26ab2d541e0d5761de3f4f69a94d6f260939ed4b +size 101814 diff --git a/image_reprocessing/input_images/set_2/npc.png b/image_reprocessing/input_images/set_2/npc.png new file mode 100644 index 0000000000000000000000000000000000000000..29440fc7324eda8d0b53b1db05ea5f63eeb156b7 --- /dev/null +++ b/image_reprocessing/input_images/set_2/npc.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1eeb7add136b804f0882724a067394d4719d614d39cb1f7d237c50234a438f73 +size 25420 diff --git a/input_images/grass_tile.png b/input_images/grass_tile.png deleted file mode 100644 index 6303d601dc85b0b36fc308ed7e08c019de1b380d..0000000000000000000000000000000000000000 --- a/input_images/grass_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2949e42e1024b0b8cd61fe9d5d3a75b60135182557dad2530568bd9e8a0dddd -size 1012 diff --git a/input_images/home_tile.png b/input_images/home_tile.png deleted file mode 100644 index 1eb6500d0d11cf0720b15f96402993b94512e153..0000000000000000000000000000000000000000 --- a/input_images/home_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8e096ff3adf09c801eb4c8c723b3ee5af57f7ddf1fc9bda7c7b6b2e586137e2 -size 1132 diff --git a/input_images/stone_tile.png b/input_images/stone_tile.png deleted file mode 100644 index fcee6ef1c9257fea257fa95973fbf0b55fa03075..0000000000000000000000000000000000000000 --- a/input_images/stone_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d63cab07715126eda0499657bc5df46c032b070a52b821b84da75b84c98a5dd3 -size 1177 diff --git a/input_images/store_tile.png b/input_images/store_tile.png deleted file mode 100644 index 282ecdaca8a35fc94ae17a712a78ed26b3318dbb..0000000000000000000000000000000000000000 --- a/input_images/store_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33ad8b1a902e56cf3e970acd775107b7e22c3dea4ace97c62137c0859f698024 -size 1145 diff --git a/input_images/temple_tile.png b/input_images/temple_tile.png deleted file mode 100644 index 76a58faf0c2dc27d313ca4ac23ff623e835df91a..0000000000000000000000000000000000000000 --- a/input_images/temple_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e75eae1e09a4453351d79dd378e8e9dce2d620ccee3367ab3bbe2aae247e7c6 -size 9643 diff --git a/input_images/tree_tile.png b/input_images/tree_tile.png deleted file mode 100644 index b2faf76d76d394ad9a7f2167b6f239c08bca7d70..0000000000000000000000000000000000000000 --- a/input_images/tree_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56a58f0c253736a1e7389f1584a13d7be75ca302d32d6bf3d8661b7865352ca4 -size 10957 diff --git a/input_images/wheat_field_tile.png b/input_images/wheat_field_tile.png deleted file mode 100644 index 8bbb5d677d7a5e15429013ad3bfa3273ad5bebf6..0000000000000000000000000000000000000000 --- a/input_images/wheat_field_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf8bc792e22b9e72455becca8313baa57e52f8ac80b912d9af48f6322c288c21 -size 9466 diff --git a/npc_social_network/maps/town_hall.py b/npc_social_network/maps/town_hall.py index b528a0441f1ab4c296766b985c6e85bf9831e602..8b7ccb58bdc3e4ac56c4ab047c438a2038c93ce4 100644 --- a/npc_social_network/maps/town_hall.py +++ b/npc_social_network/maps/town_hall.py @@ -1,6 +1,8 @@ +# portfolio/npc_social_network/maps/town_hall.py import pygame import sys import random +import os # 초기 설정 pygame.init() @@ -9,23 +11,41 @@ grid_width, grid_height = 20, 20 screen = pygame.display.set_mode((grid_width * tile_size, grid_height * tile_size)) pygame.display.set_caption("town_hall") +# 이미지 로드 함수 +def load_image(name): + path = os.path.join("../static/images/tiles", name) # 이미지들은 images/tiles 폴더에 저장한다고 가정 + return pygame.transform.scale(pygame.image.load(path), (tile_size, tile_size)) + +# 타일 이미지 사전 +TILE_IMAGES = { + # 지형 + "grass": load_image("topography/tile_grass.png"), + "dirt": load_image("topography/tile_dirt.png"), + "stone": load_image("topography/tile_stone.png"), + "water": load_image("topography/tile_water.png"), + + # 건물 + "house": load_image("building/build_house.png"), + "temple": load_image("building/build_temple.png"), + "market": load_image("building/build_market.png"), + + # 동물 + + # 식물 + "tree":load_image("plant/plant_tree.png"), + "wheat":load_image("plant/plant_wheat.png"), + + # 사람 + "npc":load_image("npc/npc.png"), +} + # 색상 정의 COLORS = { "empty": (230, 230, 230), - - "grass": (144, 238, 144), # 연녹색 - "dirt": (210, 180, 140), # 흙색 - "stone": (169, 169, 169), # 회색 - - "house": (150, 75, 0), # 갈색 - "market": (255, 215, 0), # 금색 - "farm": (34, 139, 34), # 짙은 녹색 - "temple": (128, 0, 128), # 보라색 - "npc": (0,0,255) # 파란색 } # 랜덤 배경 타일 생성 -terrain_types = ["grass", "dirt", "stone"] +terrain_types = ["grass", "dirt", "stone", "water"] terrain_map = [[random.choice(terrain_types) for _ in range(grid_width)] for _ in range(grid_height)] # 마을 구조 정의 @@ -34,32 +54,29 @@ village_map = { {"type": "house", "location": [2,3]}, {"type": "house", "location": [3,3]}, {"type": "market", "location": [5,5]}, - {"type": "farm", "location": [10,3]}, + {"type": "wheat", "location": [10,3]}, {"type": "temple", "location": [8,8]}, ], "npcs":[ - {"name": "Elin", "job": "farmer", "location": [2,3]}, - {"name": "Borg", "job": "blacksmith", "location": [6,6]} + {"name": "Elin", "job": "farmer", "location": [2,3], "type": "npc"}, + {"name": "Borg", "job": "blacksmith", "location": [6,6], "type": "npc"} ] } # 화면 렌더링 함수 def draw_map(): - screen.fill(COLORS['empty']) for y in range(grid_height): for x in range(grid_width): terrain = terrain_map[y][x] - color = COLORS.get(terrain, (200, 200, 200)) - pygame.draw.rect(screen, color, (x * tile_size, y * tile_size, tile_size, tile_size)) + screen.blit(TILE_IMAGES[terrain], (x * tile_size, y * tile_size)) for building in village_map["buildings"]: x, y = building["location"] - color = COLORS.get(building["type"], (100, 100, 100)) - pygame.draw.rect(screen, color, (x * tile_size, y * tile_size, tile_size, tile_size)) + screen.blit(TILE_IMAGES[building["type"]], (x * tile_size, y * tile_size)) for npc in village_map["npcs"]: x, y = npc["location"] - pygame.draw.circle(screen, COLORS["npc"], (x * tile_size + tile_size // 2, y * tile_size + tile_size // 2), 8) + screen.blit(TILE_IMAGES[npc["type"]], (x * tile_size, y * tile_size)) # pygame 루프 runnig = True diff --git a/npc_social_network/static/images/tiles/animal/animal_caw.png b/npc_social_network/static/images/tiles/animal/animal_caw.png new file mode 100644 index 0000000000000000000000000000000000000000..819898bb8bb9535964e628fabf726af978eb5530 --- /dev/null +++ b/npc_social_network/static/images/tiles/animal/animal_caw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29370b713daa7be22c91ac772c17dcc78adb4ec794d2aaf56806f4a8aef2e21b +size 8335 diff --git a/npc_social_network/static/images/tiles/animal/animal_chicken.png b/npc_social_network/static/images/tiles/animal/animal_chicken.png new file mode 100644 index 0000000000000000000000000000000000000000..e131668a874a0335fbdcceeddf73a0ef8461938e --- /dev/null +++ b/npc_social_network/static/images/tiles/animal/animal_chicken.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c17fbad366861df32e209b1c2d2d2a8b84114e67d999af3096eb133824dbe5f4 +size 8202 diff --git a/npc_social_network/static/images/tiles/animal/animal_dog.png b/npc_social_network/static/images/tiles/animal/animal_dog.png new file mode 100644 index 0000000000000000000000000000000000000000..fcb94bb5fcb59a1623a08e79f357782262b76b37 --- /dev/null +++ b/npc_social_network/static/images/tiles/animal/animal_dog.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab4ddd291f2e9f8607e78382237dd05224aeac353ce71754ab85546fd9514269 +size 8183 diff --git a/npc_social_network/static/images/tiles/animal/animal_horse.png b/npc_social_network/static/images/tiles/animal/animal_horse.png new file mode 100644 index 0000000000000000000000000000000000000000..77c85a6ae039997d79b988108ccd2b69678b6290 --- /dev/null +++ b/npc_social_network/static/images/tiles/animal/animal_horse.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:119c500ff4740e2bb91053c7db1e7ae6a2f15c4cf2b15ab5ab20cbbbefddbd69 +size 8035 diff --git a/npc_social_network/static/images/tiles/animal/animal_pig.png b/npc_social_network/static/images/tiles/animal/animal_pig.png new file mode 100644 index 0000000000000000000000000000000000000000..f71980bf89b3a9ad23987ed561313db30fcf6100 --- /dev/null +++ b/npc_social_network/static/images/tiles/animal/animal_pig.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9de3acb3b1de16b2c500d28276299d80854e3b1dd661bb3767fdac7fdcd365ea +size 8275 diff --git a/npc_social_network/static/images/tiles/animal/animal_sheep.png b/npc_social_network/static/images/tiles/animal/animal_sheep.png new file mode 100644 index 0000000000000000000000000000000000000000..6d08c7464e99d6b291fc40887918a578a0a6aee2 --- /dev/null +++ b/npc_social_network/static/images/tiles/animal/animal_sheep.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47f571b1f2023bc3872a58736bfb75a7113e43ece61c8112242cebeff7483921 +size 8309 diff --git a/npc_social_network/static/images/tiles/building/build_house.png b/npc_social_network/static/images/tiles/building/build_house.png new file mode 100644 index 0000000000000000000000000000000000000000..669f7f7ea511b02ec85e4b4a161ab0643711c618 --- /dev/null +++ b/npc_social_network/static/images/tiles/building/build_house.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e92fb2320d9cc4dc51b687cdd301892ac5a1c78e93c0319e9a0171dfe794bc8 +size 8361 diff --git a/npc_social_network/static/images/tiles/building/build_market.png b/npc_social_network/static/images/tiles/building/build_market.png new file mode 100644 index 0000000000000000000000000000000000000000..22a5c82b0ff822444da105491ce5bbde08dd35ae --- /dev/null +++ b/npc_social_network/static/images/tiles/building/build_market.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84666cd7a7580f20086a40f9f478a77ca4384d7d28f3ac387ba11988689f6081 +size 7615 diff --git a/npc_social_network/static/images/tiles/building/build_temple.png b/npc_social_network/static/images/tiles/building/build_temple.png new file mode 100644 index 0000000000000000000000000000000000000000..51db57dc7b10c98e98f1754e06174d4f87b9a496 --- /dev/null +++ b/npc_social_network/static/images/tiles/building/build_temple.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac387dca36c020d9344b7d630411c4a0b2a2f5d0dfecd0e205a216b41fa34716 +size 7734 diff --git a/npc_social_network/static/images/tiles/grass_tile.png b/npc_social_network/static/images/tiles/grass_tile.png deleted file mode 100644 index 6303d601dc85b0b36fc308ed7e08c019de1b380d..0000000000000000000000000000000000000000 --- a/npc_social_network/static/images/tiles/grass_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2949e42e1024b0b8cd61fe9d5d3a75b60135182557dad2530568bd9e8a0dddd -size 1012 diff --git a/npc_social_network/static/images/tiles/home_tile.png b/npc_social_network/static/images/tiles/home_tile.png deleted file mode 100644 index 1eb6500d0d11cf0720b15f96402993b94512e153..0000000000000000000000000000000000000000 --- a/npc_social_network/static/images/tiles/home_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8e096ff3adf09c801eb4c8c723b3ee5af57f7ddf1fc9bda7c7b6b2e586137e2 -size 1132 diff --git a/npc_social_network/static/images/tiles/npc/npc.png b/npc_social_network/static/images/tiles/npc/npc.png new file mode 100644 index 0000000000000000000000000000000000000000..eb656dc1bc71b2de1fcf8973b060aea15d4798bf --- /dev/null +++ b/npc_social_network/static/images/tiles/npc/npc.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fdc84aabac2136f0a364a89f575adf90ffdd6444298fcb4c41fb9c98f528711 +size 3528 diff --git a/npc_social_network/static/images/tiles/plant/plant_raspberry.png b/npc_social_network/static/images/tiles/plant/plant_raspberry.png new file mode 100644 index 0000000000000000000000000000000000000000..602554d7bf697fde7d7c5288d382788a0486fd8e --- /dev/null +++ b/npc_social_network/static/images/tiles/plant/plant_raspberry.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7882e06e7ee41929bd8125f1ac179066925adf0b844d76eba8c45f2ac1e36fcf +size 8883 diff --git a/npc_social_network/static/images/tiles/plant/plant_tree.png b/npc_social_network/static/images/tiles/plant/plant_tree.png new file mode 100644 index 0000000000000000000000000000000000000000..ffa4b8de66e4b8cc5c3f5a2cec8b0eb1d49a31c3 --- /dev/null +++ b/npc_social_network/static/images/tiles/plant/plant_tree.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bbfd2e7f2120f0908bcad633db1446d3da133ffeb9b349df028be77f8b86d80 +size 7798 diff --git a/npc_social_network/static/images/tiles/plant/plant_wheat.png b/npc_social_network/static/images/tiles/plant/plant_wheat.png new file mode 100644 index 0000000000000000000000000000000000000000..a3b3d6de40f6145a3e7cd8be7b6243d35ed4be3f --- /dev/null +++ b/npc_social_network/static/images/tiles/plant/plant_wheat.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7763a3d6bd838caebebb34adcde78a8d29d4090dc2a7d042f5c3b5fed65f01af +size 7994 diff --git a/npc_social_network/static/images/tiles/stone_tile.png b/npc_social_network/static/images/tiles/stone_tile.png deleted file mode 100644 index fcee6ef1c9257fea257fa95973fbf0b55fa03075..0000000000000000000000000000000000000000 --- a/npc_social_network/static/images/tiles/stone_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d63cab07715126eda0499657bc5df46c032b070a52b821b84da75b84c98a5dd3 -size 1177 diff --git a/npc_social_network/static/images/tiles/store_tile.png b/npc_social_network/static/images/tiles/store_tile.png deleted file mode 100644 index 282ecdaca8a35fc94ae17a712a78ed26b3318dbb..0000000000000000000000000000000000000000 --- a/npc_social_network/static/images/tiles/store_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33ad8b1a902e56cf3e970acd775107b7e22c3dea4ace97c62137c0859f698024 -size 1145 diff --git a/npc_social_network/static/images/tiles/temple_tile.png b/npc_social_network/static/images/tiles/temple_tile.png deleted file mode 100644 index 76a58faf0c2dc27d313ca4ac23ff623e835df91a..0000000000000000000000000000000000000000 --- a/npc_social_network/static/images/tiles/temple_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e75eae1e09a4453351d79dd378e8e9dce2d620ccee3367ab3bbe2aae247e7c6 -size 9643 diff --git a/npc_social_network/static/images/tiles/topography/tile_dirt.png b/npc_social_network/static/images/tiles/topography/tile_dirt.png new file mode 100644 index 0000000000000000000000000000000000000000..50f54f485152ca0e2006a361f2ad8a68e354abb1 --- /dev/null +++ b/npc_social_network/static/images/tiles/topography/tile_dirt.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1062470b299eaa522a23fec076d0759eff6b5de78014c8b983d4135cf57b155a +size 5197 diff --git a/npc_social_network/static/images/tiles/topography/tile_grass.png b/npc_social_network/static/images/tiles/topography/tile_grass.png new file mode 100644 index 0000000000000000000000000000000000000000..f8bf2f807b24273a7b584084ac503e93d06e593d --- /dev/null +++ b/npc_social_network/static/images/tiles/topography/tile_grass.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d3e01f1eabd5256b6bb413a8c39c421b80646d6a276cc3e93c66d86f002f664 +size 7916 diff --git a/npc_social_network/static/images/tiles/topography/tile_pool.png b/npc_social_network/static/images/tiles/topography/tile_pool.png new file mode 100644 index 0000000000000000000000000000000000000000..90d2a3b31cba0820e89baf64cd1316709cca4ee5 --- /dev/null +++ b/npc_social_network/static/images/tiles/topography/tile_pool.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:956621e82b8d4cccda2a7592ba2e6115fded8f35e8fbc69b9541ecd40e4bf946 +size 7832 diff --git a/npc_social_network/static/images/tiles/topography/tile_stone.png b/npc_social_network/static/images/tiles/topography/tile_stone.png new file mode 100644 index 0000000000000000000000000000000000000000..bad3b62cca4a7a8768cac48580d1aea5a32c40fc --- /dev/null +++ b/npc_social_network/static/images/tiles/topography/tile_stone.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7042bc0f255b2ceb5ef953f1f8523c95d36ab7ca447df8979aa104f36d80a79b +size 7913 diff --git a/npc_social_network/static/images/tiles/topography/tile_water.png b/npc_social_network/static/images/tiles/topography/tile_water.png new file mode 100644 index 0000000000000000000000000000000000000000..7a8f1833a7f3b782faa011cd97acf00f12e0eb41 --- /dev/null +++ b/npc_social_network/static/images/tiles/topography/tile_water.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90d4c84e3242d4feb93001525e6a836fe72926ecaabbb1a8a12883ed3657e065 +size 8338 diff --git a/npc_social_network/static/images/tiles/tree_tile.png b/npc_social_network/static/images/tiles/tree_tile.png deleted file mode 100644 index b2faf76d76d394ad9a7f2167b6f239c08bca7d70..0000000000000000000000000000000000000000 --- a/npc_social_network/static/images/tiles/tree_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56a58f0c253736a1e7389f1584a13d7be75ca302d32d6bf3d8661b7865352ca4 -size 10957 diff --git a/npc_social_network/static/images/tiles/wheat_field_tile.png b/npc_social_network/static/images/tiles/wheat_field_tile.png deleted file mode 100644 index 8bbb5d677d7a5e15429013ad3bfa3273ad5bebf6..0000000000000000000000000000000000000000 --- a/npc_social_network/static/images/tiles/wheat_field_tile.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf8bc792e22b9e72455becca8313baa57e52f8ac80b912d9af48f6322c288c21 -size 9466 diff --git a/requirements.txt b/requirements.txt index f82e954f47b6249149892a3008cac45034f2f978..f343a53c1e8b0372f4ca84f63c4a2f7ede5f48dd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,66 +1,89 @@ accelerate==1.7.0 -asttokens +annotated-types==0.7.0 +asttokens==3.0.0 bitsandbytes==0.45.5 blinker==1.9.0 +cachetools==5.5.2 certifi==2025.4.26 charset-normalizer==3.4.2 click==8.2.0 colorama==0.4.6 -comm -debugpy -decorator -exceptiongroup -executing +comm==0.2.2 +debugpy==1.8.13 +decorator==5.2.1 +exceptiongroup==1.3.0 +executing==2.2.0 filelock==3.18.0 Flask==3.1.1 fsspec==2025.5.0 +google-ai-generativelanguage==0.6.15 +google-api-core==2.25.0rc1 +google-api-python-client==2.170.0 +google-auth==2.40.2 +google-auth-httplib2==0.2.0 +google-generativeai==0.8.5 +googleapis-common-protos==1.70.0 +grpcio==1.71.0 +grpcio-status==1.71.0 +httplib2==0.22.0 huggingface-hub==0.32.0 idna==3.10 -importlib-metadata -ipykernel -ipython -ipython-pygments-lexers +importlib_metadata==8.7.0 +ipykernel==6.29.5 +ipython==9.1.0 +ipython_pygments_lexers==1.1.1 itsdangerous==2.2.0 -jedi +jedi==0.19.2 Jinja2==3.1.6 -jupyter-client -jupyter-core +jupyter_client==8.6.3 +jupyter_core==5.7.2 MarkupSafe==3.0.2 -matplotlib-inline +matplotlib-inline==0.1.7 mpmath==1.3.0 -nest-asyncio +nest-asyncio==1.6.0 networkx==3.4.2 numpy==2.2.6 -packaging -parso -pickleshare +packaging==24.2 +parso==0.8.4 +pickleshare==0.7.5 pillow==11.0.0 -platformdirs -prompt-toolkit -psutil -pure-eval -Pygments -python-dateutil +platformdirs==4.3.7 +prompt_toolkit==3.0.50 +proto-plus==1.26.1 +protobuf==5.29.4 +psutil==7.0.0 +pure_eval==0.2.3 +pyasn1==0.6.1 +pyasn1_modules==0.4.2 +pydantic==2.11.5 +pydantic_core==2.33.2 +pygame==2.6.1 +Pygments==2.19.1 +pyparsing==3.2.3 +python-dateutil==2.9.0.post0 python-dotenv==1.1.0 pywin32==304 PyYAML==6.0.2 -pyzmq +pyzmq==26.4.0 regex==2024.11.6 requests==2.32.3 +rsa==4.9.1 safetensors==0.5.3 -six -stack-data +six==1.17.0 +stack-data==0.6.3 sympy==1.14.0 tokenizers==0.21.1 torch==2.7.0+cu118 torchaudio==2.7.0+cu118 torchvision==0.22.0+cu118 -tornado +tornado==6.4.2 tqdm==4.67.1 -traitlets +traitlets==5.14.3 transformers==4.52.3 -typing-extensions +typing-inspection==0.4.1 +typing_extensions==4.13.1 +uritemplate==4.1.1 urllib3==2.4.0 -wcwidth +wcwidth==0.2.13 Werkzeug==3.1.3 -zipp \ No newline at end of file +zipp==3.21.0 diff --git a/resized_images/temp.py b/resized_images/temp.py deleted file mode 100644 index 10500012fca9b4425b50de67a7258a12cba0c076..0000000000000000000000000000000000000000 --- a/resized_images/temp.py +++ /dev/null @@ -1 +0,0 @@ -asd \ No newline at end of file diff --git a/test.ipynb b/test.ipynb index 289646fbe22eb0015b4f5d163973dd57a633a31f..ba73baf1ad458676858c43cc3206cca71bd82d9b 100644 --- a/test.ipynb +++ b/test.ipynb @@ -2,22 +2,13 @@ "cells": [ { "cell_type": "code", - "execution_count": 2, + "execution_count": 4, "id": "ecf4c973", "metadata": {}, - "outputs": [ - { - "name": "stderr", - "output_type": "stream", - "text": [ - "'sed'��(��) ���� �Ǵ� �ܺ� ����, ������ �� �ִ� ���α׷�, �Ǵ�\n", - "��ġ ������ �ƴմϴ�.\n" - ] - } - ], + "outputs": [], "source": [ "# 설치된 라이브러리 txt로 추출하기\n", - "!pip freeze | sed -E 's/ @ file:\\/\\/.*//' > clean_requirements.txt" + "!pip freeze | findstr \"==\" > requirements.txt" ] }, { @@ -2708,16 +2699,6 @@ "# GPU 지원 버전으로 다시 설치\n", "!pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118" ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "36fa8394", - "metadata": {}, - "outputs": [], - "source": [ - "# 이미지 크기 64x64로 변경 (input_images -> resized_images)" - ] } ], "metadata": {