diff --git a/Data-1.13/APBPConstants.ini b/Data-1.13/APBPConstants.ini index 506c6f3ca..67188080a 100644 --- a/Data-1.13/APBPConstants.ini +++ b/Data-1.13/APBPConstants.ini @@ -465,6 +465,11 @@ AP_SODAMACHINE = 30 ;*********************************************************************** AP_CAMERA = 30 +;*********************************************************************** +;* The APs to take another merc's blood to fill a blood bag * +;*********************************************************************** +AP_FILLBLOODBAG = 100 + [BPConstants] ;*********************************************************************** ;* Ratio of breath points to 1 energy (default = 100) * @@ -543,4 +548,5 @@ BP_FORTIFICATION = 700 BP_REMOVE_FORTIFICATION = 400 BP_HANDCUFF = 100 BP_APPLYITEM = 5 -BP_INVENTORY_ARM = 0 \ No newline at end of file +BP_INVENTORY_ARM = 0 +BP_FILLBLOODBAG = 20 \ No newline at end of file diff --git a/Data-1.13/BigItems/p1item907.sti b/Data-1.13/BigItems/p1item907.sti new file mode 100644 index 000000000..7a147f940 Binary files /dev/null and b/Data-1.13/BigItems/p1item907.sti differ diff --git a/Data-1.13/BigItems/p1item908.sti b/Data-1.13/BigItems/p1item908.sti new file mode 100644 index 000000000..58ad746ed Binary files /dev/null and b/Data-1.13/BigItems/p1item908.sti differ diff --git a/Data-1.13/Interface/MDP1ITEMS.sti b/Data-1.13/Interface/MDP1ITEMS.sti index e5b254624..67d6cc19c 100644 Binary files a/Data-1.13/Interface/MDP1ITEMS.sti and b/Data-1.13/Interface/MDP1ITEMS.sti differ diff --git a/Data-1.13/Skills_Settings.INI b/Data-1.13/Skills_Settings.INI index 83a214072..607a268ab 100644 --- a/Data-1.13/Skills_Settings.INI +++ b/Data-1.13/Skills_Settings.INI @@ -449,6 +449,9 @@ NUMBER_OF_TRAITS_NEEDED_FOR_SURGERY = 1 BASE_PERCENT_SURGERY_HEAL = 10 ONTOP_PERCENT_SURGERY_HEAL_PER_TRAIT = 20 +; if a doctor has a blood bag and chooses to use it, this percentage is added to the health amount restored by surgery +ONTOP_PERCENT_SURGERY_HEAL_BLOODBAG = 15 + ; Determines the percentage of medical supplies are used for surgery MEDICAL_BAG_CONSUMPTION_BY_SURGERY = 100 diff --git a/Data-1.13/TableData/Items/Items.xml b/Data-1.13/TableData/Items/Items.xml index 6a4b9dede..44a355e3c 100644 --- a/Data-1.13/TableData/Items/Items.xml +++ b/Data-1.13/TableData/Items/Items.xml @@ -195,6 +195,8 @@ 0 0 0 + 0 + 0 0 0 @@ -52146,4 +52148,51 @@ + + 1756 + E. Blood bag + Empty blood bag + This blood bag can be filled with the blood of a (hopefully willing) donor. + Blood bag + A simple blood bag, used to store blood for medical purposes. + 268435456 + 1 + 1 + 908 + 1 + 4 + 16 + 4 + 1 + 6 + 100.0 + 1 + + + + + + 1757 + Blood bag + Blood bag + This package of fresh blood can be used up to boost a surgery. + Blood bag + Not for sale through BR. + 268435456 + 1 + 5 + 1 + 907 + 6 + 2 + 18 + 25 + 1 + 1 + 100.0 + 1 + + + + \ No newline at end of file diff --git a/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml b/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml index 358b81de3..a6515ada8 100644 --- a/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml +++ b/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml @@ -85,4 +85,9 @@ 1752 2 + + 17 + 1756 + 6 + \ No newline at end of file diff --git a/Data-1.13/TableData/NPCInventory/HowardInventory.xml b/Data-1.13/TableData/NPCInventory/HowardInventory.xml index 1fe7f6079..270d018bb 100644 --- a/Data-1.13/TableData/NPCInventory/HowardInventory.xml +++ b/Data-1.13/TableData/NPCInventory/HowardInventory.xml @@ -115,4 +115,9 @@ 1752 4 + + 23 + 1756 + 6 + \ No newline at end of file diff --git a/Data-1.13/tilesets/0/SMP1ITEMS.STI b/Data-1.13/tilesets/0/SMP1ITEMS.STI index a3cc28d9c..68c1d28d5 100644 Binary files a/Data-1.13/tilesets/0/SMP1ITEMS.STI and b/Data-1.13/tilesets/0/SMP1ITEMS.STI differ diff --git a/Data/APBPConstants.ini b/Data/APBPConstants.ini index fdec84d65..81ada3b6b 100644 --- a/Data/APBPConstants.ini +++ b/Data/APBPConstants.ini @@ -460,6 +460,16 @@ AP_WATERTAP = 5 ;*********************************************************************** AP_SODAMACHINE = 7 +;*********************************************************************** +;* The APs to take a photo * +;*********************************************************************** +AP_CAMERA = 7 + +;*********************************************************************** +;* The APs to take another merc's blood to fill a blood bag * +;*********************************************************************** +AP_FILLBLOODBAG = 25 + [BPConstants] ;*********************************************************************** ;* Ratio of breath points to 1 energy (default = 100) * @@ -538,4 +548,5 @@ BP_FORTIFICATION = 700 BP_REMOVE_FORTIFICATION = 400 BP_HANDCUFF = 100 BP_APPLYITEM = 5 -BP_INVENTORY_ARM = 0 \ No newline at end of file +BP_INVENTORY_ARM = 0 +BP_FILLBLOODBAG = 20 \ No newline at end of file diff --git a/Data/CURSORS/bloodbag.sti b/Data/CURSORS/bloodbag.sti new file mode 100644 index 000000000..4fe564872 Binary files /dev/null and b/Data/CURSORS/bloodbag.sti differ diff --git a/Data/CURSORS/bloodbag_r.sti b/Data/CURSORS/bloodbag_r.sti new file mode 100644 index 000000000..e8f80249e Binary files /dev/null and b/Data/CURSORS/bloodbag_r.sti differ diff --git a/Data/Interface/ItemInfoSecondaryIcons.sti b/Data/Interface/ItemInfoSecondaryIcons.sti index 2f632b774..1e7730b4c 100644 Binary files a/Data/Interface/ItemInfoSecondaryIcons.sti and b/Data/Interface/ItemInfoSecondaryIcons.sti differ diff --git a/Data/Skills_Settings.INI b/Data/Skills_Settings.INI index 83a214072..607a268ab 100644 --- a/Data/Skills_Settings.INI +++ b/Data/Skills_Settings.INI @@ -449,6 +449,9 @@ NUMBER_OF_TRAITS_NEEDED_FOR_SURGERY = 1 BASE_PERCENT_SURGERY_HEAL = 10 ONTOP_PERCENT_SURGERY_HEAL_PER_TRAIT = 20 +; if a doctor has a blood bag and chooses to use it, this percentage is added to the health amount restored by surgery +ONTOP_PERCENT_SURGERY_HEAL_BLOODBAG = 15 + ; Determines the percentage of medical supplies are used for surgery MEDICAL_BAG_CONSUMPTION_BY_SURGERY = 100 diff --git a/Data/TableData/Items/Items.xml b/Data/TableData/Items/Items.xml index b22819627..586a564ab 100644 --- a/Data/TableData/Items/Items.xml +++ b/Data/TableData/Items/Items.xml @@ -175,6 +175,8 @@ 0 0 0 + 0 + 0 0 0.0 0 @@ -191,6 +193,10 @@ 0 0 0 + 0 + 0 + 0 + 0 0 0