chore: port rest of magma block stuff
This commit is contained in:
@@ -1795,6 +1795,15 @@ void ClientConnection::handleChat(shared_ptr<ChatPacket> packet)
|
||||
replacePlayer = true;
|
||||
replaceEntitySource = true;
|
||||
break;
|
||||
case ChatPacket::e_ChatDeathHotFloor:
|
||||
message=app.GetString(IDS_DEATH_HOT_FLOOR);
|
||||
replacePlayer = true;
|
||||
break;
|
||||
case ChatPacket::e_ChatDeathHotFloorPlayer:
|
||||
message=app.GetString(IDS_DEATH_HOT_FLOOR_PLAYER);
|
||||
replacePlayer = true;
|
||||
replaceEntitySource = true;
|
||||
break;
|
||||
|
||||
|
||||
case ChatPacket::e_ChatDeathFellAccidentLadder:
|
||||
|
||||
@@ -170,7 +170,7 @@ void IUIScene_CreativeMenu::staticCtor()
|
||||
ITEM(Tile::red_nether_brick_Id)
|
||||
ITEM(Tile::end_stone_Id)
|
||||
ITEM(Tile::end_bricks_Id)
|
||||
ITEM(Tile::magma_Id)
|
||||
ITEM(Tile::magma_block_Id)
|
||||
ITEM(Tile::nether_wart_block_Id)
|
||||
ITEM(Tile::bone_block_Id)
|
||||
ITEM_AUX(Tile::quartz_block_Id,QuartzBlockTile::TYPE_CHISELED)
|
||||
|
||||
@@ -143,6 +143,10 @@ static std::wstring FormatDeathMessage(const shared_ptr<ChatPacket>& packet)
|
||||
message = app.GetString(IDS_DEATH_FELL_ASSIST_ITEM); replacePlayer = true; replaceEntitySource = true; replaceItem = true; break;
|
||||
case ChatPacket::e_ChatDeathFellFinishItem:
|
||||
message = app.GetString(IDS_DEATH_FELL_FINISH_ITEM); replacePlayer = true; replaceEntitySource = true; replaceItem = true; break;
|
||||
case ChatPacket::e_ChatDeathHotFloor:
|
||||
message = app.GetString(IDS_DEATH_HOT_FLOOR); replacePlayer = true; break;
|
||||
case ChatPacket::e_ChatDeathHotFloorPlayer:
|
||||
message = app.GetString(IDS_DEATH_HOT_FLOOR_PLAYER); replacePlayer = true; replaceEntitySource = true; break;
|
||||
default:
|
||||
message = app.GetString(IDS_DEATH_GENERIC); replacePlayer = true; break;
|
||||
}
|
||||
|
||||
@@ -6792,6 +6792,11 @@ Would you like to install the mash-up pack or texture pack now?</value>
|
||||
<value>{*PLAYER*} burned to death</value>
|
||||
</data>
|
||||
|
||||
<data name="IDS_DEATH_HOT_FLOOR">
|
||||
<value>{*PLAYER*} discovered the floor was lava</value>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="IDS_DEATH_LAVA">
|
||||
<value>{*PLAYER*} tried to swim in lava</value>
|
||||
</data>
|
||||
@@ -6904,6 +6909,10 @@ Would you like to install the mash-up pack or texture pack now?</value>
|
||||
<value>{*PLAYER*} was burnt to a crisp whilst fighting {*SOURCE*}</value>
|
||||
</data>
|
||||
|
||||
<data name="IDS_DEATH_HOT_FLOOR_PLAYER">
|
||||
<value>{*PLAYER*} walked into the danger zone due to {*SOURCE*}</value>
|
||||
</data>
|
||||
|
||||
<data name="IDS_DEATH_LAVA_PLAYER">
|
||||
<value>{*PLAYER*} tried to swim in lava to escape {*SOURCE*}</value>
|
||||
</data>
|
||||
|
||||
Reference in New Issue
Block a user