- Modified textures once again

- FIxed a bug that occured when amputating an already amputated limb (hand and then forearm)
This commit is contained in:
Pao
2023-02-01 10:47:57 +01:00
parent b83d30484a
commit 9a721492aa
36 changed files with 83 additions and 77 deletions

View File

@@ -9,17 +9,17 @@
<m_Masks>4</m_Masks>
<m_MasksFolder>none</m_MasksFolder>
<textureChoices>Amputations\skin01_b</textureChoices>
<textureChoices>Amputations\skin02_b</textureChoices>
<textureChoices>Amputations\skin03_b</textureChoices>
<textureChoices>Amputations\skin04_b</textureChoices>
<textureChoices>Amputations\skin05_b</textureChoices>
<textureChoices>Amputations\Forearm\skin01_b</textureChoices>
<textureChoices>Amputations\Forearm\skin02_b</textureChoices>
<textureChoices>Amputations\Forearm\skin03_b</textureChoices>
<textureChoices>Amputations\Forearm\skin04_b</textureChoices>
<textureChoices>Amputations\Forearm\skin05_b</textureChoices>
<textureChoices>Amputations\skin01_hairy_b</textureChoices>
<textureChoices>Amputations\skin02_hairy_b</textureChoices>
<textureChoices>Amputations\skin03_hairy_b</textureChoices>
<textureChoices>Amputations\skin04_hairy_b</textureChoices>
<textureChoices>Amputations\skin05_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin01_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin02_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin03_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin04_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin05_hairy_b</textureChoices>
<textureChoices>Body\MaleBody01</textureChoices>
<textureChoices>Body\MaleBody02</textureChoices>

View File

@@ -10,17 +10,17 @@
<m_Masks>4</m_Masks>
<m_MasksFolder>none</m_MasksFolder>
<textureChoices>Amputations\skin01_b</textureChoices>
<textureChoices>Amputations\skin02_b</textureChoices>
<textureChoices>Amputations\skin03_b</textureChoices>
<textureChoices>Amputations\skin04_b</textureChoices>
<textureChoices>Amputations\skin05_b</textureChoices>
<textureChoices>Amputations\Forearm\skin01_b</textureChoices>
<textureChoices>Amputations\Forearm\skin02_b</textureChoices>
<textureChoices>Amputations\Forearm\skin03_b</textureChoices>
<textureChoices>Amputations\Forearm\skin04_b</textureChoices>
<textureChoices>Amputations\Forearm\skin05_b</textureChoices>
<textureChoices>Amputations\skin01_hairy_b</textureChoices>
<textureChoices>Amputations\skin02_hairy_b</textureChoices>
<textureChoices>Amputations\skin03_hairy_b</textureChoices>
<textureChoices>Amputations\skin04_hairy_b</textureChoices>
<textureChoices>Amputations\skin05_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin01_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin02_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin03_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin04_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin05_hairy_b</textureChoices>
<textureChoices>Body\MaleBody01</textureChoices>
<textureChoices>Body\MaleBody02</textureChoices>

View File

@@ -10,17 +10,17 @@
<m_Masks>4</m_Masks>
<m_MasksFolder>none</m_MasksFolder>
<textureChoices>Amputations\skin01_b</textureChoices>
<textureChoices>Amputations\skin02_b</textureChoices>
<textureChoices>Amputations\skin03_b</textureChoices>
<textureChoices>Amputations\skin04_b</textureChoices>
<textureChoices>Amputations\skin05_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin01_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin02_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin03_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin04_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin05_b</textureChoices>
<textureChoices>Amputations\skin01_hairy_b</textureChoices>
<textureChoices>Amputations\skin02_hairy_b</textureChoices>
<textureChoices>Amputations\skin03_hairy_b</textureChoices>
<textureChoices>Amputations\skin04_hairy_b</textureChoices>
<textureChoices>Amputations\skin05_hairy_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin01_hairy_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin02_hairy_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin03_hairy_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin04_hairy_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin05_hairy_b</textureChoices>
<textureChoices>Body\MaleBody01</textureChoices>
<textureChoices>Body\MaleBody02</textureChoices>

View File

@@ -8,17 +8,17 @@
<m_Masks>6</m_Masks>
<m_MasksFolder>none</m_MasksFolder>
<textureChoices>Amputations\skin01_b</textureChoices>
<textureChoices>Amputations\skin02_b</textureChoices>
<textureChoices>Amputations\skin03_b</textureChoices>
<textureChoices>Amputations\skin04_b</textureChoices>
<textureChoices>Amputations\skin05_b</textureChoices>
<textureChoices>Amputations\Forearm\skin01_b</textureChoices>
<textureChoices>Amputations\Forearm\skin02_b</textureChoices>
<textureChoices>Amputations\Forearm\skin03_b</textureChoices>
<textureChoices>Amputations\Forearm\skin04_b</textureChoices>
<textureChoices>Amputations\Forearm\skin05_b</textureChoices>
<textureChoices>Amputations\skin01_hairy_b</textureChoices>
<textureChoices>Amputations\skin02_hairy_b</textureChoices>
<textureChoices>Amputations\skin03_hairy_b</textureChoices>
<textureChoices>Amputations\skin04_hairy_b</textureChoices>
<textureChoices>Amputations\skin05_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin01_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin02_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin03_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin04_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin05_hairy_b</textureChoices>
<textureChoices>Body\MaleBody01</textureChoices>
<textureChoices>Body\MaleBody02</textureChoices>

