diff --git a/DefInjected/ItemCollectionGeneratorDef/ItemCollectionGenerators_General.xml b/DefInjected/ItemCollectionGeneratorDef/ItemCollectionGenerators_General.xml
index 2e985127..549fa960 100644
--- a/DefInjected/ItemCollectionGeneratorDef/ItemCollectionGenerators_General.xml
+++ b/DefInjected/ItemCollectionGeneratorDef/ItemCollectionGenerators_General.xml
@@ -9,4 +9,5 @@
物品
食物
+
\ No newline at end of file
diff --git a/DefInjected/RulePackDef/RulePacks_Combat.xml b/DefInjected/RulePackDef/RulePacks_Combat.xml
index 83ad9907..282df24f 100644
--- a/DefInjected/RulePackDef/RulePacks_Combat.xml
+++ b/DefInjected/RulePackDef/RulePacks_Combat.xml
@@ -1,139 +1,145 @@
- logentry->[action], [result].
- logentry(p=0.2)->[action].
- implement(implementOwnerType==weapon,p=2)->[initiator_possessive] [weapon_label]'s [tool_label]
- implement(implementOwnerType==weapon,p=1)->[initiator_possessive] [weapon_label]
- implement(implementOwnerType==weapon,p=1)->a [weapon_label]'s [tool_label]
- implement(implementOwnerType==weapon,p=0.5)->a [weapon_label]
- implement(implementOwnerType==bodypart,p=2)->[initiator_possessive] [tool_label]
- implement(implementOwnerType==bodypart,p=1)->[initiator_possessive] [bodypart_adjective] [tool_label]
- implement(implementOwnerType==hediff,p=2)->[initiator_possessive] [weapon_label]'s [tool_label]
- implement(implementOwnerType==hediff,p=1)->[initiator_possessive] [weapon_label]
- implement(implementOwnerType==hediff,p=1)->[initiator_possessive] [tool_label]
- bodypart_adjective->hard
- bodypart_adjective->strong
- bodypart_adjective->powerful
- bodypart_adjective->forceful
- bodypart_adjective->mighty
- bodypart_adjective->rugged
- bodypart_adjective->stout
- bodypart_adjective->sturdy
- bodypart_adjective->solid
- bodypart_adjective->tough
- bodypart_adjective->calloused
- bodypart_adjective->firm
- targetlist(recipient_part_count==1)->[recipient_part0_label]
- targetlist(recipient_part_count==2)->[recipient_part0_label] and [recipient_part1_label]
- targetlist(recipient_part_count==3)->[recipient_part0_label], [recipient_part1_label], and [recipient_part2_label]
- targetlist->[recipient_part0_label], [recipient_part1_label], [recipient_part2_label], and [recipient_part3_label]
- maneuverresult_present->wounding
- maneuverresult_present->injuring
- destroyed(p=0.5)->destroyed
- destroyed(p=0.5)->demolished
- destroyed(p=0.5)->ruined
- destroyed(p=0.5)->wrecked
- result(p=0.5)->[maneuverresult_present] [recipient_possessive] [targetlist]
- result(p=0.2)->[maneuverresult_present] [recipient_possessive] [targetlist] [flavortextadverb]
- result(p=0.2)->[maneuverresult_present] [recipient_possessive] [targetlist] [flavortextsituation]
- result(p=0.2)->[maneuverresult_present] [recipient_possessive] [targetlist] and [flavortextconsequence]
- flavortextadverb->painfully
- flavortextadverb->brutally
- flavortextadverb->horribly
- flavortextadverb->agonizingly
- flavortextadverb->fiercely
- flavortextadverb->ruthlessly
- flavortextadverb->savagely
- flavortextadverb->viciously
- flavortextadverb->mercilessly
- flavortextadverb->heartlessly
- flavortextsituation->in an explosion of gore
- flavortextsituation->leaving a disgusting wound
- flavortextsituation->without emotion
- flavortextsituation->while wearing a blank look
- flavortextsituation->while wearing a savage look
- flavortextsituation->while wearing a [badassadjective] look
- flavortextsituation->while grimacing
- flavortextsituation->while laughing
- flavortextsituation->while smirking
- flavortextconsequence->making [recipient_objective] [wince] [painevent]
- flavortextconsequence(p=0.2)->throwing [recipient_objective] off balance
- wince->wince
- wince->grimace
- wince->cringe
- wince->groan
- wince->scream
- wince->shout
- wince->recoil
- wince->stumble
- painstate->in
- painstate->with
- painstate->from the
- painevent->[painstate] pain
- painevent->[painstate] agony
- painevent->with misery
- painevent->from the injury
- painevent->from the wound
- mortarshell->shell
- mortarshell->shot
- mortarshell->projectile
- mortarshell->explosive
- mortarshell->bomb
- mortarshell(p=0.3)->ballistic shell
- mortarshell(p=0.3)->ballistic shot
- mortarshell(p=0.3)->ballistic projectile
- to->to
- to->into
+ logentry->[action], [result].
+ logentry(p=0.2)->[action].
+ implement(implementOwnerType==weapon,p=2)->[initiator_possessive] [weapon_label]'s [tool_label]
+ implement(implementOwnerType==weapon,p=1)->[initiator_possessive] [weapon_label]
+ implement(implementOwnerType==weapon,p=1)->a [weapon_label]'s [tool_label]
+ implement(implementOwnerType==weapon,p=0.5)->a [weapon_label]
+ implement(implementOwnerType==bodypart,p=2)->[initiator_possessive] [tool_label]
+ implement(implementOwnerType==bodypart,p=1)->[initiator_possessive] [bodypart_adjective] [tool_label]
+ implement(implementOwnerType==hediff,p=2)->[initiator_possessive] [weapon_label]'s [tool_label]
+ implement(implementOwnerType==hediff,p=1)->[initiator_possessive] [weapon_label]
+ implement(implementOwnerType==hediff,p=1)->[initiator_possessive] [tool_label]
+ bodypart_adjective->hard
+ bodypart_adjective->strong
+ bodypart_adjective->powerful
+ bodypart_adjective->forceful
+ bodypart_adjective->mighty
+ bodypart_adjective->rugged
+ bodypart_adjective->stout
+ bodypart_adjective->sturdy
+ bodypart_adjective->solid
+ bodypart_adjective->tough
+ bodypart_adjective(initiator_flesh==True)->calloused
+ bodypart_adjective->firm
+ targetlist(recipient_part_count==1)->[recipient_part0_label]
+ targetlist(recipient_part_count==2)->[recipient_part0_label] and [recipient_part1_label]
+ targetlist(recipient_part_count==3)->[recipient_part0_label], [recipient_part1_label], and [recipient_part2_label]
+ targetlist->[recipient_part0_label], [recipient_part1_label], [recipient_part2_label], and [recipient_part3_label]
+ damaged_present->wounding
+ damaged_present->injuring
+ destroyed(p=0.5)->destroyed
+ destroyed(p=0.5)->demolished
+ destroyed(p=0.5)->ruined
+ destroyed(p=0.5)->wrecked
+ result(p=0.5)->[damaged_present] [recipient_possessive] [targetlist]
+ result(p=0.2)->[damaged_present] [recipient_possessive] [targetlist] [flavortextadverb]
+ result(p=10000)->[damaged_present] [recipient_possessive] [targetlist] [flavortextsituation]
+ result(p=0.2)->[damaged_present] [recipient_possessive] [targetlist] and [flavortextconsequence]
+ flavortextadverb->painfully
+ flavortextadverb->brutally
+ flavortextadverb->horribly
+ flavortextadverb->agonizingly
+ flavortextadverb->fiercely
+ flavortextadverb->ruthlessly
+ flavortextadverb->savagely
+ flavortextadverb->viciously
+ flavortextadverb->mercilessly
+ flavortextadverb->heartlessly
+ flavortextsituation(recipient_flesh!=Mechanoid)->in an explosion of gore
+ flavortextsituation(recipient_flesh==Mechanoid)->in an explosion of scrap
+ flavortextsituation->without emotion
+ flavortextsituation->while wearing a blank look
+ flavortextsituation(initiator_flesh==Normal)->while wearing a savage look
+ flavortextsituation(initiator_flesh==Normal)->while wearing a [badassadjective] look
+ flavortextsituation(initiator_flesh==Normal)->while grimacing
+ flavortextsituation(initiator_flesh==Normal)->while laughing
+ flavortextsituation(initiator_flesh==Normal)->while smirking
+ flavortextconsequence(recipient_flesh!=Mechanoid)->leaving a disgusting wound
+ flavortextconsequence->leaving a horrific wound
+ flavortextconsequence(recipient_flesh!=Mechanoid)->making [recipient_objective] [wince] [painevent]
+ flavortextconsequence(p=0.2)->throwing [recipient_objective] off balance
+ wince(recipient_flesh==Normal)->wince
+ wince(recipient_flesh==Normal)->grimace
+ wince(recipient_flesh==Normal)->cringe
+ wince(recipient_flesh==Normal)->groan
+ wince(recipient_flesh!=Mechanoid)->scream
+ wince(recipient_flesh!=Mechanoid)->shout
+ wince->recoil
+ wince->stumble
+ painstate->in
+ painstate->with
+ painstate->from the
+ painevent(recipient_flesh!=Mechanoid)->[painstate] pain
+ painevent(recipient_flesh!=Mechanoid)->[painstate] agony
+ painevent(recipient_flesh==Normal)->with misery
+ painevent->from the injury
+ painevent->from the wound
+ mortarshell->shell
+ mortarshell->shot
+ mortarshell->projectile
+ mortarshell->explosive
+ mortarshell->bomb
+ mortarshell(p=0.3)->ballistic shell
+ mortarshell(p=0.3)->ballistic shot
+ mortarshell(p=0.3)->ballistic projectile
+ to->to
+ to->into
+ initiator_definite->[initiator_labelDefinite]
+ initiator_definite->[initiator_nameShortDef]
+ recipient_definite->[recipient_labelDefinite]
+ recipient_definite->[recipient_nameShortDef]
- destroyed_targets(recipient_part_destroyed_count==1)->[recipient_part_destroyed0_label]
- destroyed_targets(recipient_part_destroyed_count==2)->[recipient_part_destroyed0_label] and [recipient_part_destroyed1_label]
- destroyed_targets(recipient_part_destroyed_count==3)->[recipient_part_destroyed0_label], [recipient_part_destroyed1_label], and [recipient_part_destroyed2_label]
- destroyed_targets->[recipient_part_destroyed0_label], [recipient_part_destroyed1_label], [recipient_part_destroyed2_label], and [recipient_part_destroyed3_label]
- damaged_targets(recipient_part_damaged_count==1)->[recipient_part_damaged0_label]
- damaged_targets(recipient_part_damaged_count==2)->[recipient_part_damaged0_label] and [recipient_part_damaged1_label]
- damaged_targets(recipient_part_damaged_count==3)->[recipient_part_damaged0_label], [recipient_part_damaged1_label], and [recipient_part_damaged2_label]
- damaged_targets->[recipient_part_damaged0_label], [recipient_part_damaged1_label], [recipient_part_damaged2_label], and [recipient_part_damaged3_label]
- expertly->expertly
- expertly->adeptly
- expertly->adroitly
- expertly->deftly
- expertly->skillfully
- expertly->slickly
- expertly->professionally
- expertly->aptly
- expertly->dexterously
- expertly->cleverly
- expertly->masterfully
- expertly->artistically
- expertly->with skill
- expertly->with impressive experience
- expertly->with flair
- expertly->with care
- expertly->with precision
- expertly->with proficiency
- expertly->with strength
- expertly->with dexterity
- expertly->with mastery
- expertly->with artistry
- expertly->with professionalism
- expertly->like a virtuoso
- expertly->like an expert
- expertly->like a master
- expertly->like an artist
- expertly->like a pro
- expert->expert
- expert->adept
- expert->adroit
- expert->deft
- expert->skillful
- expert->slick
- expert->professional
- expert->apt
- expert->dexterous
- expert->clever
- expert->masterful
- expert->artistic
+ destroyed_targets(recipient_part_destroyed_count==1)->[recipient_part_destroyed0_label]
+ destroyed_targets(recipient_part_destroyed_count==2)->[recipient_part_destroyed0_label] and [recipient_part_destroyed1_label]
+ destroyed_targets(recipient_part_destroyed_count==3)->[recipient_part_destroyed0_label], [recipient_part_destroyed1_label], and [recipient_part_destroyed2_label]
+ destroyed_targets->[recipient_part_destroyed0_label], [recipient_part_destroyed1_label], [recipient_part_destroyed2_label], and [recipient_part_destroyed3_label]
+ damaged_targets(recipient_part_damaged_count==1)->[recipient_part_damaged0_label]
+ damaged_targets(recipient_part_damaged_count==2)->[recipient_part_damaged0_label] and [recipient_part_damaged1_label]
+ damaged_targets(recipient_part_damaged_count==3)->[recipient_part_damaged0_label], [recipient_part_damaged1_label], and [recipient_part_damaged2_label]
+ damaged_targets->[recipient_part_damaged0_label], [recipient_part_damaged1_label], [recipient_part_damaged2_label], and [recipient_part_damaged3_label]
+ expertly->expertly
+ expertly->adeptly
+ expertly->adroitly
+ expertly->deftly
+ expertly->skillfully
+ expertly->slickly
+ expertly->professionally
+ expertly->aptly
+ expertly->dexterously
+ expertly->cleverly
+ expertly->masterfully
+ expertly->artistically
+ expertly->with skill
+ expertly->with impressive experience
+ expertly->with flair
+ expertly->with care
+ expertly->with precision
+ expertly->with proficiency
+ expertly->with strength
+ expertly->with dexterity
+ expertly->with mastery
+ expertly->with artistry
+ expertly->with professionalism
+ expertly->like a virtuoso
+ expertly->like an expert
+ expertly->like a master
+ expertly->like an artist
+ expertly->like a pro
+ expert->expert
+ expert->adept
+ expert->adroit
+ expert->deft
+ expert->skillful
+ expert->slick
+ expert->professional
+ expert->apt
+ expert->dexterous
+ expert->clever
+ expert->masterful
+ expert->artistic
logentry(p=0.3)->[initiator_nameShortDef] [maneuver_past] [recipient_nameShortDef] in the [recipient_part0_label].
logentry(p=0.1)->[initiator_nameShortDef] [maneuver_past] [recipient_nameShortDef] in the [recipient_part0_label] [flavortextadverb].
@@ -362,6 +368,8 @@
blast->impact
fromof->from
fromof->of
+ fromof->from
+ fromof->of
\ No newline at end of file
diff --git a/DefInjected/RulePackDef/RulePacks_Damage.xml b/DefInjected/RulePackDef/RulePacks_Damage.xml
index 7619efee..5a53ae9c 100644
--- a/DefInjected/RulePackDef/RulePacks_Damage.xml
+++ b/DefInjected/RulePackDef/RulePacks_Damage.xml
@@ -29,6 +29,47 @@
destroyed->obliterated
destroyed->annihilated
destroyed->detonated
+ damaged_present->injuring
+ damaged_present->damaging
+ damaged_present->wounding
+ damaged_present->hurting
+ destroyed_past->cremated
+ destroyed_past->incinerated
+ destroyed_past->charred
+ destroyed_past->obliterated
+ destroyed_past->annihilated
+ destroyed_past->detonated
+ destroyed_present->cremating
+ destroyed_present->incinerating
+ destroyed_present->charring
+ destroyed_present->obliterating
+ destroyed_present->annihilating
+ destroyed_present->detonating
+
+
+
+
+ damaged_past->extinguished
+ damaged_past->swamped
+ damaged_past->foamed
+ damaged_past->quenched
+ destroyed_past->damaged_past
+
+ damaged_past->stunned
+ damaged_past->confused
+ damaged_past->stopped
+ damaged_past->dizzied
+ destroyed_past->damaged_past
+
+ damaged_past->electrified
+ damaged_past->shocked
+ damaged_past->zapped
+ destroyed_past->damaged_past
+
+ damaged_past->smoked
+ damaged_past->fogged
+ damaged_past->clouded
+ destroyed_past->damaged_past
\ No newline at end of file
diff --git a/DefInjected/RulePackDef/RulePacks_DamageEvent.xml b/DefInjected/RulePackDef/RulePacks_DamageEvent.xml
index 3645559b..9a8ac6c5 100644
--- a/DefInjected/RulePackDef/RulePacks_DamageEvent.xml
+++ b/DefInjected/RulePackDef/RulePacks_DamageEvent.xml
@@ -40,5 +40,29 @@
destroying->cooking
destroying->cremating
+ damageSource->The [sky] opened up on
+ damageSource->A beam of incredible [power] [damaged_past]
+ damageSource->A column of [light] [damaged_past]
+ sky->sky
+ sky->clouds
+ sky->heavens
+ power->power
+ power->energy
+ power->heat
+ light->light
+ light->heat
+ light->flame
+ light(p=0.2)->incandescence
+
+ damageSource->A [spiraling] tornado [enveloped]
+ destroyed_present(p=3)->tearing off
+ spiraling->spiraling
+ spiraling->whirling
+ spiraling->spinning
+ spiraling(p=10)->
+ enveloped(p=8)->enveloped
+ enveloped->engulfed
+ enveloped->surrounded
+
\ No newline at end of file
diff --git a/DefInjected/RulePackDef/RulePacks_Maneuvers.xml b/DefInjected/RulePackDef/RulePacks_Maneuvers.xml
index 3486a2b1..128ef066 100644
--- a/DefInjected/RulePackDef/RulePacks_Maneuvers.xml
+++ b/DefInjected/RulePackDef/RulePacks_Maneuvers.xml
@@ -38,6 +38,8 @@
destroyed_suffix->cleanly
destroyed_suffix(target_part_destroyed_count==1)->exposing its inner workings
destroyed_suffix(target_part_destroyed_count==1)->slicing it in twain
+ destroyed_suffix(target_part_destroyed_count==1)->exposing its inner workings
+ destroyed_suffix(target_part_destroyed_count==1)->slicing it in twain
maneuver_inf(p=4)->stab
maneuver_inf->jab
@@ -70,6 +72,32 @@
destroyed_suffix(target_part_destroyed_count==1)->leaving it leaking gory fluids
destroyed_suffix(target_part_destroyed_count==1)->leaving it leaking unrecognizable fluids
+ damaged_inf(p=4)->smash
+ damaged_inf->bash
+ damaged_inf->clobber
+ damaged_inf->slam
+ damaged_inf->strike
+ damaged_past(p=4)->smashed
+ damaged_past->bashed
+ damaged_past->clobbered
+ damaged_past->slammed
+ damaged_past->struck
+ damaged_present->smashing
+ damaged_present->bashing
+ damaged_present->clobbering
+ damaged_present->bruising
+ damaged_present->lacerating
+ destroyed_past->shattered
+ destroyed_past->crushed
+ destroyed_past->obliterated
+ destroyed_past->annihilated
+ destroyed_past->broke
+ destroyed_present->shattering
+ destroyed_present->crushing
+ destroyed_present->obliterating
+ destroyed_present->annihilating
+ destroyed_present->breaking
+
maneuver_inf(p=4)->smash
maneuver_inf->bash
maneuver_inf->clobber
@@ -78,31 +106,29 @@
maneuver_past(p=4)->smashed
maneuver_past->bashed
maneuver_past->clobbered
- maneuver_past->slammed
- maneuver_past->struck
- maneuverresult_present->smashing
- maneuverresult_present->bashing
- maneuverresult_present->clobbering
- maneuverresult_present->bruising
- maneuverresult_present->lacerating
- flavortext->leaving an enormous bruise
- flavortext->leaving the area visibly deformed
- flavortext->and knocking [recipient_objective] off balance
- flavortext->and knocking [recipient_objective] to the side
- destroyed_past->shattered
- destroyed_past->crushed
- destroyed_past->obliterated
- destroyed_past->annihilated
- destroyed_past->broke
- destroyed_present->shattering
- destroyed_present->crushing
- destroyed_present->obliterating
- destroyed_present->annihilating
- destroyed_present->breaking
- destroyed_suffix->[to] pieces
- destroyed_suffix->[to] bits
- destroyed_suffix->[to] a fine mist
- destroyed_suffix->[to] fragments
+
+ damaged_inf(p=4)->scratch
+ damaged_inf->lacerate
+ damaged_inf->tear
+ damaged_inf->cut
+ damaged_past(p=4)->scratched
+ damaged_past->lacerated
+ damaged_past->tore
+ damaged_past->cut
+ damaged_present->scratching
+ damaged_present->lacerating
+ damaged_present->tearing
+ damaged_present->cutting
+ destroyed_past->mauled
+ destroyed_past->lacerated
+ destroyed_past->tore off
+ destroyed_past->shredded
+ destroyed_past->ripped
+ destroyed_present->mauling
+ destroyed_present->lacerating
+ destroyed_present->tearing off
+ destroyed_present->shredding
+ destroyed_present->ripping
maneuver_inf(p=4)->scratch
maneuver_inf->lacerate
@@ -117,26 +143,6 @@
maneuverresult_present->tearing
maneuverresult_present->cutting
woundname->wound
- woundname(p=0.3)->opening
- flavortext->and exposing the flesh underneath
- flavortext->and leaving a gory [woundname]
- flavortext->with blood dripping from the [woundname]
- destroyed_past->mauled
- destroyed_past->lacerated
- destroyed_past->tore
- destroyed_past->shredded
- destroyed_past->ripped
- destroyed_present->mauling
- destroyed_present->lacerating
- destroyed_present->tearing
- destroyed_present->shredding
- destroyed_present->ripping
- destroyed_suffix->[to] messy strips
- destroyed_suffix->[to] strips
- destroyed_suffix->[to] messy pieces
- destroyed_suffix->[to] pieces
- destroyed_suffix->[to] fragments
- destroyed_suffix->[to] a pile of gore
maneuver_inf(p=2)->poke
maneuver_inf(p=2)->jab
@@ -179,6 +185,29 @@
destroyed_past->devoured
destroyed_present->devouring
destroyed_suffix->to shreds
+ damaged_past->tore
+ maneuver_present->biting
+ maneuver_present->chomping
+ maneuver_present->nipped
+ maneuver_present->gnawing
+ maneuver_present->tearing
+ flavortextconsequence(recipient_flesh!=Mechanoid)->exposing the flesh underneath
+ flavortextconsequence(recipient_flesh==Mechanoid)->exposing the machinery underneath
+ flavortextconsequence(recipient_flesh!=Mechanoid)->leaving grisly tears in the skin
+ flavortextconsequence(recipient_flesh==Mechanoid)->leaving grisly tears in the metal
+ destroyed_past->devoured
+ destroyed_past->separated
+ destroyed_past->ripped
+ destroyed_past->ravaged
+ destroyed_present->devouring
+ destroyed_present->separating
+ destroyed_present->ripping
+ destroyed_present->ravaging
+ destroyed_suffix->[to] shreds
+ destroyed_suffix->[to] pieces
+ destroyed_suffix->[to] strips
+ destroyed_suffix(recipient_flesh!=Mechanoid)->[to] messy strips
+ destroyed_suffix(recipient_flesh!=Mechanoid)->[to] an unrecognizable mess
\ No newline at end of file
diff --git a/DefInjected/RulePackDef/RulePacks_NameMakers_WorldFeatures.xml b/DefInjected/RulePackDef/RulePacks_NameMakers_WorldFeatures.xml
index a9c05c73..5acb2920 100644
--- a/DefInjected/RulePackDef/RulePacks_NameMakers_WorldFeatures.xml
+++ b/DefInjected/RulePackDef/RulePacks_NameMakers_WorldFeatures.xml
@@ -143,11 +143,24 @@
suffix->marsh
suffix->fen
+ suffix(p=6)->rainforest
+ suffix(p=3)->jungle
+ suffix->forest
+ suffix->grove
+ suffix->woodland
+ suffix->tangle
+
suffix(p=6)->forest
suffix->grove
suffix->wetlands
suffix->taiga
- suffix->woodland
+
+ suffix(p=6)->forest
+ suffix(p=3)->taiga
+ suffix->grove
+ suffix->woodland
+ suffix->tangle
+ suffix->thicket
suffix(p=4)->shrubland
suffix(p=4)->scrubland
diff --git a/DefInjected/RulePackDef/RulePacks_Transitions.xml b/DefInjected/RulePackDef/RulePacks_Transitions.xml
index 3345b503..6e111878 100644
--- a/DefInjected/RulePackDef/RulePacks_Transitions.xml
+++ b/DefInjected/RulePackDef/RulePacks_Transitions.xml
@@ -4,6 +4,8 @@
duetoa->due to
duetoa(p=0.5)->because of
duetoa(p=0.5)->thanks to
+ subject_definite->[subject_labelDefinite]
+ subject_definite->[subject_nameShortDef]
logentry->[culpritHediff_labelNoun] caused [subject_nameShortDef] to [collapsemeta].
logentry->[culpritHediff_labelNoun] in the [culpritHediff_target_label] caused [subject_nameShortDef] to [collapsemeta].
@@ -28,6 +30,13 @@
collapsemeta(p=0.5)->[collapse] [helplessly]
collapsedmeta->[collapsed]
collapsedmeta(p=0.5)->[collapsed] [helplessly]
+ helplessly(subject_flesh!=Mechanoid)->weakly
+ helplessly(subject_flesh!=Mechanoid)->feebly
+ helplessly(subject_flesh==Mechanoid)->uncontrollably
+ collapsemeta->[collapse]
+ collapsemeta(p=0.5)->[collapse] [helplessly]
+ collapsedmeta->[collapsed]
+ collapsedmeta(p=0.5)->[collapsed] [helplessly]
logentry(p=1.5)->[culpritHediff_labelNoun] caused [subject_nameShortDef] to [die].
logentry(p=1.5)->[culpritHediff_labelNoun] in the [culpritHediff_target_label] caused [subject_nameShortDef] to [die].
@@ -35,6 +44,7 @@
logentry->[subject_nameShortDef] [died] [duetoa] [culpritHediff_labelNoun] in the [culpritHediff_target_label] [flavorsuffix].
logentry->[subject_nameShortDef] [died] [duetoa] [culpritHediff_labelNoun] in [subject_possessive] [culpritHediff_target_label] [flavorsuffix].
logentry(p=0.1)->[subject_nameShortDef] [died] [suffixflavor].
+ logentry->[subject_definite] [died] [suffixflavor].
die(p=2)->die
die->perish
@@ -43,6 +53,10 @@
died(p=2)->died
died->perished
died->expired
+ died->perished
+ died(subject_flesh!=Mechanoid)->expired
+ died(subject_flesh==Mechanoid)->shut down
+ died(subject_flesh==Mechanoid)->stopped functioning
die(p=3)->explode [flavor]
die(p=3)->explode [flavorsuffix]
diff --git a/DefInjected/ThingDef/Weapons_Melee.xml b/DefInjected/ThingDef/Weapons_Melee.xml
index d62b38a1..a11b4d1d 100644
--- a/DefInjected/ThingDef/Weapons_Melee.xml
+++ b/DefInjected/ThingDef/Weapons_Melee.xml
@@ -15,10 +15,12 @@
棍子
人类最古老的武器,一根整过形的棍子。棍子的一头较重,用于将敌人击打致死。原始而有效。
handle
+ head
钉头锤
一根精致的棍棒,在挥舞和杀伤上有特别的设计。
handle
+ head
短剑
一种样式古老的短剑。劈砍或戳刺都非常有效。
diff --git a/Keyed/Incidents.xml b/Keyed/Incidents.xml
index eea941db..95c1ffb7 100644
--- a/Keyed/Incidents.xml
+++ b/Keyed/Incidents.xml
@@ -155,4 +155,5 @@
{0}说藏匿点没有人看守。
{0}说{1}。
+
\ No newline at end of file