diff --git a/src/samples/slay-the-spire-like/data/desert/card.csv b/src/samples/slay-the-spire-like/data/desert/card.csv
index c363ea0..8923f31 100644
--- a/src/samples/slay-the-spire-like/data/desert/card.csv
+++ b/src/samples/slay-the-spire-like/data/desert/card.csv
@@ -6,35 +6,35 @@
 # onDraw: effects triggered when card enters hand
 # onDiscard: effects triggered when card is discarded
 
-id,name,desc,type,costType,costCount,targetType,onPlay,onDraw,onDiscard
-string,string,string,'item'|'status','energy'|'uses'|'none',int,'single'|'none',['self'|'target'|'all'|'random';@effect;number][],['self'|'target'|'all'|'random';@effect;number][],['self'|'target'|'all'|'random';@effect;number][]
-sword,剑,【攻击2】【攻击2】,item,energy,1,single,[target;attack;2];[target;attack;2],,
-greataxe,长斧,对全体【攻击5】,item,energy,2,none,[all;attack;5],,
-spear,长枪,【攻击2】【攻击2】【攻击2】,item,energy,1,single,[target;attack;2];[target;attack;2];[target;attack;2],,
-dagger,短刀,【攻击3】【攻击3】,item,energy,1,single,[target;attack;3];[target;attack;3],,
-dart,飞镖,【攻击1】抓一张牌,item,energy,0,single,[target;attack;1];[self;draw;1],,
-crossbow,十字弩,【攻击6】对同一目标打出其他十字弩,item,energy,2,single,[target;attack;6];[self;crossbow;0],,
-shield,盾,【防御3】,item,energy,1,none,[self;defend;3],,
-hat,斗笠,【防御8】,item,energy,2,none,[self;defend;8],,
-cape,披风,【防御2】下回合【防御2】,item,energy,1,none,[self;defend;2];[self;defendNext;2],,
-bracer,护腕,【防御1】抓1张牌,item,energy,0,none,[self;defend;1];[self;draw;1],,
-greatshield,大盾,【防御5】,item,energy,1,none,[self;defend;5],,
-chainmail,锁子甲,本回合受到伤害-3,item,energy,1,none,[self;damageReduce;3],,
-bandage,绷带,从牌堆或弃牌堆随机移除1张伤口,item,uses,3,none,[self;removeWound;1],,
-poisonPotion,淬毒药剂,周围物品的【攻击】+2,item,uses,3,none,[self;attackBuff;2],,
-fortifyPotion,强固药剂,周围物品的【防御】+2,item,uses,3,none,[self;defendBuff;2],,
-vitalityPotion,活力药剂,获得1点能量,item,uses,3,none,[self;gainEnergy;1],,
-focusPotion,集中药剂,抓2张牌,item,uses,3,none,[self;draw;2],,
-healingPotion,治疗药剂,从牌堆或弃牌堆移除3张伤口,item,uses,3,none,[self;removeWound;3],,
-waterBag,水袋,下回合开始时获得1能量抓2张牌,item,energy,1,none,[self;energyNext;1];[self;drawNext;2],,
-rope,绳索,周围物品的牌【防御】+2直到打出,item,energy,1,none,[self;defendBuffUntilPlay;2],,
-belt,腰带,从牌堆周围物品的牌当中选择一张加入手牌,item,energy,0,none,[self;drawChoice;1],,
-torch,火把,下次打出周围物品的牌时将其消耗并获得1能量,item,energy,1,none,[self;burnForEnergy;1],,
-whetstone,磨刀石,周围物品的牌【攻击】+3直到打出,item,energy,1,none,[self;attackBuffUntilPlay;3],,
-blacksmithHammer,铁匠锤,从牌堆/弃牌堆选择一张牌随机变为一张周围物品的牌,item,energy,1,none,[self;transformRandom;1],,
-wound,伤口,无效果占用手牌和牌堆,status,none,0,none,,,
-venom,蛇毒,弃掉时受到3点伤害,status,none,0,none,,,[self;attack;3]
-curse,诅咒,受攻击时物品攻击-1直到弃掉一张该物品的牌,status,none,0,none,,[self;curse;1],
-static,静电,在手里时受电击伤害+1,status,none,0,none,,[self;static;1],
-fatigue,疲劳,占用手牌,status,none,0,none,,,
-vultureEye,秃鹫之眼,抓到时获得3层暴露,status,none,0,none,,[self;expose;3],
+id,name,desc,type,costType,costCount,targetType,effects
+string,string,string,'item'|'status','energy'|'uses'|'none',int,'single'|'none',['onPlay'|'onDraw'|'onDiscard';'self'|'target'|'all'|'random';@effect;number][]
+sword,剑,【攻击2】【攻击2】,item,energy,1,single,[onPlay;target;attack;2];[onPlay;target;attack;2]
+greataxe,长斧,对全体【攻击5】,item,energy,2,none,[onPlay;all;attack;5]
+spear,长枪,【攻击2】【攻击2】【攻击2】,item,energy,1,single,[onPlay;target;attack;2];[onPlay;target;attack;2];[onPlay;target;attack;2]
+dagger,短刀,【攻击3】【攻击3】,item,energy,1,single,[onPlay;target;attack;3];[onPlay;target;attack;3]
+dart,飞镖,【攻击1】抓一张牌,item,energy,0,single,[onPlay;target;attack;1];[onPlay;self;draw;1]
+crossbow,十字弩,【攻击6】对同一目标打出其他十字弩,item,energy,2,single,[onPlay;target;attack;6];[onPlay;self;crossbow;0]
+shield,盾,【防御3】,item,energy,1,none,[onPlay;self;defend;3]
+hat,斗笠,【防御8】,item,energy,2,none,[onPlay;self;defend;8]
+cape,披风,【防御2】下回合【防御2】,item,energy,1,none,[onPlay;self;defend;2];[onPlay;self;defendNext;2]
+bracer,护腕,【防御1】抓1张牌,item,energy,0,none,[onPlay;self;defend;1];[onPlay;self;draw;1]
+greatshield,大盾,【防御5】,item,energy,1,none,[onPlay;self;defend;5]
+chainmail,锁子甲,本回合受到伤害-3,item,energy,1,none,[onPlay;self;damageReduce;3]
+bandage,绷带,从牌堆或弃牌堆随机移除1张伤口,item,uses,3,none,[onPlay;self;removeWound;1]
+poisonPotion,淬毒药剂,周围物品的【攻击】+2,item,uses,3,none,[onPlay;self;attackBuff;2]
+fortifyPotion,强固药剂,周围物品的【防御】+2,item,uses,3,none,[onPlay;self;defendBuff;2]
+vitalityPotion,活力药剂,获得1点能量,item,uses,3,none,[onPlay;self;gainEnergy;1]
+focusPotion,集中药剂,抓2张牌,item,uses,3,none,[onPlay;self;draw;2]
+healingPotion,治疗药剂,从牌堆或弃牌堆移除3张伤口,item,uses,3,none,[onPlay;self;removeWound;3]
+waterBag,水袋,下回合开始时获得1能量抓2张牌,item,energy,1,none,[onPlay;self;energyNext;1];[onPlay;self;drawNext;2]
+rope,绳索,周围物品的牌【防御】+2直到打出,item,energy,1,none,[onPlay;self;defendBuffUntilPlay;2]
+belt,腰带,从牌堆周围物品的牌当中选择一张加入手牌,item,energy,0,none,[onPlay;self;drawChoice;1]
+torch,火把,下次打出周围物品的牌时将其消耗并获得1能量,item,energy,1,none,[onPlay;self;burnForEnergy;1]
+whetstone,磨刀石,周围物品的牌【攻击】+3直到打出,item,energy,1,none,[onPlay;self;attackBuffUntilPlay;3]
+blacksmithHammer,铁匠锤,从牌堆/弃牌堆选择一张牌随机变为一张周围物品的牌,item,energy,1,none,[onPlay;self;transformRandom;1]
+wound,伤口,无效果占用手牌和牌堆,status,none,0,none,
+venom,蛇毒,弃掉时受到3点伤害,status,none,0,none,[onDiscard;self;attack;3]
+curse,诅咒,受攻击时物品攻击-1直到弃掉一张该物品的牌,status,none,0,none,[onDraw;self;curse;1]
+static,静电,在手里时受电击伤害+1,status,none,0,none,[onDraw;self;static;1]
+fatigue,疲劳,占用手牌,status,none,0,none,
+vultureEye,秃鹫之眼,抓到时获得3层暴露,status,none,0,none,[onDraw;self;expose;3]
diff --git a/src/samples/slay-the-spire-like/data/desert/effect.csv b/src/samples/slay-the-spire-like/data/desert/effect.csv
index 4611d55..3a373b1 100644
--- a/src/samples/slay-the-spire-like/data/desert/effect.csv
+++ b/src/samples/slay-the-spire-like/data/desert/effect.csv
@@ -15,7 +15,7 @@
 # itemUntilDiscard: 施加buff到周围物品，物品被弃掉后失效
 # itemPermanent: 施加buff到周围物品，持续整场冒险
 
