Skip to content

Commit

Permalink
fix(crypts): add encounters and fix path to boss
Browse files Browse the repository at this point in the history
justindujardin committed Oct 26, 2022
1 parent 5ecbd76 commit c83a040
Showing 10 changed files with 84 additions and 28 deletions.
4 changes: 4 additions & 0 deletions angular-rpg.tiled-project
Original file line number Diff line number Diff line change
@@ -306,6 +306,7 @@
{
"id": 18,
"name": "MagicsStoreFeatureComponent",
"color": "#ffa41341",
"type": "class",
"useAs": [
"object",
@@ -477,6 +478,7 @@
{
"id": 19,
"name": "WeaponsStoreFeatureComponent",
"color": "#ffa41341",
"type": "class",
"useAs": [
"object",
@@ -494,6 +496,7 @@
{
"id": 20,
"name": "ArmorsStoreFeatureComponent",
"color": "#ffa41341",
"type": "class",
"useAs": [
"object",
@@ -511,6 +514,7 @@
{
"id": 21,
"name": "ItemsStoreFeatureComponent",
"color": "#ffa41341",
"type": "class",
"useAs": [
"object",
25 changes: 19 additions & 6 deletions src/app/models/game-data/enemies.ts
Original file line number Diff line number Diff line change
@@ -108,15 +108,28 @@ export const ENEMIES_DATA: ITemplateEnemy[] = [
{
id: 'skeleton',
name: 'Skeleton',
level: 3,
level: 4,
icon: 'skeleton.png',
exp: 12,
exp: 30,
gold: 20,
hp: 15,
hp: 50,
mp: 0,
attack: 12,
defense: 6,
hitpercent: 20,
attack: 14,
defense: 9,
hitpercent: 25,
},
{
id: 'ghoul',
name: 'Ghoul',
level: 4,
icon: 'ghoul.png',
exp: 30,
gold: 20,
hp: 100,
mp: 0,
attack: 25,
defense: 9,
hitpercent: 15,
},
{
id: 'goblin-scout',
37 changes: 37 additions & 0 deletions src/app/models/game-data/fixed-encounters.ts
Original file line number Diff line number Diff line change
@@ -70,6 +70,43 @@ export const FIXED_ENCOUNTERS_DATA: ITemplateFixedEncounter[] = [
'He is enormous and flanked by well-equipped soldiers.',
],
},
// Crypt
{
id: 'crypt-skeletons',
enemies: ['skeleton', 'skeleton', 'skeleton', 'skeleton', 'skeleton', 'skeleton'],
experience: 500,
gold: 400,
message: ['A squadron of Skeletons attack!'],
},
{
id: 'crypt-ghouls',
enemies: ['ghoul', 'ghoul'],
experience: 200,
gold: 100,
message: [
'As you pass through the door, you are ambushed by horrific, frightening creatures!',
],
},
{
id: 'crypt-phantoms',
enemies: ['goblin-archer'],
experience: 0,
gold: 0,
message: [
'Two phantasmal forms emerge, seemingly only partially present in this realm.',
],
},
{
id: 'crypt-wizard',
enemies: ['goblin-archer'],
experience: 0,
gold: 0,
message: [
'A Skeleton Wizard shrieks!',
'With my power, we can convert the dead into an an unstoppable army against the living!',
'It and its minions attack!',
],
},
];

/** Get a fixed encounter descriptor given its id value */
Binary file added src/art/sprites/objects/transparent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/assets/maps/castle.tmx
Original file line number Diff line number Diff line change
@@ -195,10 +195,10 @@
<property name="sellRate" value="20"/>
</properties>
</object>
<object id="19" name="Ashvari Magics" class="ItemsStoreFeatureComponent" gid="169" x="64" y="128" width="16" height="16">
<object id="19" name="Ashvari Apothecary" class="ItemsStoreFeatureComponent" gid="169" x="64" y="128" width="16" height="16">
<properties>
<property name="inventory" propertytype="DataItems" value="potion"/>
<property name="name" value="Ashvari Magics"/>
<property name="name" value="Ashvari Apothecary"/>
</properties>
</object>
<object id="20" name="temple.png" class="TempleFeatureComponent" gid="170" x="64" y="32" width="16" height="16">
4 changes: 3 additions & 1 deletion src/assets/maps/combat.tmx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="21" nextobjectid="8">
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="21" nextobjectid="10">
<properties>
<property name="music" value="assets/music/CombatTheme"/>
</properties>
@@ -223,9 +223,11 @@
<objectgroup id="9" name="Features">
<object id="1" name="p2" class="combatant" x="304" y="80" width="16" height="16"/>
<object id="2" name="e4" class="combatant" x="208" y="96" width="16" height="16"/>
<object id="8" name="e6" class="combatant" x="240" y="96" width="16" height="16"/>
<object id="3" name="e1" class="combatant" x="176" y="64" width="16" height="16"/>
<object id="4" name="e2" class="combatant" x="176" y="96" width="16" height="16"/>
<object id="5" name="e3" class="combatant" x="208" y="64" width="16" height="16"/>
<object id="9" name="e5" class="combatant" x="240" y="64" width="16" height="16"/>
<object id="6" name="p3" class="combatant" x="304" y="112" width="16" height="16"/>
<object id="7" name="p1" class="combatant" x="304" y="48" width="16" height="16"/>
</objectgroup>
16 changes: 5 additions & 11 deletions src/assets/maps/crypt.tmx
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@
40,32,32,32,32,23,32,32,23,32,32,32,32,32,32,32,32,32,32,32,32,32,32,23,32,
32,32,23,23,23,23,32,23,23,23,32,23,32,32,32,32,32,32,32,32,32,32,32,23,32,
32,32,23,23,32,23,32,23,23,23,32,23,32,32,32,32,32,32,32,23,23,32,32,23,32,
32,32,32,32,32,23,32,32,23,32,32,23,32,32,23,23,23,23,23,23,23,23,32,23,32,
32,32,32,32,32,23,32,32,23,32,32,23,32,32,23,23,23,23,77,23,23,23,32,23,32,
32,32,23,23,23,23,23,23,23,23,23,23,23,23,23,32,32,32,32,23,23,23,32,23,32,
32,32,23,23,32,32,32,32,32,32,32,32,32,32,23,23,23,23,32,32,32,23,23,23,32,
32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32
@@ -80,7 +80,7 @@
<property name="creatures" value=""/>
<property name="gold" value="12"/>
<property name="icon" value="skeletonGuard.png"/>
<property name="id" value="cryptsSkeletons"/>
<property name="id" value="crypt-skeletons"/>
<property name="items" value=""/>
<property name="text" value="A squadron of Skeletons attack!"/>
<property name="type" value="encounter"/>
@@ -92,21 +92,15 @@
<property name="creatures" value=""/>
<property name="gold" value="19"/>
<property name="icon" value="ghoul.png"/>
<property name="id" value="cryptsGhoul"/>
<property name="id" value="crypt-ghouls"/>
<property name="items" value=""/>
<property name="text" value="As you pass through the door, you are ambushed by horrific, frightening creatures!"/>
<property name="type" value="encounter"/>
</properties>
</object>
<object id="7" name="phantom2.png" class="CombatFeatureComponent" gid="145" x="224" y="352" width="16" height="16">
<properties>
<property name="creatures" value=""/>
<property name="gold" value="9"/>
<property name="icon" value="phantom2.png"/>
<property name="id" value="cryptsPhantom"/>
<property name="items" value=""/>
<property name="text" value="Two phantasmal forms emerge, seemingly only partially present in this realm."/>
<property name="type" value="encounter"/>
<property name="id" value="crypt-phantoms"/>
</properties>
</object>
<object id="9" name="skeletonWizard.png" class="CombatFeatureComponent" gid="153" x="160" y="32" width="16" height="16">
@@ -115,7 +109,7 @@
<property name="creatures" value=""/>
<property name="gold" value="37"/>
<property name="icon" value="skeletonWizard.png"/>
<property name="id" value="cryptsWizard"/>
<property name="id" value="crypt-wizard"/>
<property name="items" value=""/>
<property name="text" value="A Skeleton Wizard shrieks, &quot;With Vezu's power, we can convert the dead into an an unstoppable army against the living!&quot; It and its minions attack!"/>
<property name="type" value="encounter"/>
5 changes: 4 additions & 1 deletion src/assets/maps/tiles/objects.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.9" tiledversion="1.9.2" name="../../images/objects.png" tilewidth="16" tileheight="16" tilecount="19" columns="0" objectalignment="topleft">
<tileset version="1.9" tiledversion="1.9.2" name="../../images/objects.png" tilewidth="16" tileheight="16" tilecount="20" columns="0" objectalignment="topleft">
<grid orientation="orthogonal" width="1" height="1"/>
<tile id="0">
<image width="16" height="16" source="../../../art/sprites/objects/bigCastleCenter.png"/>
@@ -58,4 +58,7 @@
<tile id="18">
<image width="16" height="16" source="../../../art/sprites/objects/woodenDoor.png"/>
</tile>
<tile id="20">
<image width="16" height="16" source="../../../art/sprites/objects/transparent.png"/>
</tile>
</tileset>
13 changes: 6 additions & 7 deletions src/assets/maps/village.tmx
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="14" height="21" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="5">
<tileset firstgid="1" source="tiles/environment.tsx"/>
<tileset firstgid="72" source="tiles/objects.tsx"/>
<tileset firstgid="91" source="tiles/creatures.tsx"/>
<tileset firstgid="93" source="tiles/creatures.tsx"/>
<layer id="1" name="Terrain" width="14" height="21">
<data encoding="csv">
57,57,57,57,57,57,57,18,18,18,18,18,18,18,
@@ -14,8 +14,8 @@
57,57,46,46,33,46,46,46,46,18,18,18,18,18,
57,57,46,46,33,33,33,46,46,18,18,18,18,18,
57,57,57,46,33,17,33,46,18,18,18,18,18,18,
33,33,33,33,33,33,33,46,18,18,18,18,18,18,
57,57,57,57,46,46,33,46,18,18,18,18,18,18,
46,46,46,46,33,33,33,46,18,18,18,18,18,18,
57,57,57,46,46,46,33,46,18,18,18,18,18,18,
57,57,57,57,57,46,33,46,18,18,18,18,18,18,
57,57,57,57,57,46,33,69,18,18,18,18,18,18,
57,57,57,57,57,69,33,46,18,18,18,18,18,18,
@@ -29,15 +29,14 @@
</data>
</layer>
<objectgroup id="2" name="Features">
<object id="1" name="wilderness" class="PortalFeatureComponent" gid="90" x="0" y="144" width="16" height="16">
<object id="1" name="exit" class="PortalFeatureComponent" gid="92" x="0" y="144" width="16" height="16">
<properties>
<property name="icon" value="doorway.png"/>
<property name="target" type="file" value="wilderness.tmx"/>
<property name="targetX" value="31"/>
<property name="targetY" value="27"/>
</properties>
</object>
<object id="2" name="Elder" class="DialogFeatureComponent" gid="139" x="128" y="64" width="16" height="16">
<object id="2" name="Elder" class="DialogFeatureComponent" gid="141" x="128" y="64" width="16" height="16">
<properties>
<property name="icon" value=""/>
<property name="text" value="Ho ho, you found me. Good for you."/>
@@ -51,7 +50,7 @@
<property name="icon" value="temple.png"/>
</properties>
</object>
<object id="4" class="ArmorsStoreFeatureComponent" gid="84" x="64" y="48" width="16" height="16">
<object id="4" name="armors" class="ArmorsStoreFeatureComponent" gid="84" x="64" y="48" width="16" height="16">
<properties>
<property name="inventory" propertytype="DataArmors" value="leather-shield,leather-armor,apprentice-hat"/>
</properties>
4 changes: 4 additions & 0 deletions src/write-game-data.ts
Original file line number Diff line number Diff line change
@@ -71,6 +71,7 @@ const data: PropertyTypes[] = [
},
{
name: 'WeaponsStoreFeatureComponent',
color: '#ffa41341',
type: 'class',
useAs: ['object', 'tile'],
members: [
@@ -91,6 +92,7 @@ const data: PropertyTypes[] = [
},
{
name: 'ArmorsStoreFeatureComponent',
color: '#ffa41341',
type: 'class',
useAs: ['object', 'tile'],
members: [
@@ -111,6 +113,7 @@ const data: PropertyTypes[] = [
},
{
name: 'ItemsStoreFeatureComponent',
color: '#ffa41341',
type: 'class',
useAs: ['object', 'tile'],
members: [
@@ -131,6 +134,7 @@ const data: PropertyTypes[] = [
},
{
name: 'MagicsStoreFeatureComponent',
color: '#ffa41341',
type: 'class',
useAs: ['object', 'tile'],
members: [

0 comments on commit c83a040

Please sign in to comment.