diff --git a/animations/tools/scythe.txt b/animations/tools/scythe.txt new file mode 100644 index 0000000..0803918 --- /dev/null +++ b/animations/tools/scythe.txt @@ -0,0 +1,13 @@ + +image=images/loot/battle_axe.png + +[animation] +frames=6 +duration=600ms +type=play_once +frame=0,0,45,54,46,39,15,51 +frame=1,0,45,0,48,54,16,74 +frame=2,0,0,0,45,75,13,105 +frame=3,0,93,0,31,66,4,84 +frame=4,0,91,66,29,35,11,33 +frame=5,0,0,75,31,17,17,8 diff --git a/engine/classes.txt b/engine/classes.txt index 5cf2184..7807a82 100644 --- a/engine/classes.txt +++ b/engine/classes.txt @@ -2,9 +2,9 @@ name=Standard description=The majority of this map is farming land, ideal for crops and animals. currency=500 -equipment=2,3,4,9,100,101 +equipment=2,3,4,9,10,100,101 powers=10001 -actionbar=10,11,12,0,0,0,0,0,0,0,0,0 +actionbar=10,11,12,13,0,0,0,0,0,0,0,0 hero_options=0,1 [class] diff --git a/engine/equip_flags.txt b/engine/equip_flags.txt index 389e1eb..1f02097 100644 --- a/engine/equip_flags.txt +++ b/engine/equip_flags.txt @@ -31,4 +31,7 @@ id=pick name=Pick [flag] id=can -name=Can \ No newline at end of file +name=Can +[flag] +id=scythe +name=Scythe diff --git a/images/icons/items.png b/images/icons/items.png index cbf2f42..e431b32 100644 Binary files a/images/icons/items.png and b/images/icons/items.png differ diff --git a/items/tools.txt b/items/tools.txt index 9cb47d7..2b4024f 100644 --- a/items/tools.txt +++ b/items/tools.txt @@ -32,4 +32,16 @@ icon=259 soundfx=soundfx/inventory/inventory_metal.ogg gfx=battle_axe loot_animation=animations/tools/pickaxe.txt -dmg=melee,1,1 \ No newline at end of file +dmg=melee,1,1 + +[item] +id=10 +name=Scythe +quality=low +item_type=tools +equip_flags=scythe +icon=260 +soundfx=soundfx/inventory/inventory_metal.ogg +gfx=battle_axe +loot_animation=animations/tools/pickaxe.txt +dmg=melee,1,1 diff --git a/maps/farm.txt b/maps/farm.txt index 5d36098..f7bdf91 100644 --- a/maps/farm.txt +++ b/maps/farm.txt @@ -4944,6 +4944,15 @@ hotspot=location mapmod=level 2,65,16,43;level 9,66,16,44;level 3,67,16,45;level 7,65,17,107;level 10,66,17,108;level 8,67,17,109;level 4,65,18,171;level 6,66,18,172;level 5,67,18,173 requires_not_status=grass3 +[event] +# grass4 +type=event +location=66,12,1,1 +activate=on_load +hotspot=location +mapmod=level 2,65,11,43;level 9,66,11,44;level 3,67,11,45;level 7,65,12,107;level 10,66,12,108;level 8,67,12,109;level 4,65,13,171;level 6,66,13,172;level 5,67,13,173 +requires_not_status=grass4 + [event] # grass5 type=event @@ -4971,6 +4980,15 @@ hotspot=location mapmod=level 2,65,13,43;level 9,66,13,44;level 3,67,13,45;level 7,65,14,107;level 10,66,14,108;level 8,67,14,109;level 4,65,15,171;level 6,66,15,172;level 5,67,15,173 requires_not_status=grass7 +[event] +# grass8 +type=event +location=67,12,1,1 +activate=on_load +hotspot=location +mapmod=level 2,66,11,43;level 9,67,11,44;level 3,68,11,45;level 7,66,12,107;level 10,67,12,108;level 8,68,12,109;level 4,66,13,171;level 6,67,13,172;level 5,68,13,173 +requires_not_status=grass8 + [event] # grass9 type=event @@ -5034,3 +5052,48 @@ hotspot=location mapmod=level 2,63,14,43;level 9,64,14,44;level 3,65,14,45;level 7,63,15,107;level 10,64,15,108;level 8,65,15,109;level 4,63,16,171;level 6,64,16,172;level 5,65,16,173 requires_not_status=grass15 +[event] +# grass16 +type=event +location=65,12,1,1 +activate=on_load +hotspot=location +mapmod=level 2,64,11,43;level 9,65,11,44;level 3,66,11,45;level 7,64,12,107;level 10,65,12,108;level 8,66,12,109;level 4,64,13,171;level 6,65,13,172;level 5,66,13,173 +requires_not_status=grass16 + +[event] +# grass17 +type=event +location=64,12,1,1 +activate=on_load +hotspot=location +mapmod=level 2,63,11,43;level 9,64,11,44;level 3,65,11,45;level 7,63,12,107;level 10,64,12,108;level 8,65,12,109;level 4,63,13,171;level 6,64,13,172;level 5,65,13,173 +requires_not_status=grass17 + +[event] +# grass18 +type=event +location=63,12,1,1 +activate=on_load +hotspot=location +mapmod=level 2,62,11,43;level 9,63,11,44;level 3,64,11,45;level 7,62,12,107;level 10,63,12,108;level 8,64,12,109;level 4,62,13,171;level 6,63,13,172;level 5,64,13,173 +requires_not_status=grass18 + +[event] +# grass18 +type=event +location=63,12,1,1 +activate=on_interact +hotspot=location +requires_item=10 +set_status=grass18 + +[event] +# grass19 +type=event +location=68,12,1,1 +activate=on_load +hotspot=location +mapmod=level 2,67,11,43;level 9,68,11,44;level 3,69,11,45;level 7,67,12,107;level 10,68,12,108;level 8,69,12,109;level 4,67,13,171;level 6,68,13,172;level 5,69,13,173 +requires_not_status=grass19 + diff --git a/powers/powers.txt b/powers/powers.txt index 145e282..519dda4 100644 --- a/powers/powers.txt +++ b/powers/powers.txt @@ -69,6 +69,27 @@ cooldown=1s requires_flags=pickaxe target_categories=rock +[power] +id=13 +name=Scythe +type=fixed +icon=260 +new_state=instant +requires_mp=2 +face=true +use_hazard=true +aim_assist=true +base_damage=melee +lifespan=1s +speed=12 +radius=1.0 +starting_pos=melee +animation=animations/powers/scythe.txt +directional=false +cooldown=1s +requires_flags=scythe +target_categories=tools + [power] id=2 #name=Slime Attack