diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 054d20c6d..e52c26179 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -1184,8 +1184,16 @@ INCREASE_AI_WILLINGNESS_TO_SUPPRESS = FALSE ; campaign, or suffer(??) the consequences!! ;****************************************************************************************************************************** -SKILLS_SUBPOINTS_TO_IMPROVE = 25 -ATTRIBS_SUBPOINTS_TO_IMPROVE = 50 +HEALTH_SUBPOINTS_TO_IMPROVE = 50 +STRENGTH_SUBPOINTS_TO_IMPROVE = 50 +WISDOM_SUBPOINTS_TO_IMPROVE = 50 +DEXTERITY_SUBPOINTS_TO_IMPROVE = 50 +AGILITY_SUBPOINTS_TO_IMPROVE = 50 +MARKSMANSHIP_SUBPOINTS_TO_IMPROVE = 25 +MECHANICAL_SUBPOINTS_TO_IMPROVE = 25 +EXPLOSIVES_SUBPOINTS_TO_IMPROVE = 25 +MEDICAL_SUBPOINTS_TO_IMPROVE = 25 +LEADERSHIP_SUBPOINTS_TO_IMPROVE = 25 LEVEL_SUBPOINTS_TO_IMPROVE = 350 ;****************************************************************************************************************************** diff --git a/gamedir/Data-1.13/TableData/AmmoTypes.xml b/gamedir/Data-1.13/TableData/AmmoTypes.xml index 411e7188c..950bed71f 100644 --- a/gamedir/Data-1.13/TableData/AmmoTypes.xml +++ b/gamedir/Data-1.13/TableData/AmmoTypes.xml @@ -159,6 +159,7 @@ 0 0 0 + BuckshotSpread 5 @@ -178,9 +179,9 @@ 0 1 0 - 6 + 20 1 - 3 + 10 0 0 0 @@ -191,6 +192,7 @@ 0 0 0 + FlechetteSpread 6 @@ -864,4 +866,37 @@ 0 0 + + 0 + Duplex Ball + 136 + 4 + 1 + 3 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 2 + 2 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + DuplexSpread + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index 3a2e5d9a3..63ade4c1f 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -5611,6 +5611,7 @@ 1 20 1 + DuckbillSpread 245 @@ -16591,6 +16592,7 @@ 4 1 24 + SawedoffSpread 712 @@ -17210,6 +17212,7 @@ 28 5 5 + SawedoffSpread 733 @@ -31216,4 +31219,84 @@ 1 1 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/SpreadPatterns.xml b/gamedir/Data-1.13/TableData/SpreadPatterns.xml new file mode 100644 index 000000000..7cdd04ea6 --- /dev/null +++ b/gamedir/Data-1.13/TableData/SpreadPatterns.xml @@ -0,0 +1,232 @@ + + + + + DefaultSpread + First pellet straight ahead, then follow the original game's shotgun pattern, then wide random spread. + +

0.0000 0.0000

+ +

-0.0120 0.0000

+

+0.0120 0.0000

+

0.0000-0.0120

+

0.0000+0.0120

+

-0.0080-0.0080

+

-0.0080+0.0080

+

+0.0080-0.0080

+

+0.0080+0.0080

+ + 0.1234 0.1234 +
+ + + BuckshotSpread + Spread range slightly wider than the original game. + 0.0150 0.0150 + + + FlechetteSpread + Flechettes spread much wider than shot. + 0.0250 0.0250 + + + DuplexSpread + Also for triplex, quadplex, or any other inline multiple projectile. + 0.0120 0.0120 +

0.0000 0.0000

+
+ + + 12gaTungstenSpread + + (not used anywhere right now, just an example) + Tungsten shot groups better and hits harder at range. + Of course, it also groups better out of a choke, so this would ideally be cumulative + with choke or weapon, but no need to complicate things more than I already have. + + 0.0090 0.0090 + + + + FlamerSpread + Flamethrower more spread out. Uses static angles, unchanged from original game. +

0.0000 0.0000

+

-0.1200 0.0000

+

+0.1200 0.0000

+

0.0000-0.1200

+

0.0000+0.1200

+

-0.0080-0.0080

+

-0.0080+0.0080

+

+0.0080-0.0080

+

+0.0080+0.0080

+
+ + SawedoffSpread + + Very wide spread from a crudely cut-off barrel. + Use weapon based spread patterns spareingly, since ammo will likely be tweaked to have a specific + performance at specific ranges, and spreads are non-cumulative. + + 0.0300 0.0300 + + + + DuckbillSpread + Duckbill flattens the spread and makes it wider horizontally. + 0.0350 0.0050 + + + ChokeImpModSpread + A improved modified choke for standard 12ga shotguns. + 0.0110 0.0100 + + + ChokeFullSpread + A full choke for standard 12ga shotguns. + Not for use with slugs or steel shot! + Well, in real life, but it won't hurt you in the game. + Very tight pattern. + + 0.0080 0.0080 + + + ChokeRifledSpread + A rifled choke for standard 12ga shotguns. + This is a little bit of a hack, and a good example of what can be done when getting creative. + Rifled chokes are intended to increase the range and accuracy of slugs. + So, the attachment will do so. + However, rifled chokes also spray out the pellets wildly, making them rather bad for shot. + They also tend to give shot _less_ range, but we can't accomplish that, so the spread is exaggerated. + Hopefully, spread will have the desired impact on reducing the usefulness of shot at range. + (though unskilled characters may find that it inadvertantly increases their chance to hit the target + with at least one pellet) + + 0.7853 0.7853 + + + + RandomSpread + Random angles, from straight ahead to straight back, up, down, left, right. + Rectangle + 3.1415 3.1415 + + + CrazySpread + Everything firing with moderate spread, but backwards +

+3.1415 0.0000

+

-3.1415 0.0000

+

+3.0415+0.0050

+

-3.0415-0.0050

+

+3.0000+0.0100

+

-3.0000-0.0100

+
+ + AxisSpread + In straight lines along every axis +

0.0000 0.0000

+

+3.1415 0.0000

+

0.0000+1.5707

+

0.0000-1.5707

+

+1.5707 0.0000

+

-1.5707 0.0000

+
+ + Nada + Nothing defined. + + + Template + Template + Ellipse + 0.0000 0.0000 +

0.0000 0.0000

+
+
\ No newline at end of file diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index 95e7bc6cd..52d1db0a5 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -1185,8 +1185,16 @@ INCREASE_AI_WILLINGNESS_TO_SUPPRESS = FALSE ; campaign, or suffer(??) the consequences!! ;****************************************************************************************************************************** -SKILLS_SUBPOINTS_TO_IMPROVE = 25 -ATTRIBS_SUBPOINTS_TO_IMPROVE = 50 +HEALTH_SUBPOINTS_TO_IMPROVE = 50 +STRENGTH_SUBPOINTS_TO_IMPROVE = 50 +WISDOM_SUBPOINTS_TO_IMPROVE = 50 +DEXTERITY_SUBPOINTS_TO_IMPROVE = 50 +AGILITY_SUBPOINTS_TO_IMPROVE = 50 +MARKSMANSHIP_SUBPOINTS_TO_IMPROVE = 25 +MECHANICAL_SUBPOINTS_TO_IMPROVE = 25 +EXPLOSIVES_SUBPOINTS_TO_IMPROVE = 25 +MEDICAL_SUBPOINTS_TO_IMPROVE = 25 +LEADERSHIP_SUBPOINTS_TO_IMPROVE = 25 LEVEL_SUBPOINTS_TO_IMPROVE = 350 ;******************************************************************************************************************************