diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index f7db82a09a..5eb9780ea5 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -185,7 +185,6 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon7.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon8.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon9.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy_icons.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy10.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy11.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy12.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, @@ -447,10 +446,10 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"eldar.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"genestealercult.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"hulk.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"sector.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"space_marine.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"star.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, @@ -1525,6 +1524,6 @@ ], "templateType": null, "TextureGroups": [ - {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","directory":"","groupParent":null,"isScaled":false,"loadType":"default","mipsToGenerate":0,"targets":-1,}, + {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","customOptions":"","directory":"","groupParent":null,"isScaled":false,"loadType":"default","mipsToGenerate":0,"targets":-1,}, ], } \ No newline at end of file diff --git a/datafiles/main/chapters/8.JSON b/datafiles/main/chapters/8.JSON index 5a53582dbf..cfccd20ae1 100644 --- a/datafiles/main/chapters/8.JSON +++ b/datafiles/main/chapters/8.JSON @@ -226,7 +226,7 @@ "custom_roles": { "veteran": { "name": "Firedrake", - "wep1": "Power Sword" + "wep2": "Power Sword" }, "veteran_sergeant": { "name": "Firedrake Master" diff --git a/objects/obj_enunit/Alarm_1.gml b/objects/obj_enunit/Alarm_1.gml index 39f611d6d4..25e9ac8929 100644 --- a/objects/obj_enunit/Alarm_1.gml +++ b/objects/obj_enunit/Alarm_1.gml @@ -85,8 +85,8 @@ repeat(20) { if ((obj_ncombat.started = 0) or(neww = 1)) or(dudes_num[j] > 1) { if (dudes[j] = "Greater Daemon of Khorne") { - dudes_ac[j] = 18; - dudes_hp[j] = 600; + dudes_ac[j] = 12; + dudes_hp[j] = 700; } } if (dudes[j] = "Greater Daemon of Khorne") { @@ -97,20 +97,22 @@ repeat(20) { } if ((obj_ncombat.started = 0) or(neww = 1)) or(dudes_num[j] > 1) { if (dudes[j] = "Greater Daemon of Slaanesh") { - dudes_ac[j] = 18; - dudes_hp[j] = 500; + dudes_ac[j] = 10; + dudes_hp[j] = 500; + dudes_dr[j] = 0.25; } } if (dudes[j] = "Greater Daemon of Slaanesh") { scr_en_weapon("Demon Melee", true, dudes_num[j], dudes[j], j); scr_en_weapon("Lash Whip", true, dudes_num[j], dudes[j], j); - dudes_dr[j] = 0.7; + dudes_dr[j] = 0.25; medi += dudes_num[j]; } if ((obj_ncombat.started = 0) or(neww = 1)) or(dudes_num[j] > 1) { if (dudes[j] = "Greater Daemon of Nurgle") { - dudes_ac[j] = 25; - dudes_hp[j] = 700; + dudes_ac[j] = 8; + dudes_hp[j] = 900; + dudes_dr[j] = 0.2; } } if (dudes[j] = "Greater Daemon of Nurgle") { @@ -121,54 +123,54 @@ repeat(20) { } if ((obj_ncombat.started = 0) or(neww = 1)) or(dudes_num[j] > 1) { if (dudes[j] = "Greater Daemon of Tzeentch") { - dudes_ac[j] = 18; - dudes_hp[j] = 500; + dudes_ac[j] = 10; + dudes_hp[j] = 600; } } if (dudes[j] = "Greater Daemon of Tzeentch") { scr_en_weapon("Demon Melee", true, dudes_num[j], dudes[j], j); scr_en_weapon("Witchfire", true, dudes_num[j], dudes[j], j); - dudes_dr[j] = 0.7; + dudes_dr[j] = 0.75; medi += dudes_num[j]; } if (dudes[j] = "Bloodletter") { scr_en_weapon("Bloodletter Melee", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 120; + dudes_ac[j] = 10; + dudes_hp[j] = 200; men += dudes_num[j]; - dudes_dr[j] = 0.7; + dudes_dr[j] = 0.4; } if (dudes[j] = "Daemonette") { scr_en_weapon("Daemonette Melee", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 100; + dudes_ac[j] = 8; + dudes_hp[j] = 150; men += dudes_num[j]; - dudes_dr[j] = 0.7; + dudes_dr[j] = 0.3; } if (dudes[j] = "Pink Horror") { scr_en_weapon("Eldritch Fire", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; + dudes_ac[j] = 8; dudes_hp[j] = 100; men += dudes_num[j]; - dudes_dr[j] = 0.8; + dudes_dr[j] = 0.5; } if (dudes[j] = "Plaguebearer") { scr_en_weapon("Plaguebearer Melee", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 145; + dudes_ac[j] = 5; + dudes_hp[j] = 300; men += dudes_num[j]; - dudes_dr[j] = 0.6; + dudes_dr[j] = 0.4; } if (dudes[j] = "Helbrute") { scr_en_weapon("Power Fist", false, dudes_num[j], dudes[j], j); scr_en_weapon("Multi-Melta", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; - dudes_hp[j] = 100; + dudes_hp[j] = 300; veh += dudes_num[j]; dudes_vehicle[j] = 1; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.5; } if (dudes[j] = "Soul Grinder") { scr_en_weapon("Warpsword", false, dudes_num[j], dudes[j], j); @@ -178,15 +180,15 @@ repeat(20) { dudes_hp[j] = 350; veh += dudes_num[j]; dudes_vehicle[j] = 1; - dudes_dr[j] = 1; + dudes_dr[j] = 0.5; } if (dudes[j] = "Maulerfiend") { scr_en_weapon("Maulerfiend Claws", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; + dudes_ac[j] = 30; dudes_hp[j] = 250; veh += dudes_num[j]; dudes_vehicle[j] = 1; - dudes_dr[j] = 1; + dudes_dr[j] = 0.5; } } @@ -358,7 +360,7 @@ if __b__ { scr_en_weapon("Heavy Bolter", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 10; dudes_hp[j] = 100; - dudes_dr[j] = 0.1; + dudes_dr[j] = 0.9; men += dudes_num[j]; } @@ -367,7 +369,7 @@ if __b__ { scr_en_weapon("Ogryn Melee", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 10; dudes_hp[j] = 120; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; men += dudes_num[j]; } @@ -376,7 +378,7 @@ if __b__ { scr_en_weapon("Heavy Bolter", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 200; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -393,7 +395,7 @@ if __b__ { scr_en_weapon("Lascannon", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 45; dudes_hp[j] = 250; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.25; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -402,7 +404,7 @@ if __b__ { scr_en_weapon("Lascannon", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 250; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.25; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -410,7 +412,7 @@ if __b__ { scr_en_weapon("Twin-Linked Lascannon", false, dudes_num[j] * 3, dudes[j], j); dudes_ac[j] = 20; dudes_hp[j] = 300; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.25; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -468,7 +470,7 @@ if __b__ { dudes_hp[j] = 200; } men += dudes_num[j]; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.25; } if (dudes[j] = "Palatine") { scr_en_weapon("Plasma Pistol", true, dudes_num[j], dudes[j], j); @@ -491,7 +493,7 @@ if __b__ { dudes_ac[j] = 0; dudes_hp[j] = 150; men += dudes_num[j]; - dudes_dr[j] = 0.3; + dudes_dr[j] = 0.7; } if (dudes[j] = "Celestian") { @@ -514,7 +516,7 @@ if __b__ { dudes_ac[j] = 0; dudes_hp[j] = 75; men += dudes_num[j]; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; } if (dudes[j] = "Battle Sister") { @@ -529,7 +531,7 @@ if __b__ { dudes_ac[j] = 10; dudes_hp[j] = 60; men += dudes_num[j]; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; } if (dudes[j] = "Seraphim") { scr_en_weapon("Seraphim Pistols", true, dudes_num[j], dudes[j], j); @@ -537,7 +539,7 @@ if __b__ { dudes_ac[j] = 10; dudes_hp[j] = 60; men += dudes_num[j]; - dudes_dr[j] = 0.4; + dudes_dr[j] = 0.6; } if (dudes[j] = "Dominion") { scr_en_weapon("Meltagun", true, dudes_num[j], dudes[j], j); @@ -545,7 +547,7 @@ if __b__ { dudes_ac[j] = 10; dudes_hp[j] = 60; men += dudes_num[j]; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; } if (dudes[j] = "Retributor") { if (dudes_num[j] <= 3) then scr_en_weapon("Heavy Bolter", true, dudes_num[j], dudes[j], j); @@ -559,7 +561,7 @@ if __b__ { dudes_ac[j] = 10; dudes_hp[j] = 60; men += dudes_num[j]; - dudes_dr[j] = 0.4; + dudes_dr[j] = 0.6; } if (dudes[j] = "Follower") { @@ -574,7 +576,7 @@ if __b__ { scr_en_weapon("Storm Bolter", false, dudes_num[j] * 2, dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 200; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -583,7 +585,7 @@ if __b__ { scr_en_weapon("Heavy Flamer", false, dudes_num[j] * 2, dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 200; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -592,7 +594,7 @@ if __b__ { scr_en_weapon("Twin Linked Heavy Flamers", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 300; - dudes_dr[j] = 0.50; + dudes_dr[j] = 0.35; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -603,7 +605,7 @@ if __b__ { if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { dudes_hp[j] = 200; } - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.55; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -640,8 +642,8 @@ if __b__ { if (dudes[j] = "Leader") { scr_en_weapon("Singing Spear", true, dudes_num[j], dudes[j], j); scr_en_weapon("Singing Spear Throw", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 300; + dudes_ac[j] = 10; + dudes_hp[j] = 150; men += dudes_num[j]; dudes_dr[j] = 0.5; } @@ -649,22 +651,25 @@ if __b__ { if (dudes[j] = "Autarch") { scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); scr_en_weapon("Fusion Gun", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; + dudes_ac[j] = 12; dudes_hp[j] = 150; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Farseer") { scr_en_weapon("Singing Spear", true, dudes_num[j], dudes[j], j); scr_en_weapon("Singing Spear Throw", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 150; + dudes_ac[j] = 10; + dudes_hp[j] = 120; + dudes_dr[j] = 0.6; men += dudes_num[j]; } if (dudes[j] = "Warlock") { scr_en_weapon("Witchblade", true, dudes_num[j], dudes[j], j); scr_en_weapon("Psyshock", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 100; + dudes_ac[j] = 10; + dudes_hp[j] = 80; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Avatar") { @@ -672,159 +677,173 @@ if __b__ { scr_en_weapon("Avatar Smite", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 300; + dudes_dr[j] = 0.55; veh += dudes_num[j]; } if (dudes[j] = "Mighty Avatar") { scr_en_weapon("Wailing Doom", true, dudes_num[j], dudes[j], j); scr_en_weapon("Avatar Smite", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 55; + dudes_ac[j] = 50; dudes_hp[j] = 450; + dudes_dr[j] = 0.5; veh += dudes_num[j]; } if (dudes[j] = "Godly Avatar") { scr_en_weapon("Wailing Doom", true, dudes_num[j], dudes[j], j); scr_en_weapon("Avatar Smite", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 70; + dudes_ac[j] = 60; dudes_hp[j] = 600; + dudes_dr[j] = 0.40; veh += dudes_num[j]; } if (dudes[j] = "Ranger") { scr_en_weapon("Ranger Long Rifle", true, dudes_num[j], dudes[j], j); scr_en_weapon("Shuriken Pistol", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; - dudes_hp[j] = 30; + dudes_ac[j] = 8; + dudes_hp[j] = 40; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Pathfinder") { scr_en_weapon("Pathfinder Long Rifle", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 60; + dudes_dr[j] = 0.8; men += dudes_num[j]; } if (dudes[j] = "Dire Avenger") { scr_en_weapon("Avenger Shuriken Catapult", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 30; + dudes_ac[j] = 10; + dudes_hp[j] = 40; men += dudes_num[j]; } if (dudes[j] = "Dire Avenger Exarch") { scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 50; // Shimmershield + dudes_ac[j] = 10; + dudes_hp[j] = 70; // Shimmershield men += dudes_num[j]; } if (dudes[j] = "Howling Banshee") { scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); scr_en_weapon("Shuriken Pistol", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 30; + dudes_ac[j] = 8; + dudes_hp[j] = 40; + dudes_dr[j] = 0.8; men += dudes_num[j]; } if (dudes[j] = "Howling Banshee Exarch") { scr_en_weapon("Executioner", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 50; + dudes_ac[j] = 10; + dudes_hp[j] = 60; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Striking Scorpion") { scr_en_weapon("Scorpion Chainsword", true, dudes_num[j], dudes[j], j); scr_en_weapon("Shuriken Pistol", true, dudes_num[j], dudes[j], j); scr_en_weapon("Mandiblaster", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 30; + dudes_ac[j] = 8; + dudes_hp[j] = 60; men += dudes_num[j]; } if (dudes[j] = "Striking Scorpion Exarch") { scr_en_weapon("Biting Blade", true, dudes_num[j], dudes[j], j); scr_en_weapon("Scorpion's Claw", true, dudes_num[j], dudes[j], j); scr_en_weapon("Mandiblaster", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 50; + dudes_ac[j] = 10; + dudes_hp[j] = 80; men += dudes_num[j]; } if (dudes[j] = "Fire Dragon") { scr_en_weapon("Fusion Gun", true, dudes_num[j], dudes[j], j); scr_en_weapon("Meltabomb", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 30; + dudes_ac[j] = 12; + dudes_hp[j] = 40; men += dudes_num[j]; } if (dudes[j] = "Fire Dragon Exarch") { scr_en_weapon("Firepike", true, dudes_num[j], dudes[j], j); scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 50; + dudes_ac[j] = 12; + dudes_hp[j] = 60; men += dudes_num[j]; } if (dudes[j] = "Warp Spider") { scr_en_weapon("Deathspinner", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 30; + dudes_ac[j] = 8; + dudes_hp[j] = 40; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Warp Spider Exarch") { scr_en_weapon("Dual Deathspinners", true, dudes_num[j], dudes[j], j); scr_en_weapon("Powerblades", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 50; + dudes_ac[j] = 10; + dudes_hp[j] = 60; + dudes_dr[j] = 0.8; men += dudes_num[j]; } if (dudes[j] = "Dark Reaper") { scr_en_weapon("Reaper Launcher", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 30; + dudes_ac[j] = 10; + dudes_hp[j] = 40; men += dudes_num[j]; } if (dudes[j] = "Dark Reaper Exarch") { - scr_en_weapon("Eldar Missile Launcher", true, dudes_num[j], dudes[j], j); + scr_en_weapon("Tempest Launcher", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; + dudes_ac[j] = 10; dudes_hp[j] = 50; men += dudes_num[j]; } if (dudes[j] = "Shining Spear") { scr_en_weapon("Laser Lance", true, dudes_num[j], dudes[j], j); scr_en_weapon("Twin Linked Shuriken Catapult", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 30; - men += dudes_num[j]; + dudes_ac[j] = 10; + dudes_hp[j] = 75; + dudes_dr[j] = 0.8; + veh += dudes_num[j]; + dudes_vehicle[j] = 1; } if (dudes[j] = "Guardian") { scr_en_weapon("Shuriken Catapult", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; + dudes_ac[j] = 8; dudes_hp[j] = 30; men += dudes_num[j]; } if (dudes[j] = "Grav Platform") { scr_en_weapon("Pulse Laser", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 70; + dudes_ac[j] = 10; + dudes_hp[j] = 60; men += dudes_num[j]; } if (dudes[j] = "Trouper") { scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); scr_en_weapon("Fusion Pistol", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; + dudes_ac[j] = 8; dudes_hp[j] = 50; + dudes_dr[j] = 0.25; men += dudes_num[j]; } if (dudes[j] = "Athair") { scr_en_weapon("Plasma Pistol", true, dudes_num[j], dudes[j], j); scr_en_weapon("Harlequin's Kiss", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; + dudes_ac[j] = 8; dudes_hp[j] = 75; + dudes_dr[j] = 0.25; men += dudes_num[j]; } if (dudes[j] = "Wraithguard") { scr_en_weapon("Wraithcannon", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 80; + dudes_ac[j] = 15; + dudes_hp[j] = 125; + dudes_dr[j] = 0.70; men += dudes_num[j]; } if (dudes[j] = "Vyper") { @@ -832,6 +851,7 @@ if __b__ { scr_en_weapon("Pulse Laser", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 100; + dudes_dr[j] = 0.8; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -841,6 +861,7 @@ if __b__ { scr_en_weapon("Bright Lance", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 200; + dudes_dr[j] = 0.6; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -849,13 +870,15 @@ if __b__ { scr_en_weapon("Prism Cannon", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 200; + dudes_dr[j] = 0.5; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Nightspinner") { scr_en_weapon("Twin Linked Doomweaver", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; - dudes_hp[j] = 170; + dudes_hp[j] = 200; + dudes_dr[j] = 0.6; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -865,6 +888,7 @@ if __b__ { scr_en_weapon("Starcannon", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 200; + dudes_dr[j] = 0.5; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -874,6 +898,7 @@ if __b__ { scr_en_weapon("Titan Starcannon", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 50; dudes_hp[j] = 800; + dudes_dr[j] = 0.35; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -902,10 +927,10 @@ if __b__ { if (dudes[j] = "Minor Warboss") { scr_en_weapon("Choppa", true, dudes_num[j], dudes[j], j); scr_en_weapon("Big Shoota", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { dudes_hp[j] = 150; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; } men += dudes_num[j]; } @@ -915,7 +940,7 @@ if __b__ { dudes_ac[j] = 12; if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { dudes_hp[j] = 200; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; } men += dudes_num[j]; } @@ -954,47 +979,49 @@ if __b__ { if (dudes[j] = "Mekboy") { scr_en_weapon("Power Klaw", true, dudes_num[j], dudes[j], j); scr_en_weapon("Big Shoota", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; + dudes_ac[j] = 12; dudes_hp[j] = 100; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Meganob") { scr_en_weapon("Power Klaw", true, dudes_num[j], dudes[j], j); scr_en_weapon("Big Shoota", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; + dudes_ac[j] = 12; dudes_hp[j] = 150; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.6; men += dudes_num[j]; } if (dudes[j] = "Flash Git") { scr_en_weapon("Snazzgun", true, dudes_num[j], dudes[j], j); scr_en_weapon("Choppa", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 100; men += dudes_num[j]; } if (dudes[j] = "Cybork") { scr_en_weapon("Power Klaw", true, dudes_num[j], dudes[j], j); scr_en_weapon("Big Shoota", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; - dudes_hp[j] = 100; - dudes_dr[j] = 0.25; + dudes_ac[j] = 8; + dudes_hp[j] = 125; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Ard Boy") { scr_en_weapon("Choppa", true, dudes_num[j], dudes[j], j); scr_en_weapon("Slugga", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 80; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Kommando") { scr_en_weapon("Choppa", true, dudes_num[j], dudes[j], j); scr_en_weapon("Rokkit Launcha", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 10; - dudes_hp[j] = 150; + dudes_hp[j] = 125; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Burna Boy") { @@ -1037,7 +1064,7 @@ if __b__ { scr_en_weapon("Rokkit Launcha", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 20; dudes_hp[j] = 200; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1054,7 +1081,7 @@ if __b__ { scr_en_weapon("Plasma Rifle", true, dudes_num[j], dudes[j], j); scr_en_weapon("Fusion Blaster", true, dudes_num[j], dudes[j], j); scr_en_weapon("Cyclic Ion Blaster", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; + dudes_ac[j] = 12; dudes_hp[j] = 300; dudes_dr[j] = 0.5; men += dudes_num[j]; @@ -1064,7 +1091,7 @@ if __b__ { scr_en_weapon("Burst Rifle", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 10; dudes_hp[j] = 200; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "XV8 Crisis") { @@ -1072,18 +1099,18 @@ if __b__ { scr_en_weapon("Missile Pod", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 10; dudes_hp[j] = 150; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "XV8 (Brightknife)") { scr_en_weapon("Fusion Blaster", true, dudes_num[j] * 2, dudes[j], j); dudes_ac[j] = 10; dudes_hp[j] = 150; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Shield Drone") { - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 50; men += dudes_num[j]; } @@ -1091,28 +1118,28 @@ if __b__ { if (dudes[j] = "XV88 Broadside") { scr_en_weapon("Smart Missile System", true, dudes_num[j] * 2, dudes[j], j); scr_en_weapon("Small Railgun", true, dudes_num[j] * 2, dudes[j], j); - dudes_ac[j] = 15; + dudes_ac[j] = 12; dudes_hp[j] = 225; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "XV25 Stealthsuit") { scr_en_weapon("Burst Rifle", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 50; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Fire Warrior") { scr_en_weapon("Pulse Rifle", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 30; men += dudes_num[j]; } if (dudes[j] = "Pathfinder") { scr_en_weapon("Rail Rifle", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 30; men += dudes_num[j]; } @@ -1135,7 +1162,7 @@ if __b__ { scr_en_weapon("Smart Missile System", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 30; dudes_hp[j] = 150; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1144,7 +1171,7 @@ if __b__ { scr_en_weapon("Smart Missile System", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 30; dudes_hp[j] = 150; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1163,29 +1190,30 @@ if __b__ { scr_en_weapon("Heavy Venom Cannon", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 20; dudes_hp[j] = 400; - dudes_dr[j] = 0.6; + dudes_dr[j] = 0.5; men += dudes_num[j]; } if (dudes[j] = "Tyrant Guard") { scr_en_weapon("Crushing Claws", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; + dudes_ac[j] = 12; dudes_hp[j] = 200; - dudes_dr[j] = 0.4; + dudes_dr[j] = 0.6; men += dudes_num[j]; } if (dudes[j] = "Tyranid Warrior") { scr_en_weapon("Rending Claws", true, dudes_num[j], dudes[j], j); scr_en_weapon("Devourer", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 100; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Zoanthrope") { scr_en_weapon("Zoanthrope Blast", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 300; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.25; men += dudes_num[j]; } if (dudes[j] = "Carnifex") { @@ -1193,7 +1221,7 @@ if __b__ { scr_en_weapon("Venom Cannon", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 20; dudes_hp[j] = 300; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1226,25 +1254,25 @@ if __b__ { if (dudes[j] = "Genestealer Patriarch") { scr_en_weapon("Genestealer Claws", true, dudes_num[j], dudes[j], j); scr_en_weapon("Witchfire", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 300; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.60; men += dudes_num[j]; } if (dudes[j] = "Armoured Limousine") { scr_en_weapon("Autogun", false, dudes_num[j] * 4, dudes[j], j); dudes_ac[j] = 10; dudes_hp[j] = 150; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Lictor") { scr_en_weapon("Lictor Claws", true, dudes_num[j], dudes[j], j); scr_en_weapon("Flesh Hooks", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 300; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.60; men += dudes_num[j]; } @@ -1330,7 +1358,7 @@ if __b__ { dudes_ac[j] = 40; dudes_hp[j] = 120; men += dudes_num[j]; - dudes_dr[j] = 0.6; + dudes_dr[j] = 0.4; } if (dudes[j] = "World Eaters Terminator") { scr_en_weapon("Power Fist", true, dudes_num[j] * 2, dudes[j], j); @@ -1338,7 +1366,7 @@ if __b__ { dudes_ac[j] = 40; dudes_hp[j] = 120; men += dudes_num[j]; - dudes_dr[j] = 0.6; + dudes_dr[j] = 0.4; } if (dudes[j] = "Obliterator") { scr_en_weapon("Power Fist", true, dudes_num[j], dudes[j], j); @@ -1353,6 +1381,7 @@ if __b__ { scr_en_weapon("Chainsword", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 20; dudes_hp[j] = 125; + dudes_dr[j] = 0.85; men += dudes_num[j]; } if (dudes[j] = "Venerable Chaos Chosen") { @@ -1361,7 +1390,7 @@ if __b__ { dudes_ac[j] = 20; dudes_hp[j] = 125; men += dudes_num[j]; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; } if (dudes[j] = "Possessed") { @@ -1376,6 +1405,7 @@ if __b__ { scr_en_weapon("Chainsword", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 20; dudes_hp[j] = 100; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Havoc") { @@ -1383,6 +1413,7 @@ if __b__ { scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 20; dudes_hp[j] = 100; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Raptor") { @@ -1390,7 +1421,7 @@ if __b__ { scr_en_weapon("Bolt Pistol", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 20; dudes_hp[j] = 100; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; dudes_special[j] = "Jump Pack"; men += dudes_num[j]; } @@ -1400,7 +1431,7 @@ if __b__ { scr_en_weapon("Chainaxe", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 20; dudes_hp[j] = 100; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "World Eaters Veteran") { @@ -1408,7 +1439,7 @@ if __b__ { scr_en_weapon("Chainaxe", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 20; dudes_hp[j] = 100; - dudes_dr[j] = 0.3; + dudes_dr[j] = 0.7; men += dudes_num[j]; } @@ -1417,7 +1448,7 @@ if __b__ { scr_en_weapon("Bolt Pistol", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 20; dudes_hp[j] = 100; - dudes_dr[j] = 0.35; + dudes_dr[j] = 0.65; men += dudes_num[j]; } if (dudes[j] = "Plague Marine") { @@ -1433,7 +1464,7 @@ if __b__ { scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 20; dudes_hp[j] = 100; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Rubric Marine") { @@ -1441,7 +1472,7 @@ if __b__ { scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 20; dudes_hp[j] = 125; - dudes_dr[j] = 0.35; + dudes_dr[j] = 0.65; men += dudes_num[j]; } if (dudes[j] = "Rubric Sorcerer") { @@ -1463,8 +1494,8 @@ if __b__ { scr_en_weapon("Power Fist", false, dudes_num[j], dudes[j], j); scr_en_weapon("Meltagun", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; - dudes_hp[j] = 200; - dudes_dr[j] = 0.75; + dudes_hp[j] = 300; + dudes_dr[j] = 0.5; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1472,7 +1503,7 @@ if __b__ { scr_en_weapon("Storm Bolter", false, dudes_num[j] * 2, dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 200; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1499,7 +1530,7 @@ if __b__ { scr_en_weapon("Twin Linked Lascannon", false, dudes_num[j] * 2, dudes[j], j); dudes_ac[j] = 50; dudes_hp[j] = 400; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.25; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1507,7 +1538,7 @@ if __b__ { scr_en_weapon("Baleflame", false, dudes_num[j] * 5, dudes[j], j); dudes_ac[j] = 50; dudes_hp[j] = 400; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.25; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1526,16 +1557,17 @@ if __b__ { if (dudes[j] = "Arch Heretic") { scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); scr_en_weapon("Plasma Pistol", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 40; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Cultist Elite") { scr_en_weapon("Lasgun", true, dudes_num[j], dudes[j], j); scr_en_weapon("Chainaxe", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 40; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Mutant") { @@ -1547,15 +1579,16 @@ if __b__ { if (dudes[j] = "Daemonhost") { scr_en_weapon("Daemonhost Claws", true, dudes_num[j], dudes[j], j); scr_en_weapon("Daemonhost_Powers", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 300; dudes_dr[j] = 0.5; medi += dudes_num[j]; } if (dudes[j] = "Possessed") { scr_en_weapon("Possessed Claws", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 100; + dudes_dr[j] = 0.75; men += dudes_num[j]; } @@ -1571,7 +1604,7 @@ if __b__ { scr_en_weapon("Heavy Bolter", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 10; dudes_hp[j] = 100; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1581,7 +1614,7 @@ if __b__ { scr_en_weapon("Heavy Bolter", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 45; dudes_hp[j] = 250; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.25; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1617,7 +1650,7 @@ if __b__ { scr_en_weapon("Staff of Light", true, dudes_num[j], dudes[j], j); scr_en_weapon("Staff of Light Shooting", true, dudes_num[j], dudes[j], j); if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { - dudes_ac[j] = 10; + dudes_ac[j] = 12; dudes_hp[j] = 300; dudes_dr[j] = 0.5; } @@ -1625,33 +1658,33 @@ if __b__ { } if (dudes[j] = "Lychguard") { scr_en_weapon("Warscythe", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; + dudes_ac[j] = 12; dudes_hp[j] = 100; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Flayed One") { scr_en_weapon("Melee5", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; - dudes_hp[j] = 100; - dudes_dr[j] = 0.1; + dudes_ac[j] = 8; + dudes_hp[j] = 75; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Necron Warrior") { scr_en_weapon("Gauss Flayer", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee3", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; - dudes_hp[j] = 100; - dudes_dr[j] = 0.1; + dudes_ac[j] = 8; + dudes_hp[j] = 75; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Necron Immortal") { scr_en_weapon("Gauss Blaster", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee3", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 12; - dudes_hp[j] = 100; - dudes_dr[j] = 0.15; + dudes_ac[j] = 8; + dudes_hp[j] = 75; + dudes_dr[j] = 0.85; men += dudes_num[j]; } @@ -1662,7 +1695,7 @@ if __b__ { dudes_hp[j] = 200; } men += dudes_num[j]; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; } if (dudes[j] = "Necron Destroyer") { scr_en_weapon("Gauss Cannon", true, dudes_num[j], dudes[j], j); @@ -1691,15 +1724,15 @@ if __b__ { dudes_ac[j] = 30; dudes_hp[j] = 300; } - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Canoptek Scarab") { scr_en_weapon("Melee3", false, dudes_num[j] * 2, dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 8; dudes_hp[j] = 30; - dudes_dr[j] = 0.25; + dudes_dr[j] = 0.75; men += dudes_num[j]; dudes_vehicle[j] = 0; } @@ -1708,17 +1741,16 @@ if __b__ { scr_en_weapon("Particle Whip", false, dudes_num[j] * 1, dudes[j], j); dudes_ac[j] = 50; dudes_hp[j] = 500; - dudes_dr[j] = 0.5; + dudes_dr[j] = 0.25; veh += dudes_num[j]; dudes_vehicle[j] = 1; - // was 50 / 500 } if (dudes[j] = "Doomsday Arc") { scr_en_weapon("Gauss Flayer Array", false, dudes_num[j] * 2, dudes[j], j); scr_en_weapon("Doomsday Cannon", false, dudes_num[j] * 1, dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 150; - dudes_dr[j] = 0.3; + dudes_ac[j] = 40; + dudes_hp[j] = 350; + dudes_dr[j] = 0.5; veh += dudes_num[j]; dudes_vehicle[j] = 1; } diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index 49d3fef414..f7dfc69c38 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -380,6 +380,13 @@ if (shop = "equipment") { item_cost[i] = 0; } i += 1; + item[i] = "Wrist-Mounted Storm Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 80; + forge_cost[i] = 300; + if (research.bolt[0]<2) then forge_cost[i] = 0; + nobuy[i] = 1; + i += 1; item[i] = "Hand Flamer"; forge_cost[i] = 75; if (research.flame[0]<1) then forge_cost[i] = 0; @@ -501,13 +508,22 @@ if (shop = "equipment") { forge_cost[i] = 200; item_stocked[i] = scr_item_count(item[i]); item_cost[i] = 10; - + i += 1; + item[i] = "Needle Sniper Rifle"; + forge_cost[i] = 500; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 200; i += 1; item[i] = "Missile Launcher"; forge_cost[i] = 300; item_stocked[i] = scr_item_count(item[i]); item_cost[i] = 70; i += 1; + item[i] = "Cyclone Missile Launcher"; + forge_cost[i] = 350; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 150; + i += 1; item[i] = "Lascannon"; item_stocked[i] = scr_item_count(item[i]); forge_cost[i] = 500; diff --git a/scripts/scr_en_weapon/scr_en_weapon.gml b/scripts/scr_en_weapon/scr_en_weapon.gml index f424ffc980..f830b93a35 100644 --- a/scripts/scr_en_weapon/scr_en_weapon.gml +++ b/scripts/scr_en_weapon/scr_en_weapon.gml @@ -152,12 +152,19 @@ function scr_en_weapon(name, is_man, man_number, man_type, group) { if (obj_ncombat.enemy = 6) { - if (argument0 = "Fusion Gun") or(argument0 = "Firepike") { + if (argument0 = "Fusion Gun"){ atta = 200; arp = 1; rang = 2; amm = 4; } + + if (argument0 = "Firepike") { + atta = 300; + arp = 1; + rang = 4; + amm = 4; + } if (argument0 = "Singing Spear") { atta = 120; arp = -1; @@ -268,7 +275,7 @@ function scr_en_weapon(name, is_man, man_number, man_type, group) { rang = 2; } if (argument0 = "Dual Deathspinner") { - atta = 80; + atta = 100; arp = 0; rang = 2; } @@ -279,12 +286,12 @@ function scr_en_weapon(name, is_man, man_number, man_type, group) { amm = 8; spli = 3; } - if (argument0 = "Eldar Missile Launcher") { + if (argument0 = "Tempest Launcher") { atta = 200; arp = -1; rang = 20; - amm = 4; - spli = 3; + amm = 8; + spli = 9; } if (argument0 = "Laser Lance") { atta = 80; diff --git a/scripts/scr_equipment_struct/scr_equipment_struct.gml b/scripts/scr_equipment_struct/scr_equipment_struct.gml index 61f4a19bb3..29ca8eca82 100644 --- a/scripts/scr_equipment_struct/scr_equipment_struct.gml +++ b/scripts/scr_equipment_struct/scr_equipment_struct.gml @@ -49,7 +49,7 @@ function EquipmentStruct(item_data, core_type,quality="none") constructor{ if (maintenance == 0){ if (has_tags(["heavy_ranged","power", "plasma", "melta"])){ - maintenance = 0.05; + maintenance += 0.05; } } static item_tooltip_desc_gen = function(){ @@ -295,7 +295,7 @@ function EquipmentStruct(item_data, core_type,quality="none") constructor{ if (obj_controller.stc_bonus[2]>0 && obj_controller.stc_bonus[2]<3){ if (obj_controller.stc_bonus[1]==1 && has_tag("fist")){ attack*=1.1; - } else if (obj_controller.stc_bonus[1]==2 && has_tag("Plasma")){ + } else if (obj_controller.stc_bonus[1]==2 && has_tag("plasma")){ attack*=1.1; } } diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 14f3a9698a..04c399c0a8 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -1340,20 +1340,24 @@ function scr_initialize_custom() { } var weapon_lists = { - heavy_weapons: ["Heavy Bolter", "Heavy Bolter", "Heavy Bolter", "Heavy Bolter", "Missile Launcher", "Missile Launcher", "Multi-Melta", "Lascannon"], - special_weapons: ["Flamer", "Flamer", "Flamer", "Meltagun", "Meltagun", "Plasma Gun"], - melee_weapons: ["Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Power Sword", "Power Sword", "Power Sword", "Lightning Claw", "Lightning Claw", "Lightning Claw", "Power Fist", "Power Fist"], - ranged_weapons: ["Bolter", "Bolter", "Bolter", "Bolter", "Bolter", "Bolter", "Storm Bolter", "Storm Bolter", "Storm Bolter", "Combiflamer", "Combiflamer", "Plasma Pistol"], - pistols: ["Bolt Pistol", "Bolt Pistol", "Bolt Pistol", "Bolt Pistol", "Plasma Pistol"], + heavy_weapons: ["Heavy Bolter", "Heavy Bolter", "Missile Launcher", "Missile Launcher", "Multi-Melta", "Lascannon","Plasma Cannon","Grav-Cannon"], + melee_weapons: ["Chainsword", "Chainsword", "Chainsword", "Chainaxe", "Chainaxe"], + special_melee_weapons: [ "Eviscerator", "Eviscerator", "Power Sword", "Power Sword", "Power Axe", "Power Axe", "Lightning Claw", "Lightning Claw", "Lightning Claw", "Power Fist", "Power Fist"], + ranged_weapons: ["Bolter", "Bolter", "Storm Bolter", "Storm Bolter", "Stalker Pattern Bolter", "Stalker Pattern Bolter" ], + special_ranged_weapons: ["Flamer", "Flamer", "Meltagun", "Meltagun", "Plasma Gun", "Grav-Gun"], + combi_weapons: ["Combiflamer","Combiplasma","Combigrav","Combimelta"], + pistols: ["Bolt Pistol", "Bolt Pistol", "Bolt Pistol", "Hand Flamer", "Hand Flamer", "Plasma Pistol", "Plasma Pistol", "Grav-Pistol"], one_hand_melee: ["Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Power Sword", "Power Sword", "Power Sword", "Lightning Claw", "Lightning Claw", "Lightning Claw", "Power Fist", "Power Fist", "Thunder Hammer"], } var weapon_weighted_lists = { - heavy_weapons: [["Heavy Bolter", 4], ["Missile Launcher", 3], ["Multi-Melta", 2], ["Lascannon", 1]], - special_weapons: [["Flamer", 3], ["Meltagun", 2], ["Plasma Gun", 1]], - melee_weapons: [["Chainsword", 5], ["Power Sword", 4], ["Lightning Claw", 3], ["Power Fist", 2], ["Thunder Hammer", 1]], - ranged_weapons: [["Bolter", 10], ["Storm Bolter", 3], ["Combiflamer", 2], ["Plasma Pistol", 1]], - pistols: [["Bolt Pistol", 5], ["Plasma Pistol", 1]], + heavy_weapons: [["Heavy Bolter", 3], ["Missile Launcher", 3], ["Multi-Melta", 1], ["Lascannon", 1], ["Plasma Cannon", 1], ["Grav-Cannon", 1]], + ranged_weapons: [["Bolter", 4], ["Storm Bolter", 2],["Stalker Pattern Bolter", 2]], + special_ranged_weapons: [["Flamer", 2], ["Meltagun", 2], ["Plasma Gun", 1], ["Grav-Gun", 1]], + melee_weapons: [["Chainsword", 3], ["Chainaxe", 2]], + special_melee_weapons: [["Power Sword", 3], ["Power Axe", 3], ["Lightning Claw", 2], ["Power Fist", 2], ["Thunder Hammer", 1]], + combi_weapons: [["Combiflamer", 1], ["Combiplasma", 1], ["Combigrav", 1], ["Combimelta", 1]], + pistols: [["Bolt Pistol", 4],["Hand Flamer", 2], ["Plasma Pistol", 2], ["Grav-Pistol", 1]], } /* squad guidance @@ -1536,13 +1540,13 @@ function scr_initialize_custom() { "option": { "wep1": [ [ - ["Bolter", "Stalker Pattern Bolter", "Storm Bolter"], 5 + weapon_lists.ranged_weapons, 3 ], [ - ["Combiflamer"], 2 + weapon_lists.combi_weapons, 4 ], [ - weapon_lists.special_weapons, 1 + weapon_lists.special_ranged_weapons, 1 ], [ weapon_lists.heavy_weapons, 1 @@ -1584,13 +1588,7 @@ function scr_initialize_custom() { "option": { "wep1": [ [ - ["Chainsword", "Power Sword", "Power Axe", "Lightning Claw"], 6 - ], - [ - ["Power Fist"], 2 - ], - [ - ["Thunder Hammer"], 1 + weapon_lists.special_melee_weapons, 9 ], ], "wep2": [ @@ -1598,7 +1596,7 @@ function scr_initialize_custom() { ["Storm Shield"], 2, ], [ - ["Plasma Pistol"], 3 + weapon_lists.pistols, 3 ], ] } @@ -1686,7 +1684,7 @@ function scr_initialize_custom() { "option": { "wep1": [ [ - weapon_lists.special_weapons, 1 + weapon_lists.special_ranged_weapons, 1 ], [ weapon_lists.heavy_weapons, 1, { @@ -1742,7 +1740,7 @@ function scr_initialize_custom() { "option": { "wep1": [ [ - weapon_lists.melee_weapons, 2, + "Eviscerator", 2, ], ], "wep2": [ @@ -1816,7 +1814,7 @@ function scr_initialize_custom() { ], "wep2": [ [ - ["Power Sword", "Chainsword", "Power Axe"], 1 + weapon_lists.melee_weapons, 1 ] ] } @@ -1843,7 +1841,7 @@ function scr_initialize_custom() { "option": { "wep1": [ [ - ["Missile Launcher"], 1 + ["Missile Launcher","Needle Sniper Rifle"], 1 ] ], } @@ -1855,7 +1853,7 @@ function scr_initialize_custom() { "min": 1, "loadout": { "required": { - "wep1": ["Sniper Rifle", 1], + "wep1": ["Needle Sniper Rifle", 1], "wep2": ["Combat Knife", 1] }, }, @@ -1965,7 +1963,7 @@ function scr_initialize_custom() { "option": { "wep1": [ [ - weapon_lists.special_weapons, 3 + weapon_lists.special_ranged_weapons, 3 ], ], "wep2": [ @@ -2020,7 +2018,7 @@ function scr_initialize_custom() { "option": { "wep1": [ [ - weapon_lists.special_weapons, 1 + weapon_lists.special_ranged_weapons, 1 ], [ weapon_lists.heavy_weapons, 1, { diff --git a/scripts/scr_powers/scr_powers.gml b/scripts/scr_powers/scr_powers.gml index ff446f714b..f4ad97b7a1 100644 --- a/scripts/scr_powers/scr_powers.gml +++ b/scripts/scr_powers/scr_powers.gml @@ -236,17 +236,17 @@ function scr_powers(power_set, power_count, enemy_target, unit_id) { // Chaos powers here - if (power_name="Wave of Entropy"){p_type="attack";p_rang=3;p_tar=3;p_spli=1;p_att=220;p_arp=0;p_duration=0; + if (power_name="Wave of Entropy"){p_type="attack";p_rang=3;p_tar=3;p_spli=10;p_att=250;p_arp=-1;p_duration=0; flavour_text2="- a putrid cone of warp energy splashes outward, "; if (obj_ncombat.enemy=9) then flavour_text2+="twisting and rusting everything it touches. "; if (obj_ncombat.enemy!=9) then flavour_text2+="boiling and putrifying flesh. "; if (obj_ncombat.sorcery_seen<2) and (obj_ncombat.present_inquisitor=1) then obj_ncombat.sorcery_seen=1; } - if (power_name="Wave of Change"){p_type="attack";p_rang=3;p_tar=3;p_spli=1;p_att=220;p_arp=0;p_duration=0; + if (power_name="Wave of Change"){p_type="attack";p_rang=3;p_tar=3;p_spli=10;p_att=300;p_arp=-2;p_duration=0; flavour_text2="- a wispy cone of warp energy reaches outward, twisting and morphing all that it touches. "; if (obj_ncombat.sorcery_seen<2) and (obj_ncombat.present_inquisitor=1) then obj_ncombat.sorcery_seen=1; } - if (power_name="Insect Swarm"){p_type="attack";p_rang=3;p_tar=3;p_spli=1;p_att=500;p_arp=1;p_duration=0; + if (power_name="Insect Swarm"){p_type="attack";p_rang=3;p_tar=3;p_spli=8;p_att=500;p_arp=-1;p_duration=0; var rah;rah=choose(1,2); if (rah=1) then flavour_text2="- a massive, black cloud of insects spew from his body. At once they begin burrowing into your foes. "; if (rah=2) then flavour_text2="- rank, ichory insects spew forth from his body at your foes. They begin burrowing through flesh and armour alike. "; @@ -259,24 +259,24 @@ function scr_powers(power_set, power_count, enemy_target, unit_id) { marine_attack[unit_id]+=2;marine_ranged[unit_id]=0; if (obj_ncombat.sorcery_seen<2) and (obj_ncombat.present_inquisitor=1) then obj_ncombat.sorcery_seen=1; } - if (power_name="Putrid Vomit"){p_type="attack";p_rang=2.1;p_tar=3;p_spli=1;p_att=600;p_arp=0;p_duration=0; + if (power_name="Putrid Vomit"){p_type="attack";p_rang=2.1;p_tar=3;p_spli=15;p_att=600;p_arp=-2;p_duration=0; var rah;rah=choose(1,2); flavour_text2="- from in front of their mouth a stream of rancid, acidic vomit spews forth at tremendous pressure, splashing over his foes. "; if (obj_ncombat.enemy=9) then p_att=450; if (obj_ncombat.sorcery_seen<2) and (obj_ncombat.present_inquisitor=1) then obj_ncombat.sorcery_seen=1; } - if (power_name="Warp Bolts"){p_type="attack";p_rang=5;p_tar=3;p_spli=1;p_att=300;p_arp=0;p_duration=0; + if (power_name="Warp Bolts"){p_type="attack";p_rang=5;p_tar=3;p_spli=8;p_att=450;p_arp=1;p_duration=0; var rah;rah=choose(1,2,3); if (rah=1) then flavour_text2="- several bolts of purple warp energy appear and are flung at the enemy. "; if (rah=2) then flavour_text2="- he launches a series of rapid warp bolts at the enemy. "; if (rah=3) then flavour_text2="- three oozing, shifting bolts of warp energy fly outward from his palms. "; if (obj_ncombat.sorcery_seen<2) and (obj_ncombat.present_inquisitor=1) then obj_ncombat.sorcery_seen=1; } - if (power_name="Warp Beam"){p_type="attack";p_rang=8;p_tar=4;p_spli=1;p_att=600;p_arp=1;p_duration=0; + if (power_name="Warp Beam"){p_type="attack";p_rang=8;p_tar=4;p_spli=4;p_att=600;p_arp=1;p_duration=0; flavour_text2="- a massive beam of purple warp energy shoots forth. All that it touches is consumed. "; if (obj_ncombat.sorcery_seen<2) and (obj_ncombat.present_inquisitor=1) then obj_ncombat.sorcery_seen=1; } - if (power_name="Rainbow Beam"){p_type="attack";p_rang=10;p_tar=3;p_spli=1;p_att=500;p_arp=1;p_duration=0; + if (power_name="Rainbow Beam"){p_type="attack";p_rang=10;p_tar=3;p_spli=8;p_att=750;p_arp=1;p_duration=0; flavour_text2="- a massive beam of warp energy hisses at the enemy, the crackling energy shifting through every color imaginable sickeningly fast. "; if (obj_ncombat.sorcery_seen<2) and (obj_ncombat.present_inquisitor=1) then obj_ncombat.sorcery_seen=1; } @@ -320,11 +320,11 @@ function scr_powers(power_set, power_count, enemy_target, unit_id) { // target 0: self 1: ally 2: ally vehicle 3: enemy 4: enemy vehicle - if (power_name="Minor Smite"){p_type="attack";p_rang=5;p_tar=3;p_spli=1;p_att=160;p_arp=0;p_duration=0; + if (power_name="Minor Smite"){p_type="attack";p_rang=5;p_tar=3;p_spli=10;p_att=250;p_arp=-2;p_duration=0; flavour_text2="- a coil of warp energy lashes out at the enemy. "; if (binders=true) then flavour_text2="- a green, sickly coil of energy lashes out at the enemy. "; } - if (power_name="Smite"){p_type="attack";p_rang=5;p_tar=3;p_spli=1;p_att=260;p_arp=0;p_duration=0; + if (power_name="Smite"){p_type="attack";p_rang=5;p_tar=3;p_spli=15;p_att=350;p_arp=-2;p_duration=0; var rah;rah=choose(1,2,3); if (rah=1) then flavour_text2="- a blast of warp energy smashes into the enemy. "; if (rah=2) then flavour_text2="- warp lightning crackles and leaps to the enemy. "; @@ -337,10 +337,10 @@ function scr_powers(power_set, power_count, enemy_target, unit_id) { if (binders=true) then flavour_text2=". An oozing, shifting dome of sorcerous energy appears, covering your forces."; if (binders=true) and (obj_ncombat.sorcery_seen<2) and (obj_ncombat.present_inquisitor=1) then obj_ncombat.sorcery_seen=1; } - if (power_name="Machine Curse"){p_type="attack";p_rang=5;p_tar=4;p_spli=0;p_att=300;p_arp=1;p_duration=0; + if (power_name="Machine Curse"){p_type="attack";p_rang=5;p_tar=4;p_spli=0;p_att=400;p_arp=1;p_duration=0; flavour_text2="- the machine spirit within an enemy vehicle is roused. "; } - if (power_name="Avenge"){p_type="attack";p_rang=5;p_tar=3;p_spli=1;p_att=500;p_arp=0;p_duration=0; + if (power_name="Avenge"){p_type="attack";p_rang=8;p_tar=3;p_spli=12;p_att=500;p_arp=-2;p_duration=0; var rah;rah=choose(1,2); if (rah=1) then flavour_text2="- a destructive avatar of rolling flame crashes into the enemy. "; if (rah=2) then flavour_text2="- a massive conflagration rises up and then crashes down upon the enemy. "; @@ -353,14 +353,14 @@ function scr_powers(power_set, power_count, enemy_target, unit_id) { if (power_name="Might of the Ancients"){p_type="buff";p_rang=0;p_tar=0;p_spli=0;p_att=0;p_arp=0;p_duration=3; flavour_text2=". His physical power and might is increased to unimaginable levels."; } - if (power_name="Vortex of Doom"){p_type="attack";p_rang=5;p_tar=3;p_spli=1;p_att=800;p_arp=1;p_duration=0; + if (power_name="Vortex of Doom"){p_type="attack";p_rang=5;p_tar=3;p_spli=1;p_att=800;p_arp=-2;p_duration=0; flavour_text2="- a hole between real and warp space is torn open with deadly effect. "; if (binders=true) then flavour_text2="- a hole bewteen realspace and the warp is torn, unleashing a myriad of sorcerous energies. "; if (binders=true) and (obj_ncombat.sorcery_seen<2) and (obj_ncombat.present_inquisitor=1) then obj_ncombat.sorcery_seen=1; } - if (power_name="Breathe Fire"){p_type="attack";p_rang=3;p_tar=3;p_spli=0;p_att=200;p_arp=-1;p_duration=0; + if (power_name="Breathe Fire"){p_type="attack";p_rang=3;p_tar=3;p_spli=12;p_att=300;p_arp=-1;p_duration=0; flavour_text2="- a bright jet of flame shoots forth at the enemy. "; if (binders=true) then flavour_text2="- a greenish, eery jet of flame shoots forth at the enemy. "; } @@ -372,25 +372,25 @@ function scr_powers(power_set, power_count, enemy_target, unit_id) { flavour_text2=". Orange sheets of fire shimmer around your forces, protecting them. "; if (binders=true) then flavour_text2="- Purple sheets of warp fire shimmer around your forces, protecting them. "; } - if (power_name="Inferno"){p_type="attack";p_rang=4;p_tar=3;p_spli=1;p_att=600;p_arp=0;p_duration=0; + if (power_name="Inferno"){p_type="attack";p_rang=4;p_tar=3;p_spli=20;p_att=600;p_arp=-1;p_duration=0; var rah;rah=choose(1,2); if (rah=1) then flavour_text2="- a massive conflagration rises up and then crashes down upon the enemy. "; if (rah=2) then flavour_text2="- after breathing deeply a massive jet of flame is unleashed. Smoke billows into the sky. "; if (binders=true) and (rah=1) then flavour_text2="- a hideous being of rolling flame crashes into the enemy. "; if (binders=true) and (rah=2) then flavour_text2="- a massive conflagration rises up and then crashes down upon the enemy. "; } - if (power_name="Sun Burst"){p_type="attack";p_rang=8;p_tar=4;p_spli=1;p_att=200;p_arp=1;p_duration=0; + if (power_name="Sun Burst"){p_type="attack";p_rang=8;p_tar=4;p_spli=2;p_att=400;p_arp=1;p_duration=0; flavour_text2="- a crackling, hissing beam of purple-red flame shoots from him. "; if (binders=true) then flavour_text2="- a crackling, hissing beam of purple warp shoots from him. "; if (binders=true) and (obj_ncombat.sorcery_seen<2) and (obj_ncombat.present_inquisitor=1) then obj_ncombat.sorcery_seen=1; } - if (power_name="Molten Beam"){p_type="attack";p_rang=8;p_tar=4;p_spli=1;p_att=600;p_arp=1;p_duration=0; + if (power_name="Molten Beam"){p_type="attack";p_rang=8;p_tar=4;p_spli=4;p_att=600;p_arp=1;p_duration=0; flavour_text2="- a white-blue beam, blinding to behold, shoots forth. All that it touches turns to slag. "; if (binders=true) then flavour_text2="- a massive beam of purple warp energy shoots forth. All that it touches is consumed. "; if (binders=true) and (obj_ncombat.sorcery_seen<2) and (obj_ncombat.present_inquisitor=1) then obj_ncombat.sorcery_seen=1; } - if (power_name="Blood Boil"){p_type="attack";p_rang=3;p_tar=3;p_spli=0;p_att=220;p_arp=0;p_duration=0; + if (power_name="Blood Boil"){p_type="attack";p_rang=3;p_tar=3;p_spli=6;p_att=250;p_arp=1;p_duration=0; flavour_text2="- accelerating the pulse and blood pressure of his foes. "; } if (power_name="Iron Arm"){p_type="buff";p_rang=0;p_tar=0;p_spli=0;p_att=0;p_arp=0;p_duration=3; @@ -402,14 +402,14 @@ function scr_powers(power_set, power_count, enemy_target, unit_id) { if (power_name="Regenerate"){p_type="buff";p_rang=0;p_tar=0;p_spli=0;p_att=0;p_arp=0;p_duration=0; flavour_text2=". His flesh shimmers and twists back together, sealing up wounds and damage. "; } - if (power_name="Haemorrhage"){p_type="attack";p_rang=3;p_tar=3;p_spli=1;p_att=800;p_arp=0;p_duration=0; + if (power_name="Haemorrhage"){p_type="attack";p_rang=3;p_tar=3;p_spli=3;p_att=800;p_arp=-2;p_duration=0; flavour_text2="- reaching inside of his foes and lighting their flesh aflame. "; } - if (power_name="Crush"){p_type="attack";p_rang=4;p_tar=3;p_spli=0;p_att=190;p_arp=0;p_duration=0; + if (power_name="Crush"){p_type="attack";p_rang=8;p_tar=4;p_spli=2;p_att=300;p_arp=1;p_duration=0; flavour_text2="- his foes are entraped in a crushing mass of force. "; } - if (power_name="Shockwave"){p_type="attack";p_rang=4;p_tar=3;p_spli=1;p_att=280;p_arp=0;p_duration=0; + if (power_name="Shockwave"){p_type="attack";p_rang=6;p_tar=3;p_spli=6;p_att=300;p_arp=-1;p_duration=0; var rah;rah=choose(1,2,3); flavour_text2="- a massive wave of force smashes aside his foes. "; } @@ -421,31 +421,31 @@ function scr_powers(power_set, power_count, enemy_target, unit_id) { } - if (power_name="Living Lightning"){p_type="attack";p_rang=5;p_tar=3;p_spli=0;p_att=160;p_arp=0;p_duration=0; + if (power_name="Living Lightning"){p_type="attack";p_rang=5;p_tar=3;p_spli=12;p_att=300;p_arp=-1;p_duration=0; flavour_text2="- arcs of lightning shoot from hand and strike his foes. "; } if (power_name="Stormbringer"){p_type="buff";p_rang=1;p_tar=1;p_spli=0;p_att=0;p_arp=0;p_duration=2; flavour_text2=". A vortex of ice and winds crackle into existance, covering your forces."; } - if (power_name="Murderous Hurricane"){p_type="attack";p_rang=4;p_tar=3;p_spli=1;p_att=320;p_arp=0;p_duration=0; + if (power_name="Murderous Hurricane"){p_type="attack";p_rang=8;p_tar=3;p_spli=10;p_att=450;p_arp=-1;p_duration=0; var rah;rah=choose(1,2,3); flavour_text2="- a mighty winter gale billows forth, shredding and freezing flesh. "; } - if (power_name="Fury of the Wolf Spirits"){p_type="attack";p_rang=3;p_tar=3;p_spli=1;p_att=440;p_arp=0;p_duration=0; + if (power_name="Fury of the Wolf Spirits"){p_type="attack";p_rang=5;p_tar=3;p_spli=8;p_att=440;p_arp=-2;p_duration=0; var rah;rah=choose(1,2); if (rah=1) then flavour_text2="- a pair of Thunderwolf revenants sprint outward, running down and overwhelming foes. "; if (rah=2) then flavour_text2="- ghostly visages of Freki and Geri launch into his foes, overwhelming them. "; } - if (power_name="Thunderclap"){p_type="attack";p_rang=1.1;p_tar=3;p_spli=1;p_att=600;p_arp=0;p_duration=0; + if (power_name="Thunderclap"){p_type="attack";p_rang=2.1;p_tar=3;p_spli=1;p_att=600;p_arp=-2;p_duration=0; flavour_text2="- smashing his gauntlets together and unleashing a mighty shockwave. "; } - if (power_name="Jaws of the World Wolf"){p_type="attack";p_rang=5;p_tar=3;p_spli=1;p_att=800;p_arp=1;p_duration=0; + if (power_name="Jaws of the World Wolf"){p_type="attack";p_rang=5;p_tar=3;p_spli=20;p_att=800;p_arp=1;p_duration=0; flavour_text2="- chasms open up beneath his foes, swallowing them down and crushing them. "; } - if (power_name="Avenge"){p_type="attack";p_rang=5;p_tar=3;p_spli=1;p_att=500;p_arp=0;p_duration=0; + if (power_name="Avenge"){p_type="attack";p_rang=8;p_tar=3;p_spli=12;p_att=500;p_arp=-2;p_duration=0; var rah;rah=choose(1,2); if (rah=1) then flavour_text2="- a destructive avatar of rolling flame crashes into the enemy. "; if (rah=2) then flavour_text2="- a massive conflagration rises up and then crashes down upon the enemy. "; @@ -864,12 +864,15 @@ function scr_powers(power_set, power_count, enemy_target, unit_id) { if (enemy5.dudes_vehicle[good2]=0){ if (p_arp=1) then eac=0; - if (p_arp=-1) then eac=eac*6; + if (p_arp=0) then eac=eac*3; + if (p_arp=-1) then eac=eac*2; + if (p_arp=-2) then eac=eac*1.5; } if (enemy5.dudes_vehicle[good2]=1){ if (p_arp=-1) then eac=a; if (p_arp=0) then eac=eac*6; - if (p_arp=-1) then eac=a; + if (p_arp=-1) then eac=eac*4; + if (p_arp=-2) then eac=eac*2; } b=a-eac;if (b<=0) then b=0; diff --git a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml index 3a1fe35450..963e5ba064 100644 --- a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml +++ b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml @@ -68,6 +68,7 @@ function scr_ui_display_weapons(left_or_right, current_armor, equiped_weapon, cu "Infernus Pistol":spr_weapon_inferno, "Bolter":spr_weapon_bolter, "Storm Bolter":spr_weapon_sbolter, + "Wrist-Mounted Storm Bolter":spr_weapon_sbolter, "Plasma Pistol":spr_weapon_plasp, "Plasma Gun":spr_weapon_plasg, "Flamer":spr_weapon_flamer, @@ -127,6 +128,7 @@ function scr_ui_display_weapons(left_or_right, current_armor, equiped_weapon, cu "Power Spear":spr_weapon_powspear, "Thunder Hammer":spr_weapon_thhammer, "Power Axe":spr_weapon_powaxe, + "Omnissian Axe":spr_weapon_powaxe, "Crozius Arcanum":spr_weapon_crozarc, "Chainaxe":spr_weapon_chaxe, "Force Staff":spr_weapon_frcstaff, @@ -189,6 +191,7 @@ function scr_ui_display_weapons(left_or_right, current_armor, equiped_weapon, cu if (!sprite_found){ var special_ranged ={ "Sniper Rifle":spr_weapon_sniper, + "Needle Sniper Rifle":spr_weapon_sniper, "Autocannon":spr_weapon_autocannon2, } var special_ranged_names=struct_get_names(special_ranged); @@ -324,7 +327,7 @@ function scr_ui_display_weapons(left_or_right, current_armor, equiped_weapon, cu hand_variant[left_or_right] = 3; } - if (array_contains(["Sniper Rifle", "Force Staff", "Power Sword", "Thunder Hammer", "Autocannon", "Combat Knife", "Power Spear", "Chainsword", "Force Sword"], equiped_weapon)) { + if (array_contains(["Sniper Rifle", "Needle Sniper Rifle", "Force Staff", "Power Sword", "Thunder Hammer", "Autocannon", "Combat Knife", "Power Spear", "Chainsword", "Force Sword"], equiped_weapon)) { hand_variant[left_or_right] = 2; hand_on_top[left_or_right] = true; } diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 2876480038..87a4bb4d46 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -211,15 +211,15 @@ global.weapons = { "Lascutter": { "abbreviation": "Lasct", "attack": { - "standard": 100, - "master_crafted": 150, - "artifact": 200 + "standard": 250, + "master_crafted": 300, + "artifact": 425 }, - "description": "Origonally industrial tools used for breaking through bulkheads, this laser weapon is devastating in close combat.", + "description": "Originally industrial tools used for breaking through bulkheads, this laser weapon is devastating in close combat.", "melee_hands": 1, "range": 1, "arp": 1, - "tags": ["las","boarding", "siege"], + "tags": ["las","boarding 3", "siege"], }, "Power Weapon": { "abbreviation": "PwrWpn", @@ -239,7 +239,7 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 3, - "arp": -2, + "arp": -1, "tags": ["power"], }, "Power Axe": { @@ -263,6 +263,27 @@ global.weapons = { "arp": -1, "tags": ["power", "axe", "dual","savage", "boarding 2"], }, + "Omnissian Axe": { + "abbreviation": "OmnAxe", + "attack": { + "standard": 400, + "master_crafted": 450, + "artifact": 550 + }, + "melee_mod": { + "standard": 1, + "master_crafted": 1.1, + "artifact": 1.2 + }, + "description": "A symbol that is equally weapon and holy icon given only to those trained by the Adeptus Mechanicus and have shown their devotion to the Omnissiah in battle.", + "melee_hands": 1, + "ranged_hands": 0, + "ammo": 0, + "range": 1, + "spli": 5, + "arp": -1, + "tags": ["power", "axe", "savage", "boarding 3"], + }, "Executioner Power Axe": { "abbreviation": "ExPwrAxe", "attack": { @@ -280,7 +301,7 @@ global.weapons = { "ranged_hands": 2, "ammo": 0, "range": 1, - "spli": 2, + "spli": 5, "arp": -2, "tags": ["power", "axe", "martial"], }, @@ -368,7 +389,7 @@ global.weapons = { "spli": 2, "arp": -2, "second_profiles": ["Assault Cannon"], - "tags": ["power","boarding", "chain", "fist", "dual", "siege"], + "tags": ["power","boarding 3", "chain", "fist", "dual", "siege"], }, "Lightning Claw": { "abbreviation": "LghtClw", @@ -389,9 +410,9 @@ global.weapons = { "Dreadnought Lightning Claw": { "abbreviation": "LghtClw", "attack": { - "standard": 300, - "master_crafted": 400, - "artifact": 600 + "standard": 600, + "master_crafted": 700, + "artifact": 850 }, "melee_mod": { "standard": 1.2, @@ -452,7 +473,7 @@ global.weapons = { "spli": 15, "maintenance" : 0.1, "req_exp": 100, - "tags": ["heavy_melee", "power", "hammer", "siege", "savage"], + "tags": ["heavy_melee", "power", "hammer", "siege", "savage"], }, "Power Mace": { "abbreviation": "PwrMace", @@ -581,7 +602,7 @@ global.weapons = { "arp": 0, "tags": ["bolt", "pistol", "boarding 1"], }, - "Wrist-Mounted Storm Bolter": { // TODO: Not used outside of this file atm; + "Wrist-Mounted Storm Bolter": { "abbreviation": "WrstBlt", "attack": { "standard": 275, @@ -593,8 +614,9 @@ global.weapons = { "ranged_hands": 1, "ammo": 10, "range": 4.1, - "spli": 6, + "spli": 8, "arp": 0, + "maintenance" : 0.1, "tags": ["bolt", "pistol", "boarding 2"], }, "Webber": { @@ -627,9 +649,8 @@ global.weapons = { "range": 4.1, "spli": 1, "arp": 1, - "maintenance" : 0.8, + "maintenance" : 0.2, "tags": ["grav", "pistol"], - "maintenance" : 0.8, }, "Integrated-Grav": { "abbreviation": "IntGrv", @@ -662,7 +683,7 @@ global.weapons = { "spli": 3, "arp": 1, "tags": ["grav"], - "maintenance" : 0.1, + "maintenance" : 0.5, }, "Grav-Cannon": { "abbreviation": "GrvCan", @@ -678,8 +699,8 @@ global.weapons = { "range": 6, "spli": 6, "arp": 1, - "tags": ["grav", "heavy_weapon"], - "maintenance" : 0.2, + "tags": ["grav", "heavy_ranged"], + "maintenance" : 0.8, }, "Underslung Bolter": { "abbreviation": "UndBltr", @@ -968,19 +989,19 @@ global.weapons = { "tags": ["precision", "rifle"] }, "Needle Sniper Rifle": { - "abbreviation": "SnprRfl", + "abbreviation": "NdlSnpr", "attack": { "standard": 250, "master_crafted": 300, "artifact": 350 }, - "description": "The Sniper Rifle fires a solid shell over long range and boasts powerful telescopic sights to assist, allowing the user to target enemy weak points and distant foes.", + "description": "The Needle Sniper Rifle is a deadly weapon that uses both directed lasers and crystallised neurotoxic needles to dispatch enemies, commonly favoured by assasins and Astartes Scouts .", "melee_hands": 1, "ranged_hands": 2, "ammo": 20, "range": 14, "spli": 1, - "arp": -1, + "arp": -2, "tags": ["precision", "rifle"] }, "Assault Cannon": { @@ -1013,7 +1034,7 @@ global.weapons = { "range": 14, "spli": 12, "arp": -1, - "tags": ["heavy_ranged", "dreadnought"] + "tags": ["heavy_ranged","explosive", "dreadnought"] }, "Missile Launcher": { "abbreviation": "MsslLnch", @@ -1029,7 +1050,24 @@ global.weapons = { "range": 15, "spli": 10, "arp": -1, - "tags": ["heavy_ranged", "dreadnought"] + + "tags": ["heavy_ranged","explosive", "dreadnought"] + }, + "Cyclone Missile Launcher": { + "abbreviation": "CycLnch", + "attack": { + "standard": 600, + "master_crafted": 700, + "artifact": 950 + }, + "description": "This power pack mounted weapon is capable of unleashing a hail of either armor-piercing or fragmentation rockets. It's ammunition is limited by what the bearer has carried with them.", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 6, + "range": 15, + "spli": 20, + "arp": -1, + "tags": ["heavy_ranged","explosive"] }, "Lascannon": { "abbreviation": "Lascnn", @@ -1421,7 +1459,7 @@ global.weapons = { "range": 18, "spli": 15, "arp": -1, - "tags": ["vehicle","heavy_ranged", "turret"] + "tags": ["vehicle","heavy_ranged","explosive", "turret"] }, "Storm Bolter": { "abbreviation": "StrmBltr",