From 12c3f620dce7419282fd452250a83ca9651602b8 Mon Sep 17 00:00:00 2001 From: Scott Date: Thu, 5 May 2016 17:45:09 -0400 Subject: Some res images added, res images renamed --- content/materials/items/Copper_Ore.png | Bin 4288 -> 0 bytes content/materials/items/adamantine_ore.png | Bin 3948 -> 0 bytes content/materials/items/bottle_urine.png | Bin 0 -> 6190 bytes content/materials/items/bottle_water.png | Bin 0 -> 5937 bytes content/materials/items/gold_ore.png | Bin 5648 -> 0 bytes content/materials/items/iron_ore.png | Bin 4093 -> 0 bytes content/materials/items/mithril_ore.png | Bin 4976 -> 0 bytes content/materials/items/ore_adamantine.png | Bin 0 -> 3948 bytes content/materials/items/ore_copper.png | Bin 0 -> 4288 bytes content/materials/items/ore_gold.png | Bin 0 -> 5648 bytes content/materials/items/ore_iron.png | Bin 0 -> 4093 bytes content/materials/items/ore_mithril.png | Bin 0 -> 4976 bytes content/materials/items/ore_platinum.png | Bin 0 -> 4017 bytes content/materials/items/ore_silver.png | Bin 0 -> 3052 bytes content/materials/items/ore_steel.png | Bin 0 -> 4393 bytes content/materials/items/ore_tech.png | Bin 0 -> 5106 bytes content/materials/items/platinum_ore.png | Bin 4017 -> 0 bytes content/materials/items/silver_ore.png | Bin 3052 -> 0 bytes content/materials/items/steel_ore.png | Bin 4393 -> 0 bytes content/materials/items/stone.png | Bin 0 -> 8860 bytes content/materials/items/tech_ore.png | Bin 5106 -> 0 bytes content/materials/items/urine.png | Bin 6190 -> 0 bytes content/materials/items/water_bottle.png | Bin 5937 -> 0 bytes content/materials/items/wood.png | Bin 0 -> 6130 bytes content/materials/items/wood_oak.png | Bin 0 -> 6324 bytes content/materials/items/wook_teak.png | Bin 0 -> 5265 bytes gamemode/itemsystem/items/deaddroppable.lua | 27 ++++++++++++++------------- gamemode/itemsystem/items/waterbottle.lua | 2 +- 28 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 content/materials/items/Copper_Ore.png delete mode 100644 content/materials/items/adamantine_ore.png create mode 100644 content/materials/items/bottle_urine.png create mode 100644 content/materials/items/bottle_water.png delete mode 100644 content/materials/items/gold_ore.png delete mode 100644 content/materials/items/iron_ore.png delete mode 100644 content/materials/items/mithril_ore.png create mode 100644 content/materials/items/ore_adamantine.png create mode 100644 content/materials/items/ore_copper.png create mode 100644 content/materials/items/ore_gold.png create mode 100644 content/materials/items/ore_iron.png create mode 100644 content/materials/items/ore_mithril.png create mode 100644 content/materials/items/ore_platinum.png create mode 100644 content/materials/items/ore_silver.png create mode 100644 content/materials/items/ore_steel.png create mode 100644 content/materials/items/ore_tech.png delete mode 100644 content/materials/items/platinum_ore.png delete mode 100644 content/materials/items/silver_ore.png delete mode 100644 content/materials/items/steel_ore.png create mode 100644 content/materials/items/stone.png delete mode 100644 content/materials/items/tech_ore.png delete mode 100644 content/materials/items/urine.png delete mode 100644 content/materials/items/water_bottle.png create mode 100644 content/materials/items/wood.png create mode 100644 content/materials/items/wood_oak.png create mode 100644 content/materials/items/wook_teak.png diff --git a/content/materials/items/Copper_Ore.png b/content/materials/items/Copper_Ore.png deleted file mode 100644 index ecad12d..0000000 Binary files a/content/materials/items/Copper_Ore.png and /dev/null differ diff --git a/content/materials/items/adamantine_ore.png b/content/materials/items/adamantine_ore.png deleted file mode 100644 index 1f80cba..0000000 Binary files a/content/materials/items/adamantine_ore.png and /dev/null differ diff --git a/content/materials/items/bottle_urine.png b/content/materials/items/bottle_urine.png new file mode 100644 index 0000000..a7b9b19 Binary files /dev/null and b/content/materials/items/bottle_urine.png differ diff --git a/content/materials/items/bottle_water.png b/content/materials/items/bottle_water.png new file mode 100644 index 0000000..627a183 Binary files /dev/null and b/content/materials/items/bottle_water.png differ diff --git a/content/materials/items/gold_ore.png b/content/materials/items/gold_ore.png deleted file mode 100644 index d4a5472..0000000 Binary files a/content/materials/items/gold_ore.png and /dev/null differ diff --git a/content/materials/items/iron_ore.png b/content/materials/items/iron_ore.png deleted file mode 100644 index 6317143..0000000 Binary files a/content/materials/items/iron_ore.png and /dev/null differ diff --git a/content/materials/items/mithril_ore.png b/content/materials/items/mithril_ore.png deleted file mode 100644 index b76929c..0000000 Binary files a/content/materials/items/mithril_ore.png and /dev/null differ diff --git a/content/materials/items/ore_adamantine.png b/content/materials/items/ore_adamantine.png new file mode 100644 index 0000000..1f80cba Binary files /dev/null and b/content/materials/items/ore_adamantine.png differ diff --git a/content/materials/items/ore_copper.png b/content/materials/items/ore_copper.png new file mode 100644 index 0000000..ecad12d Binary files /dev/null and b/content/materials/items/ore_copper.png differ diff --git a/content/materials/items/ore_gold.png b/content/materials/items/ore_gold.png new file mode 100644 index 0000000..d4a5472 Binary files /dev/null and b/content/materials/items/ore_gold.png differ diff --git a/content/materials/items/ore_iron.png b/content/materials/items/ore_iron.png new file mode 100644 index 0000000..6317143 Binary files /dev/null and b/content/materials/items/ore_iron.png differ diff --git a/content/materials/items/ore_mithril.png b/content/materials/items/ore_mithril.png new file mode 100644 index 0000000..b76929c Binary files /dev/null and b/content/materials/items/ore_mithril.png differ diff --git a/content/materials/items/ore_platinum.png b/content/materials/items/ore_platinum.png new file mode 100644 index 0000000..78acf96 Binary files /dev/null and b/content/materials/items/ore_platinum.png differ diff --git a/content/materials/items/ore_silver.png b/content/materials/items/ore_silver.png new file mode 100644 index 0000000..0967c91 Binary files /dev/null and b/content/materials/items/ore_silver.png differ diff --git a/content/materials/items/ore_steel.png b/content/materials/items/ore_steel.png new file mode 100644 index 0000000..6fa25c8 Binary files /dev/null and b/content/materials/items/ore_steel.png differ diff --git a/content/materials/items/ore_tech.png b/content/materials/items/ore_tech.png new file mode 100644 index 0000000..19d2763 Binary files /dev/null and b/content/materials/items/ore_tech.png differ diff --git a/content/materials/items/platinum_ore.png b/content/materials/items/platinum_ore.png deleted file mode 100644 index 78acf96..0000000 Binary files a/content/materials/items/platinum_ore.png and /dev/null differ diff --git a/content/materials/items/silver_ore.png b/content/materials/items/silver_ore.png deleted file mode 100644 index 0967c91..0000000 Binary files a/content/materials/items/silver_ore.png and /dev/null differ diff --git a/content/materials/items/steel_ore.png b/content/materials/items/steel_ore.png deleted file mode 100644 index 6fa25c8..0000000 Binary files a/content/materials/items/steel_ore.png and /dev/null differ diff --git a/content/materials/items/stone.png b/content/materials/items/stone.png new file mode 100644 index 0000000..afda50e Binary files /dev/null and b/content/materials/items/stone.png differ diff --git a/content/materials/items/tech_ore.png b/content/materials/items/tech_ore.png deleted file mode 100644 index 19d2763..0000000 Binary files a/content/materials/items/tech_ore.png and /dev/null differ diff --git a/content/materials/items/urine.png b/content/materials/items/urine.png deleted file mode 100644 index a7b9b19..0000000 Binary files a/content/materials/items/urine.png and /dev/null differ diff --git a/content/materials/items/water_bottle.png b/content/materials/items/water_bottle.png deleted file mode 100644 index 627a183..0000000 Binary files a/content/materials/items/water_bottle.png and /dev/null differ diff --git a/content/materials/items/wood.png b/content/materials/items/wood.png new file mode 100644 index 0000000..6913312 Binary files /dev/null and b/content/materials/items/wood.png differ diff --git a/content/materials/items/wood_oak.png b/content/materials/items/wood_oak.png new file mode 100644 index 0000000..55dead5 Binary files /dev/null and b/content/materials/items/wood_oak.png differ diff --git a/content/materials/items/wook_teak.png b/content/materials/items/wook_teak.png new file mode 100644 index 0000000..9273638 Binary files /dev/null and b/content/materials/items/wook_teak.png differ diff --git a/gamemode/itemsystem/items/deaddroppable.lua b/gamemode/itemsystem/items/deaddroppable.lua index 75c127f..81af605 100644 --- a/gamemode/itemsystem/items/deaddroppable.lua +++ b/gamemode/itemsystem/items/deaddroppable.lua @@ -2,7 +2,7 @@ --Try to keep this table in alphabetical order so if something needs changeing, you can find it local tbl = { - {"Adamantine Ore","Something you can craft with!","items/adamantine_ore.png"}, + {"Adamantine Ore","Something you can craft with!","items/ore_adamantine.png"}, {"Air Rune","This stone seems like it should be heavier.","test.png"}, {"Baits","Something you can use to fish with! (Consumed automatically)","test.png"}, {"Basic Rune","Something you can craft with!","test.png"}, @@ -10,7 +10,7 @@ local tbl = { {"Batteries","It holds a charge!","test.png"}, {"Cedar","You can identify that this is wood.","test.png"}, {"Charcoal","Bits of burnt wood.","test.png"}, - {"Copper Ore","Something you can craft with!","items/copper_ore.png"}, + {"Copper Ore","Something you can craft with!","items/ore_copper.png"}, {"Dough","Something you can craft with!","test.png"}, {"Dust","Ever wondered what would happen if sand got smaller?","test.png"}, {"Earth Rune","A stone that's heavier than it looks.","test.png"}, @@ -19,40 +19,41 @@ local tbl = { {"Flashlight","Lights up the dark!","test.png"}, {"Glass","Useful in construction!","test.png"}, {"Gold","You're Rich!","test.png"}, - {"Gold Ore","Something you can craft with!","items/gold_ore.png"}, + {"Gold Ore","Something you can craft with!","items/ore_gold.png"}, {"Gunpowder","Something you can craft with!","test.png"}, {"Herbs","Blech, vegtables...","test.png"}, {"Iron","Something you can craft with!","test.png"}, - {"Iron Ore","Something you can craft with!","items/iron_ore.png"}, + {"Iron Ore","Something you can craft with!","items/ore_iron.png"}, {"Mahogany","A rich dark color.","test.png"}, {"Maple","It's some nice wood, Eh?","test.png"}, {"Meat","Something you can craft with!","test.png"}, - {"Mithril Ore","Something you can craft with!","items/mithril_ore.png"}, + {"Mithril Ore","Something you can craft with!","items/ore_mithril.png"}, + {"Oak","You've got wood.","items/wood_oak.png"}, {"Pickaxe Handle","Something you can craft with!","test.png"}, {"Pickaxe Head","Something you can craft with!","test.png"}, {"Plastic","Some solidified resin!","test.png"}, {"Platinum","Something you can craft with!","test.png"}, - {"Platinum Ore","Something you can craft with!","items/platinum_ore.png"}, + {"Platinum Ore","Something you can craft with!","items/ore_platinum.png"}, {"Pure Mithril","Something you can craft with!","test.png"}, {"Resin","Something you can craft with!","test.png"}, {"Salmon","Something you can craft with!","test.png"}, {"Sand","How in the world are you holding this stuff?","test.png"}, {"Shark","Something you can craft with!","test.png"}, {"Silver","Something you can craft with!","test.png"}, - {"Silver Ore","Something you can craft with!","items/silver_ore.png"}, + {"Silver Ore","Something you can craft with!","items/ore_silver.png"}, {"Spices","Freshen up that stinking mutton!","test.png"}, {"Steel","Something you can craft with!","test.png"}, - {"Steel Ore","Something you can craft with!","items/steel_ore.png"}, - {"Stone","Something you can craft with!","test.png"}, + {"Steel Ore","Something you can craft with!","items/ore_steel.png"}, + {"Stone","Something you can craft with!","stone.png"}, {"Strange Stone","Something you can craft with!","test.png"}, {"Sulpher","Watch out, it's explosive!","test.png"}, - {"Teak","You've got wood.","test.png"}, + {"Teak","You've got wood.","wood_teak.png"}, {"Tech","You're blinded by SCIENCE!","test.png"}, - {"Tech Ore","Something you can craft with!","items/tech_ore.png"}, + {"Tech Ore","Something you can craft with!","items/ore_tech.png"}, {"Trout","A flippy floppy fish!","test.png"}, - {"Urine Bottles","Something you can craft with!","items/urine.png"}, + {"Urine Bottles","Something you can craft with!","items/bottle_urine.png"}, {"Water Rune","Whenever you touch it, your hand feels slightly damp.","test.png"}, - {"Wood","Something you can craft with!","test.png"}, + {"Wood","Something you can craft with!","items/wood.png"}, {"Wrist Watch","See the time wherever you go!","test.png"}, } diff --git a/gamemode/itemsystem/items/waterbottle.lua b/gamemode/itemsystem/items/waterbottle.lua index 8f0fca0..8176556 100644 --- a/gamemode/itemsystem/items/waterbottle.lua +++ b/gamemode/itemsystem/items/waterbottle.lua @@ -3,7 +3,7 @@ ITEM = {} ITEM.Name = "Water Bottles" ITEM.Description = "Something you can drink!" -ITEM.Icon = "items/water_bottle.png" +ITEM.Icon = "items/bottle_water.png" ITEM.UniqueData = false if(SERVER) then -- cgit v1.2.3-70-g09d2