cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5054 from Heroman3003/mob-pathfix

Browse Source 
Fixes mob pathing for wilderness and V2
This commit is contained in:
Novacat
2019-04-15 02:38:20 -04:00
committed by GitHub
parent 47b47d001a c238820f95
commit 880fd9f263
12 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/ai/aI_holder_subtypes/simple_mob_ai_vr.dm Normal file
View File

@@ -0,0 +1,5 @@
/datum/ai_holder/simple_mob/melee/evasive/returnhome
returns_home = 1
/datum/ai_holder/simple_mob/ranged/kiting/threatening/returnhome
returns_home = 1

3
code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm Normal file
View File

@@ -0,0 +1,3 @@
/datum/say_list/merc/unknown_ind
speak = list("One day the'll fix that damn engine..","Next time, We're hidding on the tropical beach planet.","Wish I had better equipment...","I knew I should have been a line chef...","Fuckin' helmet keeps fogging up.","Hate this blocky ass ship.")
say_got_target = list("Looks like trouble!","Contact!","We've got company!","Perimeter Breached!!")

2
maps/submaps/surface_submaps/plains/Oldhouse.dmm
View File

@@ -37,7 +37,7 @@
"K" = (/obj/structure/table/woodentable,/obj/item/weapon/paper,/obj/item/weapon/paper,/turf/simulated/floor/wood,/area/submap/Oldhouse) "K" = (/obj/structure/table/woodentable,/obj/item/weapon/paper,/obj/item/weapon/paper,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"L" = (/obj/structure/table/woodentable,/obj/item/weapon/paper/crumpled,/turf/simulated/floor/wood,/area/submap/Oldhouse) "L" = (/obj/structure/table/woodentable,/obj/item/weapon/paper/crumpled,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"M" = (/obj/structure/frame,/turf/simulated/floor/wood,/area/submap/Oldhouse) "M" = (/obj/structure/frame,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"N" = (/mob/living/simple_mob/animal/giant_spider{attack_armor_pen = 100; attacktext = list("lightly bonked"); desc = "Furry and brown, this spider is so goddamn fat you're surprised it even moves around."; faction = "neutral"; health = 400; melee_damage_lower = 1; melee_damage_upper = 3; melee_miss_chance = 30; move_speed = 5; name = "Mr. Tuddly"},/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) "N" = (/mob/living/simple_mob/animal/giant_spider{attack_armor_pen = 100; attacktext = list("lightly bonked"); desc = "Furry and brown, this spider is so goddamn fat you're surprised it even moves around."; faction = "neutral"; health = 400; melee_damage_lower = 1; melee_damage_upper = 3; melee_miss_chance = 30; movement_cooldown = 8; name = "Mr. Tuddly"},/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse)
"O" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) "O" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse)
"P" = (/obj/item/weapon/circuitboard/papershredder,/turf/simulated/floor/wood,/area/submap/Oldhouse) "P" = (/obj/item/weapon/circuitboard/papershredder,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"Q" = (/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse) "Q" = (/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse)

4
maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm
View File

@@ -179,7 +179,7 @@
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/Oldhouse) /area/submap/Oldhouse)
"aN" = ( "aN" = (
/mob/living/simple_animal/hostile/giant_spider{ /mob/living/simple_mob/animal/giant_spider{
attack_armor_pen = 100; attack_armor_pen = 100;
attacktext = list("lightly bonked"); attacktext = list("lightly bonked");
desc = "Furry and brown, this spider is so goddamn fat you're surprised it even moves around."; desc = "Furry and brown, this spider is so goddamn fat you're surprised it even moves around.";
@@ -188,7 +188,7 @@
melee_damage_lower = 1; melee_damage_lower = 1;
melee_damage_upper = 3; melee_damage_upper = 3;
melee_miss_chance = 30; melee_miss_chance = 30;
move_speed = 5; movement_cooldown = 8;
name = "Mr. Tuddly" name = "Mr. Tuddly"
}, },
/turf/simulated/floor/carpet/turcarpet, /turf/simulated/floor/carpet/turcarpet,

2
maps/submaps/surface_submaps/plains/RationCache_vr.dmm
View File

@@ -6,7 +6,7 @@
/turf/simulated/floor/outdoors/snow, /turf/simulated/floor/outdoors/snow,
/area/submap/RationCache) /area/submap/RationCache)
"c" = ( "c" = (
/mob/living/simple_animal/otie/feral, /mob/living/simple_mob/vore/aggressive/dino,
/turf/simulated/floor/outdoors/snow, /turf/simulated/floor/outdoors/snow,
/area/submap/RationCache) /area/submap/RationCache)
"d" = ( "d" = (

2
maps/submaps/surface_submaps/plains/Shakden_vr.dmm
View File

@@ -38,7 +38,7 @@
}, },
/area/submap/Shakden) /area/submap/Shakden)
"h" = ( "h" = (
/mob/living/simple_animal/hostile/dragon, /mob/living/simple_mob/vore/aggressive/dragon/virgo3b,
/turf/simulated/floor/outdoors/dirt{ /turf/simulated/floor/outdoors/dirt{
outdoors = 0 outdoors = 0
}, },

2
maps/submaps/surface_submaps/plains/Thiefc_vr.dmm
View File

@@ -118,7 +118,7 @@
}, },
/area/submap/Thiefc) /area/submap/Thiefc)
"q" = ( "q" = (
/mob/living/simple_animal/hostile/bear, /mob/living/simple_mob/animal/space/bear,
/turf/simulated/floor/outdoors/dirt{ /turf/simulated/floor/outdoors/dirt{
outdoors = 0 outdoors = 0
}, },

23
maps/tether/submaps/aerostat/submaps/Blackshuttledown.dmm
View File

@@ -148,9 +148,9 @@
}, },
/area/submap/virgo2/Blackshuttledown) /area/submap/virgo2/Blackshuttledown)
"aB" = ( "aB" = (
/mob/living/simple_mob/hostile/viscerator, /mob/living/simple_mob/mechanical/viscerator,
/mob/living/simple_mob/hostile/viscerator, /mob/living/simple_mob/mechanical/viscerator,
/mob/living/simple_mob/hostile/viscerator, /mob/living/simple_mob/mechanical/viscerator,
/turf/simulated/floor/tiled/steel, /turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown) /area/submap/virgo2/Blackshuttledown)
"aC" = ( "aC" = (
@@ -163,7 +163,7 @@
/turf/simulated/floor/tiled/steel, /turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown) /area/submap/virgo2/Blackshuttledown)
"aD" = ( "aD" = (
/mob/living/simple_mob/hostile/syndicate/ranged/space, /mob/living/simple_mob/humanoid/merc/ranged/space,
/turf/simulated/floor/tiled/steel, /turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown) /area/submap/virgo2/Blackshuttledown)
"aE" = ( "aE" = (
@@ -242,11 +242,10 @@
/turf/simulated/floor/tiled/steel, /turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown) /area/submap/virgo2/Blackshuttledown)
"aT" = ( "aT" = (
/mob/living/simple_mob/hostile/syndicate/ranged{ /mob/living/simple_mob/humanoid/merc/ranged{
desc = "Dosen't look friendly in the slightest.";
name = "Unknown Individual"; name = "Unknown Individual";
say_got_target = list("Looks like trouble!","Contact!","We've got company!","Perimeter Breached!!"); desc = "Dosen't look friendly in the slightest.";
speak = list("One day the'll fix that damn engine..","Next time, We're hidding on the tropical beach planet.","Wish I had better equipment...","I knew I should have been a line chef...","Fuckin' helmet keeps fogging up.","Hate this blocky ass ship.") say_list_type = /datum/say_list/merc/unknown_ind
}, },
/turf/simulated/floor/tiled/steel, /turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown) /area/submap/virgo2/Blackshuttledown)
@@ -374,7 +373,7 @@
/turf/simulated/floor/tiled/steel, /turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown) /area/submap/virgo2/Blackshuttledown)
"bn" = ( "bn" = (
/mob/living/simple_mob/hostile/viscerator, /mob/living/simple_mob/mechanical/viscerator,
/turf/simulated/floor/tiled/steel, /turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown) /area/submap/virgo2/Blackshuttledown)
"bo" = ( "bo" = (
@@ -393,8 +392,8 @@
/turf/simulated/floor/tiled/steel, /turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown) /area/submap/virgo2/Blackshuttledown)
"bq" = ( "bq" = (
/mob/living/simple_mob/hostile/viscerator, /mob/living/simple_mob/mechanical/viscerator,
/mob/living/simple_mob/hostile/viscerator, /mob/living/simple_mob/mechanical/viscerator,
/turf/simulated/floor/tiled/steel, /turf/simulated/floor/tiled/steel,
/area/submap/virgo2/Blackshuttledown) /area/submap/virgo2/Blackshuttledown)
"br" = ( "br" = (
@@ -439,7 +438,7 @@
/turf/simulated/mineral/floor/ignore_mapgen/virgo2, /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
/area/submap/virgo2/Blackshuttledown) /area/submap/virgo2/Blackshuttledown)
"bz" = ( "bz" = (
/mob/living/simple_mob/hostile/syndicate/ranged/space, /mob/living/simple_mob/humanoid/merc/ranged/space,
/turf/simulated/mineral/floor/ignore_mapgen/virgo2, /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
/area/submap/virgo2/Blackshuttledown) /area/submap/virgo2/Blackshuttledown)

