- made the colorset names and the texts in the color picker localizable.

# Conflicts:
#	wadsrc/static/language.csv
This commit is contained in:
Christoph Oelckers 2019-05-19 18:56:59 +02:00 committed by drfrag
parent f31e0bcd85
commit 38fd06656d
8 changed files with 62 additions and 63 deletions

View file

@ -19,14 +19,14 @@ class ChexPlayer : DoomPlayer
player.WeaponSlot 6, "PhasingZorcher";
player.WeaponSlot 7, "LAZDevice";
Player.Colorset 0, "Light Blue", 0xC0, 0xCF, 0xC2;
Player.Colorset 1, "Green", 0x70, 0x7F, 0x72;
Player.Colorset 2, "Gray", 0x60, 0x6F, 0x62;
Player.Colorset 3, "Brown", 0x40, 0x4F, 0x42;
Player.Colorset 4, "Red", 0x20, 0x2F, 0x22;
Player.Colorset 5, "Light Gray", 0x58, 0x67, 0x5A;
Player.Colorset 6, "Light Brown", 0x38, 0x47, 0x3A;
Player.Colorset 7, "Light Red", 0xB0, 0xBF, 0xB2;
Player.Colorset 0, "$TXT_COLOR_LIGHTBLUE", 0xC0, 0xCF, 0xC2;
Player.Colorset 1, "$TXT_COLOR_GREEN", 0x70, 0x7F, 0x72;
Player.Colorset 2, "$TXT_COLOR_GRAY", 0x60, 0x6F, 0x62;
Player.Colorset 3, "$TXT_COLOR_BROWN", 0x40, 0x4F, 0x42;
Player.Colorset 4, "$TXT_COLOR_RED", 0x20, 0x2F, 0x22;
Player.Colorset 5, "$TXT_COLOR_LIGHTGRAY", 0x58, 0x67, 0x5A;
Player.Colorset 6, "$TXT_COLOR_LIGHTBROWN", 0x38, 0x47, 0x3A;
Player.Colorset 7, "$TXT_COLOR_LIGHTRED", 0xB0, 0xBF, 0xB2;
}
}

View file

@ -27,15 +27,15 @@ class DoomPlayer : PlayerPawn
Player.WeaponSlot 7, "BFG9000";
Player.ColorRange 112, 127;
Player.Colorset 0, "Green", 0x70, 0x7F, 0x72;
Player.Colorset 1, "Gray", 0x60, 0x6F, 0x62;
Player.Colorset 2, "Brown", 0x40, 0x4F, 0x42;
Player.Colorset 3, "Red", 0x20, 0x2F, 0x22;
Player.Colorset 0, "$TXT_COLOR_GREEN", 0x70, 0x7F, 0x72;
Player.Colorset 1, "$TXT_COLOR_GRAY", 0x60, 0x6F, 0x62;
Player.Colorset 2, "$TXT_COLOR_BROWN", 0x40, 0x4F, 0x42;
Player.Colorset 3, "$TXT_COLOR_RED", 0x20, 0x2F, 0x22;
// Doom Legacy additions
Player.Colorset 4, "Light Gray", 0x58, 0x67, 0x5A;
Player.Colorset 5, "Light Brown", 0x38, 0x47, 0x3A;
Player.Colorset 6, "Light Red", 0xB0, 0xBF, 0xB2;
Player.Colorset 7, "Light Blue", 0xC0, 0xCF, 0xC2;
Player.Colorset 4, "$TXT_COLOR_LIGHTGRAY", 0x58, 0x67, 0x5A;
Player.Colorset 5, "$TXT_COLOR_LIGHTBROWN", 0x38, 0x47, 0x3A;
Player.Colorset 6, "$TXT_COLOR_LIGHTRED", 0xB0, 0xBF, 0xB2;
Player.Colorset 7, "$TXT_COLOR_LIGHTBLUE", 0xC0, 0xCF, 0xC2;
}
States

View file

