diff --git a/data/campaigns/Liberty/_main.cfg b/data/campaigns/Liberty/_main.cfg index 11c1e843187..f42ceb76515 100644 --- a/data/campaigns/Liberty/_main.cfg +++ b/data/campaigns/Liberty/_main.cfg @@ -62,6 +62,9 @@ {campaigns/Liberty/scenarios} {campaigns/Liberty/} +#define USE_L3_OUTLAWS +#enddef + [+units] {campaigns/Liberty/units} [/units] diff --git a/data/campaigns/Liberty/scenarios/utils/utils.cfg b/data/campaigns/Liberty/scenarios/utils/utils.cfg index cb84e125958..66ca21cf25a 100644 --- a/data/campaigns/Liberty/scenarios/utils/utils.cfg +++ b/data/campaigns/Liberty/scenarios/utils/utils.cfg @@ -1,8 +1,5 @@ #textdomain wesnoth-l -#define USE_L3_OUTLAWS -#enddef - #define SET_VILLAGE X Y SIDE [capture_village] x={X} diff --git a/data/campaigns/The_Rise_Of_Wesnoth/_main.cfg b/data/campaigns/The_Rise_Of_Wesnoth/_main.cfg index c3f7a375445..e4e13dc2bb0 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/_main.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/_main.cfg @@ -46,6 +46,10 @@ [binary_path] path=data/campaigns/The_Rise_Of_Wesnoth [/binary_path] + +#define USE_L3_OUTLAWS +#enddef + [+units] {campaigns/The_Rise_Of_Wesnoth/units} [/units] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive+female-defend.png b/data/core/images/units/human-outlaws/fugitive+female-defend.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive+female-defend.png rename to data/core/images/units/human-outlaws/fugitive+female-defend.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive+female-melee-1.png b/data/core/images/units/human-outlaws/fugitive+female-melee-1.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive+female-melee-1.png rename to data/core/images/units/human-outlaws/fugitive+female-melee-1.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive+female-ranged-1.png b/data/core/images/units/human-outlaws/fugitive+female-ranged-1.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive+female-ranged-1.png rename to data/core/images/units/human-outlaws/fugitive+female-ranged-1.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive+female-ranged-2.png b/data/core/images/units/human-outlaws/fugitive+female-ranged-2.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive+female-ranged-2.png rename to data/core/images/units/human-outlaws/fugitive+female-ranged-2.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive+female.png b/data/core/images/units/human-outlaws/fugitive+female.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive+female.png rename to data/core/images/units/human-outlaws/fugitive+female.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive-defend.png b/data/core/images/units/human-outlaws/fugitive-defend.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive-defend.png rename to data/core/images/units/human-outlaws/fugitive-defend.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive-melee-1.png b/data/core/images/units/human-outlaws/fugitive-melee-1.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive-melee-1.png rename to data/core/images/units/human-outlaws/fugitive-melee-1.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive-ranged-1.png b/data/core/images/units/human-outlaws/fugitive-ranged-1.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive-ranged-1.png rename to data/core/images/units/human-outlaws/fugitive-ranged-1.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive-ranged-2.png b/data/core/images/units/human-outlaws/fugitive-ranged-2.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive-ranged-2.png rename to data/core/images/units/human-outlaws/fugitive-ranged-2.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive.png b/data/core/images/units/human-outlaws/fugitive.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/fugitive.png rename to data/core/images/units/human-outlaws/fugitive.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/highwayman-attack.png b/data/core/images/units/human-outlaws/highwayman-attack.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/highwayman-attack.png rename to data/core/images/units/human-outlaws/highwayman-attack.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/highwayman-defend.png b/data/core/images/units/human-outlaws/highwayman-defend.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/highwayman-defend.png rename to data/core/images/units/human-outlaws/highwayman-defend.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/highwayman.png b/data/core/images/units/human-outlaws/highwayman.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/highwayman.png rename to data/core/images/units/human-outlaws/highwayman.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-defend1.png b/data/core/images/units/human-outlaws/ranger-defend1.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-defend1.png rename to data/core/images/units/human-outlaws/ranger-defend1.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-melee1.png b/data/core/images/units/human-outlaws/ranger-melee1.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-melee1.png rename to data/core/images/units/human-outlaws/ranger-melee1.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-melee2.png b/data/core/images/units/human-outlaws/ranger-melee2.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-melee2.png rename to data/core/images/units/human-outlaws/ranger-melee2.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-ranged1.png b/data/core/images/units/human-outlaws/ranger-ranged1.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-ranged1.png rename to data/core/images/units/human-outlaws/ranger-ranged1.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-ranged2.png b/data/core/images/units/human-outlaws/ranger-ranged2.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-ranged2.png rename to data/core/images/units/human-outlaws/ranger-ranged2.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-ranged3.png b/data/core/images/units/human-outlaws/ranger-ranged3.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-ranged3.png rename to data/core/images/units/human-outlaws/ranger-ranged3.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-ranged4.png b/data/core/images/units/human-outlaws/ranger-ranged4.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger-ranged4.png rename to data/core/images/units/human-outlaws/ranger-ranged4.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger.png b/data/core/images/units/human-outlaws/ranger.png similarity index 100% rename from data/campaigns/The_Rise_Of_Wesnoth/images/units/human-outlaws/ranger.png rename to data/core/images/units/human-outlaws/ranger.png diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Human_Outlaw_Fugitive.cfg b/data/core/units/Human_Outlaw_Fugitive.cfg similarity index 98% rename from data/campaigns/The_Rise_Of_Wesnoth/units/Human_Outlaw_Fugitive.cfg rename to data/core/units/Human_Outlaw_Fugitive.cfg index c8de0439465..806a166a8f7 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Human_Outlaw_Fugitive.cfg +++ b/data/core/units/Human_Outlaw_Fugitive.cfg @@ -1,4 +1,4 @@ -#textdomain wesnoth-trow +#textdomain wesnoth [unit] id=Fugitive @@ -14,7 +14,7 @@ level=3 alignment=chaotic advanceto=null -#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH +#ifdef USE_L3_OUTLAWS [advancefrom] unit=Outlaw experience=77 diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Human_Outlaw_Highwayman.cfg b/data/core/units/Outlaw_Highwayman.cfg similarity index 66% rename from data/campaigns/The_Rise_Of_Wesnoth/units/Human_Outlaw_Highwayman.cfg rename to data/core/units/Outlaw_Highwayman.cfg index eea022fbbed..53bb84ed718 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Human_Outlaw_Highwayman.cfg +++ b/data/core/units/Outlaw_Highwayman.cfg @@ -1,10 +1,10 @@ -#textdomain wesnoth-trow +#textdomain wesnoth [unit] id=Highwayman name= _ "Highwayman" race=human - image="units/human-outlaws/highwayman.png" + image="units/humans/human-outlaws/highwayman.png" profile="portraits/Jason_Lutes/human-highwayman.png" hitpoints=70 movement_type=smallfoot @@ -13,7 +13,7 @@ level=3 alignment=chaotic advanceto=null -#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH +#ifdef USE_L3_OUTLAWS [advancefrom] unit=Bandit experience=70 @@ -24,17 +24,17 @@ usage=fighter unit_description= _ "Armed with heavy mace, Highwaymen are the last people you want to meet on a deserted road late at night." die_sound={SOUND_LIST:HUMAN_DIE} - {DEFENSE_ANIM "units/human-outlaws/highwayman-defend.png" "units/human-outlaws/highwayman.png" {SOUND_LIST:HUMAN_HIT} } + {DEFENSE_ANIM "units/humans/human-outlaws/highwayman-defend.png" "units/humans/human-outlaws/highwayman.png" {SOUND_LIST:HUMAN_HIT} } # [death] # [frame] # begin=0 # end=200 - # image="units/human-outlaws/highwayman-die-1.png" + # image="units/humans/human-outlaws/highwayman-die-1.png" # [/frame] # [frame] # begin=200 # end=400 - # image="units/human-outlaws/highwayman-die-2.png" + # image="units/humans/human-outlaws/highwayman-die-2.png" # [/frame] # [/death] [attack] @@ -50,23 +50,23 @@ # [frame] # begin=-200 # end=-100 - # image="units/human-outlaws/highwayman-melee-1.png" + # image="units/humans/human-outlaws/highwayman-melee-1.png" # [/frame] [frame] begin=-100 end=100 - image="units/human-outlaws/highwayman-attack.png" + image="units/humans/human-outlaws/highwayman-attack.png" sound={SOUND_LIST:MISS} [/frame] # [frame] # begin=100 # end=250 - # image="units/human-outlaws/highwayman-melee-3.png" + # image="units/humans/human-outlaws/highwayman-melee-3.png" # [/frame] # [frame] # begin=250 # end=350 - # image="units/human-outlaws/highwayman-defend.png" + # image="units/humans/human-outlaws/highwayman-defend.png" # [/frame] [/animation] [animation] @@ -74,23 +74,23 @@ # [frame] # begin=-200 # end=-100 - # image="units/human-outlaws/highwayman-melee-1.png" + # image="units/humans/human-outlaws/highwayman-melee-1.png" # [/frame] [frame] begin=-100 end=100 - image="units/human-outlaws/highwayman-attack.png" + image="units/humans/human-outlaws/highwayman-attack.png" sound=mace.wav [/frame] # [frame] # begin=100 # end=250 - # image="units/human-outlaws/highwayman-melee-3.png" + # image="units/humans/human-outlaws/highwayman-melee-3.png" # [/frame] # [frame] # begin=250 # end=350 - # image="units/human-outlaws/highwayman-defend.png" + # image="units/humans/human-outlaws/highwayman-defend.png" # [/frame] [/animation] [/attack] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/units/Human_Outlaw_Ranger.cfg b/data/core/units/Outlaw_Ranger.cfg similarity index 73% rename from data/campaigns/The_Rise_Of_Wesnoth/units/Human_Outlaw_Ranger.cfg rename to data/core/units/Outlaw_Ranger.cfg index 069d3687c93..959e6616d1c 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/units/Human_Outlaw_Ranger.cfg +++ b/data/core/units/Outlaw_Ranger.cfg @@ -1,10 +1,10 @@ -#textdomain wesnoth-trow +#textdomain wesnoth [unit] id=Human Ranger name= _ "Outlaw Ranger" race=human - image="units/human-outlaws/ranger.png" + image="units/humans/human-outlaws/ranger.png" hitpoints=60 movement_type=smallfoot movement=6 @@ -12,7 +12,7 @@ level=3 alignment=chaotic advanceto=null -#ifdef CAMPAIGN_THE_RISE_OF_WESNOTH +#ifdef USE_L3_OUTLAWS [advancefrom] unit=Trapper experience=65 @@ -24,17 +24,17 @@ usage=mixed fighter unit_description= _ "Rangers are wild men and masters of forest and hills. They are excellent trackers, scouts, and archers, moving freely through the countryside under the cover of night. Most rulers are afraid of rangers and would rather put them in the dungeon than put their abilities to use." die_sound={SOUND_LIST:HUMAN_DIE} - {DEFENSE_ANIM "units/human-outlaws/ranger-defend1.png" "units/human-outlaws/ranger.png" {SOUND_LIST:HUMAN_HIT} } + {DEFENSE_ANIM "units/humans/human-outlaws/ranger-defend1.png" "units/humans/human-outlaws/ranger.png" {SOUND_LIST:HUMAN_HIT} } # [defend] # [frame] # begin=-150 # end=0 - # image="units/human-outlaws/ranger-defend1.png" + # image="units/humans/human-outlaws/ranger-defend1.png" # [/frame] # [frame] # begin=0 # end=150 - # image="units/human-outlaws/ranger-defend2.png" + # image="units/humans/human-outlaws/ranger-defend2.png" # [/frame] # [/defend] # Rangers are almost like human elves @@ -61,18 +61,18 @@ [frame] begin=-200 end=-150 - image="units/human-outlaws/ranger-melee1.png" + image="units/humans/human-outlaws/ranger-melee1.png" [/frame] [frame] begin=-150 end=100 - image="units/human-outlaws/ranger-melee2.png" + image="units/humans/human-outlaws/ranger-melee2.png" sound={SOUND_LIST:MISS} [/frame] [frame] begin=100 end=150 - image="units/human-outlaws/ranger.png" + image="units/humans/human-outlaws/ranger.png" [/frame] [/animation] [animation] @@ -80,18 +80,18 @@ [frame] begin=-200 end=-150 - image="units/human-outlaws/ranger-melee1.png" + image="units/humans/human-outlaws/ranger-melee1.png" [/frame] [frame] begin=-150 end=100 - image="units/human-outlaws/ranger-melee2.png" + image="units/humans/human-outlaws/ranger-melee2.png" sound=dagger-swish.wav [/frame] [frame] begin=100 end=150 - image="units/human-outlaws/ranger.png" + image="units/humans/human-outlaws/ranger.png" [/frame] [/animation] [/attack] @@ -114,23 +114,23 @@ [frame] begin=-500 end=-300 - image="units/human-outlaws/ranger-ranged1.png" + image="units/humans/human-outlaws/ranger-ranged1.png" sound=bow-miss.ogg [/frame] [frame] begin=-300 end=-150 - image="units/human-outlaws/ranger-ranged2.png" + image="units/humans/human-outlaws/ranger-ranged2.png" [/frame] [frame] begin=-150 end=-50 - image="units/human-outlaws/ranger-ranged3.png" + image="units/humans/human-outlaws/ranger-ranged3.png" [/frame] [frame] begin=-50 end=100 - image="units/human-outlaws/ranger-ranged4.png" + image="units/humans/human-outlaws/ranger-ranged4.png" [/frame] [/animation] [animation] @@ -144,23 +144,23 @@ [frame] begin=-500 end=-300 - image="units/human-outlaws/ranger-ranged1.png" + image="units/humans/human-outlaws/ranger-ranged1.png" sound=bow.ogg [/frame] [frame] begin=-300 end=-150 - image="units/human-outlaws/ranger-ranged2.png" + image="units/humans/human-outlaws/ranger-ranged2.png" [/frame] [frame] begin=-150 end=-50 - image="units/human-outlaws/ranger-ranged3.png" + image="units/humans/human-outlaws/ranger-ranged3.png" [/frame] [frame] begin=-50 end=100 - image="units/human-outlaws/ranger-ranged4.png" + image="units/humans/human-outlaws/ranger-ranged4.png" [/frame] [/animation] [/attack]