Skip to content

Commit

Permalink
Move dwarvish miner unit to core
Browse files Browse the repository at this point in the history
TODO: Should we remove the SotA version of this?
This commit removes the images only, not the config.
I thing maybe the config can be removed too.
  • Loading branch information
CelticMinstrel committed Oct 24, 2018
1 parent e32d471 commit b8c4746
Show file tree
Hide file tree
Showing 21 changed files with 29 additions and 29 deletions.
42 changes: 21 additions & 21 deletions data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
Expand Up @@ -675,19 +675,19 @@
type=Dwarvish Miner

[not]
role=has_coal
status=has_coal
[/not]

[not]
role=has_gold
status=has_gold
[/not]
[/filter]

[message]
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
Expand All @@ -712,19 +712,19 @@
type=Dwarvish Miner

[not]
role=has_coal
status=has_coal
[/not]

[not]
role=has_gold
status=has_gold
[/not]
[/filter]

[message]
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
Expand Down Expand Up @@ -769,19 +769,19 @@
type=Dwarvish Miner

[not]
role=has_coal
status=has_coal
[/not]

[not]
role=has_gold
status=has_gold
[/not]
[/filter]

[message]
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
Expand All @@ -806,7 +806,7 @@
[filter]
side=1
type=Dwarvish Miner
role=has_coal
status=has_coal
[/filter]

[item]
Expand All @@ -826,11 +826,11 @@
type=Dwarvish Miner

[not]
role=has_coal
status=has_coal
[/not]

[not]
role=has_gold
status=has_gold
[/not]
[/filter]

Expand All @@ -846,7 +846,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
Expand Down Expand Up @@ -880,7 +880,7 @@
[filter]
side=1
type=Dwarvish Miner
role=has_gold
status=has_gold
[/filter]

[item]
Expand All @@ -900,11 +900,11 @@
type=Dwarvish Miner

[not]
role=has_coal
status=has_coal
[/not]

[not]
role=has_gold
status=has_gold
[/not]
[/filter]

Expand All @@ -920,7 +920,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
Expand Down Expand Up @@ -950,7 +950,7 @@
first_time_only=no
[filter]
type=Dwarvish Miner
role=has_coal
status=has_coal

[filter_location]
find_in=resource_return_locations
Expand All @@ -961,7 +961,7 @@
message= _ "My load of coal is delivered!"
[/message]

{CLEAR_VARIABLE unit.role}
{VARIABLE unit.status.has_coal no}

[unstore_unit]
variable=unit
Expand Down Expand Up @@ -1015,7 +1015,7 @@
first_time_only=no
[filter]
type=Dwarvish Miner
role=has_gold
status=has_gold

[filter_location]
find_in=resource_return_locations
Expand All @@ -1026,7 +1026,7 @@
message= _ "Here’s the gold."
[/message]

{CLEAR_VARIABLE unit.role}
{VARIABLE unit.status.has_gold no}

[unstore_unit]
variable=unit
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes
@@ -1,4 +1,4 @@
#textdomain wesnoth-sof
#textdomain wesnoth-units
[unit_type]
id=Dwarvish Miner
name= _ "Dwarvish Miner"
Expand All @@ -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 artifactss. 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]
Expand All @@ -28,12 +28,12 @@
[/attack]
[standing_anim]
[filter]
role=loaded
status=loaded
[or]
role=has_coal
status=has_coal
[/or]
[or]
role=has_gold
status=has_gold
[/or]
[/filter]
start_time=0
Expand All @@ -47,12 +47,12 @@
[standing_anim]
[filter]
[not]
role=loaded
status=loaded
[or]
role=has_coal
status=has_coal
[/or]
[or]
role=has_gold
status=has_gold
[/or]
[/not]
[/filter]
Expand Down

0 comments on commit b8c4746

Please sign in to comment.