@ -21,17 +21,17 @@ class HereticPlayer : PlayerPawn
Player.WeaponSlot 7, "Mace";
Player.ColorRange 225, 240;
Player.Colorset 0, "Green", 225, 240, 238;
Player.Colorset 1, "Yellow", 114, 129, 127;
Player.Colorset 2, "Red", 145, 160, 158;
Player.Colorset 3, "Blue", 190, 205, 203;
Player.Colorset 0, "$TXT_COLOR_GREEN", 225, 240, 238;
Player.Colorset 1, "$TXT_COLOR_YELLOW", 114, 129, 127;
Player.Colorset 2, "$TXT_COLOR_RED", 145, 160, 158;
Player.Colorset 3, "$TXT_COLOR_BLUE", 190, 205, 203;
// Doom Legacy additions
Player.Colorset 4, "Brown", 67, 82, 80;
Player.Colorset 5, "Light Gray", 9, 24, 22;
Player.Colorset 6, "Light Brown", 74, 89, 87;
Player.Colorset 7, "Light Red", 150, 165, 163;
Player.Colorset 8, "Light Blue", 192, 207, 205;
Player.Colorset 9, "Beige", 95, 110, 108;
Player.Colorset 4, "$TXT_COLOR_BROWN", 67, 82, 80;
Player.Colorset 5, "$TXT_COLOR_LIGHTGRAY", 9, 24, 22;
Player.Colorset 6, "$TXT_COLOR_LIGHTBROWN", 74, 89, 87;
Player.Colorset 7, "$TXT_COLOR_LIGHTRED", 150, 165, 163;
Player.Colorset 8, "$TXT_COLOR_LIGHTBLUE", 192, 207, 205;
Player.Colorset 9, "$TXT_COLOR_BEIGE", 95, 110, 108;
}
States

View file

@ -33,14 +33,14 @@ class ClericPlayer : PlayerPawn
Player.FlechetteType "ArtiPoisonBag1";
Player.ColorRange 146, 163;
Player.Colorset 0, "Blue", 146, 163, 161;
Player.ColorsetFile 1, "Red", "TRANTBL7", 0xB3;
Player.ColorsetFile 2, "Gold", "TRANTBL8", 0x8C;
Player.ColorsetFile 3, "Dull Green", "TRANTBL9", 0x41;
Player.ColorsetFile 4, "Green", "TRANTBLA", 0xC9;
Player.ColorsetFile 5, "Gray", "TRANTBLB", 0x30;
Player.ColorsetFile 6, "Brown", "TRANTBLC", 0x72;
Player.ColorsetFile 7, "Purple", "TRANTBLD", 0xEE;
Player.Colorset 0, "$TXT_COLOR_BLUE", 146, 163, 161;
Player.ColorsetFile 1, "$TXT_COLOR_RED", "TRANTBL7", 0xB3;
Player.ColorsetFile 2, "$TXT_COLOR_GOLD", "TRANTBL8", 0x8C;
Player.ColorsetFile 3, "$TXT_COLOR_DULLGREEN", "TRANTBL9", 0x41;
Player.ColorsetFile 4, "$TXT_COLOR_GREEN", "TRANTBLA", 0xC9;
Player.ColorsetFile 5, "$TXT_COLOR_GRAY", "TRANTBLB", 0x30;
Player.ColorsetFile 6, "$TXT_COLOR_BROWN", "TRANTBLC", 0x72;
Player.ColorsetFile 7, "$TXT_COLOR_PURPLE", "TRANTBLD", 0xEE;
}
States

View file

@ -32,14 +32,14 @@ class FighterPlayer : PlayerPawn
Player.WeaponSlot 4, "FWeapQuietus";
Player.ColorRange 246, 254;
Player.Colorset 0, "Gold", 246, 254, 253;
Player.ColorsetFile 1, "Red", "TRANTBL0", 0xAC;
Player.ColorsetFile 2, "Blue", "TRANTBL1", 0x9D;
Player.ColorsetFile 3, "Dull Green", "TRANTBL2", 0x3E;
Player.ColorsetFile 4, "Green", "TRANTBL3", 0xC8;
Player.ColorsetFile 5, "Gray", "TRANTBL4", 0x2D;
Player.ColorsetFile 6, "Brown", "TRANTBL5", 0x6F;
Player.ColorsetFile 7, "Purple", "TRANTBL6", 0xEE;
Player.Colorset 0, "$TXT_COLOR_GOLD", 246, 254, 253;
Player.ColorsetFile 1, "$TXT_COLOR_RED", "TRANTBL0", 0xAC;
Player.ColorsetFile 2, "$TXT_COLOR_BLUE", "TRANTBL1", 0x9D;
Player.ColorsetFile 3, "$TXT_COLOR_DULLGREEN", "TRANTBL2", 0x3E;
Player.ColorsetFile 4, "$TXT_COLOR_GREEN", "TRANTBL3", 0xC8;
Player.ColorsetFile 5, "$TXT_COLOR_GRAY", "TRANTBL4", 0x2D;
Player.ColorsetFile 6, "$TXT_COLOR_BROWN", "TRANTBL5", 0x6F;
Player.ColorsetFile 7, "$TXT_COLOR_PURPLE", "TRANTBL6", 0xEE;
}
States

