diff --git a/changelog.txt b/changelog.txt index 14ea876..11928d4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,11 @@ +0.9.9 +- Modified textures for amputations +- Fixed a bug that caused some problems when amputating an already amputated limb + +0.9.8 +- New textures for amputations +- When cicatrized, an amputation will not be bloody anymore (visual thing only) + 0.9.7 - Now amputations should spawn in every case, damn hairs. Thanks Dev for the tip! diff --git a/media/clothing/clothingItems/Amputation_Left_Hand.xml b/media/clothing/clothingItems/Amputation_Left_Hand.xml index d48ca40..cdcf365 100644 --- a/media/clothing/clothingItems/Amputation_Left_Hand.xml +++ b/media/clothing/clothingItems/Amputation_Left_Hand.xml @@ -9,17 +9,17 @@ 4 none - Amputations\skin01_b - Amputations\skin02_b - Amputations\skin03_b - Amputations\skin04_b - Amputations\skin05_b + Amputations\Forearm\skin01_b + Amputations\Forearm\skin02_b + Amputations\Forearm\skin03_b + Amputations\Forearm\skin04_b + Amputations\Forearm\skin05_b - Amputations\skin01_hairy_b - Amputations\skin02_hairy_b - Amputations\skin03_hairy_b - Amputations\skin04_hairy_b - Amputations\skin05_hairy_b + Amputations\Forearm\skin01_hairy_b + Amputations\Forearm\skin02_hairy_b + Amputations\Forearm\skin03_hairy_b + Amputations\Forearm\skin04_hairy_b + Amputations\Forearm\skin05_hairy_b Body\MaleBody01 Body\MaleBody02 diff --git a/media/clothing/clothingItems/Amputation_Left_LowerArm.xml b/media/clothing/clothingItems/Amputation_Left_LowerArm.xml index 0dc74a7..392375a 100644 --- a/media/clothing/clothingItems/Amputation_Left_LowerArm.xml +++ b/media/clothing/clothingItems/Amputation_Left_LowerArm.xml @@ -10,17 +10,17 @@ 4 none - Amputations\skin01_b - Amputations\skin02_b - Amputations\skin03_b - Amputations\skin04_b - Amputations\skin05_b + Amputations\Forearm\skin01_b + Amputations\Forearm\skin02_b + Amputations\Forearm\skin03_b + Amputations\Forearm\skin04_b + Amputations\Forearm\skin05_b - Amputations\skin01_hairy_b - Amputations\skin02_hairy_b - Amputations\skin03_hairy_b - Amputations\skin04_hairy_b - Amputations\skin05_hairy_b + Amputations\Forearm\skin01_hairy_b + Amputations\Forearm\skin02_hairy_b + Amputations\Forearm\skin03_hairy_b + Amputations\Forearm\skin04_hairy_b + Amputations\Forearm\skin05_hairy_b Body\MaleBody01 Body\MaleBody02 diff --git a/media/clothing/clothingItems/Amputation_Left_UpperArm.xml b/media/clothing/clothingItems/Amputation_Left_UpperArm.xml index a4fa58e..e9994ae 100644 --- a/media/clothing/clothingItems/Amputation_Left_UpperArm.xml +++ b/media/clothing/clothingItems/Amputation_Left_UpperArm.xml @@ -10,17 +10,17 @@ 4 none - Amputations\skin01_b - Amputations\skin02_b - Amputations\skin03_b - Amputations\skin04_b - Amputations\skin05_b + Amputations\Upperarm\skin01_b + Amputations\Upperarm\skin02_b + Amputations\Upperarm\skin03_b + Amputations\Upperarm\skin04_b + Amputations\Upperarm\skin05_b - Amputations\skin01_hairy_b - Amputations\skin02_hairy_b - Amputations\skin03_hairy_b - Amputations\skin04_hairy_b - Amputations\skin05_hairy_b + Amputations\Upperarm\skin01_hairy_b + Amputations\Upperarm\skin02_hairy_b + Amputations\Upperarm\skin03_hairy_b + Amputations\Upperarm\skin04_hairy_b + Amputations\Upperarm\skin05_hairy_b Body\MaleBody01 Body\MaleBody02 diff --git a/media/clothing/clothingItems/Amputation_Right_Hand.xml b/media/clothing/clothingItems/Amputation_Right_Hand.xml index 72f858d..d08510d 100644 --- a/media/clothing/clothingItems/Amputation_Right_Hand.xml +++ b/media/clothing/clothingItems/Amputation_Right_Hand.xml @@ -8,17 +8,17 @@ 6 none - Amputations\skin01_b - Amputations\skin02_b - Amputations\skin03_b - Amputations\skin04_b - Amputations\skin05_b + Amputations\Forearm\skin01_b + Amputations\Forearm\skin02_b + Amputations\Forearm\skin03_b + Amputations\Forearm\skin04_b + Amputations\Forearm\skin05_b - Amputations\skin01_hairy_b - Amputations\skin02_hairy_b - Amputations\skin03_hairy_b - Amputations\skin04_hairy_b - Amputations\skin05_hairy_b + Amputations\Forearm\skin01_hairy_b + Amputations\Forearm\skin02_hairy_b + Amputations\Forearm\skin03_hairy_b + Amputations\Forearm\skin04_hairy_b + Amputations\Forearm\skin05_hairy_b Body\MaleBody01 Body\MaleBody02 diff --git a/media/clothing/clothingItems/Amputation_Right_LowerArm.xml b/media/clothing/clothingItems/Amputation_Right_LowerArm.xml index 56f8830..0ae81a9 100644 --- a/media/clothing/clothingItems/Amputation_Right_LowerArm.xml +++ b/media/clothing/clothingItems/Amputation_Right_LowerArm.xml @@ -9,17 +9,17 @@ 5 6 - Amputations\skin01_b - Amputations\skin02_b - Amputations\skin03_b - Amputations\skin04_b - Amputations\skin05_b + Amputations\Forearm\skin01_b + Amputations\Forearm\skin02_b + Amputations\Forearm\skin03_b + Amputations\Forearm\skin04_b + Amputations\Forearm\skin05_b - Amputations\skin01_hairy_b - Amputations\skin02_hairy_b - Amputations\skin03_hairy_b - Amputations\skin04_hairy_b - Amputations\skin05_hairy_b + Amputations\Forearm\skin01_hairy_b + Amputations\Forearm\skin02_hairy_b + Amputations\Forearm\skin03_hairy_b + Amputations\Forearm\skin04_hairy_b + Amputations\Forearm\skin05_hairy_b Body\MaleBody01 Body\MaleBody02 diff --git a/media/clothing/clothingItems/Amputation_Right_UpperArm.xml b/media/clothing/clothingItems/Amputation_Right_UpperArm.xml index b5e0b8e..5e4d657 100644 --- a/media/clothing/clothingItems/Amputation_Right_UpperArm.xml +++ b/media/clothing/clothingItems/Amputation_Right_UpperArm.xml @@ -10,17 +10,17 @@ 6 none - Amputations\skin01_b - Amputations\skin02_b - Amputations\skin03_b - Amputations\skin04_b - Amputations\skin05_b + Amputations\Upperarm\skin01_b + Amputations\Upperarm\skin02_b + Amputations\Upperarm\skin03_b + Amputations\Upperarm\skin04_b + Amputations\Upperarm\skin05_b - Amputations\skin01_hairy_b - Amputations\skin02_hairy_b - Amputations\skin03_hairy_b - Amputations\skin04_hairy_b - Amputations\skin05_hairy_b + Amputations\Upperarm\skin01_hairy_b + Amputations\Upperarm\skin02_hairy_b + Amputations\Upperarm\skin03_hairy_b + Amputations\Upperarm\skin04_hairy_b + Amputations\Upperarm\skin05_hairy_b Body\MaleBody01 Body\MaleBody02 diff --git a/media/lua/client/TOC_Visuals.lua b/media/lua/client/TOC_Visuals.lua index 7ef6238..4064182 100644 --- a/media/lua/client/TOC_Visuals.lua +++ b/media/lua/client/TOC_Visuals.lua @@ -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 diff --git a/media/lua/client/TOC_main.lua b/media/lua/client/TOC_main.lua index 063ab39..7acafe0 100644 --- a/media/lua/client/TOC_main.lua +++ b/media/lua/client/TOC_main.lua @@ -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 diff --git a/media/textures/Amputations/Forearm/skin01_b.png b/media/textures/Amputations/Forearm/skin01_b.png new file mode 100644 index 0000000..e4d4367 Binary files /dev/null and b/media/textures/Amputations/Forearm/skin01_b.png differ diff --git a/media/textures/Amputations/Forearm/skin01_hairy_b.png b/media/textures/Amputations/Forearm/skin01_hairy_b.png new file mode 100644 index 0000000..64a2a81 Binary files /dev/null and b/media/textures/Amputations/Forearm/skin01_hairy_b.png differ diff --git a/media/textures/Amputations/Forearm/skin02_b.png b/media/textures/Amputations/Forearm/skin02_b.png new file mode 100644 index 0000000..054a241 Binary files /dev/null and b/media/textures/Amputations/Forearm/skin02_b.png differ diff --git a/media/textures/Amputations/Forearm/skin02_hairy_b.png b/media/textures/Amputations/Forearm/skin02_hairy_b.png new file mode 100644 index 0000000..f452e97 Binary files /dev/null and b/media/textures/Amputations/Forearm/skin02_hairy_b.png differ diff --git a/media/textures/Amputations/Forearm/skin03_b.png b/media/textures/Amputations/Forearm/skin03_b.png new file mode 100644 index 0000000..4e21678 Binary files /dev/null and b/media/textures/Amputations/Forearm/skin03_b.png differ diff --git a/media/textures/Amputations/Forearm/skin03_hairy_b.png b/media/textures/Amputations/Forearm/skin03_hairy_b.png new file mode 100644 index 0000000..07cdc28 Binary files /dev/null and b/media/textures/Amputations/Forearm/skin03_hairy_b.png differ diff --git a/media/textures/Amputations/Forearm/skin04_b.png b/media/textures/Amputations/Forearm/skin04_b.png new file mode 100644 index 0000000..ab93409 Binary files /dev/null and b/media/textures/Amputations/Forearm/skin04_b.png differ diff --git a/media/textures/Amputations/Forearm/skin04_hairy_b.png b/media/textures/Amputations/Forearm/skin04_hairy_b.png new file mode 100644 index 0000000..eea1b54 Binary files /dev/null and b/media/textures/Amputations/Forearm/skin04_hairy_b.png differ diff --git a/media/textures/Amputations/Forearm/skin05_b.png b/media/textures/Amputations/Forearm/skin05_b.png new file mode 100644 index 0000000..c3f779a Binary files /dev/null and b/media/textures/Amputations/Forearm/skin05_b.png differ diff --git a/media/textures/Amputations/Forearm/skin05_hairy_b.png b/media/textures/Amputations/Forearm/skin05_hairy_b.png new file mode 100644 index 0000000..c85b9a8 Binary files /dev/null and b/media/textures/Amputations/Forearm/skin05_hairy_b.png differ diff --git a/media/textures/Amputations/Upperarm/skin01_b.png b/media/textures/Amputations/Upperarm/skin01_b.png new file mode 100644 index 0000000..9a69ed4 Binary files /dev/null and b/media/textures/Amputations/Upperarm/skin01_b.png differ diff --git a/media/textures/Amputations/Upperarm/skin01_hairy_b.png b/media/textures/Amputations/Upperarm/skin01_hairy_b.png new file mode 100644 index 0000000..985c730 Binary files /dev/null and b/media/textures/Amputations/Upperarm/skin01_hairy_b.png differ diff --git a/media/textures/Amputations/Upperarm/skin02_b.png b/media/textures/Amputations/Upperarm/skin02_b.png new file mode 100644 index 0000000..f4e9d9f Binary files /dev/null and b/media/textures/Amputations/Upperarm/skin02_b.png differ diff --git a/media/textures/Amputations/Upperarm/skin02_hairy_b.png b/media/textures/Amputations/Upperarm/skin02_hairy_b.png new file mode 100644 index 0000000..7223ed7 Binary files /dev/null and b/media/textures/Amputations/Upperarm/skin02_hairy_b.png differ diff --git a/media/textures/Amputations/Upperarm/skin03_b.png b/media/textures/Amputations/Upperarm/skin03_b.png new file mode 100644 index 0000000..9513817 Binary files /dev/null and b/media/textures/Amputations/Upperarm/skin03_b.png differ diff --git a/media/textures/Amputations/Upperarm/skin03_hairy_b.png b/media/textures/Amputations/Upperarm/skin03_hairy_b.png new file mode 100644 index 0000000..8ca6494 Binary files /dev/null and b/media/textures/Amputations/Upperarm/skin03_hairy_b.png differ diff --git a/media/textures/Amputations/Upperarm/skin04_b.png b/media/textures/Amputations/Upperarm/skin04_b.png new file mode 100644 index 0000000..9a86322 Binary files /dev/null and b/media/textures/Amputations/Upperarm/skin04_b.png differ diff --git a/media/textures/Amputations/Upperarm/skin04_hairy_b.png b/media/textures/Amputations/Upperarm/skin04_hairy_b.png new file mode 100644 index 0000000..7c1672c Binary files /dev/null and b/media/textures/Amputations/Upperarm/skin04_hairy_b.png differ diff --git a/media/textures/Amputations/Upperarm/skin05_b.png b/media/textures/Amputations/Upperarm/skin05_b.png new file mode 100644 index 0000000..fe279e7 Binary files /dev/null and b/media/textures/Amputations/Upperarm/skin05_b.png differ diff --git a/media/textures/Amputations/Upperarm/skin05_hairy_b.png b/media/textures/Amputations/Upperarm/skin05_hairy_b.png new file mode 100644 index 0000000..34be9de Binary files /dev/null and b/media/textures/Amputations/Upperarm/skin05_hairy_b.png differ diff --git a/mod.info b/mod.info index 1863f2c..b4bce0a 100644 --- a/mod.info +++ b/mod.info @@ -5,5 +5,5 @@ description=Bitten? Not a problem! id=Amputation2 icon=icon.png url=https://github.com/ZioPao/The-Only-Cure-But-Better -modversion=0.9.7 +modversion=0.9.9 pzversion=41.65 diff --git a/models_stuff/textures/MaleBody01a.png b/models_stuff/textures/MaleBody01a.png new file mode 100644 index 0000000..39e85a5 Binary files /dev/null and b/models_stuff/textures/MaleBody01a.png differ diff --git a/models_stuff/textures/MaleBody02a.png b/models_stuff/textures/MaleBody02a.png new file mode 100644 index 0000000..9ebcba0 Binary files /dev/null and b/models_stuff/textures/MaleBody02a.png differ diff --git a/models_stuff/textures/MaleBody03a.png b/models_stuff/textures/MaleBody03a.png new file mode 100644 index 0000000..c5d2c13 Binary files /dev/null and b/models_stuff/textures/MaleBody03a.png differ diff --git a/models_stuff/textures/MaleBody04a.png b/models_stuff/textures/MaleBody04a.png new file mode 100644 index 0000000..02e767c Binary files /dev/null and b/models_stuff/textures/MaleBody04a.png differ diff --git a/models_stuff/textures/MaleBody05a.png b/models_stuff/textures/MaleBody05a.png new file mode 100644 index 0000000..fbdbdcb Binary files /dev/null and b/models_stuff/textures/MaleBody05a.png differ diff --git a/models_stuff/textures/bodies_textures.psd b/models_stuff/textures/bodies_textures.psd index 45c6d3e..9ad6355 100644 Binary files a/models_stuff/textures/bodies_textures.psd and b/models_stuff/textures/bodies_textures.psd differ