4
maps/tether/submaps/aerostat/submaps/Boombase.dmm
View File

@@ -57,7 +57,7 @@
/turf/simulated/floor/tiled/techfloor/virgo2, /turf/simulated/floor/tiled/techfloor/virgo2,
/area/submap/virgo2/BoomBase) /area/submap/virgo2/BoomBase)
"ao" = ( "ao" = (
/mob/living/simple_mob/hostile/jelly, /mob/living/simple_mob/animal/space/jelly,
/turf/simulated/floor/tiled/techfloor/virgo2, /turf/simulated/floor/tiled/techfloor/virgo2,
/area/submap/virgo2/BoomBase) /area/submap/virgo2/BoomBase)
"ap" = ( "ap" = (
@@ -96,7 +96,7 @@
/area/submap/virgo2/BoomBase) /area/submap/virgo2/BoomBase)
"ax" = ( "ax" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/mob/living/simple_mob/hostile/jelly, /mob/living/simple_mob/animal/space/jelly,
/turf/simulated/floor/tiled/techfloor/virgo2, /turf/simulated/floor/tiled/techfloor/virgo2,
/area/submap/virgo2/BoomBase) /area/submap/virgo2/BoomBase)
"ay" = ( "ay" = (

6
maps/tether/submaps/aerostat/submaps/CaveS.dmm
View File

@@ -48,7 +48,7 @@
/turf/simulated/mineral/floor/ignore_mapgen/virgo2, /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
/area/submap/virgo2/CaveS) /area/submap/virgo2/CaveS)
"m" = ( "m" = (
/mob/living/simple_mob/hostile/giant_spider/lurker, /mob/living/simple_mob/animal/giant_spider/lurker,
/turf/simulated/mineral/floor/ignore_mapgen/virgo2, /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
/area/submap/virgo2/CaveS) /area/submap/virgo2/CaveS)
"n" = ( "n" = (
@@ -61,7 +61,7 @@
/area/submap/virgo2/CaveS) /area/submap/virgo2/CaveS)
"q" = ( "q" = (
/obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/cobweb2,
/mob/living/simple_mob/hostile/giant_spider/lurker, /mob/living/simple_mob/animal/giant_spider/lurker,
/turf/simulated/mineral/floor/ignore_mapgen/virgo2, /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
/area/submap/virgo2/CaveS) /area/submap/virgo2/CaveS)
"r" = ( "r" = (
@@ -133,7 +133,7 @@
/area/submap/virgo2/CaveS) /area/submap/virgo2/CaveS)
"D" = ( "D" = (
/obj/effect/spider/stickyweb, /obj/effect/spider/stickyweb,
/mob/living/simple_mob/hostile/giant_spider/lurker, /mob/living/simple_mob/animal/giant_spider/lurker,
/turf/simulated/mineral/floor/ignore_mapgen/virgo2, /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
/area/submap/virgo2/CaveS) /area/submap/virgo2/CaveS)
"E" = ( "E" = (

14
maps/tether/submaps/aerostat/submaps/Rockybase.dmm
View File

@@ -1,8 +1,8 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = ( "aa" = (
/mob/living/simple_mob/hostile/viscerator{ /mob/living/simple_mob/mechanical/viscerator{
maxbodytemp = 900; maxbodytemp = 900;
returns_home = 1 ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/returnhome
}, },
/turf/simulated/mineral/floor/ignore_mapgen/virgo2, /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
/area/template_noop) /area/template_noop)
@@ -21,11 +21,11 @@
/turf/simulated/floor/tiled/techfloor/virgo2, /turf/simulated/floor/tiled/techfloor/virgo2,
/area/submap/virgo2/Rockybase) /area/submap/virgo2/Rockybase)
"af" = ( "af" = (
/mob/living/simple_mob/hostile/malf_drone{ /mob/living/simple_mob/mechanical/combat_drone{
desc = "An automated combat drone with an aged apperance."; desc = "An automated combat drone with an aged apperance.";
faction = "syndicate"; faction = "syndicate";
maxbodytemp = 900; maxbodytemp = 900;
returns_home = 1 ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/threatening/returnhome
}, },
/turf/simulated/mineral/floor/ignore_mapgen/virgo2, /turf/simulated/mineral/floor/ignore_mapgen/virgo2,
/area/submap/virgo2/Rockybase) /area/submap/virgo2/Rockybase)
@@ -357,11 +357,11 @@
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/submap/virgo2/Rockybase) /area/submap/virgo2/Rockybase)
"bl" = ( "bl" = (
/mob/living/simple_mob/hostile/malf_drone{ /mob/living/simple_mob/mechanical/combat_drone{
desc = "An automated combat drone with an aged apperance."; desc = "An automated combat drone with an aged apperance.";
faction = "syndicate"; faction = "syndicate";
maxbodytemp = 900; maxbodytemp = 900;
returns_home = 1 ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/threatening/returnhome
}, },
/turf/simulated/floor/tiled/techfloor/virgo2, /turf/simulated/floor/tiled/techfloor/virgo2,
/area/submap/virgo2/Rockybase) /area/submap/virgo2/Rockybase)
@@ -664,7 +664,7 @@
/turf/simulated/floor/tiled/techfloor/virgo2, /turf/simulated/floor/tiled/techfloor/virgo2,
/area/submap/virgo2/Rockybase) /area/submap/virgo2/Rockybase)
"co" = ( "co" = (
/mob/living/simple_mob/hostile/mecha/malf_drone{ /mob/living/simple_mob/mechanical/combat_drone{
faction = "syndicate" faction = "syndicate"
}, },
/turf/simulated/floor/tiled/techfloor/virgo2, /turf/simulated/floor/tiled/techfloor/virgo2,

2
vorestation.dme
View File

@@ -1480,6 +1480,7 @@
#include "code\modules\ai\interfaces.dm" #include "code\modules\ai\interfaces.dm"
#include "code\modules\ai\say_list.dm" #include "code\modules\ai\say_list.dm"
#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm" #include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm"
#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai_vr.dm"
#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm" #include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm"
#include "code\modules\alarm\alarm.dm" #include "code\modules\alarm\alarm.dm"
#include "code\modules\alarm\alarm_handler.dm" #include "code\modules\alarm\alarm_handler.dm"
@@ -2365,6 +2366,7 @@
#include "code\modules\mob\living\simple_mob\subtypes\humanoid\pirates.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\pirates.dm"
#include "code\modules\mob\living\simple_mob\subtypes\humanoid\russian.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\russian.dm"
#include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs.dm"
#include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs_vr.dm"
#include "code\modules\mob\living\simple_mob\subtypes\illusion\illusion.dm" #include "code\modules\mob\living\simple_mob\subtypes\illusion\illusion.dm"
#include "code\modules\mob\living\simple_mob\subtypes\mechanical\combat_drone.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\combat_drone.dm"
#include "code\modules\mob\living\simple_mob\subtypes\mechanical\golem.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\golem.dm"