diff --git a/js/script.js b/js/script.js
index 2b15b34..43cc217 100644
--- a/js/script.js
+++ b/js/script.js
@@ -1,4 +1,19 @@
const Biome = {
+<<<<<<< HEAD
+ WATER_DEEP: { acceptStructure: false, movements: ['swim'], affinities: [('water', 0.8), ('dark', 0.2)], name: 'Eau Profonde', winterColor: '#3D5A80', fallColor: '#3D5A80', summerColor: '#3D5A80', autumnColor: '#3D5A80', maxElevation: -1, minElevation: -4 },
+ WATER_SHALLOW: { acceptStructure: false, movements: ['swim', 'ride', 'navigate', 'fly'], affinities: [('water', 0.8), ('life', 0.2)], name: 'Eau Peu Profonde', winterColor: '#97aabdff', fallColor: '#5A8AB8', summerColor: '#5A8AB8', autumnColor: '#5A8AB8', maxElevation: 1, minElevation: -2 },
+ BEACH: { acceptStructure: true, movements: ['walk', 'ride', 'fly'], affinities: [('sand', 0.8), ('water', 0.2)], name: 'Sable', winterColor: '#E9D9A1', fallColor: '#E9D9A1', summerColor: '#E9D9A1', autumnColor: '#E9D9A1', maxElevation: 2, minElevation: 0 },
+ GRASSLAND: { acceptStructure: true, movements: ['walk', 'ride', 'fly'], affinities: [('life', 0.6), ('earth', 0.2)], name: 'Plaine', winterColor: '#ecf1e3ff', fallColor: '#98C159', summerColor: '#a5a450ff', autumnColor: '#455e21ff', maxElevation: 3, minElevation: -1 },
+ FOREST: { acceptStructure: true, movements: ['walk', 'ride', 'fly'], affinities: [('wood', 0.6), ('earth', 0.4)], name: 'Forêt', winterColor: '#92ac83ff', fallColor: '#21a32cff', summerColor: '#6A994E', autumnColor: '#b88a28ff', maxElevation: 3, minElevation: 0 },
+ ENCHANTED_FOREST: { acceptStructure: true, movements: ['walk', 'ride', 'fly'], affinities: [('wood', 0.8), ('dark', 0.2)('life', 0.2)], name: 'Forêt Enchantée', winterColor: '#7B6094', fallColor: '#7B6094', summerColor: '#7B6094', autumnColor: '#7B6094', maxElevation: 3, minElevation: 0 },
+ MOUNTAIN: { acceptStructure: false, movements: ['climb', 'fly'], affinities: [('rock', 0.6), ('wind', 0.4)], name: 'Montagne', winterColor: '#F7F7F7', fallColor: '#A9A9A9', summerColor: '#A9A9A9', autumnColor: '#A9A9A9', maxElevation: 4, minElevation: 3 },
+ SNOWLAND: { acceptStructure: true, movements: ['walk', 'ride', 'fly'], affinities: [('ice', 0.8), ('earth', 0.2)], name: 'Toundra', winterColor: '#F7F7F7', fallColor: '#F7F7F7', summerColor: '#F7F7F7', autumnColor: '#F7F7F7', maxElevation: 2, minElevation: -1 },
+ SNOWMOUNTAIN: { acceptStructure: false, movements: ['climb', 'fly'], affinities: [('ice', 0.4), ('rock', 0.4), ('wind', 0.2)], name: 'Mont enneigé', winterColor: '#F7F7F7', fallColor: '#F7F7F7', summerColor: '#F7F7F7', autumnColor: '#F7F7F7', maxElevation: 4, minElevation: 3 },
+ DESERT: { acceptStructure: true, movements: ['walk', 'ride', 'fly'], affinities: [('sand', 0.8), ('life', 0.1), ('fire', 0.1)], name: 'Désert', winterColor: '#D4A373', fallColor: '#D4A373', summerColor: '#D4A373', autumnColor: '#D4A373', maxElevation: 2, minElevation: 0 },
+ RIVER: { acceptStructure: false, movements: ['navigate', 'swim', 'fly'], affinities: [('water', 0.6), ('earth', 0.2), ('life', 0.2)], name: 'Rivière', winterColor: '#97aabdff', fallColor: '#5A8AB8', summerColor: '#5A8AB8', autumnColor: '#5A8AB8', maxElevation: 2, minElevation: -2 },
+ SWAMP: { acceptStructure: false, movements: ['fly'], affinities: [('water', 0.6), ('earth', 0.2), ('dark', 0.2)], name: 'Marais', winterColor: '#0b2e10ff', fallColor: '#0b2e10ff', summerColor: '#0b2e10ff', autumnColor: '#0b2e10ff', maxElevation: 1, minElevation: -1 }
+
+=======
WATER_DEEP: { acceptStructure:false, movements:['swim'], affinities:[('water',0.8),('dark',0.2)], name: 'Eau Profonde', winterColor: '#3D5A80', fallColor: '#3D5A80', summerColor: '#3D5A80', autumnColor: '#3D5A80',maxElevation:-1,minElevation:-4 },
WATER_SHALLOW: { acceptStructure:false,movements:['swim','ride','navigate','fly'], affinities:[('water',0.8),('life',0.2)],name: 'Eau Peu Profonde', winterColor: '#97aabdff', fallColor: '#5A8AB8', summerColor: '#5A8AB8', autumnColor: '#5A8AB8',maxElevation:1,minElevation:-2 },
BEACH: { acceptStructure:true, movements:['walk','ride','fly'],affinities:[('sand',0.8),('water',0.2)],name: 'Sable', winterColor: '#E9D9A1', fallColor: '#E9D9A1', summerColor: '#E9D9A1', autumnColor: '#E9D9A1',maxElevation:2 ,minElevation:0 },
@@ -12,6 +27,7 @@ const Biome = {
RIVER: { acceptStructure:false,movements:['navigate','swim','fly'],affinities:[('water',0.6),('earth',0.2),('life',0.2)],name: 'Rivière', winterColor: '#97aabdff', fallColor: '#5A8AB8', summerColor: '#5A8AB8', autumnColor: '#5A8AB8',maxElevation:2,minElevation:-2 },
SWAMP: { acceptStructure:false, movements:['fly'],affinities:[('water',0.6),('earth',0.2),('dark',0.2)],name: 'Marais', winterColor: '#0b2e10ff', fallColor: '#0b2e10ff', summerColor: '#0b2e10ff', autumnColor: '#0b2e10ff',maxElevation:1,minElevation:-1 }
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
}
const NAME_PREFIXES = ["Chêne", "Sombre", "Pierre", "Haut", "Val", "Mur", "Guet", "Clair"];
const NAME_SUFFIXES = ["bourg", "fort", "ville", "mont", "port", "bois", "rivage", "gard"];
@@ -23,6 +39,35 @@ const RACE = {
};
+<<<<<<< HEAD
+const Affinities = ['water', 'fire', 'sand', 'rock', 'dark', 'life', 'ice', 'wood', 'wind', 'metal', 'time', 'space', 'lava', 'light', 'spirit']
+
+const Slot = ['head', 'body', 'leg', 'foot', 'right-hand', 'left-hand', 'two-hands', 'finger1', 'finger2', 'neck', 'purse', 'backpack', 'belt1', 'belt2']
+
+const ItemType = {
+ lightWeapon: { slot: ('right-hand', 'left-hand', 'backpack'), soul: true, enchant: true },
+ heavyWeapon: { slot: ('two-hands', 'backpack'), soul: true, enchant: true },
+ heavyArmor: { slot: ('body', 'backpack'), soul: true, enchant: true },
+ lightArmor: { slot: ('body', 'backpack'), soul: true, enchant: true },
+ shield: { slot: ('right-hand', 'left-hand', 'backpack'), soul: true, enchant: true },
+ shoes: { slot: ('foot', 'backpack'), soul: true, enchant: true },
+ pant: { slot: ('leg', 'backpack'), soul: true, enchant: true },
+ helmet: { slot: ('leg', 'backpack'), soul: true, enchant: true },
+ potion: { slot: ('heal', 'backpack'), soul: false, enchant: false },
+ throwable: { slot: ('belt', 'backpack'), soul: true, enchant: true },
+ craftMaterial: { slot: ('right-hand', 'left-hand', 'backpack'), soul: false, enchant: false },
+ ring: { slot: ('finger1', 'finger2', 'backpack'), soul: true, enchant: true },
+ amulet: { slot: ('neck', 'backpack'), soul: true, enchant: true },
+ currency: { slot: ('purse'), soul: true, enchant: true },
+ enchantMaterial: { slot: ('backpack'), soul: false, enchant: false },
+ mercantMaterial: { slot: ('backpack'), soul: false, enchant: false }
+}
+
+const Items = {
+ 'Épée en Bois': { name: 'Épée en Bois', itemType: 'lightWeapon', stats: { strength: 2 }, icon: '🗡️', enchantments: [] },
+ 'Armure de Cuir': { name: 'Armure de Cuir', itemType: 'lightArmor', stats: { vitality: 2 }, icon: '🧥', enchantments: [] },
+ 'Claymore': { name: 'Claymore', itemType: 'lightArmor', stats: { vitality: 2 }, icon: '🧥', enchantments: ['primal'], soul: new soul('cleaver', 'test') }
+=======
const Slot = ['head','body','leg','foot','right-hand','left-hand','two-hands','finger1','finger2','neck','purse','backpack','belt1','belt2'];
@@ -55,14 +100,21 @@ const Items = {
'Fer': { name: 'Fer', itemType: 'craftMaterial', icon: '🔩',biome:['MOUNTAIN'],occurence:0.001},
'Mushroom': { name: 'Champignons', itemType: 'craftMaterial', icon: '🍄',biome:['FOREST'],occurence:0.01},
'gold': { name: 'Champignons', itemType: 'mercantMaterial', icon: '💰',biome:['MOUNTAIN','RIVER'],occurence:0.001}
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
};
const StructureType = {
+<<<<<<< HEAD
+ 'Épée en Bois': { name: 'Épée en Bois', itemType: 'lightWeapon', stats: { strength: 2 }, icon: '🗡️', enchantments: [] },
+ 'Armure de Cuir': { name: 'Armure de Cuir', itemType: 'lightArmor', stats: { vitality: 2 }, icon: '🧥', enchantments: [] },
+ 'Claymore': { name: 'Claymore', itemType: 'lightArmor', stats: { vitality: 2 }, icon: '🧥', enchantments: ['primal'], soul: new soul('cleaver', 'test') }
+=======
TOWN: { name: 'Ville', population:15, icon: '🗡️', occurence:0.001,design: ``},
VILLAGE: { name: 'Village', population:5, icon: '🗡️',occurence:0.005, design: ``},
FARM: { name: 'Ferme', population:5, icon: '🗡️',occurence:0.010 },
CAMP:{ name: 'Campement', population:2, icon: '⛺',occurence:0.002 },
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
};
const MONSTER_TYPES = {
@@ -71,6 +123,35 @@ const MONSTER_TYPES = {
};
const ANIMAL_TYPES = {
+<<<<<<< HEAD
+ WOLF: { name: 'Loup', icon: '🐺', hp: 20, strength: 4, xp: 15, loot: { 'Cuir': 1, 'Os': 1 } },
+ BOAR: { name: 'Sanglier', icon: '🐗', hp: 25, strength: 5, xp: 20, loot: { 'Cuir': 2 } },
+};
+
+class world {
+
+ constructor() {
+ this.x = x;
+ this.y = y;
+ this.h = h;
+ }
+ setPosition(x, y, z) {
+ this.x = x;
+ this.y = y;
+ this.h = h;
+ }
+
+ getPosition() {
+ return { x: this.x, y: this.y, z: this.z };
+ }
+ // Méthode de l'objet
+}
+
+
+class position {
+
+ constructor(x, y, z) {
+=======
WOLF: { name: 'Loup', icon: '🐺', hp: 20, strength: 4, xp: 15, loot: { 'Cuir': 1, 'Os': 1 }, design: ``},
BOAR: { name: 'Sanglier', icon: '🐗', hp: 25, strength: 5, xp: 20, loot: { 'Cuir': 2 } },
};
@@ -79,11 +160,12 @@ const ANIMAL_TYPES = {
class position {
constructor(x,y,z) {
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
this.x = x;
this.y = y;
this.h = h;
}
- setPosition(x,y,z) {
+ setPosition(x, y, z) {
this.x = x;
this.y = y;
this.h = h;
@@ -92,6 +174,8 @@ class position {
getPosition() {
return { x: this.x, y: this.y, z: this.z };
}
+<<<<<<< HEAD
+=======
cartToIso() {
return {
@@ -99,12 +183,18 @@ class position {
y: (this.x + this.y) * 16
}
}
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
// Méthode de l'objet
}
class tile {
+<<<<<<< HEAD
+
+ constructor(position, biome, elevation) {
+=======
constructor(position,elevation) {
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
this.position = position;
this.biome = this.setBiome();
this.elevation = this.setElevation();
@@ -118,13 +208,25 @@ class tile {
if (!Object.values(Biome).includes(biome)) {
throw new Error('Biome invalide !');
}
- this.biome=biome;
+ this.biome = biome;
}
setBiome() {
let scale = 0.05;
let eRaw = (simplex.noise2D(x * scale, y * scale) + 1) / 2;
let tRaw = (simplex.noise2D(x * scale * 0.8, y * scale * 0.8) + 1) / 2;
let mRaw = (simplex.noise2D(x * scale * 1.5, y * scale * 1.5) + 1) / 2;
+<<<<<<< HEAD
+
+ if (eRaw < 0.25) biome = BIOMES.WATER_DEEP;
+ else if (eRaw < 0.3) biome = BIOMES.WATER_SHALLOW;
+ else if (eRaw < 0.35) biome = BIOMES.SAND;
+ else if (eRaw > 0.85) biome = BIOMES.SNOW;
+ else if (eRaw > 0.75) biome = BIOMES.MOUNTAIN;
+ else {
+ if (tRaw < 0.3) biome = BIOMES.DESERT;
+ else if (tRaw > 0.6) biome = (mRaw > 0.7) ? BIOMES.ENCHANTED_FOREST : BIOMES.FOREST;
+ else biome = BIOMES.GRASSLAND;
+=======
if (eRaw < 0.25) this.biome = BIOMES.WATER_DEEP;
else if (eRaw < 0.3) this.biome = BIOMES.WATER_SHALLOW;
@@ -193,34 +295,85 @@ class tile {
this.structure = { type: 'city', name: NAME_PREFIXES[Math.floor(rand() * NAME_PREFIXES.length)] + NAME_SUFFIXES[Math.floor(rand() * NAME_SUFFIXES.length)], population: TOWN.population + Math.floor(rand() * 150), buildings: ['Remparts', 'Place Forte (Château)', 'Grand Marché', 'Forge', 'Alchimiste', 'Enchanteur', 'Écurie', 'Ferme', 'Ferme', 'Ferme', 'Ferme', 'Ferme', 'Lieu de Culte', 'Nombreuses Maisons'] };
} else if (structureChance < 0.02 && this.tile.biome.acceptStructure) {
this.structure = { type: 'village', name: NAME_PREFIXES[Math.floor(rand() * NAME_PREFIXES.length)] + NAME_SUFFIXES[Math.floor(rand() * NAME_SUFFIXES.length)], population: VILLAGE.population + Math.floor(rand() * 20), buildings: ['Maison du Chef', 'Marchand', 'Lieu de Culte', 'Ferme', 'Ferme', 'Plusieurs Maisons'] };
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
}
if (!this.tile && this.tile.biome === BIOMES.GRASSLAND && Math.random() < 0.2) {
this.structure={type:'farm', name: 'farm', population: 2, buildings: []}
// npcs.push({ x: nx, y: ny, homeX: loc.x, homeY: loc.y, workX: nx, workY: ny, type: 'farmer', icon: '🧑🌾' });
}
}
+<<<<<<< HEAD
+ setExplored(explored) {
+ this.explored = explored;
+ }
+ setElevation() {
+ this.elevation = Math.floor(Math.random() * (this.biome.maxElevation - this.biome.minElevation + 1) + this.biome.minElevation);
+ }
+ setStructure() {
+ var structureChance = rand();
+ if (structureChance < 0.005) {
+ structure = { type: 'city', name: NAME_PREFIXES[Math.floor(rand() * NAME_PREFIXES.length)] + NAME_SUFFIXES[Math.floor(rand() * NAME_SUFFIXES.length)], population: 100 + Math.floor(rand() * 150), buildings: ['Remparts', 'Place Forte (Château)', 'Grand Marché', 'Forge', 'Alchimiste', 'Enchanteur', 'Écurie', 'Ferme', 'Ferme', 'Ferme', 'Ferme', 'Ferme', 'Lieu de Culte', 'Nombreuses Maisons'] };
+ structureLocations.push({ x, y, type: 'city' });
+ } else if (structureChance < 0.02) {
+ structure = { type: 'village', name: NAME_PREFIXES[Math.floor(rand() * NAME_PREFIXES.length)] + NAME_SUFFIXES[Math.floor(rand() * NAME_SUFFIXES.length)], population: 20 + Math.floor(rand() * 20), buildings: ['Maison du Chef', 'Marchand', 'Lieu de Culte', 'Ferme', 'Ferme', 'Plusieurs Maisons'] };
+ structureLocations.push({ x, y, type: 'village' });
+ }
+ if (!this.tile && this.tile.biome === BIOMES.GRASSLAND && Math.random() < 0.2) {
+ tile.isFarm = true;
+ tile.farmCrop = null;
+ tile.farmHarvested = false;
+ // npcs.push({ x: nx, y: ny, homeX: loc.x, homeY: loc.y, workX: nx, workY: ny, type: 'farmer', icon: '🧑🌾' });
+ }
+ }
+=======
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
}
class map {
constructor(size) {
this.map_size = size;
this.tiles = initializeMap();
}
+<<<<<<< HEAD
+
+ initializeMap() {
+ console.time('Map Generation');
+ const simplex = new SimplexNoise();
+ mapData = Array(this.map_size).fill(null).map((_, y) => Array(this.map_size).fill(null).map((_, x) => {
+
+ }
+=======
initializeMap(){
console.time('Map Generation');
const simplex = new SimplexNoise();
this.tiles = Array(size).fill(null).map((_, y) => Array(size).fill(null).map((_, x) => new Tile(new Position(x, y))));
}
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
}
class Time {
constructor() {
this.year = 812;
this.month = 1;
- this.day=13;
- this.season='winter';
- this.hour=12;
- this.day=true;
+ this.day = 13;
+ this.season = 'winter';
+ this.hour = 12;
+ this.day = true;
}
+<<<<<<< HEAD
+
+ tick() {
+ this.hour = (this.hour + 1) % 24
+ if (this.hour == 1) this.day = (this.day + 1) % 30
+ if (this.day == 1) { this.month = (this.month + 1) % 12; }
+ if (this.month == 1) { this.year = (this.year + 1); }
+ if (this.month == 6 && this.day == 21) { this.season = 'summer'; }
+ if (this.month == 9 && this.day == 21) { this.season = 'autumn'; }
+ if (this.month == 12 && this.day == 21) { this.season = 'winter'; }
+ if (this.month == 3 && this.day == 21) { this.season = 'fall'; }
+ }
+
+ wait(nbrHour) {
+=======
tick(){
this.hour=(this.hour+1) % 24
@@ -234,6 +387,7 @@ class Time {
}
wait(nbrHour){
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
for (let i = 0; i < nbrHour; i++) {
this.tick();
}
@@ -243,12 +397,12 @@ class Time {
}
class attributes {
constructor(race) {
- this.strength=race.strength;
- this.vitality=race.vitality;
- this.dexterity=race.dexterity;
- this.intelligence=race.intelligence;
- this.wisdom=race.wisdom;
- this.luck=rand();
+ this.strength = race.strength;
+ this.vitality = race.vitality;
+ this.dexterity = race.dexterity;
+ this.intelligence = race.intelligence;
+ this.wisdom = race.wisdom;
+ this.luck = rand();
}
// Méthode de l'objet
@@ -256,7 +410,11 @@ class attributes {
}
class creature {
+<<<<<<< HEAD
+ constructor(name, attributes, level, affinities, name, alignments, position, species, race, hp, items) {
+=======
constructor(name,attributes,level,affinities,alignments,tile,species,race,hp,items) {
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
this.name = name;
this.attributes = attributes;
this.level = level;
@@ -265,6 +423,13 @@ class creature {
this.alignments = alignments;
this.species = species;
this.race = race;
+<<<<<<< HEAD
+ this.hp = hp;
+ }
+
+ fight() {
+
+=======
this.tile=tile;
this.items=items;
this.hp=hp;
@@ -272,15 +437,16 @@ class creature {
fight(){
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
}
// Méthode de l'objet
}
class npc {
- constructor(name,creature,settlement,equipments) {
- this.creature=creature;
- this.settlement=settlement;
- this.equipments=equipments;
+ constructor(name, creature, settlement, equipments) {
+ this.creature = creature;
+ this.settlement = settlement;
+ this.equipments = equipments;
}
talk() {
@@ -299,6 +465,15 @@ class npc {
}
class player {
+<<<<<<< HEAD
+ constructor(name, creature, equipments) {
+ this.creature = creature;
+ this.equipments = equipments;
+
+ }
+ move(position) {
+ this.position = position
+=======
constructor(creature,equipments) {
this.creature=creature;
this.equipments=equipments;
@@ -325,6 +500,7 @@ class player {
ctx.lineWidth = 2;
ctx.stroke();
ctx.restore();
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
}
move(dx, dy) {
const newX = this.position.x + dx;
@@ -340,17 +516,23 @@ class player {
}
rename(name) {
- this.name=name;
+ this.name = name;
}
+<<<<<<< HEAD
+
+ equipItem(item, slot) {
+ equipment.equip(item, slot);
+=======
equipItem(item,slot) {
equipment.equip(item,slot);
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
updateAttribute();
}
}
class settlement {
- constructor(level,affinities,name,alignments,position,structures) {
+ constructor(level, affinities, name, alignments, position, structures) {
this.level = level;
this.affinities = affinities;
this.name = name;
@@ -362,14 +544,19 @@ class settlement {
}
class resource {
- constructor(resourceType,position) {
+ constructor(resourceType, position) {
this.resourceType = resourceType;
this.position = position;
}
+<<<<<<< HEAD
+
+ collect(creature) {
+=======
collect(tile){
}
collect(creature){
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
// check if creature can collect
// transfer resulting items creature.items[]=this.resourceType.item
this = null;//end object
@@ -378,8 +565,13 @@ class resource {
}
class equipment {
+<<<<<<< HEAD
+
+ constructor(item, slot) {
+=======
constructor(item,slot) {
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
this.item = item;
this.slot = slot;
}
@@ -396,13 +588,27 @@ class equipment {
}
}
class soul {
+<<<<<<< HEAD
+
+ constructor(name, description) {
+=======
constructor(name,description) {
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
this.name = name;
this.description = description;
}
// Méthode de l'objet
invoke() {
+<<<<<<< HEAD
+ //replace current equipment
+
+ }
+}
+class item {
+
+ constructor(name, duration, itemType) {
+=======
//
}
@@ -410,12 +616,17 @@ class soul {
class item {
constructor(name,duration,itemType) {
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
this.name = name;
if (!Object.values(ItemType).includes(itemType)) {
throw new Error('Item type invalide !');
- }
+ }
this.itemType = itemType;
+<<<<<<< HEAD
+ if (duration) {
+=======
if (duration){
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
this.duration = itemType.duration
} else {
this.duration = duration
@@ -429,10 +640,17 @@ class item {
destroy() {
this = null;
}
+<<<<<<< HEAD
+ use() {
+ if (this.duration > 1) {
+ this.duration = this.duration - 1
+ }
+=======
use(){
if (this.duration >1) {
this.duration = this.duration-1
}
+>>>>>>> 1ece079030882bb9218aa5648cc24f2585c0147a
else {
this.destroy();
}