Devtools: Fix scaling issue with creature type change

Now the `wolfie` command and the [Ctrl+]Alt+Shift+T command behave similarly
by making wolves 15% bigger than rabbits. The duplicate `wolfieisgod` command
was dropped, and the logic for the hotkey was simplified (it was bogus).

diff --git a/Docs/DEVTOOLS.txt b/Docs/DEVTOOLS.txt
index 46916a012fc7d14db1db03025afedb0a64000dca..db82aac66f627560eb50e46455b7a3b6cde8100b 100644 (file)
--- a/Docs/DEVTOOLS.txt
+++ b/Docs/DEVTOOLS.txt
@@ -87,7 +87,7 @@ save (string) - saves the state of the current map.
 Character attributes
 ~~~~~~~~~~~~~~~~~~~~
 
-wolfieisgod - sets the player to a wolf. You gain all of the speed, strength,
+wolfie - sets the player to a wolf. You gain all of the speed, strength,
     durability, and attacks of a wolf.
 funnybunny - sets the player to a rabbit.
 size (float) - changes the overall size of your character.

diff --git a/Source/Devtools/ConsoleCmds.cpp b/Source/Devtools/ConsoleCmds.cpp
index 7e95bf4f90fafea3730cad8c657a1555924673a2..49ff375c987c78572970bd863760cf343c9e126b 100644 (file)
--- a/Source/Devtools/ConsoleCmds.cpp
+++ b/Source/Devtools/ConsoleCmds.cpp
@@ -496,15 +496,11 @@ void ch_wolfie(const char*)
 {
     Person::players[0]->creature = wolftype;
     Person::players[0]->skeletonLoad();
+    Person::players[0]->scale = .23;
     Person::players[0]->damagetolerance = 300;
     set_proportion(0, "1 1 1 1");
 }
 
-void ch_wolfieisgod(const char* args)
-{
-    ch_wolfie(args);
-}
-
 void ch_wolf(const char*)
 {
     Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Wolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);

diff --git a/Source/Devtools/ConsoleCmds.def b/Source/Devtools/ConsoleCmds.def
index 0c058c4340a32a1afdf97341a3eb939e3845f634..162636e06c12d12bbe762a939b1b4006d14a0c5c 100644 (file)
--- a/Source/Devtools/ConsoleCmds.def
+++ b/Source/Devtools/ConsoleCmds.def
@@ -48,7 +48,6 @@ DECLARE_COMMAND(belt)
 DECLARE_COMMAND(cellophane)
 DECLARE_COMMAND(funnybunny)
 DECLARE_COMMAND(wolfie)
-DECLARE_COMMAND(wolfieisgod)
 DECLARE_COMMAND(wolf)
 DECLARE_COMMAND(snowwolf)
 DECLARE_COMMAND(darkwolf)

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 827f82b34957ea793ec5da6b8f02253087a9c7ce..a9cf0bf6759b557e32b8d00598a0e494cf01ffcf 100644 (file)
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -1240,20 +1240,7 @@ void Game::ProcessDevInput()
                 closest = findClosestPlayer();
             }
 
-            // FIXME: Those proportions are buggy
             if (closest >= 0) {
-                if (Person::players[closest]->creature == wolftype) {
-                    headprop = Person::players[closest]->proportionhead.x / 1.1;
-                    bodyprop = Person::players[closest]->proportionbody.x / 1.1;
-                    armprop = Person::players[closest]->proportionarms.x / 1.1;
-                    legprop = Person::players[closest]->proportionlegs.x / 1.1;
-                } else { // rabbittype
-                    headprop = Person::players[closest]->proportionhead.x / 1.2;
-                    bodyprop = Person::players[closest]->proportionbody.x / 1.05;
-                    armprop = Person::players[closest]->proportionarms.x / 1.00;
-                    legprop = Person::players[closest]->proportionlegs.x / 1.1;
-                }
-
                 if (Person::players[closest]->creature == rabbittype) {
                     Person::players[closest]->creature = wolftype;
                     Person::players[closest]->whichskin = 0;
@@ -1263,11 +1250,10 @@ void Game::ProcessDevInput()
                     Person::players[closest]->proportionbody = 1.1;
                     Person::players[closest]->proportionarms = 1.1;
                     Person::players[closest]->proportionlegs = 1.1;
-                    Person::players[closest]->proportionlegs.y = 1.1;
-                    Person::players[closest]->scale = .23 * 5 * Person::players[0]->scale;
+                    Person::players[closest]->scale *= 1.15;
 
                     Person::players[closest]->damagetolerance = 300;
-                } else {
+                } else { // wolftype
                     Person::players[closest]->creature = rabbittype;
                     Person::players[closest]->whichskin = 0;
                     Person::players[closest]->skeletonLoad(true);
@@ -1275,27 +1261,12 @@ void Game::ProcessDevInput()
                     Person::players[closest]->proportionhead = 1.2;
                     Person::players[closest]->proportionbody = 1.05;
                     Person::players[closest]->proportionarms = 1.00;
-                    Person::players[closest]->proportionlegs = 1.1;
+                    Person::players[closest]->proportionlegs.x = 1.1;
                     Person::players[closest]->proportionlegs.y = 1.05;
-                    Person::players[closest]->scale = .2 * 5 * Person::players[0]->scale;
+                    Person::players[closest]->scale /= 1.15;
 
                     Person::players[closest]->damagetolerance = 200;
                 }
-
-                if (Person::players[closest]->creature == wolftype) {
-                    Person::players[closest]->proportionhead = 1.1 * headprop;
-                    Person::players[closest]->proportionbody = 1.1 * bodyprop;
-                    Person::players[closest]->proportionarms = 1.1 * armprop;
-                    Person::players[closest]->proportionlegs = 1.1 * legprop;
-                }
-
-                if (Person::players[closest]->creature == rabbittype) {
-                    Person::players[closest]->proportionhead = 1.2 * headprop;
-                    Person::players[closest]->proportionbody = 1.05 * bodyprop;
-                    Person::players[closest]->proportionarms = 1.00 * armprop;
-                    Person::players[closest]->proportionlegs = 1.1 * legprop;
-                    Person::players[closest]->proportionlegs.y = 1.05 * legprop;
-                }
             }
         }