drugwars - npm Package Compare versions

Comparing version 0.1.19 to 0.1.20

lib/army.js

@@ -95,3 +95,3 @@ 'use strict';
         });
-        if (protection) unit.defense = unit.defense + unit.defense / 5 * protection.lvl;
+        if (protection) unit.defense = unit.defense + unit.defense / 200 * protection.lvl;
         if (giant) unit.health = unit.health + unit.health / 200 * giant.lvl;
@@ -98,0 +98,0 @@ //ALL MELEE

lib/card.js

@@ -55,2 +55,3 @@ 'use strict';
     this.quality = quality;
+    this.seed = seed;
     this.attack = 0;
@@ -57,0 +58,0 @@ this.health = 0;

lib/continents.json

     [{
         "id":"na",
         "name": "North America",
-        "locations": [2,273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 402,403,404,405,406,407,408,409,410,411,412,413,414,415,416]
+        "locations": [273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 402]
       },
@@ -14,3 +14,3 @@ {
         "name": "Europe",
-        "locations": [43, 44, 51, 52, 53, 54, 61, 62, 63, 64,72, 73,80, 81,82, 83, 84, 85, 86,87, 88, 89, 279, 326, 452, 453, 454, 458, 459]
+        "locations": [43, 44, 51, 52, 53, 54, 61, 62, 63, 73, 81, 83, 84, 85, 86, 88, 89, 279, 326, 452, 453, 454, 458, 459]
       },
@@ -25,3 +25,3 @@ {
         "name": "Africa",
-        "locations": [3, 74, 75, 76, 77, 78,79, 95, 101, 102, 109, 110, 117, 118, 126, 127, 128, 136,137,138, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 417, 418, 419, 420, 421, 422,423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 455, 456, 457]
+        "locations": [3, 74, 75, 76, 77, 78, 95, 101, 102, 109, 110, 117, 118, 126, 127, 128, 136, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 417, 418, 419, 420, 421, 422, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 455, 456, 457]
       },
@@ -28,0 +28,0 @@ {

lib/drugs.json

@@ -7,6 +7,6 @@ [
       "location":["na","sa","eu","an","af","as","oc"],
-      "id": "marijuana",
+      "id": "weed",
       "name": "Marijuana",
-      "description": "Marijuana is indigenous to Central and South Asia. There is evidence of inhalation of cannabis smoke from the 3rd millennium BCE, namely charred cannabis seeds found in a ritual brazier at an ancient burial site in present-day Romania. In 2003, a leather basket filled with cannabis leaf fragments and seeds was found next to a 2,500- to 2,800-year-old mummified shaman in the northwestern Xinjiang Uygur Autonomous Region of China. Evidence of cannabis consumption was also found \r\n\t in Egyptian mummies dated about 950 BC. Cannabis was also used by the ancient Hindus of India and Nepal thousands of years ago. ",
-      "icon": "marijuana_icon.png",
+      "description": "Cannabis is indigenous to Central and South Asia. There is evidence of inhalation of cannabis smoke from the 3rd millennium BCE, namely charred cannabis seeds found in a ritual brazier at an ancient burial site in present-day Romania. In 2003, a leather basket filled with cannabis leaf fragments and seeds was found next to a 2,500- to 2,800-year-old mummified shaman in the northwestern Xinjiang Uygur Autonomous Region of China. Evidence of cannabis consumption was also found \r\n\t in Egyptian mummies dated about 950 BC. Cannabis was also used by the ancient Hindus of India and Nepal thousands of years ago. The herb is called ganja (Sanskrit ga�ja) or ganjika in Sanskrit and other modern Indo-Aryan languages. Some scholars suggest that the ancient drug soma, mentioned in the Vedas, was cannabis, although this theory is disputed.",
+      "icon": "weed_icon.png",
       "weight": 0,
@@ -28,14 +28,2 @@ "volume": 0
     {
-      "maxprice": 5,
-      "minprice": 1,
-      "effect": null,
-      "location":["na","eu","oc","as"],
-      "id": "poppers",
-      "name": "Poppers",
-      "description": "Popper is a slang term given broadly to the chemical class called alkyl nitrites, that are inhaled. It is used for practical purposes to facilitate anal sex by increasing blood flow and relaxing sphincter muscles or for recreational drug purposes, typically for the 'high' or 'rush' that the drug can create. Poppers have also been historically used for sexual encounters, initially within the gay community.",
-      "icon": "poppers_icon.png",
-      "weight": 0,
-      "volume": 0
-    },
-    {
       "maxprice": 20,
@@ -105,6 +93,6 @@ "minprice": 3,
       "location":["na","eu","as"],
-      "id": "meth",
-      "name": "methamphetamine",
-      "description": "Methamphetamine was discovered in 1893, it is a potent central nervous system stimulant that is mainly used as a recreational drug and less commonly as a second-line treatment for attention deficit hyperactivity disorder and obesity.",
-      "icon": "meth_icon.png",
+      "id": "amphet",
+      "name": "Amphetamine",
+      "description": "Amphetamine was first synthesized in 1887 in Germany by Romanian chemist Lazar Edeleanu who named it phenylisopropylamine, its stimulant effects remained unknown until 1927, when it was independently resynthesized by Gordon Alles and reported to have sympathomimetic properties. Amphetamine had no pharmacological use until 1934, when Smith, Kline and French began selling it as an inhaler under the trade name Benzedrine as a decongestant. Benzedrine sulfate was introduced three years later and found a wide variety of medical applications, including narcolepsy. During World War II, amphetamine and methamphetamine were used extensively by both the Allied and Axis forces for their stimulant and performance-enhancing effects. As the addictive properties of the drug became known, governments began to place strict controls on the sale of amphetamine.",
+      "icon": "amphet_icon.png",
       "weight": 0,
@@ -120,3 +108,3 @@ "volume": 0
       "name": "MDMA",
-      "description": "MDMA was first synthesized in 1912 by Merck chemist Anton Köllisch. At the time, Merck was interested in developing substances that stopped abnormal bleeding. Merck wanted to avoid an existing patent held by Bayer for one such compound hydrastinine. Köllisch developed a preparation of a hydrastinine analogue, methylhydrastinine, at the request of fellow lab members, Walther Beckh and Otto Wolfes. MDMA (called methylsafrylamin, safrylmethylamin or N-Methyl-a-Methylhomopiperonylamin in Merck laboratory reports) was an intermediate compound in the synthesis of methylhydrastinine. Merck was not interested in MDMA itself at the time.On 24 December 1912, Merck filed two patent applications that described the synthesis and some chemical properties of MDMAand its subsequent conversion to methylhydrastinine.",
+      "description": "MDMA was first synthesized in 1912 by Merck chemist Anton K�llisch. At the time, Merck was interested in developing substances that stopped abnormal bleeding. Merck wanted to avoid an existing patent held by Bayer for one such compound hydrastinine. K�llisch developed a preparation of a hydrastinine analogue, methylhydrastinine, at the request of fellow lab members, Walther Beckh and Otto Wolfes. MDMA (called methylsafrylamin, safrylmethylamin or N-Methyl-a-Methylhomopiperonylamin in Merck laboratory reports) was an intermediate compound in the synthesis of methylhydrastinine. Merck was not interested in MDMA itself at the time.On 24 December 1912, Merck filed two patent applications that described the synthesis and some chemical properties of MDMAand its subsequent conversion to methylhydrastinine.",
       "icon": "mdma_icon.png",
@@ -133,3 +121,3 @@ "weight": 0,
       "name": "LSD",
-      "description": "LSD was first synthesized on November 16, 1938 by Swiss chemist Albert Hofmann at the Sandoz Laboratories in Basel, Switzerland as part of a large research program searching for medically useful ergot alkaloid derivatives. LSD's psychedelic properties were discovered 5 years later when Hofmann himself accidentally ingested an unknown  quantity of the chemical. The first intentional ingestion of LSD occurred on April 19, 1943, when Hofmann ingested 250 micrograms of LSD. He said this would be a threshold dose based on the dosages of other ergot alkaloids. Hofmann found the effects to be much stronger than he anticipated.",
+      "description": "LSD was first synthesized on November 16, 1938 by Swiss chemist Albert Hofmann at the Sandoz Laboratories in Basel, Switzerland as part of a large research program searching for medically useful ergot alkaloid derivatives. LSD's psychedelic properties were discovered 5 years later when Hofmann himself accidentally ingested an unknown  quantity of the chemical. The first intentional ingestion of LSD occurred on April 19, 1943, when Hofmann ingested 250 �g of LSD. He said this would be a threshold dose based on the dosages of other ergot alkaloids. Hofmann found the effects to be much stronger than he anticipated. Sandoz Laboratories introduced LSD as a psychiatric drug in 1947.",
       "icon": "lsd_icon.png",
@@ -170,3 +158,3 @@ "weight": 0,
       "name": "Cocaine",
-      "description": "For over a thousand years South American indigenous peoples have chewed the leaves of Erythroxylon coca, a plant that contains vital nutrients as well as numerous alkaloids, including cocaine. The coca leaf was, and still is, chewed almost universally by some indigenous communities. The remains of coca leaves have been found with ancient Peruvian mummies, and pottery from the time period depicts humans with bulged cheeks, indicating the presence of something on which they are chewing. There is also evidence that these cultures used a mixture of coca leaves and saliva as an anesthetic for the performance of trepanation. When the Spanish arrived in South America, most at first ignored aboriginal claims that the leaf gave them strength and energy, and declared the practice of chewing it the work of the Devil. But after discovering that these claims were true, they legalized and taxed the leaf, taking 10% off the value of each crop. In 1569, Nicolás Monardes described the indigenous peoples' practice of chewing a mixture of tobacco and coca leaves to induce great contentment.",
+      "description": "For over a thousand years South American indigenous peoples have chewed the leaves of Erythroxylon coca, a plant that contains vital nutrients as well as numerous alkaloids, including cocaine. The coca leaf was, and still is, chewed almost universally by some indigenous communities. The remains of coca leaves have been found with ancient Peruvian mummies, and pottery from the time period depicts humans with bulged cheeks, indicating the presence of something on which they are chewing. There is also evidence that these cultures used a mixture of coca leaves and saliva as an anesthetic for the performance of trepanation. When the Spanish arrived in South America, most at first ignored aboriginal claims that the leaf gave them strength and energy, and declared the practice of chewing it the work of the Devil. But after discovering that these claims were true, they legalized and taxed the leaf, taking 10% off the value of each crop.[94] In 1569, Nicol�s Monardes described the indigenous peoples' practice of chewing a mixture of tobacco and coca leaves to induce great contentment.",
       "icon": "coke_icon.png",
@@ -173,0 +161,0 @@ "weight": 0,

lib/fight.js

@@ -23,2 +23,6 @@ 'use strict';
 
+var _units = require('./units.json');
+
+var _units2 = _interopRequireDefault(_units);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -25,0 +29,0 @@

lib/index.js

@@ -41,6 +41,2 @@ 'use strict';
 
-var _upgrades = require('./upgrades.json');
-
-var _upgrades2 = _interopRequireDefault(_upgrades);
-
 var _drugs = require('./drugs.json');
@@ -75,3 +71,2 @@
   trainings: _trainings2.default,
-  upgrades: _upgrades2.default,
   drugs: _drugs2.default,
@@ -78,0 +73,0 @@ locations: _locations2.default,

lib/troop.js

@@ -57,3 +57,3 @@ 'use strict';
       var healthAfterDamage = this.grouphealth || 0;
-      this.undead = Math.floor(healthAfterDamage / this.health);
+      this.undead = Math.round(healthAfterDamage / this.health);
       var currentlog = '<div class="tick ' + this.name + '">';
@@ -80,6 +80,5 @@ if (this.type === 'Melee' && sender_skill === 'accuratehit' && this.type != 'tastynasty') {
       if (this.skill.type === 'bulletproof' && this.grouphealth < damages && this.use > 0) {
-        currentlog += '[' + this.name.substring(0, 1).toUpperCase() + '] (' + this.i + ')  with ' + this.undead + ' x ' + this.key + ' with <span style="color:green">' + parseFloat(this.grouphealth).toFixed(0) + '</span> HP take <span style="color:red">' + parseFloat(damages).toFixed(0) + ' DMG</span> from [' + current + '] (' + num + ') with ' + sender_amount + ' x ' + name + '  <span style="color:blueviolet"> "' + sender_skill + '"</span>.';
         currentlog += '[' + this.name.substring(0, 1).toUpperCase() + '] ' + this.key + ' (' + this.i + ') used his (' + this.use + ') bulletproof.';
         this.use -= 1;
-        this.grouphealth = this.grouphealth + 250 * this.undead;
+        this.grouphealth = 250 * this.undead;
         healthAfterDamage = this.grouphealth;
@@ -105,3 +104,3 @@ } else if (this.skill.type === 'dodge' && this.use > 0 && damages > this.grouphealth) {
       } else {
-        var undead = parseInt(Math.floor(healthAfterDamage / this.health));
+        var undead = parseInt(Math.round(healthAfterDamage / this.health));
         if (undead !== this.undead) {
@@ -108,0 +107,0 @@ currentlog += '<br/> [' + this.name.substring(0, 1).toUpperCase() + '] (' + this.i + ') ' + undead + ' x ' + this.key + ' are left.';

lib/units.json

@@ -10,3 +10,3 @@ {
     "desc": "He can only gather informations but he does it at the speed of lightning.",
-    "feature": "SPY : Gives a lot of information about an opponent.",
+    "feature": "SPY : Gives a lot of information about an opponent. This unit attack per group of 100!",
     "attack": 5,
@@ -19,3 +19,3 @@ "health": 2,
     "dmg_type":"physical",
-    "group":500,
+    "group":1000,
     "speed": 3,
@@ -43,3 +43,3 @@ "range": 3,
     "desc": "He will fall into an ethylic coma after his first punch.",
-    "feature": "GROUP KAMIKAZE : If he meets an enemy he will die. This unit can not defend!",
+    "feature": "GROUP KAMIKAZE : If he meets an enemy he will die. This unit can not defend and split into group if they are a lot!",
     "attack": 13,
@@ -52,3 +52,3 @@ "health": 0,
     "dmg_type":"physical",
-    "group":250,
+    "group":500,
     "speed": 13,
@@ -79,3 +79,3 @@ "range": 1,
     "health": 30,
-    "defense":8,
+    "defense":4,
     "weapon_defense":2,
@@ -85,3 +85,3 @@ "fire_defense":0,
     "dmg_type":"weapon",
-    "group":250,
+    "group":500,
     "speed": 12,
@@ -112,3 +112,3 @@ "range": 1,
     "health": 140,
-    "defense":15,
+    "defense":6,
     "weapon_defense":4,
@@ -118,3 +118,3 @@ "fire_defense":2,
     "dmg_type":"physical",
-    "group":200,
+    "group":400,
     "speed": 11,
@@ -145,3 +145,3 @@ "range": 1,
     "health": 2100,
-    "defense":20,
+    "defense":8,
     "weapon_defense":8,
@@ -151,3 +151,3 @@ "fire_defense":8,
     "dmg_type":"physical",
-    "group":50,
+    "group":100,
     "speed": 20,
@@ -178,3 +178,3 @@ "range": 3,
     "health": 40,
-    "defense":8,
+    "defense":5,
     "weapon_defense":2,
@@ -184,3 +184,3 @@ "fire_defense":2,
     "dmg_type":"chemical",
-    "group":75,
+    "group":150,
     "speed": 10,
@@ -211,3 +211,3 @@ "range": 1,
     "health": 120,
-    "defense":12,
+    "defense":5,
     "weapon_defense":1,
@@ -217,3 +217,3 @@ "fire_defense":3,
     "dmg_type":"fire",
-    "group":75,
+    "group":150,
     "speed": 9,
@@ -244,3 +244,3 @@ "range": 5,
     "health": 200,
-    "defense":10,
+    "defense":5,
     "weapon_defense":5,
@@ -250,3 +250,3 @@ "fire_defense":5,
     "dmg_type":"physical",
-    "group":100,
+    "group":200,
     "speed": 14,
@@ -277,3 +277,3 @@ "range": 3,
     "health": 90,
-    "defense":15,
+    "defense":5,
     "weapon_defense":2,
@@ -283,3 +283,3 @@ "fire_defense":1,
     "dmg_type":"weapon",
-    "group":50,
+    "group":100,
     "speed": 14,
@@ -310,3 +310,3 @@ "range": 6,
     "health": 150,
-    "defense":18,
+    "defense":7,
     "weapon_defense":3,
@@ -316,3 +316,3 @@ "fire_defense":4,
     "dmg_type":"weapon",
-    "group":75,
+    "group":150,
     "speed": 8,
@@ -343,3 +343,3 @@ "range": 5,
     "health": 300,
-    "defense":20,
+    "defense":5,
     "weapon_defense":5,
@@ -349,3 +349,3 @@ "fire_defense":3,
     "dmg_type":"physical",
-    "group":75,
+    "group":150,
     "speed": 6,
@@ -376,3 +376,3 @@ "range": 4,
     "health": 250,
-    "defense":12,
+    "defense":7,
     "weapon_defense":4,
@@ -382,3 +382,3 @@ "fire_defense":1,
     "dmg_type":"fire",
-    "group":75,
+    "group":150,
     "speed": 17,
@@ -409,3 +409,3 @@ "range": 7,
     "health": 750,
-    "defense":50,
+    "defense":8,
     "weapon_defense":6,
@@ -415,3 +415,3 @@ "fire_defense":4,
     "dmg_type":"chemical",
-    "group":50,
+    "group":100,
     "speed": 15,
@@ -473,3 +473,3 @@ "range": 6,
     "health": 25,
-    "defense":5,
+    "defense":2,
     "weapon_defense":2,
@@ -479,3 +479,3 @@ "fire_defense":0,
     "dmg_type":"weapon",
-    "group":100,
+    "group":150,
     "speed": 12,
@@ -505,3 +505,3 @@ "range": 1,
     "health": 60,
-    "defense":6,
+    "defense":2,
     "weapon_defense":1,
@@ -511,3 +511,3 @@ "fire_defense":3,
     "dmg_type":"fire",
-    "group":50,
+    "group":100,
     "speed": 9,
@@ -537,3 +537,3 @@ "range": 5,
     "health": 600,
-    "defense":20,
+    "defense":30,
     "weapon_defense":4,
@@ -543,3 +543,3 @@ "fire_defense":2,
     "dmg_type":"physical",
-    "group":25,
+    "group":50,
     "speed": 11,
@@ -569,3 +569,3 @@ "range": 1,
     "health": 280,
-    "defense":25,
+    "defense":20,
     "weapon_defense":6,
@@ -575,3 +575,3 @@ "fire_defense":4,
     "dmg_type":"chemical",
-    "group":15,
+    "group":25,
     "speed": 15,
@@ -601,3 +601,3 @@ "range": 6,
     "health": 80,
-    "defense":15,
+    "defense":2,
     "weapon_defense":2,
@@ -607,3 +607,3 @@ "fire_defense":1,
     "dmg_type":"weapon",
-    "group":15,
+    "group":25,
     "speed": 14,
@@ -633,3 +633,3 @@ "range": 6,
     "health": 300,
-    "defense":30,
+    "defense":3,
     "weapon_defense":5,
@@ -639,3 +639,3 @@ "fire_defense":3,
     "dmg_type":"physical",
-    "group":15,
+    "group":25,
     "speed": 6,
@@ -665,3 +665,3 @@ "range": 4,
     "health": 250,
-    "defense":35,
+    "defense":3,
     "weapon_defense":4,
@@ -671,3 +671,3 @@ "fire_defense":1,
     "dmg_type":"fire",
-    "group":15,
+    "group":25,
     "speed": 17,
@@ -697,3 +697,3 @@ "range": 7,
     "health": 1200,
-    "defense":40,
+    "defense":4,
     "weapon_defense":6,
@@ -703,3 +703,3 @@ "fire_defense":4,
     "dmg_type":"chemical",
-    "group":15,
+    "group":25,
     "speed": 15,
@@ -706,0 +706,0 @@ "range": 6,

package.json

 {
   "name": "drugwars",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "A lightweight JavaScript library for DrugWars",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

src/army.js

@@ -77,3 +77,3 @@ import { orderBy } from 'lodash';
         if(protection)
-        unit.defense = unit.defense +  (unit.defense/5 *protection.lvl);
+        unit.defense = unit.defense +  (unit.defense/200 *protection.lvl);
         if(giant)
@@ -80,0 +80,0 @@ unit.health = unit.health +  (unit.health/200 *giant.lvl);

src/card.js

@@ -23,2 +23,3 @@ import suffixes from './suffixes.json';
     this.quality = quality;
+    this.seed = seed;
     this.attack = 0;
@@ -25,0 +26,0 @@ this.health= 0;

src/continents.json

     [{
         "id":"na",
         "name": "North America",
-        "locations": [2,273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 402,403,404,405,406,407,408,409,410,411,412,413,414,415,416]
+        "locations": [273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 402]
       },
@@ -14,3 +14,3 @@ {
         "name": "Europe",
-        "locations": [43, 44, 51, 52, 53, 54, 61, 62, 63, 64,72, 73,80, 81,82, 83, 84, 85, 86,87, 88, 89, 279, 326, 452, 453, 454, 458, 459]
+        "locations": [43, 44, 51, 52, 53, 54, 61, 62, 63, 73, 81, 83, 84, 85, 86, 88, 89, 279, 326, 452, 453, 454, 458, 459]
       },
@@ -25,3 +25,3 @@ {
         "name": "Africa",
-        "locations": [3, 74, 75, 76, 77, 78,79, 95, 101, 102, 109, 110, 117, 118, 126, 127, 128, 136,137,138, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 417, 418, 419, 420, 421, 422,423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 455, 456, 457]
+        "locations": [3, 74, 75, 76, 77, 78, 95, 101, 102, 109, 110, 117, 118, 126, 127, 128, 136, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 417, 418, 419, 420, 421, 422, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 455, 456, 457]
       },
@@ -28,0 +28,0 @@ {

src/drugs.json

@@ -7,6 +7,6 @@ [
       "location":["na","sa","eu","an","af","as","oc"],
-      "id": "marijuana",
+      "id": "weed",
       "name": "Marijuana",
-      "description": "Marijuana is indigenous to Central and South Asia. There is evidence of inhalation of cannabis smoke from the 3rd millennium BCE, namely charred cannabis seeds found in a ritual brazier at an ancient burial site in present-day Romania. In 2003, a leather basket filled with cannabis leaf fragments and seeds was found next to a 2,500- to 2,800-year-old mummified shaman in the northwestern Xinjiang Uygur Autonomous Region of China. Evidence of cannabis consumption was also found \r\n\t in Egyptian mummies dated about 950 BC. Cannabis was also used by the ancient Hindus of India and Nepal thousands of years ago. ",
-      "icon": "marijuana_icon.png",
+      "description": "Cannabis is indigenous to Central and South Asia. There is evidence of inhalation of cannabis smoke from the 3rd millennium BCE, namely charred cannabis seeds found in a ritual brazier at an ancient burial site in present-day Romania. In 2003, a leather basket filled with cannabis leaf fragments and seeds was found next to a 2,500- to 2,800-year-old mummified shaman in the northwestern Xinjiang Uygur Autonomous Region of China. Evidence of cannabis consumption was also found \r\n\t in Egyptian mummies dated about 950 BC. Cannabis was also used by the ancient Hindus of India and Nepal thousands of years ago. The herb is called ganja (Sanskrit ga�ja) or ganjika in Sanskrit and other modern Indo-Aryan languages. Some scholars suggest that the ancient drug soma, mentioned in the Vedas, was cannabis, although this theory is disputed.",
+      "icon": "weed_icon.png",
       "weight": 0,
@@ -28,14 +28,2 @@ "volume": 0
     {
-      "maxprice": 5,
-      "minprice": 1,
-      "effect": null,
-      "location":["na","eu","oc","as"],
-      "id": "poppers",
-      "name": "Poppers",
-      "description": "Popper is a slang term given broadly to the chemical class called alkyl nitrites, that are inhaled. It is used for practical purposes to facilitate anal sex by increasing blood flow and relaxing sphincter muscles or for recreational drug purposes, typically for the 'high' or 'rush' that the drug can create. Poppers have also been historically used for sexual encounters, initially within the gay community.",
-      "icon": "poppers_icon.png",
-      "weight": 0,
-      "volume": 0
-    },
-    {
       "maxprice": 20,
@@ -105,6 +93,6 @@ "minprice": 3,
       "location":["na","eu","as"],
-      "id": "meth",
-      "name": "methamphetamine",
-      "description": "Methamphetamine was discovered in 1893, it is a potent central nervous system stimulant that is mainly used as a recreational drug and less commonly as a second-line treatment for attention deficit hyperactivity disorder and obesity.",
-      "icon": "meth_icon.png",
+      "id": "amphet",
+      "name": "Amphetamine",
+      "description": "Amphetamine was first synthesized in 1887 in Germany by Romanian chemist Lazar Edeleanu who named it phenylisopropylamine, its stimulant effects remained unknown until 1927, when it was independently resynthesized by Gordon Alles and reported to have sympathomimetic properties. Amphetamine had no pharmacological use until 1934, when Smith, Kline and French began selling it as an inhaler under the trade name Benzedrine as a decongestant. Benzedrine sulfate was introduced three years later and found a wide variety of medical applications, including narcolepsy. During World War II, amphetamine and methamphetamine were used extensively by both the Allied and Axis forces for their stimulant and performance-enhancing effects. As the addictive properties of the drug became known, governments began to place strict controls on the sale of amphetamine.",
+      "icon": "amphet_icon.png",
       "weight": 0,
@@ -120,3 +108,3 @@ "volume": 0
       "name": "MDMA",
-      "description": "MDMA was first synthesized in 1912 by Merck chemist Anton Köllisch. At the time, Merck was interested in developing substances that stopped abnormal bleeding. Merck wanted to avoid an existing patent held by Bayer for one such compound hydrastinine. Köllisch developed a preparation of a hydrastinine analogue, methylhydrastinine, at the request of fellow lab members, Walther Beckh and Otto Wolfes. MDMA (called methylsafrylamin, safrylmethylamin or N-Methyl-a-Methylhomopiperonylamin in Merck laboratory reports) was an intermediate compound in the synthesis of methylhydrastinine. Merck was not interested in MDMA itself at the time.On 24 December 1912, Merck filed two patent applications that described the synthesis and some chemical properties of MDMAand its subsequent conversion to methylhydrastinine.",
+      "description": "MDMA was first synthesized in 1912 by Merck chemist Anton K�llisch. At the time, Merck was interested in developing substances that stopped abnormal bleeding. Merck wanted to avoid an existing patent held by Bayer for one such compound hydrastinine. K�llisch developed a preparation of a hydrastinine analogue, methylhydrastinine, at the request of fellow lab members, Walther Beckh and Otto Wolfes. MDMA (called methylsafrylamin, safrylmethylamin or N-Methyl-a-Methylhomopiperonylamin in Merck laboratory reports) was an intermediate compound in the synthesis of methylhydrastinine. Merck was not interested in MDMA itself at the time.On 24 December 1912, Merck filed two patent applications that described the synthesis and some chemical properties of MDMAand its subsequent conversion to methylhydrastinine.",
       "icon": "mdma_icon.png",
@@ -133,3 +121,3 @@ "weight": 0,
       "name": "LSD",
-      "description": "LSD was first synthesized on November 16, 1938 by Swiss chemist Albert Hofmann at the Sandoz Laboratories in Basel, Switzerland as part of a large research program searching for medically useful ergot alkaloid derivatives. LSD's psychedelic properties were discovered 5 years later when Hofmann himself accidentally ingested an unknown  quantity of the chemical. The first intentional ingestion of LSD occurred on April 19, 1943, when Hofmann ingested 250 micrograms of LSD. He said this would be a threshold dose based on the dosages of other ergot alkaloids. Hofmann found the effects to be much stronger than he anticipated.",
+      "description": "LSD was first synthesized on November 16, 1938 by Swiss chemist Albert Hofmann at the Sandoz Laboratories in Basel, Switzerland as part of a large research program searching for medically useful ergot alkaloid derivatives. LSD's psychedelic properties were discovered 5 years later when Hofmann himself accidentally ingested an unknown  quantity of the chemical. The first intentional ingestion of LSD occurred on April 19, 1943, when Hofmann ingested 250 �g of LSD. He said this would be a threshold dose based on the dosages of other ergot alkaloids. Hofmann found the effects to be much stronger than he anticipated. Sandoz Laboratories introduced LSD as a psychiatric drug in 1947.",
       "icon": "lsd_icon.png",
@@ -170,3 +158,3 @@ "weight": 0,
       "name": "Cocaine",
-      "description": "For over a thousand years South American indigenous peoples have chewed the leaves of Erythroxylon coca, a plant that contains vital nutrients as well as numerous alkaloids, including cocaine. The coca leaf was, and still is, chewed almost universally by some indigenous communities. The remains of coca leaves have been found with ancient Peruvian mummies, and pottery from the time period depicts humans with bulged cheeks, indicating the presence of something on which they are chewing. There is also evidence that these cultures used a mixture of coca leaves and saliva as an anesthetic for the performance of trepanation. When the Spanish arrived in South America, most at first ignored aboriginal claims that the leaf gave them strength and energy, and declared the practice of chewing it the work of the Devil. But after discovering that these claims were true, they legalized and taxed the leaf, taking 10% off the value of each crop. In 1569, Nicolás Monardes described the indigenous peoples' practice of chewing a mixture of tobacco and coca leaves to induce great contentment.",
+      "description": "For over a thousand years South American indigenous peoples have chewed the leaves of Erythroxylon coca, a plant that contains vital nutrients as well as numerous alkaloids, including cocaine. The coca leaf was, and still is, chewed almost universally by some indigenous communities. The remains of coca leaves have been found with ancient Peruvian mummies, and pottery from the time period depicts humans with bulged cheeks, indicating the presence of something on which they are chewing. There is also evidence that these cultures used a mixture of coca leaves and saliva as an anesthetic for the performance of trepanation. When the Spanish arrived in South America, most at first ignored aboriginal claims that the leaf gave them strength and energy, and declared the practice of chewing it the work of the Devil. But after discovering that these claims were true, they legalized and taxed the leaf, taking 10% off the value of each crop.[94] In 1569, Nicol�s Monardes described the indigenous peoples' practice of chewing a mixture of tobacco and coca leaves to induce great contentment.",
       "icon": "coke_icon.png",
@@ -173,0 +161,0 @@ "weight": 0,

src/fight.js

 import Army from './army';
 import Log from './log';
+import dunits from './units.json';
 
@@ -4,0 +5,0 @@ export default class Fight {

src/index.js

@@ -11,3 +11,2 @@ import { Client } from 'kbyte';
 import trainings from './trainings.json';
-import upgrades from './upgrades.json';
 import drugs from './drugs.json';
@@ -28,3 +27,2 @@ import locations from './locations.json';
   trainings,
-  upgrades,
   drugs,
@@ -31,0 +29,0 @@ locations,

src/troop.js

@@ -38,3 +38,3 @@ import units from './units.json';
     let healthAfterDamage = this.grouphealth || 0 ;
-    this.undead = Math.floor(healthAfterDamage / this.health);
+    this.undead = Math.round(healthAfterDamage / this.health);
     let currentlog=`<div class="tick ${this.name}">`;
@@ -63,6 +63,5 @@ if(this.type === 'Melee' && sender_skill === 'accuratehit' && this.type != 'tastynasty')
     if(this.skill.type === 'bulletproof' && this.grouphealth < damages && this.use > 0){
-      currentlog += `[${this.name.substring(0,1).toUpperCase()}] (${this.i})  with ${this.undead} x ${this.key} with <span style="color:green">${parseFloat(this.grouphealth).toFixed(0)}</span> HP take <span style="color:red">${parseFloat(damages).toFixed(0)} DMG</span> from [${current}] (${num}) with ${sender_amount} x ${name}  <span style="color:blueviolet"> "${sender_skill}"</span>.`
       currentlog += `[${this.name.substring(0, 1).toUpperCase()}] ${this.key} (${this.i}) used his (${this.use}) bulletproof.`
       this.use -= 1;
-      this.grouphealth = this.grouphealth + 250 * this.undead;
+      this.grouphealth = 250 * this.undead;
       healthAfterDamage = this.grouphealth ;
@@ -98,3 +97,3 @@ }
     else {
-      const undead = parseInt(Math.floor(healthAfterDamage / this.health));
+      const undead = parseInt(Math.round(healthAfterDamage / this.health));
     if (undead !== this.undead) {
@@ -101,0 +100,0 @@ currentlog+= `<br/> [${this.name.substring(0,1).toUpperCase()}] (${this.i}) ${undead} x ${this.key} are left.`;

src/units.json

@@ -10,3 +10,3 @@ {
     "desc": "He can only gather informations but he does it at the speed of lightning.",
-    "feature": "SPY : Gives a lot of information about an opponent.",
+    "feature": "SPY : Gives a lot of information about an opponent. This unit attack per group of 100!",
     "attack": 5,
@@ -19,3 +19,3 @@ "health": 2,
     "dmg_type":"physical",
-    "group":500,
+    "group":1000,
     "speed": 3,
@@ -43,3 +43,3 @@ "range": 3,
     "desc": "He will fall into an ethylic coma after his first punch.",
-    "feature": "GROUP KAMIKAZE : If he meets an enemy he will die. This unit can not defend!",
+    "feature": "GROUP KAMIKAZE : If he meets an enemy he will die. This unit can not defend and split into group if they are a lot!",
     "attack": 13,
@@ -52,3 +52,3 @@ "health": 0,
     "dmg_type":"physical",
-    "group":250,
+    "group":500,
     "speed": 13,
@@ -79,3 +79,3 @@ "range": 1,
     "health": 30,
-    "defense":8,
+    "defense":4,
     "weapon_defense":2,
@@ -85,3 +85,3 @@ "fire_defense":0,
     "dmg_type":"weapon",
-    "group":250,
+    "group":500,
     "speed": 12,
@@ -112,3 +112,3 @@ "range": 1,
     "health": 140,
-    "defense":15,
+    "defense":6,
     "weapon_defense":4,
@@ -118,3 +118,3 @@ "fire_defense":2,
     "dmg_type":"physical",
-    "group":200,
+    "group":400,
     "speed": 11,
@@ -145,3 +145,3 @@ "range": 1,
     "health": 2100,
-    "defense":20,
+    "defense":8,
     "weapon_defense":8,
@@ -151,3 +151,3 @@ "fire_defense":8,
     "dmg_type":"physical",
-    "group":50,
+    "group":100,
     "speed": 20,
@@ -178,3 +178,3 @@ "range": 3,
     "health": 40,
-    "defense":8,
+    "defense":5,
     "weapon_defense":2,
@@ -184,3 +184,3 @@ "fire_defense":2,
     "dmg_type":"chemical",
-    "group":75,
+    "group":150,
     "speed": 10,
@@ -211,3 +211,3 @@ "range": 1,
     "health": 120,
-    "defense":12,
+    "defense":5,
     "weapon_defense":1,
@@ -217,3 +217,3 @@ "fire_defense":3,
     "dmg_type":"fire",
-    "group":75,
+    "group":150,
     "speed": 9,
@@ -244,3 +244,3 @@ "range": 5,
     "health": 200,
-    "defense":10,
+    "defense":5,
     "weapon_defense":5,
@@ -250,3 +250,3 @@ "fire_defense":5,
     "dmg_type":"physical",
-    "group":100,
+    "group":200,
     "speed": 14,
@@ -277,3 +277,3 @@ "range": 3,
     "health": 90,
-    "defense":15,
+    "defense":5,
     "weapon_defense":2,
@@ -283,3 +283,3 @@ "fire_defense":1,
     "dmg_type":"weapon",
-    "group":50,
+    "group":100,
     "speed": 14,
@@ -310,3 +310,3 @@ "range": 6,
     "health": 150,
-    "defense":18,
+    "defense":7,
     "weapon_defense":3,
@@ -316,3 +316,3 @@ "fire_defense":4,
     "dmg_type":"weapon",
-    "group":75,
+    "group":150,
     "speed": 8,
@@ -343,3 +343,3 @@ "range": 5,
     "health": 300,
-    "defense":20,
+    "defense":5,
     "weapon_defense":5,
@@ -349,3 +349,3 @@ "fire_defense":3,
     "dmg_type":"physical",
-    "group":75,
+    "group":150,
     "speed": 6,
@@ -376,3 +376,3 @@ "range": 4,
     "health": 250,
-    "defense":12,
+    "defense":7,
     "weapon_defense":4,
@@ -382,3 +382,3 @@ "fire_defense":1,
     "dmg_type":"fire",
-    "group":75,
+    "group":150,
     "speed": 17,
@@ -409,3 +409,3 @@ "range": 7,
     "health": 750,
-    "defense":50,
+    "defense":8,
     "weapon_defense":6,
@@ -415,3 +415,3 @@ "fire_defense":4,
     "dmg_type":"chemical",
-    "group":50,
+    "group":100,
     "speed": 15,
@@ -473,3 +473,3 @@ "range": 6,
     "health": 25,
-    "defense":5,
+    "defense":2,
     "weapon_defense":2,
@@ -479,3 +479,3 @@ "fire_defense":0,
     "dmg_type":"weapon",
-    "group":100,
+    "group":150,
     "speed": 12,
@@ -505,3 +505,3 @@ "range": 1,
     "health": 60,
-    "defense":6,
+    "defense":2,
     "weapon_defense":1,
@@ -511,3 +511,3 @@ "fire_defense":3,
     "dmg_type":"fire",
-    "group":50,
+    "group":100,
     "speed": 9,
@@ -537,3 +537,3 @@ "range": 5,
     "health": 600,
-    "defense":20,
+    "defense":30,
     "weapon_defense":4,
@@ -543,3 +543,3 @@ "fire_defense":2,
     "dmg_type":"physical",
-    "group":25,
+    "group":50,
     "speed": 11,
@@ -569,3 +569,3 @@ "range": 1,
     "health": 280,
-    "defense":25,
+    "defense":20,
     "weapon_defense":6,
@@ -575,3 +575,3 @@ "fire_defense":4,
     "dmg_type":"chemical",
-    "group":15,
+    "group":25,
     "speed": 15,
@@ -601,3 +601,3 @@ "range": 6,
     "health": 80,
-    "defense":15,
+    "defense":2,
     "weapon_defense":2,
@@ -607,3 +607,3 @@ "fire_defense":1,
     "dmg_type":"weapon",
-    "group":15,
+    "group":25,
     "speed": 14,
@@ -633,3 +633,3 @@ "range": 6,
     "health": 300,
-    "defense":30,
+    "defense":3,
     "weapon_defense":5,
@@ -639,3 +639,3 @@ "fire_defense":3,
     "dmg_type":"physical",
-    "group":15,
+    "group":25,
     "speed": 6,
@@ -665,3 +665,3 @@ "range": 4,
     "health": 250,
-    "defense":35,
+    "defense":3,
     "weapon_defense":4,
@@ -671,3 +671,3 @@ "fire_defense":1,
     "dmg_type":"fire",
-    "group":15,
+    "group":25,
     "speed": 17,
@@ -697,3 +697,3 @@ "range": 7,
     "health": 1200,
-    "defense":40,
+    "defense":4,
     "weapon_defense":6,
@@ -703,3 +703,3 @@ "fire_defense":4,
     "dmg_type":"chemical",
-    "group":15,
+    "group":25,
     "speed": 15,
@@ -706,0 +706,0 @@ "range": 6,

No alert changes

Worsened metrics

Total package byte prevSize

2996435

decreased by-1.33%

Number of package files

61

decreased by-3.17%

Lines of code

16687

decreased by-2%

No dependency changes