View file

@ -35,14 +35,14 @@ class MagePlayer : PlayerPawn
Player.FlechetteType "ArtiPoisonBag2";
Player.ColorRange 146, 163;
Player.Colorset 0, "Blue", 146, 163, 161;
Player.ColorsetFile 1, "Red", "TRANTBL7", 0xB3;
Player.ColorsetFile 2, "Gold", "TRANTBL8", 0x8C;
Player.ColorsetFile 3, "Dull Green", "TRANTBL9", 0x41;
Player.ColorsetFile 4, "Green", "TRANTBLA", 0xC9;
Player.ColorsetFile 5, "Gray", "TRANTBLB", 0x30;
Player.ColorsetFile 6, "Brown", "TRANTBLC", 0x72;
Player.ColorsetFile 7, "Purple", "TRANTBLD", 0xEE;
Player.Colorset 0, "$TXT_COLOR_BLUE", 146, 163, 161;
Player.ColorsetFile 1, "$TXT_COLOR_RED", "TRANTBL7", 0xB3;
Player.ColorsetFile 2, "$TXT_COLOR_GOLD", "TRANTBL8", 0x8C;
Player.ColorsetFile 3, "$TXT_COLOR_DULLGREEN", "TRANTBL9", 0x41;
Player.ColorsetFile 4, "$TXT_COLOR_GREEN", "TRANTBLA", 0xC9;
Player.ColorsetFile 5, "$TXT_COLOR_GRAY", "TRANTBLB", 0x30;
Player.ColorsetFile 6, "$TXT_COLOR_BROWN", "TRANTBLC", 0x72;
Player.ColorsetFile 7, "$TXT_COLOR_PURPLE", "TRANTBLD", 0xEE;
}
States

View file

