1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

- added opinion event OPINIONEVENT_CIV_ATTACKER, used when injuring a non-hostile civilian/militia

Browse Source 
- cleaning kits can be merged

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2255 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Flugente
2015-06-15 17:10:09 +00:00
parent 65ca8103db
commit c59a9722f3
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/Morale_Settings.INI
+4 -1
View File
@@ -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
gamedir/Data-1.13/TableData/Items/Merges.xml
+8
View File
@@ -5808,6 +5808,14 @@
<mergeType>1</mergeType>
<APCost>32</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1576</firstItemIndex>
<secondItemIndex>1576</secondItemIndex>
<firstResultingItemIndex>1576</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>1</mergeType>
<APCost>32</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1612</firstItemIndex>
<secondItemIndex>1619</secondItemIndex>