Skip to content

Commit b3c0102

Browse files
committed
1.2.6
IT IS I, MERASMUS!
1 parent 59b670e commit b3c0102

33 files changed

+787
-96
lines changed

DD Restoration/DD Restoration.sub

384 Bytes
Binary file not shown.

DD Restoration/filelist.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<contentpackage name="DD Restoration" modversion="1.0.5" corepackage="False" steamworkshopid="3420072790" gameversion="1.7.7.0" expectedhash="8C84B63EE4BE093A7AD05C4D3433800A">
2+
<contentpackage name="DD Restoration" modversion="1.1.10" corepackage="False" steamworkshopid="3420072790" gameversion="1.7.7.0">
33
<Submarine file="%ModDir%/DD Restoration.sub" />
44
</contentpackage>

Dam Defense/Items/Items.xml

Lines changed: 278 additions & 57 deletions
Large diffs are not rendered by default.

Dam Defense/Items/Machines.xml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@
776776
<StatusEffect type="OnNotContained" target="This" setvalue="true" drawinventory="true" />
777777
</ItemContainer>
778778
<ItemContainer capacity="1" slotsperrow="1" uilabel="Output" canbeselected="true" allowuioverlap="false" hideitems="true" drawhudwhenequipped="false" keepopenwhenequipped="false" ShowContainedStateIndicator="false">
779-
<Containable items="smallitem,mediumitem" excludeditems="toolkit" />
779+
<Containable items="smallitem,mediumitem,barricade" excludeditems="toolkit" />
780780
<StatusEffect type="OnContained" target="This" setvalue="true" drawinventory="false" />
781781
<StatusEffect type="OnNotContained" target="This" setvalue="true" drawinventory="true" />
782782
</ItemContainer>
@@ -815,6 +815,33 @@
815815
<sprite texture="Content/UI/CommandUIAtlas.png" sourcerect="768,128,128,128" origin="0.5,0.5" depth="0.1" />
816816
</Item>
817817

818+
<!-- card reader button -->
819+
<Item name="Card Reader" identifier="cardreader" category="Electrical" tags="smallitem,button" allowedlinks="door" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="8">
820+
<Sprite texture="%ModDir%/items/button.png" sourcerect="0,0,34,51" depth="0.8" origin="0.5,0.5" />
821+
<Deconstruct time="10">
822+
<Item identifier="plastic" amount="2" />
823+
<Item identifier="copper" />
824+
</Deconstruct>
825+
<Fabricate suitablefabricators="fabricator" requiredtime="10">
826+
<RequiredSkill identifier="electrical" level="25" />
827+
<RequiredItem identifier="fpgacircuit" />
828+
<RequiredItem identifier="plastic" />
829+
</Fabricate>
830+
<Body width="36" height="40" density="20" />
831+
<Controller direction="None" canbepicked="true" msg="ItemMsgPressSelect">
832+
<RequiredItem identifier="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" />
833+
<sound file="Content/Items/Button/Button.ogg" type="OnUse" range="500.0" />
834+
</Controller>
835+
<ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
836+
<GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
837+
<RequiredItem identifier="screwdriver" type="Equipped" />
838+
<output name="signal_out" displayname="connection.signalout" />
839+
</ConnectionPanel>
840+
<Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="10.0" aimpos="35,-10" handle1="0,0" attachable="true" attachedbydefault="true" aimable="true">
841+
<RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
842+
</Holdable>
843+
</Item>
844+
818845
<!-- Hatch with Card Reader -->
819846
<Item name="Hatch with Card Reader" identifier="hatchwcardreader" allowedlinks="gap,hull,structure,item" linkable="true" tags="door,weldable" scale="0.5" health="150" requirebodyinsidetrigger="false" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyexplosions="true" ShowNameInHealthBar="false" explosiondamagemultiplier="0.1" ondamagedthreshold="2" allowrotatingineditor="false">
820847
<Sprite texture="Content/Items/Door/hatch.png" sourcerect="0,0,256,98" depth="0.7" origin="0.5,0.5" />

