diff --git a/Content/Assets/Gun/GunMaterialNoDrawOver.uasset b/Content/Assets/Gun/GunMaterialNoDrawOver.uasset
new file mode 100644
index 0000000..a0df3f4
--- /dev/null
+++ b/Content/Assets/Gun/GunMaterialNoDrawOver.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e995d9a323b50ab82e0dae790ea84d70fed00cc2e905d1bb8f2f8ea77873a4eb
+size 40864
diff --git a/Content/Assets/Gun/SM_MERGED_Gun_Book.uasset b/Content/Assets/Gun/SM_MERGED_Gun_Book.uasset
new file mode 100644
index 0000000..e1a7da2
--- /dev/null
+++ b/Content/Assets/Gun/SM_MERGED_Gun_Book.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31724d37643af92724f5cd94cc3a2b174144d6b1b2798c612fdb293a8464e95f
+size 210301
diff --git a/Content/Assets/Gun/SM_MERGED_Gun_Book_Blueprint.uasset b/Content/Assets/Gun/SM_MERGED_Gun_Book_Blueprint.uasset
new file mode 100644
index 0000000..ef0c2d6
--- /dev/null
+++ b/Content/Assets/Gun/SM_MERGED_Gun_Book_Blueprint.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a610c4ccd7a900930fbb5707f8fc7c8c8411db2b8d634fa49701313e7b866d9c
+size 71806
diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset
index 3eaacc3..cd9e959 100644
--- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset
+++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82f683699a5cf17c3cd137bdc3bf7a02a048848f3ee42e164116455249075e26
-size 173373
+oid sha256:e6ad386f10f75f48076a2d5b9a3a8873d0e1dc03f487358170da6af27ee9bc5d
+size 192604
diff --git a/Content/Blueprints/Quests/Quest_Start.uasset b/Content/Blueprints/Quests/Quest_Start.uasset
index 092b402..c5d1ad9 100644
--- a/Content/Blueprints/Quests/Quest_Start.uasset
+++ b/Content/Blueprints/Quests/Quest_Start.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89735b36476f8030ece4bb83cb0e4e63c6a99ff5a3c3662ead9438c60ae0e157
-size 7432
+oid sha256:f5270721718b55fb8e51c931ad6c58f6f7cbc8bae575076d215e7bfd397c6782
+size 7455
diff --git a/Content/Dialogue/SM_Merchant_Blueprint.uasset b/Content/Dialogue/SM_Merchant_Blueprint.uasset
index 651f219..a2f6085 100644
--- a/Content/Dialogue/SM_Merchant_Blueprint.uasset
+++ b/Content/Dialogue/SM_Merchant_Blueprint.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50e413a3b75015eeea1615c708478019f07c29e87dbb9ab685a5022d885e5c62
-size 135645
+oid sha256:2aae9c39e7d6091fd1ae5248c1ac9a57e6752adb4def278d67d43567376a66da
+size 135423
diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap
index 52c7da7..acae49c 100644
--- a/Content/Levels/Build.umap
+++ b/Content/Levels/Build.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83ffa5c68b6474224a8be89c56746da390b35704aceb715607c6b59480ca3010
-size 3461524
+oid sha256:39f669b4f32f01e0ba3ad87d1de55530fac89f13a60943434640a2aca95a9ca2
+size 3464522
diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp
index 4d4630b..9ad018c 100644
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp
@@ -64,6 +64,7 @@ void UHoldToInitCombat::TickComponent(float DeltaTime, ELevelTick TickType, FAct
 
 void UHoldToInitCombat::OnClickDown()
 {
+	if (!bHasBookAndGun) return;
 	if (Cast<ATurnBaseCombatV2>(GetWorld()->GetGameState())->bIsInCombat) return;
 	if (ReloadTimer > 0.0f) return;
 	if (GunEffect)
diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.h b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.h
index 9db6d2a..c18a361 100644
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.h
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.h
@@ -24,7 +24,9 @@ public:
 	UUserWidget* InitCombatWidget;
 	UPROPERTY()
 	TSubclassOf<UUserWidget> InitCombatWidgetClass;
-
+	UPROPERTY(BlueprintReadWrite)
+	bool bHasBookAndGun = false;
+	
 	UPROPERTY()
 	UNiagaraSystem* GunEffect;