From 288b0ed2841b6fc8df80ab65c405d6ad1dd315b1 Mon Sep 17 00:00:00 2001 From: Flugente Date: Mon, 3 Dec 2012 00:30:42 +0000 Subject: [PATCH] New Feature: The prisoner system allows to capture enemy soldiers by using handcuffs on them. They can be transferred to a prison the player controls, and be interrogated there. git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1568 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/APBPConstants.ini | 5 ++ gamedir/Data-1.13/Ja2_Options.INI | 31 +++++++++ gamedir/Data-1.13/TableData/Items.xml | 25 ++++++++ .../Data-1.13/TableData/Map/Facilities.xml | 25 ++++++++ .../Data-1.13/TableData/Map/FacilityTypes.xml | 43 ++++++++++++- .../Data-1.13/TableData/MercStartingGear.xml | 60 +++++++++--------- gamedir/Data/CURSORS/HANDCUFFS.sti | Bin 0 -> 2023 bytes gamedir/Data/CURSORS/HANDCUFFS_R.sti | Bin 0 -> 2023 bytes 8 files changed, 158 insertions(+), 31 deletions(-) create mode 100644 gamedir/Data/CURSORS/HANDCUFFS.sti create mode 100644 gamedir/Data/CURSORS/HANDCUFFS_R.sti 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 0000000000000000000000000000000000000000..d1477787a19743132ae6b671c2b0e75a714cd30e GIT binary patch literal 2023 zcmeHGOO6yt40UG}O@ol;0<&O)gq%_%^%YpLCY*VcSrLw^YN!N>=8tAMYbzFg7{{J- z%qDow1_@5U0$j>aMELWbpQE0p$4?0M&o)+~hxopnlz~o&HgtA&w%*<>KkmO@KlnmS zBt%MNL{3zgjHxkoCLSq`;btKbQXvy^p`v6;O{pt!p;RK7jl@We%*c(3lQ}h~?!=8! z10d*Yw#^m&zf2XuVSghkdOyIJTNya z_}rRXhoH?;i|4>GZP%EmJ9!DQy|H(89zBiF)j5=N4Q<@TOAz;_-qkUfw7vt32Sm^e zFxGsP#o`cXW9g-daE4YDb5&yySWf&-v4zmI9%sc%kIU{EA-R UXnnN`|3~~k;_va)f47(a6@zRNWB>pF literal 0 HcmV?d00001 diff --git a/gamedir/Data/CURSORS/HANDCUFFS_R.sti b/gamedir/Data/CURSORS/HANDCUFFS_R.sti new file mode 100644 index 0000000000000000000000000000000000000000..a16af2bc1e413046a6c6d0dba95610eb9c63ab50 GIT binary patch literal 2023 zcmeHGL5@>N41JyS?@l2kF2I7#D9Ha9tY$ssv&;&)l5~>>iH7bO5KGq99LKfi9Bhi` z9~i+2Sb(EnD%<7fSI?Ed>a#yV`};gs;3>aPXKjTuV2#aYvqVqJ_xo?*KR!VK1q^T? zfF^K37Yu>SsB@-8p$b#DA{5QwhHe-JX{arW#i0&!xFZ}b;DH_(0qLlnErpN-V-b%t z+(cZYiwqH&rOpBsQBf6Bag|VMCT`MAh6xMm!jEO@VlM6yE-l1EddP@`t7K20q^y>t zG@vajw2KZln6=J%C3d2js;h=-Gj-E$I@rExZFynxVA@>WHC$V$hxX7xa$Rdr@g%h| z%iCMPT2iwvHpFDMI+KM-_AyH&3$rHSjJzD9Y@0&N1+=Buy-`Cf}BL-pvPjHLop)#5(4gp@nVYZkv*mo1C`_ixkR(=X-7 zleg<>ODf-rZ_mp%)5I>C4sjmz{7^2q&MBKvcc8mkM70EJ@WK)b1Jze z1_6%eTiS7zxFlR|E~X5W!`I$CO$8pZZ(8O^@a8<*zj(03GF-0k@)1KxD`7KngI9~U Z&G`Oo`wFj5`P)VK-{Suk|5tqZUjTYi(ii{$ literal 0 HcmV?d00001