diff --git a/gamedir/Data-1.13/APBPConstants.ini b/gamedir/Data-1.13/APBPConstants.ini index ef1a70db6..575346dd0 100644 --- a/gamedir/Data-1.13/APBPConstants.ini +++ b/gamedir/Data-1.13/APBPConstants.ini @@ -414,6 +414,11 @@ AP_CLEANINGKIT = 80 ;*********************************************************************** AP_DISGUISE = 80 +;*********************************************************************** +;* The APs needed to handcuff someone +;*********************************************************************** +AP_HANDCUFF = 50 + [BPConstants] BP_RATIO_RED_PTS_TO_NORMAL = 100 BP_RUN_ENERGYCOSTFACTOR = 3 diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 38564928e..296de24d8 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -2419,6 +2419,37 @@ ENABLE_ALL_WEAPON_CACHES = FALSE MAP_ITEM_CHANCE_OVERRIDE = 0 +;****************************************************************************************************************************** +; Prisoner system +;****************************************************************************************************************************** + +; can you capture enemy soldiers? +ALLOW_TAKE_PRISONERS = TRUE + +; can you offer enemies a surrender option? +ENEMY_CAN_SURRENDER = TRUE + +; chance that released soldiers join the army again +PRISONER_RETURN_TO_ARMY_CHANCE = 50 + +; chance that interrogated soldiers decide to join your cause (they will be turned into militia) +PRISONER_DEFECT_CHANCE = 10 + +; chance that interrogated soldiers can give info on enemy positions +PRISONER_INFO_BASECHANCE = 10 + +; chance that interrogated soldiers detect a specific patrol (a soldier can detect only one max) +PRISONER_INFO_DETECT_CHANCE = 5 + +; chance that interrogated soldiers can give info on enemy numbers +PRISONER_INFO_NUMBER_CHANCE = 30 + +; chance that interrogated soldiers can give info on enemy movement directions +PRISONER_INFO_DIRECTION_CHANCE = 40 + +; chance that interrogated soldiers get you ransom money +PRISONER_RANSOM_CHANCE = 10 + ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index d30e831ef..7b2fc3b79 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -48644,4 +48644,29 @@ + + 1625 + Handcuffs + Handcuffs + If you want to arrest someone, it is helpful to keep them from using their hands. + Handcuffs + Standard police handcuffs. + 268435456 + 1 + 2 + 35 + 2 + 4 + 16 + 20 + 2 + 1 + 5 + 10 + 100.0 + 524288 + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Map/Facilities.xml b/gamedir/Data-1.13/TableData/Map/Facilities.xml index eea916d34..ce612e1da 100644 --- a/gamedir/Data-1.13/TableData/Map/Facilities.xml +++ b/gamedir/Data-1.13/TableData/Map/Facilities.xml @@ -97,6 +97,11 @@ 18 2 + + I13 + 21 + 1 + I14 9 @@ -139,6 +144,11 @@ 13 1 + + D5 + 22 + 1 + @@ -161,6 +171,11 @@ 11 0 + + B2 + 22 + 1 + D2 10 @@ -203,6 +218,11 @@ 18 2 + + G9 + 22 + 1 + H8 11 @@ -330,6 +350,11 @@ 18 2 + + N7 + 21 + 1 + O3 18 diff --git a/gamedir/Data-1.13/TableData/Map/FacilityTypes.xml b/gamedir/Data-1.13/TableData/Map/FacilityTypes.xml index b642dcba6..f745641f6 100644 --- a/gamedir/Data-1.13/TableData/Map/FacilityTypes.xml +++ b/gamedir/Data-1.13/TableData/Map/FacilityTypes.xml @@ -52,7 +52,16 @@ 3 Prison Complex Prison - 0 + 4 + + INTERROGATE_PRISONERS + Your mercs can Interrogate prisoners of war here. Prisoners might join you cause, or give you helpful information. + 4 + 100 + 60 + + + @@ -333,4 +342,36 @@ + + 21 + Military Prison + Prison + 3 + + INTERROGATE_PRISONERS + Your mercs can Interrogate prisoners of war here. Prisoners might join you cause, or give you helpful information. + 3 + 100 + 20 + + + + + + + 22 + Town Prison + Prison + 1 + + INTERROGATE_PRISONERS + Your mercs can Interrogate prisoners of war here. Prisoners might join you cause, or give you helpful information. + 1 + 100 + 5 + + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/MercStartingGear.xml b/gamedir/Data-1.13/TableData/MercStartingGear.xml index 3a7e50318..210d46415 100644 --- a/gamedir/Data-1.13/TableData/MercStartingGear.xml +++ b/gamedir/Data-1.13/TableData/MercStartingGear.xml @@ -7072,9 +7072,9 @@ 0 0 0 - 0 - 0 - 0 + 1625 + 100 + 1 0 0 0 @@ -7137,9 +7137,9 @@ 0 0 0 - 0 - 0 - 0 + 1625 + 100 + 1 0 0 0 @@ -7208,9 +7208,9 @@ 214 0 0 - 0 - 0 - 0 + 1625 + 100 + 1 0 0 0 @@ -8059,9 +8059,9 @@ 0 0 0 - 0 - 0 - 0 + 1625 + 100 + 1 0 0 0 @@ -8133,9 +8133,9 @@ 531 100 2 - 0 - 0 - 0 + 1625 + 100 + 1 0 0 0 @@ -8189,9 +8189,9 @@ 99 0 0 - 0 - 0 - 0 + 1625 + 100 + 1 0 0 0 @@ -8391,9 +8391,9 @@ 146 90 1 - 0 - 0 - 0 + 1625 + 95 + 1 0 0 0 @@ -12348,9 +12348,9 @@ 201 0 1 - 0 - 0 - 0 + 1625 + 100 + 1 0 0 0 @@ -12407,9 +12407,9 @@ 146 89 1 - 0 - 0 - 0 + 1625 + 100 + 1 0 0 0 @@ -24611,9 +24611,9 @@ 0 0 0 - 0 - 0 - 0 + 1625 + 93 + 1 0 0 0 diff --git a/gamedir/Data/CURSORS/HANDCUFFS.sti b/gamedir/Data/CURSORS/HANDCUFFS.sti new file mode 100644 index 000000000..d1477787a Binary files /dev/null and b/gamedir/Data/CURSORS/HANDCUFFS.sti differ diff --git a/gamedir/Data/CURSORS/HANDCUFFS_R.sti b/gamedir/Data/CURSORS/HANDCUFFS_R.sti new file mode 100644 index 000000000..a16af2bc1 Binary files /dev/null and b/gamedir/Data/CURSORS/HANDCUFFS_R.sti differ