diff --git a/DefInjected/RulePackDef/RulePacks_Combat.xml b/DefInjected/RulePackDef/RulePacks_Combat.xml
index 76ce9fd2..fe87910a 100644
--- a/DefInjected/RulePackDef/RulePacks_Combat.xml
+++ b/DefInjected/RulePackDef/RulePacks_Combat.xml
@@ -141,29 +141,29 @@
expert->娴熟的
expert->艺术般的
- logentry(p=0.3)->[initiator_nameShortDef][maneuver_past][recipient_nameShortDef],击中了[recipient_part0_label]。
- logentry(p=0.1)->[initiator_nameShortDef][maneuver_past][recipient_nameShortDef],[flavortextadverb]击中了[recipient_part0_label]。
- logentry(p=0.1)->[initiator_nameShortDef][maneuver_past][recipient_nameShortDef],在[recipient_part0_label]上面[flavortextsituation]。
- logentry(p=0.1)->[initiator_nameShortDef][maneuver_past][recipient_nameShortDef]的[recipient_part0_label], [flavortextconsequence]。
- logentry(p=0.4)->[initiator_nameShortDef],使用[initiator_possessive][expertly][weapon_label],[flavortextadverb]在[recipient_nameShortDef]的 [recipient_part0_label]上[maneuver_past]。
- logentry(p=0.3)->[initiator_nameShortDef][destroyed_past][recipient_nameShortDef]的[destroyed_targets]。
- logentry(p=0.3)->[initiator_nameShortDef][destroyed_past][recipient_nameShortDef]的[destroyed_targets],成为[destroyed_suffix]。
- logentry(p=0.3)->[initiator_nameShortDef][expertly][destroyed_past][recipient_nameShortDef]的[destroyed_targets]。
- logentry(p=0.3)->[initiator_nameShortDef]用[implement][destroyed_past][recipient_nameShortDef]的[destroyed_targets]。
+ logentry(p=0.3)->[initiator_definite][damaged_past][recipient_definite],击中了[recipient_part0_label]。
+ logentry(p=0.1)->[initiator_definite][damaged_past][recipient_definite],[flavortextadverb]击中了[recipient_part0_label]。
+ logentry(p=0.1)->[initiator_definite][damaged_past][recipient_definite],在[recipient_part0_label]上面[flavortextsituation]。
+ logentry(p=0.1)->[initiator_definite][damaged_past][recipient_definite]的[recipient_part0_label], [flavortextconsequence]。
+ logentry(p=0.4)->[initiator_definite],使用[initiator_possessive][expertly][weapon_label],[flavortextadverb]在[recipient_definite]的 [recipient_part0_label]上[damaged_past]。
+ logentry(p=0.3)->[initiator_definite][destroyed_past][recipient_definite]的[destroyed_targets]。
+ logentry(p=0.3)->[initiator_definite][destroyed_past][recipient_definite]的[destroyed_targets],成为[destroyed_suffix]。
+ logentry(p=0.3)->[initiator_definite][expertly][destroyed_past][recipient_definite]的[destroyed_targets]。
+ logentry(p=0.3)->[initiator_definite]用[implement][destroyed_past][recipient_definite]的[destroyed_targets]。
result(p=1,recipient_part_damaged_count==0)->[destroyed_present][recipient_possessive][destroyed_targets]
- result(p=1,recipient_part_destroyed_count==0)->[maneuverresult_present][recipient_possessive][damaged_targets]
- result(p=1)->[destroyed_present][recipient_possessive][destroyed_targets]并且[maneuverresult_present][recipient_possessive][damaged_targets]
- action(p=0.3)->[initiator_nameShortDef]使用[implement][maneuver_inf][recipient_nameShortDef]
- action(p=0.3)->[initiator_nameShortDef]使用[implement]来[maneuver_inf][recipient_nameShortDef]
- action->[initiator_nameShortDef]以[implement][maneuver_past][recipient_nameShortDef]
+ result(p=1,recipient_part_destroyed_count==0)->[damaged_present][recipient_possessive][damaged_targets]
+ result(p=1)->[destroyed_present][recipient_possessive][destroyed_targets]并且[damaged_present][recipient_possessive][damaged_targets]
+ action(p=0.3)->[initiator_definite]使用[implement][damaged_inf][recipient_definite]
+ action(p=0.3)->[initiator_definite]使用[implement]来[damaged_inf][recipient_definite]
+ action->[initiator_definite]以[implement][damaged_past][recipient_definite]
- action->[initiator_nameShortDef][tried][maneuver_inf][recipient_nameShortDef]
- action->[initiator_nameShortDef][tried]用[implement][maneuver_inf][recipient_nameShortDef]
- action->[initiator_nameShortDef][tried]使用[implement]来[maneuver_inf][recipient_nameShortDef]
- action->[initiator_nameShortDef]在[recipient_nameShortDef]面前,挥舞[initiator_possessive][weapon_label
- action(p=0.3)->[initiator_nameShortDef][genericattackverb]武器,将[implement][towardsat][recipient_nameShortDef]
- action(p=0.3)->[initiator_nameShortDef][genericattackverb]武器,[towardsat][recipient_nameShortDef]
- action(p=0.3)->[initiator_nameShortDef][genericattackverb][implement]
+ action->[initiator_definite][tried][damaged_inf][recipient_definite]
+ action->[initiator_definite][tried]用[implement][damaged_inf][recipient_definite]
+ action->[initiator_definite][tried]使用[implement]来[damaged_inf][recipient_definite]
+ action->[initiator_definite]在[recipient_definite]面前,挥舞[initiator_possessive][weapon_label
+ action(p=0.3)->[initiator_definite][genericattackverb]武器,将[implement][towardsat][recipient_definite]
+ action(p=0.3)->[initiator_definite][genericattackverb]武器,[towardsat][recipient_definite]
+ action(p=0.3)->[initiator_definite][genericattackverb][implement]
towardsat->瞄向
towardsat->对准
genericattackverb->挥舞
@@ -172,11 +172,11 @@
tried->尝试
tried->企图
- logentry(p=0.2)->[recipient_nameShortDef]躲闪了[initiator_nameShortDef]的[weapon_label][maneuver_inf].
- logentry(p=0.2)->[initiator_nameShortDef]的[implement][maneuver_inf]没有命中[recipient_nameShortDef]。
- logentry(p=0.2)->在试图使用[implement][maneuver_inf][recipient_nameShortDef]时,[initiator_nameShortDef][failtype]。
- logentry(p=0.2)->在试图[maneuver_inf][recipient_nameShortDef]时,[initiator_nameShortDef][failtype]。
- logentry(p=0.2)->[initiator_nameShortDef][failtype].
+ logentry(p=0.2)->[recipient_definite]躲闪了[initiator_definite]的[weapon_label][damaged_inf].
+ logentry(p=0.2)->[initiator_definite]的[implement][damaged_inf]没有命中[recipient_definite]。
+ logentry(p=0.2)->在试图使用[implement][damaged_inf][recipient_definite]时,[initiator_definite][failtype]。
+ logentry(p=0.2)->在试图[damaged_inf][recipient_definite]时,[initiator_definite][failtype]。
+ logentry(p=0.2)->[initiator_definite][failtype].
failtype->被绊倒
failtype->摔倒了
failtype->被打倒
@@ -186,12 +186,12 @@
result->但是打空了
result->可是幅度太大了
result->然而在最后一刻摔倒了
- result->却在最后一秒迟疑了
+ result(initiator_flesh!=Mechanoid)->却在最后一秒迟疑了
- logentry(p=0.2)->[recipient_nameShortDef]躲闪了[initiator_nameShortDef][implement]的[maneuver_inf]。
- logentry(p=0.2)->[recipient_nameShortDef]躲闪了[initiator_nameShortDef]的[maneuver_inf]。
- result->但是[recipient_nameShortDef]跳跃闪开了
- result->却被[recipient_nameShortDef]的佯攻所欺骗
+ logentry(p=0.2)->[recipient_definite]躲闪了[initiator_definite][implement]的[damaged_inf]。
+ logentry(p=0.2)->[recipient_definite]躲闪了[initiator_definite]的[damaged_inf]。
+ result->但是[recipient_definite]跳跃闪开了
+ result->却被[recipient_definite]的佯攻所欺骗
result->然而攻击被聪明的避开了
initiator_definite->[initiator_labelDefinite]
@@ -231,14 +231,14 @@
shotadverb->突然的
shotadverb->精确的
shotadverb->慎重的
- shotadverb->从容的
+ shotadverb(initiator_flesh!=Mechanoid)->从容的
shotadverb->沉着的
- shotadverb->谨慎的
+ shotadverb(initiator_flesh!=Mechanoid)->谨慎的
shotadjective->小心
shotadjective->快速
shotadjective->从容
shotadjective->精确
- shotadjective->谨慎
+ shotadjective(initiator_flesh!=Mechanoid)->谨慎
logentry->[initiator_definite]的[weapon_projectile_label][destroyed_past][recipient_definite]的[destroyed_targets].
logentry->[initiator_definite]的[weapon_projectile_label][destroyed_past][recipient_definite]的[destroyed_targets],[to][destroyed_suffix].
@@ -281,7 +281,7 @@
destroyed_suffix->一团雾
destroyed_suffix->碎片
destroyed_suffix(p=0.5)->一个蜂窝
- destroyed_suffix(p=0.2)->肉馅
+ destroyed_suffix(recipient_flesh!=Mechanoid,p=0.2)->肉馅
damaged_past->射伤了
damaged_past->伤害了
damaged_past->贯穿了
@@ -293,8 +293,8 @@
damaged_present->伤害
damaged_present->击中
damaged_suffix->面目全非
- damaged_suffix->鲜血四溅
- damaged_suffix->满目疮痍
+ damaged_suffix(recipient_flesh!=Mechanoid)->鲜血四溅
+ damaged_suffix(recipient_flesh!=Mechanoid)->满目疮痍
to->将其变得
to->使之变成
missed->没有命中
@@ -330,11 +330,11 @@
missing->与[originalTarget_definite]差之毫厘
missing->偏出[originalTarget_definite]很多
missing->没打中目标
- avoidance->千钧一发的闪避
- avoidance->左右平移的游走
- avoidance->[originalTarget_objective]突然伏地
- avoidance(p=0.3)->躲到了掩体后面
- avoidance(p=0.3)->疾跑到掩体后面
+ avoidance(originalTarget_mobile==True)->千钧一发的闪避
+ avoidance(originalTarget_mobile==True)->左右平移的游走
+ avoidance(originalTarget_mobile==True)->[originalTarget_objective]突然伏地
+ avoidance(originalTarget_mobile==True,p=0.3)->躲到了掩体后面
+ avoidance(originalTarget_mobile==True,p=0.3)->疾跑到掩体后面
prefix->[initiator_definite]的[weapon_projectile_label][fromof][blast]
prefix->[initiator_definite]的[weapon_label][fromof][blast]
@@ -350,24 +350,24 @@
prefix->[initiator_definite]的[mortarshell]
prefix->[initiator_definite]的[weapon_label]
logentry->[prefix][injured][recipient_definite]。
- logentry->[prefix][destroyed][recipient_definite]的[destroyed_targets]。
- logentry->[prefix][flavortextadverb][destroyed][recipient_definite]的[destroyed_targets]。
- logentry->[prefix][flavortextadverb][destroyed][recipient_definite]的[destroyed_targets]。
- logentry->[prefix][destroyed][recipient_definite]的[destroyed_targets]并且[damaged_past][recipient_possessive][damaged_targets]。
+ logentry->[prefix][destroyed_past][recipient_definite]的[destroyed_targets]。
+ logentry->[prefix][flavortextadverb][destroyed_past][recipient_definite]的[destroyed_targets]。
+ logentry->[prefix][flavortextadverb][destroyed_past][recipient_definite]的[destroyed_targets]。
+ logentry->[prefix][destroyed_past][recipient_definite]的[destroyed_targets]并且[damaged_past][recipient_possessive][damaged_targets]。
logentry(recipient_part_destroyed_count==0)->[prefix][damaged_past][recipient_definite]的[damaged_targets]。
logentry(recipient_part_destroyed_count==0)->[prefix][flavortextadverb][damaged_past][recipient_definite]的[damaged_targets]。
logentry(recipient_part_destroyed_count==0)->[prefix][flavortextadverb][damaged_past][recipient_definite]的[damaged_targets]。
logentry->[recipient_definite]已经被[initiator_definite][damaged_past]。
logentry->[recipient_definite]已经被[initiator_definite][flavortextadverb][damaged_past] 。
logentry->[recipient_definite]已经被[damaged_past]。
- blast->爆炸
- blast->冲击波
- blast->余波
- blast->震荡波
- blast->破坏力
- blast->压力
- fromof->释放的
- fromof->发出的
+ logentry(p=0.001)->[recipient_definite]被爆炸淹没。
+ logentry(p=0.001)->[recipient_definite]被爆炸击中。
+ blast->爆炸
+ blast->冲击波
+ blast->余波
+ blast->震荡波
+ blast->破坏力
+ blast->压力
fromof->释放的
fromof->发出的
diff --git a/DefInjected/RulePackDef/RulePacks_Damage.xml b/DefInjected/RulePackDef/RulePacks_Damage.xml
index 8b16ff5d..753ea99d 100644
--- a/DefInjected/RulePackDef/RulePacks_Damage.xml
+++ b/DefInjected/RulePackDef/RulePacks_Damage.xml
@@ -7,11 +7,11 @@
damaged_past->破坏了
damaged_past->炸伤了
damaged_past->震伤了
- destroyed->被击碎
- destroyed->破裂了
- destroyed->被打断
- destroyed->被打坏
- destroyed->被打爆
+ destroyed_past->被击碎
+ destroyed_past->破裂了
+ destroyed_past->被打断
+ destroyed_past->被打坏
+ destroyed_past->被打爆
damaged_past(p=2)->波及
damaged_past(p=2)->烧焦
@@ -23,12 +23,12 @@
damaged_past->破坏
damaged_past->流血
damaged_past->伤害
- destroyed->被烧成灰烬
- destroyed->被烧毁
- destroyed->被烧焦
- destroyed->被烧坏
- destroyed->被烧毁
- destroyed->被打爆
+ damaged_present(p=2)->爆炸
+ damaged_present(p=2)->灼烧
+ damaged_present(p=2)->燃烧
+ damaged_present(p=2)->烧起泡
+ damaged_present(p=2)->点燃
+ damaged_present(p=2)->烧灼
damaged_present->破坏
damaged_present->毁灭
damaged_present->伤害
diff --git a/DefInjected/RulePackDef/RulePacks_DamageEvent.xml b/DefInjected/RulePackDef/RulePacks_DamageEvent.xml
index d5c403f8..223fd565 100644
--- a/DefInjected/RulePackDef/RulePacks_DamageEvent.xml
+++ b/DefInjected/RulePackDef/RulePacks_DamageEvent.xml
@@ -1,9 +1,9 @@
- logentry->[damageSource][recipient_nameShortDef],[destroying][recipient_possessive][destroyed_targets]。
- logentry->[damageSource][recipient_nameShortDef],[destroying][recipient_possessive][destroyed_targets]并且[damaging][recipient_possessive] [damaged_targets]。
- logentry(recipient_part_destroyed_count==0)->[damageSource][recipient_nameShortDef],[damaging][recipient_possessive][damaged_targets]。
+ logentry->[damageSource][recipient_nameShortDef],[destroyed_present][recipient_possessive][destroyed_targets]。
+ logentry->[damageSource][recipient_nameShortDef],[destroyed_present][recipient_possessive][destroyed_targets]并且[damaged_present][recipient_possessive] [damaged_targets]。
+ logentry(recipient_part_destroyed_count==0)->[damageSource][recipient_nameShortDef],[damaged_present][recipient_possessive][damaged_targets]。
logentry(p=0.1)->[damageSource][recipient_nameShortDef]。
damageSource->[roof][collapsed]砸到
@@ -13,16 +13,16 @@
collapsed->坍塌
collapsed->掉落
collapsed->塌陷
- damaging->击伤
- damaging->砸伤
- damaging->击中
- damaging->擦伤
- damaging->撕裂
- destroying->击碎
- destroying->压碎
- destroying->压住
- destroying->摧毁
- destroying->破坏
+ damaged_present->击伤
+ damaged_present->砸伤
+ damaged_present->击中
+ damaged_present->擦伤
+ damaged_present->撕裂
+ destroyed_present->击碎
+ destroyed_present->压碎
+ destroyed_present->压住
+ destroyed_present->摧毁
+ destroyed_present->破坏
damageSource->[fire]点燃了
fire(p=3)->火焰
@@ -31,14 +31,14 @@
fire->高温
fire->大火
fire->炼狱
- damaging->灼烧
- damaging->炙烤
- damaging->烧烤
- damaging->烧焦
- destroying->烧焦
- destroying->烧毁
- destroying->烤熟
- destroying->烧成灰烬
+ damaged_present->灼烧
+ damaged_present->炙烤
+ damaged_present->烧烤
+ damaged_present->烧焦
+ destroyed_present->烧焦
+ destroyed_present->烧毁
+ destroyed_present->烤熟
+ destroyed_present->烧成灰烬
damageSource->[sky]撕开裂口,审判降临
damageSource->一束难以置信的[power][damaged_past]