From 615fe36c8d5c5a9644e982df28fa8ec363590d54 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Wed, 24 Apr 2019 19:50:22 +0200 Subject: [PATCH 1/5] Revenants now have randomly generated flavor names --- .../gamemodes/miniantags/revenant/revenant.dm | 10 ++++ strings/revenant_names.json | 51 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 strings/revenant_names.json diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index bde3f7ee8e9..c782fde76d6 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -2,7 +2,9 @@ //"Ghosts" that are invisible and move like ghosts, cannot take damage while invsible //Don't hear deadchat and are NOT normal ghosts //Admin-spawn or random event + #define INVISIBILITY_REVENANT 50 +#define REVENANT_NAME_FILE "revenant_names.json" /mob/living/simple_animal/revenant name = "revenant" @@ -124,9 +126,17 @@ ghost_darkness_images |= ghostimage updateallghostimages() remove_from_all_data_huds() + random_revenant_name() addtimer(CALLBACK(src, .proc/firstSetupAttempt), 15 SECONDS) // Give admin 15 seconds to put in a ghost (Or wait 15 seconds before giving it objectives) +/mob/living/simple_animal/revenant/proc/random_revenant_name() + var/built_name = "" + built_name += pick(strings(REVENANT_NAME_FILE, "spirit_type")) + built_name += " of " + built_name += pick(strings(REVENANT_NAME_FILE, "adverb")) + built_name += pick(strings(REVENANT_NAME_FILE, "theme")) + name = built_name /mob/living/simple_animal/revenant/proc/firstSetupAttempt() if(mind) diff --git a/strings/revenant_names.json b/strings/revenant_names.json new file mode 100644 index 00000000000..cdac4779db3 --- /dev/null +++ b/strings/revenant_names.json @@ -0,0 +1,51 @@ +{ + "spirit_type": [ + "Spirit", + "Ghost", + "Spectre", + "Phantom", + "Revenant", + "Essence", + "Soul" + ], + + "adverb": [ + "", + "abysmal ", + "dark ", + "eternal ", + "endless ", + "searing ", + "abyssal ", + "vicious ", + "hateful ", + "hideous ", + "malevolent ", + "fiery ", + "silent ", + "violent ", + "peaceful ", + "indifferent ", + "brutal " + ], + + "theme": [ + "despair", + "agony", + "screams", + "vengeance", + "hellfire", + "anger", + "suffering", + "death", + "destruction", + "hate", + "misery", + "disease", + "desperation", + "sorrow", + "ruin", + "grief", + "laughter" + ] +} From 3ba95cf7be1e371641a03571c9d10eb9b0ad7964 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Wed, 24 Apr 2019 23:32:45 +0200 Subject: [PATCH 3/5] Adjective instead of adverb, adds two new words --- code/game/gamemodes/miniantags/revenant/revenant.dm | 2 +- strings/revenant_names.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index c782fde76d6..54b01ff38ce 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -134,7 +134,7 @@ var/built_name = "" built_name += pick(strings(REVENANT_NAME_FILE, "spirit_type")) built_name += " of " - built_name += pick(strings(REVENANT_NAME_FILE, "adverb")) + built_name += pick(strings(REVENANT_NAME_FILE, "adjective")) built_name += pick(strings(REVENANT_NAME_FILE, "theme")) name = built_name diff --git a/strings/revenant_names.json b/strings/revenant_names.json index cdac4779db3..9e99a6ff281 100644 --- a/strings/revenant_names.json +++ b/strings/revenant_names.json @@ -6,10 +6,11 @@ "Phantom", "Revenant", "Essence", + "Poltergeist", "Soul" ], - "adverb": [ + "adjective": [ "", "abysmal ", "dark ", @@ -26,6 +27,7 @@ "violent ", "peaceful ", "indifferent ", + "hilarious ", "brutal " ], From c021769de6ce71ecd8dc50881dd834adfdc6eb10 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Thu, 25 Apr 2019 20:00:36 +0200 Subject: [PATCH 4/5] Capitalization --- strings/revenant_names.json | 80 ++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/strings/revenant_names.json b/strings/revenant_names.json index 9e99a6ff281..d48e9ad29c6 100644 --- a/strings/revenant_names.json +++ b/strings/revenant_names.json @@ -8,46 +8,46 @@ "Essence", "Poltergeist", "Soul" - ], - + ], + "adjective": [ - "", - "abysmal ", - "dark ", - "eternal ", - "endless ", - "searing ", - "abyssal ", - "vicious ", - "hateful ", - "hideous ", - "malevolent ", - "fiery ", - "silent ", - "violent ", - "peaceful ", - "indifferent ", - "hilarious ", - "brutal " - ], - + "", + "Abysmal ", + "Dark ", + "Eternal ", + "Endless ", + "Searing ", + "Abyssal ", + "Vicious ", + "Hateful ", + "Hideous ", + "Malevolent ", + "Fiery ", + "Silent ", + "Violent ", + "Peaceful ", + "Indifferent ", + "Hilarious ", + "Brutal " + ], + "theme": [ - "despair", - "agony", - "screams", - "vengeance", - "hellfire", - "anger", - "suffering", - "death", - "destruction", - "hate", - "misery", - "disease", - "desperation", - "sorrow", - "ruin", - "grief", - "laughter" - ] + "Despair", + "Agony", + "Screams", + "Vengeance", + "Hellfire", + "Anger", + "Suffering", + "Death", + "Destruction", + "Hate", + "Misery", + "Disease", + "Desperation", + "Sorrow", + "Ruin", + "Grief", + "Laughter" + ] } From 7587e7c9e3da219982779465c4ce5f8510252592 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Thu, 25 Apr 2019 20:08:59 +0200 Subject: [PATCH 5/5] Alphabetical order, spiteful salt --- strings/revenant_names.json | 74 +++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/strings/revenant_names.json b/strings/revenant_names.json index d48e9ad29c6..8c1229296f4 100644 --- a/strings/revenant_names.json +++ b/strings/revenant_names.json @@ -1,53 +1,55 @@ { "spirit_type": [ - "Spirit", - "Ghost", - "Spectre", - "Phantom", - "Revenant", "Essence", + "Ghost", + "Phantom", "Poltergeist", - "Soul" + "Revenant", + "Soul", + "Spectre", + "Spirit" ], "adjective": [ - "", + "", "Abysmal ", - "Dark ", - "Eternal ", - "Endless ", - "Searing ", "Abyssal ", - "Vicious ", + "Brutal ", + "Dark ", + "Endless ", + "Eternal ", + "Fiery ", "Hateful ", - "Hideous ", - "Malevolent ", - "Fiery ", - "Silent ", - "Violent ", - "Peaceful ", - "Indifferent ", - "Hilarious ", - "Brutal " + "Hideous ", + "Hilarious ", + "Indifferent ", + "Malevolent ", + "Peaceful ", + "Searing ", + "Silent ", + "Spiteful ", + "Vicious ", + "Violent " ], "theme": [ - "Despair", "Agony", + "Anger", + "Death", + "Despair", + "Desperation", + "Destruction", + "Disease", + "Grief", + "Hate", + "Hellfire", + "Laughter", + "Misery", + "Ruin", + "Salt", "Screams", - "Vengeance", - "Hellfire", - "Anger", - "Suffering", - "Death", - "Destruction", - "Hate", - "Misery", - "Disease", - "Desperation", - "Sorrow", - "Ruin", - "Grief", - "Laughter" + "Sorrow", + "Suffering", + "Vengeance" ] }