Skip to content

Commit

Permalink
Enforce mon_ prefix for monster id
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fris0uman
Fris0uman committed Mar 30, 2024
1 parent df6c8e3 commit e39798a
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 27 deletions.
6 changes: 3 additions & 3 deletions data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1319,9 +1319,9 @@
{ "compare_string": [ "mon_archunk_strong", { "context_val": "victim_type" } ] },
{ "compare_string": [ "mon_void_spider", { "context_val": "victim_type" } ] },
{ "compare_string": [ "mon_XEDRA_officer", { "context_val": "victim_type" } ] },
{ "compare_string": [ "LIXA_eigenspectre_3", { "context_val": "victim_type" } ] },
{ "compare_string": [ "LIXA_eigenspectre_4", { "context_val": "victim_type" } ] },
{ "compare_string": [ "LIXA_living_vector", { "context_val": "victim_type" } ] }
{ "compare_string": [ "mon_eigenspectre_3", { "context_val": "victim_type" } ] },
{ "compare_string": [ "mon_eigenspectre_4", { "context_val": "victim_type" } ] },
{ "compare_string": [ "mon_living_vector", { "context_val": "victim_type" } ] }
]
}
]
Expand Down
34 changes: 17 additions & 17 deletions data/json/mapgen/LIXA_mapgen.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1090,7 +1090,7 @@
{ "point": "trap", "id": "tr_LIXA_back_16", "x": 21, "y": 0 }
],
"palettes": [ "LIXA_unfolded_palette" ],
"place_monster": [ { "monster": "LIXA_eigenspectre_1", "x": [ 8, 21 ], "y": [ 2, 21 ], "repeat": 2 } ]
"place_monster": [ { "monster": "mon_eigenspectre_1", "x": [ 8, 21 ], "y": [ 2, 21 ], "repeat": 2 } ]
}
},
{
Expand Down Expand Up @@ -1160,7 +1160,7 @@
{ "point": "trap", "id": "tr_LIXA_forward_16", "x": 21, "y": 23 }
],
"palettes": [ "LIXA_unfolded_palette" ],
"place_monster": [ { "monster": "LIXA_eigenspectre_1", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1, "repeat": 1 } ]
"place_monster": [ { "monster": "mon_eigenspectre_1", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1, "repeat": 1 } ]
}
},
{
Expand Down Expand Up @@ -1231,7 +1231,7 @@
],
"palettes": [ "LIXA_unfolded_palette" ],
"terrain": { "2": [ "t_LIXA_unfolded_tube", "t_LIXA_unfolded_tube_broken" ] },
"place_monster": [ { "monster": "LIXA_eigenspectre_1", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1, "repeat": 1 } ]
"place_monster": [ { "monster": "mon_eigenspectre_1", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1, "repeat": 1 } ]
}
},
{
Expand Down Expand Up @@ -1301,8 +1301,8 @@
{ "point": "trap", "id": "tr_LIXA_forward_16", "x": 21, "y": 23 }
],
"place_monster": [
{ "monster": "LIXA_eigenspectre_1", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 },
{ "monster": "LIXA_eigenspectre_2", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 }
{ "monster": "mon_eigenspectre_1", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 },
{ "monster": "mon_eigenspectre_2", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 }
],
"palettes": [ "LIXA_unfolded_palette" ],
"terrain": { "2": [ "t_LIXA_unfolded_tube", "t_LIXA_unfolded_tube_broken" ] }
Expand Down Expand Up @@ -1375,8 +1375,8 @@
{ "point": "trap", "id": "tr_LIXA_back_16", "x": 21, "y": 0 }
],
"place_monster": [
{ "monster": "LIXA_eigenspectre_1", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 },
{ "monster": "LIXA_eigenspectre_2", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 }
{ "monster": "mon_eigenspectre_1", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 },
{ "monster": "mon_eigenspectre_2", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 }
],
"palettes": [ "LIXA_unfolded_palette" ],
"terrain": {
Expand Down Expand Up @@ -1453,8 +1453,8 @@
],
"palettes": [ "LIXA_unfolded_palette" ],
"place_monster": [
{ "monster": "LIXA_eigenspectre_3", "x": [ 8, 21 ], "y": [ 7, 18 ], "pack_size": 1 },
{ "monster": "LIXA_eigenspectre_1", "x": [ 8, 21 ], "y": [ 7, 18 ], "pack_size": 1 }
{ "monster": "mon_eigenspectre_3", "x": [ 8, 21 ], "y": [ 7, 18 ], "pack_size": 1 },
{ "monster": "mon_eigenspectre_1", "x": [ 8, 21 ], "y": [ 7, 18 ], "pack_size": 1 }
],
"terrain": {
"2": [ "t_LIXA_unfolded_tube", "t_LIXA_unfolded_tube_broken" ],
Expand Down Expand Up @@ -1529,8 +1529,8 @@
{ "point": "trap", "id": "tr_LIXA_back_16", "x": 21, "y": 0 }
],
"place_monster": [
{ "monster": "LIXA_eigenspectre_1", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 },
{ "monster": "LIXA_eigenspectre_3", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 }
{ "monster": "mon_eigenspectre_1", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 },
{ "monster": "mon_eigenspectre_3", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 }
],
"palettes": [ "LIXA_unfolded_palette" ],
"terrain": {
Expand Down Expand Up @@ -1606,8 +1606,8 @@
{ "point": "trap", "id": "tr_LIXA_forward_16", "x": 21, "y": 23 }
],
"place_monster": [
{ "monster": "LIXA_eigenspectre_2", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 },
{ "monster": "LIXA_eigenspectre_4", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 }
{ "monster": "mon_eigenspectre_2", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 },
{ "monster": "mon_eigenspectre_4", "x": [ 8, 21 ], "y": [ 2, 21 ], "pack_size": 1 }
],
"palettes": [ "LIXA_unfolded_palette" ],
"terrain": {
Expand Down Expand Up @@ -1757,10 +1757,10 @@
],
"palettes": [ "LIXA_unfolded_palette" ],
"place_monster": [
{ "monster": "LIXA_eigenspectre_2", "x": [ 7, 18 ], "y": [ 2, 21 ], "pack_size": 1, "repeat": 1 },
{ "monster": "LIXA_eigenspectre_3", "x": [ 7, 18 ], "y": [ 2, 21 ], "pack_size": 1 },
{ "monster": "LIXA_eigenspectre_4", "x": [ 7, 18 ], "y": [ 2, 21 ], "pack_size": 1 },
{ "monster": "LIXA_living_vector", "x": [ 7, 18 ], "y": [ 2, 21 ], "pack_size": 1 }
{ "monster": "mon_eigenspectre_2", "x": [ 7, 18 ], "y": [ 2, 21 ], "pack_size": 1, "repeat": 1 },
{ "monster": "mon_eigenspectre_3", "x": [ 7, 18 ], "y": [ 2, 21 ], "pack_size": 1 },
{ "monster": "mon_eigenspectre_4", "x": [ 7, 18 ], "y": [ 2, 21 ], "pack_size": 1 },
{ "monster": "mon_living_vector", "x": [ 7, 18 ], "y": [ 2, 21 ], "pack_size": 1 }
],
"terrain": {
"2": [ "t_LIXA_unfolded_tube", "t_LIXA_unfolded_tube_broken" ],
Expand Down
14 changes: 7 additions & 7 deletions data/json/monsters/LIXA_monsters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"base_casting_time": 100,
"shape": "blast",
"effect": "summon",
"effect_str": "LIXA_eigenspectre_3_echo"
"effect_str": "mon_eigenspectre_3_echo"
},
{
"id": "LIXA_vector_volley",
Expand Down Expand Up @@ -129,7 +129,7 @@
"effect_str": "EOC_LIXA_unfold_return"
},
{
"id": "LIXA_eigenspectre_1",
"id": "mon_eigenspectre_1",
"type": "MONSTER",
"name": { "str": "eigenspectre" },
"description": "This is the opposite of a human silhouette; every facet of every detail on display, with no shape to make sense of them. You can see both sides of an ID badge on a white labcoat. You can see every muscle and nerve in eyes blown wide with horror.",
Expand Down Expand Up @@ -159,7 +159,7 @@
"armor": { "electric": 1 }
},
{
"id": "LIXA_eigenspectre_2",
"id": "mon_eigenspectre_2",
"type": "MONSTER",
"name": { "str": "photonic eigenspectre" },
"description": "The endless details of this figure are mercifully obscured by the viscous light coursing 'through' it. It cannot contain anything, but the smears of light follow the shapes of stomach and intestines, and are splattered across what must be the lips and chin.",
Expand Down Expand Up @@ -214,7 +214,7 @@
"armor": { "electric": 1 }
},
{
"id": "LIXA_eigenspectre_3",
"id": "mon_eigenspectre_3",
"type": "MONSTER",
"name": { "str": "shifting eigenspectre" },
"description": "This distorted figure is a kaleidescope of borders. Every part of a human, flattened into place, warps wildly from second to second. The word your mind conjures to describe it is 'rotating', though you're not sure why.",
Expand Down Expand Up @@ -252,7 +252,7 @@
"armor": { "electric": 1 }
},
{
"id": "LIXA_eigenspectre_3_echo",
"id": "mon_eigenspectre_3_echo",
"type": "MONSTER",
"name": { "str": "shifting eigenspectre" },
"description": "This distorted figure is a kaleidescope of borders. Every part of a human, flattened into place, warps wildly from second to second. The word your mind conjures to describe it is 'rotating', though you're not sure why.",
Expand Down Expand Up @@ -291,7 +291,7 @@
"armor": { "electric": 1 }
},
{
"id": "LIXA_eigenspectre_4",
"id": "mon_eigenspectre_4",
"type": "MONSTER",
"name": { "str": "titanic eigenspectre" },
"description": "There is somehow more of this figure than the others. Every side of every surface is on display, but each of those seems like the thin edge of a larger shape. There is an eternity here, where a scientist used to be.",
Expand Down Expand Up @@ -326,7 +326,7 @@
"armor": { "electric": 1 }
},
{
"id": "LIXA_living_vector",
"id": "mon_living_vector",
"type": "MONSTER",
"name": { "str": "unfolded impossibility", "str_pl": "unfolded impossibilities" },
"description": "This is the entirety of the infinite chamber you are in, which perfectly contains itself. If you look very closely, you might see yourself looking back. You are sure that at any other time, seeing this would crack your brain like an eggshell. But you understand it just fine right now. And you can see it breathing.",
Expand Down
50 changes: 50 additions & 0 deletions data/json/obsoletion_and_migration_0.I/obsolete_monster.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[
{
"id": "LIXA_eigenspectre_1",
"type": "MONSTER",
"name": { "str": "eigenspectre" },
"symbol": "E",
"color": "light_gray",
"copy-from": "mon_eigenspectre_1"
},
{
"id": "LIXA_eigenspectre_2",
"type": "MONSTER",
"name": { "str": "photonic eigenspectre" },
"symbol": "E",
"color": "light_gray",
"copy-from": "mon_eigenspectre_2"
},
{
"id": "LIXA_eigenspectre_3",
"type": "MONSTER",
"name": { "str": "shifting eigenspectre" },
"symbol": "E",
"color": "light_gray",
"copy-from": "mon_eigenspectre_3"
},
{
"id": "LIXA_eigenspectre_3_echo",
"type": "MONSTER",
"name": { "str": "shifting eigenspectre" },
"symbol": "E",
"color": "light_gray",
"copy-from": "mon_eigenspectre_3_echo"
},
{
"id": "LIXA_eigenspectre_4",
"type": "MONSTER",
"name": { "str": "titanic eigenspectre" },
"symbol": "E",
"color": "light_gray",
"copy-from": "mon_eigenspectre_4"
},
{
"id": "LIXA_living_vector",
"type": "MONSTER",
"name": { "str": "unfolded impossibility", "str_pl": "unfolded impossibilities" },
"symbol": "X",
"color": "white",
"copy-from": "mon_living_vector"
}
]

0 comments on commit e39798a

Please sign in to comment.