Dam Defense/Items/Medicines.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
<Price storeidentifier="merchantmedical" multiplier="0.9"/>
204204
</Price>
205205
<Fabricate suitablefabricators="nukieshop" requiredtime="1" amount="1">
206-
<RequiredItem tag="fakemoney" amount="4" />
206+
<RequiredItem tag="fakemoney" amount="3" />
207207
</Fabricate>
208208
<Fabricate suitablefabricators="medicalfabricator" requiredtime="15" amount="2" >
209209
<RequiredSkill identifier="medical" level="5" />
@@ -265,7 +265,7 @@
265265
<SuitableTreatment identifier="opiateaddiction" suitability="-20" />
266266
<SuitableTreatment identifier="oxygenlow" suitability="-20" />
267267
<Fabricate suitablefabricators="nukieshop" requiredtime="1" amount="1">
268-
<RequiredItem tag="fakemoney" amount="4" />
268+
<RequiredItem tag="fakemoney" amount="3" />
269269
</Fabricate>
270270
<Fabricate suitablefabricators="nexshop" requiredtime="1">
271271
<RequiredItem tag="money" amount="4" />
@@ -534,7 +534,7 @@
534534
<RequiredItem tag="money" amount="5" />
535535
</Fabricate>
536536
<Fabricate suitablefabricators="nukieshop" requiredtime="1" amount="1">
537-
<RequiredItem tag="fakemoney" amount="4" />
537+
<RequiredItem tag="fakemoney" amount="6" />
538538
</Fabricate>
539539
<InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="129,448,62,64" origin="0.5,0.5" />
540540
<Sprite texture="Content/Items/Medical/Medicines.png" sourcerect="301,209,37,72" depth="0.6" origin="0.5,0.5" />
@@ -746,7 +746,7 @@
746746
<RequiredItem tag="money" amount="5" />
747747
</Fabricate>
748748
<Fabricate suitablefabricators="nukieshop" requiredtime="1" amount="1">
749-
<RequiredItem tag="fakemoney" amount="4" />
749+
<RequiredItem tag="fakemoney" amount="3" />
750750
</Fabricate>
751751
<Fabricate suitablefabricators="medicalfabricator" requiredtime="15" >
752752
<RequiredSkill identifier="medical" level="30" />
@@ -894,7 +894,7 @@
894894
<RequiredItem tag="money" amount="2" />
895895
</Fabricate>
896896
<Fabricate suitablefabricators="nukieshop" requiredtime="1" amount="1">
897-
<RequiredItem tag="fakemoney" amount="2" />
897+
<RequiredItem tag="fakemoney" amount="1" />
898898
</Fabricate>
899899
<Fabricate suitablefabricators="fabricator" requiredtime="7.5" amount="1">
900900
<RequiredSkill identifier="medical" level="5" />

Dam Defense/Items/book.png

1.96 KB
Loading

Dam Defense/Items/tools.png

16 KB
Loading

Dam Defense/Items/wizard.png

763 Bytes
Loading

