-
Notifications
You must be signed in to change notification settings - Fork 4.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
First two wizard towers for Magiclysm #36588
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
fef6004
create a cool tower
I-am-Erk 940828b
Merge remote-tracking branch 'upstream/master' into wizard-towers
I-am-Erk 9b1fa74
create a cool tower
I-am-Erk c7bf719
lint
I-am-Erk 65e2483
split it up into a few files
I-am-Erk e3bb2fc
move golems to their own file
I-am-Erk 2ef7b01
wizard tower 2 - still needs some tweaking
I-am-Erk e37fcb1
landscaping
I-am-Erk 8e99ee3
lint constructs.json
I-am-Erk ca48ca0
Update regional_overlay.json
I-am-Erk c83f8ad
lint wizard towers
I-am-Erk a627e48
Apply suggestions from code review
I-am-Erk d886902
Update overmap_terrain.json
I-am-Erk 8f80965
Update regional_overlay.json
I-am-Erk 1716ab2
Update wizard-towers.json
I-am-Erk 1f33604
Update wizard-towers.json
I-am-Erk b29d5b7
Update wizard-towers.json
I-am-Erk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,126 @@ | ||
[ | ||
{ | ||
"id": "mon_claygolem", | ||
"type": "MONSTER", | ||
"name": "clay golem", | ||
"description": "A large, humanoid golem made from clay. Its proportions are off and it seems fragile.", | ||
"default_faction": "robot", | ||
"bodytype": "human", | ||
"species": [ "ROBOT" ], | ||
"diff": 2, | ||
"volume": "120 L", | ||
"weight": "122 kg", | ||
"hp": 100, | ||
"speed": 80, | ||
"material": [ "clay" ], | ||
"symbol": "X", | ||
"color": "brown", | ||
"aggression": 10, | ||
"morale": 100, | ||
"melee_skill": 6, | ||
"melee_dice": 2, | ||
"melee_dice_sides": 10, | ||
"melee_cut": 5, | ||
"armor_bash": 10, | ||
"armor_cut": 10, | ||
"dodge": 0, | ||
"vision_day": 40, | ||
"vision_night": 40, | ||
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ], | ||
"death_function": [ "BROKEN" ], | ||
"flags": [ "SEES", "NO_BREATHE", "ACIDPROOF", "LOUDMOVES" ] | ||
}, | ||
{ | ||
"id": "mon_plasticgolem", | ||
"type": "MONSTER", | ||
"name": { "str": "plastic golem" }, | ||
"description": "Traditionally, making a golem is a months-long process involving hand tools and precision craftsmanship. A stone golem is as much a work of art as it is a magical device. The advent of 3D printing made it easy to get into the golem-making hobby, and plastic golems have soared in popularity.", | ||
"default_faction": "factionless", | ||
"volume": "150 L", | ||
"weight": "70 kg", | ||
"hp": 120, | ||
"speed": 90, | ||
"material": [ "plastic" ], | ||
"symbol": "G", | ||
"color": "light_gray", | ||
"aggression": 30, | ||
"morale": 100, | ||
"armor_bash": 18, | ||
"armor_cut": 6, | ||
"melee_skill": 5, | ||
"melee_dice": 3, | ||
"melee_dice_sides": 6, | ||
"melee_cut": 3, | ||
"vision_day": 30, | ||
"vision_night": 30, | ||
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ], | ||
"regenerates": 10, | ||
"death_drops": { "item": "plastic_chunk", "prob": 100, "count": [ 5, 10 ] }, | ||
"death_function": [ "BROKEN" ], | ||
"flags": [ "SEES", "HEARS", "NO_BREATHE", "LOUDMOVES" ] | ||
}, | ||
{ | ||
"id": "mon_stonegolem", | ||
"type": "MONSTER", | ||
"name": "stone golem", | ||
"description": "A large, humanoid golem made from stone. Its fists look similar to rockets.", | ||
"default_faction": "robot", | ||
"bodytype": "human", | ||
"species": [ "ROBOT" ], | ||
"diff": 2, | ||
"volume": "120 L", | ||
"weight": "162 kg", | ||
"hp": 250, | ||
"speed": 60, | ||
"material": [ "stone" ], | ||
"symbol": "X", | ||
"color": "light_gray", | ||
"aggression": 10, | ||
"morale": 100, | ||
"melee_skill": 6, | ||
"melee_dice": 3, | ||
"melee_dice_sides": 8, | ||
"melee_cut": 6, | ||
"armor_bash": 20, | ||
"armor_cut": 20, | ||
"dodge": 0, | ||
"vision_day": 40, | ||
"vision_night": 40, | ||
"special_attacks": [ { "type": "spell", "spell_id": "rocket_punch", "spell_level": 5, "cooldown": 10 } ], | ||
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ], | ||
"death_function": [ "BROKEN" ], | ||
"flags": [ "SEES", "NO_BREATHE", "ACIDPROOF", "LOUDMOVES" ] | ||
}, | ||
{ | ||
"id": "mon_irongolem", | ||
"type": "MONSTER", | ||
"name": "iron golem", | ||
"description": "A large, humanoid golem made from iron. Some sort of noxious gas seems to be seeping from its mouth.", | ||
"default_faction": "robot", | ||
"bodytype": "human", | ||
"species": [ "ROBOT" ], | ||
"diff": 2, | ||
"volume": "120 L", | ||
"weight": "945 kg", | ||
"hp": 400, | ||
"speed": 50, | ||
"material": [ "iron" ], | ||
"symbol": "X", | ||
"color": "dark_gray", | ||
"aggression": 10, | ||
"morale": 100, | ||
"melee_skill": 6, | ||
"melee_dice": 3, | ||
"melee_dice_sides": 10, | ||
"melee_cut": 7, | ||
"armor_bash": 32, | ||
"armor_cut": 32, | ||
"dodge": 0, | ||
"vision_day": 40, | ||
"vision_night": 40, | ||
"special_attacks": [ { "type": "spell", "spell_id": "gas_attack", "spell_level": 5, "cooldown": 60 } ], | ||
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ], | ||
"death_function": [ "BROKEN" ], | ||
"flags": [ "SEES", "NO_BREATHE", "ACIDPROOF", "LOUDMOVES" ] | ||
} | ||
] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe
count
is not allowed here.