Phazorknight · Phazorknight · Apr 4, 2024 · Apr 4, 2024
diff --git a/COGITO/Animations/Wieldables/Wieldable_LaserRifle.res b/COGITO/Animations/Wieldables/Wieldable_LaserRifle.res
diff --git a/COGITO/InventoryPD/CustomResources/InventoryItemPD.gd b/COGITO/InventoryPD/CustomResources/InventoryItemPD.gd
@@ -4,7 +4,7 @@ class_name InventoryItemPD
 ## Name of Item as it appears in game.
 @export var name : String = ""
 ## Description of Item as it'll appear in the HUD / Inventory menu
-@export_multiline var descpription : String = ""
+@export_multiline var description : String = ""
 ## Icon of Item for HUD / Inventory
 @export var icon : Texture2D
 ## Sets if an item can be stackable or not. Usually used for consumables or ammo.

diff --git a/COGITO/InventoryPD/Items/Cogito_Battery.tres b/COGITO/InventoryPD/Items/Cogito_Battery.tres
@@ -12,7 +12,7 @@ script = ExtResource("1_3ov2u")
 target_item_ammo = ExtResource("3_myi62")
 reload_amount = 10
 name = "Battery"
-descpription = "Can be combined with the Flashlight. Non-rechargeable."
+description = "Can be combined with the Flashlight. Non-rechargeable."
 icon = ExtResource("1_fjosn")
 is_stackable = true
 stack_size = 5

diff --git a/COGITO/InventoryPD/Items/Cogito_DiamondKey_A.tres b/COGITO/InventoryPD/Items/Cogito_DiamondKey_A.tres
@@ -19,7 +19,7 @@ script = ExtResource("5_k8w13")
 target_item_combine = "Diamond Half B"
 resulting_item = SubResource("Resource_42vrf")
 name = "Diamond Half A"
-descpription = "Looks like it's only have of some kind of shape."
+description = "Looks like it's only half of some kind of shape."
 icon = ExtResource("1_xkbwk")
 is_stackable = false
 stack_size = 0

diff --git a/COGITO/InventoryPD/Items/Cogito_DiamondKey_B.tres b/COGITO/InventoryPD/Items/Cogito_DiamondKey_B.tres
@@ -19,7 +19,7 @@ script = ExtResource("5_3fxls")
 target_item_combine = "Diamond Half A"
 resulting_item = SubResource("Resource_xp6cd")
 name = "Diamond Half B"
-descpription = "Looks incomplete. Maybe I can find the rest of it?"
+description = "Looks incomplete. Maybe I can find the rest of it?"
 icon = ExtResource("1_gdixu")
 is_stackable = false
 stack_size = 0

diff --git a/COGITO/InventoryPD/Items/Cogito_DiamondKey_Combine.tres b/COGITO/InventoryPD/Items/Cogito_DiamondKey_Combine.tres
@@ -9,7 +9,7 @@
 script = ExtResource("3_5ndf1")
 discard_after_use = true
 name = "Diamond Key"
-descpription = "This looks like it could fit into something."
+description = "This looks like it could fit into something."
 icon = ExtResource("1_iq57n")
 is_stackable = false
 stack_size = 0

diff --git a/COGITO/InventoryPD/Items/Cogito_Flashlight.tres b/COGITO/InventoryPD/Items/Cogito_Flashlight.tres
@@ -15,7 +15,7 @@ charge_current = 100.0
 wieldable_range = 0.0
 wieldable_damage = 0.0
 name = "Flashlight"
-descpription = "Eats batteries like it it's job."
+description = "Eats batteries like it's its job."
 icon = ExtResource("1_f43pq")
 is_stackable = false
 stack_size = 0

diff --git a/COGITO/InventoryPD/Items/Cogito_FoamBullets.tres b/COGITO/InventoryPD/Items/Cogito_FoamBullets.tres
@@ -11,7 +11,7 @@ script = ExtResource("3_fjkqh")
 target_item_ammo = ExtResource("5_cl3nd")
 reload_amount = 1
 name = "Foam Bullets"
-descpription = "Very visible but not very dangerous. Have a tendency to vanish."
+description = "Very visible but not very dangerous. Have a tendency to vanish."
 icon = ExtResource("1_efcmi")
 is_stackable = true
 stack_size = 50

diff --git a/COGITO/InventoryPD/Items/Cogito_HealthPotion.tres b/COGITO/InventoryPD/Items/Cogito_HealthPotion.tres
@@ -12,7 +12,7 @@ attribute_name = "health"
 attribute_change_amount = 10.0
 value_to_change = 0
 name = "Health Potion"
-descpription = "Tastes better than it looks."
+description = "Tastes better than it looks."
 icon = ExtResource("1_net5f")
 is_stackable = true
 stack_size = 5

diff --git a/COGITO/InventoryPD/Items/Cogito_Key.tres b/COGITO/InventoryPD/Items/Cogito_Key.tres
@@ -9,7 +9,7 @@
 script = ExtResource("3_2pl2b")
 discard_after_use = true
 name = "Key"
-descpription = "Opens a locked door."
+description = "Opens a locked door."
 icon = ExtResource("1_n8yj5")
 is_stackable = false
 stack_size = 1

diff --git a/COGITO/InventoryPD/Items/Cogito_Laptop.tres b/COGITO/InventoryPD/Items/Cogito_Laptop.tres
@@ -8,7 +8,7 @@
 script = ExtResource("2_fxw06")
 discard_after_use = false
 name = "Laptop"
-descpription = "Feels light and doesn't turn on.
+description = "Feels light and doesn't turn on.
 Does that matter?"
 icon = ExtResource("1_ovk1j")
 is_stackable = false

diff --git a/COGITO/InventoryPD/Items/Cogito_LaptopReal.tres b/COGITO/InventoryPD/Items/Cogito_LaptopReal.tres
@@ -8,7 +8,7 @@
 script = ExtResource("1_h5ph8")
 discard_after_use = false
 name = "CEOs Laptop"
-descpription = "The CEO's laptop. There's probably a  lot of valuable data on here."
+description = "The CEO's laptop. There's probably a lot of valuable data on here."
 icon = ExtResource("1_bw20e")
 is_stackable = false
 stack_size = 0

diff --git a/COGITO/InventoryPD/Items/Cogito_LaserAmmo.tres b/COGITO/InventoryPD/Items/Cogito_LaserAmmo.tres
@@ -10,7 +10,7 @@ script = ExtResource("1_opcg5")
 target_item_ammo = ExtResource("4_37gcd")
 reload_amount = 50
 name = "Laser Ammo"
-descpription = "Tends to get hot. One clip has a charge of 50."
+description = "Tends to get hot. One clip has a charge of 50."
 icon = ExtResource("1_6hnrl")
 is_stackable = true
 stack_size = 5

diff --git a/COGITO/InventoryPD/Items/Cogito_LaserRifle.tres b/COGITO/InventoryPD/Items/Cogito_LaserRifle.tres
@@ -13,7 +13,7 @@ charge_current = 100.0
 wieldable_range = 100.0
 wieldable_damage = 1.0
 name = "Laser Rifle"
-descpription = "Goes pew pew pew. Nees Laser Ammo to reload."
+description = "Goes pew pew pew. Needs Laser Ammo to reload."
 icon = ExtResource("1_62c38")
 is_stackable = false
 stack_size = 0

diff --git a/COGITO/InventoryPD/Items/Cogito_PageCombined.tres b/COGITO/InventoryPD/Items/Cogito_PageCombined.tres
@@ -7,7 +7,7 @@
 script = ExtResource("1_5cvs2")
 discard_after_use = false
 name = "Combined Page"
-descpription = "Reassembled page from the ripped pieces. It says \"New code is 0451\" on it."
+description = "Reassembled page from the ripped pieces. It says \"New code is 0451\" on it."
 icon = ExtResource("1_g83kf")
 is_stackable = false
 stack_size = 0

diff --git a/COGITO/InventoryPD/Items/Cogito_Pickaxe.tres b/COGITO/InventoryPD/Items/Cogito_Pickaxe.tres
@@ -13,7 +13,7 @@ charge_current = 1.0
 wieldable_range = 5.0
 wieldable_damage = 3.0
 name = "Pickaxe"
-descpription = "Don't go digging for diamonds now."
+description = "Don't go digging for diamonds now."
 icon = ExtResource("1_a7clm")
 is_stackable = false
 stack_size = 0

diff --git a/COGITO/InventoryPD/Items/Cogito_Pistol.tres b/COGITO/InventoryPD/Items/Cogito_Pistol.tres
@@ -13,7 +13,7 @@ charge_current = 10.0
 wieldable_range = 10.0
 wieldable_damage = 1.0
 name = "Foam Pistol"
-descpription = "There's a reason it looks like a toy. Shoots foam bullets."
+description = "There's a reason it looks like a toy. Shoots foam bullets."
 icon = ExtResource("1_t40ae")
 is_stackable = false
 stack_size = 0

diff --git a/COGITO/InventoryPD/Items/Cogito_RippedPage_A.tres b/COGITO/InventoryPD/Items/Cogito_RippedPage_A.tres
@@ -16,7 +16,7 @@ script = ExtResource("1_g52q8")
 target_item_combine = "Ripped Page B"
 resulting_item = SubResource("Resource_njshw")
 name = "Ripped Page A"
-descpription = "Piece of paper ripped in half. It has some numbers on it but parts are missing."
+description = "A piece of paper ripped in half. It has some numbers on it but parts are missing."
 icon = ExtResource("1_hcvti")
 is_stackable = false
 stack_size = 0

diff --git a/COGITO/InventoryPD/Items/Cogito_RippedPage_B.tres b/COGITO/InventoryPD/Items/Cogito_RippedPage_B.tres
@@ -16,7 +16,7 @@ script = ExtResource("1_u1rhg")
 target_item_combine = "Ripped Page A"
 resulting_item = SubResource("Resource_34jct")
 name = "Ripped Page B"
-descpription = "Piece of paper ripped in half. It has some numbers on it but parts are missing."
+description = "A piece of paper ripped in half. It has some numbers on it but parts are missing."
 icon = ExtResource("1_xupyp")
 is_stackable = false
 stack_size = 0

diff --git a/COGITO/InventoryPD/Items/Cogito_StaminaExtension.tres b/COGITO/InventoryPD/Items/Cogito_StaminaExtension.tres
@@ -12,7 +12,7 @@ attribute_name = "stamina"
 attribute_change_amount = 25.0
 value_to_change = 1
 name = "Stamina Extension"
-descpription = "Drinking this permanently increases your maximum stamina."
+description = "Drinking this permanently increases your maximum stamina."
 icon = ExtResource("2_ylptx")
 is_stackable = true
 stack_size = 5

diff --git a/COGITO/InventoryPD/UiScenes/inventory_interface.gd b/COGITO/InventoryPD/UiScenes/inventory_interface.gd
@@ -66,7 +66,7 @@ func _on_focus_changed(control: Control):
 
 	if control_in_focus.item_data and !grabbed_slot.visible:
 		item_name.text = control_in_focus.item_data.name
-		item_description.text = control_in_focus.item_data.descpription
+		item_description.text = control_in_focus.item_data.description
 		info_panel.global_position = control_in_focus.global_position + Vector2(0,control_in_focus.size.y)
 		info_panel.show()
 	else: