Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit d981936

Browse files
MoltijoeAMyriadseviltwinAMyriad
authored
Jungle dragon (#22332)
* implements jungledrake * Update jungle_drake.dm * Update jungle_drake.dm * Update jungle_drake.dm * Update jungle_drake.dm * Update jungle_drake.dm * Update jungle_drake.dm * Update yogstation/code/modules/jungleland/megafauna/jungle_drake.dm Co-authored-by: AMyriadseviltwin <[email protected]> * Update yogstation/code/modules/jungleland/megafauna/jungle_drake.dm Co-authored-by: AMyriadseviltwin <[email protected]> * Update yogstation/code/modules/jungleland/megafauna/jungle_drake.dm Co-authored-by: AMyriadseviltwin <[email protected]> * Update yogstation/code/modules/jungleland/megafauna/jungle_drake.dm Co-authored-by: AMyriadseviltwin <[email protected]> * Update yogstation/code/modules/jungleland/megafauna/jungle_drake.dm Co-authored-by: AMyriadseviltwin <[email protected]> * Update yogstation/code/modules/jungleland/megafauna/jungle_drake.dm Co-authored-by: AMyriadseviltwin <[email protected]> * here * Update jungle_dragon.dm * Update jungle_dragon.dm * drakeling * Update jungle_whelp.dm * tweaks * Update jungle_dragon.dm * code optimize * Update jungle_dragon.dm * Update jungle_dragon.dm * Update jungleland_barren_drake.dmm * reorganize * Update jungle.dm * layout * Update _maps/RandomRuins/JungleRuins/jungleland_jungle_dragon.dmm Co-authored-by: AMyriad <[email protected]> --------- Co-authored-by: AMyriadseviltwin <[email protected]> Co-authored-by: AMyriad <[email protected]>
1 parent ed43ed4 commit d981936

File tree

15 files changed

+864
-340
lines changed

15 files changed

+864
-340
lines changed

‎_maps/RandomRuins/JungleRuins/jungleland_barren_drake.dmm‎

Lines changed: 0 additions & 148 deletions
This file was deleted.

‎_maps/RandomRuins/JungleRuins/jungleland_jungle_dragon.dmm‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
2+
"a" = (
3+
/turf/template_noop,
4+
/area/template_noop)
5+
"f" = (
6+
/obj/structure/flora/rock/jungle,
7+
/turf/open/floor/plating/dirt/jungleland/jungle,
8+
/area/template_noop)
9+
"i" = (
10+
/obj/structure/flora/junglebush/b,
11+
/turf/open/floor/plating/dirt/jungleland/jungle,
12+
/area/template_noop)
13+
"n" = (
14+
/obj/structure/flora/grass/jungle,
15+
/turf/open/floor/plating/dirt/jungleland/jungle,
16+
/area/template_noop)
17+
"o" = (
18+
/obj/structure/flora/junglebush/large,
19+
/turf/open/floor/plating/dirt/jungleland/jungle,
20+
/area/template_noop)
21+
"r" = (
22+
/obj/structure/flora/junglebush/c,
23+
/turf/open/floor/plating/dirt/jungleland/jungle,
24+
/area/template_noop)
25+
"E" = (
26+
/obj/structure/flora/rock/pile/largejungle,
27+
/mob/living/simple_animal/hostile/megafauna/dragon/jungle,
28+
/turf/open/water/smooth/toxic_pit,
29+
/area/template_noop)
30+
"O" = (
31+
/obj/structure/flora/grass/jungle,
32+
/turf/open/water/smooth/toxic_pit,
33+
/area/template_noop)
34+
"R" = (
35+
/turf/open/floor/plating/dirt/jungleland/jungle,
36+
/area/template_noop)
37+
38+
(1,1,1) = {"
39+
a
40+
R
41+
R
42+
R
43+
n
44+
R
45+
a
46+
"}
47+
(2,1,1) = {"
48+
R
49+
R
50+
o
51+
R
52+
R
53+
R
54+
R
55+
"}
56+
(3,1,1) = {"
57+
R
58+
R
59+
R
60+
O
61+
R
62+
R
63+
n
64+
"}
65+
(4,1,1) = {"
66+
R
67+
R
68+
O
69+
E
70+
O
71+
R
72+
R
73+
"}
74+
(5,1,1) = {"
75+
i
76+
R
77+
R
78+
O
79+
R
80+
R
81+
R
82+
"}
83+
(6,1,1) = {"
84+
R
85+
n
86+
R
87+
R
88+
R
89+
f
90+
R
91+
"}
92+
(7,1,1) = {"
93+
a
94+
R
95+
R
96+
r
97+
R
98+
R
99+
a
100+
"}

‎code/datums/status_effects/debuffs/holy_fire.dm‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
/datum/status_effect/holy_fire
2-
id = "doubledown"
2+
id = "holyfire"
33
duration = 6 SECONDS
44
tick_interval = 1 //10 times per second
55
status_type = STATUS_EFFECT_REFRESH
6+
///total damage dealth over the course of the debuff
67
var/total_damage = 180
8+
///holder variable for the damage per tick, calculated upon application
79
var/damage_per_tick = 1
810

911
/datum/status_effect/holy_fire/on_apply()
@@ -21,3 +23,7 @@
2123
/datum/status_effect/holy_fire/on_remove()
2224
owner.remove_emitter("holy_fire")
2325
owner.remove_emitter("holy_sparks")
26+
27+
/datum/status_effect/holy_fire/weak
28+
id = "holyfire_weak"
29+
total_damage = 40

‎code/game/objects/items/gems.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117

118118
/obj/item/gem/amber
119119
name = "draconic amber"
120-
desc = "A brittle, strange mineral that forms from the rapidly cooling blood of a dying ash drake. Cherished by gemcutters for its faint glow and unique, soft warmth. Rumors among some mining crews whisper of the dragon's strength being bestowed to one that wears a necklace of this amber."
120+
desc = "A brittle, strange mineral that forms from the rapidly cooling blood of a dying drake. Cherished by gemcutters for its faint glow and unique, soft warmth. Rumors among some mining crews whisper of the dragon's strength being bestowed to one that wears a necklace of this amber."
121121
icon_state = "amber"
122122
point_value = 1600
123123
light_range = 2

‎code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ Difficulty: Medium
5656
loot = list(/obj/structure/closet/crate/necropolis/dragon)
5757
butcher_results = list(/obj/item/stack/ore/diamond = 5, /obj/item/stack/sheet/sinew = 5, /obj/item/stack/sheet/bone = 30)
5858
guaranteed_butcher_results = list(/obj/item/stack/sheet/animalhide/ashdrake = 10)
59-
var/swooping = NONE
60-
var/player_cooldown = 0
6159
gps_name = "Fiery Signal"
6260
deathmessage = "collapses into a pile of bones, its flesh sloughing away."
6361
deathsound = 'sound/magic/demon_dies.ogg'
@@ -70,6 +68,10 @@ Difficulty: Medium
7068
small_sprite_type = /datum/action/small_sprite/megafauna/drake
7169
music_component = /datum/component/music_player/battle
7270
music_path = /datum/music/sourced/battle/ash_drake
71+
var/swooping = NONE
72+
var/player_cooldown = 0
73+
///sound used by any ability that shoots stuff
74+
var/fire_sound = 'sound/magic/fireball.ogg'
7375

7476
/datum/action/innate/megafauna_attack/fire_cone
7577
name = "Fire Cone"
@@ -118,16 +120,12 @@ Difficulty: Medium
118120
lava_swoop()
119121
return
120122

121-
if(prob(15 + anger_modifier))
122-
lava_swoop()
123-
124-
else if(prob(10+anger_modifier))
125-
shoot_fire_attack()
126-
else
127-
fire_cone()
123+
shoot_fire_attack()
128124

129125
/mob/living/simple_animal/hostile/megafauna/dragon/proc/shoot_fire_attack()
130-
if(health < maxHealth*0.5)
126+
if(prob(15 + anger_modifier))
127+
lava_swoop()
128+
else if(prob(10+anger_modifier) && health < maxHealth*0.5)
131129
mass_fire()
132130
else
133131
fire_cone()
@@ -170,7 +168,7 @@ Difficulty: Medium
170168
SLEEP_CHECK_DEATH(0)
171169
for(var/i = 1 to times)
172170
SetRecoveryTime(50)
173-
playsound(get_turf(src),'sound/magic/fireball.ogg', 200, 1)
171+
playsound(get_turf(src),fire_sound, 200, 1)
174172
var/increment = 360 / spiral_count
175173
for(var/j = 1 to spiral_count)
176174
var/list/turfs = line_target(j * increment + i * increment / 2, range, src)
@@ -238,7 +236,7 @@ Difficulty: Medium
238236
light_range = initial(light_range)
239237

240238
/mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_cone(atom/at = target, meteors = TRUE)
241-
playsound(get_turf(src),'sound/magic/fireball.ogg', 200, 1)
239+
playsound(get_turf(src),fire_sound, 200, 1)
242240
SLEEP_CHECK_DEATH(0)
243241
if(prob(50) && meteors)
244242
INVOKE_ASYNC(src, PROC_REF(fire_rain))

0 commit comments

Comments
 (0)