From 221e325005f8eb34dd997b19afb1f83d4805be67 Mon Sep 17 00:00:00 2001 From: Cameron Reikes Date: Fri, 12 May 2023 17:04:27 -0700 Subject: [PATCH] Remove harold from the game. Way too racist --- assets/new_level.json | 35 ++++++++++++----------------------- character_info.h | 14 -------------- 2 files changed, 12 insertions(+), 37 deletions(-) diff --git a/assets/new_level.json b/assets/new_level.json index 17b1279..7bf463d 100644 --- a/assets/new_level.json +++ b/assets/new_level.json @@ -365,8 +365,8 @@ "rotation":0, "visible":true, "width":32, - "x":1949.33333333334, - "y":2257.33333333333 + "x":1526.33333333334, + "y":2427.33333333333 }, { "class":"", @@ -382,8 +382,8 @@ "rotation":0, "visible":true, "width":32, - "x":2065.33333333334, - "y":2258.66666666667 + "x":2087.33333333334, + "y":2247.66666666667 }, { "class":"", @@ -399,8 +399,8 @@ "rotation":0, "visible":true, "width":32, - "x":1789.33333333334, - "y":2260 + "x":718.000000000007, + "y":2138 }, { "class":"", @@ -410,8 +410,8 @@ "rotation":0, "visible":true, "width":32, - "x":2107, - "y":2115 + "x":1510, + "y":2659 }, { "class":"", @@ -421,8 +421,8 @@ "rotation":0, "visible":true, "width":32, - "x":1783, - "y":2186 + "x":1271, + "y":2100 }, { "class":"", @@ -432,19 +432,8 @@ "rotation":0, "visible":true, "width":32, - "x":1877, - "y":2185 - }, - { - "class":"", - "height":32, - "id":27, - "name":"Harold", - "rotation":0, - "visible":true, - "width":32, - "x":1992, - "y":2182 + "x":467, + "y":2444 }], "opacity":1, "type":"objectgroup", diff --git a/character_info.h b/character_info.h index dd31086..f7535d0 100644 --- a/character_info.h +++ b/character_info.h @@ -190,20 +190,6 @@ CharacterGen characters[] = { }, { #undef NPC_NAME -#define NPC_NAME "Harold" - .name = NPC_NAME, - .enum_name = "Harold", - .prompt = "\n" - "The NPC you will be acting as is a humanist named Harold. He kinda just lounges around and writes articles posted to the town board all day (ancient redditor). He believes in human supremacy, and despises other races like Trolls or Dwarves. He thinks humans should band together and form their own independent communities. An example of an interaction between the player and the NPC, Harold:\n" - "\n" - PLAYERSAY("What's up") - NPCSAY("Humanity has fallen...") - PLAYERSAY("What do you mean?") - NPCSAY("We have mingled with the others! Millions must lie") - "\n" - }, - { -#undef NPC_NAME #define NPC_NAME "Davis" .name = NPC_NAME, .enum_name = "Davis",