Merge branches 'ez1/feature/ez2-effects', 'ez1/feature/ez2-eye-glows', 'ez1/feature/fastzombie-damage', 'ez1/feature/bad-cop-player-changes', 'ez1/feature/mapbase-stunstick', 'ez1/feature/patch-3-achievements' and 'ez1/feature/ez2-rebel-ai' into ez1/dev

Author: 1upD

sp/game/mod_ez1/cfg/skill.cfg

@@ -80,8 +80,8 @@ sk_vortigaunt_armor_charge "30"
 
 // Zombie
 sk_zombie_health	"100"
-sk_zombie_dmg_one_slash	"50"
-sk_zombie_dmg_both_slash	"55"
+sk_zombie_dmg_one_slash	"35"
+sk_zombie_dmg_both_slash	"50"
 
 // Poison Zombie
 sk_zombie_poison_health		"250"
@@ -216,6 +216,7 @@ sk_npc_dmg_fraggrenade		"75"
 sk_fraggrenade_radius 		"250"
 
 // HEALTH/SUIT CHARGE DISTRIBUTION
+sk_suit_maxarmor	"100"
 sk_suitcharger		"75"
 sk_suitcharger_citadel		"500"
 sk_suitcharger_citadel_maxarmor	"200"

sp/game/mod_ez1/fgd/EntropyZero.fgd

@@ -789,6 +789,7 @@
 	additionalequipment(choices) : "Weapons" : "0" =
 	[
 		"weapon_smg1" : "SMG1"
+		"weapon_smg2" : "MP5K"
 		"weapon_ar2" : "AR2"
 		"weapon_stunstick" : "Stun Stick"
 		"weapon_crowbar" : "Crow Bar"
@@ -818,6 +819,8 @@
 		1 : "Downtrodden"
 		2 : "Refugee"
 		3 : "Rebel"
+		5 : "Rebel Brute"
+		6 : "Long Fall"
 		4 : "Unique"
 	]
 
@@ -867,7 +870,15 @@
 	]
 
 	denycommandconcept(string) : "Deny command speech concept" : "" : "If you want your citizens to squad with the player but not obey commands the player gives to move the squad, put a concept here and this citizen will speak the concept instead of obeying the order."
+	
+	willpowerdisabled(choices) : "Use Willpower System?" : 0 : "Citizens in Entropy : Zero will calculate a 'willpower score' based on their current conditions. If they believe conditions are favorable, they will fight more aggressively. If conditions are unfavorable, they will fear enemies instead of hating them and retreat from combat. In general, citizens that are locked to a single location with limited mobility should have willpower disabled."=
+	[
+		0 : "Use willpower"
+		1 : "Do not use willpower"
+	]
 
+	willpowermodifier(integer) : "Willpower modifier" : 0 : "This value is added to the willpower calculation to make them more brave. (Or more cowardly, if negative) Has no effect if not using the willpower system for the Citizen."
+	
     //Inputs
 	input RemoveFromPlayerSquad(void) : "Remove from player squad, instantly."
 	input SetExpressionOverride(string) : "Set facial expression override"
@@ -4154,6 +4165,8 @@
 		"ACHIEVEMENT_EVENT_PORTAL_KILL_COMPANIONCUBE"					: "[PORTAL] Do whatever it takes to survive."
 		"ACHIEVEMENT_EVENT_PORTAL_ESCAPE_TESTCHAMBERS"					: "[PORTAL] Make the correct party escort submission position decision."
 		"ACHIEVEMENT_EVENT_PORTAL_BEAT_GAME"					: "[PORTAL] Complete Portal."
+		"ACHIEVEMENT_EVENT_EZ_START_GAME"					: "[EZ] Began Entropy : Zero (for tracking difficulty achievements)"
+		"ACHIEVEMENT_EVENT_EZ_BEAT_GAME"					: "[EZ] Complete Entropy : Zero."
 	]
 
 	// Inputs