@ -25,15 +25,14 @@ class StrifePlayer : PlayerPawn
Player.WeaponSlot 8, "Sigil";
Player.ColorRange 128, 143;
Player.Colorset 0, "Brown", 0x80, 0x8F, 0x82;
Player.Colorset 1, "Red", 0x40, 0x4F, 0x42, 0x20, 0x3F, 0x00, 0x1F, 0xF1, 0xF6, 0xE0, 0xE5, 0xF7, 0xFB, 0xF1, 0xF5;
Player.Colorset 2, "Rust", 0xB0, 0xBF, 0xB2, 0x20, 0x3F, 0x00, 0x1F;
Player.Colorset 3, "Gray", 0x10, 0x1F, 0x12, 0x20, 0x2F, 0xD0, 0xDF, 0x30, 0x3F, 0xD0, 0xDF;
Player.Colorset 4, "Dark Green", 0x30, 0x3F, 0x32, 0x20, 0x2F, 0xD0, 0xDF, 0x30, 0x3F, 0xD0, 0xDF;
Player.Colorset 5, "Gold", 0x50, 0x5F, 0x52, 0x20, 0x3F, 0x00, 0x1F, 0x50, 0x5F, 0x80, 0x8F, 0xC0, 0xCF, 0xA0, 0xAF, 0xD0, 0xDF, 0xB0, 0xBF;
Player.Colorset 6, "Bright Green", 0x60, 0x6F, 0x62, 0x20, 0x3F, 0x00, 0x1F, 0x50, 0x5F, 0x10, 0x1F, 0xC0, 0xCF, 0x20, 0x2F, 0xD0, 0xDF, 0x30, 0x3F;
Player.Colorset 7, "Blue", 0x90, 0x9F, 0x92, 0x20, 0x3F, 0x00, 0x1F, 0x50, 0x5F, 0x40, 0x4F, 0xC1, 0xCF, 0x01, 0x0F, 0xC0,0xC0,1,1, 0xD0, 0xDF, 0x10, 0x1F;
Player.Colorset 0, "$TXT_COLOR_BROWN", 0x80, 0x8F, 0x82;
Player.Colorset 1, "$TXT_COLOR_RED", 0x40, 0x4F, 0x42, 0x20, 0x3F, 0x00, 0x1F, 0xF1, 0xF6, 0xE0, 0xE5, 0xF7, 0xFB, 0xF1, 0xF5;
Player.Colorset 2, "$TXT_COLOR_RUST", 0xB0, 0xBF, 0xB2, 0x20, 0x3F, 0x00, 0x1F;
Player.Colorset 3, "$TXT_COLOR_GRAY", 0x10, 0x1F, 0x12, 0x20, 0x2F, 0xD0, 0xDF, 0x30, 0x3F, 0xD0, 0xDF;
Player.Colorset 4, "$TXT_COLOR_DARKGREEN", 0x30, 0x3F, 0x32, 0x20, 0x2F, 0xD0, 0xDF, 0x30, 0x3F, 0xD0, 0xDF;
Player.Colorset 5, "$TXT_COLOR_GOLD", 0x50, 0x5F, 0x52, 0x20, 0x3F, 0x00, 0x1F, 0x50, 0x5F, 0x80, 0x8F, 0xC0, 0xCF, 0xA0, 0xAF, 0xD0, 0xDF, 0xB0, 0xBF;
Player.Colorset 6, "$TXT_COLOR_BRIGHTGREEN",0x60, 0x6F, 0x62, 0x20, 0x3F, 0x00, 0x1F, 0x50, 0x5F, 0x10, 0x1F, 0xC0, 0xCF, 0x20, 0x2F, 0xD0, 0xDF, 0x30, 0x3F;
Player.Colorset 7, "$TXT_COLOR_BLUE", 0x90, 0x9F, 0x92, 0x20, 0x3F, 0x00, 0x1F, 0x50, 0x5F, 0x40, 0x4F, 0xC1, 0xCF, 0x01, 0x0F, 0xC0,0xC0,1,1, 0xD0, 0xDF, 0x10, 0x1F;
}
States

View file

@ -109,11 +109,11 @@ class ColorpickerMenu : OptionMenu
mDesc.mItems.Resize(mStartItem+8);
mDesc.mItems[mStartItem+0] = new ("OptionMenuItemStaticText").Init(name, false);
mDesc.mItems[mStartItem+1] = new ("OptionMenuItemStaticText").Init(" ", false);
mDesc.mItems[mStartItem+2] = new ("OptionMenuSliderVar").Init("Red", 0, 0, 255, 15, 0);
mDesc.mItems[mStartItem+3] = new ("OptionMenuSliderVar").Init("Green", 1, 0, 255, 15, 0);
mDesc.mItems[mStartItem+4] = new ("OptionMenuSliderVar").Init("Blue", 2, 0, 255, 15, 0);
mDesc.mItems[mStartItem+2] = new ("OptionMenuSliderVar").Init("$TXT_COLOR_RED", 0, 0, 255, 15, 0);
mDesc.mItems[mStartItem+3] = new ("OptionMenuSliderVar").Init("$TXT_COLOR_GREEN", 1, 0, 255, 15, 0);
mDesc.mItems[mStartItem+4] = new ("OptionMenuSliderVar").Init("$TXT_COLOR_BLUE", 2, 0, 255, 15, 0);
mDesc.mItems[mStartItem+5] = new ("OptionMenuItemStaticText").Init(" ", false);
mDesc.mItems[mStartItem+6] = new ("OptionMenuItemCommand").Init("Undo changes", "undocolorpic");
mDesc.mItems[mStartItem+6] = new ("OptionMenuItemCommand").Init("$TXT_UNDOCHANGES", "undocolorpic");
mDesc.mItems[mStartItem+7] = new ("OptionMenuItemStaticText").Init(" ", false);
mDesc.mSelectedItem = mStartItem + 2;
mDesc.mIndent = 0;