Merge branch 'Version-Beta-2'

SimonMossmyr · May 2, 2018 · cc23345 · cc23345
2 parents d1011c0 + a3f2ea9
commit cc23345
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -4,9 +4,9 @@ _Enfo's Team Survival: MTExtended Edition_ is a custom map for the game WarCraft
 
 _Enfo's Team Survival_ is a Hero-centered team survival inspired by an old multi-user dungeon called DragonRealms. Choose a Hero, defend against waves of monsters, and hold out longer than the enemy team. _MTExtended Edition_ is an open-sourced continuation of the abandoned _MT Edition_ by Pedro (mecatronic) and Bruno (Prytoluk). It picks up where the developers left off at version 1.93 released in 2011.
 
-## Instructions
+## Download and Play
 
-Download the latest release in the [Releases](https://github.com/SimonMossmyr/Enfo-MTE/releases) tab and put the `.w3x` file in your WarCraft III maps folder: `X:\Users\<user>\Documents\Warcraft III\Maps`. Start the game and play.
+Download the latest release in the [Releases](https://github.com/SimonMossmyr/Enfo-MTE/releases) tab and put the map (`Enfos_MTE_###.w3x`) in your WarCraft III maps folder: `X:\Users\<user>\Documents\Warcraft III\Maps`. Start the game and play.
 
 ## Further information
 

diff --git a/media/loadingscreen/LoadingScreen.mdx → media/LoadingScreen.mdx b/media/loadingscreen/LoadingScreen.mdx → media/LoadingScreen.mdx
diff --git a/media/loadingscreen/main.xcf → media/LoadingScreen.xcf b/media/loadingscreen/main.xcf → media/LoadingScreen.xcf
diff --git a/media/README.md b/media/README.md
@@ -1,10 +1,10 @@
 # Media
 
-Created with GNU Image Manipulation Program (GIMP). The custom loading screen and lobby preview images exist as XCF files in their respective directories. All images are 32 bit TGA format _without_ RLE compression.
+Created with GNU Image Manipulation Program (GIMP). The custom loading screen and lobby preview images exist as XCF files. All images are 32 bit TGA format _without_ RLE compression.
 
 ## Loading Screen
 
-Size 1024x768. Exists as four quadrants and a header(?) file when imported into the map. Full paths:
+Size 1024x768. Exists as four quadrants and a header(?) MDX file when imported into the map. Full paths:
 
 - `LoadingScreen.mdx`
 - `LoadingScreenBL.tga` (512x256)
@@ -18,5 +18,5 @@ Size 256x256. Exists with full path `war3mapPreview.tga` when imported into the
 
 ## Sources
 
-- Background image: _Panda vs. Tauren_ by Vincent Carre (Gen-X). Source no longer available, snapshot cached by Google can be found [here](http://webcache.googleusercontent.com/search?q=cache:3Kcu-IVZL1AJ:eu.battle.net/wow/en/media/fanart/%3Fview%3Dfanart-0106%26keywords%3Drace.panda+&cd=13&hl=sv&ct=clnk&gl=se). 
-- Font: [_LeagueGothic-Italic_](https://www.ffonts.net/LeagueGothic-Italic.font) by The League of Moveable Type.
+- Background image: _Panda vs. Tauren_ by Vincent Carre (Gen-X). Source no longer available. Snapshot cached by Google can be found [here](http://webcache.googleusercontent.com/search?q=cache:3Kcu-IVZL1AJ:eu.battle.net/wow/en/media/fanart/%3Fview%3Dfanart-0106%26keywords%3Drace.panda+&cd=13&hl=sv&ct=clnk&gl=se). 
+- Font: [_LeagueGothic-Italic_](https://www.ffonts.net/LeagueGothic-Italic.font) by The League of Moveable Type.
diff --git a/media/loadingscreen/LoadingScreenBL.tga b/media/loadingscreen/LoadingScreenBL.tga
diff --git a/media/loadingscreen/LoadingScreenBR.tga b/media/loadingscreen/LoadingScreenBR.tga
diff --git a/media/loadingscreen/LoadingScreenTL.tga b/media/loadingscreen/LoadingScreenTL.tga
diff --git a/media/loadingscreen/LoadingScreenTR.tga b/media/loadingscreen/LoadingScreenTR.tga
diff --git a/media/war3mappreview/main.xcf → media/war3mapPreview.xcf b/media/war3mappreview/main.xcf → media/war3mapPreview.xcf
diff --git a/media/war3mappreview/war3mappreview.tga b/media/war3mappreview/war3mappreview.tga
diff --git a/w3x-mpq-raw/war3map.w3a b/w3x-mpq-raw/war3map.w3a
diff --git a/w3x-mpq-raw/war3map.w3i b/w3x-mpq-raw/war3map.w3i
diff --git a/w3x-mpq-raw/war3map.w3u b/w3x-mpq-raw/war3map.w3u
diff --git a/w3x-mpq-raw/war3map.wct b/w3x-mpq-raw/war3map.wct
diff --git a/w3x-mpq-raw/war3map.wtg b/w3x-mpq-raw/war3map.wtg
diff --git a/w3x-mpq-raw/war3map.wts b/w3x-mpq-raw/war3map.wts
@@ -24,6 +24,21 @@ STRING 4
 Player 13
 }
 
+STRING 5
+// Abilities: A02J (Bard - Nexus), Ubertip (Tooltip - Normal - Extended)
+{
+|c00ffcc00Ability Type:|r Activated
+|c00ffcc00Target:|r Your SpellBringer
+|c00ffcc00Effect:|r Restores target's mana
+|c00ffcc00Cooldown:|r <A02J,Cool1> seconds
+
+The magical lilt of Nexus encourages, if not outright forces, the user's Spellbringer to draw upon ambient energy, resulting in a sudden increase of its mana stores.
+
+|c00ffcc00Mana Restored:|r 40
+
+|cff87ceebCasting this ability prevents you from repicking.|r
+}
+
 STRING 6
 {
 Player 14
@@ -11162,21 +11177,6 @@ STRING 1214
 [|cffffcc00C|r] Nexus
 }
 
-STRING 1215
-// Abilities: A02J (Bard - Nexus), Ubertip (Tooltip - Normal - Extended)
-{
-|c00ffcc00Ability Type:|r Activated
-|c00ffcc00Target:|r Your SpellBringer
-|c00ffcc00Effect:|r Restores target's mana
-|c00ffcc00Cooldown:|r <A02J,Cool1> seconds
-
-The magical lilt of Nexus encourages, if not outright forces, the user's Spellbringer to draw upon ambient energy, resulting in a sudden increase of its mana stores.
-
-|c00ffcc00Mana Restored:|r 50
-
-|cff87ceebCasting this ability prevents you from repicking.|r
-}
-
 STRING 1216
 // Abilities: A03E (Meraud's Blessing), Name (Name)
 {

diff --git a/w3x-mpq-raw/war3mapMap.blp b/w3x-mpq-raw/war3mapMap.blp