Skip to content

Commit

Permalink
Minor Workshop update (vlggms#1643)
Browse files Browse the repository at this point in the history
* update part 1

* Update _templates.dm

* Update axe.dm

* Update knife.dm
  • Loading branch information
Kitsunemitsu authored Dec 3, 2023
1 parent 9462801 commit ab8d0ff
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 43 deletions.
Binary file modified ModularTegustation/Teguicons/workshop.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion ModularTegustation/tegu_items/workshop/_templates.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
// Material color overwrites
color = mod.weaponcolor
//throwforce is special
if(throwforce>force)
if(throwforce>10)
throwforce *= mod.throwforcemod
else if(mod.throwforcemod > 1)
throwforce = 30
Expand Down
33 changes: 33 additions & 0 deletions ModularTegustation/tegu_items/workshop/templates/axe.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
//has a cleave attack.
/obj/item/ego_weapon/template/axe
name = "axe template"
desc = "A blank axe workshop template."
special = "Use this weapon in hand to charge a cleave attack."
icon_state = "axetemplate"
force = 30
attack_speed = 1.5
hitsound = 'sound/abnormalities/woodsman/woodsman_attack.ogg'
attack_verb_continuous = list("attacks", "slashes", "cleaves", "slices", "cuts")
attack_verb_simple = list("attack", "slash", "cleave", "slice", "cut")

finishedicon = list("finishedaxe")
finishedname = list("hand axe", "axe", "battleaxe")
finisheddesc = "A finished axe, ready for use."
var/finishedforce
var/charged

/obj/item/ego_weapon/template/axe/attack_self(mob/user)
if(!active || charged)
return
if(!finishedforce)
finishedforce = force

if(do_after(user, attack_speed*10))
charged = TRUE
force*=1.2
to_chat(user, "<span class='info'>You charge a cleave, and your next attack will deal bonus damage.</span>")

/obj/item/ego_weapon/template/axe/attack(mob/user)
..()
if(finishedforce && finishedforce!=force)
force = finishedforce
48 changes: 6 additions & 42 deletions ModularTegustation/tegu_items/workshop/templates/basic.dm
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
/* To Finish:
Chargeblade - Weapon with Charge
Katana - Use in hand to dash
*/

/obj/item/ego_weapon/template/spear
name = "spear template"
desc = "A blank spear workshop template."
icon_state = "speartemplate"
force = 22
force = 20
reach = 2 //Has 2 Square Reach.
attack_speed = 1.2
attack_speed = 1.4
attack_verb_continuous = list("pokes", "jabs", "tears", "lacerates", "gores")
attack_verb_simple = list("poke", "jab", "tear", "lacerate", "gore")
hitsound = 'sound/weapons/ego/spear1.ogg'
Expand All @@ -34,36 +28,6 @@ Katana - Use in hand to dash
finisheddesc = "A finished sword, ready for use."


/obj/item/ego_weapon/template/knife
name = "knife template"
desc = "A blank knife workshop template."
icon_state = "knifetemplate"
force = 20
attack_speed = 0.7
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")

finishedicon = list("finishedknife","finishedstiletto")
finishedname = list("dagger", "knife", "mail breaker")
finisheddesc = "A finished knife, ready for use."


/obj/item/ego_weapon/template/axe
name = "axe template"
desc = "A blank axe workshop template."
icon_state = "axetemplate"
force = 30
attack_speed = 1.5
hitsound = 'sound/abnormalities/woodsman/woodsman_attack.ogg'
attack_verb_continuous = list("attacks", "slashes", "cleaves", "slices", "cuts")
attack_verb_simple = list("attack", "slash", "cleave", "slice", "cut")

finishedicon = list("finishedaxe")
finishedname = list("hand axe", "axe", "battleaxe")
finisheddesc = "A finished axe, ready for use."


/obj/item/ego_weapon/template/hammer
name = "hammer template"
desc = "A blank hammer workshop template."
Expand Down Expand Up @@ -103,7 +67,7 @@ Katana - Use in hand to dash
icon_state = "boomerangtemplate"
force = 16
attack_speed = 0.8 //melee is shit lol
throwforce = 38
throwforce = 14 //hits twice for some reason!?
attack_verb_continuous = list("bonks", "bashes")
attack_verb_simple = list("bonk", "bash")

Expand Down Expand Up @@ -138,8 +102,8 @@ Katana - Use in hand to dash
name = "claw template"
desc = "A blank claw workshop template."
icon_state = "clawtemplate"
force = 12
attack_speed = 0.4
force = 20
attack_speed = 0.7
attack_verb_continuous = list("rends", "tears", "lacerates", "rips", "cuts")
attack_verb_simple = list("rend", "tear", "lacerate", "rip", "cut")

Expand All @@ -152,7 +116,7 @@ Katana - Use in hand to dash
desc = "A blank club workshop template."
special = "This weapon has knockback."
icon_state = "clubtemplate"
force = 20
force = 26
attack_speed = 1.6
attack_verb_continuous = list("pounds", "crushes", "smashes", "whacks", "smacks")
attack_verb_simple = list("pound", "crush", "smash", "whack", "smack")
Expand Down
31 changes: 31 additions & 0 deletions ModularTegustation/tegu_items/workshop/templates/knife.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
//Has a dodge ability
/obj/item/ego_weapon/template/knife
name = "knife template"
desc = "A blank knife workshop template."
special = "Use this weapon in hand to perform a dodgeroll."
icon_state = "knifetemplate"
force = 18
attack_speed = 0.7
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")

finishedicon = list("finishedknife","finishedstiletto")
finishedname = list("dagger", "knife", "mail breaker")
finisheddesc = "A finished knife, ready for use."
var/dodgelanding

/obj/item/ego_weapon/template/knife/attack_self(mob/living/carbon/user)
if(!active)
to_chat(user, "<span class='notice'>This weapon is unfinished!</span>")
return
if(user.dir == 1)
dodgelanding = locate(user.x, user.y + 5, user.z)
if(user.dir == 2)
dodgelanding = locate(user.x, user.y - 5, user.z)
if(user.dir == 4)
dodgelanding = locate(user.x + 5, user.y, user.z)
if(user.dir == 8)
dodgelanding = locate(user.x - 5, user.y, user.z)
user.adjustStaminaLoss(10, TRUE, TRUE)
user.throw_at(dodgelanding, 3, 2, spin = TRUE)
2 changes: 2 additions & 0 deletions lobotomy-corp13.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4016,11 +4016,13 @@
#include "ModularTegustation\tegu_items\workshop\mods\sharp.dm"
#include "ModularTegustation\tegu_items\workshop\mods\split.dm"
#include "ModularTegustation\tegu_items\workshop\mods\throwforce.dm"
#include "ModularTegustation\tegu_items\workshop\templates\axe.dm"
#include "ModularTegustation\tegu_items\workshop\templates\basic.dm"
#include "ModularTegustation\tegu_items\workshop\templates\chargeblade.dm"
#include "ModularTegustation\tegu_items\workshop\templates\dice.dm"
#include "ModularTegustation\tegu_items\workshop\templates\gauntlet.dm"
#include "ModularTegustation\tegu_items\workshop\templates\katana.dm"
#include "ModularTegustation\tegu_items\workshop\templates\knife.dm"
#include "ModularTegustation\tegu_items\workshop\templates\scythe.dm"
#include "ModularTegustation\tegu_jobs\gamemode_overwrite.dm"
#include "ModularTegustation\tegu_medical_code\tegu_medical.dm"
Expand Down

0 comments on commit ab8d0ff

Please sign in to comment.