diff --git a/gamedir/Data-1.13/Morale_Settings.INI b/gamedir/Data-1.13/Morale_Settings.INI index fab51dd3d..76c86b3d9 100644 --- a/gamedir/Data-1.13/Morale_Settings.INI +++ b/gamedir/Data-1.13/Morale_Settings.INI @@ -189,7 +189,7 @@ OPINIONEVENT_CONTRACTEXTENSION = -2 ; we blame our leader for a retreat order OPINIONEVENT_ORDEREDRETREAT = -6 -; someone killed a non-hostile civilian +; someone killed a non-hostile civilian/militia OPINIONEVENT_CIVKILLER = -8 ; someone carries too much and slows down the squad @@ -275,3 +275,6 @@ OPINIONEVENT_BATTLE_ASSIST = 1 ; someone captured the enemy instead of killing them, and we approve OPINIONEVENT_BATTLE_TOOK_PRISONER = 3 + +; someone injured a non-hostile civilian/militia +OPINIONEVENT_CIV_ATTACKER = -3 diff --git a/gamedir/Data-1.13/TableData/Items/Merges.xml b/gamedir/Data-1.13/TableData/Items/Merges.xml index bc575a3d5..b09d5644f 100644 --- a/gamedir/Data-1.13/TableData/Items/Merges.xml +++ b/gamedir/Data-1.13/TableData/Items/Merges.xml @@ -5808,6 +5808,14 @@ 1 32 + + 1576 + 1576 + 1576 + 0 + 1 + 32 + 1612 1619