Move Great Ogre unit to core

wesnoth · Oct 24, 2018 · 1740952 · 1740952
1 parent b6e0dbf
commit 1740952
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/data/campaigns/Legend_of_Wesmere/images/units/ogres/great-ogre.png b/data/campaigns/Legend_of_Wesmere/images/units/ogres/great-ogre.png
diff --git a/...mere/images/units/monsters/great-ogre.png → data/core/images/units/ogres/great-ogre.png b/...mere/images/units/monsters/great-ogre.png → data/core/images/units/ogres/great-ogre.png
diff --git a/...end_of_Wesmere/units/ogres/Great_Ogre.cfg → data/core/units/ogres/Great_Ogre.cfg b/...end_of_Wesmere/units/ogres/Great_Ogre.cfg → data/core/units/ogres/Great_Ogre.cfg
@@ -1,4 +1,4 @@
-#textdomain wesnoth-low
+#textdomain wesnoth-units
 #Unit imported from Into the Underworld.
 
 [unit_type]
@@ -15,6 +15,7 @@
     movement=5
     #Wired mainline Ogre portrait. Elvish_Hunter
     profile="portraits/monsters/ogre.png"
+#ifdef ENABLE_GREAT_OGRE
     #It advances from L2 Ogre. Elvish_Hunter
     [advancefrom]
         unit=Ogre
@@ -23,6 +24,7 @@
         #This compensates the fact that Ogres can be intelligent unlike Trolls. Elvish_Hunter
         experience=80
     [/advancefrom]
+#endif
     experience=150
     level=3
     alignment=neutral