View File

@@ -9,17 +9,17 @@
<m_Masks>5</m_Masks>
<m_Masks>6</m_Masks>
<textureChoices>Amputations\skin01_b</textureChoices>
<textureChoices>Amputations\skin02_b</textureChoices>
<textureChoices>Amputations\skin03_b</textureChoices>
<textureChoices>Amputations\skin04_b</textureChoices>
<textureChoices>Amputations\skin05_b</textureChoices>
<textureChoices>Amputations\Forearm\skin01_b</textureChoices>
<textureChoices>Amputations\Forearm\skin02_b</textureChoices>
<textureChoices>Amputations\Forearm\skin03_b</textureChoices>
<textureChoices>Amputations\Forearm\skin04_b</textureChoices>
<textureChoices>Amputations\Forearm\skin05_b</textureChoices>
<textureChoices>Amputations\skin01_hairy_b</textureChoices>
<textureChoices>Amputations\skin02_hairy_b</textureChoices>
<textureChoices>Amputations\skin03_hairy_b</textureChoices>
<textureChoices>Amputations\skin04_hairy_b</textureChoices>
<textureChoices>Amputations\skin05_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin01_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin02_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin03_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin04_hairy_b</textureChoices>
<textureChoices>Amputations\Forearm\skin05_hairy_b</textureChoices>
<textureChoices>Body\MaleBody01</textureChoices>
<textureChoices>Body\MaleBody02</textureChoices>

View File

@@ -10,17 +10,17 @@
<m_Masks>6</m_Masks>
<m_MasksFolder>none</m_MasksFolder>
<textureChoices>Amputations\skin01_b</textureChoices>
<textureChoices>Amputations\skin02_b</textureChoices>
<textureChoices>Amputations\skin03_b</textureChoices>
<textureChoices>Amputations\skin04_b</textureChoices>
<textureChoices>Amputations\skin05_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin01_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin02_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin03_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin04_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin05_b</textureChoices>
<textureChoices>Amputations\skin01_hairy_b</textureChoices>
<textureChoices>Amputations\skin02_hairy_b</textureChoices>
<textureChoices>Amputations\skin03_hairy_b</textureChoices>
<textureChoices>Amputations\skin04_hairy_b</textureChoices>
<textureChoices>Amputations\skin05_hairy_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin01_hairy_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin02_hairy_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin03_hairy_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin04_hairy_b</textureChoices>
<textureChoices>Amputations\Upperarm\skin05_hairy_b</textureChoices>
<textureChoices>Body\MaleBody01</textureChoices>
<textureChoices>Body\MaleBody02</textureChoices>

View File

@@ -24,9 +24,8 @@ function TocSetCorrectTextureForAmputation(item, player, cicatrized)
item:getVisual():setTextureChoice(tonumber(matched_index - 1)) -- it counts from 0, so we have to subtract 1
end
function TocSetBloodOnAmputation(player, body_part)
local body_part_type = body_part:getType()
local blood_body_part_type
if body_part_type == BodyPartType.Hand_R then

View File

@@ -316,23 +316,22 @@ function TheOnlyCure.CutLimb(part_name, surgeon_factor, bandage_table, painkille
limbs_data[part_name].cicatrization_time = limbs_data[part_name].cicatrization_base_time - surgeon_factor * 50
for _, depended_v in pairs(limbs_data[part_name].depends_on) do
if limbs_data[depended_v].is_cut == false then
limbs_data[depended_v].is_cut = true
limbs_data[depended_v].is_amputation_shown = false
limbs_data[depended_v].cicatrization_time = limbs_data[part_name].cicatrization_base_time -
surgeon_factor * 50
local should_depended_v_be_healed_of_bite = limbs_data[depended_v].is_infected and
body_damage:getInfectionLevel() < 20
local depended_body_part = body_damage:getBodyPart(TocGetBodyPartFromPartName(depended_v))
TocSetParametersForMissingLimb(depended_body_part, should_depended_v_be_healed_of_bite)
if should_depended_v_be_healed_of_bite then
limbs_data[depended_v].is_infected = false
end
limbs_data[depended_v].is_cut = true
limbs_data[depended_v].is_amputation_shown = false
limbs_data[depended_v].cicatrization_time = limbs_data[part_name].cicatrization_base_time -
surgeon_factor * 50
local should_depended_v_be_healed_of_bite = limbs_data[depended_v].is_infected and
body_damage:getInfectionLevel() < 20
local depended_body_part = body_damage:getBodyPart(TocGetBodyPartFromPartName(depended_v))
TocSetParametersForMissingLimb(depended_body_part, should_depended_v_be_healed_of_bite)
if should_depended_v_be_healed_of_bite then
limbs_data[depended_v].is_infected = false
end
end

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB