From 15b42a92aa7e92277a5d8b51e6d144e7f33db111 Mon Sep 17 00:00:00 2001 From: BurgerLUA Date: Fri, 20 Jul 2018 12:30:51 -0700 Subject: [PATCH] Kinetic Accelerator Tweaks (#4949) The results are in: Science doesn't always provide mining with kinetic accelerators. As a result of these findings, high level kinetic accelerators now have increased drop chances in the warehouse and in abandoned crates. Also, kinetic accelerators no longer dig holes. --- code/game/objects/random/random.dm | 27 +++++++++------ code/modules/cargo/randomstock.dm | 2 +- code/modules/custom_ka/projectiles.dm | 4 --- code/modules/mining/abandonedcrates.dm | 13 +++----- html/changelogs/burgerbb-kinetic_tweaks.yml | 37 +++++++++++++++++++++ 5 files changed, 59 insertions(+), 24 deletions(-) create mode 100644 html/changelogs/burgerbb-kinetic_tweaks.yml diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index c1420e12dc9..baea1ae615a 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -991,28 +991,33 @@ desc = "Wew." icon = 'icons/obj/kinetic_accelerators.dmi' icon_state = "frame01" - spawnlist = list( /obj/item/toy/prize/honk ) has_postspawn = TRUE post_spawn(obj/thing) var/list/frames = list( - /obj/item/weapon/gun/custom_ka/frame01 = 3, + /obj/item/weapon/gun/custom_ka/frame01 = 1, /obj/item/weapon/gun/custom_ka/frame02 = 2, - /obj/item/weapon/gun/custom_ka/frame03 = 1 + /obj/item/weapon/gun/custom_ka/frame03 = 3, + /obj/item/weapon/gun/custom_ka/frame04 = 2, + /obj/item/weapon/gun/custom_ka/frame05 = 1 ) var/list/cells = list( - /obj/item/custom_ka_upgrade/cells/cell01 = 3, - /obj/item/custom_ka_upgrade/cells/cell02 = 2, - /obj/item/custom_ka_upgrade/cells/cell03 = 1 + /obj/item/custom_ka_upgrade/cells/cell01 = 2, + /obj/item/custom_ka_upgrade/cells/cell02 = 3, + /obj/item/custom_ka_upgrade/cells/cell03 = 2, + /obj/item/custom_ka_upgrade/cells/cell04 = 1, + /obj/item/custom_ka_upgrade/cells/cell05 = 1 ) var/list/barrels = list( - /obj/item/custom_ka_upgrade/barrels/barrel01 = 3, - /obj/item/custom_ka_upgrade/barrels/barrel02 = 2, - /obj/item/custom_ka_upgrade/barrels/barrel03 = 1 + /obj/item/custom_ka_upgrade/barrels/barrel01 = 2, + /obj/item/custom_ka_upgrade/barrels/barrel02 = 3, + /obj/item/custom_ka_upgrade/barrels/barrel03 = 2, + /obj/item/custom_ka_upgrade/barrels/barrel04 = 1, + /obj/item/custom_ka_upgrade/barrels/barrel05 = 1 ) var/frame_type = pickweight(frames) @@ -1029,4 +1034,6 @@ spawned_frame.update_icon() spawned_frame.update_stats() - qdel(thing) \ No newline at end of file + qdel(thing) + + diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm index 31ea9756522..1414959b8c2 100644 --- a/code/modules/cargo/randomstock.dm +++ b/code/modules/cargo/randomstock.dm @@ -133,6 +133,7 @@ var/list/global/random_stock_common = list( "phoronsheets" = 2, "hide" = 1, "arcade" = 2, + "custom_ka" = 1, "nothing" = 0) var/list/global/random_stock_uncommon = list( @@ -225,7 +226,6 @@ var/list/global/random_stock_rare = list( "humanhide" = 0.5, "modkit" = 1, "contraband" = 0.8, - "custom_ka" = 0.5, "nothing" = 0) var/list/global/random_stock_large = list( diff --git a/code/modules/custom_ka/projectiles.dm b/code/modules/custom_ka/projectiles.dm index 4509d402bd9..d1f4719d0da 100644 --- a/code/modules/custom_ka/projectiles.dm +++ b/code/modules/custom_ka/projectiles.dm @@ -20,7 +20,6 @@ if(isliving(A)) //Never do more than 15 damage to a living being per shot. damage = min(damage,15) - strike_thing(A,aoe*aoe_scale,damage) . = ..() @@ -31,9 +30,6 @@ if(istype(target_turf, /turf/simulated/mineral)) var/turf/simulated/mineral/M = target_turf M.kinetic_hit(damage,dir) - else if(istype(target_turf, /turf/simulated/floor/asteroid)) - var/turf/simulated/floor/asteroid/A = target_turf - A.gets_dug() new /obj/effect/overlay/temp/kinetic_blast(target_turf) diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 184c89395f3..6cefdf8feba 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -29,10 +29,9 @@ new/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus(src) new/obj/item/weapon/flame/lighter/zippo(src) if(6 to 10) - new/obj/item/weapon/pickaxe/drill(src) - new/obj/item/device/taperecorder(src) - new/obj/item/clothing/suit/space(src) - new/obj/item/clothing/head/helmet/space(src) + new/obj/random/custom_ka(src) + new/obj/random/custom_ka(src) + new/obj/random/custom_ka(src) if(11 to 15) new/obj/item/weapon/reagent_containers/glass/beaker/bluespace(src) if(16 to 20) @@ -95,11 +94,7 @@ new/obj/item/weapon/pickaxe/gold(src) if(81 to 82) new/obj/item/weapon/gun/energy/plasmacutter(src) - if(83) - new/obj/random/custom_ka(src) - new/obj/random/custom_ka(src) - new/obj/random/custom_ka(src) - if(84) + if(83 to 84) new/obj/item/toy/katana(src) if(85) new/obj/item/seeds/random(src) diff --git a/html/changelogs/burgerbb-kinetic_tweaks.yml b/html/changelogs/burgerbb-kinetic_tweaks.yml new file mode 100644 index 00000000000..fa23bb3e110 --- /dev/null +++ b/html/changelogs/burgerbb-kinetic_tweaks.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: BurgerBB + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Kinetic Accelerators can no longer dig holes. Improved warehouse and abandoned crate loot chances of getting kinetic accelerators. High level kinetic accelerators can now be found."