Dam Defense/Localizations/english.lua

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ return {
3232
-- latejoin.lua
3333
latejoinMessageNoRespawn = 'Late join respawning is temporarily enabled because of a main event. You will not respawn because you were alive when the event started. When the event ends, respawning will return to regular.',
3434
latejoinMessageNoRespawnCustom = 'Custom respawning is temporarily enabled because of a main event. You will not be respawned again by the event. When the event ends, respawning will return to regular.',
35+
lateJoinMessageNoTickets = 'Late join respawning is temporarily enabled because of a main event. You cannot be respawned because there are no respawn tickets. When the event ends, respawning will return to regular.',
3536
-- money.lua
3637
giveMoneyToClient = 'You have received {amount} Nexcredits (TM).',
3738
commandCreditsError = 'You have no Nexaccount (TM).',
@@ -113,7 +114,7 @@ return {
113114
gangWarRecruitmentNotice = 'Your gang has just recruited {name}!',
114115
commandGangGangster = 'Your fellow gang members are: {allyList}. Public list of gangsters is: {gangsterList}.',
115116
commandGang = 'Public list of gangsters is: {gangsterList}.',
116-
-- events/ghostRole.lua (TBD)
117+
-- events/ghostRole.lua
117118
-- events/greenskins.lua
118119
greenskinInfo = 'You are a kind of amphibious nimble critter that like playing games with their prey. Put masks on humans to turn them into goblins. Hide in goblin crates to regenerate.',
119120
greenskinsEventEndDefeat = 'All greenskins have been eliminated.',
@@ -132,6 +133,7 @@ return {
132133
nukiesMessagePublic = 'Intel reports nukie activity on the area. Keep the crew, and most importantly the reactor safe from them!',
133134
nukiesEndVictory = 'Nukies have won this round! Round ending in 10 seconds.',
134135
nukiesEnd = 'All nukies have been neutralized.',
136+
nukiesTicketGained = 'Nukies have gained a respawn ticket by eliminating a defender! They now have {tickets} ticket(s).',
135137
-- events/revolution.lua
136138
revolutionMessageSecret = 'You are a rebel leader! Your objective is to kill the captain and security. You have {timer} until people become aware of the revolution, so start preparing now. Try to enlist non-security personnel to your cause.{rebelList} Do /rebels to get info pertinent to this event.',
137139
revolutionMessageRebels = 'Everyone, including security, has heard rumours about your conspiracy and are now aware of the revolution. The cat is out of the bag, so be careful! They do not know who the rebels are yet, but the list of rebels will be public in {timer}. Do /rebels to get info pertinent to this event.',
@@ -149,12 +151,15 @@ return {
149151
serialKillerEndVictory = 'Serial killer has won this round! Round ending in 10 seconds.',
150152
serialKillerEndArrested = 'The serial killer has been eliminated.',
151153
serialKillerEnd = 'The serial killer has been arrested.',
152-
-- events/vip.lua (TBD)
154+
-- events/vip.lua
153155
vipMessageBoss = 'You are now a VIP. A body guard, {guardName}, has been assigned to keep you safe from hostiles. Your pay grade has been raised.',
154156
vipMessageBodyguard = 'You have been tasked with keeping VIP {vipName} alive at all costs. Failure will result in immediate termination. Your pay grade has been raised.',
155157
vipMessagePublic = 'A VIP is in town! Any non-medical and non-security personnel who kills {vipName} will be rewarded with {bounty} nexcredits.',
156158
vipEnd = 'The VIP is dead! An anonymous person has been rewarded for their death.',
157159
vipEndNoReward = 'The VIP is dead! No one has been rewarded for their death.',
160+
-- events/wizard.lua
161+
wizardEndVictory = 'The wizard has won this round! Round ending in 10 seconds.',
162+
wizardEnd = 'The wizard has been slain!',
158163
-- console commands
159164
jobbanNoticeSingular = 'You have been banned from the {jobName} job because: {reason}.',
160165
jobbanNoticePlural = 'You have been banned from {jobName} jobs because: {reason}.',

Dam Defense/Localizations/english.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
<!-- Nukie Job -->
8080
<jobname.jet>Jovian Elite Trooper</jobname.jet>
8181
<jobdescription.jet>Jovian Elite Troops. Destroy that dam and kill every single bastard inside who isn't allied with the separatists.</jobdescription.jet>
82+
<!-- Wizard Job -->
83+
<jobname.wizard>Wizard</jobname.wizard>
84+
<jobdescription.wizard>A master at casting spells, your main objective is to cause chaos and mayhem using magic. You are free to be good or evil.</jobdescription.wizard>
8285
<!-- MERCS Job -->
8386
<jobname.mercs>MERCS Member</jobname.mercs>
8487
<jobdescription.mercs>Mobile Emergency Rescue and Combat Squad. A highly trained paramilitary working for Nexpharma. Restore order in the dam and protect it. Mission failure will result in subject termination.</jobdescription.mercs>
@@ -199,6 +202,17 @@
199202
<!-- Repair Tool -->
200203
<entityname.repairtool>Repair Tool</entityname.repairtool>
201204
<entitydescription.repairtool>All in one repair tool that can weld, wrench and screw! Use the toggle to alternate between wrench and screwdriver mode.</entitydescription.repairtool>
205+
<!-- Wizard Items -->
206+
<entityname.merasmushat>Wizard Hat</entityname.merasmushat>
207+
<entitydescription.merasmushat>The skull of a goat, a proper skull island topper. May explode the head of non-wizards who try to wear it.</entitydescription.merasmushat>
208+
<entityname.merasmusrobes>Wizard Robes</entityname.merasmusrobes>
209+
<entitydescription.merasmusrobes>A dark robe used by magicians. Slowly yet surely cures all ailments a wizard may have, but will burn commoners when worn.</entitydescription.merasmusrobes>
210+
<entityname.merasmusstaff>Wizard Staff</entityname.merasmusstaff>
211+
<entitydescription.merasmusstaff>A wooden staff used alongside a spellbook to cast spells.</entitydescription.merasmusstaff>
212+
<entityname.merasmusfireballbook>Scrungly Spellbook</entityname.merasmusfireballbook>
213+
<entitydescription.merasmusfireballbook>A spellbook that when equipped with a staff can be used to shoot scrungly nitroglycerin fireballs.</entitydescription.merasmusfireballbook>
214+
<entityname.merasmusteleportbook>Blink Spellbook</entityname.merasmusteleportbook>
215+
<entitydescription.merasmusteleportbook>A spellbook that when equipped with a staff can be used to teleport. Does not telefrag or deal damage.</entitydescription.merasmusteleportbook>
202216
<!-- Boomboxes -->
203217
<entityname.boombox1>Country Boombox</entityname.boombox1>
204218
<entitydescription.boombox1>"Sweet Home Alabama" by Lynyrd Skynyrd.</entitydescription.boombox1>
@@ -319,6 +333,11 @@
319333
<!-- Brass Knuckle -->
320334
<entityname.brassknuckle>Brass Knuckle</entityname.brassknuckle>
321335
<entitydescription.brassknuckle>Don't bring a gun to a fist fight or you may have the dishonor of being killed with your own firearm. Truly a fistful of frags.</entitydescription.brassknuckle>
336+
<!-- Barricade -->
337+
<entityname.barricade>Barricade</entityname.barricade>
338+
<entitydescription.barricade>Steel beam that can be attached to a wall to provide cover in a gunfight.</entitydescription.barricade>
339+
<entityname.barricadestatic>Barricade Static</entityname.barricadestatic>
340+
<entitydescription.barricadestatic>Steel beam that has been attached to a wall to provide cover in a gunfight.</entitydescription.barricadestatic>
322341
<!-- Blood Cultist Robes -->
323342
<entityname.bloodcultistrobes>Blood Cultist Robes</entityname.bloodcultistrobes>
324343
<entitydescription.bloodcultistrobes>Only craftable by cultists. A simple hooded garment that blood cultists regeneration, immunity to disease and revives them if they die. The robe also serves to conceal their identity whilst letting other fellows cultists recognize them as their own.</entitydescription.bloodcultistrobes>

0 commit comments

Comments
 (0)