-id, name, description, timing
+id, name, description, lifecycle
 string, string, string, 'instant'|'temporary'|'lingering'|'permanent'|'posture'|'card'|'cardDraw'|'cardHand'|'item'|'itemTemporary'|'itemUntilPlay'|'itemUntilDiscard'|'itemPermanent'
 attack, 攻击, 对对手造成伤害, instant
 defend, 防御, 抵消下次行动前受到的伤害, posture
diff --git a/src/samples/slay-the-spire-like/data/desert/encounter.csv b/src/samples/slay-the-spire-like/data/desert/encounter.csv
index 71c34e5..a126934 100644
--- a/src/samples/slay-the-spire-like/data/desert/encounter.csv
+++ b/src/samples/slay-the-spire-like/data/desert/encounter.csv
@@ -5,33 +5,33 @@
 # camp (2): consumable restock and heal
 # curio (8): random pickup of treasure or resources
 # enemies: array of [enemyId; hp; buffs[]]
-# TODO: add a column for id
-type,name,description,enemies,dialogue
-'minion'|'elite'|'event'|'shop'|'camp'|'curio',string,string,[@enemy; int; [effect: @effect;stacks: int]][],string
-minion,仙人掌怪,概念：防+强化。【尖刺X】：对攻击者造成X点伤害。,[仙人掌怪;20;[]];[仙人掌怪;20;[]],
-minion,蛇,概念：攻+强化。给玩家塞入蛇毒牌（1费：打出时移除此牌。弃掉时受到3点伤害）。,[蛇;14;[]];[蛇;14;[]],
-minion,木乃伊,概念：攻+防。【诅咒】：受攻击时物品【攻击】-1，直到弃掉一张该物品的牌。,[木乃伊;18;[]];[仙人掌怪;20;[]],
-minion,枪手,概念：单回高攻。【瞄准X】：造成双倍伤害。受伤时失去等量【瞄准】,[枪手;16;[]],
-minion,风卷草,概念：防+强化。【滚动X】：攻击时，每消耗10点【滚动】，造成等量伤害。,[风卷草;22;[]];[风卷草;22;[]],
-minion,秃鹫,概念：攻+防。若造成伤害，玩家获得秃鹫之眼（0费状态牌：打出时移除。抓到时获得3层暴露）。,[秃鹫;16;[]];[仙人掌怪;20;[]],
-minion,沙蝎,概念：攻+强化。【尾刺X】：姿态buff，攻击时，伤害提升X。,[沙蝎;14;[]];[蛇;14;[]],
-minion,幼沙虫,概念：防+强化。每回合第一次受伤时，玩家失去1点能量。,[幼沙虫;24;[]],
-minion,蜥蜴,概念：攻+防+逃跑。【脱皮】：若脱皮达到生命上限，则怪物逃跑，玩家不能获得战斗奖励。,[蜥蜴;20;[]];[蜥蜴;20;[]],
-minion,沙匪,概念：弱化玩家。【劫掠】：对玩家施加的延时debuff。回合开始时，随机弃掉一张手牌。,[沙匪;16;[]];[枪手;16;[]],
-elite,风暴之灵,【风暴X】：攻击时，玩家获得1张静电。受伤时失去等量【风暴】。（静电：在手里时受【电击】伤害+1）,[风暴之灵;44;[]],
-elite,骑马枪手,【冲锋X】：受到或造成的伤害翻倍并消耗等量的冲锋。,[骑马枪手;50;[]];[枪手;20;[]],
-elite,沙虫王,召唤幼体沙虫；每当玩家弃掉一张牌，恢复1生命。,[沙虫王;55;[]],
-elite,沙漠守卫,召唤木乃伊；会复活木乃伊2次。,[沙漠守卫;48;[]];[木乃伊;20;[]],
-shop,沙漠商人,商店：可以恢复生命、出售装备、附魔物品。,,
-shop,游牧商队,商队：出售稀有物品、移除牌组中一张牌。,,
-camp,绿洲篝火,篝火：可以恢复生命、补充药水使用次数、获得下次战斗Buff。,,
-camp,岩洞庇护所,篝火：可以恢复生命、升级一张牌。,,
-curio,沙中遗物,随机获得一件遗物或受到3点伤害。,,desert_relic_in_sand
-curio,枯井,投入1能量：可能获得药水或什么也没有。,,desert_dry_well
-curio,古代石碑,阅读碑文：获得随机Buff直到下次战斗结束。,,desert_ancient_stele
-curio,沙暴残骸,搜索残骸：随机获得一张物品牌或受到2点伤害。,,desert_storm_wreckage
-curio,蜃景宝箱,打开宝箱：50%获得宝藏，50%为蜃景什么也没有。,,desert_mirage_chest
-curio,埋藏陶罐,挖掘：获得随机资源（金币、药水或遗物碎片）。,,desert_buried_pot
-curio,风化雕像,献祭1生命：获得一件随机遗物。,,desert_weathered_statue
-curio,绿洲碎片,小型绿洲：恢复3生命并获得1张随机消耗品。,,desert_oasis_fragment
-event,海市蜃楼,随机遭遇：可能获得宝藏或遭遇陷阱，使用d6双阶段结构结算。,,desert_mirage_event
+
+id,type,name,description,enemies,dialogue
+string,'minion'|'elite'|'event'|'shop'|'camp'|'curio',string,string,[@enemy; int; [effect: @effect;stacks: int]][],string
+cactus_pair,minion,仙人掌怪,概念：防+强化。【尖刺X】：对攻击者造成X点伤害。,[仙人掌怪;20;[]];[仙人掌怪;20;[]],
+snake_pair,minion,蛇,概念：攻+强化。给玩家塞入蛇毒牌（1费：打出时移除此牌。弃掉时受到3点伤害）。,[蛇;14;[]];[蛇;14;[]],
+mummy_cactus,minion,木乃伊,概念：攻+防。【诅咒】：受攻击时物品【攻击】-1，直到弃掉一张该物品的牌。,[木乃伊;18;[]];[仙人掌怪;20;[]],
+gunslinger,minion,枪手,概念：单回高攻。【瞄准X】：造成双倍伤害。受伤时失去等量【瞄准】,[枪手;16;[]],
+tumbleweed_pair,minion,风卷草,概念：防+强化。【滚动X】：攻击时，每消耗10点【滚动】，造成等量伤害。,[风卷草;22;[]];[风卷草;22;[]],
+vulture_cactus,minion,秃鹫,概念：攻+防。若造成伤害，玩家获得秃鹫之眼（0费状态牌：打出时移除。抓到时获得3层暴露）。,[秃鹫;16;[]];[仙人掌怪;20;[]],
+scorpion_snake,minion,沙蝎,概念：攻+强化。【尾刺X】：姿态buff，攻击时，伤害提升X。,[沙蝎;14;[]];[蛇;14;[]],
+sandworm_larva,minion,幼沙虫,概念：防+强化。每回合第一次受伤时，玩家失去1点能量。,[幼沙虫;24;[]],
+lizard_pair,minion,蜥蜴,概念：攻+防+逃跑。【脱皮】：若脱皮达到生命上限，则怪物逃跑，玩家不能获得战斗奖励。,[蜥蜴;20;[]];[蜥蜴;20;[]],
+bandit_gunslinger,minion,沙匪,概念：弱化玩家。【劫掠】：对玩家施加的延时debuff。回合开始时，随机弃掉一张手牌。,[沙匪;16;[]];[枪手;16;[]],
+storm_spirit,elite,风暴之灵,【风暴X】：攻击时，玩家获得1张静电。受伤时失去等量【风暴】。（静电：在手里时受【电击】伤害+1）,[风暴之灵;44;[]],
+mounted_gunslinger,elite,骑马枪手,【冲锋X】：受到或造成的伤害翻倍并消耗等量的冲锋。,[骑马枪手;50;[]];[枪手;20;[]],
+sandworm_king,elite,沙虫王,召唤幼体沙虫；每当玩家弃掉一张牌，恢复1生命。,[沙虫王;55;[]],
+desert_guard,elite,沙漠守卫,召唤木乃伊；会复活木乃伊2次。,[沙漠守卫;48;[]];[木乃伊;20;[]],
+desert_merchant,shop,沙漠商人,商店：可以恢复生命、出售装备、附魔物品。,,
+nomad_caravan,shop,游牧商队,商队：出售稀有物品、移除牌组中一张牌。,,
+oasis_campfire,camp,绿洲篝火,篝火：可以恢复生命、补充药水使用次数、获得下次战斗Buff。,,
+cave_shelter,camp,岩洞庇护所,篝火：可以恢复生命、升级一张牌。,,
+desert_relic_in_sand,curio,沙中遗物,随机获得一件遗物或受到3点伤害。,,desert_relic_in_sand
+desert_dry_well,curio,枯井,投入1能量：可能获得药水或什么也没有。,,desert_dry_well
+desert_ancient_stele,curio,古代石碑,阅读碑文：获得随机Buff直到下次战斗结束。,,desert_ancient_stele
+desert_storm_wreckage,curio,沙暴残骸,搜索残骸：随机获得一张物品牌或受到2点伤害。,,desert_storm_wreckage
+desert_mirage_chest,curio,蜃景宝箱,打开宝箱：50%获得宝藏，50%为蜃景什么也没有。,,desert_mirage_chest
+desert_buried_pot,curio,埋藏陶罐,挖掘：获得随机资源（金币、药水或遗物碎片）。,,desert_buried_pot
+desert_weathered_statue,curio,风化雕像,献祭1生命：获得一件随机遗物。,,desert_weathered_statue
+desert_oasis_fragment,curio,绿洲碎片,小型绿洲：恢复3生命并获得1张随机消耗品。,,desert_oasis_fragment
+desert_mirage_event,event,海市蜃楼,随机遭遇：可能获得宝藏或遭遇陷阱，使用d6双阶段结构结算。,,desert_mirage_event
diff --git a/src/samples/slay-the-spire-like/data/desert/enemy.csv b/src/samples/slay-the-spire-like/data/desert/enemy.csv
index 05a616f..708d551 100644
--- a/src/samples/slay-the-spire-like/data/desert/enemy.csv
+++ b/src/samples/slay-the-spire-like/data/desert/enemy.csv
@@ -1,2 +1,16 @@
-# TODO fill with data from intent.csv
-id,name,description
\ No newline at end of file
+id,name,description
+string,string,string
+仙人掌怪,仙人掌怪,防+强化。【尖刺X】：对攻击者造成X点伤害。
+蛇,蛇,攻+强化。给玩家塞入蛇毒牌（1费：打出时移除此牌。弃掉时受到3点伤害）。
+木乃伊,木乃伊,攻+防。【诅咒】：受攻击时物品【攻击】-1，直到弃掉一张该物品的牌。
+枪手,枪手,单回高攻。【瞄准X】：造成双倍伤害。受伤时失去等量【瞄准】。
+风卷草,风卷草,防+强化。【滚动X】：攻击时，每消耗10点【滚动】，造成等量伤害。
+秃鹫,秃鹫,攻+防。若造成伤害，玩家获得秃鹫之眼（0费状态牌：打出时移除。抓到时获得3层暴露）。
+沙蝎,沙蝎,攻+强化。【尾刺X】：姿态buff，攻击时，伤害提升X。
+幼沙虫,幼沙虫,防+强化。每回合第一次受伤时，玩家失去1点能量。
+蜥蜴,蜥蜴,攻+防+逃跑。【脱皮】：若脱皮达到生命上限，则怪物逃跑，玩家不能获得战斗奖励。
+沙匪,沙匪,弱化玩家。【劫掠】：对玩家施加的延时debuff。回合开始时，随机弃掉一张手牌。
+风暴之灵,风暴之灵,【风暴X】：攻击时，玩家获得1张静电。受伤时失去等量【风暴】。（静电：在手里时受【电击】伤害+1）
+骑马枪手,骑马枪手,【冲锋X】：受到或造成的伤害翻倍并消耗等量的冲锋。
+沙虫王,沙虫王,召唤幼体沙虫；每当玩家弃掉一张牌，恢复1生命。
+沙漠守卫,沙漠守卫,召唤木乃伊；会复活木乃伊2次。
diff --git a/src/samples/slay-the-spire-like/data/desert/item.csv b/src/samples/slay-the-spire-like/data/desert/item.csv
index 3a1f367..fb0d51a 100644
--- a/src/samples/slay-the-spire-like/data/desert/item.csv
+++ b/src/samples/slay-the-spire-like/data/desert/item.csv
@@ -1,27 +1,26 @@
-# TODO: add id and description
-type,name,shape,card,price
-string,string,string,@card,int
-weapon,剑,oee,sword,50
-weapon,长斧,oees,greataxe,80
-weapon,长枪,oeee,spear,75
-weapon,短刀,oe,dagger,40
-weapon,飞镖,o,dart,30
-weapon,十字弩,onrersrw,crossbow,120
-armor,盾,oesw,shield,50
-armor,斗笠,oerwrn,hat,90
-armor,披风,oers,cape,45
-armor,护腕,o,bracer,25
-armor,大盾,oesswn,greatshield,70
-armor,锁子甲,oesw,chainmail,60
-consumable,绷带,o,bandage,20
-consumable,淬毒药剂,o,poisonPotion,30
-consumable,强固药剂,o,fortifyPotion,30
-consumable,活力药剂,o,vitalityPotion,25
-consumable,集中药剂,o,focusPotion,25
-consumable,治疗药剂,o,healingPotion,35
-tool,水袋,os,waterBag,35
-tool,绳索,ose,rope,30
-tool,腰带,owre,belt,40
-tool,火把,on,torch,25
-tool,磨刀石,o,whetstone,30
-tool,铁匠锤,oerwrs,blacksmithHammer,45
+id,type,name,shape,card,price,description
+string,string,string,string,@card,int,string
+sword,weapon,剑,oee,sword,50,【攻击2】【攻击2】
+greataxe,weapon,长斧,oees,greataxe,80,对全体【攻击5】
+spear,weapon,长枪,oeee,spear,75,【攻击2】【攻击2】【攻击2】
+dagger,weapon,短刀,oe,dagger,40,【攻击3】【攻击3】
+dart,weapon,飞镖,o,dart,30,【攻击1】抓一张牌
+crossbow,weapon,十字弩,onrersrw,crossbow,120,【攻击6】对同一目标打出其他十字弩
+shield,armor,盾,oesw,shield,50,【防御3】
+hat,armor,斗笠,oerwrn,hat,90,【防御8】
+cape,armor,披风,oers,cape,45,【防御2】下回合【防御2】
+bracer,armor,护腕,o,bracer,25,【防御1】抓1张牌
+greatshield,armor,大盾,oesswn,greatshield,70,【防御5】
+chainmail,armor,锁子甲,oesw,chainmail,60,本回合受到伤害-3
+bandage,consumable,绷带,o,bandage,20,从牌堆或弃牌堆随机移除1张伤口
+poisonPotion,consumable,淬毒药剂,o,poisonPotion,30,周围物品的【攻击】+2
+fortifyPotion,consumable,强固药剂,o,fortifyPotion,30,周围物品的【防御】+2
+vitalityPotion,consumable,活力药剂,o,vitalityPotion,25,获得1点能量
+focusPotion,consumable,集中药剂,o,focusPotion,25,抓2张牌
+healingPotion,consumable,治疗药剂,o,healingPotion,35,从牌堆或弃牌堆移除3张伤口
+waterBag,tool,水袋,os,waterBag,35,下回合开始时获得1能量抓2张牌
+rope,tool,绳索,ose,rope,30,周围物品的牌【防御】+2直到打出
+belt,tool,腰带,owre,belt,40,从牌堆周围物品的牌当中选择一张加入手牌
+torch,tool,火把,on,torch,25,下次打出周围物品的牌时将其消耗并获得1能量
+whetstone,tool,磨刀石,o,whetstone,30,周围物品的牌【攻击】+3直到打出
+blacksmithHammer,tool,铁匠锤,oerwrs,blacksmithHammer,45,从牌堆/弃牌堆选择一张牌随机变为一张周围物品的牌