From ce4dfd02633cfb1fa82b603f3d7af1a89a0fcb97 Mon Sep 17 00:00:00 2001 From: Michael Levin Date: Sat, 3 Oct 2009 11:21:01 +0000 Subject: * Started updating infopanes with Badger, need to do more * Fixed a bug where regular Basilisk would not heal faster by a booster sometimes (found thanks to new GUI indicator!) * Un-reverted Lucifer Cannon sound heard by others, with Norf's blessing * Added a Help menu listing mod changes and other stuff (ESC -> Help), edit ui/help.txt * Human HUD item list will now wrap around so that it never hides items, also made it a little wider GUI cross changes: * Human GUI health cross glows when medkit is active * Alien GUI health cross glows when on creep * Double, triple healing rates show as multiple crosses --- ui/help.txt | 101 ++++++++++++++++++++++++++++++++++++++++ ui/ingame.menu | 30 ++++++++++-- ui/ingame.txt | 2 +- ui/menudef.h | 5 ++ ui/tremulous_alien_common_hud.h | 30 +++++++++++- ui/tremulous_human_hud.menu | 30 +++++++++++- 6 files changed, 188 insertions(+), 10 deletions(-) create mode 100644 ui/help.txt (limited to 'ui') diff --git a/ui/help.txt b/ui/help.txt new file mode 100644 index 00000000..02a40cf9 --- /dev/null +++ b/ui/help.txt @@ -0,0 +1,101 @@ +{ + "Welcome to MGDev!" + { + "This mod is under ongoing development. It is probably buggy and new " + "features will come and go, please be patient and report any bugs you " + "find!\n\n" + "Please visit the Mercenaries Guild at:\n" + "http://www.mercenariesguild.net/\n\n" + "We can also be reached on Freenode IRC:\n" + "#mercenariesguild" + } + "Release Notes r86" + { + "* Help menu (you're looking at it!)\n" + "* UI health cross icon shows regen speed\n" + "* Human UI health cross glows from medkit\n" + "* Human item list wider and won't hide items\n" + "* Regular Basilik benefits from booster\n" + "* Lucifer Cannon overcharge heard by others\n" + } + "Alien Healing" + { + "The most important change for Alien players to know is that their healing " + "rate is slower away from creep. To counter this, healing near Boosters " + "and Basilisks is greatly accelerated. Watch the health cross icon on your " + "HUD to see what your healing rate is. If the icon glows, you are on " + "creep. If you are near a booster or basilisk, you will see multiple " + "crosses." + } + "Barricades" + { + "Nearly useless in 1.1, Barricades now have more health, are cheaper to " + "build, and will shrink to allow Aliens to pass through them. Acid tubes " + "will fire from behind barricades, providing a formidable defense. " + "Experiment with blocking off hallways and building staged defenses, but " + "keep in mind that low ceilings will prevent Tyrants from returning inside " + "the base." + } + "Anti-Camping" + { + "Aliens will no longer be as frustrated by camping Human players because " + "the Adv. Dragoon is now available at Stage 2. The Adv. " + "Dragoon snipe attack has slight splash damage. Also, because Human turrets " + "have a slight spinup delay, skillful Dretches can run inside the Human " + "base and get a few kills before being shot by turrets." + } + "Tyrant" + { + "The Tyrant is now a weaker class as its health has been lowered and " + "turret damage is greater. To counter this, Tyrants can charge for longer " + "periods of time and can crush any Humans they land on top of. Remember " + "that because trample takes longer to charge, you need to let go early " + "for a quick charge. The Tyrant's healing aura has been removed, find a " + "booster or a basilisk to heal faster." + } + "Sprint / Dodge" + { + "Human players will find their old binds for sprinting will no longer " + "work. Sprinting has been merged with a new Human ability, dodging. You " + "can bind a key for Sprint and Dodge via the Options menu or bind a " + "key (\\bind shift +button6). When you are strafing or walking backwards, " + "press the dodge key to make a quick sideways jump. When running forward, " + "press the dodge key to start a sprint. The sprint will last until you let " + "go of the forward key." + } + "Human Weapons" + { + "The Lucifer Cannon projectile can be fired faster but now takes longer " + "to charge. You will be able to hear other players overcharge " + "their Lucifer Cannon.\n\n" + "The Mass Driver can now fire through players and buildables. The same " + "amount of damage is dealt to all targets along the path. Keep in mind " + "that you cannot shoot through friendly targets if friendly fire is off." + } + "Human Buildables" + { + "While turrets now have a small spin up delay before firing, they have " + "increased damage output. To protect against small Aliens getting inside " + "the base, build Tesla Generators at Stage 3. Tesla Generators no longer " + "require the Defense Computer to function. Instead, the Defense Computer " + "will automatically repair Human buildables." + } + "Lag Correction" + { + "While the Tremulous implementation of Neil Toronto's unlagged is " + "becoming widely accepted, MGDev also implements client-side improvements " + "not possible in 1.1 servers. Because attacking is more " + "accurate on account of lag correction, Humans no longer need to lead " + "their weapons and Alien ranges and attack widths have generally been " + "decreased." + } + "Credits" + { + "MGDev is developed and hosted by the Mercenaries Guild. " + "Contributing developers:\n\n" + "Norfenstein\n" + "Benmachine\n" + "Lakitu7\n" + "Michael Levin " + } +} diff --git a/ui/ingame.menu b/ui/ingame.menu index 90b4cf12..2c8981fa 100644 --- a/ui/ingame.menu +++ b/ui/ingame.menu @@ -1,9 +1,9 @@ #include "ui/menudef.h" { -#define BUTT_BAR_X 35 +#define BUTT_BAR_X 50 #define BUTT_BAR_Y 0 -#define BUTT_BAR_W 235 +#define BUTT_BAR_W 150 #define BUTT_BAR_H 56 #define BUTT_W (BUTT_BAR_W/3) #define BUTT_H BUTT_BAR_H @@ -68,7 +68,7 @@ rect BUTT_BAR_X BUTT_BAR_Y BUTT_W BUTT_H type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - textalign ALIGN_RIGHT + textalign ALIGN_CENTER textvalign VALIGN_CENTER textalignx -BUTT_TEXT_S textscale .4 @@ -103,11 +103,31 @@ itemDef { name leave - text "Exit" + text "Help" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY rect (BUTT_BAR_X+(2*BUTT_W)) BUTT_BAR_Y BUTT_W BUTT_H - textalign ALIGN_LEFT + textalign ALIGN_CENTER + textvalign VALIGN_CENTER + textalignx BUTT_TEXT_S + textscale .4 + forecolor 1 1 1 1 + visible MENU_TRUE + action + { + play "sound/misc/menu1.wav"; + open ingame_help + } + } + + itemDef + { + name leave + text "Exit" + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect (BUTT_BAR_X+(3*BUTT_W)) BUTT_BAR_Y BUTT_W BUTT_H + textalign ALIGN_CENTER textvalign VALIGN_CENTER textalignx BUTT_TEXT_S textscale .4 diff --git a/ui/ingame.txt b/ui/ingame.txt index a71be329..2caf449f 100644 --- a/ui/ingame.txt +++ b/ui/ingame.txt @@ -5,5 +5,5 @@ loadMenu { "ui/ingame_game.menu" } loadMenu { "ui/ingame_options.menu" } loadMenu { "ui/ingame_leave.menu" } - loadMenu { "ui/fonttest.menu" } + loadMenu { "ui/ingame_help.menu" } } diff --git a/ui/menudef.h b/ui/menudef.h index c85cb430..99adf158 100644 --- a/ui/menudef.h +++ b/ui/menudef.h @@ -79,6 +79,7 @@ #define FEEDER_TREMALIENBUILD 18 // alien buildables #define FEEDER_TREMHUMANBUILD 19 // human buildables #define FEEDER_IGNORE_LIST 20 // ignored players +#define FEEDER_HELP_LIST 21 // help topics // display flags #define UI_SHOW_FAVORITESERVERS 0x00000001 @@ -171,5 +172,9 @@ #define UI_HSELLINFOPANE 72 #define UI_ABUILDINFOPANE 73 #define UI_HBUILDINFOPANE 74 +#define UI_HELPINFOPANE 75 + +#define CG_PLAYER_HEALTH_CROSS2 76 +#define CG_PLAYER_HEALTH_CROSS3 77 #endif diff --git a/ui/tremulous_alien_common_hud.h b/ui/tremulous_alien_common_hud.h index 321c00f0..e092ecf9 100644 --- a/ui/tremulous_alien_common_hud.h +++ b/ui/tremulous_alien_common_hud.h @@ -92,13 +92,39 @@ itemDef itemDef { name "cross" - rect 155 422.5 15 15 + rect 152.5 420.5 20 20 aspectBias ALIGN_LEFT visible MENU_TRUE decoration forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5 - style WINDOW_STYLE_SHADER background "ui/assets/neutral/cross.tga" + ownerdraw CG_PLAYER_HEALTH_CROSS +} + +//CROSS 2X +itemDef +{ + name "cross" + rect 152.5 420.5 20 20 + aspectBias ALIGN_LEFT + visible MENU_TRUE + decoration + forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5 + background "ui/assets/neutral/cross2.tga" + ownerdraw CG_PLAYER_HEALTH_CROSS2 +} + +//CROSS 3X +itemDef +{ + name "cross" + rect 152.5 420.5 20 20 + aspectBias ALIGN_LEFT + visible MENU_TRUE + decoration + forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5 + background "ui/assets/neutral/cross3.tga" + ownerdraw CG_PLAYER_HEALTH_CROSS3 } //LEFT RING diff --git a/ui/tremulous_human_hud.menu b/ui/tremulous_human_hud.menu index 3d527608..5727aaf5 100644 --- a/ui/tremulous_human_hud.menu +++ b/ui/tremulous_human_hud.menu @@ -121,7 +121,7 @@ itemDef { name "cross" - rect 137.5 430 15 15 + rect 135 427.5 20 20 aspectBias ALIGN_LEFT visible MENU_TRUE decoration @@ -130,6 +130,32 @@ ownerdraw CG_PLAYER_HEALTH_CROSS } + //CROSS 2X + itemDef + { + name "cross" + rect 135 427.5 20 20 + aspectBias ALIGN_LEFT + visible MENU_TRUE + decoration + forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5 + background "ui/assets/neutral/cross2.tga" + ownerdraw CG_PLAYER_HEALTH_CROSS2 + } + + //CROSS 3X + itemDef + { + name "cross" + rect 135 427.5 20 20 + aspectBias ALIGN_LEFT + visible MENU_TRUE + decoration + forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5 + background "ui/assets/neutral/cross3.tga" + ownerdraw CG_PLAYER_HEALTH_CROSS3 + } + //STAMINA 1 itemDef { @@ -311,7 +337,7 @@ itemDef { name "inventory" - rect 232.5 425 175 25 + rect 182.5 425 275 25 aspectBias ALIGN_CENTER visible MENU_TRUE decoration -- cgit