0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

incorporate old image_defensive into DEFENSE_ANIM creation and discard, or warn of its presence

Browse source 
While getting rid of the deprecated get_hit_sound, we can get rid of the even more hoary image_defensive.

We do this with new variables that are initially set to None. While in_unit, we look for the 'image_defensive=' key. If encountered, we record the line's index position (image_defensive) and its value (defend_image).

When we hit [/unit], we look back to see if there is already a DEFENSE_ANIM. If so, and its reaction image matches the value recorded in defend_image, we figure there is no need to preserve the old key, and enter it into a list of image_defensive attributes to be deleted (image_done). If we are creating a DEFENSE_ANIM, we use defend_image for the reaction image instead of doubling up the base image. Once this is done, again there is no point in keeping image_defensive around, and it is entered into image_done for deletion.

If neither of these cases is met, we offer warnings that an outdated key is in use.

When all of the file's lines have been iterated through, we can then remove those image_defensive lines that have been marked as unnecessary.
This commit is contained in:
Groggy Dice 2013-07-05 02:41:04 -04:00
parent aeb558419d
commit 3663fb2914
1 changed files with 39 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
data/tools/wmllint-1.4
View file

@ -1002,35 +1002,53 @@ def hack_syntax(filename, lines):
lines.insert(i, leader(precomment) + baseindent + "image=wesnoth-icon.png\n")
modcount += 1
need_image = False
# Remove get_hit_sound fields
# Remove get_hit_sound fields (and image_defensive, if also present)
in_unit = False
unit_id = ""
unit_image = None
unit_sound = None
get_hit_sound = None
defend_image = None
image_defensive = None
has_defense_anim = None
has_special_notes = False
image_done = []
for i in range(len(lines)):
if "[unit]" in lines[i]:
in_unit = i+1
continue
elif "[/unit]" in lines[i]:
if unit_id and get_hit_sound:
if has_defense_anim:
if has_defense_anim:
if get_hit_sound:
print 'wmllint: "%s", lines %d, %d: unit%s has both deprecated get_hit_sound key and a DEFENSE_ANIM'%(filename, get_hit_sound+1, has_defense_anim+1, unit_id)
else:
new_anim = "{DEFENSE_ANIM %s %s %s}" % \
(unit_image, unit_image, unit_sound)
(key, prefix, val, comment) = parse_attribute(lines[get_hit_sound])
print 'wmllint: "%s", line %d: unit%s gets %s'%(filename, get_hit_sound+1, unit_id, new_anim)
lines[get_hit_sound] = leader(lines[get_hit_sound]) \
+ new_anim + comment
modcount += 1
if image_defensive:
if re.search('{DEFENSE_ANIM[A-Z_]* +["(]*' + defend_image, lines[has_defense_anim]):
image_done.append(image_defensive)
else:
print 'wmllint: "%s", lines %d, %d: unit%s has both outdated image_defensive key and a DEFENSE_ANIM' \
% (filename, image_defensive+1, has_defense_anim+1, unit_id)
elif unit_id and get_hit_sound:
if not defend_image:
defend_image = unit_image
new_anim = "{DEFENSE_ANIM %s %s %s}" % \
(defend_image, unit_image, unit_sound)
(key, prefix, val, comment) = parse_attribute(lines[get_hit_sound])
print 'wmllint: "%s", line %d: unit%s gets %s'%(filename, get_hit_sound+1, unit_id, new_anim)
lines[get_hit_sound] = leader(lines[get_hit_sound]) \
+ new_anim + comment
modcount += 1
if image_defensive:
image_done.append(image_defensive)
elif image_defensive:
print 'wmllint: "%s", line %d: unit%s has outdated image_defensive key' \
% (filename, image_defensive+1, unit_id)
in_unit = None
unit_id = ""
unit_image = None
unit_sound = None
get_hit_sound = None
defend_image = None
image_defensive = None
has_defense_anim = None
has_special_notes = False
if in_unit:
@ -1051,6 +1069,16 @@ def hack_syntax(filename, lines):
unit_sound = value
elif key == "image" and not unit_image:
unit_image = value
elif key == "image_defensive" and not defend_image:
defend_image = value
image_defensive = i
# If image_defensive is the same image as the one in DEFENSE_ANIM, it is safe to discard
image_done.reverse()
for bye in image_done:
print 'wmllint: "%s", line %d: removing outdated attribute (%s)' \
% (filename, bye+1, lines[bye].strip())
del lines[bye]
modcount += 1
# Boucman's transformation of animation syntax.
# Wrap this in try/except because some newer animation syntax chokes it.
try: