Skip to content

Commit

Permalink
random fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@jagt
jagt committed Sep 12, 2013
1 parent 3b485bd commit b4f9dc2
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 17 deletions.
4 changes: 2 additions & 2 deletions brogue/Globals.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1499,7 +1499,7 @@ const monsterWords monsterText[NUMBER_MONSTER_KINDS] = {
{"这种罕见的飞鱼里面充满了一种奇特的气体，释放出来的话能将附近的地板融化。",
"正在看着", "在看着",
{"撞击了", {0}},
"突然炸开了，附近的地板正开始随之消失！bursts, causing the floor underneath $HIMHER to disappear!"},
"突然炸开了，附近的地板正开始随之消失！"},
{"一种肮脏的类猴生物。它们形成了部落，总是一堆一起行动。",
"吼着", "正在叫唤",
{"猛击", "挥砍", "刺到了", {0}}},
Expand Down Expand Up @@ -1580,7 +1580,7 @@ const monsterWords monsterText[NUMBER_MONSTER_KINDS] = {
{"地底精灵牧师身上带满了法器，以至于走路的时候都会叮当作响。",
"跪拜着", "正在祈祷",
{"砍到了", "切到了", {0}}},
{"地底精灵战斗法师血红色的眼睛里透出的都是愤怒，其手臂都被一团神秘的火焰包裹着。The dar battlemage's eyes glow an angry shade of red, and $HISHER hands radiate an occult heat.",
{"地底精灵战斗法师血红色的眼睛里透出的都是愤怒，其手臂都被一团神秘的火焰包裹着。",
"正在炼制着", "正在炼金",
{"砍到了", {0}}},
{"这种酸性的史莱姆虽然看起来弱小但可能是冒险者最讨厌见到的敌人之一。他们会腐蚀任何碰到它的武器和防具，让人非常头疼。",
Expand Down
6 changes: 3 additions & 3 deletions brogue/IO.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ short actionMenu(short x, short y, boolean playingBack) {
buttons[buttonCount].hotkey[1] = UP_ARROW;
buttons[buttonCount].hotkey[2] = NUMPAD_8;
buttonCount++;
sprintf(buttons[buttonCount].text, " %sj:%s减速播放", yellowColorEscape, whiteColorEscape);
sprintf(buttons[buttonCount].text, "%sj:%s减速播放", yellowColorEscape, whiteColorEscape);
buttons[buttonCount].hotkey[0] = DOWN_KEY;
buttons[buttonCount].hotkey[1] = DOWN_ARROW;
buttons[buttonCount].hotkey[2] = NUMPAD_2;
Expand Down Expand Up @@ -2785,7 +2785,7 @@ void refreshSideBar(short focusX, short focusY, boolean focusedEntityMustGoFirst
io_state.sidebar_context, 0, printY++, " -- 回放中 -- ");

if (rogue.howManyTurns > 0) {
sprintf(buf, "Turn %li/%li", rogue.playerTurnNumber, rogue.howManyTurns);
sprintf(buf, "回合 %li/%li", rogue.playerTurnNumber, rogue.howManyTurns);
printProgressBar(0, printY++, buf, rogue.playerTurnNumber, rogue.howManyTurns, &darkPurple, false);
}
if (rogue.playbackOOS) {
Expand Down Expand Up @@ -3502,7 +3502,7 @@ short printMonsterInfo(creature *monst, short y, boolean dim, boolean highlight)
const char statusStrings[NUMBER_OF_STATUS_EFFECTS][COLS*3] = {
"虚弱: -",
"心灵感应",
"幻视",
"幻觉",
"悬浮",
"减速",
"加速",
Expand Down
2 changes: 1 addition & 1 deletion brogue/Items.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1335,12 +1335,12 @@ void itemName(item *theItem, char *root, boolean includeDetails, boolean include
case CHARM:
strcat(article, "件"); break;
case GOLD:
case FOOD:
strcat(article, "个"); break;
case KEY:
strcat(article, "把"); break;
case AMULET:
case ARMOR:
case FOOD:
default:
// pass
break;
Expand Down
6 changes: 4 additions & 2 deletions brogue/Monsters.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,10 @@ void monsterName(char *buf, creature *monst, boolean includeArticle) {
if (player.status[STATUS_HALLUCINATING] && !rogue.playbackOmniscience) {

assureCosmeticRNG;
sprintf(buf, "%s%s", (includeArticle ? "这个" : ""),
monsterCatalog[rand_range(1, NUMBER_MONSTER_KINDS - 1)].monsterName);
// article seems meaningless in chs
sprintf(buf, "%s", monsterCatalog[rand_range(1, NUMBER_MONSTER_KINDS - 1)].monsterName);
// sprintf(buf, "%s%s", (includeArticle ? "这个" : ""),
// monsterCatalog[rand_range(1, NUMBER_MONSTER_KINDS - 1)].monsterName);
restoreRNG;

return;
Expand Down
17 changes: 8 additions & 9 deletions brogue/Movement.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ void describeLocation(char *buf, short x, short y) {
if (cellHasTerrainFlag(x, y, T_OBSTRUCTS_PASSABILITY)) {
strcat(verb, "被关在");
} else {
strcat(verb, subjectMoving ? "漂浮在" : "被放在");
strcat(verb, subjectMoving ? "漂浮在" : "摆放在");
}
strcpy(preposition, standsInTerrain ? (subjectMoving ? "里" : "上")
: (subjectMoving ? "间" : "上"));
Expand Down Expand Up @@ -732,14 +732,14 @@ void applyInstantTileEffectsToCreature(creature *monst) {
monsterName(buf, monst, true);
if (inflictDamage(monst, damage, &yellow)) {
// if killed
sprintf(buf2, "%s dies in %s.", buf,
sprintf(buf2, "%s死在了%s里。", buf,
tileCatalog[pmap[*x][*y].layers[layerWithFlag(*x, *y, T_CAUSES_EXPLOSIVE_DAMAGE)]].description);
messageWithColor(buf2, messageColorFromVictim(monst), false);
refreshDungeonCell(*x, *y);
return;
} else {
// if survived
sprintf(buf2, "%s engulfs %s.",
sprintf(buf2, "%s被%s吞没了。",
tileCatalog[pmap[*x][*y].layers[layerWithFlag(*x, *y, T_CAUSES_EXPLOSIVE_DAMAGE)]].description, buf);
messageWithColor(buf2, messageColorFromVictim(monst), false);
}
Expand All @@ -754,7 +754,7 @@ void applyInstantTileEffectsToCreature(creature *monst) {
&& (rogue.armor->flags & ITEM_RUNIC)
&& rogue.armor->enchant2 == A_RESPIRATION) {
if (!(rogue.armor->flags & ITEM_RUNIC_IDENTIFIED)) {
message("Your armor trembles and a pocket of clean air swirls around you.", false);
message("你的护甲突然震动了一下，你感觉身体周围有一股清新空气围绕着你。", false);
autoIdentify(rogue.armor);
}
} else {
Expand All @@ -772,8 +772,7 @@ void applyInstantTileEffectsToCreature(creature *monst) {
}
flashMonster(monst, &brown, 100);
monsterName(buf, monst, true);
sprintf(buf2, "%s choke%s and gag%s on the stench of rot.", buf,
(monst == &player ? "": "s"), (monst == &player ? "": "s"));
sprintf(buf2, "%s被恶心的味道呛到不行。", buf);
message(buf2, false);
}
monst->status[STATUS_NAUSEOUS] = monst->maxStatus[STATUS_NAUSEOUS] = max(monst->status[STATUS_NAUSEOUS], 20);
Expand All @@ -790,7 +789,7 @@ void applyInstantTileEffectsToCreature(creature *monst) {
}
flashMonster(monst, &confusionGasColor, 100);
monsterName(buf, monst, true);
sprintf(buf2, "%s %s very confused!", buf, (monst == &player ? "feel": "looks"));
sprintf(buf2, "%s%s非常的困惑！", buf, (monst == &player ? "感觉": "看起来"));
message(buf2, false);
}
monst->status[STATUS_CONFUSED] = monst->maxStatus[STATUS_CONFUSED] = max(monst->status[STATUS_CONFUSED], 25);
Expand All @@ -801,7 +800,7 @@ void applyInstantTileEffectsToCreature(creature *monst) {
if (canDirectlySeeMonster(monst) && !monst->status[STATUS_PARALYZED]) {
flashMonster(monst, &pink, 100);
monsterName(buf, monst, true);
sprintf(buf2, "%s %s paralyzed!", buf, (monst == &player ? "are": "is"));
sprintf(buf2, "%s被麻痹了！", buf);
message(buf2, (monst == &player));
}
monst->status[STATUS_PARALYZED] = monst->maxStatus[STATUS_PARALYZED] = max(monst->status[STATUS_PARALYZED], 20);
Expand All @@ -822,7 +821,7 @@ void applyInstantTileEffectsToCreature(creature *monst) {
}
flashMonster(monst, &green, 100);
monsterName(buf, monst, true);
sprintf(buf2, "the lichen's grasping tendrils poison %s.", buf);
sprintf(buf2, "苔藓的触须使%s中毒了。", buf);
messageWithColor(buf2, messageColorFromVictim(monst), false);
}
monst->status[STATUS_POISONED] = max(monst->status[STATUS_POISONED], 10);
Expand Down

0 comments on commit b4f9dc2

Please sign in to comment.