Update Dagger Goblin template to use a distinct icon in maps. Change all monster tileset paths from maps/Monsters to maps/ (game requires all tilesets placed in there). Added slash behaviors for dagger-wielding goblins. Release Build 9037.
parent
6b6bdf741b
commit
00b18355c1
@ -0,0 +1,100 @@ |
|||||||
|
#pragma region License |
||||||
|
/*
|
||||||
|
License (OLC-3) |
||||||
|
~~~~~~~~~~~~~~~ |
||||||
|
|
||||||
|
Copyright 2024 Joshua Sigona <sigonasr2@gmail.com> |
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without modification, |
||||||
|
are permitted provided that the following conditions are met: |
||||||
|
|
||||||
|
1. Redistributions or derivations of source code must retain the above copyright |
||||||
|
notice, this list of conditions and the following disclaimer. |
||||||
|
|
||||||
|
2. Redistributions or derivative works in binary form must reproduce the above |
||||||
|
copyright notice. This list of conditions and the following disclaimer must be |
||||||
|
reproduced in the documentation and/or other materials provided with the distribution. |
||||||
|
|
||||||
|
3. Neither the name of the copyright holder nor the names of its contributors may |
||||||
|
be used to endorse or promote products derived from this software without specific |
||||||
|
prior written permission. |
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY |
||||||
|
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
|
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT |
||||||
|
SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
||||||
|
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED |
||||||
|
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR |
||||||
|
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
||||||
|
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
||||||
|
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
||||||
|
SUCH DAMAGE. |
||||||
|
|
||||||
|
Portions of this software are copyright © 2024 The FreeType |
||||||
|
Project (www.freetype.org). Please see LICENSE_FT.txt for more information. |
||||||
|
All rights reserved. |
||||||
|
*/ |
||||||
|
#pragma endregion |
||||||
|
|
||||||
|
#include "BulletTypes.h" |
||||||
|
#include "SoundEffect.h" |
||||||
|
#include "AdventuresInLestoria.h" |
||||||
|
#include "DEFINES.h" |
||||||
|
#include "util.h" |
||||||
|
|
||||||
|
INCLUDE_game |
||||||
|
INCLUDE_ANIMATION_DATA |
||||||
|
|
||||||
|
DaggerSlash::DaggerSlash(Monster&sourceMonster,float radius,int damage,const float knockbackAmt,bool upperLevel,const Direction facingDir,const float daggerFrameDuration,const float daggerSlashDistance,const HorizontalFlip horizontalFlip,bool friendly,Pixel col) |
||||||
|
:Bullet(sourceMonster.GetPos(),{},radius,damage,"goblin_sword_slash.png",upperLevel,false,daggerFrameDuration*ANIMATION_DATA["goblin_sword_slash.png"].GetFrameCountBasedOnAnimationStyle(),true,friendly,col), |
||||||
|
sourceMonster(sourceMonster),frameDuration(daggerFrameDuration),daggerSlashDistance(daggerSlashDistance),facingDir(facingDir),horizontalFlip(horizontalFlip),knockbackAmt(knockbackAmt){} |
||||||
|
void DaggerSlash::Update(float fElapsedTime){ |
||||||
|
ANIMATION_DATA["goblin_sword_slash.png"].ChangeFrameDuration(frameDuration); |
||||||
|
pos=sourceMonster.GetPos(); |
||||||
|
#pragma region Dagger slash offset |
||||||
|
switch(facingDir){ |
||||||
|
case Direction::NORTH:{ |
||||||
|
pos+=vf2d{0,-daggerSlashDistance}; |
||||||
|
}break; |
||||||
|
case Direction::EAST:{ |
||||||
|
pos+=vf2d{daggerSlashDistance,0}; |
||||||
|
}break; |
||||||
|
case Direction::SOUTH:{ |
||||||
|
pos+=vf2d{0,daggerSlashDistance}; |
||||||
|
}break; |
||||||
|
case Direction::WEST:{ |
||||||
|
pos+=vf2d{-daggerSlashDistance,0}; |
||||||
|
}break; |
||||||
|
default:ERR(std::format("WARNING! Unknown direction value {} was supplied! THIS SHOULD NOT BE HAPPENING!",int(facingDir))); |
||||||
|
} |
||||||
|
#pragma endregion |
||||||
|
#pragma region Dagger rotation handling |
||||||
|
switch(facingDir){ |
||||||
|
case Direction::NORTH:{ |
||||||
|
vel={0,-0.001f}; |
||||||
|
}break; |
||||||
|
case Direction::EAST:{ |
||||||
|
vel={0.001f,0}; |
||||||
|
}break; |
||||||
|
case Direction::SOUTH:{ |
||||||
|
vel={0,0.001f}; |
||||||
|
}break; |
||||||
|
case Direction::WEST:{ |
||||||
|
vel={-0.001f,0}; |
||||||
|
}break; |
||||||
|
default:ERR(std::format("WARNING! Unknown direction value {} was supplied! THIS SHOULD NOT BE HAPPENING!",int(facingDir))); |
||||||
|
} |
||||||
|
#pragma endregion |
||||||
|
} |
||||||
|
bool DaggerSlash::PlayerHit(Player*player){ |
||||||
|
deactivated=true; |
||||||
|
game->AddEffect(std::make_unique<Effect>(pos,0,"lightning_splash_effect.png",upperLevel,player->GetSizeMult()*0.25f,0.25,vf2d{})); |
||||||
|
player->Knockback(util::pointTo(sourceMonster.GetPos(),player->GetPos())*knockbackAmt); |
||||||
|
return false; |
||||||
|
} |
||||||
|
bool DaggerSlash::MonsterHit(Monster&monster){ |
||||||
|
deactivated=true; |
||||||
|
game->AddEffect(std::make_unique<Effect>(pos,0,"lightning_splash_effect.png",upperLevel,monster.GetSizeMult()*0.25f,0.25,vf2d{})); |
||||||
|
monster.Knockback(util::pointTo(sourceMonster.GetPos(),monster.GetPos())*knockbackAmt); |
||||||
|
return false; |
||||||
|
} |
Binary file not shown.
After Width: | Height: | Size: 8.9 KiB |
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Bear" type="Monster" gid="1" width="48" height="48"/> |
<object name="Bear" type="Monster" gid="1" width="48" height="48"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Blue Slime" type="Monster" gid="2" width="24" height="24"/> |
<object name="Blue Slime" type="Monster" gid="2" width="24" height="24"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Boar" type="Monster" gid="15" width="26.4" height="26.4"/> |
<object name="Boar" type="Monster" gid="15" width="26.4" height="26.4"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Bun" type="Monster" gid="3" width="48" height="48"/> |
<object name="Bun" type="Monster" gid="3" width="48" height="48"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Flower Turret" type="Monster" gid="4" width="24" height="24"/> |
<object name="Flower Turret" type="Monster" gid="4" width="24" height="24"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Frog" type="Monster" gid="5" width="16.8" height="16.8"/> |
<object name="Frog" type="Monster" gid="5" width="16.8" height="16.8"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Goblin (Bombs)" type="Monster" gid="13" width="21.6" height="21.6"/> |
<object name="Goblin (Bombs)" type="Monster" gid="13" width="21.6" height="21.6"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Goblin (Bow)" type="Monster" gid="13" width="21.6" height="21.6"/> |
<object name="Goblin (Bow)" type="Monster" gid="13" width="21.6" height="21.6"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Goblin (Dagger)" type="Monster" gid="13" width="24" height="24"/> |
<object name="Goblin (Dagger)" type="Monster" gid="17" width="24" height="24"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Goblin Boar Rider" type="Monster" gid="14" width="24" height="24"/> |
<object name="Goblin Boar Rider" type="Monster" gid="14" width="24" height="24"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Green Slime" type="Monster" gid="6" width="19.2" height="19.2"/> |
<object name="Green Slime" type="Monster" gid="6" width="19.2" height="19.2"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Hawk" type="Monster" gid="12" width="24" height="24"/> |
<object name="Hawk" type="Monster" gid="12" width="24" height="24"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Red Slime" type="Monster" gid="7" width="28.8" height="28.8"/> |
<object name="Red Slime" type="Monster" gid="7" width="28.8" height="28.8"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Slime King" type="Monster" gid="8" width="192" height="192"/> |
<object name="Slime King" type="Monster" gid="8" width="192" height="192"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Stone Elemental" type="Monster" gid="16" width="52.8" height="52.8"/> |
<object name="Stone Elemental" type="Monster" gid="16" width="52.8" height="52.8"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Ursule, Mother of Bears" type="Monster" gid="9" width="192" height="192"/> |
<object name="Ursule, Mother of Bears" type="Monster" gid="9" width="192" height="192"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Windhound" type="Monster" gid="10" width="21.6" height="21.6"/> |
<object name="Windhound" type="Monster" gid="10" width="21.6" height="21.6"/> |
||||||
</template> |
</template> |
||||||
|
@ -1,5 +1,5 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<template> |
<template> |
||||||
<tileset firstgid="1" source="Monsters.tsx"/> |
<tileset firstgid="1" source="../Monsters.tsx"/> |
||||||
<object name="Yellow Slime" type="Monster" gid="11" width="38.4" height="38.4"/> |
<object name="Yellow Slime" type="Monster" gid="11" width="38.4" height="38.4"/> |
||||||
</template> |
</template> |
||||||
|
Before Width: | Height: | Size: 12 KiB |
After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 12 KiB |
Binary file not shown.
Binary file not shown.
Loading…
Reference in new issue