diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg index 56a35c7a18e..751fe94bce2 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg @@ -813,11 +813,11 @@ type=Dwarvish Miner [not] - role=has_coal + status=has_coal [/not] [not] - role=has_gold + status=has_gold [/not] [/filter] @@ -825,7 +825,7 @@ speaker=unit message= _ "I have all the coal I can carry..." [/message] - {VARIABLE unit.role has_coal} + {VARIABLE unit.status.has_coal yes} [unstore_unit] variable=unit find_vacant=no @@ -852,11 +852,11 @@ type=Dwarvish Miner [not] - role=has_coal + status=has_coal [/not] [not] - role=has_gold + status=has_gold [/not] [/filter] @@ -864,7 +864,7 @@ speaker=unit message= _ "I have all the coal I can carry..." [/message] - {VARIABLE unit.role has_coal} + {VARIABLE unit.status.has_coal yes} [unstore_unit] variable=unit find_vacant=no @@ -911,11 +911,11 @@ type=Dwarvish Miner [not] - role=has_coal + status=has_coal [/not] [not] - role=has_gold + status=has_gold [/not] [/filter] @@ -923,7 +923,7 @@ speaker=unit message= _ "I have all the gold I can carry..." [/message] - {VARIABLE unit.role has_gold} + {VARIABLE unit.status.has_gold yes} [unstore_unit] variable=unit find_vacant=no @@ -950,7 +950,7 @@ [filter] side=1 type=Dwarvish Miner - role=has_coal + status=has_coal [/filter] [item] @@ -970,11 +970,11 @@ type=Dwarvish Miner [not] - role=has_coal + status=has_coal [/not] [not] - role=has_gold + status=has_gold [/not] [/filter] @@ -990,7 +990,7 @@ message= _ "I have all the coal I can carry..." [/message] - {VARIABLE unit.role has_coal} + {VARIABLE unit.status.has_coal yes} [unstore_unit] variable=unit @@ -1025,7 +1025,7 @@ [filter] side=1 type=Dwarvish Miner - role=has_gold + status=has_gold [/filter] [item] @@ -1045,11 +1045,11 @@ type=Dwarvish Miner [not] - role=has_coal + status=has_coal [/not] [not] - role=has_gold + status=has_gold [/not] [/filter] @@ -1065,7 +1065,7 @@ message= _ "I have all the gold I can carry..." [/message] - {VARIABLE unit.role has_gold} + {VARIABLE unit.status.has_gold yes} [unstore_unit] variable=unit @@ -1096,7 +1096,7 @@ first_time_only=no [filter] type=Dwarvish Miner - role=has_coal + status=has_coal [filter_location] find_in=resource_return_locations @@ -1107,7 +1107,7 @@ message= _ "My load of coal is delivered!" [/message] - {CLEAR_VARIABLE unit.role} + {VARIABLE unit.status.has_coal no} [unstore_unit] variable=unit @@ -1161,7 +1161,7 @@ first_time_only=no [filter] type=Dwarvish Miner - role=has_gold + status=has_gold [filter_location] find_in=resource_return_locations @@ -1172,7 +1172,7 @@ message= _ "Here’s the gold." [/message] - {CLEAR_VARIABLE unit.role} + {VARIABLE unit.status.has_gold no} [unstore_unit] variable=unit diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-1.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-1.png deleted file mode 100644 index 1ec4b2892ff..00000000000 Binary files a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-1.png and /dev/null differ diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-2.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-2.png deleted file mode 100644 index 2c68fc56367..00000000000 Binary files a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-2.png and /dev/null differ diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-3.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-3.png deleted file mode 100644 index 3a048f4dfbc..00000000000 Binary files a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-3.png and /dev/null differ diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-4.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-4.png deleted file mode 100644 index c90379658d5..00000000000 Binary files a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-4.png and /dev/null differ diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-5.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-5.png deleted file mode 100644 index 45085b1c0a0..00000000000 Binary files a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-5.png and /dev/null differ diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-6.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-6.png deleted file mode 100644 index 66bc5a4d944..00000000000 Binary files a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-6.png and /dev/null differ diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-1.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-1.png deleted file mode 100644 index 061b24d8df6..00000000000 Binary files a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-1.png and /dev/null differ diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-2.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-2.png deleted file mode 100644 index d99461d67e3..00000000000 Binary files a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-2.png and /dev/null differ diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner.png deleted file mode 100644 index a789c20e0d1..00000000000 Binary files a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner.png and /dev/null differ diff --git a/data/campaigns/Secrets_of_the_Ancients/units/Dwarvish_Miner.cfg b/data/campaigns/Secrets_of_the_Ancients/units/Dwarvish_Miner.cfg deleted file mode 100644 index a13f796cddf..00000000000 --- a/data/campaigns/Secrets_of_the_Ancients/units/Dwarvish_Miner.cfg +++ /dev/null @@ -1,40 +0,0 @@ -#textdomain wesnoth-sota -[unit_type] - id=Dwarvish Miner - name= _ "Dwarvish Miner" - race=dwarf - image=units/dwarves/miner.png - hitpoints=25 - movement_type=dwarvishfoot - movement=4 - level=1 - alignment=neutral - advances_to=null - {AMLA_DEFAULT} - experience=50 - cost=19 - usage=fighter - description= _ "Dwarvish miners are the grunt workers of dwarvish society. They take the precious ores out of the ground, but do not ever take part in the crafting of weapons or artifacts. They have no military training, but they can still do some damage with their picks." - {DEFENSE_ANIM "units/dwarves/miner-defend-2.png" "units/dwarves/miner-defend-1.png" {SOUND_LIST:DWARF_HIT} } - die_sound={SOUND_LIST:DWARF_DIE} - [attack] - name=pick - description= _"pick" - type=pierce - range=melee - damage=4 - number=2 - icon=attacks/pick-axe.png - [/attack] - [attack_anim] - [filter_attack] - name=pick - [/filter_attack] - start_time=-350 - offset=0.0~0.3,0.3~0.5,0.5~0.6,0.6~0.5,0.5~0.3,0.3~0.0 - [frame] - image=units/dwarves/miner-attack-[1~6].png:100 - [/frame] - {SOUND:HIT_AND_MISS axe.ogg {SOUND_LIST:MISS} -50} - [/attack_anim] -[/unit_type] diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-1.png b/data/core/images/units/dwarves/miner-attack-1.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-1.png rename to data/core/images/units/dwarves/miner-attack-1.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-2.png b/data/core/images/units/dwarves/miner-attack-2.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-2.png rename to data/core/images/units/dwarves/miner-attack-2.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-3.png b/data/core/images/units/dwarves/miner-attack-3.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-3.png rename to data/core/images/units/dwarves/miner-attack-3.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-4.png b/data/core/images/units/dwarves/miner-attack-4.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-4.png rename to data/core/images/units/dwarves/miner-attack-4.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-5.png b/data/core/images/units/dwarves/miner-attack-5.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-5.png rename to data/core/images/units/dwarves/miner-attack-5.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-6.png b/data/core/images/units/dwarves/miner-attack-6.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-6.png rename to data/core/images/units/dwarves/miner-attack-6.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-defend-1.png b/data/core/images/units/dwarves/miner-defend-1.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-defend-1.png rename to data/core/images/units/dwarves/miner-defend-1.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-defend-2.png b/data/core/images/units/dwarves/miner-defend-2.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-defend-2.png rename to data/core/images/units/dwarves/miner-defend-2.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-laden.png b/data/core/images/units/dwarves/miner-laden.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-laden.png rename to data/core/images/units/dwarves/miner-laden.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner.png b/data/core/images/units/dwarves/miner.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner.png rename to data/core/images/units/dwarves/miner.png diff --git a/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg b/data/core/units/dwarves/Miner.cfg similarity index 81% rename from data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg rename to data/core/units/dwarves/Miner.cfg index 3e16d308d4f..f09645f0985 100644 --- a/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg +++ b/data/core/units/dwarves/Miner.cfg @@ -1,4 +1,4 @@ -#textdomain wesnoth-sof +#textdomain wesnoth-units [unit_type] id=Dwarvish Miner name= _ "Dwarvish Miner" @@ -6,7 +6,7 @@ image=units/dwarves/miner.png hitpoints=25 movement_type=dwarvishfoot - movement=5 + movement=4 level=1 alignment=neutral advances_to=null @@ -14,7 +14,7 @@ experience=50 cost=19 usage=fighter - description= _ "Dwarvish miners are the grunt workers of dwarvish society. They take the precious ores out of the ground, but do not ever take part in the crafting of weapons or artifacts." + description= _ "Dwarvish miners are the grunt workers of dwarvish society. They take the precious ores out of the ground, but do not ever take part in the crafting of weapons or artifacts. They have no military training, but they can still do some damage with their picks." {DEFENSE_ANIM "units/dwarves/miner-defend-2.png" "units/dwarves/miner-defend-1.png" {SOUND_LIST:DWARF_HIT}} die_sound={SOUND_LIST:DWARF_DIE} [attack] @@ -27,21 +27,20 @@ icon=attacks/pick-axe.png [/attack] [standing_anim] + start_time=0 [if] [filter] - role=loaded - [or] - role=has_coal - [/or] - [or] - role=has_gold - [/or] + status=has_coal,has_gold [/filter] - start_time=0 [frame] image=units/dwarves/miner-laden.png:1000 [/frame] [/if] + [else] + [frame] + image=units/dwarves/miner.png:1000 + [/frame] + [/else] [/standing_anim] [attack_anim] [filter_attack]